diff --git a/lib/modules.nix b/lib/modules.nix index 1e48f5440798..7f1646e9b8bc 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -266,6 +266,15 @@ rec { turned off. ''; }; + + _module.specialArgs = mkOption { + readOnly = true; + internal = true; + description = '' + Externally provided module arguments that can't be modified from + within a configuration, but can be used in module imports. + ''; + }; }; config = { @@ -273,6 +282,7 @@ rec { inherit extendModules; moduleType = type; }; + _module.specialArgs = specialArgs; }; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2847b88ac057..ea6c70d8c6db 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9682,6 +9682,12 @@ githubId = 1237862; name = "Ollie Bunting"; }; + oluceps = { + email = "nixos@oluceps.uk"; + github = "oluceps"; + githubId = 35628088; + name = "oluceps"; + }; olynch = { email = "owen@olynch.me"; github = "olynch"; diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index b031ff2f2be2..09f6d8443bbc 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -1,4 +1,4 @@ -{ config, options, lib, pkgs, utils, modules, baseModules, extraModules, modulesPath, ... }: +{ config, options, lib, pkgs, utils, modules, baseModules, extraModules, modulesPath, specialArgs, ... }: with lib; @@ -7,9 +7,6 @@ let cfg = config.documentation; allOpts = options; - /* Modules for which to show options even when not imported. */ - extraDocModules = [ ../virtualisation/qemu-vm.nix ]; - canCacheDocs = m: let f = import m; @@ -23,7 +20,7 @@ let docModules = let - p = partition canCacheDocs (baseModules ++ extraDocModules); + p = partition canCacheDocs (baseModules ++ cfg.nixos.extraModules); in { lazy = p.right; @@ -41,7 +38,7 @@ let modules = [ { _module.check = false; } ] ++ docModules.eager; - specialArgs = { + specialArgs = specialArgs // { pkgs = scrubDerivations "pkgs" pkgs; # allow access to arbitrary options for eager modules, eg for getting # option types from lazy modules @@ -145,6 +142,12 @@ in { imports = [ + ./man-db.nix + ./mandoc.nix + ./assertions.nix + ./meta.nix + ../config/system-path.nix + ../system/etc/etc.nix (mkRenamedOptionModule [ "programs" "info" "enable" ] [ "documentation" "info" "enable" ]) (mkRenamedOptionModule [ "programs" "man" "enable" ] [ "documentation" "man" "enable" ]) (mkRenamedOptionModule [ "services" "nixosManual" "enable" ] [ "documentation" "nixos" "enable" ]) @@ -236,6 +239,14 @@ in ''; }; + nixos.extraModules = mkOption { + type = types.listOf types.raw; + default = []; + description = '' + Modules for which to show options even when not imported. + ''; + }; + nixos.options.splitBuild = mkOption { type = types.bool; default = true; @@ -327,10 +338,6 @@ in environment.systemPackages = [] ++ optional cfg.man.enable manual.manpages ++ optionals cfg.doc.enable [ manual.manualHTML nixos-help ]; - - services.getty.helpLine = mkIf cfg.doc.enable ( - "\nRun 'nixos-help' for the NixOS manual." - ); }) ]); diff --git a/nixos/modules/misc/documentation/test-dummy.chapter.xml b/nixos/modules/misc/documentation/test-dummy.chapter.xml new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/nixos/modules/misc/documentation/test.nix b/nixos/modules/misc/documentation/test.nix new file mode 100644 index 000000000000..1eaa63b1fb6c --- /dev/null +++ b/nixos/modules/misc/documentation/test.nix @@ -0,0 +1,49 @@ +{ nixosLib, pkgsModule, runCommand }: + +let + sys = nixosLib.evalModules rec { + modules = [ + pkgsModule + ../documentation.nix + ../version.nix + + ({ lib, someArg, ... }: { + # Make sure imports from specialArgs are respected + imports = [ someArg.myModule ]; + + # TODO test this + meta.doc = ./test-dummy.chapter.xml; + }) + + { + _module.args = { + baseModules = [ + ../documentation.nix + ../version.nix + ]; + extraModules = [ ]; + inherit modules; + }; + documentation.nixos.includeAllModules = true; + } + ]; + specialArgs.someArg.myModule = { lib, ... }: { + options.foobar = lib.mkOption { + type = lib.types.str; + description = "The foobar option was added via specialArgs"; + default = "qux"; + }; + }; + }; + +in +runCommand "documentation-check" +{ + inherit (sys.config.system.build.manual) optionsJSON; +} '' + json="$optionsJSON/share/doc/nixos/options.json" + echo checking $json + + grep 'The foobar option was added via specialArgs' <"$json" >/dev/null + touch $out +'' diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index bdc3e5623be6..b3cdaf5568d4 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -38,12 +38,19 @@ let in { imports = [ + ./label.nix (mkRenamedOptionModule [ "system" "nixosVersion" ] [ "system" "nixos" "version" ]) (mkRenamedOptionModule [ "system" "nixosVersionSuffix" ] [ "system" "nixos" "versionSuffix" ]) (mkRenamedOptionModule [ "system" "nixosRevision" ] [ "system" "nixos" "revision" ]) (mkRenamedOptionModule [ "system" "nixosLabel" ] [ "system" "nixos" "label" ]) ]; + options.boot.initrd.osRelease = mkOption { + internal = true; + readOnly = true; + default = initrdRelease; + }; + options.system = { nixos.version = mkOption { @@ -142,11 +149,6 @@ in "os-release".text = attrsToText osReleaseContents; }; - boot.initrd.systemd.contents = { - "/etc/os-release".source = initrdRelease; - "/etc/initrd-release".source = initrdRelease; - }; - # We have to use `warnings` because when warning in the default of the option # the warning would also be shown when building the manual since the manual # has to evaluate the default. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2c3e40ec465a..4c51210bc200 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1287,4 +1287,5 @@ ./virtualisation/waydroid.nix ./virtualisation/xen-dom0.nix ./virtualisation/xe-guest-utilities.nix + { documentation.nixos.extraModules = [ ./virtualisation/qemu-vm.nix ]; } ] diff --git a/nixos/modules/services/ttys/getty.nix b/nixos/modules/services/ttys/getty.nix index d2bebb9c245b..e8efe72577c5 100644 --- a/nixos/modules/services/ttys/getty.nix +++ b/nixos/modules/services/ttys/getty.nix @@ -104,6 +104,7 @@ in # Note: this is set here rather than up there so that changing # nixos.label would not rebuild manual pages services.getty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixos.label} (\m) - \l >>>''; + services.getty.helpLine = mkIf (config.documentation.nixos.enable && config.documentation.doc.enable) "\nRun 'nixos-help' for the NixOS manual."; systemd.services."getty@" = { serviceConfig.ExecStart = [ diff --git a/nixos/modules/services/web-apps/snipe-it.nix b/nixos/modules/services/web-apps/snipe-it.nix index 3059e67cb43b..e2562ddd9854 100644 --- a/nixos/modules/services/web-apps/snipe-it.nix +++ b/nixos/modules/services/web-apps/snipe-it.nix @@ -472,6 +472,7 @@ in { "d ${cfg.dataDir}/storage/framework/views 0700 ${user} ${group} - -" "d ${cfg.dataDir}/storage/logs 0700 ${user} ${group} - -" "d ${cfg.dataDir}/storage/uploads 0700 ${user} ${group} - -" + "d ${cfg.dataDir}/storage/private_uploads 0700 ${user} ${group} - -" ]; users = { diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 5c39de0dde74..2c4b0b8f3ba3 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -188,7 +188,7 @@ in runUsingSystemd = mkOption { description = lib.mdDoc "Use systemd to manage the Plasma session"; type = types.bool; - default = false; + default = true; }; excludePackages = mkOption { diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 4e56b393e2e5..52083dcaaa25 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -21,6 +21,7 @@ in ./fluxbox.nix ./fvwm2.nix ./fvwm3.nix + ./hackedbox.nix ./herbstluftwm.nix ./i3.nix ./jwm.nix diff --git a/nixos/modules/services/x11/window-managers/hackedbox.nix b/nixos/modules/services/x11/window-managers/hackedbox.nix new file mode 100644 index 000000000000..641cf1bdcbe2 --- /dev/null +++ b/nixos/modules/services/x11/window-managers/hackedbox.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.hackedbox; +in +{ + ###### interface + options = { + services.xserver.windowManager.hackedbox.enable = mkEnableOption "hackedbox"; + }; + + ###### implementation + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { + name = "hackedbox"; + start = '' + ${pkgs.hackedbox}/bin/hackedbox & + waitPID=$! + ''; + }; + environment.systemPackages = [ pkgs.hackedbox ]; + }; +} diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 0351453a6587..888653469ed7 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -374,6 +374,9 @@ in { ''; "/etc/modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases; + "/etc/os-release".source = config.boot.initrd.osRelease; + "/etc/initrd-release".source = config.boot.initrd.osRelease; + }; storePaths = [ diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 06210095cfce..affb179a92d3 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -127,6 +127,7 @@ in { docker-tools-cross = handleTestOn ["x86_64-linux" "aarch64-linux"] ./docker-tools-cross.nix {}; docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {}; documize = handleTest ./documize.nix {}; + documentation = pkgs.callPackage ../modules/misc/documentation/test.nix { inherit nixosLib; }; doh-proxy-rust = handleTest ./doh-proxy-rust.nix {}; dokuwiki = handleTest ./dokuwiki.nix {}; domination = handleTest ./domination.nix {}; diff --git a/pkgs/applications/audio/audacious/0001-Set-plugindir-to-PREFIX-lib-audacious.patch b/pkgs/applications/audio/audacious/0001-Set-plugindir-to-PREFIX-lib-audacious.patch new file mode 100644 index 000000000000..49f1208eb117 --- /dev/null +++ b/pkgs/applications/audio/audacious/0001-Set-plugindir-to-PREFIX-lib-audacious.patch @@ -0,0 +1,25 @@ +From b64b03be9edf23a80fce0c76de61ffff0914ddce Mon Sep 17 00:00:00 2001 +From: Thiago Kenji Okada +Date: Mon, 8 Aug 2022 10:28:33 +0100 +Subject: [PATCH] Set plugindir to $PREFIX/lib/audacious + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 3f7996f72..ab09d6476 100644 +--- a/meson.build ++++ b/meson.build +@@ -160,7 +160,7 @@ if (cxx.has_header('libintl.h')) + endif + + +-install_plugindir = audacious_dep.get_variable(pkgconfig: 'plugin_dir') ++install_plugindir = join_paths(get_option('prefix'), 'lib/audacious') + + + conf.set_quoted('INSTALL_PLUGINDIR', install_plugindir) +-- +2.36.0 + diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 7ccdc4eced67..eb404041d973 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,15 +1,16 @@ -{ - mkDerivation, lib, fetchurl, fetchpatch, - gettext, pkg-config, - qtbase, - alsa-lib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b, - libcddb, libcdio, libcdio-paranoia, libcue, libjack2, libmad, libmms, libmodplug, - libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp, - libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr, - wavpack, libopenmpt +{ lib +, stdenv +, audacious-plugins +, fetchurl +, gettext +, meson +, ninja +, pkg-config +, qtbase +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "audacious"; version = "4.2"; @@ -17,54 +18,39 @@ mkDerivation rec { url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; sha256 = "sha256-/rME5HCkgf4rPEyhycs7I+wmJUDBLQ0ebCKl62JeBLM="; }; - pluginsSrc = fetchurl { - url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "sha256-b6D2nDoQQeuHfDcQlROrSioKVqd9nowToVgc8UOaQX8="; - }; - nativeBuildInputs = [ gettext pkg-config ]; - - buildInputs = [ - # Core dependencies - qtbase - - # Plugin dependencies - alsa-lib curl faad2 ffmpeg flac fluidsynth gdk-pixbuf lame libbs2b libcddb - libcdio libcdio-paranoia libcue libjack2 libmad libmms libmodplug libmowgli - libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile - libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack - libopenmpt + nativeBuildInputs = [ + gettext + meson + ninja + pkg-config + wrapQtAppsHook ]; - configureFlags = [ "--disable-gtk" ]; + buildInputs = [ + qtbase + ]; - # Here we build both audacious and audacious-plugins in one - # derivation, since they really expect to be in the same prefix. - # This is slighly tricky. - builder = builtins.toFile "builder.sh" '' - # First build audacious. - ( - source $stdenv/setup - genericBuild - ) - # Then build the plugins. - ( - nativeBuildInputs="$out $nativeBuildInputs" # to find audacious - source $stdenv/setup - rm -rfv audacious-* - src=$pluginsSrc - genericBuild - ) + mesonFlags = [ + "-Dgtk=false" + "-Dbuildstamp=NixOS" + ]; + + postInstall = lib.optionalString (audacious-plugins != null) '' + ln -s ${audacious-plugins}/lib/audacious $out/lib ''; meta = with lib; { - description = "Audio player"; + description = "A lightweight and versatile audio player"; homepage = "https://audacious-media-player.org/"; - maintainers = with maintainers; [ eelco ramkromberg ttuegel ]; + maintainers = with maintainers; [ eelco ramkromberg ttuegel thiagokokada ]; platforms = with platforms; linux; license = with licenses; [ - bsd2 bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING - gpl2 gpl3 lgpl2Plus #http://redmine.audacious-media-player.org/issues/46 + bsd2 + bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING + gpl2 + gpl3 + lgpl2Plus #http://redmine.audacious-media-player.org/issues/46 ]; }; } diff --git a/pkgs/applications/audio/audacious/plugins.nix b/pkgs/applications/audio/audacious/plugins.nix new file mode 100644 index 000000000000..902140465334 --- /dev/null +++ b/pkgs/applications/audio/audacious/plugins.nix @@ -0,0 +1,111 @@ +{ stdenv +, fetchurl +, alsa-lib +, audacious +, curl +, faad2 +, ffmpeg +, flac +, fluidsynth +, gdk-pixbuf +, gettext +, lame +, libbs2b +, libcddb +, libcdio +, libcdio-paranoia +, libcue +, libjack2 +, libmad +, libmms +, libmodplug +, libmowgli +, libnotify +, libogg +, libopenmpt +, libpulseaudio +, libsamplerate +, libsidplayfp +, libsndfile +, libvorbis +, libxml2 +, lirc +, meson +, mpg123 +, neon +, ninja +, pkg-config +, qtbase +, qtmultimedia +, qtx11extras +, soxr +, wavpack +}: + +stdenv.mkDerivation rec { + pname = "audacious-plugins"; + version = "4.2"; + + src = fetchurl { + url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; + sha256 = "sha256-b6D2nDoQQeuHfDcQlROrSioKVqd9nowToVgc8UOaQX8="; + }; + + patches = [ ./0001-Set-plugindir-to-PREFIX-lib-audacious.patch ]; + + nativeBuildInputs = [ + gettext + meson + ninja + pkg-config + ]; + + buildInputs = [ + audacious + alsa-lib + curl + faad2 + ffmpeg + flac + fluidsynth + gdk-pixbuf + lame + libbs2b + libcddb + libcdio + libcdio-paranoia + libcue + libjack2 + libmad + libmms + libmodplug + libmowgli + libnotify + libogg + libpulseaudio + libsamplerate + libsidplayfp + libsndfile + libvorbis + libxml2 + lirc + mpg123 + neon + qtbase + qtmultimedia + qtx11extras + soxr + wavpack + libopenmpt + ]; + + mesonFlags = [ + "-Dgtk=false" + ]; + + dontWrapQtApps = true; + + meta = audacious.meta // { + description = "Plugins for Audacious music player"; + }; +} diff --git a/pkgs/applications/audio/radioboat/default.nix b/pkgs/applications/audio/radioboat/default.nix index f96339848dda..e12152715207 100644 --- a/pkgs/applications/audio/radioboat/default.nix +++ b/pkgs/applications/audio/radioboat/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "radioboat"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "slashformotion"; repo = "radioboat"; rev = "v${version}"; - sha256 = "sha256-ZAKTWmK3hCJxm/578cjtdgMA2ZRhCFtzfGdta0gmuFY="; + sha256 = "sha256-e6SZv5gb7NOpCU3blFsH7A6ETWL8QlxtpDmmk8DKn8I="; }; vendorSha256 = "sha256-X3KiqaiOQYQBfVckh50C+4oxIVN6gXyNuQtBwGvjdFQ="; diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 0a8414a96643..942c411762b7 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.6.1"; + version = "1.6.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-lz42emfVBWas1A2YuEkjGAX8V1Qe2YAZMEgMYwIhhKM="; + sha256 = "sha256-790/XBeFS1iM73WuBMXcEoB3gjBlU1dMPRwtQNB7taE="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index a99f04a4f90f..4dcbafb87d0e 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -106,18 +106,18 @@ }) (fetchNuGet { pname = "Fido2.AspNet"; - version = "2.0.1"; - sha256 = "1d6bjyck3mlhb9b4c75xhzr2pcs47vdqg2ayi5wnjh1aszyam3nq"; + version = "2.0.2"; + sha256 = "0x2k1wyd0p7cy4ir15m2bxiggckl98znc65b4vq75ckjyd6dm1a1"; }) (fetchNuGet { pname = "Fido2.Models"; - version = "2.0.1"; - sha256 = "0llpzkik82n5gpgjawx181j85d2lizimkbdkxj1wyrjvxb2xbg3q"; + version = "2.0.2"; + sha256 = "1vk4h9sv2dhdr0jvh2a7yk6v9rhxk9y8hxz4mkal8vd9psajz5cg"; }) (fetchNuGet { pname = "Fido2"; - version = "2.0.1"; - sha256 = "1s829n970lxngbhac9lvarwa9n9hqxr79kwv8i12amnmg6ir8ny5"; + version = "2.0.2"; + sha256 = "1wqlk48apm7h637da7sav0r1a8yz2yy2gxhifpvydjqk1n3qybz4"; }) (fetchNuGet { pname = "Google.Api.Gax.Rest"; @@ -209,11 +209,6 @@ version = "2.4.3"; sha256 = "1whxcmxydcxjkw84sqk5idd406v3ia0xj2m4ia4b6wqbvkdqn7rf"; }) - (fetchNuGet { - pname = "Microsoft.AspNet.WebApi.Client"; - version = "5.2.7"; - sha256 = "1j0wbdmycj5xbk06p32f7xrddc40sbj3yca4d7ywg611yk26mvi1"; - }) (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; @@ -226,13 +221,13 @@ }) (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; - version = "6.0.1"; - sha256 = "1mj04ynr6bxvmq9nrggi832n8hbcr9j9kjr9y2rgiq91y6skzg37"; + version = "6.0.7"; + sha256 = "0g9n5f0p9grjl1fzd7h6dd4ywkc1r7irqyjslkrrvnjqzqg7a2mp"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; - version = "6.0.1"; - sha256 = "0aqaviwbnwg0vpwwdbif7b9ncpckwpclm77l3ac11s8fsq3vb3sm"; + version = "6.0.7"; + sha256 = "0n6l22yp6qrq3wjgkgrlxf5zmpcx0cz8s9hh99g6i88fmhav7dxh"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Abstractions"; @@ -271,33 +266,33 @@ }) (fetchNuGet { pname = "Microsoft.AspNetCore.Identity.EntityFrameworkCore"; - version = "6.0.1"; - sha256 = "1j9z0xzj2hlffhg28ijp33flljq75js8dvlchbpggvvd789hm4il"; + version = "6.0.7"; + sha256 = "1sygbi88w9kkypq3nr7i81mxll8xdnjw9dp6h1dyyr7wr37yhr81"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; - version = "6.0.1"; - sha256 = "0rsqng2b8a3zaha9c2x1195das5wwvmnz31xf14ancgha4lxq68r"; + version = "6.0.7"; + sha256 = "0l235hs1j24iqvk79p95sfrsfbj6l2kb10x9zi34jinvldyn5ln6"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; - version = "6.0.1"; - sha256 = "179b2774s68im71r32lv4nydcp586x86zggs8ml6jcfjrd9fs5b1"; + version = "6.0.7"; + sha256 = "08g3aq8gn917r55hnx1i36jfwy51311yns0x6wpvs9d2y4ncygk4"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor.Extensions"; - version = "6.0.1"; - sha256 = "1grhlksdd7mwv72g78kx86mzba8mgza3i53x9jv16bkc1wxqwfcd"; + version = "6.0.7"; + sha256 = "0zsyqfywa6c01aflqdj4bc8cdwlcz4xiafkn6f07xbsl3p9v0lk5"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"; - version = "6.0.1"; - sha256 = "0778xw230flwqkjjydp73gb6r3brrlqwqdrf4m0b92b083bysh59"; + version = "6.0.7"; + sha256 = "1bfrdwvz12fs31pdjxhj8arjw8pvawsp64wlj2sfmll7q3618jgp"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.Language"; - version = "6.0.1"; - sha256 = "11spvrnp2mz5kc11ycv2wpgn8bilwpinbl6vkvvr7jjrqlm36lk1"; + version = "6.0.7"; + sha256 = "0757507ivh8q6xfrbihnhnfya0g4wd5j033i2fcsinfyn576wc8c"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; @@ -324,6 +319,11 @@ version = "3.3.2"; sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4"; }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Analyzers"; + version = "3.3.3"; + sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; + }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.0.0"; @@ -331,8 +331,8 @@ }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; - version = "4.0.1"; - sha256 = "0axjv1nhk1z9d4c51d9yxdp09l8yqqnqaifhqcwnxnv0r4y5cka9"; + version = "4.2.0"; + sha256 = "0ld6xxgaqc3c6zgyimlvpgrxncsykbz8irqs01jyj40rv150kp8s"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; @@ -341,18 +341,18 @@ }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; - version = "4.0.1"; - sha256 = "1h6jfifg7pw2vacpdds4v4jqnaydg9b108irf315wzx6rh8yv9cb"; + version = "4.2.0"; + sha256 = "0i1c7055j3f5k1765bl66amp72dcw0zapczfszdldbg91iqmmkxg"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Razor"; - version = "6.0.1"; - sha256 = "0dwwhiv28wyzq3177qg961ll2q3ggiw2k0zdashgym5cl67p93lm"; + version = "6.0.7"; + sha256 = "1jnwch6vb7v95q005wq2z7fv5pisbdi2yn0n9hmxwz3kaiqcqjdm"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; - version = "17.0.0"; - sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; + version = "17.2.0"; + sha256 = "018yl113i037m5qhm3z6csb0c4l8kj412dxw2dagdbj07qbxwikj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; @@ -371,8 +371,8 @@ }) (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; - version = "6.0.1"; - sha256 = "0gzn3rynp9k6mx4h4dhq124b7ra8m11rkjh40r2r8z4gkr0shjv1"; + version = "6.0.7"; + sha256 = "0r5njqyl10dv0akwl5y32ik0rpzs9lwj151j6ayz358pn4x26akk"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; @@ -386,43 +386,53 @@ }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; - version = "6.0.1"; - sha256 = "15mx86i7gqlak604vr853x7a4b4l48wz5vqh9qbib7wh4pkf4rp3"; + version = "6.0.5"; + sha256 = "1vziijdf6kmv61i09bk0yxnbn08b48dy1jn4qbmhxaka745z1w6x"; + }) + (fetchNuGet { + pname = "Microsoft.EntityFrameworkCore.Abstractions"; + version = "6.0.7"; + sha256 = "0xhkh9k3xpgjdsizg1wdncwz4rdjvffq3x0sfcarscmg2j5fa4yj"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; - version = "6.0.1"; - sha256 = "16739crhjky22j53v8varninz9bqdmdfwjnzj6xvfxqfl858jja5"; + version = "6.0.7"; + sha256 = "0fdh0w5c51kkpvh1p5f0dn90kikh3zdyc1k4hjvv1z8kr603nd1b"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; - version = "6.0.1"; - sha256 = "13bi91lkasy4qj04jn2hmbwpsc6fybgllwsr87qhz5p86ig9ryq9"; - }) - (fetchNuGet { - pname = "Microsoft.EntityFrameworkCore.Relational"; - version = "6.0.0"; - sha256 = "1v2r8004isvz4d8qxh5clgkbnlwivjlsqhn7skw0y9b5i61y2mwk"; + version = "6.0.7"; + sha256 = "0mdb2gqmb94sw38cpqm972vdhh88n7q81xhq4gq771hp2wspn5ap"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "6.0.1"; sha256 = "0224qas1rl3jv02ribb2lwfqcd64ij40v6q10369h4mrwr071zr2"; }) + (fetchNuGet { + pname = "Microsoft.EntityFrameworkCore.Relational"; + version = "6.0.5"; + sha256 = "027j472gmqkrazy7b044qllsh8zbvl7lv3mdgnbghrhj06jfasm6"; + }) + (fetchNuGet { + pname = "Microsoft.EntityFrameworkCore.Relational"; + version = "6.0.7"; + sha256 = "1kx0ac7jgf8nmp5nra4cd6h2xbwvb3zkyzx7cds60y1j9nm7lx1g"; + }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; - version = "6.0.1"; - sha256 = "1snpa3pzpqfsnf2dpmvhv08lzcdiqcl5af6aldlxrm82dpif95q5"; + version = "6.0.7"; + sha256 = "15l36dgq6rzvgx7i9g9jm3298p9g1pdahwa2dxblmm0gzsp65wpl"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; - version = "6.0.1"; - sha256 = "14r1j8bamfwnjzx6igc5nzqvp5gzl2wyfbi53pznkw61xcf6hnch"; + version = "6.0.7"; + sha256 = "1mam4qg6yq6qnlkx3i45gs3nwgd7njfm9r5gjs1p9wm6bm953dad"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; - version = "6.0.1"; - sha256 = "0ynspdv0f199ppwcg7hnjv6hp01qyaxfcmh1phy9nwjjxlrkwkjc"; + version = "6.0.7"; + sha256 = "1wcjjn70v8cyy5flga0nlnhg973s6pzb3rpnzv905ix3g70zdp4k"; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; @@ -436,8 +446,8 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; - version = "6.0.0"; - sha256 = "0dq1x7962zsp926rj76i4akk4hsy7r5ldys8r4xsd78rq5f67rhq"; + version = "6.0.1"; + sha256 = "0ra0ldbg09r40jzvfqhpb3h42h80nafvka9hg51dja32k3mxn5gk"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; @@ -606,13 +616,13 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Identity.Core"; - version = "6.0.1"; - sha256 = "1kwn30a024fqi9gpap8g2wifjzij0bcz70lgz7bdz4vy3sp9mn99"; + version = "6.0.7"; + sha256 = "1xxqqh3flx0g8fzi9v0565amfvc72ci8vkya08gf2h67syn63s6l"; }) (fetchNuGet { pname = "Microsoft.Extensions.Identity.Stores"; - version = "6.0.1"; - sha256 = "1l2njmcg4fvg6jr9gjvcr7yfj0r0ndwsa8r1dwlaciz3a2x2pfg8"; + version = "6.0.7"; + sha256 = "0lsvbbfppxkz5xxq9q77k7222szy7g5974q7nr1c39gwdsy0j22d"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; @@ -756,8 +766,8 @@ }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; - version = "17.0.0"; - sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; + version = "17.2.0"; + sha256 = "0ncnq378pk1immy2dyf75xjf2xn72r4m5gma1njhc4rvhzx9qz11"; }) (fetchNuGet { pname = "Microsoft.NetCore.Analyzers"; @@ -796,13 +806,13 @@ }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; - version = "17.0.0"; - sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"; + version = "17.2.0"; + sha256 = "0l05smcgjzdfa5f60f9q5lylap3i21aswxbava92s19bgv46w2rv"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; - version = "17.0.0"; - sha256 = "06mn31cgpp7d8lwdyjanh89prc66j37dchn74vrd9s588rq0y70r"; + version = "17.2.0"; + sha256 = "1238hx3hdg22s123cxygdfm89h54abw1jv6az6hl8h76ip39ybdp"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; @@ -821,8 +831,8 @@ }) (fetchNuGet { pname = "MySqlConnector"; - version = "2.0.0"; - sha256 = "0l0r4wr1h176w6hcsfjp5kx05fpzhhgzxcmirv8zfyk899vfgqkz"; + version = "2.1.2"; + sha256 = "12wgwns172vjldp1cvcq212zizpw18za7z3438rdh40zkq55s5yz"; }) (fetchNuGet { pname = "NBitcoin.Altcoins"; @@ -849,6 +859,11 @@ version = "7.0.1"; sha256 = "05kqpjyp3ckb2183g9vfsdv362y5xg5j21p36zls0x3b0jgrwxw7"; }) + (fetchNuGet { + pname = "NBitcoin"; + version = "7.0.10"; + sha256 = "1yp43n18b9qwh1ck3hxkarncbfn7r3indfdyjimapxibk3f8jm1v"; + }) (fetchNuGet { pname = "NBitpayClient"; version = "1.0.0.39"; @@ -926,13 +941,13 @@ }) (fetchNuGet { pname = "Npgsql.EntityFrameworkCore.PostgreSQL"; - version = "6.0.3"; - sha256 = "0mgwm9psxvrq6vs2cy7m72wnknydgrs71hir2jqal5wbdh8g01np"; + version = "6.0.5"; + sha256 = "0b50hzzhd8igibxm3vkmq0h7cljx13l1fxrgznh6k2v57r0vvfnq"; }) (fetchNuGet { pname = "Npgsql"; - version = "6.0.3"; - sha256 = "1crzgi4dfbn8r381m9rvkma5xi2q7gqdzgxhc36hy3r0y63v1l8q"; + version = "6.0.5"; + sha256 = "1555xj2725kkg4jyxhz6pkqwirdqyw5j5h1q3vaykpns61i2h48q"; }) (fetchNuGet { pname = "NSec.Cryptography"; @@ -941,8 +956,8 @@ }) (fetchNuGet { pname = "NuGet.Frameworks"; - version = "5.0.0"; - sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; + version = "5.11.0"; + sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "NUglify"; @@ -966,8 +981,8 @@ }) (fetchNuGet { pname = "Pomelo.EntityFrameworkCore.MySql"; - version = "6.0.0"; - sha256 = "0qvm5rh9kv8znsp8wbss81w5a2afh0dl13pwkc824j7ywklz0gzz"; + version = "6.0.1"; + sha256 = "1g212yfzlphn97gn7v4zcpi4ihfk1xp014kw498pcma49dqirn54"; }) (fetchNuGet { pname = "Portable.BouncyCastle"; @@ -1341,8 +1356,8 @@ }) (fetchNuGet { pname = "System.IO.Pipelines"; - version = "6.0.1"; - sha256 = "0b6zvhhfdxx0wx3bzyvxbq0mk8l5lbjak5124sn0gkif5jb388w4"; + version = "6.0.3"; + sha256 = "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz"; }) (fetchNuGet { pname = "System.IO"; @@ -1719,6 +1734,11 @@ version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) + (fetchNuGet { + pname = "System.Text.Encoding.CodePages"; + version = "6.0.0"; + sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; + }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; @@ -1921,8 +1941,8 @@ }) (fetchNuGet { pname = "xunit.runner.visualstudio"; - version = "2.4.3"; - sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3"; + version = "2.4.5"; + sha256 = "0y8w33ci80z8k580pp24mfnaw1r8ji0w3az543xxcz6aagax9zhs"; }) (fetchNuGet { pname = "xunit"; diff --git a/pkgs/applications/blockchains/lndhub-go/default.nix b/pkgs/applications/blockchains/lndhub-go/default.nix index 728f28dee866..a563703c6bcb 100644 --- a/pkgs/applications/blockchains/lndhub-go/default.nix +++ b/pkgs/applications/blockchains/lndhub-go/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "lndhub-go"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "getAlby"; repo = "lndhub.go"; rev = "${version}"; - sha256 = "sha256-QtLSI5xjXevTTr85Zsylabhay52ul8jFq1j6WzgSLcs="; + sha256 = "sha256-f/CkmO0KHupmi4XZDWRbvesLnYIxT6DlThgX3S/kdJ8="; }; - vendorSha256 = "sha256-12RTaXStvx29JjE1u3AjBTrPf6gKfLHJHMJpbQysEew="; + vendorSha256 = "sha256-SWQudULFRMrKmxY6ZgH0NL8d6UPxowQnovhRx+209D4="; doCheck = false; # tests require networking diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 17cf43f8af0a..9ff2a65acfb9 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.3.28"; + version = "2.3.33"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-4KedlU+TMwO6C/dgNa23N4uPk8gPq2SQKzYkCZS508I="; + sha256 = "sha256-yvnWSmf4FJoZ7ajZQQJFLleIQ/hmHD+rDoktJeIll+U="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix index 3bc5e06a1593..76fd74f6c597 100644 --- a/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -11,13 +11,13 @@ }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; - version = "6.0.1"; - sha256 = "0rsqng2b8a3zaha9c2x1195das5wwvmnz31xf14ancgha4lxq68r"; + version = "6.0.7"; + sha256 = "0l235hs1j24iqvk79p95sfrsfbj6l2kb10x9zi34jinvldyn5ln6"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; - version = "6.0.1"; - sha256 = "179b2774s68im71r32lv4nydcp586x86zggs8ml6jcfjrd9fs5b1"; + version = "6.0.7"; + sha256 = "08g3aq8gn917r55hnx1i36jfwy51311yns0x6wpvs9d2y4ncygk4"; }) (fetchNuGet { pname = "Microsoft.Azure.Amqp"; @@ -36,8 +36,8 @@ }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; - version = "16.11.0"; - sha256 = "0f41l3kks6wk5vjaxpjh8m2flnrvlbvqgqflamhv8rfz4y8ifgdv"; + version = "17.2.0"; + sha256 = "018yl113i037m5qhm3z6csb0c4l8kj412dxw2dagdbj07qbxwikj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; @@ -56,43 +56,43 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; - version = "2.1.0"; - sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; + version = "6.0.0"; + sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; - version = "2.1.0"; - sha256 = "0xx3idb1l5y1da5zynlys5gyarijmw5pc9hgci8xdxbrcv6rzbjb"; + version = "6.0.0"; + sha256 = "19w2vxliz1xangbach3hkx72x2pxqhc9n9c3kc3l8mhicl8w6vdl"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; - version = "2.1.0"; - sha256 = "1lz2xwm63clbh9dfhmygbqvcp4dsrwh5jihv82dmqd5h7lqngl40"; + version = "6.0.0"; + sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Ini"; - version = "2.1.0"; - sha256 = "0bchsljywcq36si4zs2dcx2gj8x98ww93dh2bx2z6x5ilxyjnfip"; + version = "6.0.0"; + sha256 = "18qg1f7yvgvrgsq40cgc1yvpb9av84ma80k3grhvwn1cyam2img6"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; - version = "2.1.0"; - sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2"; + version = "6.0.0"; + sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; - version = "2.1.0"; - sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; + version = "6.0.0"; + sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; - version = "2.1.0"; - sha256 = "1firpsl5bk219i9gdfgiqw1zm68146h1dzx9hvawfpw9slfaa56w"; + version = "6.0.0"; + sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; - version = "2.1.0"; - sha256 = "1d2622qp22x1cnlwycnzjbc3sgi9jria26fk78zwzsa08npa3avv"; + version = "6.0.0"; + sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; @@ -101,13 +101,13 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; - version = "2.1.0"; - sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; + version = "6.0.0"; + sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; - version = "2.1.0"; - sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; + version = "6.0.0"; + sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Clients.ActiveDirectory"; @@ -131,8 +131,8 @@ }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; - version = "16.11.0"; - sha256 = "1a2y6vw6p9xp3w72zq2lwrjl8bxv87s9d7zd2dh4zwbzh1c5slxl"; + version = "17.2.0"; + sha256 = "0ncnq378pk1immy2dyf75xjf2xn72r4m5gma1njhc4rvhzx9qz11"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; @@ -161,13 +161,13 @@ }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; - version = "16.11.0"; - sha256 = "1fc0ghk1cny4i8w43b94pxhl0srxisv6kaflkkp30ncsa9szhkxh"; + version = "17.2.0"; + sha256 = "0l05smcgjzdfa5f60f9q5lylap3i21aswxbava92s19bgv46w2rv"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; - version = "16.11.0"; - sha256 = "0hp1vndf2jhyg1f3miq4g2068z5kpfzy6nmswm25vymghxp1ws4k"; + version = "17.2.0"; + sha256 = "1238hx3hdg22s123cxygdfm89h54abw1jv6az6hl8h76ip39ybdp"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; @@ -186,29 +186,29 @@ }) (fetchNuGet { pname = "NBitcoin.Altcoins"; - version = "3.0.8"; - sha256 = "1qck2nfj8494pxwzhccslq4cbypsgnwcv3nvz24czsd87wn8n618"; + version = "3.0.11"; + sha256 = "1l8v07k862apyfr7h37jl7nrlr8mlscsqdqsmp2qdl0502x0gms3"; }) (fetchNuGet { pname = "NBitcoin.TestFramework"; - version = "3.0.9"; - sha256 = "08pwab9f2565day9b0fjzfv5ik3pbwvgvl190gh0bmwi5xv4vq93"; + version = "3.0.11"; + sha256 = "1v3g323vs65qk190dgcm3v6lzhq1ng9p1ywd39jq53hcny76fgcb"; }) (fetchNuGet { pname = "NBitcoin"; - version = "7.0.8"; - sha256 = "0h76a5wha3rqchjzhvslmm8f7qkya77n8avh5i05nvnrigf0bj5q"; + version = "7.0.10"; + sha256 = "1yp43n18b9qwh1ck3hxkarncbfn7r3indfdyjimapxibk3f8jm1v"; + }) + (fetchNuGet { + pname = "NBitcoin"; + version = "7.0.9"; + sha256 = "0bdw54q4d5vbyrgj7r4rs8322z1knl79hmhzmq3knqf68yidi87g"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { - pname = "NETStandard.Library"; - version = "2.0.3"; - sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; - }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; @@ -236,28 +236,28 @@ }) (fetchNuGet { pname = "NicolasDorier.CommandLine.Configuration"; - version = "1.0.0.3"; - sha256 = "0al0pd4zhjpmn8m208xjmy17cbyab68grzdvzr2lhsckwkl6b1jg"; + version = "2.0.0"; + sha256 = "1cng096r3kb85lf5wjill4yhxx8nv9v0d6ksbn1i1vvdawwl6fkw"; }) (fetchNuGet { pname = "NicolasDorier.CommandLine"; - version = "1.0.0.2"; - sha256 = "08a9l18zkhcfa6f56xqylzvmqjzgxsmgkpm2r3ckvxfyml6w0qyy"; + version = "2.0.0"; + sha256 = "0gywvl0gqs3crlzwgwzcqf0qsrbhk3dxjycpimxqvs1ihg4dhb1f"; }) (fetchNuGet { pname = "NicolasDorier.StandardConfiguration"; - version = "1.0.0.18"; - sha256 = "0lgssxafv6cqlw21fb79fm0fcln0clgsk6zadcwrnjv9vampfw7b"; + version = "2.0.0"; + sha256 = "0058dx34ja2idw468bmw7l3w21wr2am6yx57sqp7llhjl5ayy0wv"; }) (fetchNuGet { pname = "Npgsql"; - version = "6.0.3"; - sha256 = "1crzgi4dfbn8r381m9rvkma5xi2q7gqdzgxhc36hy3r0y63v1l8q"; + version = "6.0.5"; + sha256 = "1555xj2725kkg4jyxhz6pkqwirdqyw5j5h1q3vaykpns61i2h48q"; }) (fetchNuGet { pname = "NuGet.Frameworks"; - version = "5.0.0"; - sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; + version = "5.11.0"; + sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "RabbitMQ.Client"; @@ -374,16 +374,6 @@ version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { - pname = "System.Buffers"; - version = "4.4.0"; - sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; - }) - (fetchNuGet { - pname = "System.Buffers"; - version = "4.5.0"; - sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; - }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; @@ -579,11 +569,6 @@ version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { - pname = "System.Memory"; - version = "4.5.0"; - sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; - }) (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; @@ -644,11 +629,6 @@ version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) - (fetchNuGet { - pname = "System.Numerics.Vectors"; - version = "4.4.0"; - sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; - }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; @@ -754,11 +734,6 @@ version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { - pname = "System.Runtime.CompilerServices.Unsafe"; - version = "4.5.0"; - sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; - }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; @@ -1081,8 +1056,8 @@ }) (fetchNuGet { pname = "xunit.runner.visualstudio"; - version = "2.4.3"; - sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3"; + version = "2.4.5"; + sha256 = "0y8w33ci80z8k580pp24mfnaw1r8ji0w3az543xxcz6aagax9zhs"; }) (fetchNuGet { pname = "xunit"; diff --git a/pkgs/applications/editors/zee/default.nix b/pkgs/applications/editors/zee/default.nix new file mode 100644 index 000000000000..9442044a1697 --- /dev/null +++ b/pkgs/applications/editors/zee/default.nix @@ -0,0 +1,31 @@ +{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "zee"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "zee-editor"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/9SogKOaXdFDB+e0//lrenTTbfmXqNFGr23L+6Pnm8w="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + + # disable downloading and building the tree-sitter grammars at build time + # grammars can be configured in a config file and installed with `zee --build` + # see https://github.com/zee-editor/zee#syntax-highlighting + ZEE_DISABLE_GRAMMAR_BUILD=1; + + cargoSha256 = "sha256-mbqI1csnU95VWgax4GjIxB+nhMtmpaeJ8QQ3qb0hY4c="; + + meta = with lib; { + description = "A modern text editor for the terminal written in Rust"; + homepage = "https://github.com/zee-editor/zee"; + license = licenses.mit; + maintainers = with maintainers; [ booklearner ]; + }; +} diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix index 13f6c3f5ab30..e8ce0dbd0cef 100644 --- a/pkgs/applications/graphics/megapixels/default.nix +++ b/pkgs/applications/graphics/megapixels/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "megapixels"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitLab { owner = "postmarketOS"; repo = "megapixels"; rev = version; - hash = "sha256-zOtHxnXDzsLfaQPS0BhbuoUXglCbRULVJfk1txoS72Y="; + hash = "sha256-UH3NQdMlZTi4hc8HNSbCcQSm0rxI78RMCRYll1NCBO8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix index 2b825705b006..a3de388a52ab 100644 --- a/pkgs/applications/misc/libosmocore/default.nix +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -13,15 +13,19 @@ stdenv.mkDerivation rec { pname = "libosmocore"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmocore"; rev = version; - hash = "sha256-AjOyZiLlXhsetbyMBuUssoNxk22LzGOkZpeLt4vKli4="; + hash = "sha256-Dkud3ZA9m/UVbPugbQztUJXFpkQYTWjK2mamxfto9JA="; }; + postPatch = '' + echo "${version}" > .tarball-version + ''; + propagatedBuildInputs = [ talloc ]; diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 020015ccd6c4..6febcab39475 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -21,14 +21,14 @@ }: mkDerivation rec { - version = "1.2.1"; + version = "1.2.2"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "sha256-qcfmePPSuaCydATNhUCZ9ee9tV1KqclP9PPX6UPILTM="; + sha256 = "sha256-BdcMW9ePOLXOZnFxFb1h/mn5a6c8fHYFr9ckK9hXJAM="; }; buildInputs = [ diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index 55baf5c7a5c8..4c165cc7e10c 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "temporal"; - version = "1.17.1"; + version = "1.17.2"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - sha256 = "sha256-YaFB2OBC5dJjfomkge6w3sGyrESRxAFTDm+jPMLgskc="; + sha256 = "sha256-V80v8nRHAshPnyWdBb4ahCn5FfzT906oZlhalZ547Nk="; }; vendorSha256 = "sha256-MT/BmGTdyEzmXjuwlA6WhLIWlrQz3Wc4Tl5dMI1587Q="; diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index 3f3d71a33718..f9a2f42c5517 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -4,11 +4,11 @@ let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in stdenv.mkDerivation rec { pname = "cinny"; - version = "2.0.4"; + version = "2.1.1"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - sha256 = "0p5s25nkjs9514a16c7kl0m78vn5f14mv6nbi79yz0sxb7hc12qg"; + sha256 = "0qzg790yd23ja3a782ga085vgd5vvh7rgmdy8kpvc3wf8plvw5nm"; }; installPhase = '' diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 99a81fd1a809..c769b7de6c86 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-XBYRhbwknVa8eXxk31b7n9gMWBcTjCecDN+j2FGcpw0="; + sha256 = "sha256-bVq/99jMkxTjckMjWoK4pBa0jD/AYezgKUPJziNSqI0="; }; postPatch = '' diff --git a/pkgs/applications/science/electronics/xschem/default.nix b/pkgs/applications/science/electronics/xschem/default.nix index 646f374ba48e..456b939c60ad 100644 --- a/pkgs/applications/science/electronics/xschem/default.nix +++ b/pkgs/applications/science/electronics/xschem/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "xschem"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "StefanSchippers"; repo = "xschem"; rev = version; - sha256 = "sha256-C57jo8tAbiqQAgf4Xp2lpFGOr6F1knPpFcYxPiqSM4k="; + sha256 = "sha256-SHpESg5mn9lSDOURQusQUsug8Jqin/W5rqkVgmseSgA="; }; nativeBuildInputs = [ bison flex pkg-config ]; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index e818f4a71faa..28dad82fe162 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -125,6 +125,21 @@ buildPythonApplication rec { fish ]; + # skip failing tests due to darwin sandbox + preCheck = if stdenv.isDarwin then '' + substituteInPlace kitty_tests/file_transmission.py \ + --replace test_file_get dont_test_file_get \ + --replace test_path_mapping_receive dont_test_path_mapping_receive + substituteInPlace kitty_tests/shell_integration.py \ + --replace test_fish_integration dont_test_fish_integration + substituteInPlace kitty_tests/open_actions.py \ + --replace test_parsing_of_open_actions dont_test_parsing_of_open_actions + substituteInPlace kitty_tests/ssh.py \ + --replace test_ssh_connection_data dont_test_ssh_connection_data + substituteInPlace kitty_tests/fonts.py \ + --replace 'class Rendering(BaseTest)' 'class Rendering' + '' else ""; + checkPhase = let buildBinPath = if stdenv.isDarwin @@ -132,6 +147,8 @@ buildPythonApplication rec { else "linux-package/bin"; in '' + runHook preCheck + # Fontconfig error: Cannot load default config file: No such file: (null) export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 7a39a487e5f8..70f933e7b206 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -29,14 +29,14 @@ rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20220624-141144-bd1b7c5d"; + version = "20220807-113146-c2fee766"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-7VuNOJ4xqTxumLft7wRj4zdN8Y2ZSYtXr/KuqaLNOgw="; + sha256 = "sha256-2krngcANqcwq8wNQZSz01srJ6yEOkk03QnO2sL7SuJA="; }; postPatch = '' @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { rm -r wezterm-ssh/tests ''; - cargoSha256 = "sha256-YvQ0APyPiYwISE/pDD2s+UgYFj4CKPdolb14FrNpocU="; + cargoSha256 = "sha256-ZkDGCR86VSCuvVlo4Pf9Ifax2BZuBicZpB/K/7bIMls="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index af6d9fe702c4..a2da839347f3 100644 --- a/pkgs/applications/video/hypnotix/default.nix +++ b/pkgs/applications/video/hypnotix/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ]; pythonPath = with python3.pkgs; [ - imdbpy + cinemagoer pygobject3 requests setproctitle diff --git a/pkgs/applications/window-managers/hackedbox/default.nix b/pkgs/applications/window-managers/hackedbox/default.nix new file mode 100644 index 000000000000..0f608b83a70a --- /dev/null +++ b/pkgs/applications/window-managers/hackedbox/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, freetype +, fribidi +, imlib2 +, libX11 +, libXext +, libXft +, libXinerama +, libXpm +, libXrandr +, libXrender +, pkg-config +, xorgproto +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hackedbox"; + version = "0.8.5.1"; + + src = fetchFromGitHub { + owner = "museoa"; + repo = "hackedbox"; + rev = finalAttrs.version; + hash = "sha256-hxfbEj7UxQ19xhetmdi0iyK6ceLUfUvAAyyTbNivlLQ="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + freetype + fribidi + imlib2 + libX11 + libXext + libXft + libXinerama + libXpm + libXrandr + libXrender + xorgproto + ]; + + configureFlags = [ + "--x-includes=${libX11.dev}/include" + "--x-libraries=${libX11.out}/lib" + ]; + + meta = with lib; { + description = "A bastard hacked offspring of Blackbox"; + homepage = "http://github.com/museoa/hackedbox/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + inherit (libX11.meta) platforms; + }; +}) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index f8e28c452c33..047cdf6a4911 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -480,7 +480,7 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" stackprotector fortify" '' + optionalString targetPlatform.isAvr '' hardening_unsupported_flags+=" stackprotector pic" - '' + optionalString (targetPlatform.libc == "newlib") '' + '' + optionalString (targetPlatform.libc == "newlib" || targetPlatform.libc == "newlib-nano") '' hardening_unsupported_flags+=" stackprotector fortify pie pic" '' + optionalString (targetPlatform.libc == "musl" && targetPlatform.isx86_32) '' hardening_unsupported_flags+=" stackprotector" diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 4980f36312c1..880fc6f42341 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenvNoCC, fetchFromGitHub, fetchurl, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme, papirus-folders, color ? null }: +{ lib, stdenvNoCC, fetchFromGitHub, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme, papirus-folders, color ? null }: stdenvNoCC.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20220710"; + version = "20220808"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-CInoUlWMmLwc4mMi1krmXr2a2JCWZ7XcPe20wFSNjqk="; + sha256 = "sha256-eOsqBIo7Bs/5mbD8x2Q+RO49Cqxd1KoqNbTsiV9RDWg="; }; nativeBuildInputs = [ gtk3 papirus-folders ]; diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 5323348c2f3c..8fc5d744850e 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20220708161253"; + version = "20220808014309"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-RLfb4DmigoQAKp00RHjGKGjQhCHqxSOLNnphiv1ub8s="; + sha256 = "sha256-pqe6AjXDTN71tShD41/tQFljRiH7qJaZ8w5lcTs6dxk="; }; vendorSha256 = "sha256-Igx8yGWWVmVEogvbrosaK13LVs+ZZuYLBNji7iSfzdo="; meta = with lib; { diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 790c323e57fc..0788bff7f368 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202207070057"; + version = "202208040058"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "cbabee03cf7b7b60b1167a8a14ba1eba9d9dbb77"; - sha256 = "sha256-bWhsV7+aj75nd8NDeb5D5UjvCChhtXq9lpkaZN41wDk="; + rev = "97174fe0eeb28838b0e5e805687d230df773e661"; + sha256 = "sha256-hodJ4HQHbv9voSS847pAHd3YSmfkV7fKyJhEUApVN+w="; }; installPhase = '' diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 3bcfd4b3e891..8ac7152d7e28 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -97,7 +97,7 @@ let # In uclibc cases, libgomp needs an additional '-ldl' # and as I don't know how to pass it, I disable libgomp. "--disable-libgomp" - ] ++ lib.optional (targetPlatform.libc == "newlib") "--with-newlib" + ] ++ lib.optional (targetPlatform.libc == "newlib" || targetPlatform.libc == "newlib-nano") "--with-newlib" ++ lib.optional (targetPlatform.libc == "avrlibc") "--with-avrlibc" ); diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix index 69e5779d8f0d..d1dd64eca153 100644 --- a/pkgs/development/compilers/go/1.17.nix +++ b/pkgs/development/compilers/go/1.17.nix @@ -17,13 +17,9 @@ , runtimeShell , buildPackages , pkgsBuildTarget -, callPackage -, threadsCross ? null # for MinGW +, threadsCross }: -# threadsCross is just for MinGW -assert threadsCross != null -> stdenv.targetPlatform.isWindows; - let go_bootstrap = buildPackages.callPackage ./bootstrap116.nix { }; @@ -36,19 +32,19 @@ let ''; goarch = platform: { - "i686" = "386"; - "x86_64" = "amd64"; "aarch64" = "arm64"; "arm" = "arm"; "armv5tel" = "arm"; "armv6l" = "arm"; "armv7l" = "arm"; + "i686" = "386"; "mips" = "mips"; + "mips64el" = "mips64le"; "mipsel" = "mipsle"; + "powerpc64le" = "ppc64le"; "riscv64" = "riscv64"; "s390x" = "s390x"; - "powerpc64le" = "ppc64le"; - "mips64el" = "mips64le"; + "x86_64" = "amd64"; }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); # We need a target compiler which is still runnable at build time, @@ -57,7 +53,6 @@ let isCross = stdenv.buildPlatform != stdenv.targetPlatform; in - stdenv.mkDerivation rec { pname = "go"; version = "1.17.13"; @@ -80,7 +75,7 @@ stdenv.mkDerivation rec { depsBuildTarget = lib.optional isCross targetCC; - depsTargetTarget = lib.optional (threadsCross != null) threadsCross; + depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross; hardeningDisable = [ "all" ]; @@ -283,10 +278,10 @@ stdenv.mkDerivation rec { disallowedReferences = [ goBootstrap ]; meta = with lib; { - homepage = "https://go.dev/"; description = "The Go Programming language"; + homepage = "https://go.dev/"; license = licenses.bsd3; maintainers = teams.golang.members; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.darwin ++ platforms.linux; }; } diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index 8fef944094b1..489ed133c611 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -18,13 +18,9 @@ , runtimeShell , buildPackages , pkgsBuildTarget -, callPackage -, threadsCross ? null # for MinGW +, threadsCross }: -# threadsCross is just for MinGW -assert threadsCross != null -> stdenv.targetPlatform.isWindows; - let go_bootstrap = buildPackages.callPackage ./bootstrap116.nix { }; @@ -37,19 +33,19 @@ let ''; goarch = platform: { - "i686" = "386"; - "x86_64" = "amd64"; "aarch64" = "arm64"; "arm" = "arm"; "armv5tel" = "arm"; "armv6l" = "arm"; "armv7l" = "arm"; + "i686" = "386"; "mips" = "mips"; + "mips64el" = "mips64le"; "mipsel" = "mipsle"; + "powerpc64le" = "ppc64le"; "riscv64" = "riscv64"; "s390x" = "s390x"; - "powerpc64le" = "ppc64le"; - "mips64el" = "mips64le"; + "x86_64" = "amd64"; }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); # We need a target compiler which is still runnable at build time, @@ -58,7 +54,6 @@ let isCross = stdenv.buildPlatform != stdenv.targetPlatform; in - stdenv.mkDerivation rec { pname = "go"; version = "1.18.4"; @@ -81,7 +76,7 @@ stdenv.mkDerivation rec { depsBuildTarget = lib.optional isCross targetCC; - depsTargetTarget = lib.optional (threadsCross != null) threadsCross; + depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross; hardeningDisable = [ "all" ]; @@ -288,10 +283,10 @@ stdenv.mkDerivation rec { disallowedReferences = [ goBootstrap ]; meta = with lib; { - homepage = "https://go.dev/"; description = "The Go Programming language"; + homepage = "https://go.dev/"; license = licenses.bsd3; maintainers = teams.golang.members; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.darwin ++ platforms.linux; }; } diff --git a/pkgs/development/compilers/go/1.19.nix b/pkgs/development/compilers/go/1.19.nix index fc2855251e03..f5b511633465 100644 --- a/pkgs/development/compilers/go/1.19.nix +++ b/pkgs/development/compilers/go/1.19.nix @@ -17,13 +17,9 @@ , runtimeShell , buildPackages , pkgsBuildTarget -, callPackage -, threadsCross ? null # for MinGW +, threadsCross }: -# threadsCross is just for MinGW -assert threadsCross != null -> stdenv.targetPlatform.isWindows; - let go_bootstrap = buildPackages.callPackage ./bootstrap116.nix { }; @@ -36,19 +32,19 @@ let ''; goarch = platform: { - "i686" = "386"; - "x86_64" = "amd64"; "aarch64" = "arm64"; "arm" = "arm"; "armv5tel" = "arm"; "armv6l" = "arm"; "armv7l" = "arm"; + "i686" = "386"; "mips" = "mips"; + "mips64el" = "mips64le"; "mipsel" = "mipsle"; + "powerpc64le" = "ppc64le"; "riscv64" = "riscv64"; "s390x" = "s390x"; - "powerpc64le" = "ppc64le"; - "mips64el" = "mips64le"; + "x86_64" = "amd64"; }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); # We need a target compiler which is still runnable at build time, @@ -57,7 +53,6 @@ let isCross = stdenv.buildPlatform != stdenv.targetPlatform; in - stdenv.mkDerivation rec { pname = "go"; version = "1.19"; @@ -80,7 +75,7 @@ stdenv.mkDerivation rec { depsBuildTarget = lib.optional isCross targetCC; - depsTargetTarget = lib.optional (threadsCross != null) threadsCross; + depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross; hardeningDisable = [ "all" ]; @@ -276,10 +271,10 @@ stdenv.mkDerivation rec { disallowedReferences = [ goBootstrap ]; meta = with lib; { - homepage = "https://go.dev/"; description = "The Go Programming language"; + homepage = "https://go.dev/"; license = licenses.bsd3; maintainers = teams.golang.members; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.darwin ++ platforms.linux; }; } diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index a3df686e9d68..2c8150f764be 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -6,18 +6,18 @@ stdenv.mkDerivation rec { pname = "unison-code-manager"; - milestone_id = "M3"; + milestone_id = "M4"; version = "1.0.${milestone_id}-alpha"; src = if (stdenv.isDarwin) then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-macos.tar.gz"; - sha256 = "sha256-xshqqERBr60vz1qEnewlgNIvd24aE6/VtK5iBlanQHg="; + sha256 = "A8i1jH9+W89M+XbmYx0knJsP5c/EdVE2T9L/EIL0USU="; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-linux.tar.gz"; - sha256 = "sha256-rt8Y1ZEQVHH6gk4JV3lH38H10TDwdLDnbnqjG2vyyy4="; + sha256 = "OqtJiKAsefw2fVjhtsYUe+qLPqXBPFkHUaMh26EJBJ4="; }; # The tarball is just the prebuilt binary, in the archive root. diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 471f96b51887..1a6556764bea 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -206,9 +206,9 @@ in { major = "3"; minor = "11"; patch = "0"; - suffix = "b4"; + suffix = "b5"; }; - sha256 = "sha256-HZO2EWB5A+CAQXwalWf1+79RJMxchvSvu6HI/TTF9vs="; + sha256 = "sha256-OBC9IvfcNKmcKi60uFJkpN9PBe9ZxODMwuqC7pxJFpg="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index d65ead78624c..e2da1a30ff14 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,37 +1,94 @@ -{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper -, ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre2, augeas, libxml2 -, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db -, gmp, readline, file, numactl, libapparmor, jansson -, getopt, perlPackages, ocamlPackages +{ lib +, stdenv +, fetchurl +, pkg-config +, autoreconfHook +, makeWrapper +, ncurses +, cpio +, gperf +, cdrkit +, flex +, bison +, qemu +, pcre2 +, augeas +, libxml2 +, acl +, libcap +, libcap_ng +, libconfig +, systemd +, fuse +, yajl +, libvirt +, hivex +, db +, gmp +, readline +, file +, numactl +, libapparmor +, jansson +, getopt +, perlPackages +, ocamlPackages , libtirpc , appliance ? null -, javaSupport ? false, jdk ? null }: +, javaSupport ? false +, jdk +}: assert appliance == null || lib.isDerivation appliance; -assert javaSupport -> jdk != null; stdenv.mkDerivation rec { pname = "libguestfs"; - version = "1.48.0"; + version = "1.48.4"; src = fetchurl { url = "https://libguestfs.org/download/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; - sha256 = "sha256-FoH93t/PSEym3uxUIwMwoy3vvTDCqx+BeI4lLLXQSCk="; + sha256 = "sha256-ncIrbFpF8ZwsupEaN7Oo2G9idEUhsQ61PD05B+UIAxI="; }; strictDeps = true; nativeBuildInputs = [ - autoreconfHook bison cdrkit cpio flex getopt gperf makeWrapper pkg-config qemu - ] ++ (with perlPackages; [ perl libintl-perl GetoptLong SysVirt ]) - ++ (with ocamlPackages; [ ocaml findlib ]); + autoreconfHook + bison + cdrkit + cpio + flex + getopt + gperf + makeWrapper + pkg-config + qemu + ] ++ (with perlPackages; [ perl libintl-perl GetoptLong ModuleBuild ]) + ++ (with ocamlPackages; [ ocaml findlib ]); buildInputs = [ - ncurses jansson - pcre2 augeas libxml2 acl libcap libcap_ng libconfig - systemd fuse yajl libvirt gmp readline file hivex db - numactl libapparmor perlPackages.ModuleBuild + ncurses + jansson + pcre2 + augeas + libxml2 + acl + libcap + libcap_ng + libconfig + systemd + fuse + yajl + libvirt + gmp + readline + file + hivex + db + numactl + libapparmor + perlPackages.ModuleBuild libtirpc ] ++ (with ocamlPackages; [ ocamlbuild ocaml_libvirt gettext-stub ounit ]) - ++ lib.optional javaSupport jdk; + ++ lib.optional javaSupport jdk; prePatch = '' # build-time scripts @@ -54,10 +111,14 @@ stdenv.mkDerivation rec { patches = [ ./libguestfs-syms.patch ]; + + createFindlibDestdir = true; + installFlags = [ "REALLY_INSTALL=yes" ]; enableParallelBuilding = true; postInstall = '' + mv "$out/lib/ocaml/guestfs" "$OCAMLFIND_DESTDIR/guestfs" for bin in $out/bin/*; do wrapProgram "$bin" \ --prefix PATH : "$out/bin:${hivex}/bin:${qemu}/bin" \ @@ -95,7 +156,7 @@ stdenv.mkDerivation rec { description = "Tools for accessing and modifying virtual machine disk images"; license = with licenses; [ gpl2Plus lgpl21Plus ]; homepage = "https://libguestfs.org/"; - maintainers = with maintainers; [offline]; + maintainers = with maintainers; [ offline ]; platforms = platforms.linux; # this is to avoid "output size exceeded" hydraPlatforms = if appliance != null then appliance.meta.hydraPlatforms else platforms.linux; diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 65735896d659..1bed1362bac6 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -47,12 +47,12 @@ in lib.warnIf (enableQT != false) "geant4: enableQT is deprecated, please use enableQt" stdenv.mkDerivation rec { - version = "11.0.0"; + version = "11.0.2"; pname = "geant4"; src = fetchurl{ url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz"; - sha256 = "sha256-PMin350/8ceiGmLS6zoQvhX2uxWNOTI78yEzScnvdbk="; + hash = "sha256-/AONuDcxL3Tj+O/RC108qHqZnUg9TYlZxguKdJIh7GE="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix index 5d40ff183e77..a5827fe188c5 100644 --- a/pkgs/development/libraries/ptex/default.nix +++ b/pkgs/development/libraries/ptex/default.nix @@ -1,27 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, zlib, cmake, pkg-config }: +{ lib, stdenv, fetchFromGitHub, zlib, cmake }: stdenv.mkDerivation rec { pname = "ptex"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "wdas"; repo = "ptex"; rev = "v${version}"; - sha256 = "sha256-TuwgZJHvQUqBEFeZYvzpi+tmXB97SkOairYnuUahtSA="; + sha256 = "sha256-PR1ld9rXmL6BK4llznAsD5PNvi3anFMz2i9NDsG95DQ="; }; outputs = [ "bin" "dev" "out" "lib" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib pkg-config ]; - - # Can be removed in the next release - # https://github.com/wdas/ptex/pull/42 - patchPhase = '' - echo v${version} >version - ''; + buildInputs = [ zlib ]; meta = with lib; { description = "Per-Face Texture Mapping for Production Rendering"; diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index 3441e4cff46e..7182222db5a2 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.6.8"; + version = "0.6.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cWq9CZNQqIot/QfT42VtJemJNrFtgQG3XZR+itV+sHI="; + sha256 = "sha256-QCdOiCmo21P9vjKPWAV6Wrfi664Hx3uJ8V44B2mLtbw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 83019e202e5f..ff637dd4979e 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.4.6"; + version = "0.4.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DDp9gtKavO3LCDnaZsYYLTWwoy0kQaTitJeALSPlXaQ="; + hash = "sha256-Dm05DCNPyQW62RRIVf995jEa5A6kqYyhsUNn+XCjSSI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 890a37e24dd3..3e3148fce7c2 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -1,22 +1,53 @@ -{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp, pytest-cov }: +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, jinja2 +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "aiohttp-jinja2"; version = "1.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "7c3ba5eac060b691f4e50534af2d79fca2a75712ebd2b25e6fcb1295859f910b"; + hash = "sha256-fDul6sBgtpH05QU0ry15/KKnVxLr0rJeb8sSlYWfkQs="; }; - propagatedBuildInputs = [ aiohttp jinja2 ]; + propagatedBuildInputs = [ + aiohttp + jinja2 + ]; - checkInputs = [ pytest pytest-aiohttp pytest-cov ]; + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; - checkPhase = '' - pytest -W ignore::DeprecationWarning + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=aiohttp_jinja2 --cov-report xml --cov-report html --cov-report term" "" ''; + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + ]; + + pythonImportsCheck = [ + "aiohttp_jinja2" + ]; + + # Tests are outdated (1.5) + # pytest.PytestUnhandledCoroutineWarning: async def functions... + doCheck = false; + meta = with lib; { description = "Jinja2 support for aiohttp"; homepage = "https://github.com/aio-libs/aiohttp_jinja2"; diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 69932532efa2..a3dfa62705a5 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "2.0.1"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-BUKuZza9Jer334LUmU5zmfjg1ISuxg7HETEbUMB80KY="; + hash = "sha256-Id4qg7uSvpjXpEx0/EvSMvFxgkR78/NOoOmmwngj7Qw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index f4414d4b93f8..1c25c099805b 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.31.2"; + version = "0.31.3"; format = "setuptools"; src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - sha256 = "sha256-CAah1Yu3gbHcqHbTM1nXAVFqGKatdUNYt881sjsCD2o="; + sha256 = "sha256-h0hGTT8ipZZ3l/B6I/O74hFpRzaxj5vUBMbM/xX0dq4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 67ac93a7dcd2..834df14102f0 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.24.31"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.24.42"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-3gZzRpQsbRcwtRN4M4ViBRm4spNfWw7i5m1WX/tXzhI="; + sha256 = "sha256-3z1u8CMEvXw3EQkJNsCS1dtzXdoQneysHiNsPvf9t68="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index fa5c26d115c7..d7e525897604 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.27.31"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.27.42"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-sMx5+1o3oOK2vv6G79AnuSEB2Bnx/cVs//OfLrI58jI="; + sha256 = "sha256-OKGApmZsWpsGmnXsPPN0/ypkw+kMnySpFoWLzesERW0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index e98ee9d4fe39..2e027eaa990c 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -1,15 +1,15 @@ { lib , buildPythonPackage , fetchFromGitHub -, simpleeval +, pytestCheckHook , pythonOlder -, coveralls +, simpleeval , wcmatch }: buildPythonPackage rec { pname = "casbin"; - version = "1.16.9"; + version = "1.17.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - sha256 = "sha256-1xxjFNkCb50ndmXuRjt7svPOvSyzZbw+J49Zpyy1FUc="; + hash = "sha256-fBMhrA4zL4XPjQ63AGc5jf585ZpHTBumPievDNfCw7o="; }; propagatedBuildInputs = [ @@ -27,19 +27,15 @@ buildPythonPackage rec { ]; checkInputs = [ - coveralls + pytestCheckHook ]; - checkPhase = '' - coverage run -m unittest discover -s tests -t tests - ''; - pythonImportsCheck = [ "casbin" ]; meta = with lib; { - description = "An authorization library that supports access control models like ACL, RBAC, ABAC in Python"; + description = "Authorization library that supports access control models like ACL, RBAC and ABAC"; homepage = "https://github.com/casbin/pycasbin"; license = licenses.asl20; maintainers = with maintainers; [ costrouc ]; diff --git a/pkgs/development/python-modules/cinemagoer/default.nix b/pkgs/development/python-modules/cinemagoer/default.nix new file mode 100644 index 000000000000..45d80c26b8b3 --- /dev/null +++ b/pkgs/development/python-modules/cinemagoer/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, lxml +, sqlalchemy +}: + +buildPythonPackage rec { + pname = "cinemagoer"; + version = "2022.2.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "8efe29dab44a7d275702f3160746015bd55c87b2eed85991dd57dda42594e6c6"; + }; + + propagatedBuildInputs = [ + lxml + sqlalchemy + ]; + + # Tests require networking, and https://github.com/cinemagoer/cinemagoer/issues/240 + doCheck = false; + + pythonImportsCheck = [ "imdb" ]; # Former "imdbpy", upstream is yet to rename here + + meta = with lib; { + description = "A Python package for retrieving and managing the data of the IMDb movie database about movies and people"; + downloadPage = "https://github.com/cinemagoer/cinemagoer/"; + homepage = "https://cinemagoer.github.io/"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/pkgs/development/python-modules/colorzero/default.nix b/pkgs/development/python-modules/colorzero/default.nix new file mode 100644 index 000000000000..4e74d9592a9b --- /dev/null +++ b/pkgs/development/python-modules/colorzero/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pkginfo +, sphinxHook +, sphinx-rtd-theme +, pytestCheckHook +}: + + +buildPythonPackage rec { + pname = "colorzero"; + version = "2.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "waveform80"; + repo = pname; + rev = "refs/tags/release-${version}"; + hash = "sha256-0NoQsy86OHQNLZsTEuF5s2MlRUoacF28jNeHgFKAH14="; + }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov" "" + ''; + + outputs = [ + "out" + "doc" + ]; + + nativeBuildInputs = [ + pkginfo + sphinx-rtd-theme + sphinxHook + ]; + + pythonImportsCheck = [ + "colorzero" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Yet another Python color library"; + homepage = "https://github.com/waveform80/colorzero"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 2da762f26d7d..f3a24d70fbf0 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro ? null, futures ? null, enum34 ? null }: buildPythonPackage rec { - version = "1.9.0"; + version = "1.9.2"; pname = "confluent-kafka"; src = fetchPypi { inherit pname version; - sha256 = "sha256-L4cARHNxjRl29XyeIzB8IW2vjL1H/6cRXvDOSJY8nGk="; + sha256 = "sha256-L7l70l1Da9Wf4HmIWqd6Oi8jz6zpxjWdRwAFNmWEkmI="; }; buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ; diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index dea9e8a33970..ead7e92f09c6 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.5.11"; + version = "1.5.15"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-VEiG2m9rCla6i8Q2KrO+0pnhxyFh4o/eCU5rDlbTAbs="; + sha256 = "sha256-HseJoQBgwi00u/0FDAN6i+tL0DWxvDN2XvQl6WDyNoA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gpiozero/default.nix b/pkgs/development/python-modules/gpiozero/default.nix new file mode 100644 index 000000000000..639c5f0f69b2 --- /dev/null +++ b/pkgs/development/python-modules/gpiozero/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, sphinx-rtd-theme +, sphinxHook +, colorzero +, mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "gpiozero"; + version = "1.6.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "gpiozero"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-dmFc3DNTlEajYQ5e8QK2WfehwYwAsWyG2cxKg5ykEaI="; + }; + + outputs = [ + "out" + "doc" + ]; + + nativeBuildInputs = [ + sphinx-rtd-theme + sphinxHook + ]; + + propagatedBuildInputs = [ + colorzero + ]; + + pythonImportsCheck = [ + "gpiozero" + "gpiozero.tools" + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + + meta = with lib; { + description = "A simple interface to GPIO devices with Raspberry Pi"; + homepage = "https://github.com/gpiozero/gpiozero"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index 920b487d836c..c2da89dc6c44 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "1.2.1"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = "greeclimate"; rev = "refs/tags/v${version}"; - hash = "sha256-SvAvLxWk/IIlkv54cUVN6FXj9rrM0QPKHAk36+PuqP0="; + hash = "sha256-4kR3Hc5M4FDG/WFtIW20a9d0vwLzmqtrlhd+teMiejA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 28e81a51d1cb..aba0bc17306d 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.8.2"; + version = "2022.8.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-eFWjzp1WCPZM2BTmPeUgo4QF5c6RU9Z7OQ87t9d3vPI="; + sha256 = "sha256-660AGPKOcTwiEA3Zs81pg88DzsDwAEuF8tYMg3KXAZw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index cab1482ed917..249c9abff842 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2021.12.1"; + version = "2022.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "sha256-Qr9K4+egrXD6eUgUtke2n7HyhXLthrju9ykXSI7Wl4Q="; + sha256 = "sha256-lQ28j4vOtxSjkMZXTKG+vesAN9KWj5T4sZ3QbaWP9Gw="; }; # Tests require network connection diff --git a/pkgs/development/python-modules/imdbpy/default.nix b/pkgs/development/python-modules/imdbpy/default.nix deleted file mode 100644 index f966a3f8d3c2..000000000000 --- a/pkgs/development/python-modules/imdbpy/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, lxml -, sqlalchemy -}: - -buildPythonPackage rec { - pname = "imdbpy"; - version = "2022.7.9"; - - src = fetchPypi { - pname = "IMDbPY"; - inherit version; - sha256 = "sha256-gKXt+KhxE/8ipE0A/XbUIsQs/uzU6oIL4zdTuPJL9OY="; - }; - - propagatedBuildInputs = [ - lxml - sqlalchemy - ]; - - # Tests require networking, and https://github.com/alberanid/imdbpy/issues/240 - doCheck = false; - - pythonImportsCheck = [ "imdb" ]; - - meta = with lib; { - description = "Python package for retrieving and managing the data of the IMDb database"; - homepage = "https://imdbpy.github.io/"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ ivar ]; - }; -} diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index 2ff30608fd7f..36b1e9f42d14 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "4.1.19"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oNIh9mRdPXai6SDfyvfoOrgsbVWyRYhJva+bsqgGOoo="; + hash = "sha256-d8RG/PSWPHvQy7o9tPLPGrEp0r/Y3JWwWoT3cS4iR38="; }; # Module has no tests diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix index 3b308c4d59e6..30e94d471157 100644 --- a/pkgs/development/python-modules/pyquil/default.nix +++ b/pkgs/development/python-modules/pyquil/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pyquil"; - version = "3.1.0"; + version = "3.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ejfzxCf2NucK/hfzswHu3h4DPPZQY8vkMAQ51XDRWKU="; + sha256 = "sha256-fxHFUy/3r01WOhZ4r9OMF7UD8YETIPYlB3heOgfugMM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index ada0ded7e79a..96601c6750ac 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -32,6 +32,11 @@ buildPythonPackage rec { hash = "sha256-WSsT+p23VctVt9A+WFKNHcgUHFijfT775eMF3RzaXDA="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "mailchecker >= 4.1.0, < 5.0.0" "mailchecker >= 4.1.0" + ''; + propagatedBuildInputs = [ mailchecker phonenumbers diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 6a7495041f7a..c9b344e5acf9 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "4.3.3"; + version = "4.3.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "sha256-+0H7Ojy5/K0EllNTSvGLNIZlglcMh76r9XHxFMUwrrY="; + sha256 = "sha256-fymO9WqkYaRsHKCJHQJpySHqZor2t8BfVrfYUfYoJno="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 56026e10fe0b..a6b2bc0d247a 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.7.0"; + version = "5.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - sha256 = "sha256-POYD4w0iBAdaN2L4cpLJz1aCE9J0Iob//VN94/5lJLw="; + sha256 = "sha256-KVaBSBWLeFJYiNJYTwoExExUmUaeNJ40c/WTgTc2Y/w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix index 83a7c4174d16..163ef44f0d14 100644 --- a/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, gpiozero , mock , pyserial , pyserial-asyncio @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "zigpy-zigate"; - version = "0.9.0"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,11 +22,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy-zigate"; - rev = "v${version}"; - hash = "sha256-rFmcgfn87XS1fvbSdJG6pItXRMkeogp4faKMe7pCxkM="; + rev = "refs/tags/${version}"; + hash = "sha256-H1R+wNUo/J5ATINHrkC4mJ8KKnBxVZUvF6X7y54aiVQ="; }; propagatedBuildInputs = [ + gpiozero pyserial pyserial-asyncio pyusb diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 65532ed23c4b..43cf5d59f81f 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.48.0"; + version = "0.49.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - sha256 = "sha256-usO5d2JLZ7tochQXmxEfRgxaW1KJew3RVbfWnew+bP4="; + sha256 = "sha256-mCqRqi7AUsrvfSOHyfK+WVj/4D7/4RDOYFWveS+tS/A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/database/trino-cli/default.nix b/pkgs/development/tools/database/trino-cli/default.nix index 1dbd242b1709..d68786a9ee68 100644 --- a/pkgs/development/tools/database/trino-cli/default.nix +++ b/pkgs/development/tools/database/trino-cli/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "trino-cli"; - version = "390"; + version = "392"; jarfilename = "${pname}-${version}-executable.jar"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/trino/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-rqs2rWmr5hv4F/tc7xWBgkNht/l3meJUnpEyOn2cU48="; + sha256 = "sha256-yqTKXmcRgsSSr4KAZ2NV7FrCGIxCU/V14XFEZmUTj1s="; }; dontUnpack = true; diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index a1a593f522b5..fd2231dbe413 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -23,7 +23,7 @@ let in rec { - electron = electron_19; + electron = electron_20; electron_9 = mkElectron "9.4.4" { x86_64-linux = "781d6ca834d415c71078e1c2c198faba926d6fce19e31448bbf4450869135450"; @@ -131,4 +131,13 @@ rec { aarch64-darwin = "f9042bce83fe8446e22f6885285dd5fc2dca048d0b89cbf7f326a46102ffc440"; headers = "09dbx4qh0rgp5mdm6srz6fgx12zq6b9jqq1k6l3gzyvwigi3wny1"; }; + + electron_20 = mkElectron "20.0.1" { + armv7l-linux = "6e1f216d0680fd1116ab378846ef9204bcd27916fa0f9bb510623a01c32bef9b"; + aarch64-linux = "60ebe86847b47d98ec16d259ee58a9dbd5fa7d84df6e23888ac1a340c9b9b467"; + x86_64-linux = "db6b9a6dd1d609fbf46cc7e2fd0f3ff317e59da85d037bce018cfc6810580c32"; + x86_64-darwin = "2ceea21ba4f79e1e9bea6d01e31a6339288a3d98adf23ac52a728bb22e55794c"; + aarch64-darwin = "42f251973d4ae90941f82898d4a2e21d7e4c899e920bc671aba03eedb871ee10"; + headers = "1xvi3w8x1knc103cxk4mkqb8xw4bp6if8lra527a8x2xan4syiq1"; + }; } diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index a8a5327d9ae7..fb4081336b9d 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "9.0.4"; + version = "9.1.2"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-eLHj8a64q+wxJaNfGS2phtuI2o4xmTWtXRVvjO80NyU="; + sha256 = "sha256-NqjUkEVjRz5xzom6lDb5eW5ARDFMCtJM/Bbhsx4y0io="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 00079c82c39c..63a2fd581269 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KSIbMKaLcVUM2k+WQ5V+kU/TUQQFWpsCBVs8TQW+3g4="; + sha256 = "sha256-d1rSmDPiVHpYbDPWQKkDhcJJklKlM1+vGdzvjICTT14="; }; buildInputs = [ zlib openssl ]; diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index ba33d689b646..37abb4aed03a 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,12 +2,12 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.61.tar.xz", + "name": "factorio_alpha_x64-1.1.65.tar.xz", "needsAuth": true, - "sha256": "1rgb3i6l9v5vv3qw0ngfxryamql2fhhqymv4dr86rxjy863rpx65", + "sha256": "0rzifli06s3k3gyzxpzzisxkvnvcidw4njkibrld2n5pwhjg8qbb", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.61/alpha/linux64", - "version": "1.1.61" + "url": "https://factorio.com/get-download/1.1.65/alpha/linux64", + "version": "1.1.65" }, "stable": { "name": "factorio_alpha_x64-1.1.61.tar.xz", @@ -38,12 +38,12 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.61.tar.xz", + "name": "factorio_headless_x64-1.1.65.tar.xz", "needsAuth": false, - "sha256": "0ndnc0f22bqjg1v6ah7i4nzghvk7cn73sgm22lf715di6f6srr38", + "sha256": "1h5ziip9jbqr03ci2fvf3zqwmy0l7m25br3rm5xv0af9wig9wvh1", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.61/headless/linux64", - "version": "1.1.61" + "url": "https://factorio.com/get-download/1.1.65/headless/linux64", + "version": "1.1.65" }, "stable": { "name": "factorio_headless_x64-1.1.61.tar.xz", diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index f765961266ed..4c537d4dd372 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, desktop-file-utils , gtk3, libX11, cmake, imagemagick , pkg-config, perl, wrapGAppsHook +, isMobile ? false }: stdenv.mkDerivation rec { @@ -26,6 +27,8 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; + NIX_CFLAGS_COMPILE = if isMobile then "-DSTYLUS_BASED" else ""; + buildInputs = [ gtk3 libX11 ]; postInstall = '' diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 1472027b0cb3..addfa0bdc80e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.8.1"; + version = "2022.8.2"; components = { "abode" = ps: with ps; [ abodepy @@ -1048,7 +1048,9 @@ "graphite" = ps: with ps; [ ]; "gree" = ps: with ps; [ + aiohttp-cors greeclimate + ifaddr ]; "greeneye_monitor" = ps: with ps; [ greeneye-monitor @@ -2235,7 +2237,8 @@ "remote" = ps: with ps; [ ]; "remote_rpi_gpio" = ps: with ps; [ - ]; # missing inputs: gpiozero pigpio + gpiozero + ]; # missing inputs: pigpio "renault" = ps: with ps; [ renault-api ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 8cbc601b5a9a..884e6f9401d3 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -112,9 +112,6 @@ let hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); - pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: { - doCheck = false; # requires pytest-aiohttp>=1.0.0 - }); pynws = super.pynws.overridePythonAttrs (oldAttrs: { doCheck = false; # requires pytest-aiohttp>=1.0.0 }); @@ -186,6 +183,20 @@ let }); }) + (self: super: { + pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec { + version = "102"; + src = fetchFromGitHub { + owner = "Kane610"; + repo = "deconz"; + rev = "refs/tags/v${version}"; + hash = "sha256-Dbhp/+xyyWhFcYp2VRnivn5d1JMR5hBctdArIzLKIjM="; + }; + doCheck = false; # requires pytest-aiohttp>=1.0.0 + }); + }) + + (self: super: { python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; @@ -296,7 +307,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.8.1"; + hassVersion = "2022.8.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -314,7 +325,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-0QhWusJ7vSiudigJTo4KiXqO0OWgIlvqkSpiK5FFI+g="; + hash = "sha256-82UPZmaSJVO0kmlGuY08vS3y5ai0NtSQ7ntkiOcNc2A="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 5d0170ec735c..b478ab4886bf 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -89,6 +89,7 @@ in buildPythonApplication rec { INCLUDE_DIRS = "${pam}/include"; nativeBuildInputs = [ + gobject-introspection pkg-config wrapGAppsHook pandoc @@ -119,7 +120,6 @@ in buildPythonApplication rec { ffmpeg gdk-pixbuf glib - gobject-introspection gtk3 librsvg libvpx diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index c997acd60ef2..df3953b030fd 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -35,11 +35,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.25.31"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.25.42"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-z5FA8Xmv8Abqh/ckYB5Bcgwrnd0FlHJQJi562tLZ3hE="; + hash = "sha256-5DH3Ik0DHmHfZ+XfFjmC2CL5WRoA9ENgzDeYfCgwtTI="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index c6cc5db40278..8bf7544fdba6 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kics"; - version = "1.5.12"; + version = "1.5.13"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - sha256 = "sha256-jHspStyjq5T9jzYDRYaf2gOI4F/X+h4nDn0PFUOHoBY="; + sha256 = "sha256-+trrtcK0zIjgl8SzURbvaabB/RtDKMEYyU8ZttD0hOs="; }; - vendorSha256 = "sha256-q5NuuP04kOoLVj210s17fIW2cxrsC/tAyET8YYGai0M="; + vendorSha256 = "sha256-/hoyT/PJ/nEQFg/1CJTb4lwOQ8ZYZtuHQeQUpPZepvc="; subPackages = [ "cmd/console" ]; diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix index b1d22d5ee3cb..f7a8f7ca92f4 100644 --- a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix +++ b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "realvnc-vnc-viewer"; - version = "6.22.207"; + version = "6.22.515"; src = { "x86_64-linux" = fetchurl { url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm"; - sha256 = "0jybfqj1svkb297ahyp07xf4b8qyb5h1l2kp50a50ivb6flqd3jr"; + sha256 = "1l9kfmb1695pv2v9hm8z5yr7y5yhadbbs61s4yf9ksvvfypzwrpn"; }; "i686-linux" = fetchurl { url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x86.rpm"; - sha256 = "06jmkd474nql6p3hnqwnwj5ac29m2021flnvf44mfhrhaa5wnpz6"; + sha256 = "15fi1siwbsxmy7qi6f8r8ym346a8mx3kqcp9mvwvx39wm3ija6dh"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "VNC remote desktop client software by RealVNC"; homepage = "https://www.realvnc.com/en/connect/download/viewer/"; + mainProgram = "vncviewer"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = { fullName = "VNC Connect End User License Agreement"; diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 072327de013c..64ddc3e3f463 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.12.2"; + version = "8.13.0"; outputs = [ "bin" "out" "man" "dev" ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "sha256-ffDJJWe/SzG+lppXEiyfXXL5KLdZgnMjv1SYnuYnh4c="; + sha256 = "sha256-N2jq68Vs/D+lZcIJVdjBLVaz2gK/TwqKeNfHUWdS3NA="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix new file mode 100644 index 000000000000..8b206c7b301b --- /dev/null +++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, qmake +, vulkan-loader +, wrapQtAppsHook +, withX11 ? true +, qtx11extras +}: + +stdenv.mkDerivation rec { + pname = "vulkan-caps-viewer"; + version = "3.24"; + + src = fetchFromGitHub { + owner = "SaschaWillems"; + repo = "VulkanCapsViewer"; + rev = "${version}"; + hash = "sha256-BSydAPZ74rGzW4UA/aqL2K/86NTK/eZqc3MZUbdq7iU="; + # Note: this derivation strictly requires vulkan-header to be the same it was developed against. + # To help they put in a git-submodule. + # It works with older vulkan-loaders. + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; + + buildInputs = [ + vulkan-loader + ] ++ lib.lists.optionals withX11 [ qtx11extras ]; + + patchPhase = '' + substituteInPlace vulkanCapsViewer.pro \ + --replace '/usr/' "/" + ''; + + qmakeFlags = [ + "DEFINES+=wayland" + "CONFIG+=release" + ] ++ lib.lists.optionals withX11 [ "DEFINES+=X11" ]; + + installFlags = [ "INSTALL_ROOT=$(out)" ]; + + meta = with lib; { + description = "Vulkan hardware capability viewer"; + longDescription = '' + Client application to display hardware implementation details for GPUs supporting the Vulkan API by Khronos. + The hardware reports can be submitted to a public online database that allows comparing different devices, browsing available features, extensions, formats, etc. + ''; + homepage = "https://vulkan.gpuinfo.org/"; + platforms = platforms.unix; + license = licenses.gpl2Only; + maintainers = with maintainers; [ pedrohlc ]; + }; +} diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 609df70be4d7..850b4fe920bd 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.32.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "sha256-3iizp1Dn6fxcNUgbK4RkD38Z7KrLUkZDDq3wnIPMjPY="; + sha256 = "sha256-gtRMoUEQEVoQXtA2PnVMLqrENUh5Jv8QiolqmeX5naQ="; }; vendorSha256 = "sha256-3ry93xV3KKtFoFGt2yxzMd4jx3QG2+8TBrEEywj7HPQ="; diff --git a/pkgs/tools/misc/outils/default.nix b/pkgs/tools/misc/outils/default.nix new file mode 100644 index 000000000000..065d641f4f30 --- /dev/null +++ b/pkgs/tools/misc/outils/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, lib }: + +stdenv.mkDerivation rec { + pname = "outils"; + version = "0.10"; + + src = fetchFromGitHub { + owner = "leahneukirchen"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-xYjILa0Km57q/xNP+M34r29WLGC15tzUNoUgPzQTtIs="; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + homepage = "https://github.com/leahneukirchen/outils"; + description = "Port of OpenBSD-exclusive tools such as `calendar`, `vis`, and `signify`"; + license = with licenses; [ + beerware + bsd2 + bsd3 + bsdOriginal + isc + mit + publicDomain + ]; + platforms = platforms.linux; + maintainers = with maintainers; [ somasis ]; + }; +} diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix index 1dddd4b64ce4..c199473179e9 100644 --- a/pkgs/tools/misc/ytfzf/default.nix +++ b/pkgs/tools/misc/ytfzf/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - hash = "sha256-IQ6YIHcFriqLAGoB8QhvWiYkI7Aq4RL12TL3c/N+YqE="; + hash = "sha256-nci2VXto9LptfNHBmLGxfMXQnzbVP1+GlvllOqWFGKU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/hysteria/default.nix b/pkgs/tools/networking/hysteria/default.nix new file mode 100644 index 000000000000..6807b509adc7 --- /dev/null +++ b/pkgs/tools/networking/hysteria/default.nix @@ -0,0 +1,29 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: +buildGoModule rec { + pname = "hysteria"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "HyNetwork"; + repo = "hysteria"; + rev = "v${version}"; + sha256 = "sha256-V+umf7+qRANSNsMrU1Vij3ni6ayq/d41xSy3o+7sEHQ="; + }; + + vendorSha256 = "sha256-oxCZ4+E3kffHr8ca9BKCSYcSWQ8jwpzrFs0fvCvZyJE="; + proxyVendor = true; + + # Network required + doCheck = false; + + meta = with lib; { + description = "A feature-packed proxy & relay utility optimized for lossy, unstable connections"; + homepage = "https://github.com/HyNetwork/hysteria"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ oluceps ]; + }; +} diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 1853c080166c..2fbdebebb10d 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -2,11 +2,11 @@ , autoreconfHook }: stdenv.mkDerivation rec { - version = "0.4.5"; + version = "0.6.0"; pname = "opkg"; src = fetchurl { url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "sha256-oSFKdfo0+5Io242kcwjg5xGxyT/Yk4zxZMEP0o61Dx4="; + sha256 = "sha256-VoRHIu/yN9rxSqbmgUNvMkUhPFWQ7QzaN6ed9jf/Okw="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix index 73e4f79cab80..3b9fa39c604d 100644 --- a/pkgs/tools/security/dnsrecon/default.nix +++ b/pkgs/tools/security/dnsrecon/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "dnsrecon"; - version = "1.1.1"; + version = "1.1.2"; format = "setuptools"; src = fetchFromGitHub { owner = "darkoperator"; repo = pname; rev = version; - hash = "sha256-zbFtaEklkfLkrqJAPptOqDTdWGbCE+3ZO79t68iqLIU="; + hash = "sha256-rOFDoQEIlwV02c2aJsovnhvaC2XTFq9mMEfilG+Gs4w="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/expliot/default.nix b/pkgs/tools/security/expliot/default.nix index eb5fd03416f1..4c0318ffa3be 100644 --- a/pkgs/tools/security/expliot/default.nix +++ b/pkgs/tools/security/expliot/default.nix @@ -12,6 +12,7 @@ let inherit version; sha256 = "0qiax309my534drk81lihq9ghngr96qnm40kbmgc9ay4fncqq6kh"; }; + doCheck = false; }); }; }; diff --git a/pkgs/tools/security/faraday-agent-dispatcher/default.nix b/pkgs/tools/security/faraday-agent-dispatcher/default.nix index af3c3f8347ea..1442bba07fb6 100644 --- a/pkgs/tools/security/faraday-agent-dispatcher/default.nix +++ b/pkgs/tools/security/faraday-agent-dispatcher/default.nix @@ -49,6 +49,7 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ "test_execute_agent" + "SSL" ]; disabledTestPaths = [ diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 951e45e04425..802230774a43 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.9.0"; + version = "8.10.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LH8iW2RsBq+mxGXR/RKsIqPWMqHNlhQ9Ye9Z/LOdmYQ="; + sha256 = "sha256-Qquqluf5uzJD5u15TPOrrzSnDPbrFKCBQPDW+7A6AQY="; }; vendorSha256 = "sha256-X8z9iKRR3PptNHwy1clZG8QsClsjbW45nZb2fHGfSYk="; diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 0b8bb97ec68c..fcdf35345819 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.82"; + version = "22.0"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "sha256-kFoOqMaejvlv8RnAcUPi03qrhV/Jcy8jQ4AQA1/eBsY="; + sha256 = "sha256-hjKF/fyV7/uQF6iJNOsRpX4Iw7aDURkdb7hbwfIDBPo="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 60eefa32c8b8..d8a6e01dade3 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -33,7 +33,6 @@ let luasocket luautf8 penlight - stdlib vstruct ] ++ lib.optionals (lib.versionOlder lua.luaversion "5.2") [ bit32 @@ -44,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.13.3"; + version = "0.14.1"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "0x8w63xr3nd0is1pv55dlgnv7fkn8s5ny6453wn84h44i7qwdc8s"; + sha256 = "1l0cl5rwpndn2zmcrydnd80cznpfr8m6v3s4qkx6n6q0lrcnxa56"; }; configureFlags = [ diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix index 3b876c530609..129f02e80172 100644 --- a/pkgs/tools/wayland/wl-mirror/default.nix +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -14,6 +14,7 @@ , pipectl , slurp , rofi +, scdoc }: let @@ -27,17 +28,17 @@ in stdenv.mkDerivation rec { pname = "wl-mirror"; - version = "0.11.2"; + version = "0.12.1"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "wl-mirror"; rev = "v${version}"; - hash = "sha256-D5uUKaepcSW9v2x6uBeLGXAyuLorlt4Lb6lZD/prfp8="; + hash = "sha256-XuwHHJfUKYugx0CKxkloJnpm6s5rHetinsZCSlLJ0Zg="; }; strictDeps = true; - nativeBuildInputs = [ cmake pkg-config wayland-scanner makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config wayland-scanner scdoc makeWrapper ]; buildInputs = [ libGL wayland wayland-protocols wlr-protocols bash ]; postPatch = '' @@ -49,6 +50,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DINSTALL_EXAMPLE_SCRIPTS=${if installExampleScripts then "ON" else "OFF"}" + "-DINSTALL_DOCUMENTATION=ON" ]; postInstall = lib.optionalString installExampleScripts '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54a82c162f71..bb4f26a9956c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5848,6 +5848,10 @@ with pkgs; zabbixctl = callPackage ../tools/misc/zabbixctl { }; + zee = callPackage ../applications/editors/zee { + inherit (darwin.apple_sdk.frameworks) Security; + }; + zeek = callPackage ../applications/networking/ids/zeek { }; zoekt = callPackage ../tools/text/zoekt { }; @@ -10033,6 +10037,8 @@ with pkgs; ouch = callPackage ../tools/compression/ouch { }; + outils = callPackage ../tools/misc/outils {}; + mpi = openmpi; # this attribute should used to build MPI applications ucx = callPackage ../development/libraries/ucx {}; @@ -15362,7 +15368,8 @@ with pkgs; electron_16 electron_17 electron_18 - electron_19; + electron_19 + electron_20; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -21634,6 +21641,8 @@ with pkgs; vtk = vtk_8; vtkWithQt5 = vtk_8_withQt5; + vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { }; + vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { }; vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { inherit (darwin) moltenvk; }; @@ -25998,6 +26007,10 @@ with pkgs; aucatctl = callPackage ../applications/audio/aucatctl { }; audacious = libsForQt5.callPackage ../applications/audio/audacious { }; + audacious-plugins = libsForQt5.callPackage ../applications/audio/audacious/plugins.nix { + # Avoid circular dependency + audacious = audacious.override { audacious-plugins = null; }; + }; audaciousQt5 = audacious; audacity-gtk2 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; }; @@ -27324,6 +27337,8 @@ with pkgs; fluxbox = callPackage ../applications/window-managers/fluxbox { }; + hackedbox = callPackage ../applications/window-managers/hackedbox { }; + fomp = callPackage ../applications/audio/fomp { }; formatter = callPackage ../applications/misc/formatter { }; @@ -33067,6 +33082,10 @@ with pkgs; sgtpuzzles = callPackage ../games/sgt-puzzles { }; + sgtpuzzles-mobile = callPackage ../games/sgt-puzzles { + isMobile = true; + }; + shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { }; shticker-book-unwritten = callPackage ../games/shticker-book-unwritten { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ba7623e80b7a..fd546e026b56 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -90,6 +90,7 @@ mapAliases ({ hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29 IMAPClient = imapclient; # added 2021-10-28 + imdbpy = throw "imdbpy has been renamed to cinemagoer"; # added 2022-08-08 ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 jupyter_client = jupyter-client; # added 2021-10-15 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 497940bfaa33..e70f9ea81b7a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1702,6 +1702,8 @@ in { ci-py = callPackage ../development/python-modules/ci-py { }; + cinemagoer = callPackage ../development/python-modules/cinemagoer { }; + circuit-webhook = callPackage ../development/python-modules/circuit-webhook { }; circuitbreaker = callPackage ../development/python-modules/circuitbreaker { }; @@ -1894,6 +1896,8 @@ in { colorthief = callPackage ../development/python-modules/colorthief { }; + colorzero = callPackage ../development/python-modules/colorzero { }; + colour = callPackage ../development/python-modules/colour { }; cometblue-lite = callPackage ../development/python-modules/cometblue-lite { }; @@ -3772,6 +3776,8 @@ in { gpapi = callPackage ../development/python-modules/gpapi { }; + gpiozero = callPackage ../development/python-modules/gpiozero { }; + gplaycli = callPackage ../development/python-modules/gplaycli { }; gpgme = toPythonModule (pkgs.gpgme.override { @@ -4288,8 +4294,6 @@ in { imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn { }; - imdbpy = callPackage ../development/python-modules/imdbpy { }; - img2pdf = callPackage ../development/python-modules/img2pdf { }; imgaug = callPackage ../development/python-modules/imgaug { };