commit 6d8719a23dbea749e6ebc5f74190dbb6c58c427b

+6

maintainers/maintainer-list.nix

··· 2854 2854 githubId = 706758; 2855 2855 name = "Christian Gerbrandt"; 2856 2856 }; 2857 + derekcollison = { 2858 + email = "derek@nats.io"; 2859 + github = "derekcollison"; 2860 + githubId = 90097; 2861 + name = "Derek Collison"; 2862 + }; 2857 2863 DerGuteMoritz = { 2858 2864 email = "moritz@twoticketsplease.de"; 2859 2865 github = "DerGuteMoritz";

+8

nixos/doc/manual/from_md/release-notes/rl-2205.section.xml

··· 150 150 <link linkend="opt-services.prosody-filer.enable">services.prosody-filer</link>. 151 151 </para> 152 152 </listitem> 153 + <listitem> 154 + <para> 155 + <link xlink:href="https://timetagger.app">timetagger</link>, 156 + an open source time-tracker with an intuitive user experience 157 + and powerful reporting. 158 + <link xlink:href="options.html#opt-services.timetagger.enable">services.timetagger</link>. 159 + </para> 160 + </listitem> 153 161 </itemizedlist> 154 162 </section> 155 163 <section xml:id="sec-release-22.05-incompatibilities">

+2

nixos/doc/manual/release-notes/rl-2205.section.md

··· 46 46 47 47 - [prosody-filer](https://github.com/ThomasLeister/prosody-filer), a server for handling XMPP HTTP Upload requests. Available at [services.prosody-filer](#opt-services.prosody-filer.enable). 48 48 49 + - [timetagger](https://timetagger.app), an open source time-tracker with an intuitive user experience and powerful reporting. [services.timetagger](options.html#opt-services.timetagger.enable). 50 + 49 51 ## Backward Incompatibilities {#sec-release-22.05-incompatibilities} 50 52 51 53 - `pkgs.ghc` now refers to `pkgs.targetPackages.haskellPackages.ghc`.

+80

nixos/modules/services/web-apps/timetagger.nix

··· 1 + { config, lib, pkgs, ... }: 2 + 3 + let 4 + inherit (lib) mkEnableOption mkIf mkOption types literalExpression; 5 + 6 + cfg = config.services.timetagger; 7 + in { 8 + 9 + options = { 10 + services.timetagger = { 11 + enable = mkOption { 12 + type = types.bool; 13 + default = false; 14 + description = '' 15 + Tag your time, get the insight 16 + 17 + <note><para> 18 + This app does not do authentication. 19 + You must setup authentication yourself or run it in an environment where 20 + only allowed users have access. 21 + </para></note> 22 + ''; 23 + }; 24 + 25 + bindAddr = mkOption { 26 + description = "Address to bind to."; 27 + type = types.str; 28 + default = "127.0.0.1"; 29 + }; 30 + 31 + port = mkOption { 32 + description = "Port to bind to."; 33 + type = types.port; 34 + default = 8080; 35 + }; 36 + 37 + package = mkOption { 38 + description = '' 39 + Use own package for starting timetagger web application. 40 + 41 + The ${literalExpression ''pkgs.timetagger''} package only provides a 42 + "run.py" script for the actual package 43 + ${literalExpression ''pkgs.python3Packages.timetagger''}. 44 + 45 + If you want to provide a "run.py" script for starting timetagger 46 + yourself, you can do so with this option. 47 + If you do so, the 'bindAddr' and 'port' options are ignored. 48 + ''; 49 + 50 + default = pkgs.timetagger.override { addr = cfg.bindAddr; port = cfg.port; }; 51 + defaultText = literalExpression '' 52 + pkgs.timetagger.override { 53 + addr = ${cfg.bindAddr}; 54 + port = ${cfg.port}; 55 + }; 56 + ''; 57 + type = types.package; 58 + }; 59 + }; 60 + }; 61 + 62 + config = mkIf cfg.enable { 63 + systemd.services.timetagger = { 64 + description = "Timetagger service"; 65 + wantedBy = [ "multi-user.target" ]; 66 + 67 + serviceConfig = { 68 + User = "timetagger"; 69 + Group = "timetagger"; 70 + StateDirectory = "timetagger"; 71 + 72 + ExecStart = "${cfg.package}/bin/timetagger"; 73 + 74 + Restart = "on-failure"; 75 + RestartSec = 1; 76 + }; 77 + }; 78 + }; 79 + } 80 +

-1

nixos/tests/all-tests.nix

··· 397 397 prometheus = handleTest ./prometheus.nix {}; 398 398 prometheus-exporters = handleTest ./prometheus-exporters.nix {}; 399 399 prosody = handleTest ./xmpp/prosody.nix {}; 400 - prosodyMysql = handleTest ./xmpp/prosody-mysql.nix {}; 401 400 proxy = handleTest ./proxy.nix {}; 402 401 prowlarr = handleTest ./prowlarr.nix {}; 403 402 pt2-clone = handleTest ./pt2-clone.nix {};

-92

nixos/tests/xmpp/prosody-mysql.nix

··· 1 - import ../make-test-python.nix { 2 - name = "prosody-mysql"; 3 - 4 - nodes = { 5 - client = { nodes, pkgs, ... }: { 6 - environment.systemPackages = [ 7 - (pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = nodes.server.config.networking.primaryIPAddress; }) 8 - ]; 9 - networking.extraHosts = '' 10 - ${nodes.server.config.networking.primaryIPAddress} example.com 11 - ${nodes.server.config.networking.primaryIPAddress} conference.example.com 12 - ${nodes.server.config.networking.primaryIPAddress} uploads.example.com 13 - ''; 14 - }; 15 - server = { config, pkgs, ... }: { 16 - nixpkgs.overlays = [ 17 - (self: super: { 18 - prosody = super.prosody.override { 19 - withDBI = true; 20 - withExtraLibs = [ pkgs.luaPackages.luadbi-mysql ]; 21 - }; 22 - }) 23 - ]; 24 - networking.extraHosts = '' 25 - ${config.networking.primaryIPAddress} example.com 26 - ${config.networking.primaryIPAddress} conference.example.com 27 - ${config.networking.primaryIPAddress} uploads.example.com 28 - ''; 29 - networking.firewall.enable = false; 30 - services.prosody = { 31 - enable = true; 32 - # TODO: use a self-signed certificate 33 - c2sRequireEncryption = false; 34 - extraConfig = '' 35 - storage = "sql" 36 - sql = { 37 - driver = "MySQL"; 38 - database = "prosody"; 39 - host = "mysql"; 40 - port = 3306; 41 - username = "prosody"; 42 - password = "password123"; 43 - }; 44 - ''; 45 - virtualHosts.test = { 46 - domain = "example.com"; 47 - enabled = true; 48 - }; 49 - muc = [ 50 - { 51 - domain = "conference.example.com"; 52 - } 53 - ]; 54 - uploadHttp = { 55 - domain = "uploads.example.com"; 56 - }; 57 - }; 58 - }; 59 - mysql = { config, pkgs, ... }: { 60 - networking.firewall.enable = false; 61 - services.mysql = { 62 - enable = true; 63 - initialScript = pkgs.writeText "mysql_init.sql" '' 64 - CREATE DATABASE prosody; 65 - CREATE USER 'prosody'@'server' IDENTIFIED BY 'password123'; 66 - GRANT ALL PRIVILEGES ON prosody.* TO 'prosody'@'server'; 67 - FLUSH PRIVILEGES; 68 - ''; 69 - package = pkgs.mariadb; 70 - }; 71 - }; 72 - }; 73 - 74 - testScript = { nodes, ... }: '' 75 - mysql.wait_for_unit("mysql.service") 76 - server.wait_for_unit("prosody.service") 77 - server.succeed('prosodyctl status | grep "Prosody is running"') 78 - 79 - # set password to 'nothunter2' (it's asked twice) 80 - server.succeed("yes nothunter2 | prosodyctl adduser cthon98@example.com") 81 - # set password to 'y' 82 - server.succeed("yes | prosodyctl adduser azurediamond@example.com") 83 - # correct password to 'hunter2' 84 - server.succeed("yes hunter2 | prosodyctl passwd azurediamond@example.com") 85 - 86 - client.succeed("send-message") 87 - 88 - server.succeed("prosodyctl deluser cthon98@example.com") 89 - server.succeed("prosodyctl deluser azurediamond@example.com") 90 - ''; 91 - } 92 -

+38

pkgs/applications/misc/xiphos/0001-Add-dbus-glib-dependency-to-main.patch

··· 1 + From 0e9e686c902935c0f00afdf9d0d45f9635995988 Mon Sep 17 00:00:00 2001 2 + From: Jan Tojnar <jtojnar@gmail.com> 3 + Date: Sat, 15 Jan 2022 05:00:37 +0100 4 + Subject: [PATCH] Add dbus-glib dependency to main 5 + 6 + It is required through the ipc header and the build will fail without it on Nix: 7 + 8 + In file included from /build/source/src/main/search_sidebar.cc:48: 9 + /build/source/src/gui/ipc.h:26:10: fatal error: dbus/dbus-glib.h: No such file or directory 10 + 26 | #include <dbus/dbus-glib.h> 11 + | ^~~~~~~~~~~~~~~~~~ 12 + compilation terminated. 13 + --- 14 + src/main/CMakeLists.txt | 11 +++++++++++ 15 + 1 file changed, 11 insertions(+) 16 + 17 + diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt 18 + index 49b86371..bb8e4bb6 100644 19 + --- a/src/main/CMakeLists.txt 20 + +++ b/src/main/CMakeLists.txt 21 + @@ -74,3 +74,14 @@ target_link_libraries(main 22 + PkgConfig::Sword 23 + PkgConfig::Biblesync 24 + ) 25 + + 26 + +IF (DBUS) 27 + + target_include_directories (main 28 + + PRIVATE ${CMAKE_CURRENT_BINARY_DIR} 29 + + PkgConfig::DBus 30 + + ) 31 + + target_link_libraries(main 32 + + PRIVATE 33 + + PkgConfig::DBus 34 + + ) 35 + +ENDIF (DBUS) 36 + -- 37 + 2.34.1 38 +

+31 -74

pkgs/applications/misc/xiphos/default.nix

··· 1 - { lib 2 - , stdenv 1 + { stdenv 2 + , lib 3 3 , fetchFromGitHub 4 4 , fetchpatch 5 5 , appstream-glib 6 - , at-spi2-core 7 6 , biblesync 8 - , brotli 9 - , clucene_core 10 7 , cmake 11 - , dbus 12 8 , dbus-glib 13 9 , desktop-file-utils 14 10 , docbook2x 15 11 , docbook_xml_dtd_412 16 - , enchant 17 - , gconf 12 + , enchant2 18 13 , glib 19 - , gnome-doc-utils 20 - , gtk2 14 + , gtk3 21 15 , gtkhtml 22 16 , icu 23 17 , intltool 24 18 , isocodes 25 19 , itstool 26 - , libdatrie 27 - , libepoxy 28 - , libglade 29 - , libgsf 30 - , libpsl 31 - , libselinux 32 - , libsepol 33 - , libsysprof-capture 34 - , libthai 35 20 , libuuid 36 - , libxkbcommon 37 21 , libxslt 38 22 , minizip 39 - , pcre 40 23 , pkg-config 41 - , python 42 - , scrollkeeper 43 - , sqlite 44 24 , sword 45 25 , webkitgtk 46 26 , wrapGAppsHook 47 - , xorg 48 27 , yelp-tools 49 28 , zip 50 29 }: ··· 60 39 hash = "sha256-H5Q+azE2t3fgu77C9DxrkeUCJ7iJz3Cc91Ln4dqLvD8="; 61 40 }; 62 41 42 + patches = [ 43 + # GLIB_VERSION_MIN_REQUIRED is not defined. 44 + # https://github.com/crosswire/xiphos/issues/1083#issuecomment-820304874 45 + (fetchpatch { 46 + name ="xiphos-glibc.patch"; 47 + url = "https://aur.archlinux.org/cgit/aur.git/plain/xiphos-glibc.patch?h=xiphos&id=bb816f43ba764ffac1287ab1e2a649c2443e3ce8"; 48 + sha256 = "he3U7phU2/QCrZidHviupA7YwzudnQ9Jbb8eMZw6/ck="; 49 + extraPrefix = ""; 50 + }) 51 + 52 + # Fix D-Bus build 53 + # https://github.com/crosswire/xiphos/pull/1103 54 + ./0001-Add-dbus-glib-dependency-to-main.patch 55 + ]; 56 + 63 57 nativeBuildInputs = [ 64 - appstream-glib 58 + appstream-glib # for appstream-util 65 59 cmake 66 - desktop-file-utils 60 + desktop-file-utils # for desktop-file-validate 61 + docbook2x 62 + docbook_xml_dtd_412 63 + intltool 67 64 itstool 65 + libxslt 68 66 pkg-config 69 67 wrapGAppsHook 70 - yelp-tools 68 + yelp-tools # for yelp-build 69 + zip # for building help epubs 71 70 ]; 72 71 73 72 buildInputs = [ 74 - at-spi2-core 75 73 biblesync 76 - brotli 77 - clucene_core 78 - dbus 79 74 dbus-glib 80 - docbook2x 81 - docbook_xml_dtd_412 82 - enchant 83 - gconf 75 + enchant2 84 76 glib 85 - gnome-doc-utils 86 - gtk2 77 + gtk3 87 78 gtkhtml 88 79 icu 89 - intltool 90 80 isocodes 91 - libdatrie 92 - libepoxy 93 - libglade 94 - libgsf 95 - libpsl 96 - libselinux 97 - libsepol 98 - libsysprof-capture 99 - libthai 100 81 libuuid 101 - libxkbcommon 102 - libxslt 103 82 minizip 104 - pcre 105 - python 106 - scrollkeeper 107 - sqlite 108 83 sword 109 84 webkitgtk 110 - zip 111 - ] 112 - ++ (with xorg; [ 113 - libXdmcp 114 - libXtst 115 - ]); 85 + ]; 116 86 117 87 cmakeFlags = [ 118 - "-DDBUS=OFF" 88 + # WebKit-based editor does not build. 119 89 "-DGTKHTML=ON" 120 90 ]; 121 91 ··· 123 93 # The build script won't continue without the version saved locally. 124 94 echo "${version}" > cmake/source_version.txt 125 95 126 - export CLUCENE_HOME=${clucene_core}; 127 96 export SWORD_HOME=${sword}; 128 97 ''; 129 - 130 - patchFlags = [ "-p0" ]; 131 - 132 - patches = [ 133 - # GLIB_VERSION_MIN_REQUIRED is not defined. 134 - # https://github.com/crosswire/xiphos/issues/1083#issuecomment-820304874 135 - (fetchpatch { 136 - name ="xiphos-glibc.patch"; 137 - url = "https://aur.archlinux.org/cgit/aur.git/plain/xiphos-glibc.patch?h=xiphos"; 138 - sha256 = "sha256-0WadztJKXW2adqsDP8iSAYVShbdqHoDvP+aVJC0cQB0="; 139 - }) 140 - ]; 141 98 142 99 meta = with lib; { 143 100 description = "A GTK Bible study tool";

+2 -2

pkgs/applications/networking/irc/ii/default.nix

··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "ii"; 5 - version = "1.8"; 5 + version = "1.9"; 6 6 7 7 src = fetchurl { 8 8 url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz"; 9 - sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr"; 9 + sha256 = "sha256-hQyzI7WD0mG1G9qZk+5zMzQ1Ko5soeLwK1fBVL9WjBc="; 10 10 }; 11 11 12 12 makeFlags = [ "CC:=$(CC)" ];

+2 -2

pkgs/applications/science/math/calc/default.nix

··· 3 3 4 4 stdenv.mkDerivation rec { 5 5 pname = "calc"; 6 - version = "2.14.0.13"; 6 + version = "2.14.0.14"; 7 7 8 8 src = fetchurl { 9 9 urls = [ 10 10 "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2" 11 11 "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" 12 12 ]; 13 - sha256 = "sha256-naNBismaWnzLjlUy49Rz9OfkhUcFdbnWxs917ogxTjk="; 13 + sha256 = "sha256-93J4NaED2XEsVxlY6STpwlS9FI8I60NIAZvDT45xxV0="; 14 14 }; 15 15 16 16 postPatch = ''

+6 -6

pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix

··· 12 12 rev = "master"; 13 13 sha256 = "sha256-jL8YADvhW0o6I/2Uo5FNARMAnSbvtmFp+zWH1yCVvQk="; 14 14 }; 15 - propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ]; 16 - nativeBuildInputs = [ pkg-config ]; 17 - buildInputs = [ intltool enchant isocodes autoreconfHook ]; 18 - 19 - patchFlags = [ "-p0" ]; 20 15 21 16 patches = [ 22 17 # Enables enchant2 support. ··· 24 19 (fetchpatch { 25 20 name ="enchant-2.patch"; 26 21 url = "https://aur.archlinux.org/cgit/aur.git/plain/enchant-2.patch?h=gtkhtml4&id=0218303a63d64c04d6483a6fe9bb55063fcfaa43"; 27 - sha256 = "sha256-jkA/GgIiJZmxkbcBGQ26OZ1nuI502BMPwbPhsZkbgbY="; 22 + sha256 = "f0OToWGHZwxvqf+0qosfA9FfwJ/IXfjIPP5/WrcvArI="; 23 + extraPrefix = ""; 28 24 }) 29 25 ]; 26 + 27 + propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ]; 28 + nativeBuildInputs = [ pkg-config ]; 29 + buildInputs = [ intltool enchant isocodes autoreconfHook ]; 30 30 }

+8 -10

pkgs/development/interpreters/love/0.10.nix

··· 1 - { lib, stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit, 2 - libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, 3 - libtheora, which, autoconf, automake, libtool 1 + { lib, stdenv, fetchFromGitHub, pkg-config 2 + , SDL2, libGLU, libGL, openal, luajit 3 + , libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg 4 + , libtheora, which, autoconf, automake, libtool 4 5 }: 5 6 6 - let 7 + stdenv.mkDerivation rec { 7 8 pname = "love"; 8 9 version = "0.10.2"; 9 - in 10 10 11 - stdenv.mkDerivation { 12 - name = "${pname}-${version}"; 13 - src = fetchFromBitbucket { 14 - owner = "rude"; 11 + src = fetchFromGitHub { 12 + owner = "love2d"; 15 13 repo = "love"; 16 14 rev = version; 17 15 sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym"; ··· 32 30 NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 33 31 34 32 meta = { 35 - homepage = "http://love2d.org"; 33 + homepage = "https://love2d.org"; 36 34 description = "A Lua-based 2D game engine/scripting language"; 37 35 license = lib.licenses.zlib; 38 36 platforms = lib.platforms.linux;

+2 -3

pkgs/development/interpreters/love/0.7.nix

··· 10 10 version = "0.7.2"; 11 11 12 12 src = fetchurl { 13 - url = "https://bitbucket.org/rude/love/downloads/love-${version}-linux-src.tar.gz"; 13 + url = "https://github.com/love2d/love/releases/download/${version}/love-${version}-linux-src.tar.gz"; 14 14 sha256 = "0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5"; 15 15 }; 16 16 ··· 48 48 ''; 49 49 50 50 meta = { 51 - homepage = "http://love2d.org"; 51 + homepage = "https://love2d.org"; 52 52 description = "A Lua-based 2D game engine/scripting language"; 53 53 license = lib.licenses.zlib; 54 - 55 54 platforms = lib.platforms.linux; 56 55 maintainers = [ lib.maintainers.raskin ]; 57 56 };

+2 -3

pkgs/development/interpreters/love/0.8.nix

··· 9 9 version = "0.8.0"; 10 10 11 11 src = fetchurl { 12 - url = "https://bitbucket.org/rude/love/downloads/${pname}-${version}-linux-src.tar.gz"; 12 + url = "https://github.com/love2d/love/releases/download/${version}/love-${version}-linux-src.tar.gz"; 13 13 sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi"; 14 14 }; 15 15 ··· 45 45 ]; 46 46 47 47 meta = { 48 - homepage = "http://love2d.org"; 48 + homepage = "https://love2d.org"; 49 49 description = "A Lua-based 2D game engine/scripting language"; 50 50 license = lib.licenses.zlib; 51 - 52 51 platforms = lib.platforms.linux; 53 52 maintainers = [ lib.maintainers.raskin ]; 54 53 };

+4 -5

pkgs/development/interpreters/love/0.9.nix

··· 6 6 7 7 stdenv.mkDerivation rec { 8 8 pname = "love"; 9 - version = "0.9.1"; 9 + version = "0.9.2"; 10 10 11 11 src = fetchurl { 12 - url = "https://bitbucket.org/rude/love/downloads/love-${version}-linux-src.tar.gz"; 13 - sha256 = "1pikd0bzb44r4bf0jbgn78whz1yswpq1n5jc8nf87v42pm30kp84"; 12 + url = "https://github.com/love2d/love/releases/download/${version}/love-${version}-linux-src.tar.gz"; 13 + sha256 = "0wn1npr5gal5b1idh4a5fwc3f5c36lsbjd4r4d699rqlviid15d9"; 14 14 }; 15 15 16 16 nativeBuildInputs = [ pkg-config ]; ··· 26 26 NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 27 27 28 28 meta = { 29 - homepage = "http://love2d.org"; 29 + homepage = "https://love2d.org"; 30 30 description = "A Lua-based 2D game engine/scripting language"; 31 31 license = lib.licenses.zlib; 32 - 33 32 platforms = lib.platforms.linux; 34 33 maintainers = [ lib.maintainers.raskin ]; 35 34 broken = true;

+10 -12

pkgs/development/interpreters/love/11.1.nix pkgs/development/interpreters/love/11.nix

··· 1 - { lib, stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit, 2 - libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, 3 - libtheora, which, autoconf, automake, libtool 1 + { lib, stdenv, fetchFromGitHub, pkg-config 2 + , SDL2, libGLU, libGL, openal, luajit 3 + , libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg 4 + , libtheora, which, autoconf, automake, libtool 4 5 }: 5 6 6 - let 7 + stdenv.mkDerivation rec { 7 8 pname = "love"; 8 - version = "11.3"; 9 - in 9 + version = "11.4"; 10 10 11 - stdenv.mkDerivation { 12 - name = "${pname}-${version}"; 13 - src = fetchFromBitbucket { 14 - owner = "rude"; 11 + src = fetchFromGitHub { 12 + owner = "love2d"; 15 13 repo = "love"; 16 14 rev = version; 17 - sha256 = "18gfp65ngb8k8g7hgbw2bhrwk2i7m56m21d39pk4484q9z8p4vm7"; 15 + sha256 = "0kpdp6v8m8j0r7ppyy067shr0lfgrlh0dwb7ccws76d389vizwhb"; 18 16 }; 19 17 20 18 nativeBuildInputs = [ pkg-config ]; ··· 32 30 NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 33 31 34 32 meta = { 35 - homepage = "http://love2d.org"; 33 + homepage = "https://love2d.org"; 36 34 description = "A Lua-based 2D game engine/scripting language"; 37 35 license = lib.licenses.zlib; 38 36 platforms = lib.platforms.linux;

+2 -2

pkgs/development/libraries/libplctag/default.nix

··· 6 6 7 7 stdenv.mkDerivation rec { 8 8 pname = "libplctag"; 9 - version = "2.4.8"; 9 + version = "2.4.10"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "libplctag"; 13 13 repo = "libplctag"; 14 14 rev = "v${version}"; 15 - sha256 = "sha256-GVYG+ioqGo0k6ClrJu2mijtuBBFc9l6dNexNDNyh5+8="; 15 + sha256 = "sha256-NdkWG7QdsMwx605m4P4LqBJTEqlIQhI3ChOvYwERkis="; 16 16 }; 17 17 18 18 nativeBuildInputs = [ cmake ];

+2 -2

pkgs/development/libraries/libzim/default.nix

··· 11 11 12 12 stdenv.mkDerivation rec { 13 13 pname = "libzim"; 14 - version = "7.0.0"; 14 + version = "7.1.0"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "openzim"; 18 18 repo = pname; 19 19 rev = version; 20 - sha256 = "sha256-OQVGopAInAI7KCEVr3BxaKD6np2QcFCaDjgNWjT202U="; 20 + sha256 = "sha256-8mKUYvw/0aqrerNNKk0V7r5LByEaaJLg43R/0pwM4Z8="; 21 21 }; 22 22 23 23 nativeBuildInputs = [

+22 -15

pkgs/development/python-modules/amqtt/default.nix

··· 2 2 , buildPythonPackage 3 3 , docopt 4 4 , fetchFromGitHub 5 + , fetchpatch 5 6 , hypothesis 6 7 , passlib 7 8 , poetry-core 9 + , pytest-logdog 8 10 , pytest-asyncio 9 11 , pytestCheckHook 10 12 , pythonOlder ··· 15 17 16 18 buildPythonPackage rec { 17 19 pname = "amqtt"; 18 - version = "0.10.0"; 20 + version = "unstable-2022-01-11"; 19 21 format = "pyproject"; 22 + 20 23 disabled = pythonOlder "3.7"; 21 24 22 25 src = fetchFromGitHub { 23 26 owner = "Yakifo"; 24 27 repo = pname; 25 - rev = "v${version}"; 26 - sha256 = "sha256-27LmNR1KC8w3zRJ7YBlBolQ4Q70ScTPqypMCpU6fO+I="; 28 + rev = "8961b8fff57007a5d9907b98bc555f0519974ce9"; 29 + hash = "sha256-3uwz4RSoa6KRC8mlVfeIMLPH6F2kOJjQjjXCrnVX0Jo="; 27 30 }; 28 31 29 - postPatch = '' 30 - substituteInPlace pyproject.toml \ 31 - --replace 'websockets = "^9.0"' 'websockets = "^10.0"' \ 32 - --replace 'PyYAML = "^5.4.0"' 'PyYAML = "*"' \ 33 - ''; 34 - 35 - nativeBuildInputs = [ poetry-core ]; 32 + nativeBuildInputs = [ 33 + poetry-core 34 + ]; 36 35 37 36 propagatedBuildInputs = [ 38 37 docopt ··· 44 43 45 44 checkInputs = [ 46 45 hypothesis 46 + pytest-logdog 47 47 pytest-asyncio 48 48 pytestCheckHook 49 49 ]; 50 50 51 + postPatch = '' 52 + substituteInPlace pyproject.toml \ 53 + --replace 'PyYAML = "^5.4.0"' 'PyYAML = "*"' 54 + ''; 55 + 51 56 disabledTestPaths = [ 52 57 # Test are not ported from hbmqtt yet 53 58 "tests/test_cli.py" 54 59 "tests/test_client.py" 55 60 ]; 56 61 57 - disabledTests = [ 58 - # Requires network access 59 - "test_connect_tcp" 62 + preCheck = '' 63 + # Some tests need amqtt 64 + export PATH=$out/bin:$PATH 65 + ''; 66 + 67 + pythonImportsCheck = [ 68 + "amqtt" 60 69 ]; 61 - 62 - pythonImportsCheck = [ "amqtt" ]; 63 70 64 71 meta = with lib; { 65 72 description = "Python MQTT client and broker implementation";

+32

pkgs/development/python-modules/asgineer/default.nix

··· 1 + { lib 2 + , buildPythonPackage 3 + , fetchFromGitHub 4 + , pytestCheckHook 5 + , requests 6 + }: 7 + 8 + buildPythonPackage rec { 9 + pname = "asgineer"; 10 + version = "0.8.1"; 11 + 12 + # PyPI tarball doesn't include tests directory 13 + src = fetchFromGitHub { 14 + owner = "almarklein"; 15 + repo = pname; 16 + rev = "v${version}"; 17 + sha256 = "0hd1i9pc8m7sc8bkn31q4ygkmnl5vklrcziq9zkdiqaqm8clyhcx"; 18 + }; 19 + 20 + checkInputs = [ 21 + pytestCheckHook 22 + requests 23 + ]; 24 + 25 + meta = with lib; { 26 + description = "A really thin ASGI web framework"; 27 + license = licenses.bsd2; 28 + homepage = "https://asgineer.readthedocs.io"; 29 + maintainers = [ maintainers.matthiasbeyer ]; 30 + }; 31 + } 32 +

+36 -10

pkgs/development/python-modules/batchgenerators/default.nix

··· 1 1 { lib 2 2 , buildPythonPackage 3 - , isPy27 3 + , pythonOlder 4 4 , fetchFromGitHub 5 5 , pytestCheckHook 6 - , unittest2 7 6 , future 8 7 , numpy 9 8 , pillow 9 + , fetchpatch 10 10 , scipy 11 11 , scikit-learn 12 12 , scikitimage ··· 16 16 buildPythonPackage rec { 17 17 pname = "batchgenerators"; 18 18 version = "0.21"; 19 + format = "setuptools"; 19 20 20 - disabled = isPy27; 21 + disabled = pythonOlder "3.7"; 21 22 22 23 src = fetchFromGitHub { 23 24 owner = "MIC-DKFZ"; 24 25 repo = pname; 25 26 rev = "v${version}"; 26 - sha256 = "16bk4r0q3m2c9fawpmj4l7kz0x3fyv1spb92grf44gmyricq3jdb"; 27 - 27 + hash = "sha256-q8mBWcy+PkJcfiKtq8P2bnTw56FE1suVS0zUgUEmc5k="; 28 28 }; 29 29 30 30 propagatedBuildInputs = [ 31 - future numpy pillow scipy scikit-learn scikitimage threadpoolctl 31 + future 32 + numpy 33 + pillow 34 + scipy 35 + scikit-learn 36 + scikitimage 37 + threadpoolctl 32 38 ]; 33 39 34 - checkInputs = [ pytestCheckHook unittest2 ]; 40 + checkInputs = [ 41 + pytestCheckHook 42 + ]; 35 43 36 - meta = { 44 + patches = [ 45 + # Remove deprecated unittest2, https://github.com/MIC-DKFZ/batchgenerators/pull/78 46 + (fetchpatch { 47 + name = "remove-unittest2.patch"; 48 + url = "https://github.com/MIC-DKFZ/batchgenerators/commit/87a9437057df8a7550aa3b3eaf840871cc0d5cef.patch"; 49 + sha256 = "sha256-vozBK7g2dLxx9din/R2vU28Mm+LoGAO/BmQlt/ShmEo="; 50 + }) 51 + ]; 52 + 53 + postPatch = '' 54 + substituteInPlace setup.py \ 55 + --replace '"unittest2",' "" 56 + ''; 57 + 58 + pythonImportsCheck = [ 59 + "batchgenerators" 60 + ]; 61 + 62 + meta = with lib; { 37 63 description = "2D and 3D image data augmentation for deep learning"; 38 64 homepage = "https://github.com/MIC-DKFZ/batchgenerators"; 39 - license = lib.licenses.asl20; 40 - maintainers = with lib.maintainers; [ bcdarwin ]; 65 + license = licenses.asl20; 66 + maintainers = with maintainers; [ bcdarwin ]; 41 67 }; 42 68 }

+30 -14

pkgs/development/python-modules/bibtexparser/default.nix

··· 1 1 { lib 2 - , buildPythonPackage, fetchFromGitHub 3 - , future, pyparsing 4 - , glibcLocales, nose, unittest2 2 + , buildPythonPackage 3 + , fetchFromGitHub 4 + , future 5 + , pyparsing 6 + , pytestCheckHook 7 + , pythonOlder 5 8 }: 6 9 7 10 buildPythonPackage rec { 8 11 pname = "bibtexparser"; 9 - version = "1.1.0"; 12 + version = "1.2.0"; 13 + format = "setuptools"; 10 14 11 - # PyPI tarball does not ship tests 15 + disabled = pythonOlder "3.7"; 16 + 12 17 src = fetchFromGitHub { 13 18 owner = "sciunto-org"; 14 19 repo = "python-${pname}"; 15 20 rev = "v${version}"; 16 - sha256 = "1yj3hqnmkjh0sjjhmlm4097mmz98kna8rn0dd9g8zaw9g1a35h8c"; 21 + hash = "sha256-M9fDI28Yq0uUHPx51wiuRPmRTLkjVqj7ixapbSftnJc="; 17 22 }; 18 23 19 - propagatedBuildInputs = [ future pyparsing ]; 24 + propagatedBuildInputs = [ 25 + future 26 + pyparsing 27 + ]; 20 28 21 - checkInputs = [ nose unittest2 glibcLocales ]; 29 + checkInputs = [ 30 + pytestCheckHook 31 + ]; 22 32 23 - checkPhase = '' 24 - LC_ALL="en_US.UTF-8" nosetests 33 + postPatch = '' 34 + # https://github.com/sciunto-org/python-bibtexparser/pull/259 35 + substituteInPlace bibtexparser/tests/test_crossref_resolving.py \ 36 + --replace "import unittest2 as unittest" "import unittest" 25 37 ''; 26 38 27 - meta = { 28 - description = "Bibtex parser for python 2.7 and 3.3 and newer"; 39 + pythonImportsCheck = [ 40 + "bibtexparser" 41 + ]; 42 + 43 + meta = with lib; { 44 + description = "Bibtex parser for Python"; 29 45 homepage = "https://github.com/sciunto-org/python-bibtexparser"; 30 - license = with lib.licenses; [ gpl3 bsd3 ]; 31 - maintainers = with lib.maintainers; [ fridh ]; 46 + license = with licenses; [ lgpl3Only /* or */ bsd3 ]; 47 + maintainers = with maintainers; [ fridh ]; 32 48 }; 33 49 }

+58 -22

pkgs/development/python-modules/can/default.nix

··· 1 1 { lib 2 2 , buildPythonPackage 3 - , fetchPypi 3 + , fetchFromGitHub 4 + , future 5 + , hypothesis 6 + , parameterized 7 + , msgpack 8 + , pyserial 9 + , pytest-timeout 10 + , pytestCheckHook 4 11 , pythonOlder 5 - , aenum 12 + , typing-extensions 6 13 , wrapt 7 - , typing ? null 8 - , pyserial 9 - , nose 10 - , mock 11 - , hypothesis 12 - , future 13 - , pytest 14 - }: 14 + }: 15 15 16 16 buildPythonPackage rec { 17 17 pname = "python-can"; 18 - version = "3.3.4"; 18 + version = "unstable-2022-01-11"; 19 + format = "setuptools"; 19 20 20 - src = fetchPypi { 21 - inherit pname version; 22 - sha256 = "2d3c223b7adc4dd46ce258d4a33b7e0dbb6c339e002faa40ee4a69d5fdce9449"; 21 + disabled = pythonOlder "3.6"; 22 + 23 + src = fetchFromGitHub { 24 + owner = "hardbyte"; 25 + repo = pname; 26 + rev = "2e24af08326ecd69fba9f02fed7b9c26f233c92b"; 27 + hash = "sha256-ZP5qtbjDtBZ2uT9DOSvSnfHyTlirr0oCEXhiLO1ydz0="; 23 28 }; 24 29 25 - propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing; 26 - checkInputs = [ nose mock pytest hypothesis future ]; 30 + propagatedBuildInputs = [ 31 + msgpack 32 + pyserial 33 + typing-extensions 34 + wrapt 35 + ]; 27 36 28 - # Add the scripts to PATH 29 - checkPhase = '' 30 - PATH=$out/bin:$PATH pytest -c /dev/null 37 + checkInputs = [ 38 + future 39 + hypothesis 40 + parameterized 41 + pytest-timeout 42 + pytestCheckHook 43 + ]; 44 + 45 + postPatch = '' 46 + substituteInPlace tox.ini \ 47 + --replace " --cov=can --cov-config=tox.ini --cov-report=xml --cov-report=term" "" 31 48 ''; 32 49 50 + disabledTestPaths = [ 51 + # We don't support all interfaces 52 + "test/test_interface_canalystii.py" 53 + ]; 54 + 55 + disabledTests = [ 56 + # Tests require access socket 57 + "BasicTestUdpMulticastBusIPv4" 58 + "BasicTestUdpMulticastBusIPv6" 59 + ]; 60 + 61 + preCheck = '' 62 + export PATH="$PATH:$out/bin"; 63 + ''; 64 + 65 + pythonImportsCheck = [ 66 + "can" 67 + ]; 68 + 33 69 meta = with lib; { 34 - homepage = "https://github.com/hardbyte/python-can"; 35 70 description = "CAN support for Python"; 36 - license = licenses.lgpl3; 37 - maintainers = with maintainers; [ sorki ]; 71 + homepage = "python-can.readthedocs.io"; 72 + license = licenses.lgpl3Only; 73 + maintainers = with maintainers; [ fab sorki ]; 38 74 }; 39 75 }

+34 -12

pkgs/development/python-modules/consonance/default.nix

··· 1 - { buildPythonPackage, lib, fetchFromGitHub, dissononce, python-axolotl-curve25519 2 - , transitions, protobuf, nose 1 + { lib 2 + , buildPythonPackage 3 + , fetchFromGitHub 4 + , dissononce 5 + , python-axolotl-curve25519 6 + , transitions 7 + , protobuf 8 + , pytestCheckHook 9 + , pythonOlder 3 10 }: 4 11 5 12 buildPythonPackage rec { 6 13 pname = "consonance"; 7 - version = "0.1.3"; 14 + version = "0.1.5"; 15 + format = "setuptools"; 16 + 17 + disabled = pythonOlder "3.7"; 8 18 9 19 src = fetchFromGitHub { 10 20 owner = "tgalal"; 11 21 repo = "consonance"; 12 22 rev = version; 13 - sha256 = "1ifs0fq6i41rdna1kszv5sf87qbqx1mn98ffyx4xhw4i9r2grrjv"; 23 + hash = "sha256-BhgxLxjKZ4dSL7DqkaoS+wBPCd1SYZomRKrtDLdGmYQ="; 14 24 }; 15 25 16 - checkInputs = [ nose ]; 17 - checkPhase = '' 18 - # skipping online test as it requires network with uplink 19 - nosetests tests/test_handshakes_offline.py 20 - ''; 26 + propagatedBuildInputs = [ 27 + dissononce 28 + python-axolotl-curve25519 29 + transitions 30 + protobuf 31 + ]; 21 32 22 - propagatedBuildInputs = [ dissononce python-axolotl-curve25519 transitions protobuf ]; 33 + checkInputs = [ 34 + pytestCheckHook 35 + ]; 36 + 37 + pytestFlagsArray = [ 38 + "tests/test_handshakes_offline.py" 39 + ]; 40 + 41 + pythonImportsCheck = [ 42 + "consonance" 43 + ]; 23 44 24 45 meta = with lib; { 25 - homepage = "https://pypi.org/project/consonance/"; 26 - license = licenses.gpl3; 27 46 description = "WhatsApp's handshake implementation using Noise Protocol"; 47 + homepage = "https://github.com/tgalal/consonance"; 48 + license = licenses.gpl3Plus; 49 + maintainers = with maintainers; [ ]; 28 50 }; 29 51 }

+11 -1

pkgs/development/python-modules/dacite/default.nix

··· 2 2 , fetchFromGitHub 3 3 , buildPythonPackage 4 4 , pythonOlder 5 + , pythonAtLeast 5 6 , pytestCheckHook 6 7 }: 7 8 8 9 buildPythonPackage rec { 9 10 pname = "dacite"; 10 11 version = "1.6.0"; 12 + format = "setuptools"; 13 + 11 14 disabled = pythonOlder "3.6"; 12 15 13 16 src = fetchFromGitHub { ··· 21 24 pytestCheckHook 22 25 ]; 23 26 24 - pythonImportsCheck = [ "dacite" ]; 27 + disabledTests = lib.optionals (pythonAtLeast "3.10") [ 28 + # https://github.com/konradhalas/dacite/issues/167 29 + "test_from_dict_with_union_and_wrong_data" 30 + ]; 31 + 32 + pythonImportsCheck = [ 33 + "dacite" 34 + ]; 25 35 26 36 meta = with lib; { 27 37 description = "Python helper to create data classes from dictionaries";

+3 -6

pkgs/development/python-modules/exchangelib/default.nix

··· 1 1 { lib 2 - , backports-datetime-fromisoformat 3 2 , backports-zoneinfo 4 3 , buildPythonPackage 5 4 , cached-property ··· 27 26 28 27 buildPythonPackage rec { 29 28 pname = "exchangelib"; 30 - version = "4.6.2"; 29 + version = "4.7.0"; 31 30 format = "setuptools"; 32 31 33 - disabled = pythonOlder "3.6"; 32 + disabled = pythonOlder "3.7"; 34 33 35 34 src = fetchFromGitHub { 36 35 owner = "ecederstrand"; 37 36 repo = pname; 38 37 rev = "v${version}"; 39 - sha256 = "1vax4xqjav6nr3kfkz390ism3cs69dxnbx6sc0f9ci4mn3rxjwdy"; 38 + sha256 = "sha256-APT/esskyigt6u3A+KVTAlmZDMppeyKb9Ws+95hDLcM="; 40 39 }; 41 40 42 41 propagatedBuildInputs = [ ··· 55 54 tzlocal 56 55 ] ++ lib.optionals (pythonOlder "3.9") [ 57 56 backports-zoneinfo 58 - ] ++ lib.optionals (pythonOlder "3.7") [ 59 - backports-datetime-fromisoformat 60 57 ]; 61 58 62 59 checkInputs = [

+6 -5

pkgs/development/python-modules/homematicip/default.nix

··· 7 7 , fetchFromGitHub 8 8 , fetchpatch 9 9 , pytestCheckHook 10 + , pythonAtLeast 10 11 , pythonOlder 11 12 , pytest-aiohttp 12 13 , pytest-asyncio ··· 54 55 pytestCheckHook 55 56 ]; 56 57 57 - postPatch = '' 58 - substituteInPlace homematicip/aio/connection.py \ 59 - --replace ", loop=self._loop" "" 60 - ''; 61 - 62 58 disabledTests = [ 63 59 # Assert issues with datetime 64 60 "test_contact_interface_device" ··· 82 78 "test_home_unknown_types" 83 79 # Requires network access 84 80 "test_websocket" 81 + ] ++ lib.optionals (pythonAtLeast "3.10") [ 82 + "test_connection_lost" 83 + "test_user_disconnect_and_reconnect" 84 + "test_ws_message" 85 + "test_ws_no_pong" 85 86 ]; 86 87 87 88 pythonImportsCheck = [

+26

pkgs/development/python-modules/itemdb/default.nix

··· 1 + { lib 2 + , buildPythonPackage 3 + , fetchFromGitHub 4 + }: 5 + 6 + buildPythonPackage rec { 7 + pname = "itemdb"; 8 + version = "1.1.1"; 9 + 10 + # PyPI tarball doesn't include tests directory 11 + src = fetchFromGitHub { 12 + owner = "almarklein"; 13 + repo = pname; 14 + rev = "v${version}"; 15 + sha256 = "0ksad5j91nlbsn0a11clf994qz7r9ijand5hxnjhgd66i9hl3y78"; 16 + }; 17 + 18 + meta = with lib; { 19 + description = "Easy transactional database for Python dicts, backed by SQLite"; 20 + license = licenses.bsd2; 21 + homepage = "https://itemdb.readthedocs.io"; 22 + maintainers = [ maintainers.matthiasbeyer ]; 23 + }; 24 + } 25 + 26 +

+2 -6

pkgs/development/python-modules/logfury/default.nix

··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchPypi 4 - , funcsigs 5 4 , setuptools-scm 6 5 , pytestCheckHook 7 6 , pythonOlder ··· 11 10 buildPythonPackage rec { 12 11 pname = "logfury"; 13 12 version = "1.0.1"; 13 + format = "setuptools"; 14 14 15 15 disabled = pythonOlder "3.5"; 16 16 17 17 src = fetchPypi { 18 18 inherit pname version; 19 - sha256 = "sha256-EwpdrOq5rVNJJCUt33BIKqLJZmKzo4JafTCYHQO3aiY="; 19 + hash = "sha256-EwpdrOq5rVNJJCUt33BIKqLJZmKzo4JafTCYHQO3aiY="; 20 20 }; 21 21 22 22 nativeBuildInputs = [ 23 23 setuptools-scm 24 - ]; 25 - 26 - propagatedBuildInputs = [ 27 - funcsigs 28 24 ]; 29 25 30 26 checkInputs = [

+39

pkgs/development/python-modules/pscript/default.nix

··· 1 + { lib 2 + , buildPythonPackage 3 + , fetchFromGitHub 4 + , pytestCheckHook 5 + , nodejs 6 + }: 7 + 8 + buildPythonPackage rec { 9 + pname = "pscript"; 10 + version = "0.7.6"; 11 + 12 + # PyPI tarball doesn't include tests directory 13 + src = fetchFromGitHub { 14 + owner = "flexxui"; 15 + repo = pname; 16 + rev = "v${version}"; 17 + sha256 = "169px5n4jjnpdn9y86f28qwd95bwf1q1rz0a1h3lb5nn5c6ym8c4"; 18 + }; 19 + 20 + checkInputs = [ 21 + pytestCheckHook 22 + nodejs 23 + ]; 24 + 25 + preCheck = '' 26 + # do not execute legacy tests 27 + rm -rf pscript_legacy 28 + ''; 29 + 30 + meta = with lib; { 31 + description = "Python to JavaScript compiler"; 32 + license = licenses.bsd2; 33 + homepage = "https://pscript.readthedocs.io"; 34 + maintainers = [ maintainers.matthiasbeyer ]; 35 + }; 36 + } 37 + 38 + 39 +

+49

pkgs/development/python-modules/pytest-logdog/default.nix

··· 1 + { lib 2 + , buildPythonPackage 3 + , fetchFromGitHub 4 + , pytest 5 + , pytestCheckHook 6 + , pythonOlder 7 + , setuptools-scm 8 + }: 9 + 10 + buildPythonPackage rec { 11 + pname = "pytest-logdog"; 12 + version = "0.1.0"; 13 + format = "setuptools"; 14 + 15 + disabled = pythonOlder "3.7"; 16 + 17 + src = fetchFromGitHub { 18 + owner = "ods"; 19 + repo = pname; 20 + rev = version; 21 + hash = "sha256-Tmoq+KAGzn0MMj29rukDfAc4LSIwC8DoMTuBAppV32I="; 22 + }; 23 + 24 + SETUPTOOLS_SCM_PRETEND_VERSION = version; 25 + 26 + nativeBuildInputs = [ 27 + setuptools-scm 28 + ]; 29 + 30 + buildInputs = [ 31 + pytest 32 + ]; 33 + 34 + 35 + checkInputs = [ 36 + pytestCheckHook 37 + ]; 38 + 39 + pythonImportsCheck = [ 40 + "pytest_logdog" 41 + ]; 42 + 43 + meta = with lib; { 44 + description = "Pytest plugin to test logging"; 45 + homepage = "https://github.com/ods/pytest-logdog"; 46 + license = licenses.mit; 47 + maintainers = with maintainers; [ fab ]; 48 + }; 49 + }

+6

pkgs/development/python-modules/roombapy/default.nix

··· 37 37 pytestCheckHook 38 38 ]; 39 39 40 + postPatch = '' 41 + # hbmqtt was replaced by amqtt 42 + substituteInPlace tests/test_roomba_integration.py \ 43 + --replace "from hbmqtt.broker import Broker" "from amqtt.broker import Broker" 44 + ''; 45 + 40 46 disabledTestPaths = [ 41 47 # Requires network access 42 48 "tests/test_discovery.py"

+7 -3

pkgs/development/python-modules/scrapy/default.nix

··· 86 86 87 87 LC_ALL = "en_US.UTF-8"; 88 88 89 - # Disable doctest plugin because it causes pytest to hang 90 89 preCheck = '' 91 - substituteInPlace pytest.ini --replace "--doctest-modules" "" 90 + # Disable doctest plugin because it causes pytest to hang 91 + substituteInPlace pytest.ini \ 92 + --replace "--doctest-modules" "" 92 93 ''; 93 94 94 95 disabledTestPaths = [ ··· 116 117 "test_peek_fifo" 117 118 "test_peek_one_element" 118 119 "test_peek_lifo" 120 + "test_callback_kwargs" 119 121 ] ++ lib.optionals stdenv.isDarwin [ 120 122 "test_xmliter_encoding" 121 123 "test_download" ··· 127 129 install -m 644 -D extras/scrapy_zsh_completion $out/share/zsh/site-functions/_scrapy 128 130 ''; 129 131 130 - pythonImportsCheck = [ "scrapy" ]; 132 + pythonImportsCheck = [ 133 + "scrapy" 134 + ]; 131 135 132 136 __darwinAllowLocalNetworking = true; 133 137

+31 -29

pkgs/development/python-modules/tifffile/default.nix

··· 1 1 { lib 2 - , fetchPypi 3 2 , buildPythonPackage 4 - , isPy27 5 - , isPy3k 3 + , dask 4 + , fetchPypi 5 + , fsspec 6 + , lxml 6 7 , numpy 7 - , imagecodecs-lite 8 - , enum34 ? null 9 - , futures ? null 10 - , pathlib ? null 11 - , pytest 8 + , pytestCheckHook 9 + , pythonOlder 10 + , zarr 12 11 }: 13 12 14 13 buildPythonPackage rec { 15 14 pname = "tifffile"; 16 15 version = "2021.11.2"; 16 + format = "setuptools"; 17 + 18 + disabled = pythonOlder "3.7"; 17 19 18 20 src = fetchPypi { 19 21 inherit pname version; 20 - sha256 = "153e31fa1d892f482fabb2ae9f2561fa429ee42d01a6f67e58cee13637d9285b"; 22 + hash = "sha256-FT4x+h2JL0gvq7KunyVh+kKe5C0BpvZ+WM7hNjfZKFs="; 21 23 }; 22 24 23 - patches = lib.optional isPy27 ./python2-regex-compat.patch; 24 - 25 - # Missing dependencies: imagecodecs, czifile, cmapfile, oiffile, lfdfiles 26 - # and test data missing from PyPI tarball 27 - doCheck = false; 25 + propagatedBuildInputs = [ 26 + numpy 27 + ]; 28 28 29 29 checkInputs = [ 30 - pytest 30 + dask 31 + fsspec 32 + lxml 33 + pytestCheckHook 34 + zarr 31 35 ]; 32 36 33 - checkPhase = '' 34 - pytest 35 - ''; 37 + disabledTests = [ 38 + # Test require network access 39 + "test_class_omexml" 40 + "test_write_ome" 41 + # Test file is missing 42 + "test_write_predictor" 43 + ]; 36 44 37 - propagatedBuildInputs = [ 38 - numpy 39 - ] ++ lib.optionals isPy3k [ 40 - imagecodecs-lite 41 - ] ++ lib.optionals isPy27 [ 42 - futures 43 - enum34 44 - pathlib 45 + pythonImportsCheck = [ 46 + "tifffile" 45 47 ]; 46 48 47 49 meta = with lib; { 48 - description = "Read and write image data from and to TIFF files."; 49 - homepage = "https://www.lfd.uci.edu/~gohlke/"; 50 - maintainers = [ maintainers.lebastr ]; 50 + description = "Read and write image data from and to TIFF files"; 51 + homepage = "https://github.com/cgohlke/tifffile/"; 51 52 license = licenses.bsd3; 53 + maintainers = with maintainers; [ lebastr ]; 52 54 }; 53 55 }

+47

pkgs/development/python-modules/timetagger/default.nix

··· 1 + { lib 2 + , python3Packages 3 + , fetchFromGitHub 4 + , pytestCheckHook 5 + , requests 6 + }: 7 + 8 + python3Packages.buildPythonPackage rec { 9 + pname = "timetagger"; 10 + version = "22.1.2"; 11 + 12 + src = fetchFromGitHub { 13 + owner = "almarklein"; 14 + repo = pname; 15 + rev = "v${version}"; 16 + sha256 = "0xrajx0iij7r70ch17m4y6ydyh368dn6nbjsv74pn1x8frd686rw"; 17 + }; 18 + 19 + meta = with lib; { 20 + homepage = "https://timetagger.app"; 21 + license = licenses.gpl3; 22 + description = "Tag your time, get the insight"; 23 + maintainers = with maintainers; [ matthiasbeyer ]; 24 + }; 25 + 26 + checkInputs = [ 27 + pytestCheckHook 28 + requests 29 + ]; 30 + 31 + preCheck = '' 32 + # https://github.com/NixOS/nixpkgs/issues/12591 33 + mkdir -p check-phase 34 + export HOME=$(pwd)/check-phase 35 + ''; 36 + 37 + propagatedBuildInputs = with python3Packages; [ 38 + asgineer 39 + itemdb 40 + jinja2 41 + markdown 42 + pscript 43 + pyjwt 44 + uvicorn 45 + ]; 46 + 47 + }

+12

pkgs/development/python-modules/transitions/default.nix

··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchPypi 4 + , pythonAtLeast 4 5 , six 5 6 , pygraphviz 6 7 , pytestCheckHook ··· 13 14 buildPythonPackage rec { 14 15 pname = "transitions"; 15 16 version = "0.8.10"; 17 + format = "setuptools"; 16 18 17 19 src = fetchPypi { 18 20 inherit pname version; ··· 35 37 export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf 36 38 export HOME=$TMPDIR 37 39 ''; 40 + 41 + disabledTests = lib.optionals (pythonAtLeast "3.10") [ 42 + # https://github.com/pytransitions/transitions/issues/563 43 + "test_multiple_models" 44 + "test_timeout" 45 + ]; 46 + 47 + pythonImportsCheck = [ 48 + "transitions" 49 + ]; 38 50 39 51 meta = with lib; { 40 52 homepage = "https://github.com/pytransitions/transitions";

+3 -3

pkgs/development/tools/continuous-integration/drone-cli/default.nix

··· 1 1 { lib, fetchFromGitHub, buildGoModule }: 2 2 3 3 buildGoModule rec { 4 - version = "1.4.0"; 4 + version = "1.5.0"; 5 5 pname = "drone-cli"; 6 6 revision = "v${version}"; 7 7 8 - vendorSha256 = "sha256-v2ijRZ5xvYkL3YO7Xfgalzxzd9C5BKdaQF7VT5UoqOk="; 8 + vendorSha256 = "sha256-bYjEVmQ7lPd+Gn5cJwlzBQkMkLAXA1iSa1DXz/IM1Ss="; 9 9 10 10 doCheck = false; 11 11 ··· 17 17 owner = "drone"; 18 18 repo = "drone-cli"; 19 19 rev = revision; 20 - sha256 = "sha256-+70PWHGd8AQP6ih0b/+VOIbJcF8tSOAO9wsGqQWX+bU="; 20 + sha256 = "sha256-TFIGKTVrAMSOFEmu3afdDKBgyEwF2KIv3rt1fS6rCxw="; 21 21 }; 22 22 23 23 meta = with lib; {

+1 -1

pkgs/development/tools/electron/generic.nix

··· 28 28 maintainers = with maintainers; [ travisbhartwell manveru prusnak ]; 29 29 platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ] 30 30 ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ]; 31 - knownVulnerabilities = optional (versionOlder version "12.0.0") "Electron version ${version} is EOL"; 31 + knownVulnerabilities = optional (versionOlder version "13.0.0") "Electron version ${version} is EOL"; 32 32 }; 33 33 34 34 fetcher = vers: tag: hash: fetchurl {

+1 -1

pkgs/development/tools/github-changelog-generator/Gemfile

··· 1 1 # frozen_string_literal: true 2 2 source "https://rubygems.org" 3 3 4 - gem "github_changelog_generator", "1.14.3" 4 + gem "github_changelog_generator", "1.16.4"

+81 -29

pkgs/development/tools/github-changelog-generator/Gemfile.lock

··· 1 1 GEM 2 2 remote: https://rubygems.org/ 3 3 specs: 4 - activesupport (5.2.2) 4 + activesupport (7.0.1) 5 5 concurrent-ruby (~> 1.0, >= 1.0.2) 6 - i18n (>= 0.7, < 2) 7 - minitest (~> 5.1) 8 - tzinfo (~> 1.1) 9 - addressable (2.5.2) 10 - public_suffix (>= 2.0.2, < 4.0) 11 - concurrent-ruby (1.1.4) 12 - faraday (0.15.4) 6 + i18n (>= 1.6, < 2) 7 + minitest (>= 5.1) 8 + tzinfo (~> 2.0) 9 + addressable (2.8.0) 10 + public_suffix (>= 2.0.2, < 5.0) 11 + async (1.30.1) 12 + console (~> 1.10) 13 + nio4r (~> 2.3) 14 + timers (~> 4.1) 15 + async-http (0.56.5) 16 + async (>= 1.25) 17 + async-io (>= 1.28) 18 + async-pool (>= 0.2) 19 + protocol-http (~> 0.22.0) 20 + protocol-http1 (~> 0.14.0) 21 + protocol-http2 (~> 0.14.0) 22 + async-http-faraday (0.11.0) 23 + async-http (~> 0.42) 24 + faraday 25 + async-io (1.32.2) 26 + async 27 + async-pool (0.3.9) 28 + async (>= 1.25) 29 + concurrent-ruby (1.1.9) 30 + console (1.14.0) 31 + fiber-local 32 + faraday (1.9.3) 33 + faraday-em_http (~> 1.0) 34 + faraday-em_synchrony (~> 1.0) 35 + faraday-excon (~> 1.1) 36 + faraday-httpclient (~> 1.0) 37 + faraday-multipart (~> 1.0) 38 + faraday-net_http (~> 1.0) 39 + faraday-net_http_persistent (~> 1.0) 40 + faraday-patron (~> 1.0) 41 + faraday-rack (~> 1.0) 42 + faraday-retry (~> 1.0) 43 + ruby2_keywords (>= 0.0.4) 44 + faraday-em_http (1.0.0) 45 + faraday-em_synchrony (1.0.0) 46 + faraday-excon (1.1.0) 47 + faraday-http-cache (2.2.0) 48 + faraday (>= 0.8) 49 + faraday-httpclient (1.0.1) 50 + faraday-multipart (1.0.3) 13 51 multipart-post (>= 1.2, < 3) 14 - faraday-http-cache (2.0.0) 15 - faraday (~> 0.8) 16 - github_changelog_generator (1.14.3) 52 + faraday-net_http (1.0.1) 53 + faraday-net_http_persistent (1.2.0) 54 + faraday-patron (1.0.0) 55 + faraday-rack (1.0.0) 56 + faraday-retry (1.0.3) 57 + fiber-local (1.0.0) 58 + github_changelog_generator (1.16.4) 17 59 activesupport 60 + async (>= 1.25.0) 61 + async-http-faraday 18 62 faraday-http-cache 19 63 multi_json 20 64 octokit (~> 4.6) 21 - rainbow (>= 2.1) 65 + rainbow (>= 2.2.1) 22 66 rake (>= 10.0) 23 - retriable (~> 2.1) 24 - i18n (1.2.0) 67 + i18n (1.8.11) 25 68 concurrent-ruby (~> 1.0) 26 - minitest (5.11.3) 27 - multi_json (1.13.1) 28 - multipart-post (2.0.0) 29 - octokit (4.13.0) 69 + minitest (5.15.0) 70 + multi_json (1.15.0) 71 + multipart-post (2.1.1) 72 + nio4r (2.5.8) 73 + octokit (4.22.0) 74 + faraday (>= 0.9) 30 75 sawyer (~> 0.8.0, >= 0.5.3) 31 - public_suffix (3.0.3) 32 - rainbow (3.0.0) 33 - rake (12.3.2) 34 - retriable (2.1.0) 35 - sawyer (0.8.1) 36 - addressable (>= 2.3.5, < 2.6) 37 - faraday (~> 0.8, < 1.0) 38 - thread_safe (0.3.6) 39 - tzinfo (1.2.5) 40 - thread_safe (~> 0.1) 76 + protocol-hpack (1.4.2) 77 + protocol-http (0.22.5) 78 + protocol-http1 (0.14.2) 79 + protocol-http (~> 0.22) 80 + protocol-http2 (0.14.2) 81 + protocol-hpack (~> 1.4) 82 + protocol-http (~> 0.18) 83 + public_suffix (4.0.6) 84 + rainbow (3.1.1) 85 + rake (13.0.6) 86 + ruby2_keywords (0.0.5) 87 + sawyer (0.8.2) 88 + addressable (>= 2.3.5) 89 + faraday (> 0.8, < 2.0) 90 + timers (4.3.3) 91 + tzinfo (2.0.4) 92 + concurrent-ruby (~> 1.0) 41 93 42 94 PLATFORMS 43 95 ruby 44 96 45 97 DEPENDENCIES 46 - github_changelog_generator (= 1.14.3) 98 + github_changelog_generator (= 1.16.4) 47 99 48 100 BUNDLED WITH 49 101 2.1.4

+307 -42

pkgs/development/tools/github-changelog-generator/gemset.nix

··· 1 1 { 2 2 activesupport = { 3 3 dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; 4 + groups = ["default"]; 5 + platforms = []; 4 6 source = { 5 7 remotes = ["https://rubygems.org"]; 6 - sha256 = "1iya7vxqwxysr74s7b4z1x19gmnx5advimzip3cbmsd5bd43wfgz"; 8 + sha256 = "02lys9pnb99hsczs551iqzjn008i8k7c728xxba7acfi9rdw9pa6"; 7 9 type = "gem"; 8 10 }; 9 - version = "5.2.2"; 11 + version = "7.0.1"; 10 12 }; 11 13 addressable = { 12 14 dependencies = ["public_suffix"]; 15 + groups = ["default"]; 16 + platforms = []; 13 17 source = { 14 18 remotes = ["https://rubygems.org"]; 15 - sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; 19 + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; 16 20 type = "gem"; 17 21 }; 18 - version = "2.5.2"; 22 + version = "2.8.0"; 23 + }; 24 + async = { 25 + dependencies = ["console" "nio4r" "timers"]; 26 + groups = ["default"]; 27 + platforms = []; 28 + source = { 29 + remotes = ["https://rubygems.org"]; 30 + sha256 = "0mdv66xn5xjyaidyrp66mfnx7d4habkbfmx9y57k75h5q6fd2b65"; 31 + type = "gem"; 32 + }; 33 + version = "1.30.1"; 34 + }; 35 + async-http = { 36 + dependencies = ["async" "async-io" "async-pool" "protocol-http" "protocol-http1" "protocol-http2"]; 37 + groups = ["default"]; 38 + platforms = []; 39 + source = { 40 + remotes = ["https://rubygems.org"]; 41 + sha256 = "0v3451bnn7rhgvl6ng0ys0dgm7cmyi3m41kmf5wyrpb83dhds13l"; 42 + type = "gem"; 43 + }; 44 + version = "0.56.5"; 45 + }; 46 + async-http-faraday = { 47 + dependencies = ["async-http" "faraday"]; 48 + groups = ["default"]; 49 + platforms = []; 50 + source = { 51 + remotes = ["https://rubygems.org"]; 52 + sha256 = "0ndynkfknabv6m9wzcmdnj4r4bhlxqkg9c6rzsjc1pk8q057kslv"; 53 + type = "gem"; 54 + }; 55 + version = "0.11.0"; 56 + }; 57 + async-io = { 58 + dependencies = ["async"]; 59 + groups = ["default"]; 60 + platforms = []; 61 + source = { 62 + remotes = ["https://rubygems.org"]; 63 + sha256 = "10l9m0x2ffvsaaxc4mfalrljjx13njkyir9w6yfif8wpszc291h8"; 64 + type = "gem"; 65 + }; 66 + version = "1.32.2"; 67 + }; 68 + async-pool = { 69 + dependencies = ["async"]; 70 + groups = ["default"]; 71 + platforms = []; 72 + source = { 73 + remotes = ["https://rubygems.org"]; 74 + sha256 = "02r6cyvralcv2yn1jj0plxynwr7rvxym13vlxd2wxk1bymfq9fd9"; 75 + type = "gem"; 76 + }; 77 + version = "0.3.9"; 19 78 }; 20 79 concurrent-ruby = { 80 + groups = ["default"]; 81 + platforms = []; 21 82 source = { 22 83 remotes = ["https://rubygems.org"]; 23 - sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1"; 84 + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; 24 85 type = "gem"; 25 86 }; 26 - version = "1.1.4"; 87 + version = "1.1.9"; 88 + }; 89 + console = { 90 + dependencies = ["fiber-local"]; 91 + groups = ["default"]; 92 + platforms = []; 93 + source = { 94 + remotes = ["https://rubygems.org"]; 95 + sha256 = "13ylq7x9zk79r79pssnjvby14shcyamwcbap842p9gvmkf7xblmr"; 96 + type = "gem"; 97 + }; 98 + version = "1.14.0"; 27 99 }; 28 100 faraday = { 29 - dependencies = ["multipart-post"]; 101 + dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; 102 + groups = ["default"]; 103 + platforms = []; 104 + source = { 105 + remotes = ["https://rubygems.org"]; 106 + sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6"; 107 + type = "gem"; 108 + }; 109 + version = "1.9.3"; 110 + }; 111 + faraday-em_http = { 112 + groups = ["default"]; 113 + platforms = []; 30 114 source = { 31 115 remotes = ["https://rubygems.org"]; 32 - sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0"; 116 + sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; 33 117 type = "gem"; 34 118 }; 35 - version = "0.15.4"; 119 + version = "1.0.0"; 120 + }; 121 + faraday-em_synchrony = { 122 + groups = ["default"]; 123 + platforms = []; 124 + source = { 125 + remotes = ["https://rubygems.org"]; 126 + sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; 127 + type = "gem"; 128 + }; 129 + version = "1.0.0"; 130 + }; 131 + faraday-excon = { 132 + groups = ["default"]; 133 + platforms = []; 134 + source = { 135 + remotes = ["https://rubygems.org"]; 136 + sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; 137 + type = "gem"; 138 + }; 139 + version = "1.1.0"; 36 140 }; 37 141 faraday-http-cache = { 38 142 dependencies = ["faraday"]; 143 + groups = ["default"]; 144 + platforms = []; 145 + source = { 146 + remotes = ["https://rubygems.org"]; 147 + sha256 = "0lhfwlk4mhmw9pdlgdsl2bq4x45w7s51jkxjryf18wym8iiw36g7"; 148 + type = "gem"; 149 + }; 150 + version = "2.2.0"; 151 + }; 152 + faraday-httpclient = { 153 + groups = ["default"]; 154 + platforms = []; 155 + source = { 156 + remotes = ["https://rubygems.org"]; 157 + sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; 158 + type = "gem"; 159 + }; 160 + version = "1.0.1"; 161 + }; 162 + faraday-multipart = { 163 + dependencies = ["multipart-post"]; 164 + groups = ["default"]; 165 + platforms = []; 166 + source = { 167 + remotes = ["https://rubygems.org"]; 168 + sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j"; 169 + type = "gem"; 170 + }; 171 + version = "1.0.3"; 172 + }; 173 + faraday-net_http = { 174 + groups = ["default"]; 175 + platforms = []; 176 + source = { 177 + remotes = ["https://rubygems.org"]; 178 + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; 179 + type = "gem"; 180 + }; 181 + version = "1.0.1"; 182 + }; 183 + faraday-net_http_persistent = { 184 + groups = ["default"]; 185 + platforms = []; 186 + source = { 187 + remotes = ["https://rubygems.org"]; 188 + sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; 189 + type = "gem"; 190 + }; 191 + version = "1.2.0"; 192 + }; 193 + faraday-patron = { 194 + groups = ["default"]; 195 + platforms = []; 39 196 source = { 40 197 remotes = ["https://rubygems.org"]; 41 - sha256 = "08j86fgcwl7z792qyijdsq680arzpfiydqd24ja405z2rbm7r2i0"; 198 + sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; 42 199 type = "gem"; 43 200 }; 44 - version = "2.0.0"; 201 + version = "1.0.0"; 202 + }; 203 + faraday-rack = { 204 + groups = ["default"]; 205 + platforms = []; 206 + source = { 207 + remotes = ["https://rubygems.org"]; 208 + sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; 209 + type = "gem"; 210 + }; 211 + version = "1.0.0"; 212 + }; 213 + faraday-retry = { 214 + groups = ["default"]; 215 + platforms = []; 216 + source = { 217 + remotes = ["https://rubygems.org"]; 218 + sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; 219 + type = "gem"; 220 + }; 221 + version = "1.0.3"; 222 + }; 223 + fiber-local = { 224 + groups = ["default"]; 225 + platforms = []; 226 + source = { 227 + remotes = ["https://rubygems.org"]; 228 + sha256 = "1vrxxb09fc7aicb9zb0pmn5akggjy21dmxkdl3w949y4q05rldr9"; 229 + type = "gem"; 230 + }; 231 + version = "1.0.0"; 45 232 }; 46 233 github_changelog_generator = { 47 - dependencies = ["activesupport" "faraday-http-cache" "multi_json" "octokit" "rainbow" "rake" "retriable"]; 234 + dependencies = ["activesupport" "async" "async-http-faraday" "faraday-http-cache" "multi_json" "octokit" "rainbow" "rake"]; 235 + groups = ["default"]; 236 + platforms = []; 48 237 source = { 49 238 remotes = ["https://rubygems.org"]; 50 - sha256 = "1ylqfmc78i6jf42ydkyng0gzvsl5w80wr3rjkhd6q4kgi96n70lr"; 239 + sha256 = "04d6z2ysq3gzvpw91lq8mxmdlqcxkmvp8rw9zrzkmksh3pjdzli1"; 51 240 type = "gem"; 52 241 }; 53 - version = "1.14.3"; 242 + version = "1.16.4"; 54 243 }; 55 244 i18n = { 56 245 dependencies = ["concurrent-ruby"]; 246 + groups = ["default"]; 247 + platforms = []; 57 248 source = { 58 249 remotes = ["https://rubygems.org"]; 59 - sha256 = "079sqshk08mqs3d6yzvshmqf4s175lpi2pp71f1p10l09sgmrixr"; 250 + sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; 60 251 type = "gem"; 61 252 }; 62 - version = "1.2.0"; 253 + version = "1.8.11"; 63 254 }; 64 255 minitest = { 256 + groups = ["default"]; 257 + platforms = []; 65 258 source = { 66 259 remotes = ["https://rubygems.org"]; 67 - sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; 260 + sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; 68 261 type = "gem"; 69 262 }; 70 - version = "5.11.3"; 263 + version = "5.15.0"; 71 264 }; 72 265 multi_json = { 266 + groups = ["default"]; 267 + platforms = []; 73 268 source = { 74 269 remotes = ["https://rubygems.org"]; 75 - sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; 270 + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; 76 271 type = "gem"; 77 272 }; 78 - version = "1.13.1"; 273 + version = "1.15.0"; 79 274 }; 80 275 multipart-post = { 276 + groups = ["default"]; 277 + platforms = []; 81 278 source = { 82 279 remotes = ["https://rubygems.org"]; 83 - sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; 280 + sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; 281 + type = "gem"; 282 + }; 283 + version = "2.1.1"; 284 + }; 285 + nio4r = { 286 + groups = ["default"]; 287 + platforms = []; 288 + source = { 289 + remotes = ["https://rubygems.org"]; 290 + sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; 84 291 type = "gem"; 85 292 }; 86 - version = "2.0.0"; 293 + version = "2.5.8"; 87 294 }; 88 295 octokit = { 89 - dependencies = ["sawyer"]; 296 + dependencies = ["faraday" "sawyer"]; 297 + groups = ["default"]; 298 + platforms = []; 90 299 source = { 91 300 remotes = ["https://rubygems.org"]; 92 - sha256 = "1yh0yzzqg575ix3y2l2261b9ag82gv2v4f1wczdhcmfbxcz755x6"; 301 + sha256 = "1nmdd7klyinvrrv2mggwwmc99ykaq7i379j00i37hvvaqx4giifj"; 93 302 type = "gem"; 94 303 }; 95 - version = "4.13.0"; 304 + version = "4.22.0"; 305 + }; 306 + protocol-hpack = { 307 + groups = ["default"]; 308 + platforms = []; 309 + source = { 310 + remotes = ["https://rubygems.org"]; 311 + sha256 = "0sd85am1hj2w7z5hv19wy1nbisxfr1vqx3wlxjfz9xy7x7s6aczw"; 312 + type = "gem"; 313 + }; 314 + version = "1.4.2"; 315 + }; 316 + protocol-http = { 317 + groups = ["default"]; 318 + platforms = []; 319 + source = { 320 + remotes = ["https://rubygems.org"]; 321 + sha256 = "0lhg47b3w1d6pdwdkyha8ijzfhjrh90snwydkhwfnl5r10dd9cg5"; 322 + type = "gem"; 323 + }; 324 + version = "0.22.5"; 325 + }; 326 + protocol-http1 = { 327 + dependencies = ["protocol-http"]; 328 + groups = ["default"]; 329 + platforms = []; 330 + source = { 331 + remotes = ["https://rubygems.org"]; 332 + sha256 = "0z56p7zqbyvwlrsbs19knny4v9f7ycsgblhv50ar8wgyifvsddf6"; 333 + type = "gem"; 334 + }; 335 + version = "0.14.2"; 336 + }; 337 + protocol-http2 = { 338 + dependencies = ["protocol-hpack" "protocol-http"]; 339 + groups = ["default"]; 340 + platforms = []; 341 + source = { 342 + remotes = ["https://rubygems.org"]; 343 + sha256 = "1a9klpfmi7w465zq5xz8y8h1qvj42hkm0qd0nlws9d2idd767q5j"; 344 + type = "gem"; 345 + }; 346 + version = "0.14.2"; 96 347 }; 97 348 public_suffix = { 349 + groups = ["default"]; 350 + platforms = []; 98 351 source = { 99 352 remotes = ["https://rubygems.org"]; 100 - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; 353 + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; 101 354 type = "gem"; 102 355 }; 103 - version = "3.0.3"; 356 + version = "4.0.6"; 104 357 }; 105 358 rainbow = { 359 + groups = ["default"]; 360 + platforms = []; 106 361 source = { 107 362 remotes = ["https://rubygems.org"]; 108 - sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; 363 + sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; 109 364 type = "gem"; 110 365 }; 111 - version = "3.0.0"; 366 + version = "3.1.1"; 112 367 }; 113 368 rake = { 369 + groups = ["default"]; 370 + platforms = []; 114 371 source = { 115 372 remotes = ["https://rubygems.org"]; 116 - sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn"; 373 + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; 117 374 type = "gem"; 118 375 }; 119 - version = "12.3.2"; 376 + version = "13.0.6"; 120 377 }; 121 - retriable = { 378 + ruby2_keywords = { 379 + groups = ["default"]; 380 + platforms = []; 122 381 source = { 123 382 remotes = ["https://rubygems.org"]; 124 - sha256 = "1123kqmy3yk7k3vidvcwa46lknmhilv8axpaiag1wifa576hkqy1"; 383 + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; 125 384 type = "gem"; 126 385 }; 127 - version = "2.1.0"; 386 + version = "0.0.5"; 128 387 }; 129 388 sawyer = { 130 389 dependencies = ["addressable" "faraday"]; 390 + groups = ["default"]; 391 + platforms = []; 131 392 source = { 132 393 remotes = ["https://rubygems.org"]; 133 - sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd"; 394 + sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz"; 134 395 type = "gem"; 135 396 }; 136 - version = "0.8.1"; 397 + version = "0.8.2"; 137 398 }; 138 - thread_safe = { 399 + timers = { 400 + groups = ["default"]; 401 + platforms = []; 139 402 source = { 140 403 remotes = ["https://rubygems.org"]; 141 - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; 404 + sha256 = "00xdi97gm01alfqhjgvv5sff9n1n2l6aym69s9jh8l9clg63b0jc"; 142 405 type = "gem"; 143 406 }; 144 - version = "0.3.6"; 407 + version = "4.3.3"; 145 408 }; 146 409 tzinfo = { 147 - dependencies = ["thread_safe"]; 410 + dependencies = ["concurrent-ruby"]; 411 + groups = ["default"]; 412 + platforms = []; 148 413 source = { 149 414 remotes = ["https://rubygems.org"]; 150 - sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; 415 + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; 151 416 type = "gem"; 152 417 }; 153 - version = "1.2.5"; 418 + version = "2.0.4"; 154 419 }; 155 420 }

+9 -2

pkgs/os-specific/linux/kvmfr/default.nix

··· 1 - { lib, stdenv, fetchFromGitHub, kernel, kmod, looking-glass-client }: 1 + { lib, stdenv, fetchFromGitHub, fetchpatch, kernel, kmod, looking-glass-client }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "kvmfr"; ··· 8 8 sourceRoot = "source/module"; 9 9 hardeningDisable = [ "pic" "format" ]; 10 10 nativeBuildInputs = kernel.moduleBuildDependencies; 11 + 12 + patches = lib.optional (kernel.kernelAtLeast "5.16") (fetchpatch { 13 + name = "kvmfr-5.16.patch"; 14 + url = "https://github.com/gnif/LookingGlass/commit/a9b5302a517e19d7a2da114acf71ef1e69cfb497.patch"; 15 + sha256 = "017nxlk2f7kyjp6llwa74dbczdb1jk8v791qld81dxhzkm9dyqqx"; 16 + stripLen = 1; 17 + }); 11 18 12 19 makeFlags = [ 13 20 "KVER=${kernel.modDirVersion}" ··· 28 35 license = licenses.gpl2Plus; 29 36 maintainers = with maintainers; [ j-brn ]; 30 37 platforms = [ "x86_64-linux" ]; 31 - broken = kernel.kernelOlder "5.3" || kernel.kernelAtLeast "5.16"; 38 + broken = kernel.kernelOlder "5.3"; 32 39 }; 33 40 }

+1 -1

pkgs/servers/nats-server/default.nix

··· 18 18 meta = { 19 19 description = "High-Performance server for NATS"; 20 20 license = licenses.asl20; 21 - maintainers = [ maintainers.swdunlop ]; 21 + maintainers = with maintainers; [ swdunlop derekcollison ]; 22 22 homepage = "https://nats.io/"; 23 23 }; 24 24 }

+39

pkgs/servers/timetagger/default.nix

··· 1 + { lib 2 + , pkgs 3 + , python3Packages 4 + , fetchFromGitHub 5 + 6 + , addr ? "127.0.0.1" 7 + , port ? 8082 8 + }: 9 + 10 + # 11 + # Timetagger itself is a library that a user must write a "run.py" script for 12 + # We provide a basic "run.py" script with this package, which simply starts 13 + # timetagger. 14 + # 15 + 16 + let 17 + tt = python3Packages.timetagger; 18 + in 19 + python3Packages.buildPythonPackage rec { 20 + pname = tt.name; 21 + version = tt.version; 22 + src = tt.src; 23 + meta = tt.meta; 24 + 25 + propagatedBuildInputs = [ tt ] 26 + ++ (with python3Packages; [ 27 + setuptools 28 + ]); 29 + 30 + format = "custom"; 31 + installPhase = '' 32 + mkdir -p $out/bin 33 + echo "#!${pkgs.python3}/bin/python3" >> $out/bin/timetagger 34 + cat run.py >> $out/bin/timetagger 35 + sed -Ei 's,0\.0\.0\.0:80,${addr}:${toString port},' $out/bin/timetagger 36 + chmod +x $out/bin/timetagger 37 + ''; 38 + } 39 +

+4 -4

pkgs/servers/xmpp/prosody/default.nix

··· 20 20 ); 21 21 in 22 22 stdenv.mkDerivation rec { 23 - version = "0.11.10"; # also update communityModules 23 + version = "0.11.12"; # also update communityModules 24 24 pname = "prosody"; 25 25 # The following community modules are necessary for the nixos module 26 26 # prosody module to comply with XEP-0423 and provide a working ··· 34 34 ]; 35 35 src = fetchurl { 36 36 url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; 37 - sha256 = "1q84s9cq7cgzd295qxa2iy0r3vd3v3chbck62bdx3pd6skk19my6"; 37 + sha256 = "03an206bl3h2lqcgv1wfvc2bqjq6m9vjb2idw0vyvczm43c55kan"; 38 38 }; 39 39 40 40 # A note to all those merging automated updates: Please also update this ··· 42 42 # version. 43 43 communityModules = fetchhg { 44 44 url = "https://hg.prosody.im/prosody-modules"; 45 - rev = "64fafbeba14d"; 46 - sha256 = "02gj1b8sdmdvymsdmjpq47zrl7sg578jcdxbbq18s44f3njmc9q1"; 45 + rev = "bd0a1f917d98"; 46 + sha256 = "0figx0b0y5zfk5anf16h20y4crjmpb6bkg30vl7p0m594qnyqjcx"; 47 47 }; 48 48 49 49 nativeBuildInputs = [ makeWrapper ];

+1

pkgs/tools/misc/hidrd/default.nix

··· 19 19 license = licenses.gpl2Plus; 20 20 maintainers = with maintainers; [ pacien ]; 21 21 platforms = platforms.all; 22 + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/hidrd.x86_64-darwin 22 23 }; 23 24 }

+2 -2

pkgs/tools/security/exploitdb/default.nix

··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "exploitdb"; 5 - version = "2022-01-11"; 5 + version = "2022-01-14"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "offensive-security"; 9 9 repo = pname; 10 10 rev = version; 11 - sha256 = "sha256-uvjn/n+w5Zv/RwvQmE7bl4PFXdN2OO6FrrEVKdGNsgo="; 11 + sha256 = "sha256-/Id3cAz+upJPHzNcTnbO02AehS6R9YTz9Ff+1fc7NJs="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ makeWrapper ];

+3 -3

pkgs/tools/security/jwt-cli/default.nix

··· 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "jwt-cli"; 5 - version = "5.0.0"; 5 + version = "5.0.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "mike-engel"; 9 9 repo = pname; 10 10 rev = version; 11 - sha256 = "0za4mpzry6i5gki524kp4by0n74pbc96cvzrkq286v8w033wj01i"; 11 + sha256 = "08yynwmn1kzanabiqzysyk9jbn0zyjjlilj4b4j5m29hfykq1jvf"; 12 12 }; 13 13 14 - cargoSha256 = "1l5fhr5c2ygdlnpwsx62fm8di8li0wf15nvvcnnivjcic7f9b5j0"; 14 + cargoSha256 = "19rbmiy71hgybzfwpz4msqqgl98qv9c3x06mjcpmixq4qhgxz616"; 15 15 16 16 buildInputs = lib.optional stdenv.isDarwin Security; 17 17

+3 -5

pkgs/top-level/all-packages.nix

··· 10214 10214 10215 10215 timetrap = callPackage ../applications/office/timetrap { }; 10216 10216 10217 + timetagger = callPackage ../servers/timetagger { }; 10218 + 10217 10219 timekeeper = callPackage ../applications/office/timekeeper { }; 10218 10220 10219 10221 timezonemap = callPackage ../development/libraries/timezonemap { }; ··· 13546 13548 love_0_8 = callPackage ../development/interpreters/love/0.8.nix { lua=lua5_1; }; 13547 13549 love_0_9 = callPackage ../development/interpreters/love/0.9.nix { }; 13548 13550 love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; 13549 - love_11 = callPackage ../development/interpreters/love/11.1.nix { }; 13551 + love_11 = callPackage ../development/interpreters/love/11.nix { }; 13550 13552 love = love_0_10; 13551 13553 13552 13554 wabt = callPackage ../development/tools/wabt { }; ··· 29766 29768 }; 29767 29769 29768 29770 xiphos = callPackage ../applications/misc/xiphos { 29769 - gconf = gnome2.GConf; 29770 - inherit (gnome2) libglade scrollkeeper; 29771 29771 gtkhtml = gnome2.gtkhtml4; 29772 - python = python27; 29773 - enchant = enchant2; 29774 29772 }; 29775 29773 29776 29774 xournal = callPackage ../applications/graphics/xournal {

+10

pkgs/top-level/python-packages.nix

··· 634 634 635 635 asgi-csrf = callPackage ../development/python-modules/asgi-csrf { }; 636 636 637 + asgineer = callPackage ../development/python-modules/asgineer { }; 638 + 637 639 asgiref = callPackage ../development/python-modules/asgiref { }; 638 640 639 641 asmog = callPackage ../development/python-modules/asmog { }; ··· 4055 4057 4056 4058 itemadapter = callPackage ../development/python-modules/itemadapter { }; 4057 4059 4060 + itemdb = callPackage ../development/python-modules/itemdb { }; 4061 + 4058 4062 itemloaders = callPackage ../development/python-modules/itemloaders { }; 4059 4063 4060 4064 iterm2 = callPackage ../development/python-modules/iterm2 { }; ··· 6332 6336 6333 6337 psautohint = callPackage ../development/python-modules/psautohint { }; 6334 6338 6339 + pscript = callPackage ../development/python-modules/pscript { }; 6340 + 6335 6341 psd-tools = callPackage ../development/python-modules/psd-tools { }; 6336 6342 6337 6343 psutil = callPackage ../development/python-modules/psutil { }; ··· 7693 7699 pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { }; 7694 7700 7695 7701 pytest-localserver = callPackage ../development/python-modules/pytest-localserver { }; 7702 + 7703 + pytest-logdog = callPackage ../development/python-modules/pytest-logdog{ }; 7696 7704 7697 7705 pytest-metadata = callPackage ../development/python-modules/pytest-metadata { }; 7698 7706 ··· 9712 9720 time-machine = callPackage ../development/python-modules/time-machine { }; 9713 9721 9714 9722 timeout-decorator = callPackage ../development/python-modules/timeout-decorator { }; 9723 + 9724 + timetagger = callPackage ../development/python-modules/timetagger { }; 9715 9725 9716 9726 timezonefinder = callPackage ../development/python-modules/timezonefinder { }; 9717 9727