Merge master into staging-next

authored by

github-actions[bot] and committed by
GitHub
aa5d1072 36bd3b45

+648 -160
+8
lib/licenses.nix
··· 995 995 url = "https://github.com/thestk/stk/blob/master/LICENSE"; 996 996 }; 997 997 998 + sustainableUse = { 999 + shortName = "sustainable"; 1000 + fullName = "Sustainable Use License"; 1001 + url = "https://github.com/n8n-io/n8n/blob/master/LICENSE.md"; 1002 + free = false; 1003 + redistributable = false; # only free to redistribute "for non-commercial purposes" 1004 + }; 1005 + 998 1006 tsl = { 999 1007 shortName = "TSL"; 1000 1008 fullName = "Timescale License Agreegment";
+2 -2
pkgs/applications/audio/jamesdsp/default.nix
··· 25 25 in 26 26 mkDerivation rec { 27 27 pname = "jamesdsp"; 28 - version = "2.4"; 28 + version = "2.5.1"; 29 29 src = fetchFromGitHub rec { 30 30 owner = "Audio4Linux"; 31 31 repo = "JDSP4Linux"; 32 32 fetchSubmodules = true; 33 33 rev = version; 34 - hash = "sha256-wD1JZQD8dR24cBN4QJCSrEsS4aoMD+MQmqnOIFKOeoE="; 34 + hash = "sha256-osbRiUa/CKq4l3pV2MZYKcECEfa1ee3SAQ8RsiimbA4="; 35 35 }; 36 36 37 37 nativeBuildInputs = [
+1 -17
pkgs/applications/editors/pulsar/001-patch-wrapper.patch
··· 1 1 --- a/resources/pulsar.sh 2023-03-16 04:11:14.000000000 +0100 2 2 +++ b/resources/pulsar.sh 2023-03-24 14:37:13.468813964 +0100 3 - @@ -123,22 +123,9 @@ 3 + @@ -123,7 +123,7 @@ 4 4 elif [ $OS == 'Linux' ]; then 5 5 SCRIPT=$(readlink -f "$0") 6 6 7 7 - PULSAR_PATH="/opt/Pulsar/pulsar" 8 8 + # PULSAR_PATH is set-up via `wrapProgram` in the postFixup phase 9 - 10 - - #Will allow user to get context menu on cinnamon desktop enviroment 11 - - #Add a check to make sure that DESKTOP_SESSION is set before attempting to grep it 12 - - #expr substr is expecting 3 arguments string, index, length 13 - - #If grep doesnt find anything is provides an empty string which causes the expr: syntax error: missing argument after '8' error - see pulsar-edit/pulsar#174 14 - - #Im also not quite sure why they used grep instead of simply [ "${DESKTOP_SESSION}" == "cinnamon" ] 15 - - if [ -n "${DESKTOP_SESSION}" ] && [ "$(expr substr $(printenv | grep 'DESKTOP_SESSION=') 17 8)" == "cinnamon" ]; then 16 - - #This local path is almost assuredly wrong as it shouldnt exist in a standard install 17 - - ACTION_PATH="resources/linux/desktopenviroment/cinnamon/pulsar.nemo_action" 18 - - 19 - - #Validate the file exists before attempting to copy it 20 - - if [ -f "${ACTION_PATH}" ]; then 21 - - cp "${$ACTION_PATH}" "/usr/share/nemo/actions/pulsar.nemo_action" 22 - - fi 23 - - fi 24 - + # We remove the nemo integration. It is handled by the postFixup phase 25 9 26 10 #Set tmpdir only if tmpdir is unset 27 11 : ${TMPDIR:=/tmp}
+3 -3
pkgs/applications/editors/pulsar/default.nix
··· 23 23 24 24 let 25 25 pname = "pulsar"; 26 - version = "1.105.0"; 26 + version = "1.106.0"; 27 27 28 28 sourcesPath = { 29 29 x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz"; 30 - x86_64-linux.hash = "sha256-j2d83m8B6lt1eRAwOOTEq4o+CNe8I+6rkz9qyux55Qw="; 30 + x86_64-linux.hash = "sha256-Wd0z6kHd6qZgrgZBxZQjwVC1dDqYtJ94L7aAnbuJoO8="; 31 31 aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz"; 32 - aarch64-linux.hash = "sha256-iZVE1R30Tynyn/cAwNIiGrsCMTkWKFUforOkGXSzMsw="; 32 + aarch64-linux.hash = "sha256-Xadjqw8PRrq0ksif6te0gxn8xeYTCYnJcsrezfl2SYs="; 33 33 }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); 34 34 35 35 additionalLibs = lib.makeLibraryPath [
+16
pkgs/applications/emulators/retroarch/cores.nix
··· 426 426 }; 427 427 }; 428 428 429 + fuse = mkLibretroCore { 430 + core = "fuse"; 431 + meta = { 432 + description = "A port of the Fuse Unix Spectrum Emulator to libretro"; 433 + license = lib.licenses.gpl3Only; 434 + }; 435 + }; 436 + 429 437 gambatte = mkLibretroCore { 430 438 core = "gambatte"; 431 439 meta = { ··· 967 975 meta = { 968 976 description = "Port of TIC-80 to libretro"; 969 977 license = lib.licenses.mit; 978 + }; 979 + }; 980 + 981 + twenty-fortyeight = mkLibretroCore { 982 + core = "2048"; 983 + meta = { 984 + description = "Port of 2048 puzzle game to the libretro API"; 985 + license = lib.licenses.unlicense; 970 986 }; 971 987 }; 972 988
+12
pkgs/applications/emulators/retroarch/hashes.json
··· 1 1 { 2 + "2048": { 3 + "owner": "libretro", 4 + "repo": "libretro-2048", 5 + "rev": "331c1de588ed8f8c370dcbc488e5434a3c09f0f2", 6 + "sha256": "gPrAmoBnfuTnW6t699pqS43vE6t0ca3jZcqTNRaJipA=" 7 + }, 2 8 "atari800": { 3 9 "owner": "libretro", 4 10 "repo": "libretro-atari800", ··· 179 185 "repo": "freeintv", 180 186 "rev": "9a65ec6e31d48ad0dae1f381c1ec61c897f970cb", 181 187 "sha256": "ZeWw/K6i04XRympqZ6sQG/yjN8cJglVcIkxpyRHx424=" 188 + }, 189 + "fuse": { 190 + "owner": "libretro", 191 + "repo": "fuse-libretro", 192 + "rev": "847dbbd6f787823ac9a5dfacdd68ab181063374e", 193 + "sha256": "jzS7SFALV/YjI77ST+IWHwUsuhT+Zr5w4t6C7O8yzFM=" 182 194 }, 183 195 "gambatte": { 184 196 "owner": "libretro",
+2
pkgs/applications/emulators/retroarch/update_cores.py
··· 12 12 HASHES_PATH = SCRIPT_PATH / "hashes.json" 13 13 GET_REPO_THREADS = int(os.environ.get("GET_REPO_THREADS", 8)) 14 14 CORES = { 15 + "2048": {"repo": "libretro-2048"}, 15 16 "atari800": {"repo": "libretro-atari800"}, 16 17 "beetle-gba": {"repo": "beetle-gba-libretro"}, 17 18 "beetle-lynx": {"repo": "beetle-lynx-libretro"}, ··· 42 43 "flycast": {"repo": "flycast"}, 43 44 "fmsx": {"repo": "fmsx-libretro"}, 44 45 "freeintv": {"repo": "freeintv"}, 46 + "fuse": {"repo": "fuse-libretro"}, 45 47 "gambatte": {"repo": "gambatte-libretro"}, 46 48 "genesis-plus-gx": {"repo": "Genesis-Plus-GX"}, 47 49 "gpsp": {"repo": "gpsp"},
+2 -3
pkgs/applications/emulators/wine/base.nix
··· 1 - { stdenv, lib, pkgArches, callPackage, makeSetupHook, 1 + { stdenv, lib, pkgArches, makeSetupHook, 2 2 pname, version, src, mingwGccs, monos, geckos, platforms, 3 3 bison, flex, fontforge, makeWrapper, pkg-config, 4 4 nixosTests, ··· 84 84 ++ lib.optional sdlSupport pkgs.SDL2 85 85 ++ lib.optional usbSupport pkgs.libusb1 86 86 ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; 87 - [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav 88 - (gst-plugins-bad.override { enableZbar = false; }) ]) 87 + [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav gst-plugins-bad ]) 89 88 ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] 90 89 ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] 91 90 ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ]
+21 -1
pkgs/applications/emulators/wine/builder-wow.sh
··· 1 - ## build described at http://wiki.winehq.org/Wine64 1 + ## build described at https://wiki.winehq.org/Building_Wine#Shared_WoW64 2 2 3 3 source $stdenv/setup 4 4 preFlags="${configureFlags}" ··· 16 16 configurePhase 17 17 buildPhase 18 18 # checkPhase 19 + 20 + # Remove 64 bit gstreamer from PKG_CONFIG_PATH 21 + IFS=":" read -ra LIST_ARRAY <<< "$PKG_CONFIG_PATH" 22 + IFS=":" read -ra REMOVE_ARRAY <<< "@pkgconfig64remove@" 23 + NEW_LIST_ARRAY=() 24 + 25 + for ELEMENT in "${LIST_ARRAY[@]}"; do 26 + TO_ADD=1 27 + for REMOVE in "${REMOVE_ARRAY[@]}"; do 28 + if [[ "$REMOVE" == "$ELEMENT" ]]; then 29 + TO_ADD=0 30 + break 31 + fi 32 + done 33 + 34 + if [[ $TO_ADD -eq 1 ]]; then 35 + NEW_LIST_ARRAY+=("$ELEMENT") 36 + fi 37 + done 38 + PKG_CONFIG_PATH=$(IFS=":"; echo "${NEW_LIST_ARRAY[*]}") 19 39 20 40 cd $TMP/wine-wow 21 41 sourceRoot=`pwd`
+6 -2
pkgs/applications/emulators/wine/packages.nix
··· 1 - { stdenv_32bit, lib, pkgs, pkgsi686Linux, pkgsCross, callPackage, moltenvk, 1 + { stdenv_32bit, lib, pkgs, pkgsi686Linux, pkgsCross, callPackage, substituteAll, moltenvk, 2 2 wineRelease ? "stable", 3 3 supportFlags 4 4 }: ··· 34 34 geckos = [ gecko32 gecko64 ]; 35 35 mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc mingwW64.buildPackages.gcc ]; 36 36 monos = [ mono ]; 37 - buildScript = ./builder-wow.sh; 37 + buildScript = substituteAll { 38 + src = ./builder-wow.sh; 39 + # pkgconfig has trouble picking the right architecture 40 + pkgconfig64remove = lib.makeSearchPathOutput "dev" "lib/pkgconfig" [ pkgs.glib pkgs.gst_all_1.gstreamer ]; 41 + }; 38 42 platforms = [ "x86_64-linux" ]; 39 43 mainProgram = "wine64"; 40 44 };
+3 -3
pkgs/applications/networking/browsers/vieb/default.nix
··· 2 2 3 3 buildNpmPackage rec { 4 4 pname = "vieb"; 5 - version = "10.0.0"; 5 + version = "10.1.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "Jelmerro"; 9 9 repo = pname; 10 10 rev = version; 11 - hash = "sha256-twTP/EvUUySG9RRHoljVZFIfFK5mjPA4KcQUvOXg2xI="; 11 + hash = "sha256-g3TW3hl2D9pulEPpbcP1s536yY1o+dMv6nuMrVjgxGI="; 12 12 }; 13 13 14 14 postPatch = '' 15 15 sed -i '/"electron"/d' package.json 16 16 ''; 17 17 18 - npmDepsHash = "sha256-RbkZ3lK4t5HcFDeaM6rXnGXZpsJxj4JPObZtHn0TVcU="; 18 + npmDepsHash = "sha256-P3VdG8JQ0JVbjdhOIfx8CxwSiWr0pYUJ4e2oOgAgtU0="; 19 19 dontNpmBuild = true; 20 20 21 21 nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isAarch64 python3;
+1 -7
pkgs/applications/networking/n8n/default.nix
··· 38 38 meta = with lib; { 39 39 description = "Free and source-available fair-code licensed workflow automation tool. Easily automate tasks across different services."; 40 40 maintainers = with maintainers; [ freezeboy k900 ]; 41 - license = { 42 - fullName = "Sustainable Use License"; 43 - url = "https://github.com/n8n-io/n8n/blob/master/LICENSE.md"; 44 - free = false; 45 - # only free to redistribute "for non-commercial purposes" 46 - redistributable = false; 47 - }; 41 + license = licenses.sustainableUse; 48 42 }; 49 43 }
+2 -2
pkgs/applications/office/qownnotes/default.nix
··· 19 19 let 20 20 pname = "qownnotes"; 21 21 appname = "QOwnNotes"; 22 - version = "23.6.5"; 22 + version = "23.6.6"; 23 23 in 24 24 stdenv.mkDerivation { 25 25 inherit pname appname version; 26 26 27 27 src = fetchurl { 28 28 url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; 29 - hash = "sha256-FTGptp6RWVJYdLXtDI5cymt1bNr+0yHk0wLCOuTbxlE="; 29 + hash = "sha256-UXEnoe8TovzghKtEXDis5Gk93oDEyJhhNXMnGaK5VXI="; 30 30 }; 31 31 32 32 nativeBuildInputs = [
+2 -2
pkgs/applications/radio/sdrangel/default.nix
··· 50 50 51 51 stdenv.mkDerivation rec { 52 52 pname = "sdrangel"; 53 - version = "7.14.2"; 53 + version = "7.15.0"; 54 54 55 55 src = fetchFromGitHub { 56 56 owner = "f4exb"; 57 57 repo = "sdrangel"; 58 58 rev = "v${version}"; 59 - hash = "sha256-A9/uOecV1qRbAGcKI1brPFsbjfJG/8/zKrMwKMGw9rE="; 59 + hash = "sha256-APDrVujz/2ZYqxGggabAj8ght72Vuf+oMS/kuVaWkWM="; 60 60 }; 61 61 62 62 nativeBuildInputs = [ cmake ninja pkg-config wrapQtAppsHook ];
+1 -1
pkgs/applications/video/jellyfin-media-player/default.nix
··· 99 99 homepage = "https://github.com/jellyfin/jellyfin-media-player"; 100 100 description = "Jellyfin Desktop Client based on Plex Media Player"; 101 101 license = with licenses; [ gpl2Only mit ]; 102 - platforms = [ "x86_64-linux" "x86_64-darwin" ]; 102 + platforms = [ "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]; 103 103 maintainers = with maintainers; [ jojosch kranzes ]; 104 104 mainProgram = "jellyfinmediaplayer"; 105 105 };
+2 -2
pkgs/applications/video/kodi/addons/joystick/default.nix
··· 2 2 buildKodiBinaryAddon rec { 3 3 pname = namespace; 4 4 namespace = "peripheral.joystick"; 5 - version = "20.1.0"; 5 + version = "20.1.9"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "xbmc"; 9 9 repo = namespace; 10 10 rev = "${version}-${rel}"; 11 - sha256 = "sha256-LdagiN0bVanmGkAy9APbP1TW68KES7BIy5PXgUzksJQ="; 11 + sha256 = "sha256-xJh9Rj+PcxrgGomEsKnQcO/yZDQCnG6gNBwfK2JGuNA="; 12 12 }; 13 13 14 14 extraBuildInputs = [ tinyxml udev ];
+20 -18
pkgs/applications/window-managers/sway/default.nix
··· 2 2 , meson, ninja, pkg-config, wayland-scanner, scdoc 3 3 , wayland, libxkbcommon, pcre2, json_c, libevdev 4 4 , pango, cairo, libinput, gdk-pixbuf, librsvg 5 - , wlroots_0_16, wayland-protocols, libdrm 5 + , wlroots, wayland-protocols, libdrm 6 6 , nixosTests 7 7 # Used by the NixOS module: 8 8 , isNixOS ? false ··· 11 11 , trayEnabled ? systemdSupport 12 12 }: 13 13 14 - # The "sd-bus-provider" meson option does not include a "none" option, 15 - # but it is silently ignored iff "-Dtray=disabled". We use "basu" 16 - # (which is not in nixpkgs) instead of "none" to alert us if this 17 - # changes: https://github.com/swaywm/sway/issues/6843#issuecomment-1047288761 18 - assert trayEnabled -> systemdSupport; 19 - let sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in 20 - 21 - stdenv.mkDerivation rec { 14 + stdenv.mkDerivation (finalAttrs: { 22 15 pname = "sway-unwrapped"; 23 16 version = "1.8.1"; 24 17 18 + inherit enableXWayland isNixOS systemdSupport trayEnabled; 25 19 src = fetchFromGitHub { 26 20 owner = "swaywm"; 27 21 repo = "sway"; 28 - rev = version; 22 + rev = finalAttrs.version; 29 23 hash = "sha256-WxnT+le9vneQLFPz2KoBduOI+zfZPhn1fKlaqbPL6/g="; 30 24 }; 31 25 ··· 42 36 url = "https://github.com/swaywm/sway/commit/dee032d0a0ecd958c902b88302dc59703d703c7f.diff"; 43 37 hash = "sha256-dx+7MpEiAkxTBnJcsT3/1BO8rYRfNLecXmpAvhqGMD0="; 44 38 }) 45 - ] ++ lib.optionals (!isNixOS) [ 39 + ] ++ lib.optionals (!finalAttrs.isNixOS) [ 46 40 # References to /nix/store/... will get GC'ed which causes problems when 47 41 # copying the default configuration: 48 42 ./sway-config-no-nix-store-references.patch 49 - ] ++ lib.optionals isNixOS [ 43 + ] ++ lib.optionals finalAttrs.isNixOS [ 50 44 # Use /run/current-system/sw/share and /etc instead of /nix/store 51 45 # references: 52 46 ./sway-config-nixos-paths.patch ··· 65 59 wayland libxkbcommon pcre2 json_c libevdev 66 60 pango cairo libinput gdk-pixbuf librsvg 67 61 wayland-protocols libdrm 68 - (wlroots_0_16.override { inherit enableXWayland; }) 69 - ] ++ lib.optionals enableXWayland [ 62 + (wlroots.override { inherit (finalAttrs) enableXWayland; }) 63 + ] ++ lib.optionals finalAttrs.enableXWayland [ 70 64 xorg.xcbutilwm 71 65 ]; 72 66 73 - mesonFlags = 67 + mesonFlags = let 68 + # The "sd-bus-provider" meson option does not include a "none" option, 69 + # but it is silently ignored iff "-Dtray=disabled". We use "basu" 70 + # (which is not in nixpkgs) instead of "none" to alert us if this 71 + # changes: https://github.com/swaywm/sway/issues/6843#issuecomment-1047288761 72 + # assert trayEnabled -> systemdSupport && dbusSupport; 73 + 74 + sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; 75 + in 74 76 [ "-Dsd-bus-provider=${sd-bus-provider}" ] 75 - ++ lib.optional (!enableXWayland) "-Dxwayland=disabled" 76 - ++ lib.optional (!trayEnabled) "-Dtray=disabled" 77 + ++ lib.optional (!finalAttrs.enableXWayland) "-Dxwayland=disabled" 78 + ++ lib.optional (!finalAttrs.trayEnabled) "-Dtray=disabled" 77 79 ; 78 80 79 81 passthru.tests.basic = nixosTests.sway; ··· 95 97 platforms = platforms.linux; 96 98 maintainers = with maintainers; [ primeos synthetica ]; 97 99 }; 98 - } 100 + })
+1 -1
pkgs/applications/window-managers/sway/wrapper.nix
··· 16 16 with lib; 17 17 18 18 let 19 - sway = sway-unwrapped.override { inherit isNixOS enableXWayland; }; 19 + sway = sway-unwrapped.overrideAttrs (oa: { inherit isNixOS enableXWayland; }); 20 20 baseWrapper = writeShellScriptBin "sway" '' 21 21 set -o errexit 22 22 if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then
+1 -1
pkgs/build-support/fetchgit/nix-prefetch-git
··· 206 206 207 207 # Update submodules 208 208 init_submodules(){ 209 - clean_git submodule update --init --recursive -j $NIX_BUILD_CORES 209 + clean_git submodule update --init --recursive -j ${NIX_BUILD_CORES:-1} 210 210 } 211 211 212 212 clone(){
+9 -11
pkgs/development/interpreters/wasmer/default.nix
··· 14 14 15 15 rustPlatform.buildRustPackage rec { 16 16 pname = "wasmer"; 17 - version = "3.1.1"; 17 + version = "4.0.0"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "wasmerio"; 21 21 repo = pname; 22 22 rev = "refs/tags/v${version}"; 23 - hash = "sha256-797I3FBBfnAgNfOdMajm3WNkMo3MUXb1347LBggXrLk="; 23 + hash = "sha256-vpIvoKvIqXgJ6MtuqM3dryR8nxLB/diLyQYcuGkZDLU="; 24 24 }; 25 25 26 - cargoHash = "sha256-zUTwhfRLKUixgj3JXiz2QOuwbFhfget+GcFSRL1QJ3w="; 26 + cargoHash = "sha256-1Gx8MLPAA/LV9jdK8gkztcsjltju0ousETLEiTEAaEo="; 27 27 28 - nativeBuildInputs = [ rustPlatform.bindgenHook ]; 28 + nativeBuildInputs = [ 29 + rustPlatform.bindgenHook 30 + ]; 29 31 30 32 buildInputs = lib.optionals withLLVM [ 31 33 llvmPackages.llvm ··· 37 39 Security 38 40 ]; 39 41 40 - LLVM_SYS_120_PREFIX = lib.optionalString withLLVM llvmPackages.llvm.dev; 41 - 42 42 # check references to `compiler_features` in Makefile on update 43 - buildFeatures = checkFeatures ++ [ 44 - "webc_runner" 45 - ]; 46 - 47 - checkFeatures = [ 43 + buildFeatures = [ 48 44 "cranelift" 49 45 "wasmer-artifact-create" 50 46 "static-artifact-create" ··· 55 51 ++ lib.optional withSinglepass "singlepass"; 56 52 57 53 cargoBuildFlags = [ "--manifest-path" "lib/cli/Cargo.toml" "--bin" "wasmer" ]; 54 + 55 + env.LLVM_SYS_140_PREFIX = lib.optionalString withLLVM llvmPackages.llvm.dev; 58 56 59 57 meta = with lib; { 60 58 description = "The Universal WebAssembly Runtime";
+2 -2
pkgs/development/libraries/miniaudio/default.nix
··· 4 4 }: 5 5 stdenv.mkDerivation rec { 6 6 pname = "miniaudio"; 7 - version = "0.11.16"; 7 + version = "0.11.17"; 8 8 9 9 src = fetchFromGitHub { 10 10 owner = "mackron"; 11 11 repo = "miniaudio"; 12 12 rev = version; 13 - hash = "sha256-POe/dYPJ25RKNGIhaLoqxm9JJ08MrTyHVN4NmaGOdwM="; 13 + hash = "sha256-nPQ53+9CDEn91LZgF5RkVur+XckTDcS38FHomPXbtMI="; 14 14 }; 15 15 16 16 installPhase = ''
+3 -4
pkgs/development/libraries/mongoc/default.nix
··· 14 14 15 15 stdenv.mkDerivation rec { 16 16 pname = "mongoc"; 17 - version = "1.23.5"; 17 + version = "1.24.1"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "mongodb"; 21 21 repo = "mongo-c-driver"; 22 22 rev = "refs/tags/${version}"; 23 - hash = "sha256-gdf3+EsAIf2yfuw75bNAPlwZbi9NFhVB9Q5MmS6KSo8="; 23 + hash = "sha256-IVy2PxFM//AKffYfeLyCNjattnFZmqeg6WNTqXI/yMY="; 24 24 }; 25 25 26 26 postPatch = '' ··· 41 41 cyrus_sasl 42 42 snappy 43 43 ] ++ lib.optionals stdenv.isDarwin [ 44 - darwin.apple_sdk.frameworks.Security 44 + darwin.apple_sdk_11_0.frameworks.Security 45 45 ]; 46 46 47 47 cmakeFlags = [ ··· 56 56 ''; 57 57 58 58 meta = with lib; { 59 - broken = stdenv.isDarwin && stdenv.isx86_64; 60 59 description = "The official C client library for MongoDB"; 61 60 homepage = "http://mongoc.org"; 62 61 license = licenses.asl20;
+8 -6
pkgs/development/libraries/wlroots/default.nix
··· 28 28 29 29 let 30 30 generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], extraPatch ? "" }: 31 - stdenv.mkDerivation rec { 31 + stdenv.mkDerivation (finalAttrs: { 32 32 pname = "wlroots"; 33 33 inherit version; 34 34 35 + inherit enableXWayland; 36 + 35 37 src = fetchFromGitLab { 36 38 domain = "gitlab.freedesktop.org"; 37 39 owner = "wlroots"; 38 40 repo = "wlroots"; 39 - rev = version; 41 + rev = finalAttrs.version; 40 42 inherit hash; 41 43 }; 42 44 ··· 70 72 xorg.xcbutilrenderutil 71 73 xorg.xcbutilwm 72 74 ] 73 - ++ lib.optional enableXWayland xwayland 75 + ++ lib.optional finalAttrs.enableXWayland xwayland 74 76 ++ extraBuildInputs; 75 77 76 78 mesonFlags = 77 - lib.optional (!enableXWayland) "-Dxwayland=disabled" 79 + lib.optional (!finalAttrs.enableXWayland) "-Dxwayland=disabled" 78 80 ; 79 81 80 82 postFixup = '' ··· 98 100 Pluggable, composable, unopinionated modules for building a Wayland 99 101 compositor; or about 50,000 lines of code you were going to write anyway. 100 102 ''; 101 - inherit (src.meta) homepage; 103 + inherit (finalAttrs.src.meta) homepage; 102 104 changelog = "https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/${version}"; 103 105 license = licenses.mit; 104 106 platforms = platforms.linux; 105 107 maintainers = with maintainers; [ primeos synthetica ]; 106 108 }; 107 - }; 109 + }); 108 110 109 111 in 110 112 rec {
+41
pkgs/development/python-modules/argos-translate-files/default.nix
··· 1 + { lib 2 + , buildPythonPackage 3 + , fetchPypi 4 + , lxml 5 + , translatehtml 6 + }: 7 + 8 + buildPythonPackage rec { 9 + pname = "argos-translate-files"; 10 + version = "1.1.3"; 11 + 12 + format = "setuptools"; 13 + 14 + src = fetchPypi { 15 + inherit pname version; 16 + sha256 = "c6931ea8fbabdc24903ceaabfe848be0fa4a0477d00451a8dfbc1525b623f0ba"; 17 + }; 18 + 19 + propagatedBuildInputs = [ 20 + lxml 21 + translatehtml 22 + ]; 23 + 24 + postPatch = '' 25 + ln -s */requires.txt requirements.txt 26 + ''; 27 + 28 + # required for import check to work (argostranslate) 29 + env.HOME = "/tmp"; 30 + 31 + pythonImportsCheck = [ "argostranslatefiles" ]; 32 + 33 + doCheck = false; # no tests 34 + 35 + meta = with lib; { 36 + description = "Translate files using Argos Translate"; 37 + homepage = "https://www.argosopentech.com"; 38 + license = licenses.mit; 39 + maintainers = with maintainers; [ misuzu ]; 40 + }; 41 + }
+64
pkgs/development/python-modules/argostranslate/default.nix
··· 1 + { lib 2 + , buildPythonPackage 3 + , fetchPypi 4 + , pytestCheckHook 5 + , ctranslate2 6 + , ctranslate2-cpp 7 + , sentencepiece 8 + , stanza 9 + }: 10 + let 11 + ctranslate2OneDNN = ctranslate2.override { 12 + ctranslate2-cpp = ctranslate2-cpp.override { 13 + # https://github.com/OpenNMT/CTranslate2/issues/1294 14 + withOneDNN = true; 15 + withOpenblas = false; 16 + }; 17 + }; 18 + in 19 + buildPythonPackage rec { 20 + pname = "argostranslate"; 21 + version = "1.8.0"; 22 + 23 + format = "setuptools"; 24 + 25 + src = fetchPypi { 26 + inherit pname version; 27 + sha256 = "9b109255d6a2c692c6f3bfbde494d1a27b3d5ed1c1d1d78711cdc1b1e3744c64"; 28 + }; 29 + 30 + propagatedBuildInputs = [ 31 + ctranslate2OneDNN 32 + sentencepiece 33 + stanza 34 + ]; 35 + 36 + postPatch = '' 37 + ln -s */requires.txt requirements.txt 38 + 39 + substituteInPlace requirements.txt \ 40 + --replace "==" ">=" 41 + ''; 42 + 43 + doCheck = false; # needs network access 44 + 45 + nativeCheckInputs = [ 46 + pytestCheckHook 47 + ]; 48 + 49 + # required for import check to work 50 + # PermissionError: [Errno 13] Permission denied: '/homeless-shelter' 51 + env.HOME = "/tmp"; 52 + 53 + pythonImportsCheck = [ 54 + "argostranslate" 55 + "argostranslate.translate" 56 + ]; 57 + 58 + meta = with lib; { 59 + description = "Open-source offline translation library written in Python"; 60 + homepage = "https://www.argosopentech.com"; 61 + license = licenses.mit; 62 + maintainers = with maintainers; [ misuzu ]; 63 + }; 64 + }
+4 -2
pkgs/development/python-modules/bthome-ble/default.nix
··· 7 7 , pycryptodomex 8 8 , pytestCheckHook 9 9 , pythonOlder 10 + , pytz 10 11 , sensor-state-data 11 12 }: 12 13 13 14 buildPythonPackage rec { 14 15 pname = "bthome-ble"; 15 - version = "2.11.3"; 16 + version = "2.12.0"; 16 17 format = "pyproject"; 17 18 18 19 disabled = pythonOlder "3.9"; ··· 21 22 owner = "Bluetooth-Devices"; 22 23 repo = pname; 23 24 rev = "refs/tags/v${version}"; 24 - hash = "sha256-axumlQnD7MKGdmy1gGQNU4B/3jXffK2jTyO3BtWvp5w="; 25 + hash = "sha256-SonB0pT6sC6kpFmIMzNeASUHyuik4HOOquWx6+K05Y8="; 25 26 }; 26 27 27 28 nativeBuildInputs = [ ··· 33 34 bluetooth-sensor-state-data 34 35 sensor-state-data 35 36 pycryptodomex 37 + pytz 36 38 ]; 37 39 38 40 nativeCheckInputs = [
+6
pkgs/development/python-modules/exceptiongroup/default.nix
··· 33 33 pytestCheckHook 34 34 ]; 35 35 36 + disabledTests = if (pythonAtLeast "3.11") then [ 37 + # regression in 3.11.4 38 + # https://github.com/agronholm/exceptiongroup/issues/64 39 + "test_catch_handler_raises" 40 + ] else null; 41 + 36 42 pythonImportsCheck = [ 37 43 "exceptiongroup" 38 44 ];
+2 -2
pkgs/development/python-modules/home-assistant-chip-clusters/default.nix
··· 7 7 8 8 buildPythonPackage rec { 9 9 pname = "home-assistant-chip-clusters"; 10 - version = "2023.5.3"; 10 + version = "2023.6.0"; 11 11 format = "wheel"; 12 12 13 13 src = fetchPypi { ··· 15 15 pname = "home_assistant_chip_clusters"; 16 16 dist = "py3"; 17 17 python = "py3"; 18 - hash = "sha256-g3Hj21UPkHKKRXPewKLivWaUn1kXnVebayJYOmZfLBY="; 18 + hash = "sha256-8LYB3BEDHOj6ItfFRK7ewbhjN604xXKY0YlymNjEO+g="; 19 19 }; 20 20 21 21 propagatedBuildInputs = [
+5 -3
pkgs/development/python-modules/home-assistant-chip-core/default.nix
··· 8 8 , autoPatchelfHook 9 9 10 10 # runtime 11 + , libnl 11 12 , openssl_1_1 12 13 13 14 # propagates ··· 27 28 28 29 buildPythonPackage rec { 29 30 pname = "home-assistant-chip-core"; 30 - version = "2023.5.3"; 31 + version = "2023.6.0"; 31 32 format = "wheel"; 32 33 33 34 disabled = pythonOlder "3.7"; ··· 36 37 system = { 37 38 "aarch64-linux" = { 38 39 name = "aarch64"; 39 - hash = "sha256-rGBlzYUydgFrt40UQTFlXMUOsEYlgGnvKrfT5WEZrAQ="; 40 + hash = "sha256-fR+ea25SqOMksBJXgSjuVvv2xSBoadZmPWP0IwxpiMA="; 40 41 }; 41 42 "x86_64-linux" = { 42 43 name = "x86_64"; 43 - hash = "sha256-8F5z1PAlfJidNeaiT0PN5odyTs99WN0rirXcUpH1mP0="; 44 + hash = "sha256-bRP82jTVSJS46WuO8MVWFvte+2mCOSsGFDBaXdmdPHI="; 44 45 }; 45 46 }.${stdenv.system} or (throw "Unsupported system"); 46 47 in fetchPypi { ··· 58 59 ]; 59 60 60 61 buildInputs = [ 62 + libnl 61 63 openssl_1_1 62 64 ]; 63 65
+11 -2
pkgs/development/python-modules/ical/default.nix
··· 13 13 , pytest-golden 14 14 , pytestCheckHook 15 15 , pythonOlder 16 + , pythonRelaxDepsHook 16 17 , pyyaml 17 18 }: 18 19 19 20 buildPythonPackage rec { 20 21 pname = "ical"; 21 - version = "4.5.3"; 22 + version = "4.5.4"; 22 23 format = "setuptools"; 23 24 24 25 disabled = pythonOlder "3.9"; ··· 27 28 owner = "allenporter"; 28 29 repo = pname; 29 30 rev = "refs/tags/${version}"; 30 - hash = "sha256-CHo6khJ8Bqej/OdQBtcfa/luO1Gj8cu7h//MwPhWrMU="; 31 + hash = "sha256-UcuJ23yzpRHDUFlwov692UyLXP/9Qb4F+IJIszo12/M="; 31 32 }; 33 + 34 + nativeBuildInputs = [ 35 + pythonRelaxDepsHook 36 + ]; 37 + 38 + pythonRelaxDeps = [ 39 + "tzdata" 40 + ]; 32 41 33 42 propagatedBuildInputs = [ 34 43 emoji
+93
pkgs/development/python-modules/libretranslate/default.nix
··· 1 + { lib 2 + , buildPythonPackage 3 + , fetchFromGitHub 4 + , pytestCheckHook 5 + , argostranslate 6 + , flask 7 + , flask-swagger 8 + , flask-swagger-ui 9 + , flask-limiter 10 + , flask-babel 11 + , flask-session 12 + , waitress 13 + , expiringdict 14 + , ltpycld2 15 + , morfessor 16 + , appdirs 17 + , apscheduler 18 + , translatehtml 19 + , argos-translate-files 20 + , requests 21 + , redis 22 + , prometheus-client 23 + , polib 24 + }: 25 + 26 + buildPythonPackage rec { 27 + pname = "libretranslate"; 28 + version = "1.3.11"; 29 + 30 + format = "setuptools"; 31 + 32 + src = fetchFromGitHub { 33 + owner = "LibreTranslate"; 34 + repo = "LibreTranslate"; 35 + rev = "refs/tags/v${version}"; 36 + hash = "sha256-S2J7kcoZFHOjVm2mb3TblWf9/FzkxZEB3h27BCaPYgY="; 37 + }; 38 + 39 + propagatedBuildInputs = [ 40 + argostranslate 41 + flask 42 + flask-swagger 43 + flask-swagger-ui 44 + flask-limiter 45 + flask-babel 46 + flask-session 47 + waitress 48 + expiringdict 49 + ltpycld2 50 + morfessor 51 + appdirs 52 + apscheduler 53 + translatehtml 54 + argos-translate-files 55 + requests 56 + redis 57 + prometheus-client 58 + polib 59 + ]; 60 + 61 + postPatch = '' 62 + substituteInPlace requirements.txt \ 63 + --replace "==" ">=" 64 + 65 + substituteInPlace setup.py \ 66 + --replace "'pytest-runner'" "" 67 + ''; 68 + 69 + postInstall = '' 70 + # expose static files to be able to serve them via web-server 71 + mkdir -p $out/share/libretranslate 72 + ln -s $out/lib/python*/site-packages/libretranslate/static $out/share/libretranslate/static 73 + ''; 74 + 75 + doCheck = false; # needs network access 76 + 77 + nativeCheckInputs = [ 78 + pytestCheckHook 79 + ]; 80 + 81 + # required for import check to work (argostranslate) 82 + env.HOME = "/tmp"; 83 + 84 + pythonImportsCheck = [ "libretranslate" ]; 85 + 86 + meta = with lib; { 87 + description = "Free and Open Source Machine Translation API. Self-hosted, no limits, no ties to proprietary services"; 88 + homepage = "https://libretranslate.com"; 89 + changelog = "https://github.com/LibreTranslate/LibreTranslate/releases/tag/v${version}"; 90 + license = licenses.agpl3Only; 91 + maintainers = with maintainers; [ misuzu ]; 92 + }; 93 + }
+29
pkgs/development/python-modules/ltpycld2/default.nix
··· 1 + { stdenv 2 + , lib 3 + , buildPythonPackage 4 + , fetchPypi 5 + }: 6 + 7 + buildPythonPackage rec { 8 + pname = "LTpycld2"; 9 + version = "0.42"; 10 + 11 + format = "setuptools"; 12 + 13 + src = fetchPypi { 14 + inherit pname version; 15 + sha256 = "948d0c1ab5518ab4efcbcc3cd73bb29f809f1dfb30f4d2fbd81b175a1ffeb516"; 16 + }; 17 + 18 + doCheck = false; # completely broken tests 19 + 20 + pythonImportsCheck = [ "pycld2" ]; 21 + 22 + meta = with lib; { 23 + description = "Python bindings around Google Chromium's embedded compact language detection library (CLD2)"; 24 + homepage = "https://github.com/LibreTranslate/pycld2"; 25 + license = licenses.asl20; 26 + maintainers = with maintainers; [ misuzu ]; 27 + broken = stdenv.isDarwin; 28 + }; 29 + }
+12 -1
pkgs/development/python-modules/miniaudio/default.nix
··· 10 10 , CoreAudio 11 11 }: 12 12 13 + let 14 + # TODO: recheck after 1.59 15 + miniaudio' = miniaudio.overrideAttrs (oldAttrs: rec { 16 + version = "0.11.16"; # cffi breakage with 0.11.17 17 + src = fetchFromGitHub { 18 + inherit (oldAttrs.src) owner repo; 19 + rev = "refs/tags/${version}"; 20 + hash = "sha256-POe/dYPJ25RKNGIhaLoqxm9JJ08MrTyHVN4NmaGOdwM="; 21 + }; 22 + }); 23 + in 13 24 buildPythonPackage rec { 14 25 pname = "miniaudio"; 15 26 version = "1.59"; ··· 27 38 28 39 postPatch = '' 29 40 rm -r miniaudio 30 - ln -s ${miniaudio} miniaudio 41 + ln -s ${miniaudio'} miniaudio 31 42 substituteInPlace build_ffi_module.py \ 32 43 --replace "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c"; 33 44 substituteInPlace miniaudio.c \
+2 -2
pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "mkdocs-swagger-ui-tag"; 12 - version = "0.6.1"; 12 + version = "0.6.2"; 13 13 format = "setuptools"; 14 14 15 15 disabled = pythonOlder "3.7"; 16 16 17 17 src = fetchPypi { 18 18 inherit pname version; 19 - hash = "sha256-FBrAZ9MhPGPwJhVXslu5mvVIJ7gPDiCK/3EuPAq6RNw="; 19 + hash = "sha256-H/eqrwlZntEYoKkJZKiRV+KyzkrDKRirMDDSciFNIGo="; 20 20 }; 21 21 22 22 propagatedBuildInputs = [
+27
pkgs/development/python-modules/morfessor/default.nix
··· 1 + { lib 2 + , buildPythonPackage 3 + , fetchPypi 4 + }: 5 + 6 + buildPythonPackage rec { 7 + pname = "Morfessor"; 8 + version = "2.0.6"; 9 + 10 + format = "setuptools"; 11 + 12 + src = fetchPypi { 13 + inherit pname version; 14 + sha256 = "bb3beac234341724c5f640f65803071f62373a50dba854d5a398567f9aefbab2"; 15 + }; 16 + 17 + checkPhase = "python -m unittest -v morfessor/test/*"; 18 + 19 + pythonImportsCheck = [ "morfessor" ]; 20 + 21 + meta = with lib; { 22 + description = "A tool for unsupervised and semi-supervised morphological segmentation"; 23 + homepage = "https://github.com/aalto-speech/morfessor"; 24 + license = licenses.bsd2; 25 + maintainers = with maintainers; [ misuzu ]; 26 + }; 27 + }
+2 -2
pkgs/development/python-modules/python-matter-server/default.nix
··· 27 27 28 28 buildPythonPackage rec { 29 29 pname = "python-matter-server"; 30 - version = "3.4.2"; 30 + version = "3.5.2"; 31 31 format = "pyproject"; 32 32 33 33 disabled = pythonOlder "3.10"; ··· 36 36 owner = "home-assistant-libs"; 37 37 repo = "python-matter-server"; 38 38 rev = "refs/tags/${version}"; 39 - hash = "sha256-C46GrCoilOYVZvuvYIOwyJM16tpJtm8cknqdAzhew7I="; 39 + hash = "sha256-sLVKhQIqJanvupfkJSLObHTiyGE+PP8UdQR2my1azUA="; 40 40 }; 41 41 42 42 nativeBuildInputs = [
+5
pkgs/development/python-modules/restrictedpython/default.nix
··· 3 3 , fetchPypi 4 4 , pytest-mock 5 5 , pytestCheckHook 6 + , pythonAtLeast 6 7 , pythonOlder 7 8 }: 8 9 ··· 22 23 nativeCheckInputs = [ 23 24 pytestCheckHook 24 25 pytest-mock 26 + ]; 27 + 28 + disabledTests = lib.optionals (pythonAtLeast "3.11") [ 29 + "test_compile__compile_restricted_exec__5" 25 30 ]; 26 31 27 32 pythonImportsCheck = [
+44
pkgs/development/python-modules/translatehtml/default.nix
··· 1 + { lib 2 + , buildPythonPackage 3 + , fetchPypi 4 + , argostranslate 5 + , beautifulsoup4 6 + }: 7 + 8 + buildPythonPackage rec { 9 + pname = "translatehtml"; 10 + version = "1.5.2"; 11 + 12 + format = "setuptools"; 13 + 14 + src = fetchPypi { 15 + inherit pname version; 16 + sha256 = "6b30ceb8b6f174917e2660caf2d2ccbaa71d8d24c815316edf56b061d678820d"; 17 + }; 18 + 19 + propagatedBuildInputs = [ 20 + argostranslate 21 + beautifulsoup4 22 + ]; 23 + 24 + postPatch = '' 25 + ln -s */requires.txt requirements.txt 26 + 27 + substituteInPlace requirements.txt \ 28 + --replace "==" ">=" 29 + ''; 30 + 31 + # required for import check to work (argostranslate) 32 + env.HOME = "/tmp"; 33 + 34 + pythonImportsCheck = [ "translatehtml" ]; 35 + 36 + doCheck = false; # no tests 37 + 38 + meta = with lib; { 39 + description = "Translate HTML using Beautiful Soup and Argos Translate."; 40 + homepage = "https://www.argosopentech.com"; 41 + license = licenses.mit; 42 + maintainers = with maintainers; [ misuzu ]; 43 + }; 44 + }
+3 -3
pkgs/development/tools/argc/default.nix
··· 6 6 7 7 rustPlatform.buildRustPackage rec { 8 8 pname = "argc"; 9 - version = "1.5.0"; 9 + version = "1.6.0"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "sigoden"; 13 13 repo = pname; 14 14 rev = "v${version}"; 15 - hash = "sha256-3e15knnM9CQn/nIh4H1Kd91qyE1KJ18jO0gk7UWz08Y="; 15 + hash = "sha256-jtE1OwDEo533wGY1zya09LscED6zyjn0qu+HxyWXO1E="; 16 16 }; 17 17 18 - cargoHash = "sha256-NnK3SNBZNvXoSJhMu7Gg9HjAmAws8eD051iSZEfhfIw="; 18 + cargoHash = "sha256-+K551Am9sHUj/+0aFVxuf8/M/pnqofoVLPqqnBZWOZA="; 19 19 20 20 nativeBuildInputs = [ installShellFiles ]; 21 21
+2 -2
pkgs/development/tools/esbuild/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "esbuild"; 5 - version = "0.18.7"; 5 + version = "0.18.8"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "evanw"; 9 9 repo = "esbuild"; 10 10 rev = "v${version}"; 11 - hash = "sha256-KwBucWZwgOtS167IO2cTdSM9OvL766cHdyJlbI33Md4="; 11 + hash = "sha256-yFMPUvRh+sP45qGf65QXmrqy2mBlGZsSizeeV53DvP0="; 12 12 }; 13 13 14 14 vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
+7 -2
pkgs/development/tools/ocaml/dune-release/default.nix
··· 10 10 let runtimeInputs = [ opam findlib git mercurial bzip2 gnutar coreutils ]; 11 11 in buildDunePackage rec { 12 12 pname = "dune-release"; 13 - version = "1.6.2"; 13 + version = "2.0.0"; 14 14 duneVersion = "3"; 15 15 16 16 minimalOCamlVersion = "4.06"; 17 17 18 18 src = fetchurl { 19 19 url = "https://github.com/ocamllabs/${pname}/releases/download/${version}/${pname}-${version}.tbz"; 20 - sha256 = "sha256-oJ5SL7qNM5izoEpr+nTjbT+YmmNIoy7QgSNse3wNIA4="; 20 + hash = "sha256-u8TgaoeDaDLenu3s1Km/Kh85WHMtvUy7C7Q+OY588Ss="; 21 21 }; 22 22 23 23 nativeBuildInputs = [ makeWrapper ] ++ runtimeInputs; ··· 34 34 ''; 35 35 36 36 preCheck = '' 37 + export HOME=$TMPDIR 38 + git config --global user.email "nix-builder@nixos.org" 39 + git config --global user.name "Nix Builder" 40 + 37 41 # it fails when it tries to reference "./make_check_deterministic.exe" 38 42 rm -r tests/bin/check 39 43 ''; ··· 47 51 meta = with lib; { 48 52 description = "Release dune packages in opam"; 49 53 homepage = "https://github.com/ocamllabs/dune-release"; 54 + changelog = "https://github.com/tarides/dune-release/blob/${version}/CHANGES.md"; 50 55 license = licenses.isc; 51 56 maintainers = with maintainers; [ sternenseemann ]; 52 57 };
+1 -1
pkgs/servers/home-assistant/component-packages.nix
··· 2 2 # Do not edit! 3 3 4 4 { 5 - version = "2023.6.2"; 5 + version = "2023.6.3"; 6 6 components = { 7 7 "3_day_blinds" = ps: with ps; [ 8 8 ];
+4 -13
pkgs/servers/home-assistant/default.nix
··· 231 231 doCheck = false; 232 232 }); 233 233 234 - sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { 235 - version = "2.0.12"; 236 - src = fetchPypi { 237 - pname = "SQLAlchemy"; 238 - inherit version; 239 - hash = "sha256-vd/FvR3uXbD93J2rJvgAwoPzJD5ygbvxByAP7TASX5w="; 240 - }; 241 - }); 242 - 243 234 # Pinned due to API changes in 0.3.0 244 235 tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec { 245 236 version = "0.2.0"; ··· 296 287 extraBuildInputs = extraPackages python.pkgs; 297 288 298 289 # Don't forget to run parse-requirements.py after updating 299 - hassVersion = "2023.6.2"; 290 + hassVersion = "2023.6.3"; 300 291 301 292 in python.pkgs.buildPythonApplication rec { 302 293 pname = "homeassistant"; ··· 312 303 # Primary source is the pypi sdist, because it contains translations 313 304 src = fetchPypi { 314 305 inherit pname version; 315 - hash = "sha256-WPjqKCktCEk7yPrz8/GDphoFtD4Q3j0cIxUxOEwc/i0="; 306 + hash = "sha256-hlU2LNG/9Uy7XfST/ZwVOQCar0IFvFUgpMSoSCviTrc="; 316 307 }; 317 308 318 309 # Secondary source is git for tests ··· 320 311 owner = "home-assistant"; 321 312 repo = "core"; 322 313 rev = "refs/tags/${version}"; 323 - hash = "sha256-qAwNuCoQN2r++QvKCTdNs7AePszSxwrFaY5FHXf3Vy8="; 314 + hash = "sha256-V/ndNu8zvtI8Z0LzrlWaV+EbeL8oBBz/D46ec+fhPPY="; 324 315 }; 325 316 326 317 nativeBuildInputs = with python.pkgs; [ ··· 357 348 "PyJWT" 358 349 "pyOpenSSL" 359 350 "requests" 360 - "typing-extensions" 351 + "typing_extensions" 361 352 "voluptuous-serialize" 362 353 "yarl" 363 354 ];
+2 -3
pkgs/servers/home-assistant/stubs.nix
··· 8 8 9 9 buildPythonPackage rec { 10 10 pname = "homeassistant-stubs"; 11 - version = "2023.6.2"; 11 + version = "2023.6.3"; 12 12 format = "pyproject"; 13 13 14 14 disabled = python.version != home-assistant.python.version; ··· 17 17 owner = "KapJI"; 18 18 repo = "homeassistant-stubs"; 19 19 rev = "refs/tags/${version}"; 20 - hash = "sha256-DApFCEpm+Q0UqXZkHsowPs7jFoua4UahfEoejKXEnms="; 20 + hash = "sha256-Ia+y9I92XqPcoRFXfEmoAmzU2LUH5oP+A5Uu/8DdUAc="; 21 21 }; 22 22 23 23 nativeBuildInputs = [ ··· 30 30 substituteInPlace pyproject.toml --replace \ 31 31 'homeassistant = "${version}"' \ 32 32 'homeassistant = "~${lib.versions.majorMinor home-assistant.version}"' 33 - cat pyproject.toml 34 33 ''; 35 34 36 35 pythonImportsCheck = [
+12
pkgs/servers/home-assistant/tests.nix
··· 47 47 }; 48 48 49 49 extraPytestFlagsArray = { 50 + conversation = [ 51 + "--deselect tests/components/conversation/test_init.py::test_get_agent_list" 52 + ]; 50 53 dnsip = [ 51 54 # Tries to resolve DNS entries 52 55 "--deselect tests/components/dnsip/test_config_flow.py::test_options_flow" ··· 63 66 # aioserial mock produces wrong state 64 67 "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry" 65 68 ]; 69 + sonos = [ 70 + # KeyError: 'sonos_media_player' 71 + "--deselect tests/components/sonos/test_init.py::test_async_poll_manual_hosts_warnings" 72 + "--deselect tests/components/sonos/test_init.py::test_async_poll_manual_hosts_3" 73 + ]; 66 74 unifiprotect = [ 67 75 # "TypeError: object Mock can't be used in 'await' expression 68 76 "--deselect tests/components/unifiprotect/test_repairs.py::test_ea_warning_fix" 77 + ]; 78 + zha = [ 79 + "--deselect tests/components/zha/test_config_flow.py::test_formation_strategy_restore_manual_backup_non_ezsp" 80 + "--deselect tests/components/zha/test_config_flow.py::test_formation_strategy_restore_automatic_backup_non_ezsp" 69 81 ]; 70 82 }; 71 83 in lib.listToAttrs (map (component: lib.nameValuePair component (
+2 -2
pkgs/servers/jackett/default.nix
··· 9 9 10 10 buildDotnetModule rec { 11 11 pname = "jackett"; 12 - version = "0.21.275"; 12 + version = "0.21.314"; 13 13 14 14 src = fetchFromGitHub { 15 15 owner = pname; 16 16 repo = pname; 17 17 rev = "v${version}"; 18 - hash = "sha512-MQrIzt/V6MWhRvdpBFR1sg8CeJNE3r05+DdxVYssRjFSqDOLTAOoL8Dd0S2upuzFTBcxB2dIYDYfdKrtUT8suA=="; 18 + hash = "sha512-ty9EYS02nTeOq2RrSS0NoVMQVq9tVaaX4ulbbGzvjECkKKGIjtWxUCTxN3cgm2GNI0YjwEr7/S41HDUnJGD73g=="; 19 19 }; 20 20 21 21 projectFile = "src/Jackett.Server/Jackett.Server.csproj";
+4 -4
pkgs/servers/readarr/default.nix
··· 8 8 x86_64-darwin = "x64"; 9 9 }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); 10 10 hash = { 11 - x64-linux_hash = "sha256-XKgjLlm53jfZz94lq6DtVVIwMkTjArzMWQ2+ePH+pzU="; 12 - arm64-linux_hash = "sha256-xbw/ObIe/wPEnBekikkN7bykb+pQZ9wIMEqjOzvf4NQ="; 13 - x64-osx_hash = "sha256-/U+YV5Y3MY5ibo6eBzYgFq2bWz3JP9XBZd8jFSMlkBM="; 11 + x64-linux_hash = "sha256-TKK0009ZEFWpzR9jYRanG3sMVp8hQcTd9G/FvUu00tQ="; 12 + arm64-linux_hash = "sha256-u1vjSYu751VoOYsCPyPzcNnmG0rrKk7VgbXMG8X96jU="; 13 + x64-osx_hash = "sha256-IHJ6hZP4DVTotoGxfLLbOveA8TD+6DHXkC+8QqmgTeg="; 14 14 }."${arch}-${os}_hash"; 15 15 in stdenv.mkDerivation rec { 16 16 pname = "readarr"; 17 - version = "0.1.8.1889"; 17 + version = "0.1.9.1905"; 18 18 19 19 src = fetchurl { 20 20 url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz";
+2 -2
pkgs/servers/search/zincsearch/default.nix
··· 5 5 }: 6 6 7 7 let 8 - version = "0.4.6"; 8 + version = "0.4.7"; 9 9 src = fetchFromGitHub { 10 10 owner = "zinclabs"; 11 11 repo = "zincsearch"; 12 12 rev = "v${version}"; 13 - hash = "sha256-M2QNrQFMZJuJ2BlGmHT1eGGWccXqjLSjuEppP8uTWJw="; 13 + hash = "sha256-6ZwEH9Xm+iIZ0SDa8qb82lIN3KU6DMe2wt0q9doKgkE="; 14 14 }; 15 15 16 16 webui = buildNpmPackage {
+2 -2
pkgs/servers/web-apps/snipe-it/default.nix
··· 34 34 35 35 in package.override rec { 36 36 pname = "snipe-it"; 37 - version = "6.1.0"; 37 + version = "6.1.1"; 38 38 39 39 src = fetchFromGitHub { 40 40 owner = "snipe"; 41 41 repo = pname; 42 42 rev = "v${version}"; 43 - sha256 = "0c8cjywhyiywfav2syjkah777qj5f1jrckgri70ypqyxbwgb4rpm"; 43 + sha256 = "0kqrq0blamqbfh8dxfyvn2m4q7yphamh4yvpfs7iyb3lb7z7a75i"; 44 44 }; 45 45 46 46 passthru.tests = nixosTests.snipe-it;
+20
pkgs/servers/web-apps/snipe-it/php-packages.nix
··· 492 492 }; 493 493 }; 494 494 }; 495 + "laravel/socialite" = { 496 + targetDir = ""; 497 + src = composerEnv.buildZipPackage { 498 + name = "laravel-socialite-a14a177f2cc71d8add71e2b19e00800e83bdda09"; 499 + src = fetchurl { 500 + url = "https://api.github.com/repos/laravel/socialite/zipball/a14a177f2cc71d8add71e2b19e00800e83bdda09"; 501 + sha256 = "1fxlywrr2pansda2p9k475i20il2b5sz93w9b0kr7lihf242rz1z"; 502 + }; 503 + }; 504 + }; 495 505 "laravel/tinker" = { 496 506 targetDir = ""; 497 507 src = composerEnv.buildZipPackage { ··· 619 629 src = fetchurl { 620 630 url = "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd"; 621 631 sha256 = "1a63nvqd6cz3vck3y8vjswn6c3cfwh13p0cn0ci5pqdf0bgjvvfz"; 632 + }; 633 + }; 634 + }; 635 + "league/oauth1-client" = { 636 + targetDir = ""; 637 + src = composerEnv.buildZipPackage { 638 + name = "league-oauth1-client-d6365b901b5c287dd41f143033315e2f777e1167"; 639 + src = fetchurl { 640 + url = "https://api.github.com/repos/thephpleague/oauth1-client/zipball/d6365b901b5c287dd41f143033315e2f777e1167"; 641 + sha256 = "0hkh8l7884g8ssja1biwfb59x0jj951lwk6kmiacjqvyvzs07qmx"; 622 642 }; 623 643 }; 624 644 };
+2 -2
pkgs/tools/filesystems/btrfs-progs/default.nix
··· 9 9 10 10 stdenv.mkDerivation rec { 11 11 pname = "btrfs-progs"; 12 - version = "6.3.1"; 12 + version = "6.3.2"; 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; 16 - sha256 = "sha256-mtmDlMeTbDZQRFoTQQOg22rTv28WORff/0n/d2FLPxQ="; 16 + sha256 = "sha256-qfJhmdWBeBb1sKjw9jdj8/sBQ6IDiKkpt0LcrVvyfCQ="; 17 17 }; 18 18 19 19 nativeBuildInputs = [
+68
pkgs/tools/games/trigger-control/default.nix
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , cmake 5 + , makeWrapper 6 + , pkg-config 7 + , SDL2 8 + , dbus 9 + , libdecor 10 + , libnotify 11 + , dejavu_fonts 12 + , gnome 13 + }: 14 + 15 + let 16 + inherit (gnome) zenity; 17 + in 18 + 19 + stdenv.mkDerivation rec { 20 + pname = "trigger-control"; 21 + version = "unstable-2023-06-18"; 22 + 23 + src = fetchFromGitHub { 24 + owner = "Etaash-mathamsetty"; 25 + repo = "trigger-control"; 26 + rev = "d457ebd9e0844cfc456bfa4fa4bb694bb8ad982a"; 27 + hash = "sha256-QWhUQ8xqS8oRVF0KUpEthlrOoXmhcfEkIHauDI1/5a8="; 28 + }; 29 + 30 + nativeBuildInputs = [ 31 + cmake 32 + makeWrapper 33 + pkg-config 34 + ]; 35 + 36 + buildInputs = [ 37 + SDL2 38 + dbus 39 + libnotify 40 + ] ++ lib.optionals stdenv.isLinux [ 41 + libdecor 42 + ]; 43 + 44 + # The app crashes without a changed fontdir and upstream recommends dejavu as font 45 + postPatch = '' 46 + substituteInPlace trigger-control.cpp --replace "/usr/share/fonts/" "${dejavu_fonts}/share/fonts/" 47 + ''; 48 + 49 + installPhase = '' 50 + runHook preInstall 51 + 52 + install -D trigger-control $out/bin/trigger-control 53 + 54 + runHook postInstall 55 + ''; 56 + 57 + postInstall = lib.optionalString stdenv.isLinux '' 58 + wrapProgram $out/bin/trigger-control \ 59 + --prefix PATH : ${lib.makeBinPath [ zenity ]} 60 + ''; 61 + 62 + meta = with lib; { 63 + description = "Control the dualsense's triggers on Linux (and Windows) with a gui and C++ api"; 64 + homepage = "https://github.com/Etaash-mathamsetty/trigger-control"; 65 + license = licenses.mit; 66 + maintainers = with maintainers; [ azuwis ]; 67 + }; 68 + }
+3 -3
pkgs/tools/misc/onefetch/default.nix
··· 14 14 15 15 rustPlatform.buildRustPackage rec { 16 16 pname = "onefetch"; 17 - version = "2.18.0"; 17 + version = "2.18.1"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "o2sh"; 21 21 repo = pname; 22 22 rev = version; 23 - hash = "sha256-XjsKdfz4uQ1W8ul/2dbKiz7oVksUv5UNBF0U0MNsUPs="; 23 + hash = "sha256-xa7LdIeeSzCoSUVe9CzC3hKDiKlQdr011+iF/WOVGx0="; 24 24 }; 25 25 26 - cargoHash = "sha256-G7cJoUxkOn6pQtRwzI8/KFvvbkN8JLgZcdUUZffIydo="; 26 + cargoHash = "sha256-zaRoL5fV0Vyca0Ay1WIl/1jAlPSeuoBevgrEFER6XJU="; 27 27 28 28 cargoPatches = [ 29 29 # enable pkg-config feature of zstd
+2 -2
pkgs/tools/misc/parallel/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "parallel"; 5 - version = "20230522"; 5 + version = "20230622"; 6 6 7 7 src = fetchurl { 8 8 url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; 9 - sha256 = "sha256-GvRrdgUCOxQ2C7lohF3mQT2yS/D5UfXgII0jgDy2QgI="; 9 + sha256 = "sha256-3jokrXAhmKZCEVzrmygGJf1Jxt2IQrCGhf8FfGuEI44="; 10 10 }; 11 11 12 12 outputs = [ "out" "man" "doc" ];
+3 -3
pkgs/tools/misc/tagref/default.nix
··· 1 1 { lib, fetchFromGitHub, rustPlatform }: 2 2 rustPlatform.buildRustPackage rec { 3 3 pname = "tagref"; 4 - version = "1.8.3"; 4 + version = "1.8.4"; 5 5 6 6 src = fetchFromGitHub { 7 7 owner = "stepchowfun"; 8 8 repo = pname; 9 9 rev = "v${version}"; 10 - sha256 = "sha256-BZ0by5H6yZuvksMneor02rx0kXlvO9tdpWivRDB9qDs="; 10 + sha256 = "sha256-wjCehdCZR/97nD4HsTZCiVZZb2GQaOTfyU72Ez5kjW8="; 11 11 }; 12 12 13 - cargoHash = "sha256-w+YU0+/vba/fRYbLAmOloOuHMWbFiEyt3b0mfIvFE0Q="; 13 + cargoHash = "sha256-Wis6C4Wlz7NScFeKXWODA8BKmRtL7adaYxPVR13wNsg="; 14 14 15 15 meta = with lib; { 16 16 description = "Tagref helps you refer to other locations in your codebase.";
+2 -2
pkgs/tools/security/doppler/default.nix
··· 8 8 9 9 buildGoModule rec { 10 10 pname = "doppler"; 11 - version = "3.61.0"; 11 + version = "3.62.0"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "dopplerhq"; 15 15 repo = "cli"; 16 16 rev = version; 17 - sha256 = "sha256-qX8W9tI8oVQXKA+RfJ7Y69mS7yf2nEgfu1IRvhmM48Y="; 17 + sha256 = "sha256-Li/eDD5v4b+DHlScZIIrwvlu8KgHQadwxDrS9P4wVP0="; 18 18 }; 19 19 20 20 vendorHash = "sha256-yuGjaUHfXCJnMvxfaSwbVAApflwfsvX2W7iEZdruMDE=";
+6 -6
pkgs/tools/security/vault/vault-bin.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "vault-bin"; 5 - version = "1.13.2"; 5 + version = "1.13.3"; 6 6 7 7 src = 8 8 let ··· 16 16 aarch64-darwin = "darwin_arm64"; 17 17 }; 18 18 sha256 = selectSystem { 19 - x86_64-linux = "sha256-RVqhObAw1M4zNK5cXzbD+cbITtsUPBXoc7O7zqVRJhI="; 20 - aarch64-linux = "sha256-WLw6GKNZc5a7HGTAI4kzsel8N9EwoTWda7Z05pXNeDA="; 21 - i686-linux = "sha256-v1f5yDrarKmWFtL9fIr03H5tH/bDi83XVYsTnLgLq5Q="; 22 - x86_64-darwin = "sha256-f1f6KFgr/A62PxEZEzzkNkQF4YI/xISYKVczcXn3r0k="; 23 - aarch64-darwin = "sha256-TQ9Wi6rBXWCYBkkvCyoMMbRiUOEBykvbwp6hdqUUO4I="; 19 + x86_64-linux = "sha256-heC2VX656nAlYoTwfa4Tv+tlkclfKxNTTpWa+Y6XWLA="; 20 + aarch64-linux = "sha256-Alx8Lacb0IO8kSjYwkeytGxQkCM57zTSk+JXATxZ1eU="; 21 + i686-linux = "sha256-eJW6boE0KG4oF/Sf1UxWVXkwLOx5R6ohrpog3YXKfvY="; 22 + x86_64-darwin = "sha256-lWLEr0arVR7fpgxGEZqkoj/w4YHzNQo+jILZRQ53Eok="; 23 + aarch64-darwin = "sha256-hGlmOKLpb9P/pO8ilxG2dLYDULXarp55/e8HoSbHz98="; 24 24 }; 25 25 in 26 26 fetchzip {
+3 -3
pkgs/tools/system/automatic-timezoned/default.nix
··· 5 5 6 6 rustPlatform.buildRustPackage rec { 7 7 pname = "automatic-timezoned"; 8 - version = "1.0.94"; 8 + version = "1.0.100"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "maxbrunet"; 12 12 repo = pname; 13 13 rev = "v${version}"; 14 - sha256 = "sha256-MeglBAWmEqRtWKzvNMixXUPOkGGTFCCyO9A+RE/joTw="; 14 + sha256 = "sha256-RyfUJJ4XgC8mNss4mPMxogQ4nL1uvPwDisVPtgF6+OU="; 15 15 }; 16 16 17 - cargoHash = "sha256-NkGWjvIN6Be12tuDEd7PhdFQgVUwzz2CEg6XASn9DKY="; 17 + cargoHash = "sha256-Dp8UUMWAOYdNAljktrMHpPxTIPDCY/VPWA33kzZNCuc="; 18 18 19 19 meta = with lib; { 20 20 description = "Automatically update system timezone based on location";
+9 -3
pkgs/top-level/all-packages.nix
··· 1811 1811 1812 1812 topicctl = callPackage ../tools/misc/topicctl { }; 1813 1813 1814 + trigger-control = callPackage ../tools/games/trigger-control { }; 1815 + 1814 1816 ttchat = callPackage ../tools/misc/ttchat { }; 1815 1817 1816 1818 ukmm = callPackage ../tools/games/ukmm { }; ··· 2580 2582 }; 2581 2583 2582 2584 retroarch-assets = callPackage ../applications/emulators/retroarch/retroarch-assets.nix { }; 2585 + 2586 + libretranslate = with python3.pkgs; toPythonApplication libretranslate; 2583 2587 2584 2588 libretro = recurseIntoAttrs 2585 2589 (callPackage ../applications/emulators/retroarch/cores.nix { ··· 31751 31755 wlroots_0_16 31752 31756 wlroots; 31753 31757 31754 - sway-unwrapped = callPackage ../applications/window-managers/sway { }; 31758 + sway-unwrapped = callPackage ../applications/window-managers/sway { 31759 + wlroots = wlroots_0_16; 31760 + }; 31755 31761 sway = callPackage ../applications/window-managers/sway/wrapper.nix { }; 31756 31762 swaybg = callPackage ../applications/window-managers/sway/bg.nix { }; 31757 31763 swayidle = callPackage ../applications/window-managers/sway/idle.nix { }; ··· 39522 39528 39523 39529 openzwave = callPackage ../development/libraries/openzwave { }; 39524 39530 39525 - mongoc = callPackage ../development/libraries/mongoc { }; 39531 + mongoc = darwin.apple_sdk_11_0.callPackage ../development/libraries/mongoc { }; 39526 39532 39527 39533 mongoose = callPackage ../development/libraries/science/math/mongoose { }; 39528 39534 ··· 40305 40311 wamr = callPackage ../development/interpreters/wamr { }; 40306 40312 40307 40313 wasmer = callPackage ../development/interpreters/wasmer { 40308 - llvmPackages = llvmPackages_12; 40314 + llvmPackages = llvmPackages_14; 40309 40315 inherit (darwin.apple_sdk.frameworks) CoreFoundation SystemConfiguration Security; 40310 40316 }; 40311 40317
+14
pkgs/top-level/python-packages.nix
··· 612 612 613 613 argon2-cffi-bindings = callPackage ../development/python-modules/argon2-cffi-bindings { }; 614 614 615 + argostranslate = callPackage ../development/python-modules/argostranslate { 616 + ctranslate2-cpp = pkgs.ctranslate2; 617 + }; 618 + 619 + argos-translate-files = callPackage ../development/python-modules/argos-translate-files { }; 620 + 615 621 argparse-addons = callPackage ../development/python-modules/argparse-addons { }; 616 622 617 623 argparse-dataclass = callPackage ../development/python-modules/argparse-dataclass { }; ··· 5728 5734 (p: p.py) 5729 5735 ]; 5730 5736 5737 + libretranslate = callPackage ../development/python-modules/libretranslate { }; 5738 + 5731 5739 librosa = callPackage ../development/python-modules/librosa { }; 5732 5740 5733 5741 librouteros = callPackage ../development/python-modules/librouteros { }; ··· 5946 5954 lsassy = callPackage ../development/python-modules/lsassy { }; 5947 5955 5948 5956 lsprotocol = callPackage ../development/python-modules/lsprotocol { }; 5957 + 5958 + ltpycld2 = callPackage ../development/python-modules/ltpycld2 { }; 5949 5959 5950 5960 luddite = callPackage ../development/python-modules/luddite { }; 5951 5961 ··· 6433 6443 more-properties = callPackage ../development/python-modules/more-properties { }; 6434 6444 6435 6445 moretools = callPackage ../development/python-modules/moretools { }; 6446 + 6447 + morfessor = callPackage ../development/python-modules/morfessor { }; 6436 6448 6437 6449 morphys = callPackage ../development/python-modules/morphys { }; 6438 6450 ··· 12437 12449 transforms3d = callPackage ../development/python-modules/transforms3d { }; 12438 12450 12439 12451 transitions = callPackage ../development/python-modules/transitions { }; 12452 + 12453 + translatehtml = callPackage ../development/python-modules/translatehtml { }; 12440 12454 12441 12455 translatepy = callPackage ../development/python-modules/translatepy { }; 12442 12456