diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 6e494fce69b2..233174d40831 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -141,6 +141,14 @@ rec { powerpc64le = "ppc64le"; }.${final.parsed.cpu.name} or final.parsed.cpu.name; + # Name used by UEFI for architectures. + efiArch = + if final.isx86_32 then "ia32" + else if final.isx86_64 then "x64" + else if final.isAarch32 then "arm" + else if final.isAarch64 then "aa64" + else final.parsed.cpu.name; + darwinArch = { armv7a = "armv7"; aarch64 = "arm64"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5e51f2641677..2195778492eb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14050,7 +14050,7 @@ name = "Dmitry Kalinkin"; }; victormignot = { - email = "victor.mignot@protonmail.com"; + email = "root@victormignot.fr"; github = "victormignot"; githubId = 58660971; name = "Victor Mignot"; diff --git a/nixos/lib/make-system-tarball.nix b/nixos/lib/make-system-tarball.nix index dab168f4a481..325792f97e8f 100644 --- a/nixos/lib/make-system-tarball.nix +++ b/nixos/lib/make-system-tarball.nix @@ -22,7 +22,7 @@ # Extra tar arguments , extraArgs ? "" # Command used for compression -, compressCommand ? "pixz" +, compressCommand ? "pixz -t" # Extension for the compressed tarball , compressionExtension ? ".xz" # extra inputs, like the compressor to use diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index c303b0bf17bc..f63b6c78f6da 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -49,7 +49,7 @@ rec { , extraPythonPackages ? (_ : []) , interactive ? {} } @ t: - runTest { + (evalTest { imports = [ { _file = "makeTest parameters"; config = t; } { @@ -59,7 +59,7 @@ rec { }; } ]; - }; + }).config; simpleTest = as: (makeTest as).test; diff --git a/nixos/lib/testing/call-test.nix b/nixos/lib/testing/call-test.nix index e3716bf163aa..9abcea07455e 100644 --- a/nixos/lib/testing/call-test.nix +++ b/nixos/lib/testing/call-test.nix @@ -4,13 +4,9 @@ let in { options = { - callTest = mkOption { - internal = true; - type = types.functionTo types.raw; - }; result = mkOption { internal = true; - default = config.test; + default = config; }; }; } diff --git a/nixos/lib/testing/default.nix b/nixos/lib/testing/default.nix index 676d52f5c3fb..9d4f9dbc43d7 100644 --- a/nixos/lib/testing/default.nix +++ b/nixos/lib/testing/default.nix @@ -2,7 +2,7 @@ let evalTest = module: lib.evalModules { modules = testModules ++ [ module ]; }; - runTest = module: (evalTest module).config.result; + runTest = module: (evalTest ({ config, ... }: { imports = [ module ]; result = config.test; })).config.result; testModules = [ ./call-test.nix diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index f73f10f0f369..b1efc00773dc 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -10,12 +10,12 @@ with lib; i18n = { glibcLocales = mkOption { type = types.path; - default = pkgs.buildPackages.glibcLocales.override { + default = pkgs.glibcLocales.override { allLocales = any (x: x == "all") config.i18n.supportedLocales; locales = config.i18n.supportedLocales; }; defaultText = literalExpression '' - pkgs.buildPackages.glibcLocales.override { + pkgs.glibcLocales.override { allLocales = any (x: x == "all") config.i18n.supportedLocales; locales = config.i18n.supportedLocales; } diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 6d0a11b7491f..35fa45dbc014 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -35,17 +35,21 @@ let ; /** - * Given a `config`, builds the default options. + * Builds the default options. */ - buildMenuGrub2 = config: - buildMenuAdditionalParamsGrub2 config "" - ; + buildMenuGrub2 = buildMenuAdditionalParamsGrub2 ""; + + targetArch = + if config.boot.loader.grub.forcei686 then + "ia32" + else + pkgs.stdenv.hostPlatform.efiArch; /** - * Given a `config` and params to add to `params`, build a set of default options. + * Given params to add to `params`, build a set of default options. * Use this one when creating a variant (e.g. hidpi) */ - buildMenuAdditionalParamsGrub2 = config: additional: + buildMenuAdditionalParamsGrub2 = additional: let finalCfg = { name = "NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel}"; @@ -53,6 +57,7 @@ let image = "/boot/${config.system.boot.loader.kernelFile}"; initrd = "/boot/initrd"; }; + in menuBuilderGrub2 finalCfg @@ -314,16 +319,16 @@ let # Menu entries # - ${buildMenuGrub2 config} + ${buildMenuGrub2} submenu "HiDPI, Quirks and Accessibility" --class hidpi --class submenu { ${grubMenuCfg} submenu "Suggests resolution @720p" --class hidpi-720p { ${grubMenuCfg} - ${buildMenuAdditionalParamsGrub2 config "video=1280x720@60"} + ${buildMenuAdditionalParamsGrub2 "video=1280x720@60"} } submenu "Suggests resolution @1080p" --class hidpi-1080p { ${grubMenuCfg} - ${buildMenuAdditionalParamsGrub2 config "video=1920x1080@60"} + ${buildMenuAdditionalParamsGrub2 "video=1920x1080@60"} } # If we boot into a graphical environment where X is autoran @@ -331,7 +336,7 @@ let # to disable this. submenu "Disable display-manager" --class quirk-disable-displaymanager { ${grubMenuCfg} - ${buildMenuAdditionalParamsGrub2 config "systemd.mask=display-manager.service"} + ${buildMenuAdditionalParamsGrub2 "systemd.mask=display-manager.service"} } # Some laptop and convertibles have the panel installed in an @@ -340,29 +345,29 @@ let submenu "" {return} submenu "Rotate framebuffer Clockwise" --class rotate-90cw { ${grubMenuCfg} - ${buildMenuAdditionalParamsGrub2 config "fbcon=rotate:1"} + ${buildMenuAdditionalParamsGrub2 "fbcon=rotate:1"} } submenu "Rotate framebuffer Upside-Down" --class rotate-180 { ${grubMenuCfg} - ${buildMenuAdditionalParamsGrub2 config "fbcon=rotate:2"} + ${buildMenuAdditionalParamsGrub2 "fbcon=rotate:2"} } submenu "Rotate framebuffer Counter-Clockwise" --class rotate-90ccw { ${grubMenuCfg} - ${buildMenuAdditionalParamsGrub2 config "fbcon=rotate:3"} + ${buildMenuAdditionalParamsGrub2 "fbcon=rotate:3"} } # As a proof of concept, mainly. (Not sure it has accessibility merits.) submenu "" {return} submenu "Use black on white" --class accessibility-blakconwhite { ${grubMenuCfg} - ${buildMenuAdditionalParamsGrub2 config "vt.default_red=0xFF,0xBC,0x4F,0xB4,0x56,0xBC,0x4F,0x00,0xA1,0xCF,0x84,0xCA,0x8D,0xB4,0x84,0x68 vt.default_grn=0xFF,0x55,0xBA,0xBA,0x4D,0x4D,0xB3,0x00,0xA0,0x8F,0xB3,0xCA,0x88,0x93,0xA4,0x68 vt.default_blu=0xFF,0x58,0x5F,0x58,0xC5,0xBD,0xC5,0x00,0xA8,0xBB,0xAB,0x97,0xBD,0xC7,0xC5,0x68"} + ${buildMenuAdditionalParamsGrub2 "vt.default_red=0xFF,0xBC,0x4F,0xB4,0x56,0xBC,0x4F,0x00,0xA1,0xCF,0x84,0xCA,0x8D,0xB4,0x84,0x68 vt.default_grn=0xFF,0x55,0xBA,0xBA,0x4D,0x4D,0xB3,0x00,0xA0,0x8F,0xB3,0xCA,0x88,0x93,0xA4,0x68 vt.default_blu=0xFF,0x58,0x5F,0x58,0xC5,0xBD,0xC5,0x00,0xA8,0xBB,0xAB,0x97,0xBD,0xC7,0xC5,0x68"} } # Serial access is a must! submenu "" {return} submenu "Serial console=ttyS0,115200n8" --class serial { ${grubMenuCfg} - ${buildMenuAdditionalParamsGrub2 config "console=ttyS0,115200n8"} + ${buildMenuAdditionalParamsGrub2 "console=ttyS0,115200n8"} } } @@ -431,19 +436,6 @@ let fsck.vfat -vn "$out" ''; # */ - # Name used by UEFI for architectures. - targetArch = - if pkgs.stdenv.isi686 || config.boot.loader.grub.forcei686 then - "ia32" - else if pkgs.stdenv.isx86_64 then - "x64" - else if pkgs.stdenv.isAarch32 then - "arm" - else if pkgs.stdenv.isAarch64 then - "aa64" - else - throw "Unsupported architecture"; - # Syslinux (and isolinux) only supports x86-based architectures. canx86BiosBoot = pkgs.stdenv.hostPlatform.isx86; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index bd5991448957..ba3ea4c47ac1 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -228,13 +228,16 @@ in ''; }; protocol = mkOption { - type = types.enum [ "ssh" "ssh-ng" ]; + type = types.enum [ null "ssh" "ssh-ng" ]; default = "ssh"; example = "ssh-ng"; description = lib.mdDoc '' The protocol used for communicating with the build machine. Use `ssh-ng` if your remote builder and your local Nix version support that improved protocol. + + Use `null` when trying to change the special localhost builder + without a protocol which is for example used by hydra. ''; }; system = mkOption { @@ -680,13 +683,15 @@ in concatMapStrings (machine: (concatStringsSep " " ([ - "${machine.protocol}://${optionalString (machine.sshUser != null) "${machine.sshUser}@"}${machine.hostName}" + "${optionalString (machine.protocol != null) "${machine.protocol}://"}${optionalString (machine.sshUser != null) "${machine.sshUser}@"}${machine.hostName}" (if machine.system != null then machine.system else if machine.systems != [ ] then concatStringsSep "," machine.systems else "-") (if machine.sshKey != null then machine.sshKey else "-") (toString machine.maxJobs) (toString machine.speedFactor) - (concatStringsSep "," (machine.supportedFeatures ++ machine.mandatoryFeatures)) - (concatStringsSep "," machine.mandatoryFeatures) + (let res = (machine.supportedFeatures ++ machine.mandatoryFeatures); + in if (res == []) then "-" else (concatStringsSep "," res)) + (let res = machine.mandatoryFeatures; + in if (res == []) then "-" else (concatStringsSep "," machine.mandatoryFeatures)) ] ++ optional (isNixAtLeast "2.4pre") (if machine.publicHostKey != null then machine.publicHostKey else "-"))) + "\n" diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index e11158f8a12b..6a98d5cb686d 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -80,7 +80,7 @@ let RestrictSUIDSGID = true; SupplementaryGroups = optional enableRedis redisServer.user; SystemCallArchitectures = "native"; - SystemCallFilter = [ "@system-service" "~@privileged @resources @setuid @keyring" ]; + SystemCallFilter = [ "@system-service" "~@privileged @setuid @keyring" ]; # Does not work well with the temporary root #UMask = "0066"; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ed09aa9e8e4c..011d7b11b4f8 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -45,9 +45,9 @@ let inherit (rec { - doRunTest = arg: (import ../lib/testing-python.nix { inherit system pkgs; }).runTest { - imports = [ arg { inherit callTest; } ]; - }; + doRunTest = arg: ((import ../lib/testing-python.nix { inherit system pkgs; }).evalTest { + imports = [ arg ]; + }).config.result; findTests = tree: if tree?recurseForDerivations && tree.recurseForDerivations then @@ -198,7 +198,6 @@ in { ferm = handleTest ./ferm.nix {}; firefox = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox; }; firefox-esr = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr; }; # used in `tested` job - firefox-esr-91 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-91; }; firefox-esr-102 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-102; }; firejail = handleTest ./firejail.nix {}; firewall = handleTest ./firewall.nix {}; diff --git a/pkgs/applications/audio/codecserver/default.nix b/pkgs/applications/audio/codecserver/default.nix index 8a5c3d842d4d..d1bcf82115ef 100644 --- a/pkgs/applications/audio/codecserver/default.nix +++ b/pkgs/applications/audio/codecserver/default.nix @@ -24,6 +24,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ protobuf ]; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/codecserver.pc \ + --replace '=''${prefix}//' '=/' \ + --replace '=''${exec_prefix}//' '=/' + ''; + meta = with lib; { homepage = "https://github.com/jketterl/codecserver"; description = "Modular audio codec server"; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 45b25ec3d8af..1c0ddd1942d3 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "fluidsynth"; - version = "2.2.8"; + version = "2.2.9"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - sha256 = "sha256-zJMe2skFeXhrAx9vBcTXWJLfivI/iXyc0JFlNKpBETQ="; + sha256 = "sha256-8vsYn/4qkANp6f6avtdaXHfJD+9NTHTrl7i4RTlKXPQ="; }; nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ]; diff --git a/pkgs/applications/audio/munt/libmt32emu.nix b/pkgs/applications/audio/munt/libmt32emu.nix index fdd9e6fac89d..d8b2ae1510cc 100644 --- a/pkgs/applications/audio/munt/libmt32emu.nix +++ b/pkgs/applications/audio/munt/libmt32emu.nix @@ -28,6 +28,12 @@ stdenv.mkDerivation rec { "-Dmunt_WITH_MT32EMU_QT=OFF" ]; + postFixup = '' + substituteInPlace "$dev"/lib/pkgconfig/mt32emu.pc \ + --replace '=''${exec_prefix}//' '=/' \ + --replace "$dev/$dev/" "$dev/" + ''; + meta = with lib; { homepage = "http://munt.sourceforge.net/"; description = "A library to emulate Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index 3f7e1e038f8e..4b50ff3e7ea0 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -28,9 +28,14 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection python3Packages.poetry-core + python3Packages.pythonRelaxDepsHook wrapGAppsHook ]; + # Can be removed in later versions + # https://gitlab.com/sublime-music/sublime-music/-/issues/343 + pythonRelaxDeps = [ "python-mpv" ]; + buildInputs = [ gtk3 pango diff --git a/pkgs/applications/blockchains/taro/default.nix b/pkgs/applications/blockchains/taro/default.nix new file mode 100644 index 000000000000..ef2c71ebd6fa --- /dev/null +++ b/pkgs/applications/blockchains/taro/default.nix @@ -0,0 +1,29 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "taro"; + version = "0.1.0-alpha"; + + src = fetchFromGitHub { + owner = "lightninglabs"; + repo = "taro"; + rev = "v${version}"; + sha256 = "sha256-0kEdGHi+R9Ns3cVgHSpK/GMVqi8xU/xV831ogV2ErYM="; + }; + + vendorSha256 = "sha256-huQZy62lx82lmuCQ7RQ+7SLMJIBYKfXbw+2ZkswPXxw="; + + subPackages = [ "cmd/tarocli" "cmd/tarod" ]; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Daemon for the Taro protocol specification"; + homepage = "https://github.com/lightninglabs/taro"; + license = licenses.mit; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/applications/blockchains/zecwallet-lite/default.nix b/pkgs/applications/blockchains/zecwallet-lite/default.nix index 2a15d2fa9233..e3aad8cb0c5f 100644 --- a/pkgs/applications/blockchains/zecwallet-lite/default.nix +++ b/pkgs/applications/blockchains/zecwallet-lite/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { pname = "zecwallet-lite"; - version = "1.7.13"; + version = "1.8.8"; src = fetchurl { url = "https://github.com/adityapk00/zecwallet-lite/releases/download/v${version}/Zecwallet.Lite-${version}.AppImage"; - hash = "sha256-uBiLGHBgm0vurfvOJjJ+RqVoGnVccEHTFO2T7LDqUzU="; + hash = "sha256-6jppP3V7R8tCR5Wv5UWfbWKkAdsgrCjSiO/bbpLNcw4="; }; extraInstallCommands = @@ -14,9 +14,9 @@ appimageTools.wrapType2 rec { in '' mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${contents}/${pname}.desktop -t $out/share/applications - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + install -m 444 -D ${contents}/zecwallet-lite.desktop -t $out/share/applications + substituteInPlace $out/share/applications/zecwallet-lite.desktop \ + --replace 'Exec=AppRun' "Exec=$out/bin/zecwallet-lite" cp -r ${contents}/usr/share/icons $out/share ''; diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index 715b7ee9c68c..c9af2f89627f 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -17,26 +17,30 @@ , ApplicationServices , Carbon , AppKit +, wrapGAppsHook +, gobject-introspection }: rustPlatform.buildRustPackage rec { pname = "lapce"; - version = "0.1.2"; + version = "unstable-2022-09-21"; src = fetchFromGitHub { owner = "lapce"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-jH473FdBI3rGt90L3WwMDPP8M3w0rtG5D758ceCMw94="; + rev = "c5a924ef34250e9117e2b57c19c1f29f6b9b3ea7"; + sha256 = "sha256-0nAUbtokDgSxPcJCa9xGM8Rpbu282o7OHAQtAfdNmJU="; }; - cargoSha256 = "sha256-0Kya2KcyBDlt0TpFV60VAA3+JPfwId/+k8k+H97EhB0="; + cargoSha256 = "sha256-uIFC5x8TzsvTGylQ0AttIRAUWU0k0P7UeF96vUc7cKw="; nativeBuildInputs = [ cmake pkg-config perl copyDesktopItems + wrapGAppsHook # FIX: No GSettings schemas are installed on the system + gobject-introspection ]; # Get openssl-sys to use pkg-config diff --git a/pkgs/applications/editors/neovim/build-neovim-plugin.nix b/pkgs/applications/editors/neovim/build-neovim-plugin.nix index cb69b5ecacdb..f89d36741e94 100644 --- a/pkgs/applications/editors/neovim/build-neovim-plugin.nix +++ b/pkgs/applications/editors/neovim/build-neovim-plugin.nix @@ -20,7 +20,7 @@ in }@attrs: let originalLuaDrv = lua51Packages.${luaAttr}; - luaDrv = lua51Packages.lib.overrideLuarocks originalLuaDrv (drv: { + luaDrv = lua51Packages.luaLib.overrideLuarocks originalLuaDrv (drv: { extraConfig = '' -- to create a flat hierarchy lua_modules_path = "lua" diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index 660a86903555..3fed7fda38ac 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -7,7 +7,6 @@ , pkgs }: let - inherit (vimUtils) buildVimPluginFrom2Nix; inherit (neovimUtils) makeNeovimConfig; packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; @@ -69,12 +68,12 @@ let # this plugin checks that it's ftplugin/vim.tex is loaded before $VIMRUNTIME/ftplugin/vim.tex # the answer is store in `plugin_was_loaded_too_late` in the cwd - texFtplugin = pkgs.runCommandLocal "tex-ftplugin" {} '' + texFtplugin = (pkgs.runCommandLocal "tex-ftplugin" {} '' mkdir -p $out/ftplugin echo 'call system("echo ". exists("b:did_ftplugin") . " > plugin_was_loaded_too_late")' > $out/ftplugin/tex.vim echo ':q!' >> $out/ftplugin/tex.vim echo '\documentclass{article}' > $out/main.tex - ''; + '') // { pname = "test-ftplugin"; }; # neovim-drv must be a wrapped neovim runTest = neovim-drv: buildCommand: @@ -140,7 +139,7 @@ rec { nvim_with_ftplugin = neovim.override { extraName = "-with-ftplugin"; - configure.packages.plugins = with pkgs.vimPlugins; { + configure.packages.plugins = { start = [ texFtplugin ]; diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index feb5f9637ba1..d5845ac4a66a 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -116,8 +116,8 @@ let ] ++ lib.optionals (binPath != "") [ "--suffix" "PATH" ":" binPath ] ++ lib.optionals (luaEnv != null) [ - "--prefix" "LUA_PATH" ";" (neovim-unwrapped.lua.pkgs.lib.genLuaPathAbsStr luaEnv) - "--prefix" "LUA_CPATH" ";" (neovim-unwrapped.lua.pkgs.lib.genLuaCPathAbsStr luaEnv) + "--prefix" "LUA_PATH" ";" (neovim-unwrapped.lua.pkgs.luaLib.genLuaPathAbsStr luaEnv) + "--prefix" "LUA_CPATH" ";" (neovim-unwrapped.lua.pkgs.luaLib.genLuaCPathAbsStr luaEnv) ]; manifestRc = vimUtils.vimrcContent ({ customRC = ""; }) ; diff --git a/pkgs/applications/editors/sublime/4/packages.nix b/pkgs/applications/editors/sublime/4/packages.nix index 0742ee42b215..5d03b2083728 100644 --- a/pkgs/applications/editors/sublime/4/packages.nix +++ b/pkgs/applications/editors/sublime/4/packages.nix @@ -11,9 +11,9 @@ in } {}; sublime4-dev = common { - buildVersion = "4136"; + buildVersion = "4137"; dev = true; - x64sha256 = "6cSaF8seS3XpXpoaROO5tpVuwJzE+z1kzwxNlOUadj0="; - aarch64sha256 = "Mtib8i29FCFutRXmWPQSp9h/FcLD7+wv+tGAjwf9d3w="; + x64sha256 = "oGBPoqVwTIQfIzh/8fEOOrZkrbzT0tG23ASeHbN/OMk="; + aarch64sha256 = "7mqYSoggfrcRoDh+QfA4rW0qvF2ZpiUY5yVxhxZKsfE="; } {}; } diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 016d8ad02d60..66369c266d60 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "9.0.0244"; + version = "9.0.0609"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-l6fLM6+tc1Wy1mjNPa/s73GKhhGBLz3OXUJgJN1wuxY="; + hash = "sha256-UBj3pXY6rdekKnCX/V/4o8LLBMZkNs1U4Z4KuvisIYQ="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index c80dcb80949a..1692a81c3d6c 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -5,6 +5,7 @@ , fetchFromGitHub, runtimeShell , python3 , callPackage, makeSetupHook +, linkFarm }: /* @@ -165,6 +166,10 @@ let rtpPath = "."; + vimFarm = prefix: name: drvs: + let mkEntryFromDrv = drv: { name = "${prefix}/${drv.pname}"; path = drv; }; + in linkFarm name (map mkEntryFromDrv drvs); + /* Generates a packpath folder as expected by vim Example: packDir (myVimPackage.{ start = [ vimPlugins.vim-fugitive ]; opt = [] }) @@ -172,16 +177,6 @@ let */ packDir = packages: let - linkVimlPlugin = plugin: packageName: dir: '' - mkdir -p $out/pack/${packageName}/${dir} - if test -e "$out/pack/${packageName}/${dir}/${lib.getName plugin}"; then - printf "\nERROR - Duplicated vim plugin: ${lib.getName plugin}\n\n" - exit 1 - fi - ln -sf ${plugin}/${rtpPath} $out/pack/${packageName}/${dir}/${lib.getName plugin} - ''; - - packageLinks = packageName: {start ? [], opt ? []}: let # `nativeImpl` expects packages to be derivations, not strings (as @@ -194,26 +189,23 @@ let python3Env = python3.withPackages (ps: lib.flatten (builtins.map (plugin: (plugin.python3Dependencies or (_: [])) ps) allPlugins) ); - in - [ "mkdir -p $out/pack/${packageName}/start" ] - # To avoid confusion, even dependencies of optional plugins are added - # to `start` (except if they are explicitly listed as optional plugins). - ++ (builtins.map (x: linkVimlPlugin x packageName "start") allPlugins) - ++ ["mkdir -p $out/pack/${packageName}/opt"] - ++ (builtins.map (x: linkVimlPlugin x packageName "opt") opt) + + packdirStart = vimFarm "pack/${packageName}/start" "packdir-start" allPlugins; + packdirOpt = vimFarm "pack/${packageName}/opt" "packdir-opt" opt; # Assemble all python3 dependencies into a single `site-packages` to avoid doing recursive dependency collection # for each plugin. # This directory is only for python import search path, and will not slow down the startup time. - ++ [ - "mkdir -p $out/pack/${packageName}/start/__python3_dependencies" - "ln -s ${python3Env}/${python3Env.sitePackages} $out/pack/${packageName}/start/__python3_dependencies/python3" - ]; + # see :help python3-directory for more details + python3link = runCommand "vim-python3-deps" {} '' + mkdir -p $out/pack/${packageName}/start/__python3_dependencies + ln -s ${python3Env}/${python3Env.sitePackages} $out/pack/${packageName}/start/__python3_dependencies/python3 + ''; + in + [ packdirStart packdirOpt python3link ]; in - stdenv.mkDerivation { - name = "vim-pack-dir"; - src = ./.; - installPhase = lib.concatStringsSep "\n" (lib.flatten (lib.mapAttrsToList packageLinks packages)); - preferLocalBuild = true; + buildEnv { + name = "vim-pack-dir"; + paths = (lib.flatten (lib.mapAttrsToList packageLinks packages)); }; nativeImpl = packages: diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index fb23a791ab5c..a7936404015f 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1453,6 +1453,8 @@ let }; }; + jebbs.plantuml = callPackage ./jebbs.plantuml {}; + jnoortheen.nix-ide = buildVscodeMarketplaceExtension { mktplcRef = { name = "nix-ide"; diff --git a/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix b/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix new file mode 100644 index 000000000000..c54e975e4f46 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix @@ -0,0 +1,27 @@ +{ lib, vscode-utils, plantuml, jq, moreutils }: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "plantuml"; + publisher = "jebbs"; + version = "2.17.4"; + sha256 = "sha256-fnz6ubB73i7rJcv+paYyNV1r4cReuyFPjgPM0HO40ug="; + }; + nativeBuildInputs = [ jq moreutils ]; + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."plantuml.java".default = "${plantuml}/bin/plantuml"' package.json | sponge package.json + ''; + + meta = with lib; { + description = "A Visual Studio Code extension for supporting Rich PlantUML"; + downloadPage = + "https://marketplace.visualstudio.com/items?itemName=jebbs.plantuml"; + homepage = "https://github.com/qjebbs/vscode-plantuml"; + changelog = + "https://marketplace.visualstudio.com/items/jebbs.plantuml/changelog"; + license = licenses.mit; + maintainers = with maintainers; [ victormignot ]; + }; +} + diff --git a/pkgs/applications/editors/vscode/extensions/python/default.nix b/pkgs/applications/editors/vscode/extensions/python/default.nix index 8ca353c8479a..e72c89511aed 100644 --- a/pkgs/applications/editors/vscode/extensions/python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/python/default.nix @@ -6,14 +6,21 @@ # Use version from `PATH` for default setting otherwise. # Defaults to `false` as we expect it to be project specific most of the time. , pythonUseFixed ? false + # For updateScript +, writeScript +, bash +, curl +, coreutils +, gnused +, nix }: -vscode-utils.buildVscodeMarketplaceExtension { +vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2022.11.11881005"; - sha256 = "sha256-8NH/aWIAwSpVRi3cvBCpvO8MVzIoRaXxADmWp6DuUb8="; + version = "2022.15.12711056"; + sha256 = "sha256-bksUMN+ZdkmElVD8BC4ihklQyWlKkcpep2VOwUzISnQ="; }; buildInputs = [ icu ]; @@ -41,7 +48,37 @@ vscode-utils.buildVscodeMarketplaceExtension { --replace "\"default\": \"python\"" "\"default\": \"${python3.interpreter}\"" ''; + passthru.updateScript = writeScript "update" '' + #! ${bash}/bin/bash + + set -eu -o pipefail + + export PATH=${lib.makeBinPath [ + curl + coreutils + gnused + nix + ]} + + api=$(curl -s 'https://marketplace.visualstudio.com/_apis/public/gallery/extensionquery' \ + -H 'accept: application/json;api-version=3.0-preview.1' \ + -H 'content-type: application/json' \ + --data-raw '{"filters":[{"criteria":[{"filterType":7,"value":"${mktplcRef.publisher}.${mktplcRef.name}"}]}],"flags":512}') + version=$(echo $api | sed -n -E 's|^.*"version":"([0-9.]+)".*$|\1|p') + + if [[ $version != ${mktplcRef.version} ]]; then + tmp=$(mktemp) + curl -sLo $tmp $(echo ${(import ../mktplcExtRefToFetchArgs.nix mktplcRef).url} | sed "s|${mktplcRef.version}|$version|") + hash=$(nix hash file --type sha256 --base32 --sri $tmp) + sed -i -e "s|${mktplcRef.sha256}|$hash|" -e "s|${mktplcRef.version}|$version|" pkgs/applications/editors/vscode/extensions/python/default.nix + fi + ''; + meta = with lib; { + description = "A Visual Studio Code extension with rich support for the Python language"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.python"; + homepage = "https://github.com/Microsoft/vscode-python"; + changelog = "https://github.com/microsoft/vscode-python/releases"; license = licenses.mit; platforms = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ]; maintainers = with maintainers; [ jraygauthier jfchevrette ]; diff --git a/pkgs/applications/emulators/ruffle/default.nix b/pkgs/applications/emulators/ruffle/default.nix index 784ea69d3979..80dc86643eb8 100644 --- a/pkgs/applications/emulators/ruffle/default.nix +++ b/pkgs/applications/emulators/ruffle/default.nix @@ -9,27 +9,39 @@ , wayland , xorg , vulkan-loader +, jre_minimal +, cairo +, gtk3 +, wrapGAppsHook +, gsettings-desktop-schemas +, glib }: rustPlatform.buildRustPackage rec { pname = "ruffle"; - version = "nightly-2022-02-02"; + version = "nightly-2022-09-26"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = pname; rev = version; - sha256 = "sha256-AV3zGfWacYdkyxHED1nGwTqRHhXpybaCVnudmHqWvqw="; + sha256 = "sha256-o0geKXODFRPKN4JgW+Sg16uPhBS5rrlMCmFSc9AcNPQ="; }; nativeBuildInputs = [ + glib + gsettings-desktop-schemas + jre_minimal makeWrapper pkg-config python3 + wrapGAppsHook ]; buildInputs = [ alsa-lib + cairo + gtk3 openssl wayland xorg.libX11 @@ -41,14 +53,25 @@ rustPlatform.buildRustPackage rec { vulkan-loader ]; - postInstall = '' + dontWrapGApps = true; + + postFixup = '' # This name is too generic mv $out/bin/exporter $out/bin/ruffle_exporter - wrapProgram $out/bin/ruffle_desktop --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib + vulkanWrapperArgs+=( + --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib + ) + + wrapProgram $out/bin/ruffle_exporter \ + "''${vulkanWrapperArgs[@]}" + + wrapProgram $out/bin/ruffle_desktop \ + "''${vulkanWrapperArgs[@]}" \ + "''${gappsWrapperArgs[@]}" ''; - cargoSha256 = "sha256-LP9aHcey+e3fqtWdOkqF5k8dwjdAOKpP+mKGxFhTte0="; + cargoSha256 = "sha256-erqBuU66k7SGG9ueyYEINjeXbyC7A2I/r1bBqdsJemY="; meta = with lib; { description = "An Adobe Flash Player emulator written in the Rust programming language."; diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index c755b0fb6678..9ae2d97a3d28 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -120,7 +120,7 @@ in python.pkgs.buildPythonApplication rec { pypdf2 pyserial python-dateutil - ldap + python-ldap python-stdnum pytz pyusb diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 6b991e8dd398..4b421b41d9a3 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "497"; + version = "500"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-dQ6a3jys6V1ihT6q8FUaX7jOA1ZDZdX5EUy03ILk7vM="; + sha256 = "sha256-gsOto37++++ucpDC0ri3HhROp7v6qlHENjFvsbuyM6k="; }; nativeBuildInputs = [ @@ -33,7 +33,6 @@ python3Packages.buildPythonPackage rec { html5lib lxml lz4 - nose numpy opencv4 pillow diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index 291d63d11a0d..a05dbc28be02 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "kodelife"; - version = "1.0.5.161"; + version = "1.0.6.163"; suffix = { aarch64-linux = "linux-arm64"; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; hash = { - aarch64-linux = "sha256-6QZ5jCxINCH46GQx+V68FpkIAOIOFw4Kd0tUQTKBRzU="; - armv7l-linux = "sha256-eToNjPttY62EzNuRSVvJsHttO6Ux6LXRPRuuIKnvaxM="; - x86_64-linux = "sha256-5M2tgpF74RmrCLI44RBNXK5t0hMAOHtmcjWu7fypc0U="; + aarch64-linux = "sha256-BbNk/YfTx/J8ApgdiY/thnD2MFUUCSQt/CMjkewLcL0="; + armv7l-linux = "sha256-fp4YM2BgyTr4vvxw5FaqKyGm608q8fOpB3gAgPA9UQ4="; + x86_64-linux = "sha256-sLRdU/UW2JORAUOPzmr+VUkcLoesrshjdLvDCizX0iM="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index b93b4794db81..7f1ba67acce6 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -23,6 +23,7 @@ let in buildPythonApplication rec { pname = "mypaint"; version = "2.0.1"; + format = "other"; src = fetchFromGitHub { owner = "mypaint"; @@ -48,6 +49,7 @@ in buildPythonApplication rec { wrapGAppsHook gobject-introspection # for setup hook hicolor-icon-theme # fór setup hook + python3.pkgs.setuptools ]; buildInputs = [ diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/applications/misc/chrysalis/default.nix index 8c455a725cc1..749dc4b8e863 100644 --- a/pkgs/applications/misc/chrysalis/default.nix +++ b/pkgs/applications/misc/chrysalis/default.nix @@ -2,7 +2,7 @@ let pname = "chrysalis"; - version = "0.9.4"; + version = "0.11.5"; in appimageTools.wrapAppImage rec { name = "${pname}-${version}-binary"; @@ -10,7 +10,7 @@ in appimageTools.wrapAppImage rec { inherit name; src = fetchurl { url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; - sha256 = "sha256-DAJGS1vKOOLMRgMczAiEfrT9awRNjz9r/MEr4ZFc3Bo="; + sha256 = "sha256-3GdObGW91nDqOAlHcaI/4wnbl2EG2RGGzpwY+XYQ0u4="; }; }; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 8f7ab1e5f9e0..2973ac81539c 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gpxsee"; - version = "11.4"; + version = "11.5"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - hash = "sha256-aePX82B810I45n2t0OVCt1FlmkVKWgNgzCD71lYyngU="; + hash = "sha256-bA5C+BFqeOS0oFgz/qlYOFMsuh3L/U6QJbzOcRQkNhY="; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/inlyne/default.nix b/pkgs/applications/misc/inlyne/default.nix new file mode 100644 index 000000000000..6d78dd559c26 --- /dev/null +++ b/pkgs/applications/misc/inlyne/default.nix @@ -0,0 +1,76 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, pkg-config +, fontconfig +, libXcursor +, libXi +, libXrandr +, libxcb +, libGL +, libX11 +, openssl +, AppKit +, ApplicationServices +, CoreFoundation +, CoreGraphics +, CoreServices +, CoreText +, CoreVideo +, Foundation +, Metal +, QuartzCore +, Security +, libobjc +}: + +rustPlatform.buildRustPackage rec { + pname = "inlyne"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "trimental"; + repo = pname; + rev = "v${version}"; + sha256 = "1y8nxz20agmrdcl25wry8lnpg86zbkkkkiscljwd7g7a831hlb9z"; + }; + + cargoSha256 = "sha256-NXVwydEn4hX/4NorDx6eE+sWQXj1jwZgzpDE3wg8OkU="; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + + buildInputs = lib.optionals stdenv.isLinux [ + fontconfig + libXcursor + libXi + libXrandr + libxcb + openssl + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + ApplicationServices + CoreFoundation + CoreGraphics + CoreServices + CoreText + CoreVideo + Foundation + Metal + QuartzCore + Security + libobjc + ]; + + postFixup = lib.optionalString stdenv.isLinux '' + patchelf $out/bin/inlyne \ + --add-rpath ${lib.makeLibraryPath [ libGL libX11 ]} + ''; + + meta = with lib; { + description = "A GPU powered browserless markdown viewer"; + homepage = "https://github.com/trimental/inlyne"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix index 6a6e66f293bd..ca942ca72d47 100644 --- a/pkgs/applications/misc/maliit-framework/default.nix +++ b/pkgs/applications/misc/maliit-framework/default.nix @@ -1,6 +1,7 @@ { mkDerivation , lib , fetchFromGitHub +, fetchpatch , at-spi2-atk , at-spi2-core @@ -32,6 +33,15 @@ mkDerivation rec { sha256 = "138jyvw130kmrldksbk4l38gvvahh3x51zi4vyplad0z5nxmbazb"; }; + # in master post 2.2.1, see https://github.com/maliit/framework/issues/106 + patches = [ + (fetchpatch { + name = "fix-pkg-config.patch"; + url = "https://github.com/maliit/framework/commit/1e20a4a5113f1c092295f5a5f04ab6e584f6fcff.patch"; + sha256 = "0h7jfqnqvjka626wx2z2g150rch4air7q3zbq59gcb12g7x6gfyn"; + }) + ]; + buildInputs = [ at-spi2-atk at-spi2-core diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/applications/misc/rofi-rbw/default.nix index a02d486ca9e5..28602cf0240e 100644 --- a/pkgs/applications/misc/rofi-rbw/default.nix +++ b/pkgs/applications/misc/rofi-rbw/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, configargparse }: +{ lib, buildPythonApplication, fetchFromGitHub, configargparse, setuptools }: buildPythonApplication rec { pname = "rofi-rbw"; @@ -12,6 +12,10 @@ buildPythonApplication rec { hash = "sha256-YDL0pMl3BX59kzjuykn0lQHu2RMvPhsBrlSiqdcZAXs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ configargparse ]; pythonImportsCheck = [ "rofi_rbw" ]; diff --git a/pkgs/applications/misc/rofimoji/default.nix b/pkgs/applications/misc/rofimoji/default.nix index 45b12bab89e3..371da82e2b07 100644 --- a/pkgs/applications/misc/rofimoji/default.nix +++ b/pkgs/applications/misc/rofimoji/default.nix @@ -1,6 +1,7 @@ { buildPythonApplication , fetchFromGitHub , lib +, python3 , waylandSupport ? true , x11Support ? true @@ -25,6 +26,10 @@ buildPythonApplication rec { sha256 = "sha256-6W/59DjxrgejHSkNxpruDAws812Vjyf+GePDPbXzVbc="; }; + nativeBuildInputs = [ + python3.pkgs.setuptools + ]; + # `rofi` and the `waylandSupport` and `x11Support` dependencies # contain binaries needed at runtime. propagatedBuildInputs = with lib; [ configargparse rofi ] diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index 3972d7a17230..b42fbe12ffeb 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "whalebird"; - version = "4.6.0"; + version = "4.6.5"; src = let downloads = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}"; @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { if stdenv.system == "x86_64-linux" then fetchurl { url = downloads + "/Whalebird-${version}-linux-x64.tar.bz2"; - sha256 = "02f2f4b7184494926ef58523174acfa23738d5f27b4956d094836a485047c2f8"; + sha256 = "sha256-WeZnWEwRbZEnYkLwWf6EC3ZbwI+Cr59czdKxxG/Lhn0="; } else if stdenv.system == "aarch64-linux" then fetchurl { url = downloads + "/Whalebird-${version}-linux-arm64.tar.bz2"; - sha256 = "de0cdf7cbd6f0305100a2440e2559ddce0a5e4ad73a341874d6774e23dc76974"; + sha256 = "sha256-5iKVP7zOci5X+EhnfJx5cZ5RiqZKz1pFLDUwZncynUc="; } else throw "Whalebird is not supported for ${stdenv.system}"; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # Necessary steps to find the tray icon asar extract opt/Whalebird/resources/app.asar "$TMP/work" substituteInPlace $TMP/work/dist/electron/main.js \ - --replace "Do,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\"" + --replace "Ao,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\"" asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" opt/Whalebird/resources/app.asar runHook postBuild diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 8221f88c06e4..fc3c98f4f36b 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "106.0b2"; + version = "106.0b5"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/ach/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ach/firefox-106.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "e6751881f8fb534d18de09f0dd9fd55f32e15d8cb9f71bdd46477967fcc07676"; + sha256 = "bea7f87f3a7b29f3c096f49f2ab94e51856cb442e7f1761094f8f52bde5eb059"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/af/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/af/firefox-106.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "463d7b34617a2e0b52c26287ce45e359023ebb7c0ba232cf88e6ff8ecca56702"; + sha256 = "a9dd69131df9d9a3bb8caf9a4b55ae3dcd4465b704b5f8bddd781ab7cfc775e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/an/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/an/firefox-106.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "e5cf072404e62873d1210fd5794e2f0415196a7761327812f540962579e8030f"; + sha256 = "c15a591ca484546cd529a53a574941f53be43c521fef08e3e55010be351d06dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/ar/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ar/firefox-106.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "bb4c6ee1cf3beeead17a02e1449ee698f4e88bdc07016abe0338a9491dc13c3d"; + sha256 = "4c995eddc6de0eef2459e37bb1501bccbc552bf0ad47193eb1043154e3e07a49"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/ast/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ast/firefox-106.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "cb22952c1f11d918beb6e454ff8254a5a751cf8732649102d4d66ab209e12f9e"; + sha256 = "ae81c1f39262047e85d621b86c99baccd8fe82f756f5c0c44d1bd2ad90710943"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/az/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/az/firefox-106.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "5515d457b294c6007af3c3756e0fe5557850e297fb5b203cd7955d073b2e879a"; + sha256 = "3910d9fe216ee82555db1f0828646c987c5cb613ef5762a2711c60093971737b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/be/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/be/firefox-106.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "dd85a5c0dc4bf029f73e16cfd34a18ef3a32f02d240958875c4dbb926f4d96bb"; + sha256 = "2ce805213b9a64661f2557f7afecbc5f8f6944d89f6d060c2bdb4a19dc8d7901"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/bg/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/bg/firefox-106.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "b6c97985d0809d885c9d27a02ef6bb221820547fd5482c65052db9a43d2bdbe3"; + sha256 = "a6bbe60761bbff9f22b1734b9a9c3e43909fa9d5ff6631e5d625994df18d65fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/bn/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/bn/firefox-106.0b5.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "0bede38ac8a350d78b79e92ad6eb5dd6fd8ac7ba66700eab3af5fabc8fd3d2a0"; + sha256 = "7429b78661eafadecf5fc2c21ba2e32c424fb29843625ee3d5768104c9c79c73"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/br/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/br/firefox-106.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "86e0082310d924cb6e18022ae834845ee30ec27b3f2e1eef6622f387c4791bf9"; + sha256 = "68381f2a0fa6666c97607b6a6c66b667e54311ec61292ccdfa2432c6d3919931"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/bs/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/bs/firefox-106.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "c4ec174eb04b3dc336cd6d242d102330435d1bc346ccc96979bf943266d9c7ea"; + sha256 = "73a61dde5341c3222922da34552a8fbf7b61db27d067319def238f3185912a2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/ca-valencia/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ca-valencia/firefox-106.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "d3c174eeba1669137a9b03835d47a574a345d6c2cc1b798da7303cbdc21ab160"; + sha256 = "df2b3b99b7aca85bb36b590ca30c1208ac8560b70823de3f84ef0a992b2e78b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/ca/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ca/firefox-106.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "82b75c880883c8f4d11b3aa2025b9d5c984ac26564c44341831f212a3fd4c11e"; + sha256 = "de7dd57997baf718d07535457092c82046d48d91049c7774e3b8ecfde4c7fe8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/cak/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/cak/firefox-106.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "5f9aa0adc8e0e9e52aed15de2d1b2e6c0bedfbf768978237dd7ae1593c8fe00b"; + sha256 = "91e28a46e769a9c61ccf6673de33c5e87291c428ca0d35d00a7ff6f8e168ade4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/cs/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/cs/firefox-106.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "2d3236d64606abe39927419e9c1161d2fc8fe02665ec0c11447aa5983e1be271"; + sha256 = "25b8a12896b9caaeda63b8a37476f2696fbba0ece2ea29e2589543895bbc724d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/cy/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/cy/firefox-106.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "fb06a45f366ac0aca6cc8c5fd58b6f0d7ac4c5a816bed61616d2aac1e1323dba"; + sha256 = "00722d5a8fa7b7fef65aa1414095ed792cef438249548e49996768533ccf62a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/da/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/da/firefox-106.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "bcbdd457d0f90cee062b65628fde19db4b435ba55e431b345d050a20030dd354"; + sha256 = "98b4d5daaa9e01a8fe94479263ab036c11f9b54eb248b38679e04b240be0a5a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/de/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/de/firefox-106.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "3acb7217b01918c766a9e752acb30b5750d74dba6ae693807aca1ed14c989b6e"; + sha256 = "afa49b3348af68b40ad2878fe4179aa574bfbcd3c018c3fc2ab558ceb685d019"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/dsb/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/dsb/firefox-106.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "2c818572f2da44e386618b60bb579b3cbbf905003e47d7eb01e1393ff03ea8ae"; + sha256 = "f924915523444a65b931bf79c313f2f812a674ababcac9c6b87d409b0a85dea8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/el/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/el/firefox-106.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "63c1ac349505f483729440ded96ef0f43344aecbc5fa9c06fb39ae52c83dad40"; + sha256 = "b8b45b326456fb57d21a5824088e7dee205eb32678a054e3a5df07f7bd1a78d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/en-CA/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/en-CA/firefox-106.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "498be02d1f09481846f853b8b6d1503b050b4906b3431bafbadf0483c6bd5113"; + sha256 = "0b0008a5286cde1dd8921221d824b431c63a72fc9481f7fce1b38f74d5cd012f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/en-GB/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/en-GB/firefox-106.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "81da585d3248e1942a557ec2d04666cd08807ba193a2ff51b9055559d93e4aba"; + sha256 = "94591b8014b8a11af8eba21d0d11b26cabdc316c0e8d767467b47f8a6812d5a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/en-US/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/en-US/firefox-106.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "85998b089622f49e368997e89efcabf1dd6aeec9798ba0f1e915c308e8ad8e3c"; + sha256 = "e273a1b11dc3e91000d68dce334ea7a4268cfbbe6b58237eac7d9ab18951023e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/eo/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/eo/firefox-106.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "3a0f7aeb89bbf4debb458ddb71a37e6a03453024b52b6403216cb4fa79f8468f"; + sha256 = "1dea74114d1b7faac73ea4c5a311b7154aec8909c1889b83027d7099ecf554e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/es-AR/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/es-AR/firefox-106.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "67beca85c2464b16b7327e8fca1e9c7c52f3c75b3c605f003a58f99a91678bea"; + sha256 = "071ea18cd48c6e18276e0b78c7aaf71c2e63076b1a2ddeb56383937cad01946d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/es-CL/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/es-CL/firefox-106.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "99094943294c3319ebb9d10d6fa871e50ef698233311c2b8335aeea6c2b385c3"; + sha256 = "1f00980599f660f3e428ef84afa09df877311fb9ab681fcec04b83612ba112f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/es-ES/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/es-ES/firefox-106.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "420245f8768ad9e64a78e84bb45b23a5ba1a871251e07b7c7be3f148b5d6b4c8"; + sha256 = "b8c126fc40a10ec3be625d769a5480226893e80684ef0a107b67478c5e66609a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/es-MX/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/es-MX/firefox-106.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "5cfafb07c49e083bfbc4da5b434f0c7805bf7074254e80711210c6cd9b61ca04"; + sha256 = "2b5954e0de55133c34aa559a249fa25c57457db1d2d8faf2bf62cf7e4913dedf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/et/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/et/firefox-106.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "2a1a72d813db92d3de81e3aa58eb4d71dda654440385e6f20419815d6425c86e"; + sha256 = "25a1f91f515e22a2ff746ba0d7bdf0d2dc872054332cca11073b1a044816b1b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/eu/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/eu/firefox-106.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "7a35ba12ec46b3b61cb90e5620723a1ee1f4b7b56a0df89d4703ab6f6c28847a"; + sha256 = "7b15f34cec3ffddefa5abf3b7c188ae4632ebe6bdb65857da08a243e109ec017"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/fa/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/fa/firefox-106.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "31b0990299c6fd7a9cc6306f12da4c505c3d9d7bf8966277675862f55a2c50c5"; + sha256 = "241350d7f85483d005db7c1a019a310f3a522733f7cde4e99a07b5455df3b24f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/ff/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ff/firefox-106.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "1f1c1b5901ae7c795265c96c5b4ffc9286676fc3a3ecab696f479dad19d7f875"; + sha256 = "b3d86797d3194e60f45e831e81b98d59605c71f67867c441bd7cb09b798a8a6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/fi/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/fi/firefox-106.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "180f5cd0c88f7892105457214c336a3c72233421283afe96fb8e4973d763a17a"; + sha256 = "67718e8fb190fad9293f83141e3c019813e32f6ae4488a27a65f083835d2d875"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/fr/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/fr/firefox-106.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "dabda291439d159ad2a4e12f232a870718ab3cd53d2681dada9008754426c54d"; + sha256 = "1fd4c7f4beaaeebc5096cd1f0dca50489373f6df7ee14882382e11af83b9f7d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/fy-NL/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/fy-NL/firefox-106.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "04b5c8d853012648b3efffc298f92339249815dbc65b73c3fb09d9d2e9c47bde"; + sha256 = "ae1c105ec2612c51c4e22d8927f10db6d8ac926f68418d668302f6f88a19446a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/ga-IE/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ga-IE/firefox-106.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "ae258d5583de27162a935ff6758636e1836855ce3d3620969d27efb7d3df7ad1"; + sha256 = "019fb8ca065127fdf32549429377eaec17cdca33be1bf23d8a984e24e5122892"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/gd/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/gd/firefox-106.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "85f470b3312463bd5307219b2e214aa6a093b9768ddc4a0021cc18e05e334c8c"; + sha256 = "d6fc76cf2af53b13eef471b32a5e56e832713208d9a93f401c4c024a2a805431"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/gl/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/gl/firefox-106.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "de6a5a0d44d56d614dc8d212641d2251e3d724b1ae647bbcad045108af4d351e"; + sha256 = "8927a42942c020ae39ab7e71009019c8a8eea5c95504c8a1078ea9c4d747db79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/gn/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/gn/firefox-106.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "e78a1d0e38e446bc8d56df1ca85faf115019b79375edce0df35a8ea377b1d859"; + sha256 = "9ebfc17c47c2ae47ee1fccbd060936dd80896839672200ddcf33ab8a0443f591"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/gu-IN/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/gu-IN/firefox-106.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "eb2ec25451a1a22297f36febf39d72f5ecfefc435d5bc70a02dc5b7cafbd5b17"; + sha256 = "e8b258e4824668c2418636f152b908e731712a42443b12f2da15703c91ddde0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/he/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/he/firefox-106.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "e7e1bdb24eb2f9d49320127724174886d998707e90d5e8fd567b5d0b52d02560"; + sha256 = "272276863f7614f276b6798f5ab7613b04a0c715dc3d6f132c212971d8844908"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/hi-IN/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/hi-IN/firefox-106.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "64424ae77bdbcce8780206ad233f3ccdf6f8549b52ca38c59c7468b5e602df17"; + sha256 = "76a40f6845a43bcb614df52735604c797f26ef7d5bdc524a977fa6ef5893a7f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/hr/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/hr/firefox-106.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "c4c10d18c0096663a350d991f92918645498df12de7a7d31abff97ee8d975fdd"; + sha256 = "dcf93acdd526561af640e3a6fa13b7de92b20cd0e0b5e4011c0490f95550080c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/hsb/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/hsb/firefox-106.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "675c259d2ae57c90bfa668ac3aca78355cd7ffb3d2bc62da5818f3a915516b25"; + sha256 = "aefc788cd53e96eb91635bc0b29c257ca5f6eadcd349f33d211a69e0c35fb633"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/hu/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/hu/firefox-106.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "56001af5b995cdcd1dc966974b7e376d78d38e072d6ba6dff765329c5453600c"; + sha256 = "2d9b5f4f8dd3fdd10316c4d63bf5c5177831489499adf27d4de6d7dd2e860964"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/hy-AM/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/hy-AM/firefox-106.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "498493344a251b3500cc4fe0445225983863e73443fc8b7814edfbb28eb41680"; + sha256 = "a399698df95f954613020654c9a088cd1929d9f772a22a388d3f39861f26ff98"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/ia/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ia/firefox-106.0b5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "d109b630122685f23fe0fa3a24b25f6d52c59dcd4c75db2ab923310e5205cba3"; + sha256 = "51f3425e0769384010c7a09914410ddd980b11e098b07e489f624302a515a33b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/id/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/id/firefox-106.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "2fb18d144a4a95da5f7869698f5bfef5d07e672de63f25821c8405fbee96f846"; + sha256 = "70ef6ff4532ab0c3b65770d632ad56dbddd08bf23e641b16a2d2ef477d13682e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/is/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/is/firefox-106.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "009930a81dd9eb1bcd1d312d68448f5d9298c6b09b131f08eaf1787163f3b8dd"; + sha256 = "ad6aa8a533a00a2a2deb2b0f3ec89f4b3fedbc4981c9efe68eaaf6df8aff7599"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/it/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/it/firefox-106.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "c489f676ae785f57e8e45fe92fa01f0b88c4055ab68292003dcef77baee61cd3"; + sha256 = "e94457fd250270e5814a463e6d27e1b23f3d092ed9af0a2c8341eac238f598c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/ja/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ja/firefox-106.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "00db1825231bc9c7932a47cd8bc3e81f6f6850c7a7bab9ec669f7f5273287247"; + sha256 = "fe2c1e465e2bfa951e516e83b00de06942e496f8c49a1263397d7bdc1f842c8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/ka/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ka/firefox-106.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "af93272aa01a2022278f0337e8de8242f8859f8c77162faf0fea0667fbb3d456"; + sha256 = "cdea26f06a2022b1dc257345488befadc7d56846f058b8cf4c13428921d8b45d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/kab/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/kab/firefox-106.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "46d629c375aa63e6c0130a430ab50ff207a07616e5f0279df94b1831d00d9114"; + sha256 = "ea574431246be1f4255c526d8f22f6a93eb013236531fe0c8e82b84e3a332ed1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/kk/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/kk/firefox-106.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "9418c2bd1cfa97e219cc014e72d1cd9d5110757764079005413682eb8abe4282"; + sha256 = "09bba91f39ba55c982859be6f9f35b6292c7501d65b5f91205f2c281962b5673"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/km/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/km/firefox-106.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "cab6d10e4d1da7a775d836ea10141dae60a96e29bd1bc9a0d38a5ad9e4c5c74c"; + sha256 = "0034438685615cd9a60ae185e28f1536d85c47e7b2f2673c9754fa49474ab079"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/kn/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/kn/firefox-106.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "4f0b233fc03cce40f45a009d0e5e118a17007ff56fd5da10b2db294b448d5529"; + sha256 = "f39eddee2312c72573982e673986f15feeb080b61248d9d9cbe2505643a89ab7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/ko/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ko/firefox-106.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "d2a1f756c3fa443d6ed5e948f4f631be2030795321df86984a068473bbf23827"; + sha256 = "533f070343c7ad16f588c3e1c95e9426322f9125f0ec6e44ec14028a84c795b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/lij/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/lij/firefox-106.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "487bd1a6a09fc174e697a67eb7e1aa7bf9edb8ec27b63dfa48c67d1f5aaad621"; + sha256 = "2ccbaa80bc62059889e40d9ac942afbe4ea1a4ce59443fc4dad1496cc5b111b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/lt/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/lt/firefox-106.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "ce7f3100392d9dd01aeffd2ba1e6b25b249a656c83b851d796ade188aadb6302"; + sha256 = "1414dc3341af8fbea50697f1c3d2ef82113165fd433301c2cf855496e48851c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/lv/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/lv/firefox-106.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "a16d8b8efe7668948fa3f46615ea55e1bf8c82880f2f0661bbcfba5ed2990da2"; + sha256 = "2a5b9870de4717d3c38306f761db12ebfa3aa168a4853c2da112ff90654a1fa6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/mk/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/mk/firefox-106.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "5b075f3bb969b10bcb3c136bf1603a784111a4356f87388246f7b0cd6eb9d252"; + sha256 = "2fa658a186ea7d45137d4733bd36228165ead1344c0c5a55f5d1f08cca705d26"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/mr/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/mr/firefox-106.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "078ee1ba9ba8be52f274c02effb02c2490a6d32fb50d2541b039abc06e2b90db"; + sha256 = "c84dad1b673bebd621c671c3955dc0f74dd0c33d5fea0bf984b323baceeec753"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/ms/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ms/firefox-106.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "e54c4853da55476fcd6eaf9977da9902bbb18ed0e0dbd70936e9864b7ef79491"; + sha256 = "3874937e10203c29a7694055eb94c21fa21c22eed84a8a784df0a6c2db3af628"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/my/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/my/firefox-106.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "0417b62343abca9861ab3981020e2d0ea5ff9341d56f25c2fad73942d0c147ea"; + sha256 = "0458d73594a7b6a893fbe238f3c04040ef465ef24de99cf93ce63d2ee138a6ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/nb-NO/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/nb-NO/firefox-106.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "7ec9fe2fd3d7c2e49ce34fbe2819cb4750c996751d7ac16749113dd5b5424c2e"; + sha256 = "627e707144082ba5b517e81494d897a7ba45037bd7671e51a31f050f43c893aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/ne-NP/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ne-NP/firefox-106.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "c885bb1c16b8433f880158bf4f4d7ffe741092eb247774e2ed810cb8fbde69cb"; + sha256 = "8e3f0eebe18515d6ba3313647ca7eb4b47a5562aa6d98fc5ff03f76c19a9f195"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/nl/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/nl/firefox-106.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "1b05e07285727953050683b63557fe7a9f075a63f89d5b1bf179ebb5e326ecdb"; + sha256 = "c01353905bb853f9bb84b6a57e659957f056bcec97f909429a11afee615fd467"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/nn-NO/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/nn-NO/firefox-106.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "1c250d10d471b5a5ae3d73cb4e98eb478f137cc4bfad9f3d96dfbabfbb84a103"; + sha256 = "e7f32834243ccc2750f3c910a77ab3ca23c2ad20a25b36f46ed158dd8a2b6ff4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/oc/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/oc/firefox-106.0b5.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "334b1e46ba5d3bf9aa426a245fc6aaa3bffce4f343342d2cecab3d0488c273af"; + sha256 = "68f961dc9cb1736788d24af07de2ff898203f83e22a104b4753b9ca5975eab01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/pa-IN/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/pa-IN/firefox-106.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "274c24477fd0d026a53b3adb8002761f0082198431dc87a768baef966ed0c331"; + sha256 = "8473afdf1cd2f401d590b590572741bbb9a9d6de813d9156eee9f211372f3919"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/pl/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/pl/firefox-106.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "ed2da752ff24653bb9caa035b87d7cfa02c857e9c438184792df532acb5c1a68"; + sha256 = "9d0b27ca2d551dc1b0e2441e42ddfdccac9be9c55fbe6407da62a13a812d6c2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/pt-BR/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/pt-BR/firefox-106.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "7365ce27389fbb08229bebc6d2a318f35bb77ce99c5bce91f2f97e0095ca6114"; + sha256 = "cb6437c603f99b6fffb61068abbea8c14ed918c5f6014cf74c4e07061c585c62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/pt-PT/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/pt-PT/firefox-106.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "a571ae959cf5770d29a8aaab7b30bebba3b9730cd80b9ce24ad54d446e8fbacb"; + sha256 = "3e77d7b0d5defaa43b2d546acaa432386cfc1a7500080381b7f0aa7d76bb3f8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/rm/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/rm/firefox-106.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "3483abadecb9f6c1bbf81e76062781f9c1fabf9443129b4031bd9d082c672df5"; + sha256 = "401b0c3c8a20f8e54fb7b4efdee8ff5b87b2e5a92f810ebbbf95ca29a3d198f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/ro/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ro/firefox-106.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "8a6ad1467525d547d49ee4014177a1ea5049fe620d131f0cdd88b942a05e1af0"; + sha256 = "7c8579b37b2f87221484cf4d9b91e0ce07b3fbe491d52045dad5a99487014d3d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/ru/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ru/firefox-106.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "8f828371905074a6b368e8bd5c205c76f68f04f1066dd2209c1a20cd8e17b041"; + sha256 = "b09f65afe0fadf16d7f79c9394a32ec01810e5ff5d6f579a134f1af2a9572b5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/sco/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/sco/firefox-106.0b5.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "0ceb75ee2199bbf1962d325178bc645ea1eaae6ee0ec55b6cca7581375a53a49"; + sha256 = "4c3ab17ec042eff2f22e64d8e13fddb5bc8c2f20b50e5c2f270dafbb8e291734"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/si/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/si/firefox-106.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "83968683080ea32f07d3012b77443e283c56d788e6bcded937677137753dfdfd"; + sha256 = "29eca6a13366388a53d2be6ec5ed0f920162658778998f5bf4db74992d4c822a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/sk/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/sk/firefox-106.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "a2751ba104dcd89989b73741bf01f1cab0f982041098b638f6a70727575d9740"; + sha256 = "f8f15fb9d5d79a7c871bc85e9d307c9f80c9483effae44e785eaf9366e9d965d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/sl/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/sl/firefox-106.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "ee19028e9cb895b102010a378bdb5555a21a1c3aa67da3294553b944f91f25bd"; + sha256 = "2598d5da878e9191d3afd09c763f8fa8810dbd07e74cc7e606be16b662ccaaf0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/son/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/son/firefox-106.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "ff7fed4d807b59c094608ff5170b22a7ff5a2dc4b93a92aa087f6adc1cca5eb5"; + sha256 = "82195883335e0e519e49bee16e74658346ae746fa8dbba7f8e93e54d0af2fbd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/sq/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/sq/firefox-106.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "31b89117424cc3c2605e5e355e8d3e547d0766e76df3799d0e4bc76560872fbc"; + sha256 = "2539b349125716e96daca48728bc630fef26f7041ff9555c05d999da249f30c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/sr/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/sr/firefox-106.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "9a8bda003e65f65a220ebc59c0425ef44083fd9f59695143cdb80cfd885f1900"; + sha256 = "b83878494c9d2c00576456f353fcebd451741d806d4f28e3bd471a79d50ea1af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/sv-SE/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/sv-SE/firefox-106.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "8553f61232ddfd378c25a0a2e665b04f367c110bc026c87e3817e439c731b9cd"; + sha256 = "6401bd691601f5ce3eb6dc15bbf317601b1e6f4538a34029a81dca9db2fc2818"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/szl/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/szl/firefox-106.0b5.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "9f86028a1100dc9f8d9b6d73a52570a23a157d8262b34e2fcc28dc8075111f61"; + sha256 = "2329347da1cd23f925a00c30119c27e7bc3d51250b65f692b098fee50ad95224"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/ta/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ta/firefox-106.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "2d9b301d79fbe2ff56c6cc17b1b853e1bbbc21a5bf485cbb79bbda92e004573c"; + sha256 = "850cbd19a1a4f382e9457caa92f0a2fdb43a11bf7351e0d2b291eee48f9ff8e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/te/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/te/firefox-106.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "d7d7d45312412935c3e592cbe9c9d8607bccc79e7f490a255186dc6265ba1147"; + sha256 = "b9fe3a5939eb5590692533ee23ce60063b11531480d4161de5722dea6e98eeba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/th/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/th/firefox-106.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "9096da808a030d9d773436122b19c7b71d0430798e5924451177764af390411c"; + sha256 = "7bc0e3063692bcb8b45ba8e1f66adbcad564c2f26a4ce86e064cb1e65868ae3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/tl/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/tl/firefox-106.0b5.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "422cc7c2766c8d2d04efb82f09ca2b5831059f828da319a0170f0fedbc38139a"; + sha256 = "8cd7a5b6a8ad541f221785db3eb36d57fa881940e0f6e3f815fe25521efd9b4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/tr/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/tr/firefox-106.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "c74e4802023171757feed0fbc74769bd5958be4364ffdec07bb8c6767c9f62ee"; + sha256 = "1cd939b803cde0ae9c492e9228c25e5b5f3ee791a0f24e78487453c9da62404f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/trs/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/trs/firefox-106.0b5.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "e9b21a565119cd614f7278beb9261861820e667dfc959da4a8eb13ae8dffc8ac"; + sha256 = "822f95b96f3e4bc5443a94d5211bba78c97522851b4bbf140505ac02f4568582"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/uk/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/uk/firefox-106.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "98bcc4ed75e80f6794797c2188f1f928141e113e7d1b626f0077b07dc7fee947"; + sha256 = "e8f636cb417047c77a172a408897dc4c561a791398f0ef67109d442296e83c7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/ur/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ur/firefox-106.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "020c05973ac8c9a17fd4b28e3110a0e5c699804076d03a9b090b8d627ad9763d"; + sha256 = "a5d34b9c701f6ac3d7bc9d489fb745b6e1918a32134ba2a46602b0dbf02cfd71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/uz/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/uz/firefox-106.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "5f628b775040d8269994f12aaf5aa765a02cfac4909904eb7a96e2602ec906a7"; + sha256 = "99b5cb40e2395eae81a08e4b35e493783b3ae9974bbf8ab07be19f06d7083196"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/vi/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/vi/firefox-106.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "7c56cd3a54cd5873fc1b733d8b54fe9ca3d37ddcfe5e1d72b82a1c143968414a"; + sha256 = "b7f9a9ff83528a178271f11468cbb44061a338d89f0b81bf55173dede0104651"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/xh/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/xh/firefox-106.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "e69e22be3ccd30af08f491c4a418e6b4026f5edba6593a24c5a89d54e50de64c"; + sha256 = "f56cf5d4ec969ce37c50380e10c9c705f4c4c024243e7f240a85be1643a4218a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/zh-CN/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/zh-CN/firefox-106.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "95eb6af88e82e85d48c67ba01ddb20a549067fab9e0c8f47e73cb52364046333"; + sha256 = "98d28832e91435cf766f8600eb234618e29cfc924338b20b5839a65f157d056c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-x86_64/zh-TW/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/zh-TW/firefox-106.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "cac628ef12712d520c286c80e5301f147b2cf7c7ee16b06a5b45b1764a549562"; + sha256 = "a7c8399e074762be8bd4db9d35b16a7c4cfe77cf652bc7171026049b2294a9fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/ach/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ach/firefox-106.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "295dd9c5efa3df52ced97b86bd2e15426cb41187b5bbd0618c8e7a0553da33ad"; + sha256 = "169078c74274713ffbb76cb8adc528c6cabaabd1273c9ac1a95cfee05aaa7bef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/af/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/af/firefox-106.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "2e9fbfe43cdcf589a4c6fceb1517880815d10ffd66881f671f2c3ddbcf70fddd"; + sha256 = "e4242a1757a8b99f546fbc744afff0c1522404a89f7c6e9e1aeb818a2a6d4bae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/an/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/an/firefox-106.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "335776b1c71bce7bdabf59cdeceebb66919c9c346dccefacda375253441e0c4c"; + sha256 = "454a0c854b3b79d3b95d9867a020dde2f80ee3b0f0095df9c4fe2a9df9544551"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/ar/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ar/firefox-106.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "298ae97cf5dd506976db6f365b05a5873b29d96c245cfc2f25b23c488e6750d0"; + sha256 = "9cb8ae5b764d5b8f5256486039f8408895f710620a3a9e12ecb161bef85d53a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/ast/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ast/firefox-106.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "c8039427e0f718c49f2d590723e20a2f3c00b87be8e074c15fea7e423f07828e"; + sha256 = "e4c5d5fdcf8046311a838d2240a667681e88ba54c8e23dd83b9eb63585a652a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/az/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/az/firefox-106.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "652743a11f257946c1a87d495bd5aaee7afecc98231c2036467e4e99130c4d90"; + sha256 = "1bf60c9297ca771568fbc05b5cdec9ea8b9a635db1892367bd7d56a8f7634fa3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/be/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/be/firefox-106.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "41bfcee9f441e7266b0625802d23bfda1efea3ab9dacebc121907b935c4d0980"; + sha256 = "f446ea1ec69f709f9414b1ae12ed1f743ddb6c51fa4934e7045fef34d6ff69fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/bg/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/bg/firefox-106.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "913704db38595232bf866a2244767e4706896dde24f4e75b37aaefd0299ef3ed"; + sha256 = "794a41ebcfc905628cd4c79af06e044c63c6ff2121ecf35d99b414e65c897a36"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/bn/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/bn/firefox-106.0b5.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "b360612a0407788b2e23dc6d414ee035c7b65568473decd2c78900c0eef23434"; + sha256 = "f101f45d4de2e3fdf0e6d505982e363f0431d1955f95e35afc0bbac8d5e38bd7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/br/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/br/firefox-106.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "6bbdb07e87f03ac8773643ecad878efb9efc8d63ec0b1c40fd11497a7f264da3"; + sha256 = "3285c16382a1a53dbfb97c6ef5cc248efa136737a8ab163d011bfefc8c3dbd48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/bs/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/bs/firefox-106.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "026da184f2d628c1b976e149563054a3b771d96ba82641d404ddb487e0c85bd2"; + sha256 = "42f651f98d3a55fd7e0839a099cfd56ca4d52042ff77de5380db2941cc281ce0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/ca-valencia/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ca-valencia/firefox-106.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "854598a2bdb530bfba01c99f56365a98256a3a6d6e0914606d5ad0780bc8050e"; + sha256 = "11df86cb15f49f56cd342dd6e1bdae85c9be3c5275b309f4c5c69ad788d64507"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/ca/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ca/firefox-106.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "e513ca8e32c6d6a42fe56c6799abc782131a631bc90f3ab76b2ee65e156ecd08"; + sha256 = "7171df8a1cd84e8a8037ed4403abffa84c3d6f962dcc8536473ed1032eb44497"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/cak/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/cak/firefox-106.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "95dce437a4336dd1fcc3ac0e15f9bed69a1299f428bdc69ddd02a27e2ac549ae"; + sha256 = "defe1af608fbd9feaa67387ab62f261f9ca907d2bd2ffa0221393b83b32e2018"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/cs/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/cs/firefox-106.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "3635dd84f75611f20a25ea886732deaed8cd9606bc43adfb62eeda4d35a314f5"; + sha256 = "5cd180fcbf478d9f7c7b46879ca03bd043f6d3aff116dc0da82a4ca78f85d75d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/cy/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/cy/firefox-106.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "9c174820de1d198db96ae7edd350fb2760a02f03a05eecbb0d6fec5561373ef9"; + sha256 = "becd879cd077966bd14463d29bc6bb2661446f4ca5fae88cfd7b6885281931b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/da/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/da/firefox-106.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "0a90d3a6297a80b2d878a9d776e1624a7994b89f16e4c69a1cc160aff8c5dcb4"; + sha256 = "fe6d51f6e466e4032b0e676781dcd0261f74202d87141eb0d28886342c4b34eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/de/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/de/firefox-106.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "df9c422c172a92d57ca4ab90ff1d671bade4fa93d3eaecb928f480748c9c696f"; + sha256 = "3b30a374bc43e7bccbec85b315066262820abcbaca827839cbde81995ca515ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/dsb/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/dsb/firefox-106.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "f90b19cb6fbefef64d516cac18600f8a05a59294414e95b25444139a5a786c98"; + sha256 = "84564df51533b11ea8d87c3cf22b7717af60ef82d10480e29ff3e8d6a78c91f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/el/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/el/firefox-106.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "2a329860dd3b8a683314eee2687f62f07294dce14629ebd56e6d520608fe5dd6"; + sha256 = "1a714aa96e1b1b8e703342656dadb3cb69e71c3ae500ad2e3478c7595845d961"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/en-CA/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/en-CA/firefox-106.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "5c6ab9f7b826a6bf012a83549a0a8585115dd6ecd6c35d46bc065eb71b884e1b"; + sha256 = "615bf2277f21cdd78977ba69e650e71674ee5dd9bc8b8f2494a58b384ed504da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/en-GB/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/en-GB/firefox-106.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "5ab6a568210a3d849a08bbe002064e9ac9bbc7139c9673d5e23c2f1c8a7f4c88"; + sha256 = "56c164907b01f1e82a93895c5a0eccd9ccb5263bdb1f1994152291e72adc674f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/en-US/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/en-US/firefox-106.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "c8337352f183277941fb5b1540782c31d939a6b9c4841497b8972ea99601ab16"; + sha256 = "50493199497b216f1be3bf25ba86364806eada947112f375f59bb7bf354ca8a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/eo/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/eo/firefox-106.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "1d7c118fcb6a296a1bdf242a0129b3aea5767f4a3192913901549f7876eb583c"; + sha256 = "262a430720e18cee49592f9c0dcda721a6011b44ee67d45a827cb6a962fc727a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/es-AR/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/es-AR/firefox-106.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "670da9ccac00211b48f81fcd25afcf29111a24021b104416a09b7fb642cee399"; + sha256 = "811a8106f0e1582deddf17cc06e1e897b9bbbc6971ee7b918b435e94091b5dde"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/es-CL/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/es-CL/firefox-106.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "60a1599975635e5c1e29a3eda2686729c5896746880962c1942f469072dcbff5"; + sha256 = "fbd830e4167439ca683a85a651bc8c775e041bdf36f8a37e620f0a75abe9a414"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/es-ES/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/es-ES/firefox-106.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a3c6fd7bcafaf932dc2faf90d7b19b1875ce8f31c97746e11eb4b96d2845bc16"; + sha256 = "41830935f8a966c2dedb9273bfc4d0a621c57a9e0a4ff26344a02f28f9d3ced2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/es-MX/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/es-MX/firefox-106.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "35c204b4898cf1f8fd24d529c02586fbd537c036a9e8b401539cbb69f6d087a9"; + sha256 = "9282891f005799dfb6e3de35c58c83d56a7f54ad18453cbc9baa353683f41062"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/et/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/et/firefox-106.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "f40572bf2844deef7b7124bdb41ae4899a5ccef14b5c3c25d3f4217ecde4f150"; + sha256 = "30156bfb0e8bad70f2d7627f715f88a01bdcd386f413e046f1870945124bcbfa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/eu/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/eu/firefox-106.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "466338aca1d1a26233576f3097a0cba9e55eeac85f203cf1fcc7d31801329ddc"; + sha256 = "276d3ed3317085eb0eb8cb1c579cd06ee12f7b615599f3e3dc1428758d7b2c78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/fa/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/fa/firefox-106.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "fea5474085b86c4b6a9bdf2a033e9a92b444128c11145e8c8ef61f6c2f261d43"; + sha256 = "e91dff193a088ab5fd17f918e85adcb99a9d6971df59f0934b933676808a44be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/ff/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ff/firefox-106.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "652a2d28ebd0ac203561df3dcba4719f4c54ddf4ea15709fd409820e2792f88f"; + sha256 = "1ceb71ed721122af040cf77be246df18a5598766b8e4288f8f16e2127ea2308b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/fi/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/fi/firefox-106.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "737dea199be03930495ae10bf4bd4293932214b2dca898702f0844d7a5f93eb3"; + sha256 = "dd0e8125686a13dc8a7a870781a076256e1797b97a784198cf39399a3a8cef1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/fr/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/fr/firefox-106.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "c4aff6c895e1ebe1946ef6aa39f094e6f2d54d6a57a633afd857b55b89bc8110"; + sha256 = "0120c5b797070f7cd3b3fd12bf83a8aec29c423ed9633df4995f653408492c49"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/fy-NL/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/fy-NL/firefox-106.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "5ddf5fcb1545da814b6eeba7c8c323e10853ec0827c8ebb26dca131bb9729764"; + sha256 = "cd746b723f847bcb428b92d53e86a0a9a566f7539aeccd982f056cd3416c2a8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/ga-IE/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ga-IE/firefox-106.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "3601f6128d2bd5a41b8471d7651b630b5b0c1fe3c5a840f60f12c97782c509a2"; + sha256 = "2c8f04872e6da8dcdf9a5cd6b39b2b6d5d16eee1b75180c829e75d040ec0e108"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/gd/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/gd/firefox-106.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "a11e9ccdbb26435b945cc874f221ab09f84e4936c65feaca0f959faa87263d5d"; + sha256 = "974558931565de0e93fd95e8af46e8203ee3d50c7ed74cea3e1cf8d9a231dbb2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/gl/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/gl/firefox-106.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "994e6ba6fdc1c082a8c8b6f7ffb606b5526ac20a4c9519b1b931ef5da302af8a"; + sha256 = "25c7e7398c41e698bbc1ef60a29ec67ec6b4cb0d5970f16e438d0251c4b233be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/gn/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/gn/firefox-106.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "cb05a76e0355584ab9b0d9e6600a8d024487dcbe042b59feba5f6167e31d9f10"; + sha256 = "9a60eca480973b4d17cc61ade4220db856afc3fede155cf20cb7d3d1520edb19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/gu-IN/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/gu-IN/firefox-106.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "42328bd90dd4d6b4296c3d7da279fae510b417cadda5071e1aa83de07f338a38"; + sha256 = "b5dbf1c01e67bb8803300774eab8a2db1090ebced6b63aa95731bbd3e0ee5c92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/he/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/he/firefox-106.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "87f000aed76c83dfd63141147eaa2ce1fbd3ae987db46fae79855fcf73ceb5a8"; + sha256 = "d9fb27f016bc8ed15582c064ad616ccc0aab11ad8054d6b7cef79d552658cc00"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/hi-IN/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/hi-IN/firefox-106.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "5c514f8f1d68261248ff165922b921d600fac18a7cd5ffc839deb80cba866cc9"; + sha256 = "427375be41df65c7b42619bdf52d7ff74cc6019d9d95ada7cf0abe388c430bfe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/hr/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/hr/firefox-106.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "46b3f1564b9a47de6889e3c58d2534af6375a020137d87e73d75862645cf3999"; + sha256 = "4142e5fce3fbc48e71d62635958d8f91ce18759066a3808eaeba66b8560cf683"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/hsb/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/hsb/firefox-106.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "33762373fae6257dcf7169e027b9395aff46090d89c44ab07911fc6726185028"; + sha256 = "282031c7b262ee6e25cd8a8d7358f4067de7ded90413c5e6fc2f0309733c0df6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/hu/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/hu/firefox-106.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "fae3af6c9bed6f681a7c78b55914676bc973995506771a1659465111e9ddf0bc"; + sha256 = "82c9562e6e00c508675ce68a95576f5182377d69bd6d88ac852501b5a68b38cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/hy-AM/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/hy-AM/firefox-106.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "d9b90f45eb40b871d4a76c88fa7eff65bbcf3d58066d682d5f134333f547b80e"; + sha256 = "56eeceb75cfdb3289ab3676fbd11b00b9a2af5ff43f635e740690bc51c56b989"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/ia/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ia/firefox-106.0b5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "fd057fd32607b8ffe97a9a8cfeb2b261e610be148de4766cd00d661b14e11b5a"; + sha256 = "853a3b4f646df1f1a0b35bd2b5adc1037230fbecbf3e3cd695e23d650987fe5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/id/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/id/firefox-106.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "26bf3b04a237af06dbd47e2c571439ff4da3533508b3076513e0bf5557c572e3"; + sha256 = "88d9b1afcb5b0ba2e9ba15e4cc3c4db1c70f3f7c3e610d1673f7e6a79730676a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/is/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/is/firefox-106.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "dd5632f03f091a0bf1bc107e7cf2500a5c96403ba25f6014863fdadf450af0d1"; + sha256 = "17b81b21f0b29af20b7fe784291ce82af92c2f500826a9317824589cc53fd531"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/it/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/it/firefox-106.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "c74689aedd59aac1ff4a1c105f39be9687fb1497c18e68ed564649b58da3b5b4"; + sha256 = "accc16a4e97055e20d2b43cd6845a1366d98e47e82210fa64205935f465b7905"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/ja/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ja/firefox-106.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "fc98606fd7d37e9da7ba39e212847f1e6d1d978a6ce4f513be07e90caa54cb29"; + sha256 = "d33537fc124f00aa026d7c38516c57abc8db96c91683283bd4e05a6913c2e4f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/ka/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ka/firefox-106.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "b1831934053ad54ff57d62bb6317872990ca55c1efa24e8708a8bc1af82016fd"; + sha256 = "7b2f82de48d51c3974f5f6d288ad36ccbb1c2c81a1e552a79018b769cdfad897"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/kab/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/kab/firefox-106.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "fb8a29a02276fab0651c205989bbfd915bdad026287812582b21b847b626f484"; + sha256 = "199068a45daa7969f76eda767a5d93d46a50a17deef61882f2735df595aac59b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/kk/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/kk/firefox-106.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "c6a658c5fe7e4d697abab4499c8bda3bf9b73d3304d1a40880362e9f303e0502"; + sha256 = "00fc43c92a23afc23dfd5a8898aefa598ad43b70364024659aba3f30f79d1c42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/km/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/km/firefox-106.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "795fac450f4d08e0c1587c0cb544c9bf9cc5a6c60222096f222d9666d41d607d"; + sha256 = "34aa8d09cf26680d73785ecdb437f3725e869c9f5228d732bd63ea59cee4a413"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/kn/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/kn/firefox-106.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "7c54b7d7db3fb7b9a9272658304ef31715e26f40959be34786fc7612c8d256f8"; + sha256 = "e32ba6af267023b41228fff4846494f57c2716f473f82b1c496402a770bce2f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/ko/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ko/firefox-106.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "aa0f69ea0f9cef98ad1ed2f22d1a2819daf7de745e46abb7238db19b14bf2343"; + sha256 = "79c749404b273e38c5e55f9aa826008948113789f8e4e8d081fb6b1373c90d84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/lij/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/lij/firefox-106.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "6c4da6f2f31dcd823ad8eed7d9d891b551e055970785017187ad98216b21cb29"; + sha256 = "cae6d39686fb95b24d49384050c0ecdb6e62ee3c6ca5e09b3060df66eb6d8ab4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/lt/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/lt/firefox-106.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "3a74f4249338afa0a3b9c223d474511b8d9268bddfcce6edfdefeef0bc691bb5"; + sha256 = "587b6e65835fafc7248019796ad8be5f66e76711a501047c1bb3f13a85405ba4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/lv/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/lv/firefox-106.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "5b166b795698be544aa3cced7d33980036cbf81c8fa658ea36256eb6ec8d28a2"; + sha256 = "ad0b9cc6999fbf2d94c31bc1374ad69b63d055e95e472ce78989b717411b7b06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/mk/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/mk/firefox-106.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "02839eeb8d191898a489f3db51615687299736a675702674fa03357d50f46ee6"; + sha256 = "6157eb460916c3380c482de68a90efa56ee34ed5726cccc7f4a6b6592f5e3a4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/mr/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/mr/firefox-106.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "af2dc5ee9d664006f5e92f9aa562f29cbdb110896245bc7ae20c6ac59fee2958"; + sha256 = "1bc36fe6d9c1053251273378e88d0fee9390473d2e4727daa3f6ada440d5daee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/ms/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ms/firefox-106.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "b4be7647594003fb2ac6d7af237670665a46901b135505a98357f1cc62df7913"; + sha256 = "39177d411723ad28f4b7c5068d2e170eb1bd24241304052473185d72ca05ce84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/my/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/my/firefox-106.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "e9902720b9ee28f14217dd9aa63e4f84c4ccc44c1025812b43b9418fdc990d4a"; + sha256 = "acaa92b8a029f8207e150f8417156aa474e28af775199b7a9e4ec9757ef8c0b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/nb-NO/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/nb-NO/firefox-106.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "b565b49e98ffaa1899b149a4105f7be5a76351ae505e2937eca57f4d4f6d7bd8"; + sha256 = "177f0dd59c5d463937dce0fedf18841cc6cf7423decfacae5347ae580aeb6bcd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/ne-NP/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ne-NP/firefox-106.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "b656aefab0531ed66ba87ffdfa806c32b69a8c965082e12cfaeeece1becc8d1b"; + sha256 = "246f98ba8548543213e6e15f1c33613dd7c4d718d23c6c93c7453dcde63c2d46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/nl/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/nl/firefox-106.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "3ac4f38b8db18138d7901a9a93e725fc81992b2d541b3e3b50a3091ed3d3c032"; + sha256 = "0fde142970d72d4f1bf0a0aa9729a2828172856697440253fef2c2888ebbf077"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/nn-NO/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/nn-NO/firefox-106.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "10e82c0e50a47750f94f16de95295a16fa05eb03f2f1e8cfe1794cccfbfddc98"; + sha256 = "2801c4a9db78587d3d5a4d817cdb6551551c6daedada650b658a94e0bdbca91f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/oc/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/oc/firefox-106.0b5.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "93c5ac9dae4a50e58522a366371b21b3654fac915ee9dbf03518a9a0d1e83334"; + sha256 = "db851c61ac83f4328b97fe95e377a748da500beca19f2eedfd9b58abaf346239"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/pa-IN/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/pa-IN/firefox-106.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "2340656b67eec0ed06e04a60834137dacada2b7ddc917bd4477a90cde4723308"; + sha256 = "bbc9e82d30764efcc9e5168fef26c8d3ab141af6a2bee58007843b5dc9170ef8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/pl/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/pl/firefox-106.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "38aa00113260e1e8ae19062792f7519977a1cb53b73e993e28806d5e34f1e9e2"; + sha256 = "cdafd35d0ff5482477f0942fce33258974a533371d55e2a4de7c7b5f0ff17b0b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/pt-BR/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/pt-BR/firefox-106.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "d3984fa1c630115c42740a47111bb94d968dc13ddb57ae9b1d325158c80d0bb6"; + sha256 = "fb80e5442da92bedecc4a94f935321ac70c3a57072e115663243287265d9ce7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/pt-PT/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/pt-PT/firefox-106.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "0f248ce02403b6716ec05bf0f606bf0ad6032fe990033d56cc0a4b862a497780"; + sha256 = "471daad9a2ac8bc4df475bca4c6f8ff940e545b9171970c01ed57b173ff820ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/rm/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/rm/firefox-106.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "6e7cf5d3cb1ff5f0b353d01ebd3f18ef02d671165fbda1b9f3fc32212c2f70b2"; + sha256 = "993751ae6469b7105cb187952570b1b4e87f458720b47576ffeccb50c7b9f52f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/ro/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ro/firefox-106.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "c30ee37a10741a5f8f4c16c897b6493cbe0343cdef4c25582a6133004b88c609"; + sha256 = "47ec676324b841bcb9cf366176a394640f9b47c181b5a3a818342b1692e3b1c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/ru/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ru/firefox-106.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "1ded58968c63efe9714c68095ac9a17a0d61f0a3e8101c2896b32cc8872b92cc"; + sha256 = "15dc118027eaa0d7d063523aabba12b46920405076c1ce238fda62db2b4ee7e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/sco/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/sco/firefox-106.0b5.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "3c7ac1f51a2c6908a0c09818a873447f4394ee9f2ae039980768ebeff1a0228a"; + sha256 = "82476bdfe8ad10077e32b96789c5fed32eaeb5c907650e003010203788006bf0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/si/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/si/firefox-106.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "ab1c3bd46b8d5c4dc7c6babbeca042b4a89110cde972cc2686e47fc07d229756"; + sha256 = "bd2e414bc53a2f13cb36366a0fbed16dac9aed3e777553e1fe052f435af03bdb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/sk/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/sk/firefox-106.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "3613b1bdcfe91475b13c6998396c467cbb67c2988bcb0b7b4997d126ce75017d"; + sha256 = "4c6a3a51cfe0ac744b1f7940f419b78d67033733c9ec141e6e117cb80ecf8dd7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/sl/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/sl/firefox-106.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "ed4b14ee52edc2e71791da7cb35c4996ffb965d12b28a5f9048fa44bfa041274"; + sha256 = "305cba317b340a649a531c493801bca0533e05b68b7b8c1c81f4970cf57a1d09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/son/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/son/firefox-106.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "d6d26895d32a6d88cf5acc81777f8cc94134fd4c9ab3c7e189d17ec781a8f637"; + sha256 = "88c43f4fd4c61a1cdbd6109f65bb27235e22f471c8091d52890c0dcb8bf38b48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/sq/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/sq/firefox-106.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "ba07bd3fdf199b58ebc02866c6a58a2b15e64917ac7ad6bb48ae82990b8c20b1"; + sha256 = "127e042d07e6b56e2bc177c05a09a6b712ee63fbbaeb4a90d4b0e9775fef7aa2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/sr/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/sr/firefox-106.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "da94b246aca6573d91170d4b4e5ee0a4d12f3b722d712fe17226601a2e1315fc"; + sha256 = "d08f6fba892fb500924d2ed2531127b6bf51b7b9d65f11c36ae3e05adebd1a71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/sv-SE/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/sv-SE/firefox-106.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "185499fb8cd52014c4f6b43e4a1dd49c34d5b18c8b9f6903b3c5dbfe5399c243"; + sha256 = "ef56a2f2acd15e54f831f0e0c4a55506c3ed8ff1d532cefca86f6fdaa5b14d21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/szl/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/szl/firefox-106.0b5.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "1de424833ad58e22f13821f41e1777f6de69431df372cdb3b06431154ae45c51"; + sha256 = "8aefe66b15188403a200cd215c89da1b35998d5a5cbf5519ee05160dc98b8e10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/ta/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ta/firefox-106.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "3c1885c017574b1677993e2aca6bb52e88994ed07926bf28beb9574209db332f"; + sha256 = "427f704d4d0a533b76f120d10164def4da34d0292870e728dd3019d7aa7d87e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/te/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/te/firefox-106.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "a22b4e0aab2dcbfbb9c82e502c83130cc4c3f4a3ac9ebdb7731babc030a1cf10"; + sha256 = "7edb070de265f08795b5808dc1bdb6f98b17b22b7a1f8cbd449de5e54fd2c4c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/th/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/th/firefox-106.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "fa71a2d7c216f7fe3dab88c0b6e8639b764aca2014f2537fb7bb34ceccf04efe"; + sha256 = "c618a55797f8dcc66efe766ed00ceb8a26768fb8873865d3a88c721e8419fba1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/tl/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/tl/firefox-106.0b5.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "0a36f5a458632ab519c96e59d17d107b36a486b3b419b4787232bbbe5ecf7a06"; + sha256 = "d33946e26e36e72e341d7407184806230c5bff06f9d9cd4042dfc723f0283072"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/tr/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/tr/firefox-106.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "54d33cac6a27434186936249f191d7fdc969e22f0b6475d01bffec1eefa85cda"; + sha256 = "38ae66fe5a76b6f86283adbce1e2b47117e69316d4fdf17c68b3173ae332ed13"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/trs/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/trs/firefox-106.0b5.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "a93d669a4555d80abaeb4b33f753137fce6bf9dacdb9c3b4e914ebc0772d502f"; + sha256 = "0f628d1d423a024491dc1360c5d7ff949061ec7e4b373501f026f94e0725493b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/uk/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/uk/firefox-106.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "14f2cd11d20643314c227c7f9120f0c63d3380ed0f24899a53e325dd277eeb42"; + sha256 = "95ec7c2a00e87aec69055334681a81dd1e26074136bae946e166193b380d469a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/ur/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ur/firefox-106.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "cd51d89baab5a9ab0f1dfa6aee9c9b1934c2eb6e97af8335c4355c39249a8efd"; + sha256 = "9f7a89e65ce6e3c286499bc2b54ed86cb4319a509cafbc5705bcd6fd509bc0b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/uz/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/uz/firefox-106.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "ec767ef6dfd78da2e7cf0020548d9aaaec751193255e4f1403b67ebd93a58903"; + sha256 = "54e32fe8c68655dfd0ac18af6be75f6bb853b4d2f065a021e8042c415fefc90f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/vi/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/vi/firefox-106.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "151de0cb6ebd96d944bbef8b914c6d42e0748f984b3137a26188c9a8843d1de4"; + sha256 = "23a925448bb9bf719f12af2d5d1735d580f1a53f9a7f4d9d0ef351a1d1bc1b59"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/xh/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/xh/firefox-106.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "bbf4bd493deaddf71459991b3151feb363beec2e48b436a89fb3725fe4514544"; + sha256 = "258cd630090bdf94f9df31a572d20bfc6b556527646c0c29e75446c884cda1db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/zh-CN/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/zh-CN/firefox-106.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "d09cf68190dbc2c84acf9a34be01f0aceb56347d50e536c15bf95b95ffd4648d"; + sha256 = "5509842e4292b9b98fe24671643b646b25f7f50a32f4cf75bbe0afeb4e784642"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b2/linux-i686/zh-TW/firefox-106.0b2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/zh-TW/firefox-106.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ab75d10b30d310df232d6f4ffbf9af9baea1766c674c0b506f15459bf7244dee"; + sha256 = "5fe8c896bd2ef9b80041c4375a3441707b3719161d2f03e220e54cfd956ad9e2"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index e5c835241e41..d84d53101937 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "106.0b3"; + version = "106.0b5"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/ach/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ach/firefox-106.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "e463e54551231c570f8802074587f839b9e78d37ab93bdcd15458be917f1f2a8"; + sha256 = "8561511ffa05f44e7ecb355e55a5f34debf314fda2db73f9e3b72be9748acd40"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/af/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/af/firefox-106.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "e6250b78de9aa47f883eaee3e08d28647a4b0fc95e38b2fc1ffbf711fec6d0f9"; + sha256 = "83617476e933ae50766e48d915716606585e52aadfb0794f2f522ea0249588bd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/an/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/an/firefox-106.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "b070074594aa0f710bd4dc2df3d3874d347ef59ba49465c1c3690743f11b9405"; + sha256 = "05500e3cb7dfd8d6767cf1a0a9de36f8e5569f8c561a6c723702373a258e9416"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/ar/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ar/firefox-106.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "bf4b816e7e5646bfda6df9754c932e3c8fdd7d5aeebbe2c6d1b0257e60c37d1b"; + sha256 = "7a084938b7996cf7003a9d351ac6a47d36d1341aada27be3a7b4cd8a904bb8aa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/ast/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ast/firefox-106.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "226fcbb78bdf928f7876a342c5a9aee70e61427f1002f92d451af1d364366720"; + sha256 = "2555cbd082b0e4e94ebbc71f45897c3f2e62703d8f14300360d896cc48d70e86"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/az/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/az/firefox-106.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "4cf75b84255ef1a6b307534ac97d98c39fb902eaa4858e062bd5d43e4f8b1001"; + sha256 = "71cff2fa458bc664a8fc43f8c94b36dd75b61c6534e45d904e391991dae38590"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/be/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/be/firefox-106.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "2234e46ace57d3c9f6a0553f67f9f650464a08955b35ad77a2f501d8b2c878cb"; + sha256 = "30b1055d251fffe08c867e4e17ce564e0cfb98db57c5e94733a462e25a93b357"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/bg/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/bg/firefox-106.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "c644f63cbf8c4aa01a0c98634903a152c1856d3323b981a47722ce876eb7cd73"; + sha256 = "0fa796ab33be0378f5119f6485310370032b3ff0a265c09844060a16299d8044"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/bn/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/bn/firefox-106.0b5.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "866fb6fad4c5ebb939c68d8867656f543028cc43da02a5ec7def22245667d4c4"; + sha256 = "e9167f0d715f29337bc378d0bad08c283b61128d0c6d4d34b0ea9d0230129d27"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/br/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/br/firefox-106.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "1b42d36234d85e5f57c9a7de0dca3f4087723b68a162c201535ae7b4301d53c1"; + sha256 = "7ffd2f5ce0a865984016849c41c2eec420f65f569142d2999a45c85f88b6359b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/bs/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/bs/firefox-106.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "ca38d54268d4907984350fd3935004d07ffcbbfb4f2bd4a530ec80bc6047008b"; + sha256 = "255a076f7d77405a6a9a717baa2e7428810ab2d0e52f4b1b7d3bd661a8e68d45"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/ca-valencia/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ca-valencia/firefox-106.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "8949880d826cdb165bc4f48bdbf1a1bd0ee08fe4635893eac7a3fdaf011d1149"; + sha256 = "adea915bc0c7b6b108c78399e1f2246c71e6c52edf68b0acc5bb09b89910c77f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/ca/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ca/firefox-106.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "d324234eacaca5c7da76b9d8a2915358b6735ad0e347216108e5016fe3e14532"; + sha256 = "bd57a37cd9d7d7b7fe11d4d657a65edb28f6d8cdf97c618db8f5ee61cf0f45a1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/cak/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/cak/firefox-106.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "d97bd0cf79c64b50853681031bdc7ffaf1490e2770ee44f81ad7364c0157255e"; + sha256 = "064bfc818a73e26b2391af3952419fcd33185b777a445566f7611573b512aa36"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/cs/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/cs/firefox-106.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "ba8b38a28bea4b64aade6627a4ffe5220e0ec873a47d877a5c3952f1441e838e"; + sha256 = "96f9ffcd5c27fb63322146012db1484f4348e37ef67487ee6ae595785f821d4c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/cy/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/cy/firefox-106.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "8754ed3f6e5f24d5c4c036d8e27ee6e37c3fef48822958962bbce53bc90cdbe9"; + sha256 = "f33a17099b64ca3a88d53666ac3e82f9d349f17610bceb3be2f2f78c00b442c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/da/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/da/firefox-106.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "757c77227c97804878b010b07f7d499cf6fffe20a2df3ee088be2d77ee5b90d9"; + sha256 = "c17bd03975c4aea3c8469f16340a50ae55287b1fd9a92223487e5293e6520540"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/de/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/de/firefox-106.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "e59b6300bf60a297a475603769001e8cf64354e1e74b9b79cfe135a73092bd21"; + sha256 = "3b8c84ab9a961d4c0b1fbfcab10a6b38e855bff9b54446d94f9f7b5a66dd04a1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/dsb/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/dsb/firefox-106.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "5897ee5f2dfbd970bfa6304dcd9e9003d6d85f4d0d9180abd37f98eaa88241ae"; + sha256 = "10f57d6cb48e493d860a1fbcd1817224e63bbaf36bcc9bf8d6d56e9e7e07d490"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/el/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/el/firefox-106.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "0ff0f28da627a48f951103dacee2fcda5a9fc7f4e2945f3e8aa8cd277a9b1e6b"; + sha256 = "ebb6a84f17e0a0ae677f01417e7e199be75b8888624c739a63be50e7cb6631ed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/en-CA/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/en-CA/firefox-106.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "425d0f1e253a722968d430bbd4a4d3f916abbcae6d99e4d720c4884f06c64fd0"; + sha256 = "f132aa451958757f8f8fd1ae82ed0b72e46838ff59044d956edc7242a106687e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/en-GB/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/en-GB/firefox-106.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "048b1ab1e46ef3d1574c88e72208e0179922f40069ae6de62a3d0a3034d4d1e6"; + sha256 = "733e103756d3e885d9b7dd084448c8ed9158b735615e2433ea2eb35c4aacf413"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/en-US/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/en-US/firefox-106.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "cb7c9a4ed20e37971c79dcf673516e74ce9c2496fc59e779350f3adc818fafbd"; + sha256 = "3c5e8abf57742958345d1be9ed5d4cc8096198a8f9e1b58277ddf5dee300df42"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/eo/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/eo/firefox-106.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "1a25f81ecb0824134ba50251940e79047c8dd33d194cfd62cc7e8e8b67a60c9d"; + sha256 = "ed02281964a7b63be645a1c0bfa54c60c9c06e17ae46958b4bbe7feaf844a55b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/es-AR/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/es-AR/firefox-106.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "412ec2928d5917335ad72d995af09bfb11683f0747705cc138e0b295cf58fb53"; + sha256 = "8acea707b073aee74c3a5072f04150b35bbf4e1b603752d3931dca3d51abfb5e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/es-CL/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/es-CL/firefox-106.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "12c37dfa3c8b88f8cf3726719979a9440350a3b5cedf705b71a1d632c647f268"; + sha256 = "295208a0fa79f04f27e7d0a5597faa40ace70c425c6236ce5ffa0105d617a68e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/es-ES/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/es-ES/firefox-106.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "cfe71a36b2aeb75d4331a59be5094ecb2f5292e7a173ed1cb73f3e9232896a4e"; + sha256 = "c278cf1a3010f0fdf63334773b37e02a368f2fa60aeb626215f16a45cbea7ac8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/es-MX/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/es-MX/firefox-106.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "1f3051983e0cbce87afd3fc8e6716b973038234fbe4ff52309abffe922194e2d"; + sha256 = "68b8242ce796aef4e08e23db3c804d373e7b811e22759fc0fd4777169e77864f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/et/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/et/firefox-106.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "2c0a0dce5c2294f01b878387d0b1b0a3eea5e6a9396dc221bab8c971c9df6efc"; + sha256 = "0526e691ee552cbf11a74749d2a1c633d84289210ba85677f035565c9ac9f395"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/eu/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/eu/firefox-106.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "bb635909dc108ea6b75605443f5b37b8a1706c747d91b59e62ecebf2f01ab407"; + sha256 = "fb8aadf65afcc9503181600eb1c446922fe6d46ba74a32c069b7dbe9acab4f14"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/fa/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/fa/firefox-106.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "00b43871bb77b7ce866520a04b90ad6b829c7b377d46c97c25eb5f0821904c0b"; + sha256 = "79f82ad1a1aeacd865449c34c1d7249d62875924dc204e04e9cd0123fad04286"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/ff/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ff/firefox-106.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "ad04c8296c6ca99ee5c2b698b2ffe2b19c50bc4cffe672839b68e1af68d11537"; + sha256 = "c33b13c7b6a19604f46f33e705ea3d950832ea62495ef687212e38d8205b322a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/fi/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/fi/firefox-106.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "441c3c48274d123d0006e6dfd59c71ebd5cb718d2e8501beb6fcdf8c9ec276c9"; + sha256 = "8080d7de2104faa02a38b12700bde752c8bd2b01168d975247c2576e59b34d8e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/fr/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/fr/firefox-106.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "b7a4ea4df1917b9c65c98370d65559b1330751382f512049df4f7633c802c6d0"; + sha256 = "f552d225f475b428c701a52780824f559659760438928c6ca765fc95888d4a48"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/fy-NL/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/fy-NL/firefox-106.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "838b635c5456c7565fdf744742b2b70fe47a3c2316656c606067961a6bd4d2c4"; + sha256 = "3918bf4e8662d104255c633e6845653797c15ec4919864b20460520320ec0acf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/ga-IE/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ga-IE/firefox-106.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "13551a85014408a835c933015368d090cd55e35a4b774fc4359f62f48365ac78"; + sha256 = "643808c3cddae4bb84d1e1801e861c82d8254c783a70e08bd2323e0ffc6f1136"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/gd/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/gd/firefox-106.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "85ab7babb0373cc054dfe043c2b23696b85c9f211a4650bd4772ab7b7ed92cf6"; + sha256 = "d07e8ac6bd91644e92a81d004f2167b4a0157671b4883cae42e5ee4435bdfb04"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/gl/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/gl/firefox-106.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "e67a442433ea996d7a7d48aef1db16cbaf1f5a4fa9a2e239f6dcc2c34a1711e1"; + sha256 = "bc844861dedb5a3567f20352bc522cdd6f1517a8578716dd856a0c505f13f350"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/gn/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/gn/firefox-106.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "9120bd521e4fdf4c34e5dbd5879a2a50da8172e1fb18f81d2e66738457185eca"; + sha256 = "28b2a372aad0253f7c86897eeee1ffbd5618b3adc1795fab5f45519ad8308df0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/gu-IN/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/gu-IN/firefox-106.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "13e8f1da90102734e44ebc4240eb5b6f0110125f831ac569d42aec8018e12cde"; + sha256 = "513eb2523c4ae09c14b7102c09f6fbc6a33f194e0f9c71ab0fbbeca96796d9a6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/he/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/he/firefox-106.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "843dc3d7262c777b68641b1bd03cd3d57cfa1330c5b651f3946bdb2f7f8286a5"; + sha256 = "20b83257778c16097889f9399f326cbc631fdd9fb3c8aec03e9d99d1af0d1764"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/hi-IN/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/hi-IN/firefox-106.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "5de727ee6658965ffa9d37a6c09234d68c86dee36616428faeeb11003c196226"; + sha256 = "beb5034ab76c09b605b91a87070674c82a5ffe92da5e8905cade02477976dbc4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/hr/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/hr/firefox-106.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "f025459ab2321de8c772b9620237f6b83a5544852feb76a0fae09535a7f7c248"; + sha256 = "76585fcca92bae5ea91b2e16d1c38b645d1a5b6132a474be1de070efa7d14a34"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/hsb/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/hsb/firefox-106.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "95a9001379ec8394c36fddd65f7b078bc93ed1c2c1e3529948e53703e52f89e7"; + sha256 = "ee3c70ec61475cb01df13adbf45d6f889934e97162662dba56e54a553b403913"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/hu/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/hu/firefox-106.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "9fcc29f54e8268fc1fc5304f616db55083c54ce89879e25be9c6b9b98150b393"; + sha256 = "2349d58a9dce6588de0a0afcb28a66269674cdd6b8879a3ff9514a4d129dad09"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/hy-AM/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/hy-AM/firefox-106.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c4e289635f3581738a2dccc5d322998be772020f0800b7d515370b6d77b6c787"; + sha256 = "a5429d3282b68498986668070ca1e6b009b2471871efee707df659d4ab1a5051"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/ia/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ia/firefox-106.0b5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "97af51d19a39e36d1d67bb1d08b9cdc24377e8241ce802db8470e2dab371cb12"; + sha256 = "c00260190fa7f71b0394f33eb4f3955c3eaece1c47ba85eb32c7c61ddc750fb7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/id/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/id/firefox-106.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "36ca009d15df7467ba2081920eabfc9682b546c99bb5abf0fa07002e1230f1a9"; + sha256 = "1b89d56c33b0b36d16d4a454beb1572a29f21f4e93c584f7282367770f309b46"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/is/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/is/firefox-106.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "df803624034cd56fc86cc22a55dc19df9a72eb1a189ee2d9879856addc6f2ee4"; + sha256 = "64b453f79e65911ebc192201a711439d0d4c2bf31b2757fafcdbaf42e4cdd61a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/it/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/it/firefox-106.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "008d658dc952c178f03a2fe4b8962f116e6c0164e2007acc8fe3a86df3ea7dae"; + sha256 = "f199bbd3957966733a8d7b3b7cb365b9d8ff6bb1a1009dc8a444b9d23cf75ce6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/ja/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ja/firefox-106.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "65ef07119b4768b283d7dc9ac061058d5b472801d0c3e1018e4232f40981b048"; + sha256 = "fd671e68f74080861b7671c7c50e10553d3aab4e3bd695f2726eade496a7d462"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/ka/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ka/firefox-106.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "d6e95006003e050e07c287c7d424a302fd3ed44b1298d1af2c81d0e4656aa695"; + sha256 = "85b4c5e5c1aa54e634db7beea0fd9570aaf7d88753cca8fee58198763be86d54"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/kab/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/kab/firefox-106.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "ec9f8e30b2e121c92e807084c40fd06a46ee2c41a2383a01790e9267ff411b8e"; + sha256 = "f99f041f9239e4c2f01c812523390bf53a514ddb76dc9be59865f04deae06b1d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/kk/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/kk/firefox-106.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "c55ebd781149563efe1deae01fd7daa1cf8dc5430b6ee841ed292bb0ec4237bf"; + sha256 = "7b594bee8a5c86306e8b1958418b3113bafeff8ffeab26996b4d61f6adbbc10c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/km/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/km/firefox-106.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "75b4cb380fed3afcc347da6e807183c7191636f620f564ca0321274e4826d094"; + sha256 = "77290edbc038e7a263ba2020215d69f18d1dd431982d54ddeb2947296f0b798a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/kn/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/kn/firefox-106.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "4936f48719163564daa9c33765a8169fd49eddf198049f3fc95506e8bdae3740"; + sha256 = "32e9df13c83adb6a9d715e3987ae8a64c8b008265b9737b5c9ca1e219963905a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/ko/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ko/firefox-106.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "e98fc3de5a60763886313ddda8b2e70f4cb95b3b04709ee275a67a4900389bab"; + sha256 = "4bc1ac651a96274d6353113f7c28a2937d533d12a297f8c8afa8596b73e1b35f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/lij/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/lij/firefox-106.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "98efda385c1b0b866ab24103eb2c319e339acd84a0e3de04b4316d6f6d1f3c59"; + sha256 = "51beb8c5e8aab30a3cfeeeb6944315082c3bad5f6984ed9de8b0f3b439bb47fc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/lt/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/lt/firefox-106.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "6b982365360b2d3e5abee7a830e9bb92c958c689bfea6bc2202a36555fb33dba"; + sha256 = "18ee3a3f4d3628060338ff32b738e6ece839aa01c8b7c21e54eeb1a4a42decb2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/lv/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/lv/firefox-106.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "81447de12dfab7247b371f2eae6fbc9757c5040e37f668ddba6a4ff81c7be185"; + sha256 = "dee950f1b2dbd3d96e121d4200c3ed05befb3e96f88b70fe08a4c5ec081b6190"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/mk/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/mk/firefox-106.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "0ff1d70e486d6d2bc60f28115382beb94d4808f52c93fa44b1d61212daa75977"; + sha256 = "1ae47a547f40f517f185fd49cd74c48d3203a40d377651705563fcb651b867af"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/mr/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/mr/firefox-106.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "3caf31fcacf0bdd36bc755c0a223b27c62c658934acc069a1eb1d2e6a1c3119e"; + sha256 = "0adfcf990bb90bc33b056fe113f7c89a4dcd06e2dd5e05ba1fa5e6290fa4cb50"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/ms/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ms/firefox-106.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "5de5bd3be15f48eda0f38e048fcbd3ca1ea2eb0600e159fe014248646a8c1696"; + sha256 = "c105fb810a6665a95b801f963aa66356b110ebe573c720e0076b123fc3f6ee8d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/my/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/my/firefox-106.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "627519b4d177234500a1b4a219f0804b1e58eb6dfcbc00effe319da4d8ca1912"; + sha256 = "73c8a093f14db76099b84f9bd97c679cbceee78e93470878cc2144f50edc7c21"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/nb-NO/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/nb-NO/firefox-106.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "5f4656e62e417570623f9fe0ce2f85c615dd1ac5381258443262a2127c8ec862"; + sha256 = "9b323cc24010071a915c2d7f8ad7c62a125799289e2d37e16054df22deea0e95"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/ne-NP/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ne-NP/firefox-106.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "5615f7e1cc247eace8bf1427a74a429860f3d3607b3bdd56ae96519b6a1e701b"; + sha256 = "aac79aeba8cfe567b8f281c98e4b0914c7ba94c746ba836c3eb3d2dc5b908e04"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/nl/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/nl/firefox-106.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "84431b965068964c5cdfb4c0dcdb0bb2f4001bfc29d5e573611f380da9f9595c"; + sha256 = "e7d7b3ba83e5de6636335c612b709916974f06b9fb9bedac3786f23a8d76887d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/nn-NO/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/nn-NO/firefox-106.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "9cdcfd00bc619217403a9dcbbab63c28bfca479590e7157e2e377a71b7c0d366"; + sha256 = "806a6d230030228fc9c386711de90a57d47fb46a8360f6d0ca4608e845bf1e5d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/oc/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/oc/firefox-106.0b5.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "690f945f9f719cbd9f8252b4dd855c658248365a686d537c4170b0ce4acc8952"; + sha256 = "d44da3e42a9539efb56d87f15d8f931d10e555124951f679f6651630161e1434"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/pa-IN/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/pa-IN/firefox-106.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "4860ba23550f4255949e6985c2f20b6cd22a3656e09476f703ed94b5651ba8c5"; + sha256 = "f5a69d6488040009bbdd02481931a4b8b16a2cefd092f8b77822e7d92acfd658"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/pl/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/pl/firefox-106.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "f7354aa68375c07ff0c3e73a20b9b0181a686f071ea768ed7d5ba8b0ee36757c"; + sha256 = "713b9a753f3124c7f828b9d47fd0efb096f992d7dda927469ba9d5b657488ffd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/pt-BR/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/pt-BR/firefox-106.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "48ea57e2f823c20ea1d17b6431e38e29c1d34de911cae4ba29123451704f4f30"; + sha256 = "765ceef939a14617f3c6551245c5f5add040b2be481366dfb80f55680ccd5a4f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/pt-PT/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/pt-PT/firefox-106.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "5b731fdb0bde6e97deaa850dcc864db9d2aa9a30dd28c33bdaff6c8ecad7e1c6"; + sha256 = "7489126fb451d4a75b5a18be31d1bee296efe7b47339def2b7d97a7308663800"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/rm/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/rm/firefox-106.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "aa85d8dece1c19ff2dcbb2ef242caae55b1588502fb482aa08130fe4d4843345"; + sha256 = "444781014ed9cb501c6ce6bd7254bef771b5d9a78a46b40caa057fda5ea9fdbc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/ro/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ro/firefox-106.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "99eedcc8c1e0c77d745cbce5e41ab888508e2fcdd03f5f89b8b4386bda9ea7ec"; + sha256 = "a435a105cc1b450e56fa773215f4f39974dd1865ff21abdfe0d9eab15ac38f20"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/ru/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ru/firefox-106.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "e9cedcdc53e6ec019d0bee22be26538b4d3044d2739fdc368cf7a2a193821411"; + sha256 = "50bb64601eac51ee80cd232f25a37c40f58f630ea888f4656e06ff53a511d978"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/sco/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/sco/firefox-106.0b5.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "c78525232a51437bc00fb0c022dd63e118ffa553ce917ba04725564b017c9d9a"; + sha256 = "30d43956c9ad25eb0e60453fdd88f9adad5d057ddddcafe32d8e103193a8a7f0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/si/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/si/firefox-106.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "1505ae3d5c83c6e0b9d9a2c352b22ff04aa8f68ca3bd829dff0a90500a1712c0"; + sha256 = "0013f2fd5008756443e661becf13d91d5a6fcec91c83aedf9deb422b14c1957a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/sk/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/sk/firefox-106.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "e09264ecf4c1f5b21af4edf247dd0a6d44f988489e5f6a4ad213200e5be8d017"; + sha256 = "8feabb983ee212d93f59bcad6d9a8a66450e871560e597d768ad7c986f694b68"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/sl/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/sl/firefox-106.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "72659a864885d6a1a79f17e24e648979c408da501b533867c5ee14a290d830f8"; + sha256 = "ecab79986183edc42aa1450488cbb6163a7ad92a21788ee5f8468ad47d3629f8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/son/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/son/firefox-106.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "9cd9d33ee567a50d5d24e94d3b7d9e70d27c5af5b3ce8b7ae222d45232087af1"; + sha256 = "7742d879125b22e25bc18e9113e567150eea3b991a6fe55d364399ca01374552"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/sq/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/sq/firefox-106.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "3a891a39e774379cacd8d15d7f19b8ea99cae087958bb398f95a02709aa24963"; + sha256 = "21d213389cae20280f5ecba82993d165dba36fc36c6f9ab0e93732d049f2f593"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/sr/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/sr/firefox-106.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "f38e8aff090e6340eec9f0979ea00acd897253118fa7c136b7bbed00c548286f"; + sha256 = "978ad725c887c4b68a65cf7c67349b44298ef404d7d84f7113a0c4855370a31e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/sv-SE/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/sv-SE/firefox-106.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "d2e3f28504317fe099d3e01b3e032e543714a0370225fece5652bae3df26fe33"; + sha256 = "7e53f46c1135822a09c53cd10a375ca299b6254752daf0a90883648c1d428209"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/szl/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/szl/firefox-106.0b5.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "2082bc6c435caf0389b518faa97b0fafba1ec114e1e6566ebe19d95a79bdd1ce"; + sha256 = "37e203a9b83482ffa8bd2ac5c757d295e0ff1550077b0151023e1974f049642f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/ta/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ta/firefox-106.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "c773019739f8488d12f180c0c2e13bd2c9386edd534e7a3499af6e4dd362b83e"; + sha256 = "2044377f697fd6943d7e904b74556a084700d2a7064eb994114119264fef450e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/te/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/te/firefox-106.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "c8274b14b8664e7f3048f27c2e13004f6f97e827cdeac51db469972ef0ee7746"; + sha256 = "0afe9d890f0e3d6087d3f12a63d007de658bd94c7bad43845065e2f7f8ea1715"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/th/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/th/firefox-106.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c7e4e02c9856852118ff380264725ad99b842a0a351750f74ddf3c065b19bddc"; + sha256 = "9d3bfa3a227c1193c4900e99aa181306aa2560e0f419405e8f0026aa5f04e0b7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/tl/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/tl/firefox-106.0b5.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "b6c4df24a3706773f88c9c5bbdc9905d02622b11fff206557da9a138cbf1a9ee"; + sha256 = "c4784990fefd26fcb26abdc59bf5b978bf00dc6036212565e4c4c75baf71f8fe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/tr/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/tr/firefox-106.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "647f3eaa4cff80f9b47b382770126f8f40b387749bff7cb904cfc3ef5fd72fd7"; + sha256 = "bff6fcbdc140766aa4971dabd2544a08ce42f923a8726871fc47b18fde099c59"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/trs/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/trs/firefox-106.0b5.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "5831ef9c011215a7aef2be56c91d8ca2d8cc3c85f14b630586cd8382b6a92a5c"; + sha256 = "727663232ee0fca2a9b5918688211de5013dc294d2fec80e7f568ef579fcfcdb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/uk/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/uk/firefox-106.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "66f4172235aef99ef3b804556350be22ab72c227c01d5a11ac05b57b363dd90e"; + sha256 = "feda8099c81ca622f19a1a3205d6aef9d2b452397e16e6d1b213609ff23bfa05"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/ur/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ur/firefox-106.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "b429c9ac394479d9ce48a769b92b812f0df2c9c4d32de80e9fbb8785c0965868"; + sha256 = "40ee8c47b590054eddf4bf8789abc52bb76d8a4261fd342db26a15e614ce6e57"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/uz/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/uz/firefox-106.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "70314ebe800531973d3069c84c9f72efbef7f81393458088d49b26fefcbbbe23"; + sha256 = "f6fa60d36fc6f624ce5b8b97a74a181720645ff0aa7b0f5545b6759804e9821c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/vi/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/vi/firefox-106.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "7915dbe530cdf16b6a52e88b8f2b4d516af7ca05a8bf5587d1db026c4c04455b"; + sha256 = "0159e7f7bec4e32589a955cc7b94c322e0d80257fbb960c8fa1f5d56cb5564cb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/xh/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/xh/firefox-106.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "56f14020c3b106e0526ce8b8f98ae987e399ba84bdef6d4d23bc31a80496bd49"; + sha256 = "e05a18b54cc54b74b7a90317378939cfac2278473e5d2166288a560bc621964e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/zh-CN/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/zh-CN/firefox-106.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "cd4e3e7089298a352d969f91c3d1fa48243f9509fbdf898dfd1d11c35b7f5832"; + sha256 = "88337f1fa445a934866493be661e59d968ab48d1beb8ab65820adbf5c43b47ad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-x86_64/zh-TW/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/zh-TW/firefox-106.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "b2b997a416f19200b8bf0f59b4beb3da1ecefaca6298438bf8adafea8e41304c"; + sha256 = "5710e0a112ccc06d7dfbcfc550e397796a3a829d9b587723cd6f74352ad2ffa3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/ach/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ach/firefox-106.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "c4965abd58e242e7e1c3b25b9c453a27d3fe05c2adfd21d809b34843d83ff269"; + sha256 = "ad16eeb19cb0d64715faafa58f7ae5344306c57ae5cc00064870ea6d0d422705"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/af/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/af/firefox-106.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "cc031b4906ab8075375c614fb7e38ca356f2a6483e2d7a9a882d0652c4d5b112"; + sha256 = "3e94c4b550466e7ae223ee9347e67ba05f00b5aa77a889b4063066b6c0f96a01"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/an/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/an/firefox-106.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "56b94ad1e3559f3a9d1775c82e4fac47256708ca8fb1dc3f3a242cf858b07adb"; + sha256 = "7bec79c662b03e5b9690ea283d15b26105714ebcae5e43ddf6acff3207c8a399"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/ar/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ar/firefox-106.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "bd53ffe4c0f767a3a5a127a8b0587e6803541fe6e01c310aa65cab679725c37b"; + sha256 = "7ff23d45f9af6dc4e381ad944726f196239baa0c073f2e91ce2b6a0f8fbb0e82"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/ast/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ast/firefox-106.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "935e8d259fca0b9e553c3a202e5f60a5de44df2f5dd1c3ea1dbe87224bc5458f"; + sha256 = "4ebba3167fbb09e7881c765378db6dc283f68dfe5cb430bc1b7e7d1d69f5e7d1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/az/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/az/firefox-106.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "9449ee0390d974a65d2788cd0c1b4396042cdc15d90fa8d14fc87ef9f655209a"; + sha256 = "d14511717cf9d7baeff5d18bacf364374f24d5a6f5ef780eb43db7b85feb490b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/be/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/be/firefox-106.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "d779494f18291d301b77cc9a6701783df608fb2db297e6ac5e7e337d0516aa60"; + sha256 = "a9e8f4776977c30cf9b3f30f5d0e82c34b402ca0974d3c130ed5629a22e168b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/bg/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/bg/firefox-106.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "6e9b7b62bd0ea19b0dd791ced2e2e87b94b69beae8036ee41c55b3759425a04c"; + sha256 = "47d8c1926013cb318b400f9e0cf68c9ce555fe2e4923d47d5017df792925beae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/bn/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/bn/firefox-106.0b5.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "adcda71b13ff0d134b0593bddc28bde54d8e7605cc16f18f25a5032ccf428cc6"; + sha256 = "551740e8756abde368f1c7937f123ec571ebf576d1b71d60ca20ec075ecc2b2d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/br/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/br/firefox-106.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "ddb971e459d11408ad5bb9ddad8f259aad1d92c8e1db8ae02edf01df3a4b9bcc"; + sha256 = "2d1a3e19a9f076f0e71600527324db780b3422f4f204f64c7b99d0e01256c5ba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/bs/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/bs/firefox-106.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "2f5d7ef7ffd089739cf0fc7278e2beb9935d4bb34d6937dc4eca3e03574c4e2e"; + sha256 = "9d1030495857bbb0e1ff8bb76c4e7519b73c219233d608c74420149dac2d8f1b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/ca-valencia/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ca-valencia/firefox-106.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "0580369df466b60adb69fb96e302845ddcdb1ee67ed12c9e53d77fafd2af6465"; + sha256 = "1eeb313718a669ea559b7f88a427d96b54f0229424ad8b3db01b8e3843bbc4ed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/ca/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ca/firefox-106.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "c7dc2deab96b41f9d57e0fd7dbeffa6f83e3da89a46d3980e1ef27ecd6b5a6d7"; + sha256 = "e348847c952faa0a60a6a21a579102c86cf186b28b400cbac07119228bee33a1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/cak/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/cak/firefox-106.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "5b18a494a603af3c8ee5c8e1f664eff5b9cada61c2f5e1cb1bd19789bf977279"; + sha256 = "8f019eb3200baa1ff673b86d4a020ec40008c79d217e54698f0b01b4b6bea4ac"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/cs/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/cs/firefox-106.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "2d9b7a1f812f50796c91d5edb2ede07892762baf74612cc524053aeebf8c1585"; + sha256 = "b3076475e5eefcfb7053dd6efc93ab71aa60fdcf2007d4d78c19c277b1ae696f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/cy/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/cy/firefox-106.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "ed41d01289e4e37baa3ec01b68ef546b66cd598ebc956a8ff9747621ab4d76e8"; + sha256 = "ce73e760b47aceba4585a0e1c718efe454276878bab20d3bdef949e95167340a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/da/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/da/firefox-106.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "f9ce4962286f55b4e5294d633fc0c068ea51fe79070d100d5054a876ecfff8c1"; + sha256 = "0f3a2ca436f1ae15fcc894c404debe5c2a913374839d307c6ddf63542d9755fa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/de/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/de/firefox-106.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "548d7100c555cad4d505c193a89c27dcc6cfa472c7b7d8d405e0b3a74d52b451"; + sha256 = "fddc3ac5efc62eee05df25aff44b9581e716206e57b0d466bcc97294c76d3f27"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/dsb/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/dsb/firefox-106.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "6660d5d6822475698b1fbd023fb42c2b86bef6730c1fcda251bb3efce3ae1b5a"; + sha256 = "55fb931de68335a636689aa7734a03f3b4bd12796b0d16f82dd4400d0c250960"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/el/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/el/firefox-106.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "e79f02f8490141005bd0bc1dd7d939ce6c5e56ff67e81d92c29f608f791f80ca"; + sha256 = "8a5a2396eb14fd11c58c4e6c951746bac1d2e1ba65804927f105e3b97607ee3c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/en-CA/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/en-CA/firefox-106.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "4307601552854c8126649de164c5bfba72c941caedc136a7e45d49840582c175"; + sha256 = "18651db0a2a70b056b3d324279e294d1626790701bf523c43f2f1641f4d89fdd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/en-GB/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/en-GB/firefox-106.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "02f9423909a3729bcd00db0633a05997144105b653afe6306e17763e77c9e059"; + sha256 = "8efd080d721fe1d971d61ebfd9a284f78feb743fc3450c216d0438e46734e1bc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/en-US/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/en-US/firefox-106.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "bb78b73082455e30e232f2529b04e365bb0df47f09ff51c0dd713e102a3c794b"; + sha256 = "732c2355f1105af61505c899932e6e53e43c79784c1e921b684ff10db3c50262"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/eo/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/eo/firefox-106.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "2d4e42af295194bd3949b19a28a57823d7d4c4041fb7eb74d7e7da3fc34f967e"; + sha256 = "7151f8420e25157e86733bdf13df4a2fed5357aecf7674dab505feee9c4eb09c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/es-AR/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/es-AR/firefox-106.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "57a889570350a417ca021fd531c9830b7bec051c62435c69465b0ae9570cba3f"; + sha256 = "1f017a00e0755655c5503348e7d4f0462330fc6afba8d3aec24ab3173efd0926"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/es-CL/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/es-CL/firefox-106.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "946305a809c447e467f1e44dc90a440459da25e8ac8bd8b76acff2016d5c0fce"; + sha256 = "a31fba6855a952403692d6fbdb85c01ea83770205e8542e0cef8c635a861c6a6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/es-ES/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/es-ES/firefox-106.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "840491012154c99b0edfec794f644b780a2dfd46befa1d26a2ff51ca2eb7b7e6"; + sha256 = "a28f566bbf8e0eb5908fc88b5468f3f94455e3b70cff0bc81006c1370144404d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/es-MX/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/es-MX/firefox-106.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "225380aa890e1a02b2ecd2038984b0d2229aa6ccbe29c13b8967c7d3590b57dc"; + sha256 = "641f6b89fcd53bd8a55b93bd72b2e59922f43f0e4bef3ae0391dd721ba1e124c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/et/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/et/firefox-106.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "66671cc626f96120ede75b60eb5295ecf21f5061639465153db4d559954558e0"; + sha256 = "4b4f28c3590ff40d42246c5e2867398606a572d0f1f289c2b1e60e5aae4ffb5f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/eu/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/eu/firefox-106.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "5254cbdc906d7c4957f6f22ffa67fdcf2ebeef0f5672c725c96deb8d8a03c395"; + sha256 = "dd5a093ff4a8990f48900b48f30b3eec6df7029a41cddb4eae23b934770da1ec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/fa/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/fa/firefox-106.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "4e4a2b33c5df2cf4451388ac849bd35de4c2e12c350b49327a3a56af94a6f423"; + sha256 = "f4c869d935cc9e57bb1363d7bd4fff11eb85af6f9a6569164acf01948f675a84"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/ff/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ff/firefox-106.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "b0ac40065c62c104e462c44fccb1e6b5a282a472f7756b08cbec9621ad94dbba"; + sha256 = "a4b4eb26b522d3394c7beb1b059cd7bc347e613e5cd24660f6f9841193ac8c8a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/fi/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/fi/firefox-106.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "7b1864cac0b3f8081dc0015af2a0081b8620e0629ac51c93d7983afabbde0fa3"; + sha256 = "5b88dd9ea08e45ad165ba05d2e17586aff8df602277724be9106068508d59234"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/fr/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/fr/firefox-106.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "7b25652dc72f7a8314727fbe67fde7404ef777c780ef4c5b73636ef745cf818e"; + sha256 = "5b5e392b8984afb42bd2871e5a0044c5b64fcc006026af618d4bbee6905f06ed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/fy-NL/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/fy-NL/firefox-106.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "1925ad2f86ebf8c7fa469f4ecd7ce05cf13ac42700fc1c98dd2f9b80e43c2fe0"; + sha256 = "e71c2f92a1b7805b23ea03902383ebb82318d6252be76726a80659c53f73c1ba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/ga-IE/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ga-IE/firefox-106.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "487e474e6d3ddb9e7aade1c354a27ca65d9a18e1a211baf692c0cc3a7d53cbba"; + sha256 = "7bfe67bff7f844586fa9fc3d46c383823cec26a35856d7d71b73f84c59deb1d5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/gd/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/gd/firefox-106.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "26a1b16d7fd974f238c623ce6dc92dedd6a8838221d5640a25876a1ef3da2667"; + sha256 = "2de9bcaf38257b2557f61d0f2828bdd3ab67d4b406cb93dcdc4d8ef145716708"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/gl/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/gl/firefox-106.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "b6518aa4dc6afa8630d63a5eff5781ee8498db7c05c240b0f72d421fa381bd84"; + sha256 = "94f25607dde8a8b7cd96c91bbf59047b40c6e28763cd28055ab0991470448de2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/gn/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/gn/firefox-106.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "966104a41fee3b0bfb0ea666d137482be4490263058d98ea313f371ae001f4bf"; + sha256 = "8b7fb89fa16cfebc8f88ebfa0a71e00fc6be999e5ab8d5605482580f2c812d1b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/gu-IN/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/gu-IN/firefox-106.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "c234c07f88c5f9651b06bdde55cf3cc224f1b01baf76dfdb3aa837530999a2ca"; + sha256 = "eb6a925a483b5f0e42e14d8f9be83c4d1fe0d6d29aea44adb9e1b3e53cad465e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/he/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/he/firefox-106.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "e2af05cd377ef9e495797d537b482076c559ad6ce525e3a51e053443c09d1be4"; + sha256 = "137ac1cdaebfaa5b07076176537d6bf83e7159f23d486f7846dafda995177d76"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/hi-IN/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/hi-IN/firefox-106.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "d64bc4a1af080f1f87a634de315785744347145aafb8bdfece9a6fd63bfb59e3"; + sha256 = "5c0fb3aa2c88d954dab3f4a11ae901f56e3af990b37e0c161952ada8280c2b8b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/hr/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/hr/firefox-106.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "615a5635f3c82b4d2ca53bb701f842e15687da6c4e24b05cd9122250eebdca84"; + sha256 = "36339c7514dd93088dd89fb58de234804cc6cd2959ab47be01e66b08322e0e0c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/hsb/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/hsb/firefox-106.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "857b062c18a42c2d67aaa3eec035927709545a2dfa87e8fda3f892cb4a016675"; + sha256 = "438cfe725888f0a3ecd06c426951148dd26a2102e8085de988f62f391ae63491"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/hu/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/hu/firefox-106.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "ce683bed79893a6225e9ed53e7f8b7645c30908da29185996e7d73564b30db71"; + sha256 = "d6cf04012dcdcba201e02d2e8bdc54134d845ad3055d604cce9701e6b1a43a2d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/hy-AM/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/hy-AM/firefox-106.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "84cbe39875c176a71ba1555ef07494127691fbab75b1acca2df5f1f3d52d40a7"; + sha256 = "46622bc5ba0240171a93f8eb6b023998455fbc46c562f5ee134eca255349e896"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/ia/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ia/firefox-106.0b5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "f615177f141ac347113b1b255152793308477e8ba54b71635a2becff9297cb11"; + sha256 = "70f0ce5b7a053b9dc0e0728501c525c305683792654717ffa8f56d53e7421b19"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/id/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/id/firefox-106.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "c06e3b974cca5e68d856991a3a9d47dcee848b1be8b3177d004e458f887e564b"; + sha256 = "c544291b74d3538ce76dadaef86b68ef16a7bdb6af12f274fa4313fc6ac55474"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/is/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/is/firefox-106.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "7544bb02271f0ff91d963e3abf63e0e736fe68e14b6f7c8b1a945f641048715c"; + sha256 = "345965cd4a4ddf0a69b00ec10f33ba947f75b38a35e56705a6ff44957d2b650d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/it/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/it/firefox-106.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "2bebb76660a12ed410b327aa957761f66bad14c9095a89045d5a94f6a2186612"; + sha256 = "b01889446d3e539046c13c0b3c8a9c60308768e0e0bb3cc772a7b19198702547"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/ja/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ja/firefox-106.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "b0dc503133ec86e0055d82372c2160e948a2891c321835d20be3443ada07e376"; + sha256 = "6270bad12685a49626291d90f620aa194e3262e2e0a59fda87a75e1bb47b3559"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/ka/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ka/firefox-106.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "74c85b6bd4e74005271031f973b8562d277d69bde9ff4aed72fa563ddb94cb42"; + sha256 = "20c845eb27d0aab0ffceef8ff1d7215b8fcda883dcc7cd285ff01a890ecdbf7f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/kab/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/kab/firefox-106.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c9caffd3e795275c8e77d6689693a85ce0d77901674db71836c708b07c8fec63"; + sha256 = "82083c91554c9432c93fbdb740a69cff2fa0d23ec937c6f308524b5e8c619348"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/kk/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/kk/firefox-106.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "c9b368d8f860f3be20bb1309c4d03ea931382d7be6d83113a71332037dea9830"; + sha256 = "0060a1ffbc5c272c9f13375f657bedbbd856e39f88ac13082db138b5c5361ca7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/km/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/km/firefox-106.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "e5252605b9cdeef02fe235fa5f8b4bf8d0550cd3c47951d5d23b0ad3a8e7c8c5"; + sha256 = "f888e6b31238df74d6c10ac1136c795276c65ab7b2e9b4d63b4f20230b861fb3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/kn/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/kn/firefox-106.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "b2f36f393ed2260da707531c63b41c7aa7bd4510a5691adf7b4a9a6120eee8f5"; + sha256 = "107b113f5239f0d1a225248f274f7d730b6e5b2c3ed7b873c0252d83c5d798e4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/ko/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ko/firefox-106.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "bfb098b40b321a090987886df22faf3d0b678193e3060d4d27db209e19df04a3"; + sha256 = "d4db566fa090f3ab7c49d51d2fa4d3d822ac6fdb7c6562278f1880b6b742deed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/lij/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/lij/firefox-106.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "484cfcc3ff03acd2ddd1f990a29b6028a1eae08eb0cde9841357f12c125c1bbc"; + sha256 = "32a62e75511133ac65c0cf02bd41e9142ee33adaeefc593795dfb7f477f9b6ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/lt/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/lt/firefox-106.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "0f467a329fa018a97758774a95d6065e0f1510a1518b36a75a7089485c71a3cc"; + sha256 = "926c0eef7c2f96034ae0901d3803d9940a03b9c5d14a2bc6baabda82d285cfa5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/lv/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/lv/firefox-106.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "094dd348d617ede6a6291a333eb65c1eaefce44a5a6c7ae1f354ac51a5c02ddf"; + sha256 = "7c4643e8b8626679b55499cdffaeca1b7d941502c916171c7cac28c4efa925d4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/mk/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/mk/firefox-106.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "7fa9a0b0b4fb91eab676d687cfd8147df376096c0f5126e67f974f18b3702225"; + sha256 = "652ba14a7c92460f6f6ded6340888b7442df3eef506ede26d1f829999f223766"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/mr/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/mr/firefox-106.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "0d8515e46b4fd3f321cc59926d3d9acfb7f45c1ddae4b81214f481284951a3ec"; + sha256 = "8b8f2da65becc73b9d4b17cef27554e6a29d4313174947f80567b9ea1dfb7036"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/ms/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ms/firefox-106.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "537506a6ab68357d82f79754a31c8bf2fce84860ebf6c562680fed03273b7b9e"; + sha256 = "39cf1d632f53a686d66f76a2a9d51c2da719655824ef888cd89b9f0deb04d1e1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/my/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/my/firefox-106.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "0756c5eab91e3ad8cf22b22bc69820eda18e077f43e383df921002877dc0072d"; + sha256 = "ab8afee1d85f3f7b96c232bbee11ba7e7e3442e3415e450cb9d0fe93922a78f4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/nb-NO/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/nb-NO/firefox-106.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "be7186bcd63476ad19aaad3c9d909297dc8abcef44ff603b2092446a2f2e5c2e"; + sha256 = "9e4dba2ab7645922257e59cdf3f008086fddd32c5acfd52dd2d2ffa97f747aae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/ne-NP/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ne-NP/firefox-106.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "eb5f1361dd7f10005ed23538e76e16f6e704a295dd41a286881436194a70ca62"; + sha256 = "2a158b9898f464500a94f9f70575d717195c9f197fea2844f3d7ae7f3b3ee619"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/nl/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/nl/firefox-106.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "8c50cd3037fc2afad2937c25c3a0c7e5832c703fdc878a3c35aaa0f59583da9d"; + sha256 = "528f9f405a69ef8c8b1a49c2ed9c5e24a23d570b0e956c5376ffeff5e3ad21e0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/nn-NO/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/nn-NO/firefox-106.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "7b9b33c98b4ac09416c80e423bdb2ca5b0fc5de976663add470fc07ba65fdb5a"; + sha256 = "47722775d70bd26f72bb1d0791afc8871ad1a6e0770ffb79858a078a23ea0796"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/oc/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/oc/firefox-106.0b5.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "80f45ca3656399ab0c7aed3203ae3d726df381ea539833ff68048453f3783e8d"; + sha256 = "bdf867e3a02420d361f1089b4c3795473c062a8b7e0d3b6fa6d43734f059cd9f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/pa-IN/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/pa-IN/firefox-106.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "a14fa2be62c8616095846ef60791ad314660696356fc36a5819b36c8d098703f"; + sha256 = "d533a1f51a2feeeb233b0a450ce7f435acbae3e7d10d085c96ccf2668a3980ab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/pl/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/pl/firefox-106.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "da43bda18dd53db74a8f21f63508318062c152dbd2033b075b0bec8aefd0d3a9"; + sha256 = "dac080a9f0967529443d78e78641239e33176751b81d21654110b6479daa53e8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/pt-BR/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/pt-BR/firefox-106.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "eff28a0773543d664b5dc106aca6fa22d6455f49c8c73617085dfe003a240497"; + sha256 = "2c0a21897e70bc1a552f85040ba35b024e0c702eb4b4455b47ecf94a7220de71"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/pt-PT/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/pt-PT/firefox-106.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "17c77a2cec7b281d8389d30c0b1f2584b921ef04f71a96ab772930633d4e8b91"; + sha256 = "1a3ce08ce28134b84c05b2bebf9706e0735931af479ab117684d76b4fd33b097"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/rm/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/rm/firefox-106.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "6ccb9d232408657c6d9a0fa1e2f0d08ccb2340cc22a17317ef33f092621a41ac"; + sha256 = "fffd3d3a7b9bdfb6f61c92105dbafcf018acc58733cc5e6d7552acc0ab0505b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/ro/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ro/firefox-106.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "147aca32e5b58e12221706b079688f357d7cf678407a43cfc4fe1d28d8c39b71"; + sha256 = "4d7fe3626437e5c4b49e35aff6bdfd532203599947ef0014953a869cdffa31f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/ru/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ru/firefox-106.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "c5c25d8139651e68a6ed05a19f22a98bb488c5ec1326fa85f76cedd04d1dcbfd"; + sha256 = "c31f1f2dadb723a10097408b36e63532f921fa1362d4699c9f437c016d24169c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/sco/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/sco/firefox-106.0b5.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "1767490ca56ef443c6142c69af4543b55a7374a3fa95baaf50eb94e68cc20055"; + sha256 = "d7ae32dd99b2c5b09d5ce01d068bbcdd6ba3c42a81852693fd895c7611ce7bc9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/si/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/si/firefox-106.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "b9f580a402d39a2d3639b6c87606cc0d5b32a7807762350defa96a51c4486ecb"; + sha256 = "350533abb41efa727a2cc74ade0b23a1bd25e8fdb6858c90c32f9c395db263c7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/sk/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/sk/firefox-106.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "20e5dffb28a5dc6c615032e4635178db8c0991ef8482417c8892565017821055"; + sha256 = "7358c40827d3c0fdc5e36766c0073374b42281cd0c6e63f45b7f0e03207f4bd4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/sl/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/sl/firefox-106.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "5ae21eeda64041965ba7084f148e96fd7ce36734b7cf7d616db38943c2bcfc1f"; + sha256 = "b5e38822a3aeb879a6dbca59b7c2417e3ebedbf79dbd08d4df5881ebf776e62a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/son/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/son/firefox-106.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "9ced1c97546f868f6081e8735b33a44112fb72f58c02609eaafb54dd9d204a97"; + sha256 = "484e3341331e95e9c375a263fbaa8ca7a59db445701f9c7f9caa1d70d3f6805e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/sq/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/sq/firefox-106.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "581ea6d1c066b50fa1087662c6f264acb096733036d44f22af5a99fedbc8fa90"; + sha256 = "8d408e7bf017679496e76f7f2968684d5c4046c9fb443d2fb3c9ea13abf19594"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/sr/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/sr/firefox-106.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "7d5206bca5d699513d85d778e157bc5e4b662cb8d9023891b181ae2dcd99cead"; + sha256 = "50a3b16863ac0c79ad17361fc845d1d374ca114038fbdbb1722a1e90ca4c52c6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/sv-SE/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/sv-SE/firefox-106.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "bc07818899a4d33d029008f3265a566494fe096d69a95d166bd66cae5fa5348d"; + sha256 = "ca9af22602e8683d810032f895e7d7e5d5ae7c5f6b3ceded2085277c3c7ea3f2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/szl/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/szl/firefox-106.0b5.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "a005bc787bab1ebb3bc7a5b310e5ac36b8db709cf0a6483c5b94cd44afe8f3d0"; + sha256 = "501b33a929f17e5ad49041113140676d77f24484343ef4a785dd29b5e2fb23a2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/ta/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ta/firefox-106.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "0c6de995767d5b01b2120d9876546c459b5b1c6da0851c65bef9859c0014e1ff"; + sha256 = "513af6cc93ed1197a8f4519fbf26a3791b2de608ba5d3e3c282d04e5bad941db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/te/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/te/firefox-106.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "4a3ee2a19127edddd98014f4125e2df415a1ad82b9171d01b113faafb5280fef"; + sha256 = "7a2a9d2244c73c39d915a970e2133532a1a44596dcad4fec0783702bd630521d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/th/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/th/firefox-106.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "f96eec3a103e71ebb2aaf5c7dfa455f8a66826d5a293cb2ec38cba5e69ca1512"; + sha256 = "7c5453ef9a84da8f71305919cc23b8e0bb746239df4a94b75a26c240c3b00c12"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/tl/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/tl/firefox-106.0b5.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "f96ca052c4ea09c441e878fbd9ae2ade397139762ec14832333b1e9d274d3374"; + sha256 = "00c4d5b8120a2e434cf77c2fa994575eda8a46d10fddf5e55407bf5a84b9d7ea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/tr/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/tr/firefox-106.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "5f8f867cea2a7e3eaf732ce397f44a511c7198f3040c1c81745a4155933bc9a7"; + sha256 = "daa107b760f215ec0bec362462edebbd3df0e9f7dc3ecec0baba394bf16f9c51"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/trs/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/trs/firefox-106.0b5.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "8929d42419651e535ebd047b6c78760c91bf5df124114cf69f59836ebf5362d6"; + sha256 = "bcfc29fbfbf9e791896e19935b868609cdfc85116282a732cfdd83f5871f825f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/uk/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/uk/firefox-106.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "bab026f462d0aafec3d1a23a325c11eac694c39bc217d640b1745e41de1ca53a"; + sha256 = "a0a55891b3032d00da27a940b99af8447537e9f5c1aab3689ef77131e7ae9210"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/ur/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ur/firefox-106.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "d728db2ed8466a4b0966584f71c3e5b96d4f572dd6790a89b3e9607dc62bf501"; + sha256 = "a6038932291061aba7b57a3cd95346580df997ba34e45bbf77b0f648f9f3f7ed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/uz/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/uz/firefox-106.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "33fcb54dca835032bfc2ccafe606a2115a92519eca262ca8474aa07401818744"; + sha256 = "c1eecdca0d2047392cb70d19ee485d02b7cda0717ed4bc3eabc9906579f3189c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/vi/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/vi/firefox-106.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "b245b05777431d7676b7f1e146632b726940ae443179bdead42c7f56ec9d6239"; + sha256 = "bc33bb2e02e23ec740cb1f91298862d346b799ac9df04ed3e0301e19a7b97e34"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/xh/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/xh/firefox-106.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "0b186036c34fc05e517052ec8a17e0db3bd5855fd4b9668b2bab7ca74bdf911c"; + sha256 = "4d7147385bbd00a3cca6130831ca67e87904aa403d4e8134d459c18a8b3824d6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/zh-CN/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/zh-CN/firefox-106.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "8b42db49e369c79450858de54e22e27f9c701fd264c8e4b3b14112111ead3ab4"; + sha256 = "3d854dfd5ba369e803a462c75cbe4912e3c28767e570f5946cf3ec07a25c85d7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b3/linux-i686/zh-TW/firefox-106.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/zh-TW/firefox-106.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "f6e30d56a071009498822f31923325585abf347f75298317766c2bdcddee8c4f"; + sha256 = "b439906bdc4e1b6b2b19ca28506aebbedaf0fb063ea9a5955654521983ec0f6b"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index f0fe6e1551bf..d144db172868 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -228,7 +228,6 @@ buildStdenv.mkDerivation ({ }) ] ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch - ++ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch ++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch ++ extraPatches; @@ -294,9 +293,6 @@ buildStdenv.mkDerivation ({ '' + lib.optionalString (lib.versionAtLeast version "100.0") '' # Use our own python export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system - '' + lib.optionalString (lib.versionOlder version "100.0") '' - # Use our own python - export MACH_USE_SYSTEM_PYTHON=1 '' + lib.optionalString (lib.versionAtLeast version "95.0") '' # RBox WASM Sandboxing @@ -434,7 +430,7 @@ buildStdenv.mkDerivation ({ zip zlib ] - ++ [ (if (lib.versionAtLeast version "92") then nss_latest else nss_esr) ] + ++ [ (if (lib.versionAtLeast version "103") then nss_latest else nss_esr) ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional jackSupport libjack2 ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx90.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx90.patch deleted file mode 100644 index c8d2028f30b2..000000000000 --- a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx90.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/docshell/base/nsAboutRedirector.cpp -+++ b/docshell/base/nsAboutRedirector.cpp -@@ -66,8 +66,6 @@ static const RedirEntry kRedirMap[] = { - {"about", "chrome://global/content/aboutAbout.html", 0}, - {"addons", "chrome://mozapps/content/extensions/aboutaddons.html", - nsIAboutModule::ALLOW_SCRIPT}, -- {"buildconfig", "chrome://global/content/buildconfig.html", -- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, - {"checkerboard", "chrome://global/content/aboutCheckerboard.html", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::ALLOW_SCRIPT}, ---- a/toolkit/content/jar.mn -+++ b/toolkit/content/jar.mn -@@ -39,8 +39,6 @@ toolkit.jar: - content/global/plugins.html - content/global/plugins.css - content/global/plugins.js --* content/global/buildconfig.html -- content/global/buildconfig.css - content/global/contentAreaUtils.js - content/global/datepicker.xhtml - #ifndef MOZ_FENNEC diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index b577314b7897..682d4c37ee43 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -52,31 +52,4 @@ rec { versionSuffix = "esr"; }; }; - - firefox-esr-91 = buildMozillaMach rec { - pname = "firefox-esr-91"; - version = "91.13.0esr"; - applicationName = "Mozilla Firefox ESR"; - src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "38b4cc52de21e76d6061e6ba175e1cbfd888a16070aa951f5a44283f2db9d7e94f2504621f0da78feac6e71491a6d0e7038f63dd0ae112dcad700eb02e9aa516"; - }; - - meta = { - description = "A web browser built from Firefox Extended Support Release source tree"; - homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ hexa ]; - platforms = lib.platforms.unix; - badPlatforms = lib.platforms.darwin; - broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". - # not in `badPlatforms` because cross-compilation on 64-bit machine might work. - license = lib.licenses.mpl20; - }; - tests = [ nixosTests.firefox-esr-91 ]; - updateScript = callPackage ./update.nix { - attrPath = "firefox-esr-91-unwrapped"; - versionPrefix = "91"; - versionSuffix = "esr"; - }; - }; } diff --git a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix index 582bcc84e4f1..2e1cb37a6468 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config +{ lib, stdenv, fetchurl, pkg-config, buildPackages , buildsystem }: @@ -12,12 +12,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-nq6lNM1wtTxar0UxeulXcBaFprSojb407Sb0+q6Hmks="; }; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ buildsystem ]; makeFlags = [ "PREFIX=$(out)" "NSSHARED=${buildsystem}/share/netsurf-buildsystem" + "BUILD_CC=$(CC_FOR_BUILD)" ]; meta = with lib; { diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 2a4dc9e389ab..898c3febc170 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -1,19 +1,12 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , ncurses, boehmgc, gettext, zlib -, sslSupport ? true, openssl ? null -, graphicsSupport ? !stdenv.isDarwin, imlib2 ? null -, x11Support ? graphicsSupport, libX11 ? null -, mouseSupport ? !stdenv.isDarwin, gpm-ncurses ? null +, sslSupport ? true, openssl +, graphicsSupport ? !stdenv.isDarwin, imlib2 +, x11Support ? graphicsSupport, libX11 +, mouseSupport ? !stdenv.isDarwin, gpm-ncurses , perl, man, pkg-config, buildPackages, w3m }: -assert sslSupport -> openssl != null; -assert graphicsSupport -> imlib2 != null; -assert x11Support -> graphicsSupport && libX11 != null; -assert mouseSupport -> gpm-ncurses != null; - -with lib; - let mktable = buildPackages.stdenv.mkDerivation { name = "w3m-mktable"; @@ -26,16 +19,16 @@ let }; in stdenv.mkDerivation rec { pname = "w3m"; - version = "0.5.3+git20190105"; + version = "0.5.3+git20220429"; src = fetchFromGitHub { owner = "tats"; repo = pname; rev = "v${version}"; - sha256 = "1fbg2p8qh2gvi3g4iz4q6vc0k70pf248r4yndi5lcn2m3mzvjx0i"; + hash = "sha256-aPPLZjjL3A5Tk0hv0NoAwJnjemC7a5RUoubhUr3lQE4="; }; - NIX_LDFLAGS = optionalString stdenv.isSunOS "-lsocket -lnsl"; + NIX_LDFLAGS = lib.optionalString stdenv.isSunOS "-lsocket -lnsl"; # we must set these so that the generated files (e.g. w3mhelp.cgi) contain # the correct paths. @@ -51,9 +44,9 @@ in stdenv.mkDerivation rec { url = "https://aur.archlinux.org/cgit/aur.git/plain/https.patch?h=w3m-mouse&id=5b5f0fbb59f674575e87dd368fed834641c35f03"; sha256 = "08skvaha1hjyapsh8zw5dgfy433mw2hk7qy9yy9avn8rjqj7kjxk"; }) - ] ++ optional (graphicsSupport && !x11Support) [ ./no-x11.patch ]; + ]; - postPatch = optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' ln -s ${mktable}/bin/mktable mktable # stop make from recompiling mktable sed -ie 's!mktable.*:.*!mktable:!' Makefile.in @@ -61,12 +54,12 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ ncurses boehmgc zlib ] - ++ optional sslSupport openssl - ++ optional mouseSupport gpm-ncurses - ++ optional graphicsSupport imlib2 - ++ optional x11Support libX11; + ++ lib.optional sslSupport openssl + ++ lib.optional mouseSupport gpm-ncurses + ++ lib.optional graphicsSupport imlib2 + ++ lib.optional x11Support libX11; - postInstall = optionalString graphicsSupport '' + postInstall = lib.optionalString graphicsSupport '' ln -s $out/libexec/w3m/w3mimgdisplay $out/bin ''; @@ -74,10 +67,11 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-ssl=${openssl.dev}" "--with-gc=${boehmgc.dev}" ] - ++ optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_func_setpgrp_void=yes" ] - ++ optional graphicsSupport "--enable-image=${optionalString x11Support "x11,"}fb"; + ++ lib.optional graphicsSupport "--enable-image=${lib.optionalString x11Support "x11,"}fb" + ++ lib.optional (graphicsSupport && !x11Support) "--without-x"; preConfigure = '' substituteInPlace ./configure --replace "/lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64" /no-such-path @@ -88,13 +82,13 @@ in stdenv.mkDerivation rec { # for w3mimgdisplay # see: https://bbs.archlinux.org/viewtopic.php?id=196093 - LIBS = optionalString x11Support "-lX11"; + LIBS = lib.optionalString x11Support "-lX11"; - meta = { + meta = with lib; { homepage = "http://w3m.sourceforge.net/"; description = "A text-mode web browser"; - maintainers = [ maintainers.cstrahan ]; - platforms = lib.platforms.unix; - license = lib.licenses.mit; + maintainers = with maintainers; [ cstrahan anthonyroussel ]; + platforms = platforms.unix; + license = licenses.mit; }; } diff --git a/pkgs/applications/networking/browsers/w3m/no-x11.patch b/pkgs/applications/networking/browsers/w3m/no-x11.patch deleted file mode 100644 index 0816c022926d..000000000000 --- a/pkgs/applications/networking/browsers/w3m/no-x11.patch +++ /dev/null @@ -1,14 +0,0 @@ -Forget about X11 in fb module. -This breaks w3mimgdisplay under X11, but removes X11 dependency it in pure fb. -diff --git a/w3mimg/fb/fb_imlib2.c b/w3mimg/fb/fb_imlib2.c -index 1a5151c..d3d7bc3 100644 ---- a/w3mimg/fb/fb_imlib2.c -+++ b/w3mimg/fb/fb_imlib2.c -@@ -3,6 +3,7 @@ - fb_imlib2.c 0.3 Copyright (C) 2002, hito - **************************************************************************/ - -+#define X_DISPLAY_MISSING - #include - #include "fb.h" - #include "fb_img.h" diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 8a837399048f..71597daea2b0 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }: let - version = "0.34.0"; - sha256 = "1znxhjqvch0z0s98v3hvvh1pa3nlv0l6qhlm0f61z64srz3i5d1k"; - manifestsSha256 = "1fchzr7fb894hdya9bbh59avqsa66wcz06fck60wmwpc93m64cqs"; + version = "0.35.0"; + sha256 = "11bbrxgfwvf6gnm402mcq6na75gcifx8m1b28pzspvw01p2yshf9"; + manifestsSha256 = "0ink2cvysgnqvid4hh2x969iqc86pmz654nd7wv37iqndfhy7rd5"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-0oHcitczG+sW9mkwxY6hCdR2ASpat2XQ+IsLAiqCUb8="; + vendorSha256 = "sha256-HCBEMMFMoepr4bUYICAGMb2A42smgd3VlE7b9TR6LAc="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix index 6d8897c84dce..09e73514ab78 100644 --- a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { name = "cinny-desktop"; - version = "2.2.0"; + version = "2.2.2"; src = fetchurl { url = "https://github.com/cinnyapp/cinny-desktop/releases/download/v${version}/Cinny_desktop-x86_64.deb"; - sha256 = "sha256-UvNvfgOaqG2P3pl7cHwP0E7f8JLMo1EDiDAy05pJVE4="; + sha256 = "sha256-TdKxVvhz6DTJ9ZST/OBc37DcH9lpoKrY5yP8skTO9eQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/pkgs/applications/networking/instant-messengers/schildichat/pin.json index 9ad6237af2df..77cedc68b42d 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/pin.json +++ b/pkgs/applications/networking/instant-messengers/schildichat/pin.json @@ -1,9 +1,9 @@ { - "version": "1.11.4-sc.1", - "rev": "v1.11.4-sc.1", - "srcHash": "05h7zcgnq8xi1hs5wqhjbm173y56zyz8g9l6ii8nbkzjrggif37w", - "webYarnHash": "1yji94xcigz54bbhvssj2pgncw9fgal7mzw9h9bfwmny0pjh8c4p", - "jsSdkYarnHash": "11yaii6srq6fysipsr083g4ac3k1rxhclprj4q60xwk39fl4qfpb", - "reactSdkYarnHash": "0riz037rigpqybyf1jnfchzxyalajfc37l6xwdn5zb9avf730bms", - "desktopYarnHash": "0m0zzq2wbk7h7anjmj586089j2qgsd5cj99rmi2hmsmssq63fmwk" + "version": "1.11.8-sc.1", + "rev": "v1.11.8-sc.1", + "srcHash": "1a4flbdc18whphxldk0nxqhw0zddsj7zw5js4fpyrr6h85h8qxcp", + "webYarnHash": "1q05r2shv1c3kghwksjzrh9rl25ins6r2y46ng7smdml4f9vdcc0", + "jsSdkYarnHash": "0z6qqif7kccbvbzr9fw92vs4affm4vw8rgs08rqig8pqpk52lwi2", + "reactSdkYarnHash": "0mx9iaciy965jr6vd0gnmyc3jiila9mmh36rv5vm60rx9aw02dv6", + "desktopYarnHash": "105xj2xwc9g8cfiby0x93gy8w8w5c76mzzxck5mgvawcc6qpvmrc" } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/91_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/91_sources.nix deleted file mode 100644 index 30ea4090ac90..000000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/91_sources.nix +++ /dev/null @@ -1,655 +0,0 @@ -{ - version = "91.11.0"; - sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/af/thunderbird-91.11.0.tar.bz2"; - locale = "af"; - arch = "linux-x86_64"; - sha256 = "6636029a5493af2bdc3bd4b66ab2ec6bdf3386784378c6e3663e0dacabf61341"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ar/thunderbird-91.11.0.tar.bz2"; - locale = "ar"; - arch = "linux-x86_64"; - sha256 = "4cbde6508c12b4f17268ecb76fac4724fd03be17637debd5e3b0f4ae9664cb38"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ast/thunderbird-91.11.0.tar.bz2"; - locale = "ast"; - arch = "linux-x86_64"; - sha256 = "501d71124a124168dda01442a94858ac8d1aada8dd7949d1e73f3c89464798ee"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/be/thunderbird-91.11.0.tar.bz2"; - locale = "be"; - arch = "linux-x86_64"; - sha256 = "34337ba1e8b7209b7b7e7ac9924e6f8745916f87df30a2b8af9dcd201a40c7a9"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/bg/thunderbird-91.11.0.tar.bz2"; - locale = "bg"; - arch = "linux-x86_64"; - sha256 = "3a13287699e97b160adf8008101f64f3f5078cb51f65cba7b076d5c62e8dc583"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/br/thunderbird-91.11.0.tar.bz2"; - locale = "br"; - arch = "linux-x86_64"; - sha256 = "6f67a0fc18d23e0ad0e3776d4039c218af0afac1d7e744215d0225763a33007f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ca/thunderbird-91.11.0.tar.bz2"; - locale = "ca"; - arch = "linux-x86_64"; - sha256 = "25f7848814c4f49d82f4fb305edc52068e0738fc02009f68f2a7822a4307e39a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/cak/thunderbird-91.11.0.tar.bz2"; - locale = "cak"; - arch = "linux-x86_64"; - sha256 = "1e341a101e42b88ee2ab763694066598203a834d85ef3a5c4572a0950dec868a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/cs/thunderbird-91.11.0.tar.bz2"; - locale = "cs"; - arch = "linux-x86_64"; - sha256 = "b36b25191dd6f70e03aee3a5238428e8cdad16192f173ca094356a9404b2a6a0"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/cy/thunderbird-91.11.0.tar.bz2"; - locale = "cy"; - arch = "linux-x86_64"; - sha256 = "604e262c8efb59e6250d26d964aba3e7c3fc9a3743137d67dda6011ad31a0331"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/da/thunderbird-91.11.0.tar.bz2"; - locale = "da"; - arch = "linux-x86_64"; - sha256 = "d9b1b3067ebbd2685c53a1787d3b6a496b54e0102e3c15e99539110765787ca0"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/de/thunderbird-91.11.0.tar.bz2"; - locale = "de"; - arch = "linux-x86_64"; - sha256 = "03bb508c63f6e9d4ec0846d288113cee0c99ba81cfb82ed3ad96b60a4a04aae8"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/dsb/thunderbird-91.11.0.tar.bz2"; - locale = "dsb"; - arch = "linux-x86_64"; - sha256 = "cd09f6ad9323c893284d752afe97e92800f4db579a78eb8d04e2ff0b60321cca"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/el/thunderbird-91.11.0.tar.bz2"; - locale = "el"; - arch = "linux-x86_64"; - sha256 = "1db218644eb596bb47c45405f8e1c6c0ff6d3b0f227fca34ceac7bcb35d19a25"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/en-CA/thunderbird-91.11.0.tar.bz2"; - locale = "en-CA"; - arch = "linux-x86_64"; - sha256 = "5833bf8ba7c5ece94abb082937937c531632831fe6eb6cb059f9f567663b4073"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/en-GB/thunderbird-91.11.0.tar.bz2"; - locale = "en-GB"; - arch = "linux-x86_64"; - sha256 = "fd779ea56324f157cf16587f29f46a8e102a42f951532d20d0d522f16b71de83"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/en-US/thunderbird-91.11.0.tar.bz2"; - locale = "en-US"; - arch = "linux-x86_64"; - sha256 = "5df888beee833cdc3316f82d22d4b87c67021b5433009a11d170c3d204a54752"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/es-AR/thunderbird-91.11.0.tar.bz2"; - locale = "es-AR"; - arch = "linux-x86_64"; - sha256 = "aa0235f0d9864aeba031589ec0983300cf1f3681ec724baf7c4e8325a678b093"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/es-ES/thunderbird-91.11.0.tar.bz2"; - locale = "es-ES"; - arch = "linux-x86_64"; - sha256 = "59fe5b24a8671b7d533099441f2154cbb2ae878421db861bdf63449d0ddea33a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/et/thunderbird-91.11.0.tar.bz2"; - locale = "et"; - arch = "linux-x86_64"; - sha256 = "5dfde219d3121da4bac10cd4bb0ebb7f01e0e268d6e0a5495617cbe8f101205e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/eu/thunderbird-91.11.0.tar.bz2"; - locale = "eu"; - arch = "linux-x86_64"; - sha256 = "0ef3e6dc4d906b59cc41814a01f2f9795cb0f68cedb2d42b3a6ae6f941e57866"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/fi/thunderbird-91.11.0.tar.bz2"; - locale = "fi"; - arch = "linux-x86_64"; - sha256 = "41133551838ab598ca8ff8b414b5e59b100d90fd0d76d86efdbe0932f55ae183"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/fr/thunderbird-91.11.0.tar.bz2"; - locale = "fr"; - arch = "linux-x86_64"; - sha256 = "2f9524eba48ce5584db51bdc70a6d2db9fe855b95bc0ea4886211cd9571fef1e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/fy-NL/thunderbird-91.11.0.tar.bz2"; - locale = "fy-NL"; - arch = "linux-x86_64"; - sha256 = "90c205af710dc61817b385b937eb8f19785d26b7c706454d5e5eb2caa98a6f2f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ga-IE/thunderbird-91.11.0.tar.bz2"; - locale = "ga-IE"; - arch = "linux-x86_64"; - sha256 = "c58024054af2557b41cab9f6ffbcd35e23aeaef082c992a326d442a2d88f7d36"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/gd/thunderbird-91.11.0.tar.bz2"; - locale = "gd"; - arch = "linux-x86_64"; - sha256 = "3c5b3345a8ecb9a929ad4f257545ae21b7d7312d838303f2f45fb82801e3fe7d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/gl/thunderbird-91.11.0.tar.bz2"; - locale = "gl"; - arch = "linux-x86_64"; - sha256 = "9ab74394aa219e005347bb480da18d0640df11184fdf8bccaace8ae4fdfd2e61"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/he/thunderbird-91.11.0.tar.bz2"; - locale = "he"; - arch = "linux-x86_64"; - sha256 = "5b4997c947aeba88b4b67baa9ed70fdc8c5ab5dd4c2ba8faeb858bb572ef7262"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/hr/thunderbird-91.11.0.tar.bz2"; - locale = "hr"; - arch = "linux-x86_64"; - sha256 = "028a0ac856f5eb24db1fbd6064554d39e097e681d2acd366eb500ae2a9f44d3e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/hsb/thunderbird-91.11.0.tar.bz2"; - locale = "hsb"; - arch = "linux-x86_64"; - sha256 = "c7cf4a82322a80ef5c7587bc7ff1a68c89116ff3575a82d4fa0057484108b726"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/hu/thunderbird-91.11.0.tar.bz2"; - locale = "hu"; - arch = "linux-x86_64"; - sha256 = "58e6060e7f104b9096ac521542b55d92cf88d409cb96f9a72705ac9e77b55cfa"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/hy-AM/thunderbird-91.11.0.tar.bz2"; - locale = "hy-AM"; - arch = "linux-x86_64"; - sha256 = "0f4254ac57ce8c4db9c336c38c5d35b6260cf32a85b7bd72935f216d0a54851e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/id/thunderbird-91.11.0.tar.bz2"; - locale = "id"; - arch = "linux-x86_64"; - sha256 = "4476719d376d6dfa2b6a984b8c9dd1024a813da848acb7b4c76df5ba903a87a2"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/is/thunderbird-91.11.0.tar.bz2"; - locale = "is"; - arch = "linux-x86_64"; - sha256 = "104420cb76394b8a4d243643e087b04be802152758cff256b09dbd1fd7c4bcf2"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/it/thunderbird-91.11.0.tar.bz2"; - locale = "it"; - arch = "linux-x86_64"; - sha256 = "8dee7d28dfe512b5bde06cb8ff826c22c46b238b828c1f9f2df75728195cc6d9"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ja/thunderbird-91.11.0.tar.bz2"; - locale = "ja"; - arch = "linux-x86_64"; - sha256 = "bd9a73ce7f363d530d23304036d17be5ba92c14ed809b15aeed021fdf940e060"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ka/thunderbird-91.11.0.tar.bz2"; - locale = "ka"; - arch = "linux-x86_64"; - sha256 = "b94f942fc2e0605b38c3fc89b2dfe07faaa812db1035563feb11fa2a20dff0d9"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/kab/thunderbird-91.11.0.tar.bz2"; - locale = "kab"; - arch = "linux-x86_64"; - sha256 = "c9201067ae0cd3bb3fc013798b2f7b33daad96707f70d6dfea1e6ab010c6ad25"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/kk/thunderbird-91.11.0.tar.bz2"; - locale = "kk"; - arch = "linux-x86_64"; - sha256 = "1eca6541d09608cdc481f0f1031d6a6d0fc41b53b09e0f6e48bb4694d3be4b45"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ko/thunderbird-91.11.0.tar.bz2"; - locale = "ko"; - arch = "linux-x86_64"; - sha256 = "10b1a259373bba55b9de98d87949c13ded07d9c913d8491c2b9e07700b10420d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/lt/thunderbird-91.11.0.tar.bz2"; - locale = "lt"; - arch = "linux-x86_64"; - sha256 = "72a8496237b15de47a689d5546513cd0da77efa8ae365d538e4a89d4adf37d0a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/lv/thunderbird-91.11.0.tar.bz2"; - locale = "lv"; - arch = "linux-x86_64"; - sha256 = "7b537e57c6244cde41e6c1a3516124293eef9cf42cfcf26d733f69fc6ea8b446"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ms/thunderbird-91.11.0.tar.bz2"; - locale = "ms"; - arch = "linux-x86_64"; - sha256 = "f7382386f24d6f0c5134b60a7c4fc81956bbaeb716697cae9030bdbf3a8a7bc9"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/nb-NO/thunderbird-91.11.0.tar.bz2"; - locale = "nb-NO"; - arch = "linux-x86_64"; - sha256 = "cd5bbe73d36900ea4b964b5362e93ca631198eef1f5b790ac8e5fbd3ba2fd851"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/nl/thunderbird-91.11.0.tar.bz2"; - locale = "nl"; - arch = "linux-x86_64"; - sha256 = "6202949156d0471da39f636d53954b2c3a3955f91da906444db8d17dc6b7d346"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/nn-NO/thunderbird-91.11.0.tar.bz2"; - locale = "nn-NO"; - arch = "linux-x86_64"; - sha256 = "43d47e9766780a32ba5bfbe3006cba454189405bf8b019fcbb8a91d8eaa5734b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/pa-IN/thunderbird-91.11.0.tar.bz2"; - locale = "pa-IN"; - arch = "linux-x86_64"; - sha256 = "49211576fb1637f285399c2b7e9c867633da8b53d5f862c9f46f587ab50ac960"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/pl/thunderbird-91.11.0.tar.bz2"; - locale = "pl"; - arch = "linux-x86_64"; - sha256 = "54f7ec4a13681b0173909e28ce6d44ef642ccb208ff96ce53472e63a7d9500e0"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/pt-BR/thunderbird-91.11.0.tar.bz2"; - locale = "pt-BR"; - arch = "linux-x86_64"; - sha256 = "974781b88c324ef8d795ba602ebef9f3e34737ab7b17d753c9b9e81ac543895c"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/pt-PT/thunderbird-91.11.0.tar.bz2"; - locale = "pt-PT"; - arch = "linux-x86_64"; - sha256 = "b7fdf05204afcbedd5562f9f15a1d6b2179c67dd84c150aa36690b6c709c6237"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/rm/thunderbird-91.11.0.tar.bz2"; - locale = "rm"; - arch = "linux-x86_64"; - sha256 = "04994c9de996a609bdd3a17a75c82e3738c4bb4e7cec1cafb2f5284be665ffb4"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ro/thunderbird-91.11.0.tar.bz2"; - locale = "ro"; - arch = "linux-x86_64"; - sha256 = "9373a55e1602f50af98c1949d43c4700e34f8ff43b5c1ddd9e7bad6651a6f8cb"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/ru/thunderbird-91.11.0.tar.bz2"; - locale = "ru"; - arch = "linux-x86_64"; - sha256 = "3e386ac2034b623eeb7cbc99ec9fcb543f7ee47cea9bd732c6fe62aa01cbeed8"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/sk/thunderbird-91.11.0.tar.bz2"; - locale = "sk"; - arch = "linux-x86_64"; - sha256 = "0aa6eb1ba0f714eec99151eb99ab08d862de57d3f3c6cd8086418cadcdea6447"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/sl/thunderbird-91.11.0.tar.bz2"; - locale = "sl"; - arch = "linux-x86_64"; - sha256 = "5fbadaa8562c13478ccb4eec4707b683058a52a6a3edcdd60e94408e370c0a59"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/sq/thunderbird-91.11.0.tar.bz2"; - locale = "sq"; - arch = "linux-x86_64"; - sha256 = "505158fd5eb28ff2eaa98e7be104551bda552ab6983191e1d86d39e33bb2108d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/sr/thunderbird-91.11.0.tar.bz2"; - locale = "sr"; - arch = "linux-x86_64"; - sha256 = "607f65c325201d5751248c4877dcbea28a3d3f99905cbf0f8fbc2ece38bab819"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/sv-SE/thunderbird-91.11.0.tar.bz2"; - locale = "sv-SE"; - arch = "linux-x86_64"; - sha256 = "d490bfac8742f29052a14f4973dbec326740610da348498f6ca0417035061c4d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/th/thunderbird-91.11.0.tar.bz2"; - locale = "th"; - arch = "linux-x86_64"; - sha256 = "e218e77576af8c552cd5fa06e6323970bf32681166206ddf42ee0ddbbefbeda5"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/tr/thunderbird-91.11.0.tar.bz2"; - locale = "tr"; - arch = "linux-x86_64"; - sha256 = "14b0a4dddd9185896475e840e5953b6543ee0ccb3f8ee0b0a4a448e524726cbc"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/uk/thunderbird-91.11.0.tar.bz2"; - locale = "uk"; - arch = "linux-x86_64"; - sha256 = "a194835b5361faf5b0dd05c26a747d36b761de676e19f54dc3fd5354f4fae12c"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/uz/thunderbird-91.11.0.tar.bz2"; - locale = "uz"; - arch = "linux-x86_64"; - sha256 = "457f3040bc017c7cf525b44c5a503385561fe072e8fcc6cc7877c6e070fdd937"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/vi/thunderbird-91.11.0.tar.bz2"; - locale = "vi"; - arch = "linux-x86_64"; - sha256 = "64b81087215b52b8a5780c9955fa9b0e94dbfeb005bf39feea85d838dec01b51"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/zh-CN/thunderbird-91.11.0.tar.bz2"; - locale = "zh-CN"; - arch = "linux-x86_64"; - sha256 = "5187404d29307a0e931663a3f1c8f85b9198869468b9541043988d7ab692bb09"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-x86_64/zh-TW/thunderbird-91.11.0.tar.bz2"; - locale = "zh-TW"; - arch = "linux-x86_64"; - sha256 = "69e52c2281548034169063b1e9b3c77354aa81c616ba407135d148d04f3c39b1"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/af/thunderbird-91.11.0.tar.bz2"; - locale = "af"; - arch = "linux-i686"; - sha256 = "fab1aaabdf672e2e30c11f7b6c884ea84da0e2d4dd1f6e7ea73561f45758972a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ar/thunderbird-91.11.0.tar.bz2"; - locale = "ar"; - arch = "linux-i686"; - sha256 = "7e3e89f1f7fd59e11323397cea81a01da5a2025f8a4eb5bd5e22a8ae7558ad16"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ast/thunderbird-91.11.0.tar.bz2"; - locale = "ast"; - arch = "linux-i686"; - sha256 = "e25ef39a6b91c414d2f748fbe94552be106c0be37ac3ba1bb69ec79731d7c8b1"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/be/thunderbird-91.11.0.tar.bz2"; - locale = "be"; - arch = "linux-i686"; - sha256 = "2cdf39bf05d2f090a120b6285e74cf77199849b0b22dcaef10506ee94dfb6949"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/bg/thunderbird-91.11.0.tar.bz2"; - locale = "bg"; - arch = "linux-i686"; - sha256 = "524766c780d086fd4335bdbf09e3b006176ae514cc5940e08b8729462b69cf21"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/br/thunderbird-91.11.0.tar.bz2"; - locale = "br"; - arch = "linux-i686"; - sha256 = "88967dfc29888cb310d667a786605c60b99836c4d96c9d80bbe0d3e1ffc4fc4d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ca/thunderbird-91.11.0.tar.bz2"; - locale = "ca"; - arch = "linux-i686"; - sha256 = "bcc7fec068db74291c4e7fae965ed0d59c690011c0b102ae52fc35355a37c2d3"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/cak/thunderbird-91.11.0.tar.bz2"; - locale = "cak"; - arch = "linux-i686"; - sha256 = "92557a0bfce5c70a7112cce28059cb7e5f36ea6de25837cc9e84f29dd4f437d3"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/cs/thunderbird-91.11.0.tar.bz2"; - locale = "cs"; - arch = "linux-i686"; - sha256 = "85df534c707dfdf1029c653b8402e0ff8fbb5a76bd6881a03e49422576c50a7b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/cy/thunderbird-91.11.0.tar.bz2"; - locale = "cy"; - arch = "linux-i686"; - sha256 = "6acc4efd7a7eaa9cb1630a1830d8e13a59da59f7cb9c6430c42a6ab0947cb924"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/da/thunderbird-91.11.0.tar.bz2"; - locale = "da"; - arch = "linux-i686"; - sha256 = "b6a9bd2852f7076466bf369b793a480023ef2b025a83765a80b5e996f213ca02"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/de/thunderbird-91.11.0.tar.bz2"; - locale = "de"; - arch = "linux-i686"; - sha256 = "b6524641f5dd509467fcc0fe3eb2ee44df177d07da8ea77aa706714efa6e34dd"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/dsb/thunderbird-91.11.0.tar.bz2"; - locale = "dsb"; - arch = "linux-i686"; - sha256 = "7d9aedca49c87841e2535aa0d7e89b893c6b91042c8c54b3d8a123c36cd21508"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/el/thunderbird-91.11.0.tar.bz2"; - locale = "el"; - arch = "linux-i686"; - sha256 = "840ede568df0cf197039f4ccb4d0ac86b617bdb705bf0bfc13d5ea46f327f43a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/en-CA/thunderbird-91.11.0.tar.bz2"; - locale = "en-CA"; - arch = "linux-i686"; - sha256 = "9410f138179876e844042b7386d3b1bf857ac65ebc45039bb97d4d199983151f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/en-GB/thunderbird-91.11.0.tar.bz2"; - locale = "en-GB"; - arch = "linux-i686"; - sha256 = "7e5a91a64f72c7a01028833ced6cd7b997630d54967e0e2938875645d0868f27"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/en-US/thunderbird-91.11.0.tar.bz2"; - locale = "en-US"; - arch = "linux-i686"; - sha256 = "0afacc2ccee154819e6289992c9daaa9f6dc977ecffc59cd548d5facf7bc118b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/es-AR/thunderbird-91.11.0.tar.bz2"; - locale = "es-AR"; - arch = "linux-i686"; - sha256 = "f8488581fd4dc90e036e58436bb82838d6ae5f386fa73e40b3706d8137d63feb"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/es-ES/thunderbird-91.11.0.tar.bz2"; - locale = "es-ES"; - arch = "linux-i686"; - sha256 = "8bb3607d710e25c3c981bfada12be85a9b32dff38bb5d5fe3b045c63494789a5"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/et/thunderbird-91.11.0.tar.bz2"; - locale = "et"; - arch = "linux-i686"; - sha256 = "a204822cf3af0d14412bc585ddbcd794f0bff40233f3022709978fa79a3544b3"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/eu/thunderbird-91.11.0.tar.bz2"; - locale = "eu"; - arch = "linux-i686"; - sha256 = "b7e71ce61437008e4006712dc08d72fb3355c5114ddce4841c6bfac4420d13a8"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/fi/thunderbird-91.11.0.tar.bz2"; - locale = "fi"; - arch = "linux-i686"; - sha256 = "aa1a2c83786985e5b5afb9ae62de7644880675c401313ad2ebd8cff6759b1652"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/fr/thunderbird-91.11.0.tar.bz2"; - locale = "fr"; - arch = "linux-i686"; - sha256 = "49e02176f56e9bcbe2ae22a2f26ee1c4e1c18abc0e5622ac3cd3e1cf36feef35"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/fy-NL/thunderbird-91.11.0.tar.bz2"; - locale = "fy-NL"; - arch = "linux-i686"; - sha256 = "41417c3d07809919e639f8124ac1f3a12e150ec9f2a48e4ff5461b11a49fff79"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ga-IE/thunderbird-91.11.0.tar.bz2"; - locale = "ga-IE"; - arch = "linux-i686"; - sha256 = "3bda30e7d860fdc0fa92f56451d36e96cf7444aa186b936c8a8b75cab10c1256"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/gd/thunderbird-91.11.0.tar.bz2"; - locale = "gd"; - arch = "linux-i686"; - sha256 = "89f0ab5eb0df82611fe5abbaf9f626c00a47e80b49f9b3bfacbe49588a5d15a5"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/gl/thunderbird-91.11.0.tar.bz2"; - locale = "gl"; - arch = "linux-i686"; - sha256 = "d1da56e2ed418a30c225857cee00c6feac62e02ac64279d340265602faea30d9"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/he/thunderbird-91.11.0.tar.bz2"; - locale = "he"; - arch = "linux-i686"; - sha256 = "644508c044d0b9de9c226005c9a6a9a88eb179da56fccb4abe012e905bbfaaaa"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/hr/thunderbird-91.11.0.tar.bz2"; - locale = "hr"; - arch = "linux-i686"; - sha256 = "ceb9ef728f0413525c93949c4960e97e4b887965cfd94211b1ec349165368864"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/hsb/thunderbird-91.11.0.tar.bz2"; - locale = "hsb"; - arch = "linux-i686"; - sha256 = "81fadd0d89c48bf2a3df279ba24e48490bdbe8913ceb5fb53738f32c1cc61211"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/hu/thunderbird-91.11.0.tar.bz2"; - locale = "hu"; - arch = "linux-i686"; - sha256 = "57c6223d5dbd0221742b51df296a8ea74739ec601ba0cbbc8de9c27dc3a09226"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/hy-AM/thunderbird-91.11.0.tar.bz2"; - locale = "hy-AM"; - arch = "linux-i686"; - sha256 = "b33ad866c009c85793a2e2ee8e837de49bebbbc98c069e8e6735aa2041208642"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/id/thunderbird-91.11.0.tar.bz2"; - locale = "id"; - arch = "linux-i686"; - sha256 = "6c9da73ca1706a35496a5e298f3c1308a0a0e56a03826c41bd84e7ef0a54341b"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/is/thunderbird-91.11.0.tar.bz2"; - locale = "is"; - arch = "linux-i686"; - sha256 = "bc2dedfe32f7f82ee485c39bd21919bad3ab706c82fe04ab6b13198628f03b43"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/it/thunderbird-91.11.0.tar.bz2"; - locale = "it"; - arch = "linux-i686"; - sha256 = "15a69c14973def0f7ad062a8a3a9f5c72b8358f46ed89fba0dce0bb614164cbb"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ja/thunderbird-91.11.0.tar.bz2"; - locale = "ja"; - arch = "linux-i686"; - sha256 = "49f9b81962a2bc38d1c465a347a871b377cfe5110fe44761fba88779e1cf6c16"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ka/thunderbird-91.11.0.tar.bz2"; - locale = "ka"; - arch = "linux-i686"; - sha256 = "3d57cd918664d17208bb877561807c1c6c7fd0b3d72b77592fd1eba1e36e3c0e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/kab/thunderbird-91.11.0.tar.bz2"; - locale = "kab"; - arch = "linux-i686"; - sha256 = "cfa2dcd465a6e877253e029733d32f2040f6145d5bd34dbaf6ce2cbfe4d83df2"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/kk/thunderbird-91.11.0.tar.bz2"; - locale = "kk"; - arch = "linux-i686"; - sha256 = "cd60db4921fefaf47dbfe2e681a0f5c4c1054cc6fe9ca4ea36abf3b2ff8d89a5"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ko/thunderbird-91.11.0.tar.bz2"; - locale = "ko"; - arch = "linux-i686"; - sha256 = "48ff8d98abd69d377f3964d8d278e79554e3ec31973ff4baf7773236fc635fa7"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/lt/thunderbird-91.11.0.tar.bz2"; - locale = "lt"; - arch = "linux-i686"; - sha256 = "cde6ca3288571470ae836fc3b1584ef2e5413548e2180a58b5e8755e6ece3912"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/lv/thunderbird-91.11.0.tar.bz2"; - locale = "lv"; - arch = "linux-i686"; - sha256 = "e54b05e69f07c191658b5fe86aefef21f8dd2ea28c4fd5518876ca00dadc7ee1"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ms/thunderbird-91.11.0.tar.bz2"; - locale = "ms"; - arch = "linux-i686"; - sha256 = "481c849a5347befe0204e090e457617278a598a20411f07379bcebf997752089"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/nb-NO/thunderbird-91.11.0.tar.bz2"; - locale = "nb-NO"; - arch = "linux-i686"; - sha256 = "d239864212742c86b2a83246acb22523be4097f438ebb1fdaa3776cb7274d68e"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/nl/thunderbird-91.11.0.tar.bz2"; - locale = "nl"; - arch = "linux-i686"; - sha256 = "6d50d645030e2672cda90d56b795c5de2813e82101839f821ef5345c0bac3e1d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/nn-NO/thunderbird-91.11.0.tar.bz2"; - locale = "nn-NO"; - arch = "linux-i686"; - sha256 = "87f5d8da66fc1bc224777a1db400d73f792ecec257ebe4ca7b857a29eb1b46f2"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/pa-IN/thunderbird-91.11.0.tar.bz2"; - locale = "pa-IN"; - arch = "linux-i686"; - sha256 = "1b9315e847a7b40f8f984facd3bb24d5291199ba974e0391f1088c8623e2ac10"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/pl/thunderbird-91.11.0.tar.bz2"; - locale = "pl"; - arch = "linux-i686"; - sha256 = "22c0be8d666e5a7e7fc2ef0e44558e0a7fad299a5946f55850652d25ff1f3e24"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/pt-BR/thunderbird-91.11.0.tar.bz2"; - locale = "pt-BR"; - arch = "linux-i686"; - sha256 = "e9ff705ff4d1513060f3142590bdbff2e66c84875bf683fd5196c464ce45d23a"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/pt-PT/thunderbird-91.11.0.tar.bz2"; - locale = "pt-PT"; - arch = "linux-i686"; - sha256 = "a446fab64e1b49d5463e5966a0a3399314bf893cf9e2687d9c88dc810e3c50d6"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/rm/thunderbird-91.11.0.tar.bz2"; - locale = "rm"; - arch = "linux-i686"; - sha256 = "a533be1dbc69a4821039b969050253b40c5c96926e61f79b186a7a61452f01be"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ro/thunderbird-91.11.0.tar.bz2"; - locale = "ro"; - arch = "linux-i686"; - sha256 = "1cfd9675f82e3a6262946a0fd40fae143abc0bd896f74a1afa1bb5fce72c8a31"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/ru/thunderbird-91.11.0.tar.bz2"; - locale = "ru"; - arch = "linux-i686"; - sha256 = "177641bee951eb96f56b4f2551014e648be8e62766258a7e25ff6e3d6aef465f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/sk/thunderbird-91.11.0.tar.bz2"; - locale = "sk"; - arch = "linux-i686"; - sha256 = "f30a2a1afc23f790908efb04e5a90552ecd33b0a61eac0f8e51c66e2745befb3"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/sl/thunderbird-91.11.0.tar.bz2"; - locale = "sl"; - arch = "linux-i686"; - sha256 = "deb684209fd7a773e5679daea7b20d62c9a2ad885a33f9bafb2596aa44465d8d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/sq/thunderbird-91.11.0.tar.bz2"; - locale = "sq"; - arch = "linux-i686"; - sha256 = "efd8462f8886c0396d71e89adbcefdec0c7d8bd60d319df833b3cff3aae7e5ea"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/sr/thunderbird-91.11.0.tar.bz2"; - locale = "sr"; - arch = "linux-i686"; - sha256 = "c120fd6dcf72da105190c46781fffb8d5ba310a3bf9febd8d9090024953ab2eb"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/sv-SE/thunderbird-91.11.0.tar.bz2"; - locale = "sv-SE"; - arch = "linux-i686"; - sha256 = "09f2bf230701dd26c6b72a1b053c743bd6fe79fafd43fed18154dcd20d466ed6"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/th/thunderbird-91.11.0.tar.bz2"; - locale = "th"; - arch = "linux-i686"; - sha256 = "121cceee1a3eb123a2e23c7c440beacda0deaffd651153d176b2a9b4678146c6"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/tr/thunderbird-91.11.0.tar.bz2"; - locale = "tr"; - arch = "linux-i686"; - sha256 = "41626b2bb506dca9929ce3a5f44b6d1f1a763ab34caa1dbbf1b4d25f49573b88"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/uk/thunderbird-91.11.0.tar.bz2"; - locale = "uk"; - arch = "linux-i686"; - sha256 = "05373f8f2e23c0551b025b89a2ab116635e49ffdf469dfaaaeddff96db77a1db"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/uz/thunderbird-91.11.0.tar.bz2"; - locale = "uz"; - arch = "linux-i686"; - sha256 = "ef50609a5a0382aed53c0af6bd4de6143db508442b104eba10832967ad540018"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/vi/thunderbird-91.11.0.tar.bz2"; - locale = "vi"; - arch = "linux-i686"; - sha256 = "dabf2c94a148504308b281de70b2dc37aa7b12fe67a83bae1b6df4be7e864a3d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/zh-CN/thunderbird-91.11.0.tar.bz2"; - locale = "zh-CN"; - arch = "linux-i686"; - sha256 = "adce5e780010b7f81e53e727627df3db6a2fbc50ee7789dc980b06af93b1e1fe"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.11.0/linux-i686/zh-TW/thunderbird-91.11.0.tar.bz2"; - locale = "zh-TW"; - arch = "linux-i686"; - sha256 = "d08f81345272c130c2050b6a89605f4e714b9320ca7242fba95e320d4f69097a"; - } - ]; -} diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 37c24be84477..65fb5458fa49 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "102.3.0"; + version = "102.3.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/af/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/af/thunderbird-102.3.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "a71e670c596136f66de55baa66ed297ef64099398bc2e6e81bae01e0bfc05872"; + sha256 = "4e9ec93b6cadc5596aa61efbaaccb377b4666e48dc73237c6119f9a91478fdc9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/ar/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ar/thunderbird-102.3.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "84e217bbf27f9439a5bc3b8222bdd5a91cb959b113aafd977bfbab979c592901"; + sha256 = "ab00353e8e55395525fdb85d5b2e824a144d52117e113ef88d5b120e99ebd506"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/ast/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ast/thunderbird-102.3.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "3dc6dc884750e247aeee47ab66e08af179bbd7ea8cb21b5029984960e78a8712"; + sha256 = "2d7fc95f771cb315791d7b5558a05cd0b897e407b456d464235c593afa8c8dd6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/be/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/be/thunderbird-102.3.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "6a62b0406fa3f593527a2600b24493bab3aea62bcf83de0e5b33bdaa8157cdac"; + sha256 = "091e1da27b7590cd3a667c3a380d59723b2807e66401834a2d54dbbced4f98ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/bg/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/bg/thunderbird-102.3.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "a9d09246945b25486a10fc57d4d1f4b2fa773c4ac04903d3632e43a0d072d49e"; + sha256 = "02cb218c8f9b0407f1c7da2b688d3ced64c4e05166e6b234d89b7ec3f35204c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/br/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/br/thunderbird-102.3.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "cff86504bb76772af803f57e1ed8d395a00e38c8635bae60bc6d4275993fd889"; + sha256 = "4257d1f808ff6c4559f5710e5f3ba03f28a2a6725a8d707d10baca133bc28c0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/ca/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ca/thunderbird-102.3.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "866c5a4bd0d7923059c3415053352d5fb28a55225ac43b637845e14940b77927"; + sha256 = "cc9deaa88c614ecf831cf7cebab21197f3f4eeae39934da474a60ce29b8e2ceb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/cak/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/cak/thunderbird-102.3.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "2b96d1e706761c8e28acc2def2aee9e74f5f2b775cdaae1f988ca175876626fe"; + sha256 = "917854ff9d323a2c827450e3c37dc8b1b0de3d666f91b400999f290dbca00ecb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/cs/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/cs/thunderbird-102.3.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "943f16d0d455e2cadb82bb1560302ba650d8e5fa16ea4622694899f5b2457497"; + sha256 = "9d785bb167ccdf14cffa6cefd78e40da6851c328ca898c332647639c79c2217e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/cy/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/cy/thunderbird-102.3.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "33512180cbabe5e242471df8dbc39c6abd3061fc7f372a2dc92a93c1ba371ec1"; + sha256 = "2a7cf8397ad73f8f9beddfffc93950336d6619bacf8e5e3baca0cb6ce934927a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/da/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/da/thunderbird-102.3.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "3072dcf961434bccfc18103a7765a73d02a950d7eb80b499b9a121cbb3ea1660"; + sha256 = "5cd15b8266e6f27e676bc268e44dcac15f24bb385443dcda60ce6493a3a9694f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/de/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/de/thunderbird-102.3.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "2c8d711559de44c4cb29afc317647d8e275e3ba28099fc69879756776afbe524"; + sha256 = "f765a23938acd9d7a34c16bf578ed2992d81981f7425b3ae0971f8daf6567d86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/dsb/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/dsb/thunderbird-102.3.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "38f89ad3800b088635384388786733d01cc1e588ca894d4e5360ab99f4669ce7"; + sha256 = "71bd0e2685b76081aaae2d30ec30f787c58d6c22d191f91c968e0e8393c1accb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/el/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/el/thunderbird-102.3.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "20253bdceb86bbd50ab9d02b6b03451fc7c26b085fb9fe0a42883b6404f06bae"; + sha256 = "9c6312b6c76c388bfe85edf0c23df474224db5db804298eea2623229f82ba6c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/en-CA/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/en-CA/thunderbird-102.3.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "7c5555a80587490912e89b7fc4343f9f4481c46ff14eef7cdfd4c5fdfb0374e4"; + sha256 = "cb0d81609be24e85454a7c52f05ef6f4557837e6ca63908376c6beefa4d6a7f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/en-GB/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/en-GB/thunderbird-102.3.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c43fa7e64ac8f0ade149b9200b410f603a25708a58182ce5d60c6be59d7381a8"; + sha256 = "8fce652d0f319812e1bcb485c011087a09034a81ebefc19d8e6bff6ce74897a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/en-US/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/en-US/thunderbird-102.3.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "76991484d78a726e80f49b3a57bb6bdb61d1b7069fabde0a0e68abd3ed10684e"; + sha256 = "23c48f5d92915d1ed823c2f47f3a611bf81dd6d69b9b1a5a0aeb939a405d7466"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/es-AR/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/es-AR/thunderbird-102.3.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "c0aa9b60ded76a20f8f3a529a690c0757ac2124d5cf11951ead2101d9e21318f"; + sha256 = "ffb7f0e9d6df315f9fe18dc955d2d5394a8b2413727ae674fa81d72fae0d8a14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/es-ES/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/es-ES/thunderbird-102.3.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "be9bd160ab6a3fa7c59f463d9e0f455c4e33489404307296af1383f969c66c82"; + sha256 = "a0442f1146c6c455c4934834b8b6dabe42afc29512a48f9ccdb28467de0d8800"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/es-MX/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/es-MX/thunderbird-102.3.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "ad4057b3156a3b66bc4a3838d94a295cfa8f45bb2c9b7733c5b0ab6617732df6"; + sha256 = "84f7b65736a7c872ec6ac7283ff53d1c0b9e36edb1469784b5094fa963b44d59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/et/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/et/thunderbird-102.3.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "8e75ebfe0f71f25efbae14258e951ee32207745fc09f7f7dbdd4d6fbb10089d4"; + sha256 = "6c2985ac3473f124b842daca57d97f584a58d1d5cd0864cbcc432e1af250e83d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/eu/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/eu/thunderbird-102.3.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "620ea903dc405eb43da4c96409233618479b68975252eb293cb8607a033754cc"; + sha256 = "adafa0ecbb2f8a8ee2d4f06b38744c9bec60d1d0bee386b9840a4d5e08f28cb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/fi/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/fi/thunderbird-102.3.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "5223db47cc4681d5811e577227561d4f8b70212e9153e6165faf9fe17fdf83b4"; + sha256 = "ab7e814fe7e45f49bc6cb9451ad388b3d220af33d02071c8d9358ad1949937c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/fr/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/fr/thunderbird-102.3.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "862147cda527c7525e51e38b4a9917039c29a904f386d5a3b2fc03b7badd11a4"; + sha256 = "f2bc22c3a12fa32c8c13e50a3fe502d5966fa082e6b07c84d2867b043f7770fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/fy-NL/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/fy-NL/thunderbird-102.3.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "a75a460ac29e1f464a208cc0ca8e2de96d89639d190648c4895390af75bee7b2"; + sha256 = "eeba9b084a5cc818dd62f0bc60de98769c2a62923a121ed77b84f9b4409e60ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/ga-IE/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ga-IE/thunderbird-102.3.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "d93a35059913ae5af72a09276cc43a86acd55bedb70b9d9782459fe1eaddfa1b"; + sha256 = "6a86c5e24299ee5a24a573d5e598eb42686c4c5baf58798f487048bb18b9d892"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/gd/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/gd/thunderbird-102.3.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "032ee6598490975314e9beec7afc6f38d97420708e4f517682ac66f57469303f"; + sha256 = "a53567a12afc89f3dbdc20976a098f085298414e9a2453e86608715e7500609b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/gl/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/gl/thunderbird-102.3.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "c7ba04686b6657c318b6c4becac40c521efb02f5b3606a1c03d4d6bd9cf903d2"; + sha256 = "fc47765f922e599b18903a9697493a3c939e5660b3efb19353c511876bc1e74e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/he/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/he/thunderbird-102.3.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c679f00773f660cad158b5ab9bf172f5bed388483a07249824f9c3bb04103b88"; + sha256 = "5ea02bf7572cf7568e508b42ebfc7dd8ceacc6675b80a609d6fb2448f99d111c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/hr/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/hr/thunderbird-102.3.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "027cc50ddcaa102c881783b2fa31708cb6e83b9169f4b8dc0eb3a7b03ec3adad"; + sha256 = "cc304fdd627e3eb6286ef919bdc0afa08c13c06b9586e058724a30a58e06bda5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/hsb/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/hsb/thunderbird-102.3.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "bda5d2d087be8bf313c410f5e40b7c84f24bda77801a3f290dc35354d04ee726"; + sha256 = "5b4daf66a885260f00d6142102830abe91cc3e4ba5f44dce89f9ea405edcb725"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/hu/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/hu/thunderbird-102.3.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "d5d26ff850b344a757340602fbcc2648376a24b067ad43bd87ab03a649ba9928"; + sha256 = "eff03ec8945cbe8378651d8847aeeaf395c3c5a6351f8f77586969db13cff90a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/hy-AM/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/hy-AM/thunderbird-102.3.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "058bd247aeb32b00f456259391fd3d320e1bbf0393de554b1f099c5052966dbe"; + sha256 = "e3e1d117ca12ab81c71ac412532691bac97488d4c4de0f2c6b3e04ad8842b8d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/id/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/id/thunderbird-102.3.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "749f44a45f98b12f4a3d8420cb14991f62e9f00d9650376d8d5800afba3e098c"; + sha256 = "31783513a34d7c254bf256fece50303d19659d555ec9be6aa65d7c927331b613"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/is/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/is/thunderbird-102.3.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "818d89f3aeff1bd6e6436a664527f4057f62dfd3e33e8e63de2ba85b4ab0e4b8"; + sha256 = "6872d041b88b3ef63c576545f290306002af052bddf836755983f1cc04e0d88e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/it/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/it/thunderbird-102.3.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7a26bd84f3030d28e0b9c5fb8aebf9c6bafba384fb79f42c3d66be9e344518e3"; + sha256 = "62b3f417ce64feec22cad34bed2ceff9b148e1c70fa6c113a6ebdffa03176790"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/ja/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ja/thunderbird-102.3.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "848a7261b4db8f48fb572ffba6737e7db7160c53b4d2bca39f7349aee5fca6c1"; + sha256 = "d532ffe63954e34a1fabf0c4fd82650d47b6149ed24e721ec8a982e41151656d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/ka/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ka/thunderbird-102.3.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "404ba964cf866f27c27406c87f0e22a75a45978f4fa819797de6553032f259c5"; + sha256 = "34f6c534c1a1e0765beddab6f282a37a433019bf34c8f682b34bb2043ee50873"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/kab/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/kab/thunderbird-102.3.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "9de2784610c91f35e705a764a90e94a3a85c0e53e6d5b34f0179e335adba46cd"; + sha256 = "c8eb3166d1969e61092b360387cc36225a40dd6a6bd02fb1770fe9038737725f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/kk/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/kk/thunderbird-102.3.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "115bf5beb4544c9871c0e63e8af25b81fee12d64a081cb5f9635e974cad265ca"; + sha256 = "1ac2a9fa3c8c4d81011bfaf7832f1b0e8e90eb5d5e6244090d72147d2e2b8fb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/ko/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ko/thunderbird-102.3.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "44566c62f8ebb0291808d6124babb04ea84ab1372a3eff18ddafcc5d94b0b3af"; + sha256 = "cf93f79fa959c5bdf95b4c35c55db071825026d251ee877901864e875b28cc0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/lt/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/lt/thunderbird-102.3.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "53d54cf530347c74ffeffd98f0b5071b79a3f0790bc867dd5240276f82422616"; + sha256 = "ae27c62284aa6884daf2e798f150d2d23134dc1a9f94fa6af707436af2018c13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/lv/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/lv/thunderbird-102.3.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "c5a98eeddb8a31349d2221a96697a06160bcc5c0228cfee4b77d33be954999bf"; + sha256 = "1866d66a091e4b8126b70371631e5c97ce0a5868c77355b8e918678b1864e982"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/ms/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ms/thunderbird-102.3.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "78fd257d6467715913b3920cccbc5603ec76d1e8936830792b0f2bd35c4c9de5"; + sha256 = "01b3960e8316292b7e76ff1c43784120d515ce9f1dde3698db3242fb1b06edf2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/nb-NO/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/nb-NO/thunderbird-102.3.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d6694969e586c94cbb72269dc7b960d6b09193c72160cafdb249b393accbc667"; + sha256 = "98afda50d6fe63681e643d6580a773bffac167a6b074fc2523ddeaa99b34b791"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/nl/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/nl/thunderbird-102.3.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "fbf91391d014566303e48d68541db5b5e2ed13997dcaef36c54ea59a2efd98af"; + sha256 = "fa8e08b8ed82590db431527c75f407365b01da7a8bf445060eabd3b1cb433191"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/nn-NO/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/nn-NO/thunderbird-102.3.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "47c5005d8f377a2ed25fb09d6505bd05bc18b1a9ec3449299bfb218504464eb8"; + sha256 = "b1696f0c18425096daba4cf42000b62fb3e520b670b96c716dad159dfd87ea8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/pa-IN/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/pa-IN/thunderbird-102.3.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "352131eb36bf81812b5511df0902467b488d3dbcef24d16264f9bfac337cd294"; + sha256 = "64d1d93e474178e58ecbb6a320334fcf282768a6670d7a4b61a9868028a2b872"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/pl/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/pl/thunderbird-102.3.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "b657e92a43078fd1ae06a73b53469e3f7a0b697dd9941585c23ccb248cd4f264"; + sha256 = "2944648239de42d63296117fd400f91f113f1abe43c07427d8bae171fc704178"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/pt-BR/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/pt-BR/thunderbird-102.3.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "9d37a752027668d0558a03d99750231294ff5268fd17124e09e9133fb9f06ff4"; + sha256 = "8a90e2f181579f2f554323c0a517f39068261157fdb9c7a3e103b7e12bdaf85a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/pt-PT/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/pt-PT/thunderbird-102.3.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "e5398880d1e6f65bc0f8f188b66bf6e2a8244127eae4ed8ba31a6055d0abe99b"; + sha256 = "daf5b99316e61405a791d4c08934135578b89046b9364f59d8ff3c96ae2aad8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/rm/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/rm/thunderbird-102.3.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "831b23a999b7958e14e2f7d175d0d6eaa304898df57447774cbc07e481601819"; + sha256 = "21293b3675a5cf775840a197278538132ce6072fcf05c9752658d7b8c1733507"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/ro/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ro/thunderbird-102.3.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "c0961a43c10849f9701995299cda5c6478981ec8d75b46f34043a6fc0eb80afe"; + sha256 = "a488e2de83e8a644dd4943ae1fb1ef7e573044d896d40174c057d85b5c572bdd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/ru/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/ru/thunderbird-102.3.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "9eea77287bc6e5aed37dc52d33cff749c6f26ca8581ecad0c573c5439bac4832"; + sha256 = "c442169025d3af45f6f17d93b4ee6b93a19dee8dc76aa3a86d05f909c7738f01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/sk/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/sk/thunderbird-102.3.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "cf8796a6dab3fc5367f37c0ce3a44504d28773683f3d7cac283a522a69eae40c"; + sha256 = "ecdf233b3492989e4bfa8479603088bae5c01d91f803d0ef75217999727bfb96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/sl/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/sl/thunderbird-102.3.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "8e7aac5c3e8417fb873d636621a86fc2bb579c24f123de9c232f9cb4ec8ecb28"; + sha256 = "4a50de5e9e4d521fe82dac6975fc0524cda87982dbb408fc49020d444fe4a517"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/sq/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/sq/thunderbird-102.3.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "2180e8ca12666c021fccab62debd1f7d316cb6886e906830d20dc7fad5642f5f"; + sha256 = "85374a718f1968852318320d39dee77b1377aab49e9d16457a1a92b8606f0390"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/sr/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/sr/thunderbird-102.3.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "f62bf2d43e8b6d22293e50efc7308314ceb282cf5796498d042ca480358fbe7f"; + sha256 = "1a2799e9821b1eb49ec90e6b50fc2b306e53738e192fbb8bcccba0ddaad90cc7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/sv-SE/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/sv-SE/thunderbird-102.3.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "c25766e789a138d80eb619c1d3b048becd978908b6a87fa418dd0dc7811c71ed"; + sha256 = "3f1d06d90214103104788f2f874b0ec7b915fda8f2a2c54155706f6c8b9455c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/th/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/th/thunderbird-102.3.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "d8b2786ac76aa8400685f653e14cef346351bb789f18dac53880f33b584d2c9a"; + sha256 = "1d611eb6a2a1dfeea5e08bdc1d46a580df25f172169a9752d865b89e44bd673c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/tr/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/tr/thunderbird-102.3.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "e901d5637da581d77101c3421991634b78f0c8204b31cf10c7895d7b5099bf0e"; + sha256 = "3c9df11854ff3a775b9bafe57feeb585afd46e853e8be06b73f9fb5a06b21595"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/uk/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/uk/thunderbird-102.3.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e2f3dc72619b1b0445d426afbca316f53d1ad13dd67b932344f75c79b399b825"; + sha256 = "fa3a01b7a86a8885aa05fe9251ca8843b08268d338d73a4f26e790b76249e429"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/uz/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/uz/thunderbird-102.3.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "6f181f7cdd809bb1996d9ee901a99fb4e5664c7cae840083c2e76ab79ebb1ad8"; + sha256 = "8e87c7f295216f70d861ced167970968db3926ddfc597613b51be82724793e19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/vi/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/vi/thunderbird-102.3.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "4693ae38cabcd20d514d69f6f858f859d56e4cb7ace8902f72b315fdae55d390"; + sha256 = "c8a75c6a87e5606037da51c57a9b0ca01cce95b9a6bf51f92645902be7fe666c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/zh-CN/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/zh-CN/thunderbird-102.3.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "2497a1296ede40faa3b8a8376e9042ab76a028e2e103a085bae372001addb487"; + sha256 = "679f176ab93c5afe107c9afad67216c86f3b85fd95051da8a194e3f28bbc9c24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-x86_64/zh-TW/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-x86_64/zh-TW/thunderbird-102.3.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "00f442567958647e83005c4e82dcb955adfdcf1af78a4ca455e261eab21ec428"; + sha256 = "d9dac3efd9f3b6f8b3de483fb895b21079f9cda9cee4247dcf605e7d1a15ed71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/af/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/af/thunderbird-102.3.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "49827ebb3ea00c8140053747e55276c2c19b4c2a9e7a177dab5d5817799590f2"; + sha256 = "448bba05f7fc7982e189cd0b012b83695a16b7912050919ae15ccff23ac0e9c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/ar/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ar/thunderbird-102.3.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "0aebf49ad8277dbbeffe07b5a83cd7fe9706ef6bb1c5d5b6a95a9127644052cf"; + sha256 = "ce5d762c58ae99327e1b40bb0a2fa39e66391d620b09d156299c1240f3cd6214"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/ast/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ast/thunderbird-102.3.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "d47831aa039fd8854c9f42d024cc94de4d6b4349445ed67ba0a432c36cabb13c"; + sha256 = "2bb16102cbbf2d5ecf8a4d0cf7e52abe59e0e77bab8b99955753ed2833c7c60b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/be/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/be/thunderbird-102.3.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "669bcf2ec8bcea3b8d5336f0a6b5f5353bd4b72e40f4edf2d8f8b96204c95ef4"; + sha256 = "77480fd5f82259c02107072cfe572d8c13611279fd9a6ffb2a9203db8cf1e233"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/bg/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/bg/thunderbird-102.3.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "1a8075b16187382bc217fe62ba657ff48319a855ed62093dd068c5d5b63afc36"; + sha256 = "317909be58eb0718ee8a38e07ba22ef78fa912a75f18b547a1a65840214c52a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/br/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/br/thunderbird-102.3.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "3160489a59afdf42502f11c9b8e71384dcdfa37d8b328e9a4f0cbe59f3c61cf6"; + sha256 = "a6b8d5c4012c00cbcd03beedb87826fd3553497da09710517d07ab5f26347f92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/ca/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ca/thunderbird-102.3.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "bd0c59710b62dda697f348bb7b3e23b5aaadb57f37cfedb31790a6104b1e6ad7"; + sha256 = "337d21f0927c21e54009d0a38744230145e7ab36710940da1180517a946bf06f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/cak/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/cak/thunderbird-102.3.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "da1d565549c98074765b00060d5e7fa1945839f02c228fb190d0f9352f194588"; + sha256 = "d626cc58418c56a6505087e3ce1b8387cbf371c86653e5576b24421ef1be8cff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/cs/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/cs/thunderbird-102.3.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "b7f3ad988dab7dd1e67179c2a7642dbc97e03013b4f9700c74f3a61e5224a2c6"; + sha256 = "85422320690772a867f9128c77784f16270d739561e613505894ded2d5dea8bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/cy/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/cy/thunderbird-102.3.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "c73218a8809576938e2e1458c2a6e511b07e9d3f206240d84ed41052ccfa7e68"; + sha256 = "1b01874769ddcde6a5e520034131a42418f2f7cadb07d0aa9e815ebd0c59dbda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/da/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/da/thunderbird-102.3.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "a079c1981f6fa3f91b07cb9f208eb9b752470b9eedf50b6f36eecfae9b6c2c59"; + sha256 = "6381065e3e8841a6113d2cfdc2ccb6d8082f68e977940040ee85af2ad59162a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/de/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/de/thunderbird-102.3.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "946ea9dff65a8cdd191b0ccd8bbd31fd107d5fca8c58e21f97bc03970d09c511"; + sha256 = "ce9525f4d3df6336f01c526d095292490a3ef8c50752140899ef01dd5a4822cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/dsb/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/dsb/thunderbird-102.3.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c13dad0c2bb06fe29f751cb0f1aae38a798ec0d32134fa702f77fe1c039dd863"; + sha256 = "5597b4565df7f09e2a5682fe252076c1f689a3c7f139a38b9415c1e1ff6d3255"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/el/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/el/thunderbird-102.3.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "5f22dbe9f0c0da32ad08b60e064517f453b19d640d7c3162b08c746d80880dd8"; + sha256 = "4b1a586b566482d4a0b333642f6a3f8d4b68c6eebb0a0620713af4e5cea97997"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/en-CA/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/en-CA/thunderbird-102.3.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a95f2c99462003b1c120205b84437a351b5f95d5389d5bc65a571d7a26f0a9f8"; + sha256 = "d6f1602354ac05f3220f8f4dc95164d511530f3aeee50e5f24141a9807359320"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/en-GB/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/en-GB/thunderbird-102.3.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "0ee72a491d0453758bbce19a44d1599f81bb56f267ec281a13d6a3c7066aea05"; + sha256 = "14432051534a87a677318885cebe3e1ecd0d8121426bdf378251da28f8c1a3a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/en-US/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/en-US/thunderbird-102.3.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "0866b4b4177b9978a6e0104ff53abb66536b53c9ac4be8a57f070f0131d08154"; + sha256 = "24b0bbb9eb51289daa6dd422dda05b044f1a5a791d9d5108ea6eeb711c44de76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/es-AR/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/es-AR/thunderbird-102.3.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "be590480542b2ffd8b7de90a3dcc453604c6be2b7bf7d8eb8c82a72f20e7daa4"; + sha256 = "b7624620c724a64b1d87f09bf685c26ce0a84d80b07ca6d9d3f784ad21967277"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/es-ES/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/es-ES/thunderbird-102.3.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a8268dde4aaa52f72013f988e2b1b424ac7772823cae4712f7f27fb13c7336ed"; + sha256 = "dfecfa47b402b90456dc5d4ae623816cbeda9c80c4938f741bf151fae0793f47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/es-MX/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/es-MX/thunderbird-102.3.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "9211b32009e3e8cc4aed35fdea32d7de5adb8fdee650baa7b50605441763686c"; + sha256 = "8e6527ad6aad041262d85f514ecafd9d62814844a8a29d7ca1ae883e79cef50d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/et/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/et/thunderbird-102.3.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "47b9ee74703b7f6fc049409a081d0908c89bd291d8a634cca5384ab5970de540"; + sha256 = "8d18b241852707454ced76b234b242b3779b8d6e1443dac325379be06e688e9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/eu/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/eu/thunderbird-102.3.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "5d20e8463ef8ca5b0474e6d18bdd020bebe0e7ebe102ec2f94b45cb46caab615"; + sha256 = "b8aef6273a96f6e78ba194833fcfb31461fdc6bf6bba0fd6b2412fdf152ec53c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/fi/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/fi/thunderbird-102.3.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "6da84cec6f109ce81a23dece24dcf63387ff930db29af161d8bf9e594886738f"; + sha256 = "001c89758fc323fa0adcc687d9a593a7cd37a02bff039028876cbe29cbc30c2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/fr/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/fr/thunderbird-102.3.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "2e0f34e922eddb196545509d34023853299f3d580f8dc38699914e8b0fb145f7"; + sha256 = "736754863283dfb3c3a4fed93d75fca3e7c91e8b82b501569931c34fe75610a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/fy-NL/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/fy-NL/thunderbird-102.3.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "47796de28d0ac83bafbf9c67b710e5733679881e824786c3404209403366d404"; + sha256 = "99de0a63b7591e089fbe107c9054334dfba47a6c2b3fe5a1257dbdd6201d6ca2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/ga-IE/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ga-IE/thunderbird-102.3.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "93c0bb6e29a6ed9c68c9afaa19ab7559cc68771490ebf29fb28dee3659b92a79"; + sha256 = "b7e2fdf11b027c6ebc8854b1dc88c8bd0f9d7fd79cf8a795aaa3e915201fec80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/gd/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/gd/thunderbird-102.3.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "5159bfe69050d249e73655d986ea424587d2f11f219a983bc31cfc3c91006f15"; + sha256 = "8e8c4c8fc100186085c7a6fbbf5aa051effae790a6616e0b9443dac25b635da4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/gl/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/gl/thunderbird-102.3.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "2b0e6e631ba33a1d50c12c514755bdda509857dec78427e118f59653fe0b9501"; + sha256 = "6961cbf70431de590dfb00037bb78872086405f0e6b769f75ed3d053e4d12ace"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/he/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/he/thunderbird-102.3.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "b91562950b7a0c0e4d9639a86cdc16cf78bed7a73634625e2de1e39cfc1b6616"; + sha256 = "2b7c4b2fc9ef21cc303435ce65361314c9e7621259384205658ea06fa191f91a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/hr/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/hr/thunderbird-102.3.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "5617e24889a5ac8449b7258796491ec07eb20a2998ca1bbc8b2b0824fb8ad628"; + sha256 = "2e223e3830b8d7b4747633c2450f654d6c92b822d04c7c652d9c5e5431d19cca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/hsb/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/hsb/thunderbird-102.3.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "cf0413d8b8810e87cb570aa74c6e456defb13356614eb77301281bf8130a6c2b"; + sha256 = "b8b49ac96522c1e0a44aa0341a272bbfac68bc3022bced753baba929c276fe7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/hu/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/hu/thunderbird-102.3.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "23a5684419aa3da23a3f869d920aeabe5c00fd8ad277ba122880728c57297334"; + sha256 = "b3a5aefaac3a95d4dd1d809835cc024338fcf2ed6820808dac1007e74cb11c2b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/hy-AM/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/hy-AM/thunderbird-102.3.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "46f61ef71c03154640ef92bdbd5d5d8b85edd8400918b0c6b16cecee67a1fd2c"; + sha256 = "adc79864747e21dd293d46d91f57dae8a502964c5d6f952c010dc0f0a1d4c656"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/id/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/id/thunderbird-102.3.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "cfeb2d79981de6e42b15ca18be31e0c23a23d5a28413a8f3117e044671396d2d"; + sha256 = "a154337146c6a8d5a8acab2f332ca8da6572bafdc9c888ba062bc29bc7ef37fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/is/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/is/thunderbird-102.3.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "b3cd601891679454104396777203ab07a447e6edbad14fc1b2c43b7cc3b2fc49"; + sha256 = "5799af2df9dd50b0c6694335b12cb77783ab0f622a8415ff82fbf15aca2822ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/it/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/it/thunderbird-102.3.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "b0be5a7591cbc907fffdd9b3afd641393ec7988b7fba4a85477f89845366d9f0"; + sha256 = "6c2e9dc4c6a805f919840c22a75fd6acd4bb3078a82a16b3b27e5ae1a63e21d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/ja/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ja/thunderbird-102.3.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "70c0153f9a8abfa4a744356bd962216ff2492f62a3f7a8a449cd2873192357ed"; + sha256 = "9e67f40ceb46fd39f50cc0f8f5d83ea3c677bd91810dd84d225c636f6c20a290"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/ka/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ka/thunderbird-102.3.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "e8f832f89175a5c61c7dec32d8351c79dbc5d346952255bbd6f402942bb9b8c9"; + sha256 = "765c999714bb3b897dfaa0fa3e6743123ba7e3d7dc9e54eea9252dc10e5535cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/kab/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/kab/thunderbird-102.3.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "a205169670909c6138148bbef7a0244e4ece9f8631d21bba40221f8fc9ac910f"; + sha256 = "63380a855e8e68d5796d22c06beaf0c0021e5488cc8d408049126334e62fb70a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/kk/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/kk/thunderbird-102.3.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "dff9aea004c10f861d7643118b48130cfeaf9b7a5c13d8040e5ff32a233a91f0"; + sha256 = "694dfb86d441657d7fa3a5c9fb0aee04963fca34e6062278170b7ddb828bd6f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/ko/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ko/thunderbird-102.3.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "bc4e70f8180f4b66ff53117f8a3f133b04fbc24c6141c7f24caf350f75d93d01"; + sha256 = "533945ef9f5f4b47b8042e226a062fb0f406a70c89fd727c86360ff86ede56a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/lt/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/lt/thunderbird-102.3.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "540e1d5086b42a60a3db0fac2d558e80b24e43cc018aeb7ca9b64819fc46d012"; + sha256 = "f59bc567e18f0a7bf6a8309ffd41d812196a4fb7328d0485ba01154b46b4bf89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/lv/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/lv/thunderbird-102.3.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "8baea9b65ecfa1b126b36ed8680a30fbb0b5f6f2231718afc600f991e0b01798"; + sha256 = "48ba520948c2ca6e10e6a16bd7110538895780612fcd49eeb9485c6c77e6e43d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/ms/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ms/thunderbird-102.3.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "92f6e2c2796cbd8fdef2ce38c0850d649adcf1eb333a1701911909180f08572d"; + sha256 = "9bdb1a669c831dc8a714d35adaaef8a25149462d7230efbee4daa1632b487425"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/nb-NO/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/nb-NO/thunderbird-102.3.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "965b760f2122134288b74558b76d18eaa7ab94f19fe66f3c8f76f7ece826930c"; + sha256 = "07016efab2eb7ed564cebcce06aa96842c2db9935e20627207ea81eb4febc583"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/nl/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/nl/thunderbird-102.3.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "0635a5bd45b61790ff0ff8db356d7a13321d7dc15abe7f94a5b91a750448ffbe"; + sha256 = "6da0d6ddc98213620e9d9b20a008e1d419f9c183a379ce29a03113be3f168388"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/nn-NO/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/nn-NO/thunderbird-102.3.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "3b930eed9a5f7d30ec1136c89d641a2bf13ed5ff10623627609f64fbbdc74996"; + sha256 = "8ede5e5a46e972d5b08e2c5afe316ca8f789faffc2b25e235eefda361073cbc3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/pa-IN/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/pa-IN/thunderbird-102.3.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "a2226cd7a555c573edc1b309ba668bfbbe1d696750d2bcc373d69d3ed2246ce8"; + sha256 = "d7090dc233b508586d04c19b9f0a72d49207daf01f7dba009fbab6004bffa2da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/pl/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/pl/thunderbird-102.3.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "f29df81475357a88947d84fd56f9e0707314a7e1ca73357a1debd4fe3af7a289"; + sha256 = "55728076e95a42ae58bd545f4a9a07d43937e3eeca432cf14cc5b990df993cb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/pt-BR/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/pt-BR/thunderbird-102.3.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "dc7f57d4a44c44a110452b0e60ebadede4edafb006bd198b2ece64075cb43795"; + sha256 = "4fcef15d7ff85a5dbfc8c30628ab50403715217ba90c28c10a46f6dfd54c806e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/pt-PT/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/pt-PT/thunderbird-102.3.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "f9477ba8f30b69198b82b5ef5e12a638352b34f7f0d88d627a6bc7805c7ab8e2"; + sha256 = "3a52e1938df9e3905e628444fa39a8ec242d5035d22081b9b236f4c9530360a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/rm/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/rm/thunderbird-102.3.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "dc8577eabef2640c3f3c1f8057cfcea87c537eb52706763da8f91a78dd8e1c51"; + sha256 = "fe1a9489fb05b630958419e9a861900f1f2208563cbfddca1535f2189fb22c9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/ro/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ro/thunderbird-102.3.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "390a06810db344da6f7d37c8be338daf71b2b768e895c6d9da926f19429edcfa"; + sha256 = "27faa3fe3ec2491bbba28719d1251b3b1708d533c7139d7ed9ae764cfff77b4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/ru/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/ru/thunderbird-102.3.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "e1f9c393c869e9ee2f915e1836c58d8d25d63e6473e09fbd9ddcce43883db6cc"; + sha256 = "25d8d95ee2310f168ba3c3b9ac382f9faa7980e2993d53170007fd8430ea81de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/sk/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/sk/thunderbird-102.3.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "24f84b4c0edee2da24855e696fb6db10a8039ec37ea14f2c58a2be33bbfa3aaf"; + sha256 = "c20d3375ecd71abc3a2e0ac02ecd3eba94a551515f3359ef1b67ba0bf6bce00e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/sl/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/sl/thunderbird-102.3.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "27df3a463ff04bd38d2d7aaba1d5cd7a73fadbce531ec72d490241076f6e6582"; + sha256 = "0228e8468438a9aa8eac458e24b20bfafe6aefdb5e48b54954ed00e63706bc13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/sq/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/sq/thunderbird-102.3.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "6f642a524ee4c6239107baa2f37eec4fbbc554f9e9f6fac5fded99198a3850e1"; + sha256 = "5a8663228110c37300854bf27dcc7266ab7f644433b661504c45abba41aed2e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/sr/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/sr/thunderbird-102.3.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "1e87b3540d43679a0a85bb285ca198b827f667e08162c947b85617fc56f7bc5e"; + sha256 = "9a1df52ac44477ca7686408fe0581cdd72767ca72195799026ce5140623c096b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/sv-SE/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/sv-SE/thunderbird-102.3.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "f93323f082a723c57bc1cd48f07c23850d76052d96c9b28fab5695a4ac1af7e9"; + sha256 = "232aa296cc744b133127baffd286521dd9f07f3236619bd052b3f279860db9ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/th/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/th/thunderbird-102.3.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "9407f4e26811778c2c16eb29f81926426177949ee216652261c1c524b5a1efbb"; + sha256 = "184a66243f02c8387e10cccaf8a464aba3da6f3e2f20d8493a7e6e491b16a329"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/tr/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/tr/thunderbird-102.3.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "ebdafe4fa1d07c2575fc85021c8fee4e3415e6c766729ee285a0af663f779ca0"; + sha256 = "9ed55035f0d9348f5903bf80a8f4b9b25d024f42eb67c7f90e32546bbe8aad37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/uk/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/uk/thunderbird-102.3.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "59c64e335af77ba4424f5b9c8ad120adc4e3acfd971b4badcc95735325c90dc3"; + sha256 = "2c8b84d9cc9db19d8bfccba149c02f2b339967e2e97b3955a3628f9cec3e26f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/uz/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/uz/thunderbird-102.3.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "8f6726081b79fed9b33172adab53fd8d95ce325123690ffedd1fbda516a3b122"; + sha256 = "47e31e1aaf4b8cd9506bc22f25cc1b7be23b6c6aa36dc7828f2d56f3506f7def"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/vi/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/vi/thunderbird-102.3.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ff9031b8db9496551d96a8f5b1dee497a40fcc4c59ac0e24bc2dfa54f0b6120d"; + sha256 = "d9253ed61361b5c7888429c10c2792f95c59b72dd56ab16c2707db5e4305f34b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/zh-CN/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/zh-CN/thunderbird-102.3.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "b20af611c056d3d03afd2745ba41b135639b90ce25bfc8a8aa7b7456471b582c"; + sha256 = "f978eb65f70017c61f7e32994bbf5be19fe2f18176a58f1b1aa0e36e688dc2ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.0/linux-i686/zh-TW/thunderbird-102.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.3.1/linux-i686/zh-TW/thunderbird-102.3.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "5fa2a5710b1e414e3f3696e6217fedd16ef5389e523c11ae3ef648b342e2b1e3"; + sha256 = "7a337e36d45668e5c6b20e60b3617f9acdf0f0a9166ca234567a1f0e4a47181a"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 1f061188806d..aebb182dcb23 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -2,50 +2,16 @@ rec { thunderbird = thunderbird-102; - thunderbird-91 = (buildMozillaMach rec { - pname = "thunderbird"; - version = "91.13.1"; - application = "comm/mail"; - applicationName = "Mozilla Thunderbird"; - binaryName = pname; - src = fetchurl { - url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "ca1bf821e6ca010c554fc111157af60e627ace7a0d43785ba39b260cd0606480dd5736c188c49ef6c3f1bda4b4c6870767b75e483241e7fd5a4290d689017e73"; - }; - extraPatches = [ - # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. - ./no-buildconfig.patch - ]; - meta = with lib; { - description = "A full-featured e-mail client"; - homepage = "https://thunderbird.net/"; - maintainers = with maintainers; [ eelco lovesegfault pierron vcunat ]; - platforms = platforms.unix; - badPlatforms = platforms.darwin; - broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". - # not in `badPlatforms` because cross-compilation on 64-bit machine might work. - license = licenses.mpl20; - }; - updateScript = callPackage ./update.nix { - attrPath = "thunderbird-91-unwrapped"; - versionPrefix = "91"; - }; - }).override { - geolocationSupport = false; - webrtcSupport = false; - - pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" - }; thunderbird-102 = (buildMozillaMach rec { pname = "thunderbird"; - version = "102.3.0"; + version = "102.3.1"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "9b9908d9f7b1281df5b2c74a25211973e25d9b780f05b9550c89e5aeb8b39070c517a1a33d0d84a33ed26dbcef99058308b76c056bd4e34987c32f0600e3882e"; + sha512 = "8a127958b35c1c14b8acaa3ac256f8a3a7e9bde89fc810299ae4036c80c41d0c0d45c85ed47099d6ec37e2774a6bdeefe0de6b0b4b8bceca8206c7e54c3f93c1"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/novnc/default.nix b/pkgs/applications/networking/novnc/default.nix index 269944324c64..a4efc6889ad4 100644 --- a/pkgs/applications/networking/novnc/default.nix +++ b/pkgs/applications/networking/novnc/default.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-Z+bks7kcwj+Z3uf/t0u25DnGOM60QhSH6uuoIi59jqU="; }; + patches = [ ./fix-paths.patch ]; + + postPatch = '' + substituteAllInPlace utils/novnc_proxy + ''; + installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/novnc/fix-paths.patch b/pkgs/applications/networking/novnc/fix-paths.patch new file mode 100644 index 000000000000..cb160320dd53 --- /dev/null +++ b/pkgs/applications/networking/novnc/fix-paths.patch @@ -0,0 +1,22 @@ +diff --git a/utils/novnc_proxy b/utils/novnc_proxy +index 0900f7e..a931763 100755 +--- a/utils/novnc_proxy ++++ b/utils/novnc_proxy +@@ -22,7 +22,7 @@ usage() { + echo " Default: self.pem" + echo " --key KEY Path to key file, when not combined with cert" + echo " --web WEB Path to web files (e.g. vnc.html)" +- echo " Default: ./" ++ echo " Default: @out@/share/webapps/novnc" + echo " --ssl-only Disable non-https connections." + echo " " + echo " --record FILE Record traffic to FILE.session.js" +@@ -44,7 +44,7 @@ PORT="6080" + VNC_DEST="localhost:5900" + CERT="" + KEY="" +-WEB="" ++WEB="@out@/share/webapps/novnc" + proxy_pid="" + SSLONLY="" + RECORD_ARG="" diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index bea7fad805e2..558fe7e385f0 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "ncdc"; - version = "1.23"; + version = "1.23.1"; src = fetchurl { url = "https://dev.yorhel.nl/download/ncdc-${version}.tar.gz"; - hash = "sha256-gEq65B/MqWnof2UEg65+OiN0Gdq70yCJfiX+iFHwoss="; + hash = "sha256-lYgSFAd6Wzwk+7rwIK2g0ITuO1lqfDzB4OaKqsTJteY="; }; nativeBuildInputs = [ perl pkg-config ]; diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix index 6ff10989b1d3..a4b78e250d5c 100644 --- a/pkgs/applications/networking/p2p/tremc/default.nix +++ b/pkgs/applications/networking/p2p/tremc/default.nix @@ -13,6 +13,7 @@ in python3Packages.buildPythonApplication rec { pname = "tremc"; version = "0.9.2"; + format = "other"; src = fetchFromGitHub { owner = "tremc"; diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/applications/networking/powerdns-admin/default.nix index 33f2517621c1..d889fdcf100d 100644 --- a/pkgs/applications/networking/powerdns-admin/default.nix +++ b/pkgs/applications/networking/powerdns-admin/default.nix @@ -20,7 +20,7 @@ let pythonDeps = with python.pkgs; [ flask flask_assets flask_login flask-sqlalchemy flask_migrate flask-seasurf flask_mail flask-session flask-sslify mysqlclient psycopg2 sqlalchemy - cffi configobj cryptography bcrypt requests ldap pyotp qrcode dnspython + cffi configobj cryptography bcrypt requests python-ldap pyotp qrcode dnspython gunicorn python3-saml pytz cssmin rjsmin authlib bravado-core lima pytimeparse pyyaml jinja2 itsdangerous werkzeug ]; diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index d2c6620b8d6f..9fa34e785b06 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.20"; + version = "2.4.21"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - hash = "sha256-2sDs4AhiyccVpnfCGPBL+QifQGStbrzSUIL547kh2ko="; + hash = "sha256-KZVRLXXaJYMqHzjxTfQaD0u7n3ACBEk3fLOmqwybNhM="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index a5964e0d28a6..7065343378f1 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "2.5.13"; + version = "2.5.16"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-n9lZfg+0JRRaO3H+sDXRIrELTs6NE5G78Ni0RKWzYuI="; + sha256 = "sha256-U77yOgQNSj1p3WZbwkyq0Ui2UrXeuAv5sD7L+ZI2x24="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 68a6b4f6bbe3..d3faa478e49b 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -41,6 +41,10 @@ let sha256 = "0fi7jd5hlx8cnv1m97kv9hc4ih4l8v15wzkqwsp73is4n0qazy0m"; }; }); + + eth-keys = super.eth-keys.overridePythonAttrs (_: { + doCheck = false; + }); }; }; diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 2055bfc0fc7f..e39d7b5954c2 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2022-03-12"; + version = "unstable-2022-09-26"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "120c10d4d9ea1ce76db5c1bbd6f5d705b397b57d"; - sha256 = "oXgOvvRoZpueEeWnD3jsc6y5RIAzkXzLeEe7BSErBpw="; + rev = "4778c343ac78a3b3ccdaf079187b53d8cd64e235"; + sha256 = "UyltzT9B+7/hME7famQa/XgrDPaNw3apwchKgxwscOo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/csdr/default.nix b/pkgs/applications/radio/csdr/default.nix index db4efe4b1ef8..5fc3f900da66 100644 --- a/pkgs/applications/radio/csdr/default.nix +++ b/pkgs/applications/radio/csdr/default.nix @@ -23,6 +23,12 @@ stdenv.mkDerivation rec { libsamplerate ]; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/csdr.pc \ + --replace '=''${prefix}//' '=/' \ + --replace '=''${exec_prefix}//' '=/' + ''; + meta = with lib; { broken = stdenv.isDarwin; homepage = "https://github.com/jketterl/csdr"; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 422e665b9372..adf997773ecc 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -40,6 +40,13 @@ in stdenv.mkDerivation { "-DCMAKE_BUILD_TYPE=Release" ] ++ lib.optional usePython "-DUSE_PYTHON_CONFIG=ON"; + # https://github.com/pothosware/SoapySDR/issues/352 + postPatch = '' + substituteInPlace lib/SoapySDR.in.pc \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + postFixup = lib.optionalString (lib.length extraPackages != 0) '' # Join all plugins via symlinking for i in ${toString extraPackages}; do diff --git a/pkgs/applications/science/logic/easycrypt/runtest.nix b/pkgs/applications/science/logic/easycrypt/runtest.nix index 79a034b93693..c0d72d96e1d1 100644 --- a/pkgs/applications/science/logic/easycrypt/runtest.nix +++ b/pkgs/applications/science/logic/easycrypt/runtest.nix @@ -2,6 +2,7 @@ python3Packages.buildPythonApplication rec { inherit (easycrypt) src version; + format = "other"; pname = "easycrypt-runtest"; diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 27d0ffc6fec5..4fd18969a941 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -115,6 +115,22 @@ stdenv.mkDerivation rec { # adapted from https://trac.sagemath.org/ticket/23712#comment:22 ./patches/tachyon-renamed-focallength.patch + + # https://trac.sagemath.org/ticket/34118 + (fetchSageDiff { + name = "sympy-1.11-upgrade.patch"; + base = "9.7"; + rev = "52815744bde2b682245b6f985a112f7cb8666056"; + sha256 = "sha256-gv6z6JkQ6S6oCJQNkVgcPVvzlplyvR1nC7pWmcUiSc0="; + }) + + # https://trac.sagemath.org/ticket/34460 + (fetchSageDiff { + name = "ipywidgets-8-upgrade.patch"; + base = "9.7"; + rev = "2816dbacb342398a23bb3099e20c92c8020ab0fa"; + sha256 = "sha256-tCOsMxXwPkRg3FJGVvTqDzlWdra78UfDY6nci0Nr9GI="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index b4e0a35184a8..457b571be922 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -195,5 +195,9 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ maintainers.veprbl ]; license = licenses.lgpl21; + + # See https://github.com/NixOS/nixpkgs/pull/192581#issuecomment-1256860426 + # for some context on issues on aarch64. + broken = stdenv.isAarch64; }; } diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index bababa50c59e..125283589aef 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -63,6 +63,12 @@ in stdenv.mkDerivation rec { ] ) ++ lib.optional enableCuda "-DGMX_GPU=CUDA"; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/*.pc \ + --replace '=''${prefix}//' '=/' \ + --replace "$out/$out/" "$out/" + ''; + meta = with lib; { homepage = "http://www.gromacs.org"; license = licenses.gpl2; diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 32d1286ab1b3..2b145717fb38 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -54,16 +54,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.10.1"; + version = "0.11.0-rc2"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-Q/ulRgU6zNLRZUjL83O/Krx85voPWZPZDo65CLp/aOg="; + hash = "sha256-svo7DIPgNQy+MkIrRtRQjKQ2ND0CRfofSCiXJqoWby0="; }; - cargoSha256 = "sha256-S1V8hDuzp4sf6945gqs8QNVdu8jwPGVYjVbV6EY28Hk="; + cargoSha256 = "sha256-ClAW7WjnDs4Peu+UqcOwtuDDkWYWACMQU5p39CiIFm0="; nativeBuildInputs = [ cmake @@ -101,7 +101,7 @@ rustPlatform.buildRustPackage rec { ln -s $out/bin $out/Applications/Alacritty.app/Contents/MacOS '' else '' install -D extra/linux/Alacritty.desktop -t $out/share/applications/ - install -D extra/linux/io.alacritty.Alacritty.appdata.xml -t $out/share/appdata/ + install -D extra/linux/org.alacritty.Alacritty.appdata.xml -t $out/share/appdata/ install -D extra/logo/compat/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg # patchelf generates an ELF that binutils' "strip" doesn't like: diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index ebf7883e3657..c63c3e6bf492 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -7,6 +7,7 @@ , pkg-config , python3 , fontconfig +, installShellFiles , openssl , libGL , libX11 @@ -49,9 +50,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-XJAeMDwtLtBzHMU/cb3lZgmcw5F3ifjKzKVmuP85/RY="; nativeBuildInputs = [ + installShellFiles + ncurses # tic for terminfo pkg-config python3 - ncurses # tic for terminfo ] ++ lib.optional stdenv.isDarwin perl; buildInputs = [ @@ -75,17 +77,23 @@ rustPlatform.buildRustPackage rec { UserNotifications ]; + buildFeatures = [ "distro-defaults" ]; + postInstall = '' mkdir -p $out/nix-support echo "${passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages - # desktop icon install -Dm644 assets/icon/terminal.png $out/share/icons/hicolor/128x128/apps/org.wezfurlong.wezterm.png install -Dm644 assets/wezterm.desktop $out/share/applications/org.wezfurlong.wezterm.desktop install -Dm644 assets/wezterm.appdata.xml $out/share/metainfo/org.wezfurlong.wezterm.appdata.xml - # helper scripts install -Dm644 assets/shell-integration/wezterm.sh -t $out/etc/profile.d + installShellCompletion --cmd wezterm \ + --bash assets/shell-completion/bash \ + --fish assets/shell-completion/fish \ + --zsh assets/shell-completion/zsh + + install -Dm644 assets/wezterm-nautilus.py -t $out/share/nautilus-python/extensions ''; preFixup = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 20cc283af989..95327f31ddcd 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -28,7 +28,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.37.2"; + version = "2.37.3"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "sha256-HD2cghxFOOem2sMKSvi9jc/k9lH5VHTFJrUvg0BtsAM="; + sha256 = "sha256-gUZB1/YWWc+8F4JdBGJJnKFAPjn/U9dqhRIFDmSD6Ho="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 1ed773bd65b4..b5bdecd85ad1 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-TsJr2Riygz/DZrn6UZMPvq1tTfvl3dFEZZNq2wVj1Nw="; }; - nativeBuildInputs = [ installShellFiles asciidoc xmlto docbook_xsl docbook_xml_dtd_45 ]; + nativeBuildInputs = [ installShellFiles asciidoc xmlto docbook_xsl docbook_xml_dtd_45 python3Packages.setuptools ]; format = "other"; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 8ba5d6df7417..36fa987b8463 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "15.4.0", - "repo_hash": "sha256-AONzkIZbrOJkxGUYAunoWTc9xuCykKr4YkYeQQxRW8A=", + "version": "15.4.1", + "repo_hash": "sha256-z4J0ia9WxL+tJnoYNBtb6ZMuqGHiyhQ0tc0L8kzj26w=", "yarn_hash": "1r33qrvwf2wmq5c1d2awk9qhk9nzvafqn3drdvnczfv43sda4lg8", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.4.0-ee", + "rev": "v15.4.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.4.0", + "GITALY_SERVER_VERSION": "15.4.1", "GITLAB_PAGES_VERSION": "1.62.0", "GITLAB_SHELL_VERSION": "14.10.0", - "GITLAB_WORKHORSE_VERSION": "15.4.0" + "GITLAB_WORKHORSE_VERSION": "15.4.1" }, "vendored_gems": [ "bundler-checksum", diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 718deffbaa76..390581fe4472 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.4.0"; + version = "15.4.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,7 +22,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-cESZfLlwyC6khUrvS0LGfkvzCLudjFmlGXculYLrcDM="; + sha256 = "sha256-7f4TxCI/k2yirQxYI8i/6PXGVDs4x4ncIou1qH0TKAc="; }; vendorSha256 = "sha256-CUFYHjmOfosM3mfw0qEY+AQcR8U3J/1lU2Ml6wSZ/QM="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 31b0cf680034..cf58ee92860a 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.4.0"; + version = "15.4.1"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index b8f9a0f1522a..1655ad28aaf9 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -1,5 +1,6 @@ { lib , fetchFromSourcehut +, fetchpatch , buildGoModule , buildPythonPackage , srht @@ -12,27 +13,36 @@ , unzip }: let - version = "0.81.0"; + version = "0.82.8"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "builds.sr.ht"; rev = version; - sha256 = "sha256-oUSzanRFZ2dQTgm/VuNhqUaUAPq7ffxR7OtBKtE61DE="; + hash = "sha256-M94zkEUJU8EwksN34sd5IkASDCQ0hHb98G5wzZsCrpg="; }; buildsrht-api = buildGoModule ({ inherit src version; pname = "buildsrht-api"; modRoot = "api"; - vendorSha256 = "sha256-roTwqtg4Y846PNtLdRN/LV3Jd0LVElqjFy3DJcrwoaI="; + vendorHash = "sha256-8z5m4bMwLeYg4i91MMjLMqbciWvqS0icCHFUJTUHBgk="; } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); buildsrht-worker = buildGoModule { inherit src version; sourceRoot = "source/worker"; pname = "buildsrht-worker"; - vendorSha256 = "sha256-Pf1M9a43eK4jr6QMi6kRHA8DodXQU0pqq9ua5VC3ER0="; + vendorHash = "sha256-y5RFPbtaGmgPpiV2Q3njeWORGZF1TJRjAbY6VgC1hek="; + + patches = [ + (fetchpatch { + name = "update-x-sys-for-go-1.18-on-aarch64-darwin.patch"; + url = "https://git.sr.ht/~sircmpwn/builds.sr.ht/commit/f58bbde6bfed7d2321a3b17e991c91fc83d4c230.patch"; + stripLen = 1; + hash = "sha256-vQR/T5G5Gz5tY+SEZZabsbnFKW44b+Bs+GDdydyeCDs="; + }) + ]; }; in buildPythonPackage rec { diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 72b8de44ada9..d4f75e7d9301 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -101,6 +101,8 @@ in stdenv.mkDerivation rec { NIX_LDFLAGS = lib.optionalString x11Support "-lX11 -lXext " + lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; + # These flags are not supported and cause the build + # to fail, even when cross compilation itself works. dontAddWafCrossFlags = true; wafConfigureFlags = [ diff --git a/pkgs/applications/window-managers/fvwm/3.nix b/pkgs/applications/window-managers/fvwm/3.nix index e68f93bf836c..5c2cc999f45e 100644 --- a/pkgs/applications/window-managers/fvwm/3.nix +++ b/pkgs/applications/window-managers/fvwm/3.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fvwm3"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "fvwmorg"; repo = "fvwm3"; rev = finalAttrs.version; - hash = "sha256-ByMSX4nwXkp+ly39C2+cYy3e9B0vnGcJlyIiS7V6zoI="; + hash = "sha256-/2Ssl/sgKCXbUCtKj2WIcvEC3B16h5/1Jp87AggKxJo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 5c2db7d47a53..9a6fc5959548 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms -, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev +, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre2, libev , yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon , xorgserver, xvfb-run , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "i3"; - version = "4.20.1"; + version = "4.21"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "1rpwdgykcvmrmdz244f0wm7446ih1dcw8rlc1hm1c7cc42pyrq93"; + sha256 = "sha256-jcUgXg80Q9WGYeMHg1If2cbUJtHn82Z6sS8qwbLTIHg="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon - libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango + libstartup_notification libX11 pcre2 libev yajl xcb-util-cursor perl pango perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.ExtUtilsPkgConfig perlPackages.InlineC xorgserver xvfb-run diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index faa325023f9f..64d863e8047f 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -2,13 +2,13 @@ i3.overrideAttrs (oldAttrs : rec { pname = "i3-gaps"; - version = "4.20.1"; + version = "4.21"; src = fetchFromGitHub { owner = "Airblader"; repo = "i3"; rev = version; - sha256 = "sha256-aS1dLs8KxoJaTf3RlQX+zRrtNmHEFZgkXDjt+8SuGDw="; + sha256 = "sha256-douSRvnyDbi2gDJfu9VZmmTyYfy+FrFWHgyAyPyBWdM="; }; meta = with lib; { diff --git a/pkgs/applications/window-managers/i3/rounded.nix b/pkgs/applications/window-managers/i3/rounded.nix index 6ab3c29387f5..aa3701975fcc 100644 --- a/pkgs/applications/window-managers/i3/rounded.nix +++ b/pkgs/applications/window-managers/i3/rounded.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, i3 }: +{ fetchFromGitHub, lib, i3, pcre }: i3.overrideAttrs (oldAttrs: rec { pname = "i3-rounded"; @@ -11,6 +11,8 @@ i3.overrideAttrs (oldAttrs: rec { sha256 = "0y7m1s1y8f9vgkp7byi33js8n4rigiykd71s936i5d4rwlzrxiwm"; }; + buildInputs = oldAttrs.buildInputs ++ [ pcre ]; + meta = with lib; { description = "A fork of i3-gaps that adds rounding to window corners"; homepage = "https://github.com/LinoBigatti/i3-rounded"; diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix index d0055ef63653..e077254b70f4 100644 --- a/pkgs/applications/window-managers/i3/wk-switch.nix +++ b/pkgs/applications/window-managers/i3/wk-switch.nix @@ -3,6 +3,7 @@ python3Packages.buildPythonApplication rec { pname = "i3-wk-switch"; version = "2020-03-18"; + format = "other"; src = fetchFromGitHub { owner = "tmfink"; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index ec6bd7855972..14cd1d431391 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -251,19 +251,12 @@ stdenv.mkDerivation { wrap ${targetPrefix}gdc $wrapper $ccPath/${targetPrefix}gdc '' - + optionalString cc.langFortran or false ('' + + optionalString cc.langFortran or false '' wrap ${targetPrefix}gfortran $wrapper $ccPath/${targetPrefix}gfortran ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}g77 ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}f77 export named_fc=${targetPrefix}gfortran '' - # Darwin aarch64 fortran compilations seem to fail otherwise, see: - # https://github.com/NixOS/nixpkgs/issues/140041 - + (if (stdenvNoCC.isDarwin && stdenvNoCC.isAarch64) then '' - export fortran_hardening="pic strictoverflow relro bindnow" - '' else '' - export fortran_hardening="pic strictoverflow relro bindnow stackprotector" - '')) + optionalString cc.langJava or false '' wrap ${targetPrefix}gcj $wrapper $ccPath/${targetPrefix}gcj diff --git a/pkgs/build-support/cc-wrapper/fortran-hook.sh b/pkgs/build-support/cc-wrapper/fortran-hook.sh index 59e493e1836d..d72f314c01ce 100644 --- a/pkgs/build-support/cc-wrapper/fortran-hook.sh +++ b/pkgs/build-support/cc-wrapper/fortran-hook.sh @@ -5,7 +5,7 @@ export FC${role_post}=@named_fc@ # If unset, assume the default hardening flags. # These are different for fortran. -: ${NIX_HARDENING_ENABLE="@fortran_hardening@"} +: ${NIX_HARDENING_ENABLE="stackprotector pic strictoverflow relro bindnow"} export NIX_HARDENING_ENABLE unset -v role_post diff --git a/pkgs/build-support/remove-references-to/remove-references-to.sh b/pkgs/build-support/remove-references-to/remove-references-to.sh old mode 100644 new mode 100755 index d8d38dbd80a9..f1b5dde5f073 --- a/pkgs/build-support/remove-references-to/remove-references-to.sh +++ b/pkgs/build-support/remove-references-to/remove-references-to.sh @@ -27,7 +27,7 @@ for i in "$@"; do done for target in "${targets[@]}" ; do - sed -i -e "s|@storeDir@/$target-|@storeDir@/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" "${regions[@]}" + sed -i -e "s|$target|eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee|g" "${regions[@]}" done for region in "${regions[@]}"; do diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix index 020352836c89..7244d3d38575 100644 --- a/pkgs/build-support/testers/default.nix +++ b/pkgs/build-support/testers/default.nix @@ -67,6 +67,6 @@ else test; calledTest = lib.toFunction loadedTest pkgs; in - nixosTesting.makeTest calledTest; + nixosTesting.simpleTest calledTest; } diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 557243e2be5f..0f0d8518e926 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -49,7 +49,6 @@ , vte , glib-networking , qemu-utils -, qemu }: stdenv.mkDerivation rec { @@ -126,7 +125,7 @@ stdenv.mkDerivation rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio qemu-utils qemu ]}") + gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio qemu-utils ]}") ''; postPatch = '' diff --git a/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/pkgs/desktops/gnome/apps/gnome-characters/default.nix index b43e0cdecadf..b4e9eee9712f 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -29,6 +30,13 @@ stdenv.mkDerivation rec { sha256 = "XaD/uBb4prRPMDdEyoJ6NAgBGMHJONjXmvF7f+Z5gPg="; }; + patches = [ + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-characters/-/commit/3e28a6ad668e2239b14f2e05bc477ec1bfb210ba.patch"; + sha256 = "sha256-2N4eewknhOXBABs6BPA5/YuqZMT8dyXW857iamrrtuA="; + }) + ]; + nativeBuildInputs = [ gettext gobject-introspection diff --git a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index 3c57c6272e84..2700f769b083 100644 --- a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -45,6 +45,9 @@ stdenv.mkDerivation rec { desktop-file-utils libxml2 gobject-introspection # for finding vapi files + # error: Package `...' not found in specified Vala API directories or GObject-Introspection GIR directories + # TODO: the vala setuphook should look for vala filess in targetOffset instead of hostOffset + gsound ]; buildInputs = [ diff --git a/pkgs/desktops/gnome/apps/gnome-logs/default.nix b/pkgs/desktops/gnome/apps/gnome-logs/default.nix index 16d487867b8f..105194123d00 100644 --- a/pkgs/desktops/gnome/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-logs/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -29,6 +30,19 @@ stdenv.mkDerivation rec { sha256 = "TV5FFp1r9DkC16npoHk8kW65LaumuoWzXI629nLNq9c="; }; + patches = [ + # meson: Remove redundant check for glib-mkenums + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/01386ce9a69652a00bdb163e569b51150ca8903e.diff"; + sha256 = "sha256-tJJEai4Jw8aVcyhsFTYILiUV1xhsysX/rleeLP13DVM="; + }) + # meson: remove redundant check for pkg-config + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/ad350729a8b81f2c8eb2122de0956bb2199b48da.patch"; + sha256 = "sha256-5qGYyKM+B9XNZKytWH8K4QfSuBf7wpaPCWT6YIO5FGY="; + }) + ]; + nativeBuildInputs = [ python3 meson @@ -41,6 +55,7 @@ stdenv.mkDerivation rec { libxslt docbook_xsl docbook_xml_dtd_43 + glib ]; buildInputs = [ diff --git a/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix index b7921322d994..c04cd6f2dc96 100644 --- a/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -31,13 +31,14 @@ stdenv.mkDerivation rec { ninja wrapGAppsHook python3 + gobject-introspection + gjs ]; buildInputs = [ gtk4 libadwaita gjs - gobject-introspection libgweather gnome.adwaita-icon-theme geoclue2 diff --git a/pkgs/desktops/gnome/apps/seahorse/default.nix b/pkgs/desktops/gnome/apps/seahorse/default.nix index 60b1e2d572ed..07e39248bb70 100644 --- a/pkgs/desktops/gnome/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome/apps/seahorse/default.nix @@ -42,6 +42,13 @@ stdenv.mkDerivation rec { itstool wrapGAppsHook python3 + openssh + gnupg + gcr + # error: Package `...' not found in specified Vala API directories or GObject-Introspection GIR directories + # TODO: the vala setuphook should look for vala filess in targetOffset instead of hostOffset + libhandy + libsecret ]; buildInputs = [ @@ -50,13 +57,11 @@ stdenv.mkDerivation rec { glib-networking gcr gsettings-desktop-schemas - gnupg gpgme libsecret avahi libsoup p11-kit - openssh openldap libpwquality libhandy diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix index 990f1bef2119..cf435b1e9ea3 100644 --- a/pkgs/desktops/gnome/core/gdm/default.nix +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -73,13 +73,13 @@ stdenv.mkDerivation rec { pkg-config python3 rsync + gobject-introspection ]; buildInputs = [ accountsservice audit glib - gobject-introspection gtk3 keyutils libX11 diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix index 678895ffbb50..8b6eb8c4f1bb 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -3,6 +3,7 @@ , fetchurl , gnome , meson +, mesonEmulatorHook , ninja , pkg-config , gtk4 @@ -49,6 +50,8 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_43 python3 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix index 397f0b9838f1..64eb22b186d6 100644 --- a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { gettext wrapGAppsHook4 libxml2 + glib ]; buildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 0d8e87b3642d..c60e06ea640a 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # Fixup adapted from export-zips.sh in the source. extensiondir=$out/share/gnome-shell/extensions - schemadir=${glib.makeSchemaPath "$out" "${pname}-${version}"} + schemadir=${glib.makeSchemaPath "$out" "$name"} glib-compile-schemas $schemadir diff --git a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix index aad4744935be..cbce4ad8b05c 100644 --- a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { wrapGAppsHook meson ninja + glib ]; buildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix index 53f775833a8f..c7f70c76b2b3 100644 --- a/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix +++ b/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ pkg-config intltool ]; + nativeBuildInputs = [ pkg-config intltool gtk3 ]; buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf ]; propagatedBuildInputs = [ gnome.adwaita-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/desktops/gnome/core/gnome-tour/default.nix b/pkgs/desktops/gnome/core/gnome-tour/default.nix index cbb33c2b2308..a26dcfa0a7b0 100644 --- a/pkgs/desktops/gnome/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome/core/gnome-tour/default.nix @@ -17,6 +17,8 @@ , libadwaita , librsvg , rustc +, rust +, writeText , cargo }: @@ -31,6 +33,10 @@ stdenv.mkDerivation rec { cargoVendorDir = "vendor"; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ appstream-glib cargo @@ -54,6 +60,16 @@ stdenv.mkDerivation rec { librsvg ]; + mesonFlags = + let + # ERROR: 'rust' compiler binary not defined in cross or native file + crossFile = writeText "cross-file.conf" '' + [binaries] + rust = [ 'rustc', '--target', '${rust.toRustTargetSpec stdenv.hostPlatform}' ] + ''; + in + lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ]; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index f72394a09825..d543cf11c359 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , mkDerivation +, fetchpatch , fetchFromGitHub , cmake , pkg-config @@ -22,6 +23,15 @@ mkDerivation rec { sha256 = "vzppKTDwADBG5pOaluT858cWCKFFRaSbHz2Qhe6799E="; }; + patches = [ + # in master post 0.11.0, see https://github.com/lxqt/lxqt-build-tools/pull/76 + (fetchpatch { + name = "fix-pkg-config.patch"; + url = "https://github.com/lxqt/lxqt-build-tools/pull/76/commits/fa9672b671ede3f46b004f81580f9afb50fedf00.patch"; + sha256 = "0dl7n1afcc6ky9vd9lpc65p9grpszpql7lfjq2vlzlilixnv8xv1"; + }) + ]; + postPatch = '' # Nix clang on darwin identifies as 'Clang', not 'AppleClang' # Without this, dependants fail to link. diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py index 6c60fc5c490d..1d030e3f1d26 100755 --- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py +++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py @@ -6,6 +6,7 @@ import re import requests import sys +# openjdk15 is only for bootstrapping openjdk releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16", "openjdk17") oses = ("mac", "linux") types = ("jre", "jdk") @@ -21,7 +22,7 @@ arch_to_nixos = { def get_sha256(url): resp = requests.get(url) if resp.status_code != 200: - print("error: could not fetch checksum from url {}: code {}".format(url, resp.code), file=sys.stderr) + print("error: could not fetch checksum from url {}: code {}".format(url, resp.status_code), file=sys.stderr) sys.exit(1) return resp.text.strip().split(" ")[0] diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index 4ef422c850ed..10ce704382a7 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -63,11 +63,9 @@ let majorVersion = "12"; ../gcc-12-gfortran-driving.patch ../ppc-musl.patch ] ++ optional (stdenv.isDarwin && stdenv.isAarch64) (fetchpatch { - # TODO: switch back to Homebrew patches: - # was "https://github.com/Homebrew/formula-patches/raw/76677f2b/gcc/gcc-12.1.0-arm.diff" name = "gcc-12-darwin-aarch64-support.patch"; - url = "https://github.com/tjni/gcc-12-branch/compare/releases/gcc-12.2...gcc-12-2-darwin.diff"; - sha256 = "sha256-hjM9q6tsdzoGOQWJ7v3BaeVxdWQGTaEnep2ZSwX5+74="; + url = "https://github.com/Homebrew/formula-patches/raw/1d184289/gcc/gcc-12.2.0-arm.diff"; + sha256 = "sha256-omclLslGi/2yCV4pNBMaIpPDMW3tcz/RXdupbNbeOHA="; }) ++ optional langD ../libphobos.patch diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index 0da4b60a3ed6..1dd303170936 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "1.3.224.0"; + version = "1.3.224.1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = "sdk-${version}"; - hash = "sha256-+NKp/4e3iruAcTunpxksvCHxoVYmPd0kFI8JDJJUVg4="; + hash = "sha256-VEOENuy/VhYBBX52O4QHJFXUjsj6jL4vDD4cLDlQcIA="; }; # These get set at all-packages, keep onto them for child drvs @@ -36,6 +36,12 @@ stdenv.mkDerivation rec { mkdir $out/include/External ''; + # Fix the paths in .pc, even though it's unclear if these .pc are really useful. + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/SPIRV-Tools{,-shared}.pc \ + --replace '=''${prefix}//' '=/' + ''; + meta = with lib; { inherit (src.meta) homepage; description = "Khronos reference front-end for GLSL and ESSL"; diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index 7b208da59882..c3ec8ceac009 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -45,11 +45,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.18.5"; + version = "1.18.6"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - sha256 = "sha256-mSDTMGoaxTbN0seW1ss8VLxVnCJvw8w5wy8eC9f1DSo="; + sha256 = "sha256-p/HVBCQ1XavOZtERKxyuQ5tu5eTxXtum8QTApLFz6JU="; }; strictDeps = true; diff --git a/pkgs/development/compilers/llvm/10/llvm/default.nix b/pkgs/development/compilers/llvm/10/llvm/default.nix index bb1b90b36a92..78b0adcaadfb 100644 --- a/pkgs/development/compilers/llvm/10/llvm/default.nix +++ b/pkgs/development/compilers/llvm/10/llvm/default.nix @@ -151,6 +151,13 @@ in stdenv.mkDerivation (rec { done ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ diff --git a/pkgs/development/compilers/llvm/11/llvm/default.nix b/pkgs/development/compilers/llvm/11/llvm/default.nix index a038795a4df1..1623d06c7f7a 100644 --- a/pkgs/development/compilers/llvm/11/llvm/default.nix +++ b/pkgs/development/compilers/llvm/11/llvm/default.nix @@ -150,6 +150,13 @@ in stdenv.mkDerivation (rec { done ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ diff --git a/pkgs/development/compilers/llvm/12/llvm/default.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix index 435744b073f7..d330b7387595 100644 --- a/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -140,6 +140,13 @@ in stdenv.mkDerivation (rec { done ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ diff --git a/pkgs/development/compilers/llvm/13/llvm/default.nix b/pkgs/development/compilers/llvm/13/llvm/default.nix index 6372655b7ed4..5b8ec69853f2 100644 --- a/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -102,6 +102,13 @@ in stdenv.mkDerivation (rec { patchShebangs test/BugPoint/compile-custom.ll.py ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ diff --git a/pkgs/development/compilers/llvm/14/llvm/default.nix b/pkgs/development/compilers/llvm/14/llvm/default.nix index 47d6ee8ab1fe..673cd31460e8 100644 --- a/pkgs/development/compilers/llvm/14/llvm/default.nix +++ b/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -113,6 +113,13 @@ in stdenv.mkDerivation (rec { patchShebangs test/BugPoint/compile-custom.ll.py ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ diff --git a/pkgs/development/compilers/llvm/5/llvm/default.nix b/pkgs/development/compilers/llvm/5/llvm/default.nix index cf668cd566a6..a4d04f0618c7 100644 --- a/pkgs/development/compilers/llvm/5/llvm/default.nix +++ b/pkgs/development/compilers/llvm/5/llvm/default.nix @@ -125,6 +125,13 @@ stdenv.mkDerivation (rec { done ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ diff --git a/pkgs/development/compilers/llvm/6/llvm/default.nix b/pkgs/development/compilers/llvm/6/llvm/default.nix index 61f9234274d3..d18bf2149e1d 100644 --- a/pkgs/development/compilers/llvm/6/llvm/default.nix +++ b/pkgs/development/compilers/llvm/6/llvm/default.nix @@ -120,6 +120,13 @@ stdenv.mkDerivation (rec { done ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ diff --git a/pkgs/development/compilers/llvm/7/llvm/default.nix b/pkgs/development/compilers/llvm/7/llvm/default.nix index b324e1a0e4d6..1aa85f543ea2 100644 --- a/pkgs/development/compilers/llvm/7/llvm/default.nix +++ b/pkgs/development/compilers/llvm/7/llvm/default.nix @@ -139,6 +139,13 @@ in stdenv.mkDerivation (rec { done ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ diff --git a/pkgs/development/compilers/llvm/8/llvm/default.nix b/pkgs/development/compilers/llvm/8/llvm/default.nix index efd1707eb337..3e01c7ac9ca1 100644 --- a/pkgs/development/compilers/llvm/8/llvm/default.nix +++ b/pkgs/development/compilers/llvm/8/llvm/default.nix @@ -133,6 +133,13 @@ in stdenv.mkDerivation (rec { done ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ diff --git a/pkgs/development/compilers/llvm/9/llvm/default.nix b/pkgs/development/compilers/llvm/9/llvm/default.nix index 1dd1455ed6d6..6c0a37cadd90 100644 --- a/pkgs/development/compilers/llvm/9/llvm/default.nix +++ b/pkgs/development/compilers/llvm/9/llvm/default.nix @@ -148,6 +148,13 @@ in stdenv.mkDerivation (rec { done ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index fe6d650cdcd5..656c226574a4 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -99,6 +99,13 @@ in stdenv.mkDerivation (rec { patchShebangs test/BugPoint/compile-custom.ll.py ''; + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' + ) + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 3accbf63abe3..0fbb0eff2382 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -67,6 +67,11 @@ in stdenv.mkDerivation rec { zlib ]; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/*.pc \ + --replace '=''${exec_prefix}//' '=/' + ''; + meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64); description = "Advanced shading language for production GI renderers"; diff --git a/pkgs/development/compilers/p4c/default.nix b/pkgs/development/compilers/p4c/default.nix index 816960bc9c0d..dac9011f575a 100644 --- a/pkgs/development/compilers/p4c/default.nix +++ b/pkgs/development/compilers/p4c/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "-DENABLE_DOCS=${toCMakeBoolean enableDocumentation}" "-DENABLE_GC=ON" "-DENABLE_GTESTS=${toCMakeBoolean enableGTests}" - "-DENABLE_PROTOBUF_STATIC=ON" + "-DENABLE_PROTOBUF_STATIC=OFF" # static protobuf has been removed since 3.21.6 "-DENABLE_MULTITHREAD=${toCMakeBoolean enableMultithreading}" "-DENABLE_GMP=ON" ]; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 5fd374160746..bb5bc1bb1d73 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -107,9 +107,6 @@ in stdenv.mkDerivation rec { "${setHost}.musl-root=${pkgsBuildHost.targetPackages.stdenv.cc.libc}" ] ++ optionals stdenv.targetPlatform.isMusl [ "${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}" - ] ++ optionals (stdenv.isDarwin && stdenv.isx86_64) [ - # https://github.com/rust-lang/rust/issues/92173 - "--set rust.jemalloc" ]; # The bootstrap.py will generated a Makefile that then executes the build. diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix index b07a91599332..210daae37459 100644 --- a/pkgs/development/compilers/seexpr/default.nix +++ b/pkgs/development/compilers/seexpr/default.nix @@ -31,6 +31,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU libpng zlib qt4 python3Packages.pyqt4 python3Packages.boost bison flex ]; + # https://github.com/wdas/SeExpr/issues/106 + postPatch = '' + substituteInPlace src/build/seexpr2.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + meta = with lib; { description = "Embeddable expression evaluation engine from Disney Animation"; homepage = "https://wdas.github.io/SeExpr/"; diff --git a/pkgs/development/compilers/semeru-bin/generate-sources.py b/pkgs/development/compilers/semeru-bin/generate-sources.py new file mode 100755 index 000000000000..da23559955d9 --- /dev/null +++ b/pkgs/development/compilers/semeru-bin/generate-sources.py @@ -0,0 +1,85 @@ +#!/usr/bin/env nix-shell +#!nix-shell --pure -i python3 -p "python3.withPackages (ps: with ps; [ requests ])" + +import json +import re +import requests +import sys + +feature_versions = (8, 11, 16, 17) +oses = ("mac", "linux") +types = ("jre", "jdk") +impls = ("openj9") + +arch_to_nixos = { + "x64": ("x86_64",), + "aarch64": ("aarch64",), + "arm": ("armv6l", "armv7l"), +} + +def get_sha256(url): + resp = requests.get(url) + if resp.status_code != 200: + print("error: could not fetch checksum from url {}: code {}".format(url, resp.status_code), file=sys.stderr) + sys.exit(1) + return resp.text.strip().split(" ")[0] + +def generate_sources(releases, feature_version, out): + latest_version = None + for release in releases: + if release["prerelease"]: continue + if not re.search("_openj9-", release["name"]): continue + + for asset in release["assets"]: + match = re.match("ibm-semeru-open-(?P[a-z]*)_(?P[a-z0-9]*)_(?P[a-z]*)_(?:(?P[0-9]*)u(?P[0-9]*)b(?P[0-9]*)|(?P[0-9]*)\\.(?P[0-9]*)\\.(?P[0-9]*)_(?P[0-9]*))_(?P[a-z0-9]*)-[0-9]*\\.[0-9]*\\.[0-9]\\.tar\\.gz$", asset["name"]) + + if not match: continue + if match["os"] not in oses: continue + if match["image_type"] not in types: continue + if match["jvm_impl"] not in impls: continue + if match["architecture"] not in arch_to_nixos: continue + + version = ".".join([ + match["major1"] or match["major2"], + match["minor2"] or "0", + match["security1"] or match["security2"] + ]) + build = match["build1"] or match["build2"] + + if latest_version and latest_version != (version, build): continue + latest_version = (version, build) + + arch_map = ( + out + .setdefault(match["jvm_impl"], {}) + .setdefault(match["os"], {}) + .setdefault(match["image_type"], {}) + .setdefault(feature_version, { + "packageType": match["image_type"], + "vmType": match["jvm_impl"], + }) + ) + + for nixos_arch in arch_to_nixos[match["architecture"]]: + arch_map[nixos_arch] = { + "url": asset["browser_download_url"], + "sha256": get_sha256(asset["browser_download_url"] + ".sha256.txt"), + "version": version, + "build": build, + } + + return out + + +out = {} +for feature_version in feature_versions: + resp = requests.get(f"https://api.github.com/repos/ibmruntimes/semeru{feature_version}-binaries/releases") + + if resp.status_code != 200: + print("error: could not fetch data for release {} (code {}) {}".format(feature_version, resp.status_code, resp.content), file=sys.stderr) + sys.exit(1) + generate_sources(resp.json(), f"openjdk{feature_version}", out) + +with open("sources.json", "w") as f: + json.dump(out, f, indent=2, sort_keys=True) + f.write('\n') diff --git a/pkgs/development/compilers/semeru-bin/jdk-darwin-base.nix b/pkgs/development/compilers/semeru-bin/jdk-darwin-base.nix new file mode 100644 index 000000000000..ccbc7d871e8a --- /dev/null +++ b/pkgs/development/compilers/semeru-bin/jdk-darwin-base.nix @@ -0,0 +1,5 @@ +args: +import ../temurin-bin/jdk-darwin-base.nix ({ + name-prefix = "semeru"; + brand-name = "IBM Semeru Runtime"; +} // args) diff --git a/pkgs/development/compilers/semeru-bin/jdk-darwin.nix b/pkgs/development/compilers/semeru-bin/jdk-darwin.nix new file mode 100644 index 000000000000..f58fec3a84c0 --- /dev/null +++ b/pkgs/development/compilers/semeru-bin/jdk-darwin.nix @@ -0,0 +1,16 @@ +{ lib, callPackage }: + +let + sources = (lib.importJSON ./sources.json).openj9.mac; + common = opts: callPackage (import ./jdk-darwin-base.nix opts) {}; +in +{ + jdk-8 = common { sourcePerArch = sources.jdk.openjdk8; }; + jre-8 = common { sourcePerArch = sources.jre.openjdk8; }; + jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; + jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; + jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; }; + jre-16 = common { sourcePerArch = sources.jre.openjdk16; }; + jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; + jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; +} diff --git a/pkgs/development/compilers/semeru-bin/jdk-linux-base.nix b/pkgs/development/compilers/semeru-bin/jdk-linux-base.nix new file mode 100644 index 000000000000..41879ea88681 --- /dev/null +++ b/pkgs/development/compilers/semeru-bin/jdk-linux-base.nix @@ -0,0 +1,5 @@ +args: +import ../temurin-bin/jdk-linux-base.nix ({ + name-prefix = "semeru"; + brand-name = "IBM Semeru Runtime"; +} // args) diff --git a/pkgs/development/compilers/semeru-bin/jdk-linux.nix b/pkgs/development/compilers/semeru-bin/jdk-linux.nix new file mode 100644 index 000000000000..c80dd991bf04 --- /dev/null +++ b/pkgs/development/compilers/semeru-bin/jdk-linux.nix @@ -0,0 +1,16 @@ +{ lib, callPackage }: + +let + sources = (lib.importJSON ./sources.json).openj9.linux; + common = opts: callPackage (import ./jdk-linux-base.nix opts) {}; +in +{ + jdk-8 = common { sourcePerArch = sources.jdk.openjdk8; }; + jre-8 = common { sourcePerArch = sources.jre.openjdk8; }; + jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; + jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; + jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; }; + jre-16 = common { sourcePerArch = sources.jre.openjdk16; }; + jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; + jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; +} diff --git a/pkgs/development/compilers/semeru-bin/sources.json b/pkgs/development/compilers/semeru-bin/sources.json new file mode 100644 index 000000000000..5e04fa90af74 --- /dev/null +++ b/pkgs/development/compilers/semeru-bin/sources.json @@ -0,0 +1,248 @@ +{ + "openj9": { + "linux": { + "jdk": { + "openjdk11": { + "aarch64": { + "build": "8", + "sha256": "488739171f84e3949df6ccb1c40eaf1b73541748b123d88780329648d6b383d0", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jdk_aarch64_linux_11.0.16_8_openj9-0.33.0.tar.gz", + "version": "11.0.16" + }, + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "8", + "sha256": "eeca01d4e245a001d01663c5c20a8d50ef3d572b47a9b3689a5154f2a37bf005", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jdk_x64_linux_11.0.16_8_openj9-0.33.0.tar.gz", + "version": "11.0.16" + } + }, + "openjdk16": { + "aarch64": { + "build": "7", + "sha256": "022cda1210331488c3db3d0d1282ea74467397fdabc34cb482cdfe81c45f6a15", + "url": "https://github.com/ibmruntimes/semeru16-binaries/releases/download/jdk-16.0.2%2B7_openj9-0.27.0/ibm-semeru-open-jdk_aarch64_linux_16.0.2_7_openj9-0.27.0.tar.gz", + "version": "16.0.2" + }, + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "7", + "sha256": "1349eb9a1d9af491a1984d66a80126730357c4a5c4fcbe7112a2c832f6c0886e", + "url": "https://github.com/ibmruntimes/semeru16-binaries/releases/download/jdk-16.0.2%2B7_openj9-0.27.0/ibm-semeru-open-jdk_x64_linux_16.0.2_7_openj9-0.27.0.tar.gz", + "version": "16.0.2" + } + }, + "openjdk17": { + "aarch64": { + "build": "8", + "sha256": "18d291411ee4a956018b4dcefe436971e73694128782617f1b44beca991956c5", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jdk_aarch64_linux_17.0.4_8_openj9-0.33.0.tar.gz", + "version": "17.0.4" + }, + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "8", + "sha256": "78ae15d9e01fce3a473f4d6a90c331fb766211b950931088c2a85590f178ad39", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jdk_x64_linux_17.0.4_8_openj9-0.33.0.tar.gz", + "version": "17.0.4" + } + }, + "openjdk8": { + "aarch64": { + "build": "01", + "sha256": "6b89e648899709459b7c7dbe0a5b1ea480a88da84c6163f01255d638dbdd051b", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jdk_aarch64_linux_8u345b01_openj9-0.33.0.tar.gz", + "version": "8.0.345" + }, + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "01", + "sha256": "82c8232a5cb420246457d65a5014602feb8b288079cdae896e22a2eb6e390b58", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jdk_x64_linux_8u345b01_openj9-0.33.0.tar.gz", + "version": "8.0.345" + } + } + }, + "jre": { + "openjdk11": { + "aarch64": { + "build": "8", + "sha256": "49dc05a3e9f3f99c5f8fa466261aa3e33a753694c67cabfa7d3f682e5a2e3685", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jre_aarch64_linux_11.0.16_8_openj9-0.33.0.tar.gz", + "version": "11.0.16" + }, + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "8", + "sha256": "ba09711193b8b8664478f3f949b5320232f65c1bdf61f32a885d84de73c02767", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jre_x64_linux_11.0.16_8_openj9-0.33.0.tar.gz", + "version": "11.0.16" + } + }, + "openjdk16": { + "aarch64": { + "build": "7", + "sha256": "575dc3827077fc661fd1103effaa13ccd0f1606d01a33643956ed2eb1ece9763", + "url": "https://github.com/ibmruntimes/semeru16-binaries/releases/download/jdk-16.0.2%2B7_openj9-0.27.0/ibm-semeru-open-jre_aarch64_linux_16.0.2_7_openj9-0.27.0.tar.gz", + "version": "16.0.2" + }, + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "7", + "sha256": "b077cd0b35d3ed1927c22e5b498264ecff67297992809056187b42662edfc536", + "url": "https://github.com/ibmruntimes/semeru16-binaries/releases/download/jdk-16.0.2%2B7_openj9-0.27.0/ibm-semeru-open-jre_x64_linux_16.0.2_7_openj9-0.27.0.tar.gz", + "version": "16.0.2" + } + }, + "openjdk17": { + "aarch64": { + "build": "8", + "sha256": "6c40c1e0d7ee0509c44465e9f26dd970904137a95fd751e6447b1d6a9ef5092a", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jre_aarch64_linux_17.0.4_8_openj9-0.33.0.tar.gz", + "version": "17.0.4" + }, + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "8", + "sha256": "b2c176f8aa8cc7138d4c22ce9298d8f49597e1d8e3fdd33125898e5ee0182c93", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jre_x64_linux_17.0.4_8_openj9-0.33.0.tar.gz", + "version": "17.0.4" + } + }, + "openjdk8": { + "aarch64": { + "build": "01", + "sha256": "03caff41622e84a6e7fa66a225414a9b6eefb38dd215f830cae0bc4bbfc55b5c", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jre_aarch64_linux_8u345b01_openj9-0.33.0.tar.gz", + "version": "8.0.345" + }, + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "01", + "sha256": "0d4fe62716b9da2ccce324b5b46d57e8d47e5dfb5d128f87e16135ee9bc36cdc", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jre_x64_linux_8u345b01_openj9-0.33.0.tar.gz", + "version": "8.0.345" + } + } + } + }, + "mac": { + "jdk": { + "openjdk11": { + "aarch64": { + "build": "8", + "sha256": "9881b292142a129f6f5c6b21608b090f8f94625052b4f7d0ce5bd982c054ca2e", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jdk_aarch64_mac_11.0.16_8_openj9-0.33.0.tar.gz", + "version": "11.0.16" + }, + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "8", + "sha256": "8638735d2cae3efff212f898728685380355bb0a298076e9e46244d0bf3d4a64", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jdk_x64_mac_11.0.16_8_openj9-0.33.0.tar.gz", + "version": "11.0.16" + } + }, + "openjdk16": { + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "7", + "sha256": "89e807261145243a358a2a626f64340944c03622f34eaa35429053e2085d7aef", + "url": "https://github.com/ibmruntimes/semeru16-binaries/releases/download/jdk-16.0.2%2B7_openj9-0.27.0/ibm-semeru-open-jdk_x64_mac_16.0.2_7_openj9-0.27.0.tar.gz", + "version": "16.0.2" + } + }, + "openjdk17": { + "aarch64": { + "build": "8", + "sha256": "bf22628b54115dff9939b94751531544ab735b7cbbc8d6ddfe83d1b04df3a532", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jdk_aarch64_mac_17.0.4_8_openj9-0.33.0.tar.gz", + "version": "17.0.4" + }, + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "8", + "sha256": "a935f20564e347a9292955c04eb57e51efdb1853ae7f0b4fe759b22c9fe248be", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jdk_x64_mac_17.0.4_8_openj9-0.33.0.tar.gz", + "version": "17.0.4" + } + }, + "openjdk8": { + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "01", + "sha256": "c69086950c006b17484a70ef7bc85e92d121be15e69e282e1446fd238d42b6b4", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jdk_x64_mac_8u345b01_openj9-0.33.0.tar.gz", + "version": "8.0.345" + } + } + }, + "jre": { + "openjdk11": { + "aarch64": { + "build": "8", + "sha256": "39802020896476342dc11486e3cbdf10f6311c172abeb4a1e2931b472da4417e", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jre_aarch64_mac_11.0.16_8_openj9-0.33.0.tar.gz", + "version": "11.0.16" + }, + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "8", + "sha256": "92f87a3c2fb5fe60d3d51020ff95b9c234b2ae2677b79aebbe749dda717c9cdd", + "url": "https://github.com/ibmruntimes/semeru11-binaries/releases/download/jdk-11.0.16%2B8_openj9-0.33.0/ibm-semeru-open-jre_x64_mac_11.0.16_8_openj9-0.33.0.tar.gz", + "version": "11.0.16" + } + }, + "openjdk16": { + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "7", + "sha256": "2cb8007de405d0c8f160549309bcfc1adc82e304eb372e86ce0e0a214239438f", + "url": "https://github.com/ibmruntimes/semeru16-binaries/releases/download/jdk-16.0.2%2B7_openj9-0.27.0/ibm-semeru-open-jre_x64_mac_16.0.2_7_openj9-0.27.0.tar.gz", + "version": "16.0.2" + } + }, + "openjdk17": { + "aarch64": { + "build": "8", + "sha256": "4057c94cd46b814cc5a4d683d5f0b95dbd0b9e13e8c2e11155561ad0d8bec85b", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jre_aarch64_mac_17.0.4_8_openj9-0.33.0.tar.gz", + "version": "17.0.4" + }, + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "8", + "sha256": "8e957d2eb47eaca64516ac669272c6e5186155ed8ee4d6a77e0d4b7811cd7bb6", + "url": "https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.4%2B8_openj9-0.33.0/ibm-semeru-open-jre_x64_mac_17.0.4_8_openj9-0.33.0.tar.gz", + "version": "17.0.4" + } + }, + "openjdk8": { + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "01", + "sha256": "019e08dea8fbd54517dacbeac791d85717902800dd8bba77fbca1dfc6b0abd9e", + "url": "https://github.com/ibmruntimes/semeru8-binaries/releases/download/8u345-b01_openj9-0.33.0/ibm-semeru-open-jre_x64_mac_8u345b01_openj9-0.33.0.tar.gz", + "version": "8.0.345" + } + } + } + } + } +} diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index ae9d0f8810e6..082c480d6e77 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -50,6 +50,13 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" ]; + # Fix the paths in .pc, even though it's unclear if all these .pc are really useful. + postFixup = '' + substituteInPlace "$dev"/lib/pkgconfig/*.pc \ + --replace '=''${prefix}//' '=/' \ + --replace "$dev/$dev/" "$dev/" + ''; + meta = with lib; { inherit (src.meta) homepage; description = "A collection of tools, libraries and tests for shader compilation"; diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py new file mode 100755 index 000000000000..ae3c06d1dfe4 --- /dev/null +++ b/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -0,0 +1,71 @@ +#!/usr/bin/env nix-shell +#!nix-shell --pure -i python3 -p "python3.withPackages (ps: with ps; [ requests ])" + +import json +import re +import requests +import sys + +feature_versions = (8, 11, 16, 17) +oses = ("mac", "linux") +types = ("jre", "jdk") +impls = ("hotspot") + +arch_to_nixos = { + "x64": ("x86_64",), + "aarch64": ("aarch64",), + "arm": ("armv6l", "armv7l"), +} + +def generate_sources(assets, feature_version, out): + for asset in assets: + binary = asset["binary"] + if binary["os"] not in oses: continue + if binary["image_type"] not in types: continue + if binary["jvm_impl"] not in impls: continue + if binary["heap_size"] != "normal": continue + if binary["architecture"] not in arch_to_nixos: continue + + version = ".".join(str(v) for v in [ + asset["version"]["major"], + asset["version"]["minor"], + asset["version"]["security"] + ]) + build = str(asset["version"]["build"]) + + arch_map = ( + out + .setdefault(binary["jvm_impl"], {}) + .setdefault(binary["os"], {}) + .setdefault(binary["image_type"], {}) + .setdefault(feature_version, { + "packageType": binary["image_type"], + "vmType": binary["jvm_impl"], + }) + ) + + for nixos_arch in arch_to_nixos[binary["architecture"]]: + arch_map[nixos_arch] = { + "url": binary["package"]["link"], + "sha256": binary["package"]["checksum"], + "version": version, + "build": build, + } + + return out + + +out = {} +for feature_version in feature_versions: + # Default user-agenet is blocked by Azure WAF. + headers = {'user-agent': 'nixpkgs-temurin-generate-sources/1.0.0'} + resp = requests.get(f"https://api.adoptium.net/v3/assets/latest/{feature_version}/hotspot", headers=headers) + + if resp.status_code != 200: + print("error: could not fetch data for release {} (code {}) {}".format(feature_version, resp.status_code, resp.content), file=sys.stderr) + sys.exit(1) + generate_sources(resp.json(), f"openjdk{feature_version}", out) + +with open("sources.json", "w") as f: + json.dump(out, f, indent=2, sort_keys=True) + f.write('\n') diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix new file mode 100644 index 000000000000..eff9eda73ed3 --- /dev/null +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix @@ -0,0 +1,74 @@ +{ name-prefix ? "temurin" +, brand-name ? "Eclipse Temurin" +, sourcePerArch +, knownVulnerabilities ? [] +}: + +{ swingSupport ? true # not used for now +, lib, stdenv +, fetchurl +, setJavaClassPath +}: + +let + cpuName = stdenv.hostPlatform.parsed.cpu.name; + validCpuTypes = builtins.attrNames lib.systems.parse.cpuTypes; + providedCpuTypes = builtins.filter + (arch: builtins.elem arch validCpuTypes) + (builtins.attrNames sourcePerArch); + result = stdenv.mkDerivation { + pname = if sourcePerArch.packageType == "jdk" + then "${name-prefix}-bin" + else "${name-prefix}-${sourcePerArch.packageType}-bin"; + version = + sourcePerArch.${cpuName}.version or (throw "unsupported CPU ${cpuName}"); + + src = fetchurl { + inherit (sourcePerArch.${cpuName}) url sha256; + }; + + # See: https://github.com/NixOS/patchelf/issues/10 + dontStrip = 1; + + installPhase = '' + cd .. + + mv $sourceRoot $out + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/Contents/Home/include/darwin/*_md.h $out/Contents/Home/include/ + + # Remove some broken manpages. + # Only for 11 and earlier. + [ -e "$out/Contents/Home/man/ja" ] && rm -r $out/Contents/Home/man/ja + + ln -s $out/Contents/Home/* $out/ + + # Propagate the setJavaClassPath setup hook from the JDK so that + # any package that depends on the JDK has $CLASSPATH set up + # properly. + mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + cat <> $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + # FIXME: use multiple outputs or return actual JRE package + passthru = { + jre = result; + home = result; + }; + + meta = with lib; { + license = licenses.gpl2Classpath; + description = "${brand-name}, prebuilt OpenJDK binary"; + platforms = builtins.map (arch: arch + "-darwin") providedCpuTypes; # some inherit jre.meta.platforms + maintainers = with maintainers; [ taku0 ]; + inherit knownVulnerabilities; + mainProgram = "java"; + }; + }; +in result diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix new file mode 100644 index 000000000000..75bd52dcc9fd --- /dev/null +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix @@ -0,0 +1,15 @@ +{ lib, callPackage }: + +let + sources = (lib.importJSON ./sources.json).hotspot.mac; + common = opts: callPackage (import ./jdk-darwin-base.nix opts) {}; +in +{ + jdk-8 = common { sourcePerArch = sources.jdk.openjdk8; }; + jre-8 = common { sourcePerArch = sources.jre.openjdk8; }; + jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; + jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; + jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; }; + jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; + jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; +} diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix new file mode 100644 index 000000000000..a7ed81ca8acb --- /dev/null +++ b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix @@ -0,0 +1,129 @@ +{ name-prefix ? "temurin" +, brand-name ? "Eclipse Temurin" +, sourcePerArch +, knownVulnerabilities ? [] +}: + +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, makeWrapper +, setJavaClassPath +# minimum dependencies +, alsa-lib +, fontconfig +, freetype +, libffi +, xorg +, zlib +# runtime dependencies +, cups +# runtime dependencies for GTK+ Look and Feel +, gtkSupport ? true +, cairo +, glib +, gtk3 +}: + +let + cpuName = stdenv.hostPlatform.parsed.cpu.name; + runtimeDependencies = [ + cups + ] ++ lib.optionals gtkSupport [ + cairo glib gtk3 + ]; + runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies; + validCpuTypes = builtins.attrNames lib.systems.parse.cpuTypes; + providedCpuTypes = builtins.filter + (arch: builtins.elem arch validCpuTypes) + (builtins.attrNames sourcePerArch); + result = stdenv.mkDerivation rec { + pname = if sourcePerArch.packageType == "jdk" + then "${name-prefix}-bin" + else "${name-prefix}-${sourcePerArch.packageType}-bin"; + + version = + sourcePerArch.${cpuName}.version or (throw "unsupported CPU ${cpuName}"); + + src = fetchurl { + inherit (sourcePerArch.${cpuName}) url sha256; + }; + + buildInputs = [ + alsa-lib # libasound.so wanted by lib/libjsound.so + fontconfig + freetype + stdenv.cc.cc.lib # libstdc++.so.6 + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXrender + xorg.libXtst + zlib + ] ++ lib.optional stdenv.isAarch32 libffi; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + + # See: https://github.com/NixOS/patchelf/issues/10 + dontStrip = 1; + + installPhase = '' + cd .. + + mv $sourceRoot $out + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + + # Remove some broken manpages. + # Only for 11 and earlier. + [ -e "$out/man/ja" ] && rm -r $out/man/ja* + + # Remove embedded freetype to avoid problems like + # https://github.com/NixOS/nixpkgs/issues/57733 + find "$out" -name 'libfreetype.so*' -delete + + # Propagate the setJavaClassPath setup hook from the JDK so that + # any package that depends on the JDK has $CLASSPATH set up + # properly. + mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + cat <> "$out/nix-support/setup-hook" + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi + EOF + + # We cannot use -exec since wrapProgram is a function but not a command. + # + # jspawnhelper is executed from JVM, so it doesn't need to wrap it, and it + # breaks building OpenJDK (#114495). + for bin in $( find "$out" -executable -type f -not -name jspawnhelper ); do + if patchelf --print-interpreter "$bin" &> /dev/null; then + wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" + fi + done + ''; + + preFixup = '' + find "$out" -name libfontmanager.so -exec \ + patchelf --add-needed libfontconfig.so {} \; + ''; + + # FIXME: use multiple outputs or return actual JRE package + passthru = { + jre = result; + home = result; + }; + + meta = with lib; { + license = licenses.gpl2Classpath; + description = "${brand-name}, prebuilt OpenJDK binary"; + platforms = builtins.map (arch: arch + "-linux") providedCpuTypes; # some inherit jre.meta.platforms + maintainers = with maintainers; [ taku0 ]; + inherit knownVulnerabilities; + mainProgram = "java"; + }; + }; +in result diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/pkgs/development/compilers/temurin-bin/jdk-linux.nix new file mode 100644 index 000000000000..4c0306d5aba4 --- /dev/null +++ b/pkgs/development/compilers/temurin-bin/jdk-linux.nix @@ -0,0 +1,15 @@ +{ lib, callPackage }: + +let + sources = (lib.importJSON ./sources.json).hotspot.linux; + common = opts: callPackage (import ./jdk-linux-base.nix opts) {}; +in +{ + jdk-8 = common { sourcePerArch = sources.jdk.openjdk8; }; + jre-8 = common { sourcePerArch = sources.jre.openjdk8; }; + jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; }; + jre-11 = common { sourcePerArch = sources.jre.openjdk11; }; + jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; }; + jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; }; + jre-17 = common { sourcePerArch = sources.jre.openjdk17; }; +} diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json new file mode 100644 index 000000000000..ee8231738212 --- /dev/null +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -0,0 +1,306 @@ +{ + "hotspot": { + "linux": { + "jdk": { + "openjdk11": { + "aarch64": { + "build": "1", + "sha256": "2b89cabf0ce1c2cedadd92b798d6e9056bc27c71a06f5ba24ede5dc9c316e3e8", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + }, + "armv6l": { + "build": "1", + "sha256": "a703acfd04ece4a4aac4cb9bda26b7d225874008bba324237bd6f53792edb778", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + }, + "armv7l": { + "build": "1", + "sha256": "a703acfd04ece4a4aac4cb9bda26b7d225874008bba324237bd6f53792edb778", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "5f6b513757d386352cf91514ed5859d1ab59364b4453e1f1c57152ba2039b8e2", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + } + }, + "openjdk16": { + "aarch64": { + "build": "7", + "sha256": "cb77d9d126f97898dfdc8b5fb694d1e0e5d93d13a0a6cb2aeda76f8635384340", + "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.2_7.tar.gz", + "version": "16.0.2" + }, + "armv6l": { + "build": "7", + "sha256": "7721ef81416af8122a28448f3d661eb4bda40a9f78d400e4ecc55b58e627a00c", + "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_arm_linux_hotspot_16.0.2_7.tar.gz", + "version": "16.0.2" + }, + "armv7l": { + "build": "7", + "sha256": "7721ef81416af8122a28448f3d661eb4bda40a9f78d400e4ecc55b58e627a00c", + "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_arm_linux_hotspot_16.0.2_7.tar.gz", + "version": "16.0.2" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "7", + "sha256": "323d6d7474a359a28eff7ddd0df8e65bd61554a8ed12ef42fd9365349e573c2c", + "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz", + "version": "16.0.2" + } + }, + "openjdk17": { + "aarch64": { + "build": "1", + "sha256": "3c7460de77421284b38b4e57cb1bd584a6cef55c34fc51a12270620544de2b8a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + }, + "armv6l": { + "build": "1", + "sha256": "efba97cd38af8f43b61f09cb5041f81d92ecd005dcd51c81678fbcf4f24d8461", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_arm_linux_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + }, + "armv7l": { + "build": "1", + "sha256": "efba97cd38af8f43b61f09cb5041f81d92ecd005dcd51c81678fbcf4f24d8461", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_arm_linux_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "5fbf8b62c44f10be2efab97c5f5dbf15b74fae31e451ec10abbc74e54a04ff44", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_linux_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + } + }, + "openjdk8": { + "aarch64": { + "build": "1", + "sha256": "c1965fb24dded7d7944e2da36cd902adf3b7b1d327aaa21ea507cff00a5a0090", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_aarch64_linux_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + }, + "armv6l": { + "build": "1", + "sha256": "af4ecd311df32b405142d5756f966418d0200fbf6cb9009c20a44dc691e8da6f", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + }, + "armv7l": { + "build": "1", + "sha256": "af4ecd311df32b405142d5756f966418d0200fbf6cb9009c20a44dc691e8da6f", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "ed6c9db3719895584fb1fd69fc79c29240977675f26631911c5a1dbce07b7d58", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_linux_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + } + } + }, + "jre": { + "openjdk11": { + "aarch64": { + "build": "1", + "sha256": "b6607f28fa2906d612d517f0babe4f0f895aa1c3f901edcddb493e33c1e27364", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + }, + "armv6l": { + "build": "1", + "sha256": "2ee7fe636a6a57e4718dfe597e8097b93ef8d976e4b05384433777c9f0526f5a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + }, + "armv7l": { + "build": "1", + "sha256": "2ee7fe636a6a57e4718dfe597e8097b93ef8d976e4b05384433777c9f0526f5a", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "1ffe1a682e8179e35238bf3f93aba0cb185850e202c676f41d38cb0561883eda", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_x64_linux_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + } + }, + "openjdk17": { + "aarch64": { + "build": "1", + "sha256": "2e4137529319cd7935f74e1289025b7b4c794c0fb47a3d138adffbd1bbc0ea58", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + }, + "armv6l": { + "build": "1", + "sha256": "b63f532cb8b30e4d0bd18d52f08c1933e3cf66aeb373180d002274b6d94b4a25", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_arm_linux_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + }, + "armv7l": { + "build": "1", + "sha256": "b63f532cb8b30e4d0bd18d52f08c1933e3cf66aeb373180d002274b6d94b4a25", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_arm_linux_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "e96814ee145a599397d91e16831d2dddc3c6b8e8517a8527e28e727649aaa2d1", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_x64_linux_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + } + }, + "openjdk8": { + "aarch64": { + "build": "1", + "sha256": "65b8bd74382d6514d2458ff4375468651791a55a186a5bffe0803204801e9c94", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_aarch64_linux_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + }, + "armv6l": { + "build": "1", + "sha256": "a9dd1ea4280a85158191101688bbf1920c4676a3849e22dc7783fb61f60d6199", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_arm_linux_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + }, + "armv7l": { + "build": "1", + "sha256": "a9dd1ea4280a85158191101688bbf1920c4676a3849e22dc7783fb61f60d6199", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_arm_linux_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "2422a8831fe414b9dba4c443ee3562431dfcde27577124f0db58ec903afc262a", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_x64_linux_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + } + } + } + }, + "mac": { + "jdk": { + "openjdk11": { + "aarch64": { + "build": "1", + "sha256": "1953f06702d45eb54bae3ccf453b57c33de827015f5623a2dfc16e1c83e6b0a1", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "723548e36e0b3e0a5a2f36a38b22ea825d3004e26054a0e254854adc57045352", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_x64_mac_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + } + }, + "openjdk16": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "7", + "sha256": "27975d9e695cfbb93861540926f9f7bcac973a254ceecbee549706a99cbbdf95", + "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_mac_hotspot_16.0.2_7.tar.gz", + "version": "16.0.2" + } + }, + "openjdk17": { + "aarch64": { + "build": "1", + "sha256": "3a976943a9e6a635e68e2b06bd093fc096aad9f5894acda673d3bea0cb3a6f38", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "ac21a5a87f7cfa00212ab7c41f7eb80ca33640d83b63ad850be811c24095d61a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_mac_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + } + }, + "openjdk8": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "3eeba0e76101b9f5e8eb9eb14ad991293cf0cc064df35f6a89882b603630f0c8", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_mac_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + } + } + }, + "jre": { + "openjdk11": { + "aarch64": { + "build": "1", + "sha256": "c84f38a7d87d50649ffc1f625facb4398fa54885371336a2cbf6ae2b435cbd10", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "10be61a8dd3766f7c12e2e823a6eca48cc6361d97e1b76310c752bd39770c7fe", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_x64_mac_hotspot_11.0.16.1_1.tar.gz", + "version": "11.0.16" + } + }, + "openjdk17": { + "aarch64": { + "build": "1", + "sha256": "63a32fe611f2666856e84b79305eb80609de229bbce4f13991b961797aa88bf8", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "9c59e45a9a6cbc1b8d671c4a88bb8d9b8929fae067df0d0a73b1ca71781a0996", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_x64_mac_hotspot_17.0.4.1_1.tar.gz", + "version": "17.0.4" + } + }, + "openjdk8": { + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "1", + "sha256": "6161240769bd784e5ad55105fab9782d787ad34b7b8efd1f730a05f2659455d2", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_x64_mac_hotspot_8u345b01.tar.gz", + "version": "8.0.345" + } + } + } + } + } +} diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index 9bb197c0bd40..fcb4e7d5fda3 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -21,7 +21,8 @@ with python3.pkgs; buildPythonApplication rec { --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data.json}' substituteInPlace setup.py \ - --replace 'uvicorn==%s" % ("0.17.*"' 'uvicorn==%s" % ("0.18.*"' + --replace 'uvicorn==%s" % ("0.17.*"' 'uvicorn==%s" % ("0.18.*"' \ + --replace 'wsproto==' 'wsproto>=' ''; propagatedBuildInputs = [ diff --git a/pkgs/development/interpreters/cg3/default.nix b/pkgs/development/interpreters/cg3/default.nix index 27db9bebcd0c..7f7a38185f9e 100644 --- a/pkgs/development/interpreters/cg3/default.nix +++ b/pkgs/development/interpreters/cg3/default.nix @@ -30,6 +30,11 @@ let cg3 = stdenv.mkDerivation rec { doCheck = true; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/cg3.pc \ + --replace '=''${prefix}//' '=/' + ''; + passthru.tests.minimal = runCommand "${pname}-test" { buildInputs = [ cg3 diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix index 968583543406..23c77300c03d 100644 --- a/pkgs/development/interpreters/erlang/R22.nix +++ b/pkgs/development/interpreters/erlang/R22.nix @@ -1,7 +1,5 @@ { mkDerivation }: -# How to obtain `sha256`: -# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { version = "22.3.4.24"; sha256 = "0c9713xa8sjw7nr55hysgcnbvj7gzbrpzdl94y1nqn7vw4ni8is3"; diff --git a/pkgs/development/interpreters/erlang/R23.nix b/pkgs/development/interpreters/erlang/R23.nix index a0d831d631f4..daf69b6bfe0a 100644 --- a/pkgs/development/interpreters/erlang/R23.nix +++ b/pkgs/development/interpreters/erlang/R23.nix @@ -1,7 +1,5 @@ { mkDerivation }: -# How to obtain `sha256`: -# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { version = "23.3.4.10"; sha256 = "0sfz7n748hvhmcygnvb6h31ag35p59aaa9h8gdpqsh6p4hnjh1mf"; diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix index b86667ec1e76..ac2cc48b0a0c 100644 --- a/pkgs/development/interpreters/erlang/R24.nix +++ b/pkgs/development/interpreters/erlang/R24.nix @@ -1,7 +1,5 @@ { mkDerivation }: -# How to obtain `sha256`: -# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { version = "24.2"; sha256 = "10s57v2i2qqyg3gddm85n3crzrkikl4zfwgzqmxjzdynsyb4xg68"; diff --git a/pkgs/development/interpreters/erlang/R25.nix b/pkgs/development/interpreters/erlang/R25.nix index 381ea8d5c227..4d1c6be5f914 100644 --- a/pkgs/development/interpreters/erlang/R25.nix +++ b/pkgs/development/interpreters/erlang/R25.nix @@ -1,8 +1,6 @@ { mkDerivation }: -# How to obtain `sha256`: -# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "25.0.3"; - sha256 = "0zchcm7gv52j30fq5p658h9c593ziirq09kkah6mpsvjfdsmvmgl"; + version = "25.1"; + sha256 = "1wrdcc576ad4fibm95c3mfni8sg1h536b4affdj05qg5cyjjwwis"; } diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index 0af7b470b0b3..b2f82ddb4694 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -2,9 +2,10 @@ { lib , lua , wrapLua +, luarocks # Whether the derivation provides a lua module or not. -, toLuaModule , luarocksCheckHook +, luaLib }: { @@ -12,9 +13,7 @@ pname , version # by default prefix `name` e.g. "lua5.2-${name}" -, namePrefix ? if lua.pkgs.isLuaJIT - then lua.name + "-" - else "lua" + lua.luaversion + "-" +, namePrefix ? "${lua.pname}${lua.sourceVersion.major}.${lua.sourceVersion.minor}-" # Dependencies for building the package , buildInputs ? [] @@ -82,7 +81,7 @@ let # configured trees) luarocks_config = "luarocks-config.lua"; luarocks_content = let - generatedConfig = lua.pkgs.lib.generateLuarocksConfig { + generatedConfig = luaLib.generateLuarocksConfig { externalDeps = externalDeps ++ externalDepsGenerated; inherit extraVariables; inherit rocksSubdir; @@ -107,19 +106,19 @@ let ); externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps; - luarocksDrv = toLuaModule ( lua.stdenv.mkDerivation ( + luarocksDrv = luaLib.toLuaModule ( lua.stdenv.mkDerivation ( builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariables"] // { name = namePrefix + pname + "-" + version; nativeBuildInputs = [ wrapLua - lua.pkgs.luarocks - ] - ++ buildInputs - ++ lib.optionals doCheck ([ luarocksCheckHook ] ++ checkInputs) - ++ (map (d: d.dep) externalDeps') - ; + luarocks + ] ++ lib.optionals doCheck ([ luarocksCheckHook ] ++ checkInputs); + + buildInputs = buildInputs + ++ (map (d: d.dep) externalDeps'); + # propagate lua to active setup-hook in nix-shell propagatedBuildInputs = propagatedBuildInputs ++ [ lua ]; @@ -156,7 +155,7 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab nix_debug "Using LUAROCKS_CONFIG=$LUAROCKS_CONFIG" - LUAROCKS=${lua.pkgs.luarocks}/bin/luarocks + LUAROCKS=luarocks if (( ''${NIX_DEBUG:-0} >= 1 )); then LUAROCKS="$LUAROCKS --verbose" fi diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index 97e444ded903..39de72785437 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -1,11 +1,86 @@ # similar to interpreters/python/default.nix { stdenv, lib, callPackage, fetchurl, fetchpatch, makeBinaryWrapper }: + +let + + # Common passthru for all lua interpreters. + # copied from python + passthruFun = + { executable + , sourceVersion + , luaversion + , packageOverrides + , luaOnBuildForBuild + , luaOnBuildForHost + , luaOnBuildForTarget + , luaOnHostForHost + , luaOnTargetForTarget + , luaAttr ? null + , self # is luaOnHostForTarget + }: let + luaPackages = callPackage + # Function that when called + # - imports lua-packages.nix + # - adds spliced package sets to the package set + # - applies overrides from `packageOverrides` + ({ lua, overrides, callPackage, splicePackages, newScope }: let + luaPackagesFun = callPackage ../../../top-level/lua-packages.nix { + lua = self; + }; + generatedPackages = if (builtins.pathExists ../../lua-modules/generated-packages.nix) then + (final: prev: callPackage ../../lua-modules/generated-packages.nix { inherit (final) callPackage; } final prev) + else (final: prev: {}); + overridenPackages = callPackage ../../lua-modules/overrides.nix { }; + + otherSplices = { + selfBuildBuild = luaOnBuildForBuild.pkgs; + selfBuildHost = luaOnBuildForHost.pkgs; + selfBuildTarget = luaOnBuildForTarget.pkgs; + selfHostHost = luaOnHostForHost.pkgs; + selfTargetTarget = luaOnTargetForTarget.pkgs or {}; + }; + keep = self: { }; + extra = spliced0: {}; + extensions = lib.composeManyExtensions [ + generatedPackages + overridenPackages + overrides + ]; + in lib.makeScopeWithSplicing + splicePackages + newScope + otherSplices + keep + extra + (lib.extends extensions luaPackagesFun)) + { + overrides = packageOverrides; + lua = self; + }; + in rec { + buildEnv = callPackage ./wrapper.nix { + lua = self; + inherit (luaPackages) requiredLuaModules; + }; + withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;}; + pkgs = luaPackages; + interpreter = "${self}/bin/${executable}"; + inherit executable luaversion sourceVersion; + luaOnBuild = luaOnBuildForHost.override { inherit packageOverrides; self = luaOnBuild; }; + + inherit luaAttr; + }; + +in + rec { lua5_4 = callPackage ./interpreter.nix { + self = lua5_4; sourceVersion = { major = "5"; minor = "4"; patch = "3"; }; hash = "1yxvjvnbg4nyrdv10bq42gz6dr66pyan28lgzfygqfwy2rv24qgq"; makeWrapper = makeBinaryWrapper; + inherit passthruFun; patches = lib.optional stdenv.isDarwin ./5.4.darwin.patch ++ [ @@ -28,53 +103,62 @@ rec { }; lua5_4_compat = lua5_4.override({ + self = lua5_4_compat; compat = true; }); lua5_3 = callPackage ./interpreter.nix { + self = lua5_3; sourceVersion = { major = "5"; minor = "3"; patch = "6"; }; hash = "0q3d8qhd7p0b7a4mh9g7fxqksqfs6mr1nav74vq26qvkp2dxcpzw"; makeWrapper = makeBinaryWrapper; + inherit passthruFun; patches = lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ]; }; lua5_3_compat = lua5_3.override({ + self = lua5_3_compat; compat = true; }); lua5_2 = callPackage ./interpreter.nix { + self = lua5_2; sourceVersion = { major = "5"; minor = "2"; patch = "4"; }; hash = "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr"; makeWrapper = makeBinaryWrapper; + inherit passthruFun; patches = [ ./CVE-2022-28805.patch ] ++ lib.optional stdenv.isDarwin ./5.2.darwin.patch; }; lua5_2_compat = lua5_2.override({ + self = lua5_2_compat; compat = true; }); lua5_1 = callPackage ./interpreter.nix { + self = lua5_1; sourceVersion = { major = "5"; minor = "1"; patch = "5"; }; hash = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"; makeWrapper = makeBinaryWrapper; + inherit passthruFun; patches = (lib.optional stdenv.isDarwin ./5.1.darwin.patch) ++ [ ./CVE-2014-5461.patch ]; }; luajit_2_0 = import ../luajit/2.0.nix { self = luajit_2_0; - inherit callPackage lib; + inherit callPackage lib passthruFun; }; luajit_2_1 = import ../luajit/2.1.nix { self = luajit_2_1; - inherit callPackage; + inherit callPackage passthruFun; }; } diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 1fb56851ce52..d4af272e7cf6 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -2,19 +2,26 @@ , compat ? false , callPackage , makeWrapper +, self , packageOverrides ? (final: prev: {}) +, pkgsBuildBuild +, pkgsBuildHost +, pkgsBuildTarget +, pkgsHostHost +, pkgsTargetTarget , sourceVersion , hash +, passthruFun , patches ? [] , postConfigure ? null , postBuild ? null , staticOnly ? stdenv.hostPlatform.isStatic -}: +, luaAttr ? "lua${sourceVersion.major}_${sourceVersion.minor}" +} @ inputs: let - luaPackages = callPackage ../../lua-modules { - lua = self; - overrides = packageOverrides; - }; + luaPackages = self.pkgs; + + luaversion = with sourceVersion; "${major}.${minor}"; plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux" else if (stdenv.isLinux && lib.versionAtLeast self.luaversion "5.4") then "linux-readline" @@ -25,10 +32,10 @@ plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux else if stdenv.hostPlatform.isBSD then "bsd" else if stdenv.hostPlatform.isUnix then "posix" else "generic"; +in -self = stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "lua"; - luaversion = with sourceVersion; "${major}.${minor}"; version = "${luaversion}.${sourceVersion.patch}"; src = fetchurl { @@ -36,8 +43,8 @@ self = stdenv.mkDerivation rec { sha256 = hash; }; - LuaPathSearchPaths = luaPackages.lib.luaPathList; - LuaCPathSearchPaths = luaPackages.lib.luaCPathList; + LuaPathSearchPaths = luaPackages.luaLib.luaPathList; + LuaCPathSearchPaths = luaPackages.luaLib.luaCPathList; setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths; nativeBuildInputs = [ makeWrapper ]; @@ -123,15 +130,19 @@ self = stdenv.mkDerivation rec { ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${lib.replaceStrings [ "." ] [ "" ] luaversion}.pc" ''; - passthru = rec { - buildEnv = callPackage ./wrapper.nix { - lua = self; - inherit makeWrapper; - inherit (luaPackages) requiredLuaModules; - }; - withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;}; - pkgs = luaPackages; - interpreter = "${self}/bin/lua"; + # copied from python + passthru = let + # When we override the interpreter we also need to override the spliced versions of the interpreter + inputs' = lib.filterAttrs (n: v: ! lib.isDerivation v && n != "passthruFun") inputs; + override = attr: let lua = attr.override (inputs' // { self = lua; }); in lua; + in passthruFun rec { + inherit self luaversion packageOverrides luaAttr sourceVersion; + executable = "lua"; + luaOnBuildForBuild = override pkgsBuildBuild.${luaAttr}; + luaOnBuildForHost = override pkgsBuildHost.${luaAttr}; + luaOnBuildForTarget = override pkgsBuildTarget.${luaAttr}; + luaOnHostForHost = override pkgsHostHost.${luaAttr}; + luaOnTargetForTarget = if lib.hasAttr luaAttr pkgsTargetTarget then (override pkgsTargetTarget.${luaAttr}) else {}; }; meta = { @@ -148,5 +159,4 @@ self = stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.unix; }; -}; -in self +} diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index f2fc16963cad..fe7843caeb0f 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -1,6 +1,7 @@ -{ self, callPackage, lib }: +{ self, callPackage, lib, passthruFun }: callPackage ./default.nix { - inherit self; + sourceVersion = { major = "2"; minor = "0"; patch = "5"; }; + inherit self passthruFun; version = "2.0.5-2022-03-13"; rev = "93a65d3cc263aef2d2feb3d7ff2206aca3bee17e"; isStable = true; diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index 507bc40fcf6a..d5c539331e00 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,6 +1,7 @@ -{ self, callPackage }: +{ self, callPackage, passthruFun }: callPackage ./default.nix { - inherit self; + sourceVersion = { major = "2"; minor = "1"; patch = "0"; }; + inherit self passthruFun; version = "2.1.0-2022-04-05"; rev = "5e3c45c43bb0e0f1f2917d432e9d2dba12c42a6e"; isStable = false; diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 480e34244134..2d47b0395c36 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , buildPackages -, name ? "luajit-${version}" , isStable , hash , rev @@ -11,6 +10,13 @@ , callPackage , self , packageOverrides ? (final: prev: {}) +, pkgsBuildBuild +, pkgsBuildHost +, pkgsBuildTarget +, pkgsHostHost +, pkgsTargetTarget +, sourceVersion +, passthruFun , enableFFI ? true , enableJIT ? true , enableJITDebugModule ? enableJIT @@ -22,12 +28,14 @@ , enableAPICheck ? false , enableVMAssertions ? false , useSystemMalloc ? false -}: +, luaAttr ? "luajit_${sourceVersion.major}_${sourceVersion.minor}" +} @ inputs: assert enableJITDebugModule -> enableJIT; assert enableGDBJITSupport -> enableJIT; assert enableValgrindSupport -> valgrind != null; let - luaPackages = callPackage ../../lua-modules { lua = self; overrides = packageOverrides; }; + + luaPackages = self.pkgs; XCFLAGS = with lib; optional (!enableFFI) "-DLUAJIT_DISABLE_FFI" @@ -42,7 +50,8 @@ let ; in stdenv.mkDerivation rec { - inherit name version; + pname = "luajit"; + inherit version; src = fetchFromGitHub { owner = "LuaJIT"; repo = "LuaJIT"; @@ -93,19 +102,24 @@ stdenv.mkDerivation rec { ln -s "$out"/bin/luajit-* "$out"/bin/luajit ''; - LuaPathSearchPaths = luaPackages.lib.luaPathList; - LuaCPathSearchPaths = luaPackages.lib.luaCPathList; + LuaPathSearchPaths = luaPackages.luaLib.luaPathList; + LuaCPathSearchPaths = luaPackages.luaLib.luaCPathList; - setupHook = luaPackages.lua-setup-hook luaPackages.lib.luaPathList luaPackages.lib.luaCPathList; + setupHook = luaPackages.lua-setup-hook luaPackages.luaLib.luaPathList luaPackages.luaLib.luaCPathList; - passthru = rec { - buildEnv = callPackage ../lua-5/wrapper.nix { - lua = self; - inherit (luaPackages) requiredLuaModules; - }; - withPackages = import ../lua-5/with-packages.nix { inherit buildEnv luaPackages; }; - pkgs = luaPackages; - interpreter = "${self}/bin/lua"; + # copied from python + passthru = let + # When we override the interpreter we also need to override the spliced versions of the interpreter + inputs' = lib.filterAttrs (n: v: ! lib.isDerivation v && n != "passthruFun") inputs; + override = attr: let lua = attr.override (inputs' // { self = lua; }); in lua; + in passthruFun rec { + inherit self luaversion packageOverrides luaAttr sourceVersion; + executable = "lua"; + luaOnBuildForBuild = override pkgsBuildBuild.${luaAttr}; + luaOnBuildForHost = override pkgsBuildHost.${luaAttr}; + luaOnBuildForTarget = override pkgsBuildTarget.${luaAttr}; + luaOnHostForHost = override pkgsHostHost.${luaAttr}; + luaOnTargetForTarget = if lib.hasAttr luaAttr pkgsTargetTarget then (override pkgsTargetTarget.${luaAttr}) else {}; }; meta = with lib; { diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 73197f065625..ddf0a5548475 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -115,7 +115,7 @@ let ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc pythonForBuild - ] ++ optionals (stdenv.cc.isClang && (enableLTO || enableOptimizations)) [ + ] ++ optionals (stdenv.cc.isClang && (!stdenv.hostPlatform.useAndroidPrebuilt or false) && (enableLTO || enableOptimizations)) [ stdenv.cc.cc.libllvm.out ]; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index c3023b5e7bed..ade4168036a5 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -131,19 +131,19 @@ with pkgs; sourceVersion = { major = "3"; minor = "9"; - patch = "13"; + patch = "14"; suffix = ""; }; - sha256 = "sha256-ElsMWY8eFdKqZUBug/eS330XHN84wWgDsUmZQxajCA8="; + sha256 = "sha256-ZRME0hbIID/grfGoCvRy2OksOw4KeJIiKuTZ865N688="; }; python310 = { sourceVersion = { major = "3"; minor = "10"; - patch = "6"; + patch = "7"; suffix = ""; }; - sha256 = "sha256-95X/h9EdSwx8M7yIUbDChkjYpFg6ohAKmMIrQya20/M="; + sha256 = "sha256-bu2EFbdRb7LyYJBttdSN1MBqzAyySn1swVKWpgTc3Eg="; }; }; diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 45b230e44702..e75d78758f98 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -89,9 +89,8 @@ in rec { pythonCatchConflictsHook = callPackage ({ setuptools }: makeSetupHook { name = "python-catch-conflicts-hook"; - deps = [ setuptools ]; substitutions = { - inherit pythonInterpreter; + inherit pythonInterpreter pythonSitePackages setuptools; catchConflicts=../catch_conflicts/catch_conflicts.py; }; } ./python-catch-conflicts-hook.sh) {}; @@ -112,6 +111,11 @@ in rec { }; } ./python-namespaces-hook.sh) {}; + pythonOutputDistHook = callPackage ({ }: + makeSetupHook { + name = "python-output-dist-hook"; + } ./python-output-dist-hook.sh ) {}; + pythonRecompileBytecodeHook = callPackage ({ }: makeSetupHook { name = "python-recompile-bytecode-hook"; diff --git a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh index 374a2eddb407..0abcad3c42f2 100644 --- a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh @@ -2,7 +2,7 @@ echo "Sourcing python-catch-conflicts-hook.sh" pythonCatchConflictsPhase() { - @pythonInterpreter@ @catchConflicts@ + PYTHONPATH="@setuptools@/@pythonSitePackages@:$PYTHONPATH" @pythonInterpreter@ @catchConflicts@ } if [ -z "${dontUsePythonCatchConflicts-}" ]; then diff --git a/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh b/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh new file mode 100644 index 000000000000..e73e45cd597a --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh @@ -0,0 +1,10 @@ +# Setup hook for storing dist folder (wheels/sdists) in a separate output +echo "Sourcing python-catch-conflicts-hook.sh" + +pythonOutputDistPhase() { + echo "Executing pythonOutputDistPhase" + mv "dist" "$dist" + echo "Finished executing pythonOutputDistPhase" +} + +preFixupPhases+=" pythonOutputDistPhase" diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index f37ad592cb49..abb1ceb7879e 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -17,6 +17,7 @@ , pythonCatchConflictsHook , pythonImportsCheckHook , pythonNamespacesHook +, pythonOutputDistHook , pythonRemoveBinBytecodeHook , pythonRemoveTestsDirHook , setuptoolsBuildHook @@ -49,6 +50,8 @@ # Enabled to detect some (native)BuildInputs mistakes , strictDeps ? true +, outputs ? [ "out" ] + # used to disable derivation, useful for specific python versions , disabled ? false @@ -106,11 +109,13 @@ else let inherit (python) stdenv; + withDistOutput = lib.elem format ["pyproject" "setuptools" "flit"]; + name_ = name; self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ "disabled" "checkPhase" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" - "disabledTestPaths" + "disabledTestPaths" "outputs" ]) // { name = namePrefix + name_; @@ -121,7 +126,7 @@ let ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? pythonRemoveTestsDirHook ] ++ lib.optionals catchConflicts [ - setuptools pythonCatchConflictsHook + pythonCatchConflictsHook ] ++ lib.optionals removeBinBytecode [ pythonRemoveBinBytecodeHook ] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [ @@ -144,6 +149,8 @@ let ] ++ lib.optionals (python.pythonAtLeast "3.3") [ # Optionally enforce PEP420 for python3 pythonNamespacesHook + ] ++ lib.optionals withDistOutput [ + pythonOutputDistHook ] ++ nativeBuildInputs; buildInputs = buildInputs ++ pythonPath; @@ -177,6 +184,8 @@ let # Python packages built through cross-compilation are always for the host platform. disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; + outputs = outputs ++ lib.optional withDistOutput "dist"; + meta = { # default to python's platforms platforms = python.meta.platforms; diff --git a/pkgs/development/libraries/audio/libkeyfinder/default.nix b/pkgs/development/libraries/audio/libkeyfinder/default.nix index 65e4d0fb15ee..0a48dc479045 100644 --- a/pkgs/development/libraries/audio/libkeyfinder/default.nix +++ b/pkgs/development/libraries/audio/libkeyfinder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fftw, catch2 }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, fftw, catch2 }: stdenv.mkDerivation rec { pname = "libkeyfinder"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-7w/Wc9ncLinbnM2q3yv5DBtFoJFAM2e9xAUTsqvE9mg="; }; + # in main post 2.2.6, see https://github.com/mixxxdj/libkeyfinder/issues/21 + patches = [ + (fetchpatch { + name = "fix-pkg-config"; + url = "https://github.com/mixxxdj/libkeyfinder/commit/4e1a5022d4c91e3ecfe9be5c3ac7cc488093bd2e.patch"; + sha256 = "08llmgp6r11bq5s820j3fs9bgriaibkhq8r3v2av064w66mwp48x"; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ fftw ]; diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix index bd383ffe39c4..270e4632aef1 100644 --- a/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.6.4"; + version = "0.6.5"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "4J+4RcMpJwCnrBPDsx1mns072+vL/hMo66I3bOvkAWI="; + sha256 = "8iq+l3za5AX2hbdRUOf7FVsseJa0cA/VSr5ohA9m6cA="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/bcg729/default.nix b/pkgs/development/libraries/bcg729/default.nix index 125512c3fed6..ff5840b8373f 100644 --- a/pkgs/development/libraries/bcg729/default.nix +++ b/pkgs/development/libraries/bcg729/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} + ''; + meta = with lib; { description = "Opensource implementation of both encoder and decoder of the ITU G729 Annex A/B speech codec"; homepage = "https://linphone.org/technical-corner/bcg729"; diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 1e74ddfc721e..513ae50298e2 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , autoreconfHook -# doc: https://github.com/ivmai/bdwgc/blob/v8.0.6/doc/README.macros (LARGE_CONFIG) +# doc: https://github.com/ivmai/bdwgc/blob/v8.2.2/doc/README.macros (LARGE_CONFIG) , enableLargeConfig ? false , enableMmap ? true , nixVersions @@ -10,22 +10,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "boehm-gc"; - version = "8.0.6"; + version = "8.2.2"; src = fetchurl { urls = [ - "https://www.hboehm.info/gc/gc_source/gc-${finalAttrs.version}.tar.gz" + # "https://www.hboehm.info/gc/gc_source/gc-${finalAttrs.version}.tar.gz" "https://github.com/ivmai/bdwgc/releases/download/v${finalAttrs.version}/gc-${finalAttrs.version}.tar.gz" ]; - sha256 = "sha256-O0kUq8n6dlk1lnc+TaZx1+1NU5Dj1G+/Ll8VXhIb6hE="; + sha256 = "sha256-8wEHvLBi4JIKeQ//+lbZUSNIVGhZNkwjoUviZLOINqA="; }; outputs = [ "out" "dev" "doc" ]; separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; - # boehm-gc whitelists GCC threading models - patches = lib.optional stdenv.hostPlatform.isMinGW ./mcfgthread.patch; - configureFlags = [ "--enable-cplusplus" "--with-libatomic-ops=none" @@ -33,9 +30,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional enableMmap "--enable-mmap" ++ lib.optional enableLargeConfig "--enable-large-config"; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isMinGW autoreconfHook; - - doCheck = true; + # `gctest` fails under emulation on aarch64-darwin + doCheck = !(stdenv.isDarwin && stdenv.isx86_64); enableParallelBuilding = true; diff --git a/pkgs/development/libraries/boehm-gc/mcfgthread.patch b/pkgs/development/libraries/boehm-gc/mcfgthread.patch deleted file mode 100644 index c4aa996aebd7..000000000000 --- a/pkgs/development/libraries/boehm-gc/mcfgthread.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -277,7 +277,7 @@ case "$THREADS" in - ;; - esac - ;; -- win32) -+ win32 | mcf) - AC_DEFINE(GC_THREADS) - use_parallel_mark=$enable_parallel_mark - if test "${enable_parallel_mark}" != no \ diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index d52c3cb560c0..9c2072179b26 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -28,8 +28,6 @@ # We must build at least one type of libraries assert enableShared || enableStatic; -# Python isn't supported when cross-compiling -assert enablePython -> stdenv.hostPlatform == stdenv.buildPlatform; assert enableNumpy -> enablePython; # Boost <1.69 can't be built on linux with clang >8, because pth was removed diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix index 50a9bf62c54b..5929c9dcbd3b 100644 --- a/pkgs/development/libraries/cglm/default.nix +++ b/pkgs/development/libraries/cglm/default.nix @@ -17,6 +17,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} + ''; + meta = with lib; { homepage = "https://github.com/recp/cglm"; description = "Highly Optimized Graphics Math (glm) for C"; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index aacb8581c8fc..2bf1162fe192 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = [ gtk3 ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config gobject-introspection ]; propagatedBuildInputs = [ libX11 libGL libGLU libXext libXfixes libXdamage libXcomposite libXi cogl pango atk json-glib gobject-introspection libxcb libinput libgudev libxkbcommon diff --git a/pkgs/development/libraries/cm256cc/default.nix b/pkgs/development/libraries/cm256cc/default.nix index 09b0ffba98ba..3a2538898cce 100644 --- a/pkgs/development/libraries/cm256cc/default.nix +++ b/pkgs/development/libraries/cm256cc/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost ]; + # https://github.com/f4exb/cm256cc/issues/16 + postPatch = '' + substituteInPlace libcm256cc.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + meta = with lib; { description = "Fast GF(256) Cauchy MDS Block Erasure Codec in C++"; homepage = "https://github.com/f4exb/cm256cc"; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index e58a500cf838..7eef53e4c625 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config libintl automake autoconf ]; + nativeBuildInputs = [ pkg-config libintl automake autoconf gobject-introspection ]; configureFlags = [ "--enable-introspection" @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional gstreamerSupport "--enable-cogl-gst" ++ lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; + # TODO: this shouldn't propagate so many things + # especially not gobject-introspection propagatedBuildInputs = with xorg; [ glib gdk-pixbuf gobject-introspection wayland mesa libGL libXrandr libXfixes libXcomposite libXdamage diff --git a/pkgs/development/libraries/cxxopts/default.nix b/pkgs/development/libraries/cxxopts/default.nix index 5d12b3c19ee3..cf36a88a35be 100644 --- a/pkgs/development/libraries/cxxopts/default.nix +++ b/pkgs/development/libraries/cxxopts/default.nix @@ -31,6 +31,12 @@ stdenv.mkDerivation rec { # Conflict on case-insensitive filesystems. dontUseCmakeBuildDir = true; + # https://github.com/jarro2783/cxxopts/issues/332 + postPatch = '' + substituteInPlace packaging/pkgconfig.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { homepage = "https://github.com/jarro2783/cxxopts"; description = "Lightweight C++ GNU-style option parser library"; diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 6d11d8bfc8a3..36a4c56bbaf7 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace library/rt/backendmanager.cpp --subst-var out + + # https://sourceforge.net/p/drumstick/bugs/39/ + substituteInPlace drumstick-alsa.pc.in drumstick-file.pc.in drumstick-rt.pc.in drumstick-widgets.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ ''; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/dsdcc/default.nix b/pkgs/development/libraries/dsdcc/default.nix index 5eb4c8dc4640..a992eac27cb0 100644 --- a/pkgs/development/libraries/dsdcc/default.nix +++ b/pkgs/development/libraries/dsdcc/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { "-DUSE_MBELIB=ON" ]; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/libdsdcc.pc \ + --replace '=''${exec_prefix}//' '=/' + ''; + meta = with lib; { description = "Digital Speech Decoder (DSD) rewritten as a C++ library"; homepage = "https://github.com/f4exb/dsdcc"; diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index b6d4cd29f7e1..54df7be6f1ba 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -24,6 +24,17 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace cmake/FindOpenJPEG.cmake --replace openjpeg-2.1 ${openjpeg.incDir} + + # https://github.com/ecmwf/ecbuild/issues/40 + substituteInPlace cmake/ecbuild_config.h.in \ + --replace @CMAKE_INSTALL_PREFIX@/@INSTALL_LIB_DIR@ @eccodes_FULL_INSTALL_LIB_DIR@ \ + --replace @CMAKE_INSTALL_PREFIX@/@INSTALL_BIN_DIR@ @eccodes_FULL_INSTALL_BIN_DIR@ + substituteInPlace cmake/pkg-config.pc.in \ + --replace '$'{prefix}/@INSTALL_LIB_DIR@ @eccodes_FULL_INSTALL_LIB_DIR@ \ + --replace '$'{prefix}/@INSTALL_INCLUDE_DIR@ @eccodes_FULL_INSTALL_INCLUDE_DIR@ \ + --replace '$'{prefix}/@INSTALL_BIN_DIR@ @eccodes_FULL_INSTALL_BIN_DIR@ + substituteInPlace cmake/ecbuild_install_project.cmake \ + --replace '$'{CMAKE_INSTALL_PREFIX}/'$'{INSTALL_INCLUDE_DIR} '$'{'$'{PROJECT_NAME}_FULL_INSTALL_INCLUDE_DIR} ''; nativeBuildInputs = [ cmake gfortran perl ]; diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix index 7c87580aea11..01d4b88246a8 100644 --- a/pkgs/development/libraries/entt/default.nix +++ b/pkgs/development/libraries/entt/default.nix @@ -12,6 +12,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # https://github.com/skypjack/entt/issues/890 + postPatch = '' + substituteInPlace cmake/in/entt.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { homepage = "https://github.com/skypjack/entt"; description = "A header-only, tiny and easy to use library for game programming and much more written in modern C++"; diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index cb7b8214c57d..bfe8f80032dd 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { buildInputs = [ ffmpeg libpng libjpeg ]; cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ]; + # https://github.com/dirkvdb/ffmpegthumbnailer/issues/215 + postPatch = '' + substituteInPlace libffmpegthumbnailer.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + meta = with lib; { homepage = "https://github.com/dirkvdb/ffmpegthumbnailer"; description = "A lightweight video thumbnailer"; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 0f866eeb9ec9..116d3c9ce40d 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -59,6 +59,12 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" "-fpermissive" ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/libfolly.pc \ + --replace '=''${prefix}//' '=/' \ + --replace '=''${exec_prefix}//' '=/' + ''; + # folly-config.cmake, will `find_package` these, thus there should be # a way to ensure abi compatibility. passthru = { diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index fc356d6f0034..ff7aa2fbdda8 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { postPatch = '' cp -r ${gtest.src} googletest chmod -R u+w googletest + + # https://github.com/google/benchmark/issues/1396 + substituteInPlace cmake/benchmark.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ ''; doCheck = true; diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index cb833272923f..1241ae2a63f5 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -46,10 +46,11 @@ stdenv.mkDerivation rec { wrapGAppsHook vala shared-mime-info + gnupg + openssh ]; buildInputs = [ - gnupg libgcrypt libtasn1 pango diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index b55b5c19228a..e69ea93bb121 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -3,6 +3,7 @@ , fetchurl , fetchpatch , meson +, mesonEmulatorHook , ninja , pkg-config , gettext @@ -53,6 +54,8 @@ stdenv.mkDerivation rec { gtk-doc docbook-xsl-nons gobject-introspection + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index 1ad8f1027c19..3691dc164077 100644 --- a/pkgs/development/libraries/getdns/default.nix +++ b/pkgs/development/libraries/getdns/default.nix @@ -29,6 +29,13 @@ in rec { buildInputs = [ libidn2 openssl unbound ]; + # https://github.com/getdnsapi/getdns/issues/517 + postPatch = '' + substituteInPlace getdns.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + postInstall = "rm -r $out/share/doc"; meta = with lib; diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index 0cf505660040..6c5f797a0981 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -2,6 +2,7 @@ , lib , fetchurl , meson +, mesonEmulatorHook , ninja , pkg-config , exiv2 @@ -35,13 +36,13 @@ stdenv.mkDerivation rec { gtk-doc docbook-xsl-nons docbook_xml_dtd_43 + (python3.pythonForBuild.withPackages (ps: [ ps.pygobject3 ])) + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ glib - # Python binding overrides - python3 - python3.pkgs.pygobject3 ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index c8e28236aa3c..e24211590054 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -2,6 +2,7 @@ , lib , stdenv , meson +, mesonEmulatorHook , ninja , pkg-config , gnome @@ -55,15 +56,17 @@ in stdenv.mkDerivation rec { makeWrapper which # for locale detection libxml2 # for xml-stripblanks + dbus # for dbus-run-session + gobject-introspection + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ - gobject-introspection cairo readline libsysprof-capture spidermonkey_91 - dbus # for dbus-run-session ]; checkInputs = [ diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 0316deee7bcc..942231ebb3ea 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -5,7 +5,6 @@ , buildPackages # this is just for tests (not in the closure of any regular package) -, doCheck ? config.doCheckByDefault or false , coreutils, dbus, libxml2, tzdata , desktop-file-utils, shared-mime-info , darwin, fetchpatch @@ -43,12 +42,12 @@ let ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glib"; version = "2.72.3"; src = fetchurl { - url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; sha256 = "Sjmi9iS4US1QDVhAFz7af6hfUcEJBS6ugGrOzoXTRfA="; }; @@ -90,14 +89,23 @@ stdenv.mkDerivation rec { # 3. Tools for desktop environment that cannot go to $bin due to $out depending on them ($out) # * gio-launch-desktop ./split-dev-programs.patch - ] ++ optional doCheck ./skip-timer-test.patch; + + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2866 + (fetchpatch { + name = "tests-skip-g-file-info-test-if-atime-unsupported.patch"; + url = "https://gitlab.gnome.org/qyliss/glib/-/commit/339a06d66685107280ca6bdca5da5d96b8222fb5.patch"; + sha256 = "sha256-/NdFkuiJvyass3jTDEJPeciA2Lwe53IUd3kAnKAvTaw="; + }) + + ./skip-timer-test.patch + ]; outputs = [ "bin" "out" "dev" "devdoc" ]; setupHook = ./setup-hook.sh; buildInputs = [ - libelf setupHook pcre + libelf finalAttrs.setupHook pcre ] ++ optionals (!stdenv.hostPlatform.isWindows) [ bash gnum4 # install glib-gettextize and m4 macros for other apps to use ] ++ optionals stdenv.isLinux [ @@ -154,11 +162,25 @@ stdenv.mkDerivation rec { patchShebangs glib/gen-unicode-tables.pl patchShebangs glib/tests/gen-casefold-txt.py patchShebangs glib/tests/gen-casemap-txt.py + + # Needs machine-id, comment the test + sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c + sed -e '/g_test_add_func/ s/^\/*/\/\//' -i gio/tests/gdbus-address-get-session.c + # All gschemas fail to pass the test, upstream bug? + sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c + # Cannot reproduce the failing test_associations on hydra + sed -e '/\/appinfo\/associations/d' -i gio/tests/appinfo.c + # Needed because of libtool wrappers + sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c '' + lib.optionalString stdenv.hostPlatform.isWindows '' substituteInPlace gio/win32/meson.build \ --replace "libintl, " "" ''; + postConfigure = '' + patchShebangs gio/gdbus-2.0/codegen/gdbus-codegen gobject/glib-{genmarshal,mkenums} + ''; + DETERMINISTIC_BUILD = 1; postInstall = '' @@ -167,7 +189,7 @@ stdenv.mkDerivation rec { sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|" # This file is *included* in gtk3 and would introduce runtime reference via __FILE__. - sed '1i#line 1 "${pname}-${version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ + sed '1i#line 1 "glib-${finalAttrs.version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c for i in $bin/bin/*; do moveToOutput "share/bash-completion/completions/''${i##*/}" "$bin" @@ -190,8 +212,8 @@ stdenv.mkDerivation rec { checkInputs = [ tzdata desktop-file-utils shared-mime-info ]; - preCheck = optionalString doCheck '' - export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${pname}-${version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + preCheck = optionalString finalAttrs.doCheck or config.doCheckByDefault or false '' + export LD_LIBRARY_PATH="$NIX_BUILD_TOP/glib-${finalAttrs.version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" export TZDIR="${tzdata}/share/zoneinfo" export XDG_CACHE_HOME="$TMP" export XDG_RUNTIME_HOME="$TMP" @@ -200,22 +222,8 @@ stdenv.mkDerivation rec { export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon" export PATH="$PATH:$(pwd)/gobject" echo "PATH=$PATH" - - substituteInPlace gio/tests/desktop-files/home/applications/epiphany-weather-for-toronto-island-9c6a4e022b17686306243dada811d550d25eb1fb.desktop \ - --replace "Exec=/bin/true" "Exec=${coreutils}/bin/true" - # Needs machine-id, comment the test - sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c - sed -e '/g_test_add_func/ s/^\/*/\/\//' -i gio/tests/gdbus-unix-addresses.c - # All gschemas fail to pass the test, upstream bug? - sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c - # Cannot reproduce the failing test_associations on hydra - sed -e '/\/appinfo\/associations/d' -i gio/tests/appinfo.c - # Needed because of libtool wrappers - sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c ''; - inherit doCheck; - separateDebugInfo = stdenv.isLinux; passthru = rec { @@ -226,6 +234,8 @@ stdenv.mkDerivation rec { getSchemaPath = pkg: makeSchemaPath pkg pkg.name; getSchemaDataDirPath = pkg: makeSchemaDataDirPath pkg pkg.name; + tests.withChecks = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; }); + inherit flattenInclude; updateScript = gnome.updateScript { packageName = "glib"; @@ -247,4 +257,4 @@ stdenv.mkDerivation rec { set of utility functions for strings and common data structures. ''; }; -} +}) diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix index bada8b3f31f7..d2cf0f89cb07 100644 --- a/pkgs/development/libraries/glibc/locales.nix +++ b/pkgs/development/libraries/glibc/locales.nix @@ -19,19 +19,26 @@ callPackage ./common.nix { inherit stdenv; } { extraNativeBuildInputs = [ glibc ]; - # Awful hack: `localedef' doesn't allow the path to `locale-archive' - # to be overriden, but you *can* specify a prefix, i.e. it will use - # //lib/locale/locale-archive. So we use - # $TMPDIR as a prefix, meaning that the locale-archive is placed in - # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive. - buildPhase = - '' + LOCALEDEF_FLAGS = [ + (if stdenv.hostPlatform.isLittleEndian + then "--little-endian" + else "--big-endian") + ]; + + buildPhase = '' + # Awful hack: `localedef' doesn't allow the path to `locale-archive' + # to be overriden, but you *can* specify a prefix, i.e. it will use + # //lib/locale/locale-archive. So we use + # $TMPDIR as a prefix, meaning that the locale-archive is placed in + # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive. + LOCALEDEF_FLAGS+=" --prefix=$TMPDIR" + mkdir -p $TMPDIR/"${buildPackages.glibc.out}/lib/locale" echo 'C.UTF-8/UTF-8 \' >> ../glibc-2*/localedata/SUPPORTED # Hack to allow building of the locales (needed since glibc-2.12) - sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef --prefix='$TMPDIR',' ../glibc-2*/localedata/Makefile + sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef $(LOCALEDEF_FLAGS),' ../glibc-2*/localedata/Makefile '' + lib.optionalString (!allLocales) '' # Check that all locales to be built are supported diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix index 0b3d6689cb0b..498641bbdc30 100644 --- a/pkgs/development/libraries/gnome-menus/default.nix +++ b/pkgs/development/libraries/gnome-menus/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0" ]; - nativeBuildInputs = [ pkg-config gettext ]; - buildInputs = [ glib gobject-introspection ]; + nativeBuildInputs = [ pkg-config gettext gobject-introspection ]; + buildInputs = [ glib ]; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index bb07d8c792ce..175a149e5c6b 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -27,6 +27,12 @@ # it may be worth thinking about using multiple derivation outputs # In that case its about 6MB which could be separated +let + pythonModules = pp: [ + pp.Mako + pp.markdown + ]; +in stdenv.mkDerivation (finalAttrs: { pname = "gobject-introspection"; version = "1.72.0"; @@ -58,6 +64,8 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + strictDeps = true; + nativeBuildInputs = [ meson ninja @@ -67,12 +75,13 @@ stdenv.mkDerivation (finalAttrs: { gtk-doc docbook-xsl-nons docbook_xml_dtd_45 - python3 + # Build definition checks for the Python modules needed at runtime by importing them. + (buildPackages.python3.withPackages pythonModules) finalAttrs.setupHook # move .gir files - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ gobject-introspection-unwrapped ]; + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ gobject-introspection-unwrapped ]; buildInputs = [ - python3 + (python3.withPackages pythonModules) ]; checkInputs = lib.optionals stdenv.isDarwin [ @@ -86,16 +95,15 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "--datadir=${placeholder "dev"}/share" - "-Ddoctool=disabled" "-Dcairo=disabled" "-Dgtk_doc=${lib.boolToString (stdenv.hostPlatform == stdenv.buildPlatform)}" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ "-Dgi_cross_ldd_wrapper=${substituteAll { name = "g-ir-scanner-lddwrapper"; isExecutable = true; src = ./wrappers/g-ir-scanner-lddwrapper.sh; inherit (buildPackages) bash; - buildobjdump = "${buildPackages.stdenv.cc.bintools}/bin/objdump"; + buildlddtree = "${buildPackages.pax-utils}/bin/lddtree"; }}" "-Dgi_cross_use_prebuilt_gi=true" "-Dgi_cross_binary_wrapper=${stdenv.hostPlatform.emulator buildPackages}" @@ -130,6 +138,14 @@ stdenv.mkDerivation (finalAttrs: { rm $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} ''; + # add self to buildInputs to avoid needing to add gobject-introspection to buildInputs in addition to nativeBuildInputs + # builds use target-pkg-config to look for gobject-introspection instead of just looking for binaries in $PATH + # wrapper uses depsTargetTargetPropagated so ignore it + preFixup = lib.optionalString (!lib.hasSuffix "-wrapped" finalAttrs.pname) '' + mkdir -p $dev/nix-support + echo "$out" > $dev/nix-support/propagated-target-target-deps + ''; + setupHook = ./setup-hook.sh; passthru = { diff --git a/pkgs/development/libraries/gobject-introspection/wrapper.nix b/pkgs/development/libraries/gobject-introspection/wrapper.nix index 4b3fa1a19819..f887b7d18c77 100644 --- a/pkgs/development/libraries/gobject-introspection/wrapper.nix +++ b/pkgs/development/libraries/gobject-introspection/wrapper.nix @@ -18,6 +18,7 @@ in (gobject-introspection-unwrapped.override args).overrideAttrs (previousAttrs: { pname = "gobject-introspection-wrapped"; + depsTargetTargetPropagated = [ gobject-introspection-unwrapped ]; postFixup = (previousAttrs.postFixup or "") + '' mv $dev/bin/g-ir-compiler $dev/bin/.g-ir-compiler-wrapped mv $dev/bin/g-ir-scanner $dev/bin/.g-ir-scanner-wrapped @@ -25,16 +26,16 @@ in ( export bash="${buildPackages.bash}" export emulator=${lib.escapeShellArg (stdenv.targetPlatform.emulator buildPackages)} - export buildobjdump="${buildPackages.stdenv.cc.bintools}/bin/objdump" + export emulatorwrapper="$dev/bin/g-ir-scanner-qemuwrapper" + export buildlddtree="${buildPackages.pax-utils}/bin/lddtree" export targetgir="${lib.getDev (targetPackages.gobject-introspection-unwrapped.override argsForTarget)}" substituteAll "${./wrappers/g-ir-compiler.sh}" "$dev/bin/g-ir-compiler" substituteAll "${./wrappers/g-ir-scanner.sh}" "$dev/bin/g-ir-scanner" substituteAll "${./wrappers/g-ir-scanner-lddwrapper.sh}" "$dev/bin/g-ir-scanner-lddwrapper" - chmod +x "$dev/bin/g-ir-compiler" - chmod +x "$dev/bin/g-ir-scanner" - chmod +x "$dev/bin/g-ir-scanner-lddwrapper" + substituteAll "${./wrappers/g-ir-scanner-qemuwrapper.sh}" "$dev/bin/g-ir-scanner-qemuwrapper" + chmod +x $dev/bin/g-ir-* ) '' # when cross-compiling and using the wrapper then when a package looks up the g_ir_X diff --git a/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-compiler.sh b/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-compiler.sh index 69642831c8a0..e82de18cae3d 100644 --- a/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-compiler.sh +++ b/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-compiler.sh @@ -1,4 +1,4 @@ #! @bash@/bin/bash # shellcheck shell=bash -exec @emulator@ @targetgir@/bin/g-ir-compiler "$@" +exec @emulatorwrapper@ @targetgir@/bin/g-ir-compiler "$@" diff --git a/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-lddwrapper.sh b/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-lddwrapper.sh index 1bf9c3659dc5..f9c2a29f1442 100644 --- a/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-lddwrapper.sh +++ b/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-lddwrapper.sh @@ -1,4 +1,4 @@ #! @bash@/bin/bash # shellcheck shell=bash -exec @buildobjdump@ -p "$@" +exec @buildlddtree@ "$@" diff --git a/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-qemuwrapper.sh b/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-qemuwrapper.sh new file mode 100644 index 000000000000..9b407bc4144a --- /dev/null +++ b/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-qemuwrapper.sh @@ -0,0 +1,23 @@ +#! @bash@/bin/bash +# shellcheck shell=bash + +# fixes issues like +# libdbusmenu-gtk3-aarch64-unknown-linux-gnu> /build/libdbusmenu-16.04.0/libdbusmenu-gtk/tmp-introspect2jhtiwwn/.libs/DbusmenuGtk3-0.4: +# error while loading shared libraries: libdbusmenu-glib.so.4: cannot open shared object file: No such file or directory +# in non-meson builds + +# see: https://github.com/void-linux/void-packages/blob/master/srcpkgs/gobject-introspection/files/g-ir-scanner-qemuwrapper +# https://github.com/openembedded/openembedded-core/blob/c5a14f39a6717a99b510cb97aa2fb403d4b98d99/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.72.0.bb#L74 +while read -r d; do \ + # some meson projects may have subprojects which use makefiles for docs(e.g. gi-docgen), ignore those as they will never be needed + if [[ -f "$d/Makefile" && "$d" != *"subproject"* ]]; then + GIR_EXTRA_LIBS_PATH="$(readlink -f "$d/.libs"):$GIR_EXTRA_LIBS_PATH" + export GIR_EXTRA_LIBS_PATH + fi +done < <(find "$NIX_BUILD_TOP" -type d) + +# quoting broke the build of atk +# shellcheck disable=2086 +exec @emulator@ ${GIR_EXTRA_OPTIONS:-} \ + ${GIR_EXTRA_LIBS_PATH:+-E LD_LIBRARY_PATH="${GIR_EXTRA_LIBS_PATH}"} \ + "$@" diff --git a/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner.sh b/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner.sh index 6a222191c7b2..7843bb91db97 100644 --- a/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner.sh +++ b/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner.sh @@ -2,6 +2,6 @@ # shellcheck shell=bash exec @dev@/bin/.g-ir-scanner-wrapped \ - --use-binary-wrapper=@emulator@ \ + --use-binary-wrapper=@emulatorwrapper@ \ --use-ldd-wrapper=@dev@/bin/g-ir-scanner-lddwrapper \ "$@" diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index 2c5cade6b69c..18acca3f6915 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -42,6 +42,14 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace external/googleapis/CMakeLists.txt \ --replace "https://github.com/googleapis/googleapis/archive/\''${GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" "file://${googleapis}" + + # https://github.com/googleapis/google-cloud-cpp/issues/8992 + for file in external/googleapis/config.pc.in google/cloud/{,*/}config.pc.in; do + substituteInPlace "$file" \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_BINDIR@ @CMAKE_INSTALL_FULL_BINDIR@ + done ''; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index b883c549da54..baf42430c299 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -5,6 +5,7 @@ , nix-update-script , pkg-config , meson +, mesonEmulatorHook , ninja , python3 , mutest @@ -21,8 +22,8 @@ stdenv.mkDerivation rec { pname = "graphene"; version = "1.10.8"; - outputs = [ "out" ] - ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" "installedTests" ]; + outputs = [ "out" "dev" "devdoc" ] + ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "installedTests" ]; src = fetchFromGitHub { owner = "ebassi"; @@ -59,6 +60,8 @@ stdenv.mkDerivation rec { gobject-introspection python3 makeWrapper + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ @@ -70,8 +73,8 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" - "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" + "-Dgtk_doc=true" + "-Dintrospection=enabled" "-Dinstalled_test_datadir=${placeholder "installedTests"}/share" "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec" ]; @@ -80,7 +83,6 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs tests/gen-installed-test.py - '' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' PATH=${python3.withPackages (pp: [ pp.pygobject3 pp.tappy ])}/bin:$PATH patchShebangs tests/introspection.py ''; diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index 16897c6f0446..2f8c291da0d6 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -2,6 +2,7 @@ , lib , fetchurl , meson +, mesonEmulatorHook , ninja , pkg-config , gettext @@ -47,6 +48,8 @@ stdenv.mkDerivation rec { gtk-doc docbook-xsl-nons docbook_xml_dtd_43 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index acc143cd5566..8a26742ce23e 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -30,10 +30,6 @@ stdenv.mkDerivation rec { gobject-introspection ]; - mesonFlags = [ - "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" - ]; - postPatch = '' chmod +x build-aux/meson/post-install.py patchShebangs build-aux/meson/post-install.py diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index d4bd149e64e3..9592fd116766 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -1,4 +1,5 @@ { lib, stdenv +, buildPackages , fetchurl , pkg-config , libxml2 @@ -38,10 +39,10 @@ stdenv.mkDerivation rec { libxml2 autoreconfHook gtk-doc + glib ]; buildInputs = [ - glib gtk3 icu ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ @@ -53,6 +54,11 @@ stdenv.mkDerivation rec { enchant2 ]; + configureFlags = [ + "GLIB_COMPILE_RESOURCES=${lib.getDev buildPackages.glib}/bin/glib-compile-resources" + "GLIB_MKENUMS=${lib.getDev buildPackages.glib}/bin/glib-mkenums" + ]; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index be7509d4cfbf..b378c81c89f4 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -85,6 +85,7 @@ , srt , vo-aacenc , libfreeaptx +, zxing-cpp , VideoToolbox , AudioToolbox , AVFoundation @@ -171,6 +172,7 @@ stdenv.mkDerivation rec { srt vo-aacenc libfreeaptx + zxing-cpp ] ++ lib.optionals enableZbar [ zbar ] ++ lib.optionals faacSupport [ @@ -259,7 +261,6 @@ stdenv.mkDerivation rec { "-Dwasapi=disabled" # not packaged in nixpkgs as of writing / no Windows support "-Dwasapi2=disabled" # not packaged in nixpkgs as of writing / no Windows support "-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing - "-Dzxing=disabled" # required `zxing-cpp` library not packaged in nixpkgs as of writing "-Disac=disabled" # depends on `webrtc-audio-coding-1` not compatible with 0.3 "-Dgs=disabled" # depends on `google-cloud-cpp` "-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index d23eef0201fc..64e7a745e954 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -42,6 +42,7 @@ , vulkan-headers , wayland , wayland-protocols +, wayland-scanner , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux , cups @@ -77,6 +78,10 @@ stdenv.mkDerivation rec { sha256 = "XOjY3piiO9DI7KGmEJThwAm18AncvWC0XpkKjbG3Qv0="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ gettext gobject-introspection @@ -88,6 +93,7 @@ stdenv.mkDerivation rec { sassc gi-docgen libxml2 # for xmllint + wayland-scanner ] ++ setupHooks; buildInputs = [ @@ -183,6 +189,14 @@ stdenv.mkDerivation rec { chmod +x ''${files[@]} patchShebangs ''${files[@]} + + '' + + # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) + # it should be a build-time dep for build + # TODO: send upstream + '' + substituteInPlace meson.build \ + --replace "'gi-docgen', ver" "'gi-docgen', native:true, ver" ''; preInstall = '' diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 420dee6cbaaf..7245b9749303 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, libepoxy, gnome }: +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, libepoxy, gnome, glib, gdk-pixbuf }: stdenv.mkDerivation rec { pname = "gtkmm"; @@ -11,7 +11,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config meson ninja python3 ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + python3 + glib + gdk-pixbuf # for gdk-pixbuf-pixdata + ]; buildInputs = [ libepoxy ]; propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ]; diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index e3dac6c4ec70..af24e46efe2a 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -4,7 +4,7 @@ }: let - pythonEnv = python3.withPackages(ps: with ps; [ + pythonEnv = python3.pythonForBuild.withPackages(ps: with ps; [ setuptools ]); in diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index 44f49adbd3a6..baaa07d7e7ea 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, readline, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { - version = "1.7.0"; + version = "1.7.1"; pname = "hunspell"; src = fetchFromGitHub { @@ -18,11 +18,6 @@ stdenv.mkDerivation rec { patches = [ ./0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch - (fetchpatch { - name = "CVE-2019-16707.patch"; - url = "https://github.com/hunspell/hunspell/commit/ac938e2ecb48ab4dd21298126c7921689d60571b.patch"; - sha256 = "0bwfksz87iy7ikx3fb54zd5ww169qfm9kl076hsch3cs8p30s8az"; - }) ]; postPatch = '' diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index b274999010a2..e4168299c182 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -1,10 +1,15 @@ -{ mkDerivation, lib, cmake, pkg-config }: +{ mkDerivation, lib, fetchpatch, cmake, pkg-config }: mkDerivation { pname = "extra-cmake-modules"; patches = [ ./nix-lib-path.patch + # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/268 + (fetchpatch { + url = "https://invent.kde.org/frameworks/extra-cmake-modules/-/commit/5862a6f5b5cd7ed5a7ce2af01e44747c36318220.patch"; + sha256 = "10y36fc3hnpmcsmjgfxn1rp4chj5yrhgghj7m8gbmcai1q5jr0xj"; + }) ]; outputs = [ "out" ]; # this package has no runtime components diff --git a/pkgs/development/libraries/libabigail/default.nix b/pkgs/development/libraries/libabigail/default.nix index d18b5e11cf90..844a30cc89aa 100644 --- a/pkgs/development/libraries/libabigail/default.nix +++ b/pkgs/development/libraries/libabigail/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libabigail"; - version = "2.0"; + version = "2.1"; outputs = [ "bin" "out" "dev" ]; src = fetchurl { url = "https://mirrors.kernel.org/sourceware/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-NwSul6Vr8HbKCPtd6msh25mPu/FMT53hKCS3jbU7b9o="; + sha256 = "sha256-SmKX1B0V0ZNiVhFxFr1hKW5rm+4j1UoMr40/WrjdzEw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index 8dfc222f36ac..e20ad1c954d1 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, meson, ninja, glib, check, python3, vala, gtk-doc, glibcLocales +{ lib, stdenv, fetchFromGitLab, meson, mesonEmulatorHook, ninja, glib, check, python3, vala, gtk-doc, glibcLocales , libxml2, libxslt, pkg-config, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }: stdenv.mkDerivation rec { @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { ninja pkg-config vala + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ @@ -38,6 +40,12 @@ stdenv.mkDerivation rec { sqlite ]; + # TODO: send patch upstream to make running tests optional + postPatch = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + substituteInPlace meson.build \ + --replace "subdir('tests')" "" + ''; + LC_ALL = "en_US.UTF-8"; mesonFlags = [ diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 0d9678e038d0..c60390f4f4e7 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -33,6 +33,10 @@ stdenv.mkDerivation rec { hash = "sha256-3lH7Vi9M8k+GSrCpvruRpLrIpMoOakKbcJlaAc/FK+U="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ gi-docgen meson @@ -40,6 +44,7 @@ stdenv.mkDerivation rec { pkg-config sassc vala + gobject-introspection ]; mesonFlags = [ @@ -50,7 +55,6 @@ stdenv.mkDerivation rec { buildInputs = [ fribidi - gobject-introspection ] ++ lib.optionals stdenv.isDarwin [ AppKit Foundation diff --git a/pkgs/development/libraries/libargs/default.nix b/pkgs/development/libraries/libargs/default.nix index f75f556fb0de..3b27df772117 100644 --- a/pkgs/development/libraries/libargs/default.nix +++ b/pkgs/development/libraries/libargs/default.nix @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # https://github.com/Taywee/args/issues/108 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '$'{CMAKE_INSTALL_LIBDIR_ARCHIND} '$'{CMAKE_INSTALL_LIBDIR} + substituteInPlace packaging/pkgconfig.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { description = "A simple header-only C++ argument parser library"; homepage = "https://github.com/Taywee/args"; diff --git a/pkgs/development/libraries/libbtbb/default.nix b/pkgs/development/libraries/libbtbb/default.nix index 2e2b95c2d8c7..e0e70005e25f 100644 --- a/pkgs/development/libraries/libbtbb/default.nix +++ b/pkgs/development/libraries/libbtbb/default.nix @@ -13,6 +13,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + # https://github.com/greatscottgadgets/libbtbb/issues/63 + postPatch = '' + substituteInPlace lib/libbtbb.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { description = "Bluetooth baseband decoding library"; homepage = "https://github.com/greatscottgadgets/libbtbb"; diff --git a/pkgs/development/libraries/libcamera/default.nix b/pkgs/development/libraries/libcamera/default.nix index 3841c205b7b9..ab2095be8fcd 100644 --- a/pkgs/development/libraries/libcamera/default.nix +++ b/pkgs/development/libraries/libcamera/default.nix @@ -5,8 +5,6 @@ , ninja , pkg-config , makeFontsConf -, boost -, gnutls , openssl , libdrm , libevent @@ -23,12 +21,12 @@ stdenv.mkDerivation { pname = "libcamera"; - version = "unstable-2022-07-15"; + version = "unstable-2022-09-15"; src = fetchgit { url = "https://git.libcamera.org/libcamera/libcamera.git"; - rev = "e9b6b362820338d0546563444e7b1767f5c7044c"; - hash = "sha256-geqFcMBHcVe7dPdVOal8V2pVItYUdoC+5isISqRG4Wc="; + rev = "74ab3f778c848b20cbf8fe299170756ff6ebab1a"; + hash = "sha256-w0I4L6xXTBUdqj30LpVW/KZW6bdoUeoW9lnMOW0OLJY="; }; postPatch = '' @@ -39,8 +37,7 @@ stdenv.mkDerivation { buildInputs = [ # IPA and signing - gnutls - boost + openssl # gstreamer integration gst_all_1.gstreamer diff --git a/pkgs/development/libraries/libcork/default.nix b/pkgs/development/libraries/libcork/default.nix index 3875ff91185a..305ba24e280e 100644 --- a/pkgs/development/libraries/libcork/default.nix +++ b/pkgs/development/libraries/libcork/default.nix @@ -16,14 +16,20 @@ stdenv.mkDerivation rec { sha256 = "152gqnmr6wfmflf5l6447am4clmg3p69pvy3iw7yhaawjqa797sk"; }; - # N.B. We need to create this file, otherwise it tries to use git to - # determine the package version, which we do not want. - # - # N.B. We disable tests by force, since their build is broken. postPatch = '' + # N.B. We need to create this file, otherwise it tries to use git to + # determine the package version, which we do not want. echo "${version}" > .version-stamp echo "${version}" > .commit-stamp + + # N.B. We disable tests by force, since their build is broken. sed -i '/add_subdirectory(tests)/d' ./CMakeLists.txt + + # https://github.com/dcreager/libcork/issues/173 + substituteInPlace cmake/FindCTargets.cmake \ + --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} \ + --replace '\$'{datarootdir}/'$'{base_docdir} '$'{CMAKE_INSTALL_FULL_DOCDIR} ''; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 22ef87e43d04..aa808d5b4aa8 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -3,6 +3,7 @@ , fetchurl , ninja , meson +, mesonEmulatorHook , pkg-config , vala , gobject-introspection @@ -43,6 +44,8 @@ stdenv.mkDerivation rec { glib ] ++ lib.optionals stdenv.isLinux [ xvfb-run + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 84025e24f659..00fc506add7f 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { sha256 = "1yd6rsds03kwx5jki4hihd2bpfh26g5l1pi82qzaqzarixdxwzvl"; excludes = [ "ChangeLog" ]; }) + # in master post 1.4.2, see https://github.com/Matroska-Org/libebml/issues/97 + (fetchpatch { + name = "fix-pkg-config.patch"; + url = "https://github.com/Matroska-Org/libebml/commit/42fbae35d291b737f2bb4ad5d643fd0d48537a88.patch"; + sha256 = "020qp4a3l60mcm4n310ynxbbv5qlpmybb9xy10pjvx4brp83pmy3"; + }) ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix index 656923da3d15..c91cb23189f7 100644 --- a/pkgs/development/libraries/libebur128/default.nix +++ b/pkgs/development/libraries/libebur128/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ speexdsp ]; + # https://github.com/jiixyj/libebur128/issues/121 + postPatch = '' + substituteInPlace ebur128/libebur128.pc.cmake \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + meta = with lib; { description = "Implementation of the EBU R128 loudness standard"; homepage = "https://github.com/jiixyj/libebur128"; diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index 6d894da17d0e..07873f4197e3 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { doCheck = true; + preConfigure = if !stdenv.hostPlatform.useAndroidPrebuilt then null else '' + sed -i 's|DISTSUBDIRS = lib po|DISTSUBDIRS = lib|g' Makefile.in + sed -i 's|SUBDIRS = lib @POSUB@|SUBDIRS = lib|g' Makefile.in + ''; + configureFlags = [] # Configure check for dynamic lib support is broken, see # http://lists.uclibc.org/pipermail/uclibc-cvs/2005-August/019383.html diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index 957c21342524..5efd751bbb1e 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome }: +{ lib, stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome, gobject-introspection }: stdenv.mkDerivation rec { pname = "libgnomekbd"; @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { intltool pkg-config wrapGAppsHook + glib + gobject-introspection ]; # Requires in libgnomekbd.pc @@ -25,6 +27,11 @@ stdenv.mkDerivation rec { glib ]; + postPatch = '' + substituteInPlace libgnomekbd/Makefile.in \ + --replace "shell pkg-config" 'shell $(PKG_CONFIG)' + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 30324b04d850..6897ed5a0973 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -55,6 +55,14 @@ stdenv.mkDerivation rec { patchShebangs ./tests/ ''; + # checking pkg-config is at least version 0.9.0... ./configure: line 15213: no: command not found + # configure: error: in `/build/libgsf-1.14.50': + # configure: error: The pkg-config script could not be found or is too old. Make sure it + # is in your PATH or set the PKG_CONFIG environment variable to the full + preConfigure = '' + export PKG_CONFIG="$(command -v "$PKG_CONFIG")" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index bc9a04685840..77a4b936ae54 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -35,6 +35,10 @@ stdenv.mkDerivation rec { ./fix-pkgconfig.patch ]; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja @@ -43,8 +47,7 @@ stdenv.mkDerivation rec { vala gi-docgen gobject-introspection - python3 - python3.pkgs.pygobject3 + (python3.pythonForBuild.withPackages (ps: [ ps.pygobject3 ])) ]; buildInputs = [ @@ -63,6 +66,18 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs build-aux/meson/meson_post_install.py patchShebangs build-aux/meson/gen_locations_variant.py + + # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) + # it should be a build-time dep for build + # TODO: send upstream + substituteInPlace doc/meson.build \ + --replace "'gi-docgen', ver" "'gi-docgen', native:true, ver" \ + --replace "'gi-docgen', req" "'gi-docgen', native:true, req" + + # gir works for us even when cross-compiling + # TODO: send upstream because downstream users can use the option to disable gir if they don't have it working + substituteInPlace libgweather/meson.build \ + --replace "g_ir_scanner.found() and not meson.is_cross_build()" "g_ir_scanner.found()" ''; postFixup = '' diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 468062beaefb..58d9097d8378 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" - ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ] ++ lib.optionals enableGlade [ "glade" @@ -43,6 +42,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-R3iL01gE69M8sJkR6XU0TIQ1ngttlSCv0cgh66i6d/8="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ gobject-introspection gi-docgen @@ -70,9 +73,8 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" + "-Dgtk_doc=true" "-Dglade_catalog=${if enableGlade then "enabled" else "disabled"}" - "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" ]; # Uses define_variable in pkg-config, but we still need it to use the glade output diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index df564812178e..57786cad761f 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, zlib, gperf}: +{ lib, stdenv, fetchurl, zlib, gperf_3_0 }: stdenv.mkDerivation rec { pname = "libid3tag"; @@ -12,7 +12,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; setOutputFlags = false; - propagatedBuildInputs = [ zlib gperf ]; + strictDeps = true; + + nativeBuildInputs = [ gperf_3_0 ]; + + buildInputs = [ zlib ]; patches = [ ./debian-patches.patch diff --git a/pkgs/development/libraries/libiio/cmake-fix-libxml2-find-package.patch b/pkgs/development/libraries/libiio/cmake-fix-libxml2-find-package.patch index 25345bef90c4..034f6d32c7d1 100644 --- a/pkgs/development/libraries/libiio/cmake-fix-libxml2-find-package.patch +++ b/pkgs/development/libraries/libiio/cmake-fix-libxml2-find-package.patch @@ -1,13 +1,13 @@ diff --color -ur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2021-05-30 13:46:22.256040282 +0200 -+++ b/CMakeLists.txt 2021-05-30 14:15:42.530181216 +0200 -@@ -333,7 +333,7 @@ - # So, try first to find the CMake module provided by libxml2 package, then fallback - # on the CMake's FindLibXml2.cmake module (which can lack some definition, especially - # in static build case). --find_package(LibXml2 QUIET NO_MODULE) -+find_package(LibXml2 QUIET MODULE) - if(DEFINED LIBXML2_VERSION_STRING) - set(LIBXML2_FOUND ON) - set(LIBXML2_INCLUDE_DIR ${LIBXML2_INCLUDE_DIRS}) +--- a/CMakeLists.txt 2022-06-02 02:57:01.503340155 +0300 ++++ b/CMakeLists.txt 2022-06-02 02:54:33.726941188 +0300 +@@ -378,7 +378,7 @@ + # So, try first to find the CMake module provided by libxml2 package, then fallback + # on the CMake's FindLibXml2.cmake module (which can lack some definition, especially + # in static build case). +- find_package(LibXml2 QUIET NO_MODULE) ++ find_package(LibXml2 QUIET MODULE) + if(DEFINED LIBXML2_VERSION_STRING) + set(LIBXML2_FOUND ON) + set(LIBXML2_INCLUDE_DIR ${LIBXML2_INCLUDE_DIRS}) Seulement dans b: good.patch diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index e704076ab57a..400da08cab32 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -6,13 +6,15 @@ , libxml2 , python , libusb1 +, avahi +, libaio , runtimeShell , lib }: stdenv.mkDerivation rec { pname = "libiio"; - version = "0.21"; + version = "0.23"; outputs = [ "out" "lib" "dev" "python" ]; @@ -20,7 +22,7 @@ stdenv.mkDerivation rec { owner = "analogdevicesinc"; repo = "libiio"; rev = "v${version}"; - sha256 = "0psw67mzysdb8fkh8xpcwicm7z94k8plkcc8ymxyvl6inshq0mc7"; + sha256 = "0awny9zb43dcnxa5jpxay2zxswydblnbn4x6vi5mlw1r48pzhjf8"; }; # Revert after https://github.com/NixOS/nixpkgs/issues/125008 is @@ -37,6 +39,8 @@ stdenv.mkDerivation rec { python libxml2 libusb1 + avahi + libaio ] ++ lib.optional python.isPy3k python.pkgs.setuptools; cmakeFlags = [ diff --git a/pkgs/development/libraries/libjxl/default.nix b/pkgs/development/libraries/libjxl/default.nix index 461a3579ddef..567d985fd3d4 100644 --- a/pkgs/development/libraries/libjxl/default.nix +++ b/pkgs/development/libraries/libjxl/default.nix @@ -35,6 +35,13 @@ stdenv.mkDerivation rec { }; patches = [ + # present in master, see https://github.com/libjxl/libjxl/pull/1403 + (fetchpatch { + name = "prefixless-pkg-config.patch"; + url = "https://github.com/libjxl/libjxl/commit/0b906564bfbfd8507d61c5d6a447f545f893227c.patch"; + sha256 = "1g5c6lrsmgxb9j64pjy8lbdgbvw834m5jyfivy9ppmd8iiv0kkq4"; + }) + # present in master, remove after 0.7? (fetchpatch { name = "fix-link-lld-macho.patch"; diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index ace169a8cce0..33ec04734f5b 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { pname = "liblouis"; version = "3.23.0"; - outputs = [ "out" "dev" "man" "info" "doc" ]; + outputs = [ "out" "dev" "info" "doc" ] + # configure: WARNING: cannot generate manual pages while cross compiling + ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "man" ]; src = fetchFromGitHub { owner = "liblouis"; diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index a89bf9fc4ab9..1d5d13259bb2 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config , libebml }: stdenv.mkDerivation rec { @@ -12,6 +12,15 @@ stdenv.mkDerivation rec { sha256 = "01dg12ndxfdqgjx5v2qy4mff6xjdxglywyg82sr3if5aw6rp3dji"; }; + # in master post 1.6.3, see https://github.com/Matroska-Org/libmatroska/issues/62 + patches = [ + (fetchpatch { + name = "fix-pkg-config.patch"; + url = "https://github.com/Matroska-Org/libmatroska/commit/53f6ea573878621871bca5f089220229fcb33a3b.patch"; + sha256 = "1lcxl3n32kk5x4aa4ja7p68km7qb2bwscavpv7qdmbhp3w5ia0mk"; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libebml ]; diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix index 531ff8584fac..e8898698dca1 100644 --- a/pkgs/development/libraries/libmediaart/default.nix +++ b/pkgs/development/libraries/libmediaart/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome }: +{ lib, stdenv, fetchurl, meson, mesonEmulatorHook, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome }: stdenv.mkDerivation rec { pname = "libmediaart"; @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { sha256 = "w7xQJdfbOAWH+cjrgAxhH2taFta0t4/P+T9ih2pnfxc="; }; - nativeBuildInputs = [ meson ninja pkg-config vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkg-config vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; + buildInputs = [ glib gdk-pixbuf ]; mesonFlags = [ diff --git a/pkgs/development/libraries/libmodule/default.nix b/pkgs/development/libraries/libmodule/default.nix index d77d2bcbdcd7..dd98908f3111 100644 --- a/pkgs/development/libraries/libmodule/default.nix +++ b/pkgs/development/libraries/libmodule/default.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation rec { pkg-config ]; + # https://github.com/FedeDP/libmodule/issues/7 + postPatch = '' + substituteInPlace Extra/libmodule.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { description = "C simple and elegant implementation of an actor library"; homepage = "https://github.com/FedeDP/libmodule"; diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix index 3ec800f890fe..edb692d512d7 100644 --- a/pkgs/development/libraries/libmpack/default.nix +++ b/pkgs/development/libraries/libmpack/default.nix @@ -10,9 +10,11 @@ stdenv.mkDerivation rec { sha256 = "0rai5djdkjz7bsn025k5489in7r1amagw1pib0z4qns6b52kiar2"; }; - nativeBuildInputs = [ libtool ]; - - makeFlags = [ "LIBTOOL=libtool" "PREFIX=$(out)" "config=release" ]; + makeFlags = [ + "LIBTOOL=${libtool}/bin/libtool" + "PREFIX=$(out)" + "config=release" + ]; meta = with lib; { description = "Simple implementation of msgpack in C"; diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/development/libraries/libnats-c/default.nix index 7c72b6774994..b39cb7be189a 100644 --- a/pkgs/development/libraries/libnats-c/default.nix +++ b/pkgs/development/libraries/libnats-c/default.nix @@ -20,6 +20,12 @@ stdenv.mkDerivation rec { separateDebugInfo = true; outputs = [ "out" "dev" ]; + # https://github.com/nats-io/nats.c/issues/542 + postPatch = '' + substituteInPlace src/libnats.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + meta = with lib; { description = "C API for the NATS messaging system"; homepage = "https://github.com/nats-io/nats.c"; diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index 712592431abe..95e56153e51c 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { sha256 = "1iVSD6AuiXcCmyRq5Dm8IYloll8egtYSIItxPx3MPQ4="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ pkg-config meson diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/development/libraries/libportal/default.nix index 93ca52c243c6..005bc2126652 100644 --- a/pkgs/development/libraries/libportal/default.nix +++ b/pkgs/development/libraries/libportal/default.nix @@ -40,6 +40,10 @@ stdenv.mkDerivation rec { }) ]; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index eea7eeb88fc7..0f75c8d1f4e5 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -20,6 +20,13 @@ mkDerivation rec { "-DQuotient_ENABLE_E2EE=OFF" ]; + # https://github.com/quotient-im/libQuotient/issues/551 + postPatch = '' + substituteInPlace Quotient.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { description = "A Qt5 library to write cross-platform clients for Matrix"; homepage = "https://matrix.org/docs/projects/sdk/quotient"; diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index f9e8ae22923e..dd202d4a2954 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "libssh"; - version = "0.9.6"; + version = "0.10.0"; src = fetchurl { url = "https://www.libssh.org/files/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-hrz4hb2bgEZv4OBUU8WLh332GvqLqUeljDVtfw+rgps="; + sha256 = "sha256-DcFYxTTNg4rQt4WoLexYbeQNp+CWUjrmwIybe9KvC1c="; }; postPatch = '' diff --git a/pkgs/development/libraries/libstemmer/default.nix b/pkgs/development/libraries/libstemmer/default.nix index 835d13d51b4f..3f66ee92a72e 100644 --- a/pkgs/development/libraries/libstemmer/default.nix +++ b/pkgs/development/libraries/libstemmer/default.nix @@ -1,21 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, perl, buildPackages }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libstemmer"; - version = "unstable-2017-03-02"; + version = "2.2.0"; src = fetchFromGitHub { - owner = "zvelo"; - repo = "libstemmer"; - rev = "78c149a3a6f262a35c7f7351d3f77b725fc646cf"; - sha256 = "06md6n6h1f2zvnjrpfrq7ng46l1x12c14cacbrzmh5n0j98crpq7"; + owner = "snowballstem"; + repo = "snowball"; + rev = "v${version}"; + sha256 = "sha256-qXrypwv/I+5npvGHGsHveijoui0ZnoGYhskCfLkewVE="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ perl ]; + + prePatch = '' + patchShebangs . + '' + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + substituteInPlace GNUmakefile \ + --replace './snowball' '${lib.getBin buildPackages.libstemmer}/bin/snowball' + ''; + + makeTarget = "libstemmer.a"; + + installPhase = '' + runHook preInstall + install -Dt $out/lib libstemmer.a + install -Dt $out/include include/libstemmer.h + install -Dt $out/bin {snowball,stemwords} + runHook postInstall + ''; meta = with lib; { description = "Snowball Stemming Algorithms"; - homepage = "http://snowball.tartarus.org/"; + homepage = "https://snowballstem.org/"; license = licenses.bsd3; maintainers = with maintainers; [ fpletz ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/development/libraries/libsurvive/default.nix index 02c4ddffd78a..dc282886b963 100644 --- a/pkgs/development/libraries/libsurvive/default.nix +++ b/pkgs/development/libraries/libsurvive/default.nix @@ -34,6 +34,13 @@ stdenv.mkDerivation rec { eigen ]; + # https://github.com/cntools/libsurvive/issues/272 + postPatch = '' + substituteInPlace survive.pc.in \ + libs/cnkalman/cnkalman.pc.in libs/cnkalman/libs/cnmatrix/cnmatrix.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + meta = with lib; { description = "Open Source Lighthouse Tracking System"; homepage = "https://github.com/cntools/libsurvive"; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 7f6d11d9e715..a87513174fb7 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/libtiff/libtiff/-/commit/275735d0354e39c0ac1dc3c0db2120d6f31d1990.patch"; sha256 = "sha256-faKsdJjvQwNdkAKjYm4vubvZvnULt9zz4l53zBFr67s="; }) + (fetchpatch { + name = "CVE-2022-2953.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/48d6ece8389b01129e7d357f0985c8f938ce3da3.patch"; + sha256 = "sha256-h9hulV+dnsUt/2Rsk4C1AKdULkvweM2ypIJXYQ3BqQU="; + }) ]; postPatch = '' diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 412446f215f8..09788cfef71d 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -25,6 +25,18 @@ in stdenv.mkDerivation { buildInputs = [ boostPython openssl zlib python ncurses ] ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ]; + # https://github.com/arvidn/libtorrent/issues/6865 + postPatch = '' + substituteInPlace cmake/Modules/GeneratePkgConfig.cmake \ + --replace @CMAKE_INSTALL_PREFIX@/'$<'1: '$<'1: + substituteInPlace cmake/Modules/GeneratePkgConfig/target-compile-settings.cmake.in \ + --replace 'set(_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@")' \ + 'set(_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@") + set(_INSTALL_FULL_LIBDIR "@CMAKE_INSTALL_FULL_LIBDIR@")' + substituteInPlace cmake/Modules/GeneratePkgConfig/pkg-config.cmake.in \ + --replace '$'{prefix}/@_INSTALL_LIBDIR@ @_INSTALL_FULL_LIBDIR@ + ''; + postInstall = '' moveToOutput "include" "$dev" moveToOutput "lib/${python.libPrefix}" "$python" diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index 25214242b531..7c0868509f09 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -15,6 +15,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; + # https://github.com/Aetf/libtsm/issues/20 + postPatch = '' + substituteInPlace etc/libtsm.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { description = "Terminal-emulator State Machine"; homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/"; diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/development/libraries/libunarr/default.nix index 523ce82ce22d..94269e85c66d 100644 --- a/pkgs/development/libraries/libunarr/default.nix +++ b/pkgs/development/libraries/libunarr/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # https://github.com/selmf/unarr/issues/23 + postPatch = '' + substituteInPlace pkg-config.pc.cmake \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { homepage = "https://github.com/selmf/unarr"; description = "A lightweight decompression library with support for rar, tar and zip archives"; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index c4571feb81ef..474afc4ba6ca 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , zlib , pkg-config , autoreconfHook @@ -21,15 +22,16 @@ stdenv.mkDerivation rec { pname = "libxml2"; - version = "2.9.14"; + version = "2.10.0"; - outputs = [ "bin" "dev" "out" "man" "doc" ] + outputs = [ "bin" "dev" "out" "doc" ] ++ lib.optional pythonSupport "py" ++ lib.optional (enableStatic && enableShared) "static"; + outputMan = "bin"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1vnzk33wfms348lgz9pvkq9li7jm44pvm73lbr3w1khwgljlmmv0"; + sha256 = "LdMxEOp3hnbeFL6kmZ7hFzxMpV1f8UUryiJOBvAVJZU="; }; patches = [ @@ -45,9 +47,18 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/pull/63174 # https://github.com/NixOS/nixpkgs/pull/72342 ./utf8-xmlErrorFuncHandler.patch - ]; - strictDeps = true; + # Fix PostgreSQL tests + # https://gitlab.gnome.org/GNOME/libxml2/-/issues/397 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/4ad71c2d72beef0d10cf75aa417db10d77846f75.patch"; + sha256 = "gubGDhBhHNYdEty+sFQFd3pSWB9isN5AjD//ksujGQk="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/5b2d07a72670513e41b481a9d922c983a64027ca.patch"; + sha256 = "7jYvMW6bgImXubbaWpQhrIw3xBBnaNn+iJt3EQiW3yU="; + }) + ]; nativeBuildInputs = [ pkg-config @@ -88,6 +99,7 @@ stdenv.mkDerivation rec { installFlags = lib.optionals pythonSupport [ "pythondir=\"${placeholder "py"}/${python.sitePackages}\"" + "pyexecdir=\"${placeholder "py"}/${python.sitePackages}\"" ]; enableParallelBuilding = true; @@ -110,7 +122,6 @@ stdenv.mkDerivation rec { postFixup = '' moveToOutput bin/xml2-config "$dev" moveToOutput lib/xml2Conf.sh "$dev" - moveToOutput share/man/man1 "$bin" '' + lib.optionalString (enableStatic && enableShared) '' moveToOutput lib/libxml2.a "$static" ''; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 0b7432136144..29c693891162 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -16,13 +16,14 @@ stdenv.mkDerivation rec { pname = "libxslt"; - version = "1.1.35"; + version = "1.1.36"; - outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py"; + outputs = [ "bin" "dev" "out" "doc" "devdoc" ] ++ lib.optional pythonSupport "py"; + outputMan = "bin"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "gkfzPpqHLGrIWapFAYvExNALl+L+rJ7rwQyTzh803Xk="; + sha256 = "EoSPCkQI9ltTDTlizZ/2cLaueWGRz+/zdSK1dy3o3I4="; }; nativeBuildInputs = [ @@ -58,11 +59,10 @@ stdenv.mkDerivation rec { postFixup = '' moveToOutput bin/xslt-config "$dev" moveToOutput lib/xsltConf.sh "$dev" - moveToOutput share/man/man1 "$bin" '' + lib.optionalString pythonSupport '' mkdir -p $py/nix-support echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs - moveToOutput ${python.libPrefix} "$py" + moveToOutput ${python.sitePackages} "$py" ''; passthru = { diff --git a/pkgs/development/libraries/libzra/default.nix b/pkgs/development/libraries/libzra/default.nix index 3ebfc21095d1..feb0f1840b4d 100644 --- a/pkgs/development/libraries/libzra/default.nix +++ b/pkgs/development/libraries/libzra/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # in submodule dev as of 1.4.7 + postPatch = '' + (cd submodule/zstd && patch -Np1 < ${./fix-pkg-config.patch}) + ''; + meta = with lib; { homepage = "https://github.com/zraorg/ZRA"; description = "Library for ZStandard random access"; diff --git a/pkgs/development/libraries/libzra/fix-pkg-config.patch b/pkgs/development/libraries/libzra/fix-pkg-config.patch new file mode 100644 index 000000000000..5b0d40a4233f --- /dev/null +++ b/pkgs/development/libraries/libzra/fix-pkg-config.patch @@ -0,0 +1,150 @@ +From 7be7e35d61d8d499599623502a35460d410de114 Mon Sep 17 00:00:00 2001 +From: Alexander Shpilkin +Date: Thu, 26 May 2022 16:03:27 +0300 +Subject: [PATCH] Squashed commit of the following: + +commit 9aacb9d5da65a64c3845937a6f9eede329d43989 +Author: W. Felix Handte +Date: Tue Dec 8 20:46:02 2020 -0500 + + Apply Same Strategy to CMake + + (cherry picked from commit a75f9ce3e924564ab358c2c1aa95b6268383ec42) + +commit e21b7ad0d98d1322ea92f99fcd1f85e2d6b6f6b7 +Author: W. Felix Handte +Date: Tue Dec 8 20:10:05 2020 -0500 + + Avoid Use of Regexes in Building Package-Config File + + (cherry picked from commit b521183c74795bd9bdd9bdebe74af01cae4d3d43) +--- + build/cmake/lib/CMakeLists.txt | 29 ++++++++++++++++++++++++---- + lib/Makefile | 35 ++++++++++++++++------------------ + lib/libzstd.pc.in | 6 +++--- + 3 files changed, 44 insertions(+), 26 deletions(-) + +diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt +index 32ae7525..466c2c7b 100644 +--- a/build/cmake/lib/CMakeLists.txt ++++ b/build/cmake/lib/CMakeLists.txt +@@ -137,12 +137,33 @@ endif () + if (UNIX) + # pkg-config + set(PREFIX "${CMAKE_INSTALL_PREFIX}") +- set(LIBDIR "${CMAKE_INSTALL_LIBDIR}") +- set(INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}") ++ set(EXEC_PREFIX "\\$$\{prefix}") ++ set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}") ++ set(INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}") + set(VERSION "${zstd_VERSION}") ++ ++ string(LENGTH "${PREFIX}" PREFIX_LENGTH) ++ string(SUBSTRING "${LIBDIR}" 0 ${PREFIX_LENGTH} LIBDIR_PREFIX) ++ string(SUBSTRING "${LIBDIR}" ${PREFIX_LENGTH} -1 LIBDIR_SUFFIX) ++ string(SUBSTRING "${INCLUDEDIR}" 0 ${PREFIX_LENGTH} INCLUDEDIR_PREFIX) ++ string(SUBSTRING "${INCLUDEDIR}" ${PREFIX_LENGTH} -1 INCLUDEDIR_SUFFIX) ++ ++ if ("${INCLUDEDIR_PREFIX}" STREQUAL "${PREFIX}") ++ set(INCLUDEDIR_PREFIX "\\$$\{prefix}") ++ endif() ++ if ("${LIBDIR_PREFIX}" STREQUAL "${PREFIX}") ++ set(LIBDIR_PREFIX "\\$$\{exec_prefix}") ++ endif() ++ + add_custom_target(libzstd.pc ALL +- ${CMAKE_COMMAND} -DIN="${LIBRARY_DIR}/libzstd.pc.in" -DOUT="libzstd.pc" +- -DPREFIX="${PREFIX}" -DLIBDIR="${LIBDIR}" -DINCLUDEDIR="${INCLUDEDIR}" -DVERSION="${VERSION}" ++ ${CMAKE_COMMAND} ++ -DIN="${LIBRARY_DIR}/libzstd.pc.in" ++ -DOUT="libzstd.pc" ++ -DPREFIX="${PREFIX}" ++ -DEXEC_PREFIX="${EXEC_PREFIX}" ++ -DINCLUDEDIR="${INCLUDEDIR_PREFIX}${INCLUDEDIR_SUFFIX}" ++ -DLIBDIR="${LIBDIR_PREFIX}${LIBDIR_SUFFIX}" ++ -DVERSION="${VERSION}" + -P "${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig.cmake" + COMMENT "Creating pkg-config file") + +diff --git a/lib/Makefile b/lib/Makefile +index 4a9ab799..2893ec21 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -257,6 +257,8 @@ ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD Ne + + all: libzstd.pc + ++HAS_EXPLICIT_EXEC_PREFIX := $(if $(or $(EXEC_PREFIX),$(exec_prefix)),1,) ++ + DESTDIR ?= + # directory variables : GNU conventions prefer lowercase + # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html +@@ -270,24 +272,17 @@ LIBDIR ?= $(libdir) + includedir ?= $(PREFIX)/include + INCLUDEDIR ?= $(includedir) + +-PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n $(SED_ERE_OPT) -e "s@^$(EXEC_PREFIX)(/|$$)@@p") +-PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n $(SED_ERE_OPT) -e "s@^$(PREFIX)(/|$$)@@p") ++PCINCDIR := $(patsubst $(PREFIX)%,%,$(INCLUDEDIR)) ++PCLIBDIR := $(patsubst $(EXEC_PREFIX)%,%,$(LIBDIR)) + +-ifeq (,$(PCLIBDIR)) +-# Additional prefix check is required, since the empty string is technically a +-# valid PCLIBDIR +-ifeq (,$(shell echo "$(LIBDIR)" | sed -n $(SED_ERE_OPT) -e "\\@^$(EXEC_PREFIX)(/|$$)@ p")) +-$(error configured libdir ($(LIBDIR)) is outside of prefix ($(PREFIX)), can't generate pkg-config file) +-endif +-endif ++# If we successfully stripped off a prefix, we'll add a reference to the ++# relevant pc variable. ++PCINCPREFIX := $(if $(findstring $(INCLUDEDIR),$(PCINCDIR)),,$${prefix}) ++PCLIBPREFIX := $(if $(findstring $(LIBDIR),$(PCLIBDIR)),,$${exec_prefix}) + +-ifeq (,$(PCINCDIR)) +-# Additional prefix check is required, since the empty string is technically a +-# valid PCINCDIR +-ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n $(SED_ERE_OPT) -e "\\@^$(PREFIX)(/|$$)@ p")) +-$(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(EXEC_PREFIX)), can't generate pkg-config file) +-endif +-endif ++# If no explicit EXEC_PREFIX was set by the caller, write it out as a reference ++# to PREFIX, rather than as a resolved value. ++PCEXEC_PREFIX := $(if $(HAS_EXPLICIT_EXEC_PREFIX),$(EXEC_PREFIX),$${prefix}) + + ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly)) + PKGCONFIGDIR ?= $(PREFIX)/libdata/pkgconfig +@@ -308,9 +303,11 @@ INSTALL_DATA ?= $(INSTALL) -m 644 + libzstd.pc: + libzstd.pc: libzstd.pc.in + @echo creating pkgconfig +- $(Q)@sed $(SED_ERE_OPT) -e 's|@PREFIX@|$(PREFIX)|' \ +- -e 's|@LIBDIR@|$(PCLIBDIR)|' \ +- -e 's|@INCLUDEDIR@|$(PCINCDIR)|' \ ++ $(Q)@sed $(SED_ERE_OPT) \ ++ -e 's|@PREFIX@|$(PREFIX)|' \ ++ -e 's|@EXEC_PREFIX@|$(PCEXEC_PREFIX)|' \ ++ -e 's|@INCLUDEDIR@|$(PCINCPREFIX)$(PCINCDIR)|' \ ++ -e 's|@LIBDIR@|$(PCLIBPREFIX)$(PCLIBDIR)|' \ + -e 's|@VERSION@|$(VERSION)|' \ + $< >$@ + +diff --git a/lib/libzstd.pc.in b/lib/libzstd.pc.in +index 8ec0235a..8465c977 100644 +--- a/lib/libzstd.pc.in ++++ b/lib/libzstd.pc.in +@@ -3,9 +3,9 @@ + # BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) + + prefix=@PREFIX@ +-exec_prefix=${prefix} +-includedir=${prefix}/@INCLUDEDIR@ +-libdir=${exec_prefix}/@LIBDIR@ ++exec_prefix=@EXEC_PREFIX@ ++includedir=@INCLUDEDIR@ ++libdir=@LIBDIR@ + + Name: zstd + Description: fast lossless compression algorithm library +-- +2.36.0 + diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 68b3b86a9eec..8e9561ecd49c 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,6 +1,9 @@ { lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, help2man, python3, alsa-lib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }: +let + pythonEnv = python3.pythonForBuild.withPackages (p: with p; [ pyyaml setuptools ]); +in stdenv.mkDerivation rec { pname = "lirc"; version = "0.10.1"; @@ -34,6 +37,10 @@ stdenv.mkDerivation rec { # Pull fix for new pyyaml pending upstream inclusion # https://sourceforge.net/p/lirc/git/merge-requests/39/ substituteInPlace python-pkg/lirc/database.py --replace 'yaml.load(' 'yaml.safe_load(' + + # cant import '/build/lirc-0.10.1/python-pkg/lirc/_client.so' while cross-compiling to check the version + substituteInPlace python-pkg/setup.py \ + --replace "VERSION='0.0.0'" "VERSION='${version}'" ''; preConfigure = '' @@ -41,10 +48,15 @@ stdenv.mkDerivation rec { touch lib/lirc/input_map.inc ''; - nativeBuildInputs = [ autoreconfHook pkg-config help2man - (python3.withPackages (p: with p; [ pyyaml setuptools ])) ]; + strictDeps = true; - buildInputs = [ alsa-lib xlibsWrapper libxslt systemd libusb-compat-0_1 libftdi1 ]; + nativeBuildInputs = [ autoreconfHook help2man libxslt pythonEnv ]; + + depsBuildBuild = [ pkg-config ]; + + buildInputs = [ alsa-lib xlibsWrapper systemd libusb-compat-0_1 libftdi1 ]; + + DEVINPUT_HEADER = "include/linux/input-event-codes.h"; configureFlags = [ "--sysconfdir=/etc" @@ -53,6 +65,7 @@ stdenv.mkDerivation rec { "--enable-uinput" # explicit activation because build env has no uinput "--enable-devinput" # explicit activation because build env has no /dev/input "--with-lockdir=/run/lirc/lock" # /run/lock is not writable for 'lirc' user + "PYTHON=${pythonEnv.interpreter}" ]; installFlags = [ diff --git a/pkgs/development/libraries/miniz/default.nix b/pkgs/development/libraries/miniz/default.nix index d390a019a52a..8592dc5f1224 100644 --- a/pkgs/development/libraries/miniz/default.nix +++ b/pkgs/development/libraries/miniz/default.nix @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + postFixup = '' + substituteInPlace "$out"/share/pkgconfig/miniz.pc \ + --replace '=''${prefix}//' '=/' \ + --replace '=''${exec_prefix}//' '=/' + ''; + meta = with lib; { description = "Single C source file zlib-replacement library"; homepage = "https://github.com/richgel999/miniz"; diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 9c2c21384612..b050c8d0caf3 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -70,6 +70,11 @@ mkDerivation rec { "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" ]; + postFixup = '' + substituteInPlace "$dev"/lib/pkgconfig/mlt-framework-7.pc \ + --replace '=''${prefix}//' '=/' + ''; + passthru = { inherit ffmpeg; }; diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index 32987d649922..5ee10c854a55 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -1,10 +1,20 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch +, fetchurl , openssl , cmake }: +let + + joinpaths-src = fetchurl { + url = "https://github.com/AnotherFoxGuy/CMakeCM/raw/afe41f4536ae21f6f11f83e8c0b8b8c450ef1332/modules/JoinPaths.cmake"; + hash = "sha256-eUsNj6YqO3mMffEtUBFFgNGkeiNL+2tNgwkutkam7MQ="; + }; + +in stdenv.mkDerivation rec { pname = "mysocketw"; version = "3.11.0"; @@ -16,6 +26,15 @@ stdenv.mkDerivation rec { hash = "sha256-mpfhmKE2l59BllkOjmURIfl17lAakXpmGh2x9SFSaAo="; }; + patches = [ + # in master post 3.11.0, see https://github.com/RigsOfRods/socketw/issues/16 + (fetchpatch { + name = "fix-pkg-config.patch"; + url = "https://github.com/RigsOfRods/socketw/commit/17cad062c3673bd0da74a2fecadb01dbf9813a07.patch"; + sha256 = "01b019gfm01g0r1548cizrf7mqigsda8jnrzhg8dhi9c49nfw1bp"; + }) + ]; + nativeBuildInputs = [ cmake ]; @@ -24,6 +43,12 @@ stdenv.mkDerivation rec { openssl ]; + postUnpack = ''( + mkdir -p source/build/_cmcm-modules/resolved && cd $_ + cp ${joinpaths-src} JoinPaths.cmake + printf %s 'https://AnotherFoxGuy.com/CMakeCM::modules/JoinPaths.cmake.1' > JoinPaths.cmake.whence + )''; + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace src/Makefile \ --replace -Wl,-soname, -Wl,-install_name,$out/lib/ diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index e7290d54c0b8..d7b7409dad14 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -21,6 +21,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # https://github.com/nanomsg/nanomsg/issues/1082 + postPatch = '' + substituteInPlace src/pkgconfig.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + meta = with lib; { description= "Socket library that provides several common communication patterns"; homepage = "https://nanomsg.org/"; diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index 5250dcddf845..4a00044bb557 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { - version = "0.32.2"; + version = "0.32.3"; pname = "neon"; src = fetchurl { url = "https://notroj.github.io/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-mGVmRoxilfxdD7FBpZgeMcn4LuOOk4N0q+2Ece8vsoY="; + sha256 = "sha256-lMuHXcbb/N7ljwObdjxnSwIyiGzf16Xekb5c36K3WWo="; }; patches = optionals stdenv.isDarwin [ ./darwin-fix-configure.patch ]; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index ca8cb6418190..6d28b79565e7 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -31,11 +31,11 @@ assert enableJemalloc -> enableApp; stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.47.0"; + version = "1.49.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "11d6w8iqrhnxmjd9ss9fzf66f7a32d48h2ihyk1580lg8d3rkj07"; + sha256 = "sha256-LNTbfXX3FJQVMknL6UoJLaTG7NdCQPirGM9kTZ1l9u4="; }; outputs = [ "bin" "out" "dev" "lib" ] diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index 41bf84c5b69b..1633de12e434 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nghttp3"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q9rXvMeCXhyytiaGekRlowCYKzvq8aktfN0lk+VPG78="; + sha256 = "sha256-MZ5ynaGZTzO2w0hGHII19PFC0+kjfd+IlcsenGGgMgg="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/notcurses/default.nix b/pkgs/development/libraries/notcurses/default.nix index 21b10ad4ed15..a0a5ddfa9c2d 100644 --- a/pkgs/development/libraries/notcurses/default.nix +++ b/pkgs/development/libraries/notcurses/default.nix @@ -44,6 +44,22 @@ stdenv.mkDerivation rec { lib.optional (qrcodegenSupport) "-DUSE_QRCODEGEN=ON" ++ lib.optional (!multimediaSupport) "-DUSE_MULTIMEDIA=none"; + # https://github.com/dankamongmen/notcurses/issues/2661 + postPatch = '' + substituteInPlace tools/notcurses-core.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + substituteInPlace tools/notcurses-ffi.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + substituteInPlace tools/notcurses++.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + substituteInPlace tools/notcurses.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { homepage = "https://github.com/dankamongmen/notcurses"; description = "Blingful TUIs and character graphics"; diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 44d172dba859..7aa0b485bed0 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "nspr"; - version = "4.34.1"; + version = "4.35"; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - hash = "sha256-xbg1TEi2Mrj0wZcGKBRsDgwMqPMscxXX1XNsAC4Dd08="; + hash = "sha256-fqMpfqWWm10lpd2NR/JEPNqI6e50YwH24eFCb4pqvI8="; }; patches = [ diff --git a/pkgs/development/libraries/nss/esr.nix b/pkgs/development/libraries/nss/esr.nix index a789f0306d32..b4a566030d07 100644 --- a/pkgs/development/libraries/nss/esr.nix +++ b/pkgs/development/libraries/nss/esr.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "3.68.4"; - hash = "sha256-K5/T9aG0nzs7KdEgAmdPcEgRViV1b7R3KELsfDm+Fgs="; + version = "3.79.1"; + hash = "sha256-NwxS5niE0dnCG5d+lzPcwYzIR2WmsgGBT77VDCbfThQ="; } diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index 47a265687122..8c205d73287f 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { doCheck = true; + postPatch = '' + substituteInPlace olm.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { description = "Implements double cryptographic ratchet and Megolm ratchet"; homepage = "https://gitlab.matrix.org/matrix-org/olm"; diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index fa1d5af48042..b9471d681937 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -17,9 +17,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-MVM0qCZDWcO7/Hnco+0dBqzBLcWD279xjx0slxxlc4w="; }; - # this will make it find its own data files (e.g. HRTF profiles) - # without any other configuration - patches = [ ./search-out.patch ]; + patches = [ + # this will make it find its own data files (e.g. HRTF profiles) + # without any other configuration + ./search-out.patch + ]; postPatch = '' substituteInPlace core/helpers.cpp \ --replace "@OUT@" $out @@ -46,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "OpenAL alternative"; - homepage = "https://kcat.strangesoft.net/openal.html"; + homepage = "https://openal-soft.org/"; license = licenses.lgpl2; maintainers = with maintainers; [ftrvxmtrx]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/opencolorio/1.x.nix b/pkgs/development/libraries/opencolorio/1.x.nix index 1b58faf54438..7622ebbe43eb 100644 --- a/pkgs/development/libraries/opencolorio/1.x.nix +++ b/pkgs/development/libraries/opencolorio/1.x.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { # External libyamlcpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517 "-DUSE_EXTERNAL_YAML=OFF" ] ++ lib.optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON" - ++ lib.optional (!stdenv.hostPlatform.isx86) "-DOCIO_USE_SSE=OFF"; + ++ lib.optional (!stdenv.hostPlatform.isx86) "-DOCIO_USE_SSE=OFF" + ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-DCMAKE_OSX_ARCHITECTURES=arm64"; postInstall = '' mkdir -p $bin/bin; mv $out/bin $bin/ diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index dd6c31792b10..53a37da01fd6 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -65,6 +65,13 @@ stdenv.mkDerivation rec { # TODO Investigate this: Python and GPU tests fail to load libOpenColorIO.so.2.0 # doCheck = true; + # https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1649 + postPatch = '' + substituteInPlace src/OpenColorIO/CMakeLists.txt \ + --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} \ + --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} + ''; + meta = with lib; { homepage = "https://opencolorio.org"; description = "A color management framework for visual effects and animation"; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index dc1afaab3f40..26a7676dd615 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -59,6 +59,13 @@ stdenv.mkDerivation rec { "-DOPENDHT_PUSH_NOTIFICATIONS=ON" ]; + # https://github.com/savoirfairelinux/opendht/issues/612 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} + ''; + outputs = [ "out" "lib" "dev" "man" ]; meta = with lib; { diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 13f60524463e..b4b438e4a810 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "layers" ]; + # https://github.com/KhronosGroup/OpenXR-SDK-Source/issues/305 + postPatch = '' + substituteInPlace src/loader/openxr.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + postInstall = '' mkdir -p "$layers/share" mv "$out/share/openxr" "$layers/share" diff --git a/pkgs/development/libraries/pc-ble-driver/default.nix b/pkgs/development/libraries/pc-ble-driver/default.nix index ae139639c732..7a7b8475d7c4 100644 --- a/pkgs/development/libraries/pc-ble-driver/default.nix +++ b/pkgs/development/libraries/pc-ble-driver/default.nix @@ -10,21 +10,28 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NordicSemiconductor"; - repo = "pc-ble-driver"; + repo = pname; rev = "v${version}"; - sha256 = "1609x17sbfi668jfwyvnfk9z29w6cgzvgv67xcpvpx5jv0czpcdj"; + hash = "sha256-srH7Gdiy9Lsv68fst/9jhifx03R2e+4kMia6pU/oCZg="; }; patches = [ + (fetchpatch { + name = "support-arm.patch"; + url = "https://github.com/NordicSemiconductor/pc-ble-driver/commit/76a6b31dba7a13ceae40587494cbfa01a29192f4.patch"; + hash = "sha256-bvK1BXjdlhIXV8R4PiCGaq8oSLzgjMmTgAwssm8N2sk="; + }) # Fix build with GCC 11 (fetchpatch { url = "https://github.com/NordicSemiconductor/pc-ble-driver/commit/37258e65bdbcd0b4369ae448faf650dd181816ec.patch"; - sha256 = "sha256-gOdzIW8YJQC+PE4FJd644I1+I7CMcBY8wpF6g02eI5g="; + hash = "sha256-gOdzIW8YJQC+PE4FJd644I1+I7CMcBY8wpF6g02eI5g="; }) ]; cmakeFlags = [ "-DNRF_BLE_DRIVER_VERSION=${version}" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + "-DARCH=arm64" ]; nativeBuildInputs = [ cmake git ]; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 991ac1ad594c..a02ecc1e9b74 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -46,6 +46,7 @@ , libfreeaptx , ldacbt , fdk_aac +, libopus , nativeHspSupport ? true , nativeHfpSupport ? true , ofonoSupport ? true @@ -69,7 +70,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.56"; + version = "0.3.58"; outputs = [ "out" @@ -87,7 +88,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-wbHHr7BW8Gdj9D1IjzOuD6VuXApJ5E0Zde2iKWImzxg="; + sha256 = "sha256-r8sDXyXwtA2o2xqglOI8XflttSScrqJ57cj1//k2tZ8="; }; patches = [ @@ -133,7 +134,7 @@ let ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] ++ lib.optionals libcameraSupport [ libcamera libdrm ] ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optionals bluezSupport [ bluez libfreeaptx ldacbt sbc fdk_aac ] + ++ lib.optionals bluezSupport [ bluez libfreeaptx ldacbt sbc fdk_aac libopus ] ++ lib.optional pulseTunnelSupport libpulseaudio ++ lib.optional zeroconfSupport avahi ++ lib.optional raopSupport openssl diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index 5f418efe9fab..d43a4331f98d 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -20,7 +20,7 @@ , pipewire , # options enableDocs ? true -, enableGI ? stdenv.hostPlatform == stdenv.buildPlatform +, enableGI ? true }: let mesonEnableFeature = b: if b then "enabled" else "disabled"; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { gobject-introspection ] ++ lib.optionals (enableDocs || enableGI) [ doxygen - (python3.withPackages (ps: with ps; + (python3.pythonForBuild.withPackages (ps: with ps; lib.optionals enableDocs [ sphinx sphinx-rtd-theme breathe ] ++ lib.optionals enableGI [ lxml ] )) diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix index 7db287e5a44f..3f0980046d59 100644 --- a/pkgs/development/libraries/plasma-wayland-protocols/default.nix +++ b/pkgs/development/libraries/plasma-wayland-protocols/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "plasma-wayland-protocols"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-CE4mhcqmHZTG/obc4AayJHTXu0s0xMuWvXY7l+MF+tY="; + sha256 = "sha256-XQ+gyaC0SAAeCEJSQfI1/PuiW7xizkPAUK0dgI1X3Xo="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index b90987899085..cba1af704607 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , fetchpatch +, fetchFromGitLab , cairo , cmake , pcre @@ -32,8 +33,20 @@ let mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; + + # unclear relationship between test data repo versions and poppler + # versions, though files don't appear to be updated after they're + # added, so it's probably safe to just always use the latest available + # version. + testData = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "poppler"; + repo = "test"; + rev = "920c89f8f43bdfe8966c8e397e7f67f5302e9435"; + sha256 = "sha256-ySP7zcVI3HW4lk8oqVMPTlFh5pgvBwqcE0EXE71iWos="; + }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: rec { pname = "poppler-${suffix}"; version = "22.08.0"; # beware: updates often break cups-filters build, check texlive and scribus too! @@ -94,7 +107,10 @@ stdenv.mkDerivation rec { (mkFlag utils "UTILS") (mkFlag qt5Support "QT5") (mkFlag qt6Support "QT6") + ] ++ lib.optionals finalAttrs.doCheck [ + "-DTESTDATADIR=${testData}" ]; + disallowedReferences = lib.optional finalAttrs.doCheck testData; dontWrapQtApps = true; @@ -103,7 +119,10 @@ stdenv.mkDerivation rec { sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt ''; + doCheck = true; + passthru = { + inherit testData; tests = { # These depend on internal poppler code that frequently changes. inherit inkscape cups-filters texlive scribus; @@ -121,4 +140,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ ttuegel ] ++ teams.freedesktop.members; }; -} +}) diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 68b47e2a2eb3..c7a316778212 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -22,6 +22,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-zMP+WzC65BFz8g8mF5t7toqxmxCJePysd6WJuqpe8yg="; }; + # https://github.com/OSGeo/PROJ/issues/3206 + postPatch = '' + # NB will not apply once https://github.com/OSGeo/PROJ/pull/3150 is released + substituteInPlace cmake/ProjUtilities.cmake \ + --replace '$\{exec_prefix\}/$'{PROJ_LIB_SUBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '$\{prefix\}/$'{PROJ_INCLUDE_SUBDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} \ + --replace '$\{prefix\}/$'{CMAKE_INSTALL_DATAROOTDIR} '$'{CMAKE_INSTALL_FULL_DATAROOTDIR} + substituteInPlace cmake/project-config.cmake.in \ + --replace '$'{_ROOT}/@INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \ + --replace '$'{_ROOT}/@LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{_ROOT}/@BINDIR@ @CMAKE_INSTALL_FULL_BINDIR@ + ''; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/protobuf/3.11.nix b/pkgs/development/libraries/protobuf/3.11.nix deleted file mode 100644 index c5d8b21b1ac4..000000000000 --- a/pkgs/development/libraries/protobuf/3.11.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... }: - -callPackage ./generic-v3.nix { - version = "3.11.4"; - sha256 = "00g61f1yd8z5l0z0svmr3hms38ph35lcx2y7hivw6fahslw0l8yw"; -} diff --git a/pkgs/development/libraries/protobuf/3.19.nix b/pkgs/development/libraries/protobuf/3.19.nix index e47bb62e736a..8e8674f15041 100644 --- a/pkgs/development/libraries/protobuf/3.19.nix +++ b/pkgs/development/libraries/protobuf/3.19.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.19.4"; - sha256 = "sha256-mxQ8XonVgctfaNAyd3vqQHMLHVnkjBa9EObk47vxH24="; + version = "3.19.5"; + sha256 = "sha256-C5ZfPXHtUtNjPGS4tbswCwVH1gjd6A64KtIR16DgHzQ="; } diff --git a/pkgs/development/libraries/protobuf/3.20.nix b/pkgs/development/libraries/protobuf/3.20.nix index 93d180159b87..d518e7298e9f 100644 --- a/pkgs/development/libraries/protobuf/3.20.nix +++ b/pkgs/development/libraries/protobuf/3.20.nix @@ -1,6 +1,6 @@ { callPackage, abseil-cpp, ... }: callPackage ./generic-v3.nix { - version = "3.20.1"; - sha256 = "sha256-pAMacD0UQetqysZHszu5slPqp0iREtDmHFv1cgcUBJA="; + version = "3.20.2"; + sha256 = "sha256-7hLTIujvYIGRqBQgPHrCq0XOh0GJrePBszXJnBFaXVM="; } diff --git a/pkgs/development/libraries/protobuf/3.21.nix b/pkgs/development/libraries/protobuf/3.21.nix index 70c6095ae7b6..c23afb9138f5 100644 --- a/pkgs/development/libraries/protobuf/3.21.nix +++ b/pkgs/development/libraries/protobuf/3.21.nix @@ -1,6 +1,6 @@ { callPackage, abseil-cpp, ... }: callPackage ./generic-v3-cmake.nix { - version = "3.21.2"; - sha256 = "sha256-DUv07pWiZV7jNeSA2ClDOz9DY0x/hiJynxkbSTeJOSs="; + version = "3.21.6"; + sha256 = "sha256-6Omd2O/eIZIgod3YV+zIIv+GqT+trith6+eepFEJIWM="; } diff --git a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix b/pkgs/development/libraries/protobuf/generic-v3-cmake.nix index 0b6967a67385..07e84a2ae066 100644 --- a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix +++ b/pkgs/development/libraries/protobuf/generic-v3-cmake.nix @@ -101,6 +101,7 @@ let platforms = lib.platforms.unix; homepage = "https://developers.google.com/protocol-buffers/"; maintainers = with lib.maintainers; [ jonringer ]; + mainProgram = "protoc"; }; }; in diff --git a/pkgs/development/libraries/protobufc/1.3.nix b/pkgs/development/libraries/protobufc/1.3.nix deleted file mode 100644 index 82126727282c..000000000000 --- a/pkgs/development/libraries/protobufc/1.3.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ callPackage, fetchFromGitHub, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "1.3.3"; - src = fetchFromGitHub { - owner = "protobuf-c"; - repo = "protobuf-c"; - rev = "v${version}"; - sha256 = "13948amsjj9xpa4yl6amlyk3ksr96bbd4ngshh2yzflwcslhg6gv"; - }; -}) diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/default.nix similarity index 55% rename from pkgs/development/libraries/protobufc/generic.nix rename to pkgs/development/libraries/protobufc/default.nix index b64d75076baf..28c15f0ef45e 100644 --- a/pkgs/development/libraries/protobufc/generic.nix +++ b/pkgs/development/libraries/protobufc/default.nix @@ -1,15 +1,20 @@ -{ lib, stdenv, src, version +{ lib, stdenv, fetchFromGitHub , autoreconfHook, pkg-config, protobuf, zlib -, ... }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "protobuf-c"; - inherit version; + version = "1.4.1"; - inherit src; + src = fetchFromGitHub { + owner = "protobuf-c"; + repo = "protobuf-c"; + rev = "refs/tags/v${version}"; + hash = "sha256-TJCLzxozuZ8ynrBQ2lKyk03N+QA/lbOwywUjDUdTlbM="; + }; nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ protobuf zlib ]; meta = with lib; { @@ -17,5 +22,6 @@ stdenv.mkDerivation { description = "C bindings for Google's Protocol Buffers"; license = licenses.bsd2; platforms = platforms.all; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index 3d8fa0f95d93..b5324abd6ced 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -14,6 +14,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ openssl popt xmlto ]; + # https://github.com/alanxz/rabbitmq-c/issues/733 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} + ''; + meta = with lib; { description = "RabbitMQ C AMQP client library"; homepage = "https://github.com/alanxz/rabbitmq-c"; diff --git a/pkgs/development/libraries/recastnavigation/default.nix b/pkgs/development/libraries/recastnavigation/default.nix index 7825983a455b..59f39986ffcd 100644 --- a/pkgs/development/libraries/recastnavigation/default.nix +++ b/pkgs/development/libraries/recastnavigation/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { postPatch = '' cp ${catch}/include/catch/catch.hpp Tests/catch.hpp + + # https://github.com/recastnavigation/recastnavigation/issues/524 + substituteInPlace CMakeLists.txt \ + --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} ''; doCheck = true; diff --git a/pkgs/development/libraries/reproc/default.nix b/pkgs/development/libraries/reproc/default.nix index b8449b61d76d..2083a6a7af4d 100644 --- a/pkgs/development/libraries/reproc/default.nix +++ b/pkgs/development/libraries/reproc/default.nix @@ -22,6 +22,16 @@ stdenv.mkDerivation rec { "-DREPROC_TEST=ON" ]; + # https://github.com/DaanDeMeyer/reproc/issues/81 + postPatch = '' + substituteInPlace reproc++/reproc++.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + substituteInPlace reproc/reproc.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { homepage = "https://github.com/DaanDeMeyer/reproc"; description = "A cross-platform (C99/C++11) process library"; diff --git a/pkgs/development/libraries/rinutils/default.nix b/pkgs/development/libraries/rinutils/default.nix index d80a5f79d6ad..efb2adf497f1 100644 --- a/pkgs/development/libraries/rinutils/default.nix +++ b/pkgs/development/libraries/rinutils/default.nix @@ -18,4 +18,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake perl ]; + + # https://github.com/shlomif/rinutils/issues/5 + # (variable was unused at time of writing) + postPatch = '' + substituteInPlace librinutils.pc.in \ + --replace '$'{exec_prefix}/@RINUTILS_INSTALL_MYLIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; } diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 137593e0a71e..742ebe05ab73 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -58,6 +58,14 @@ stdenv.mkDerivation rec { # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]" hardeningDisable = lib.optional stdenv.hostPlatform.isWindows "format"; + # Old version doesn't ship the .pc file, new version puts wrong paths in there. + postFixup = '' + if [ -f "$out"/lib/pkgconfig/rocksdb.pc ]; then + substituteInPlace "$out"/lib/pkgconfig/rocksdb.pc \ + --replace '="''${prefix}//' '="/' + fi + ''; + meta = with lib; { homepage = "https://rocksdb.org"; description = "A library that provides an embeddable, persistent key-value store for fast storage"; diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index 583d9b59900e..c2a67a6f1462 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -26,6 +26,13 @@ stdenv.mkDerivation rec { buildInputs = [ libdrm numactl ]; + # https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/issues/75 + postPatch = '' + substituteInPlace libhsakmt.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + postInstall = '' cp -r $src/include $out ''; diff --git a/pkgs/development/libraries/rtrlib/default.nix b/pkgs/development/libraries/rtrlib/default.nix index bb0aec308ae8..05429a72fb66 100644 --- a/pkgs/development/libraries/rtrlib/default.nix +++ b/pkgs/development/libraries/rtrlib/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libssh openssl ]; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/rtrlib.pc \ + --replace '=''${prefix}//' '=/' + ''; + meta = with lib; { description = "An open-source C implementation of the RPKI/Router Protocol client"; homepage = "https://github.com/rtrlib/rtrlib"; diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix index cc4dd1268e60..ea903ca58e0e 100644 --- a/pkgs/development/libraries/sentencepiece/default.nix +++ b/pkgs/development/libraries/sentencepiece/default.nix @@ -24,6 +24,13 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; + # https://github.com/google/sentencepiece/issues/754 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} + ''; + meta = with lib; { homepage = "https://github.com/google/sentencepiece"; description = "Unsupervised text tokenizer for Neural Network-based text generation"; diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 9c61ef70624d..b77eb935d4e6 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fmt_8 +{ lib, stdenv, fetchFromGitHub, cmake, fmt_8, fetchpatch , staticBuild ? stdenv.hostPlatform.isStatic }: @@ -15,6 +15,13 @@ let inherit sha256; }; + # in master post 1.10.0, see https://github.com/gabime/spdlog/issues/2380 + patches = lib.optional (lib.versionAtLeast version "1.4.1") (fetchpatch { + name = "fix-pkg-config.patch"; + url = "https://github.com/gabime/spdlog/commit/afb69071d5346b84e38fbcb0c8c32eddfef02a55.patch"; + sha256 = "0cab2bbv8zyfhrhfvcyfwf5p2fddlq5hs2maampn5w18f6jhvk6q"; + }); + nativeBuildInputs = [ cmake ]; # spdlog <1.3 uses a bundled version of fmt propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt_8; diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index c634b8330428..de135e9168ac 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.224.0"; + version = "1.3.224.1"; src = fetchFromGitHub { owner = "KhronosGroup"; @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # https://github.com/KhronosGroup/SPIRV-Headers/issues/282 + postPatch = '' + substituteInPlace SPIRV-Headers.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { inherit (src.meta) homepage; description = "Machine-readable components of the Khronos SPIR-V Registry"; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 0c90d2a70602..786c3c9e313c 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${optionalString interactive "-interactive"}"; - version = "3.39.2"; + version = "3.39.3"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2022/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "sha256-hSvophg6F7pHzuC7/3QAt6pa/9KDvzvu/DT80IiiOd4="; + sha256 = "sha256-eGj7MIK+Pyz0SRxvum3ivdy8KTo1/vsGJO48E/AUIrk="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 1d559dcb38bf..92d521b1916c 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.39.2"; + version = "3.39.3"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2022/sqlite-src-${archiveVersion version}.zip"; - sha256 = "sha256-6TPXcAD0Xz+8hgXwBQWGowE1Bajem0QDK9AO1y8VhvA="; + sha256 = "sha256-GMEvLh2hEkIRc8hcT4rtQyYScsGwR0qgdZKI/TD6ufw="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index 0196e62fb977..10982240d971 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -15,6 +15,16 @@ stdenv.mkDerivation rec { buildInputs = [ gperf openssl readline zlib ]; nativeBuildInputs = [ cmake ]; + # https://github.com/tdlib/td/issues/1974 + postPatch = '' + substituteInPlace CMake/GeneratePkgConfig.cmake \ + --replace 'function(generate_pkgconfig' \ + 'include(GNUInstallDirs) + function(generate_pkgconfig' \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} + ''; + meta = with lib; { description = "Cross-platform library for building Telegram clients"; homepage = "https://core.telegram.org/tdlib/"; diff --git a/pkgs/development/libraries/the-foundation/default.nix b/pkgs/development/libraries/the-foundation/default.nix index 012d13964c4b..95c8653a4663 100644 --- a/pkgs/development/libraries/the-foundation/default.nix +++ b/pkgs/development/libraries/the-foundation/default.nix @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { buildInputs = [ curl libunistring openssl pcre zlib ]; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/the_Foundation.pc \ + --replace '="''${prefix}//' '="/' + ''; + meta = with lib; { description = "Opinionated C11 library for low-level functionality"; homepage = "https://git.skyjake.fi/skyjake/the_Foundation"; diff --git a/pkgs/development/libraries/tinyobjloader/default.nix b/pkgs/development/libraries/tinyobjloader/default.nix index 113e5f5ae95a..d07a841c3c02 100644 --- a/pkgs/development/libraries/tinyobjloader/default.nix +++ b/pkgs/development/libraries/tinyobjloader/default.nix @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # https://github.com/tinyobjloader/tinyobjloader/issues/336 + postPatch = '' + substituteInPlace tinyobjloader.pc.in \ + --replace '$'{prefix}/@TINYOBJLOADER_LIBRARY_DIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@TINYOBJLOADER_INCLUDE_DIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { homepage = "https://github.com/tinyobjloader/tinyobjloader"; description = "Tiny but powerful single file wavefront obj loader"; diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix index 7a27cd1fd678..a5bd2fd36162 100644 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ b/pkgs/development/libraries/uhttpmock/default.nix @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { preConfigure = "NOCONFIGURE=1 ./autogen.sh"; + # while cross + # /build/source/tmp-introspect3xf43lf3/.libs/Uhm-0.0: error while loading shared libraries: libuhttpmock-0.0.so.0: cannot open shared object file: No such file or directory + preBuild = '' + mkdir -p ${placeholder "out"}/lib + ln -s $PWD/libuhttpmock/.libs/libuhttpmock-0.0.so.0 ${placeholder "out"}/lib/libuhttpmock-0.0.so.0 + ''; + meta = with lib; { description = "Project for mocking web service APIs which use HTTP or HTTPS"; homepage = "https://gitlab.com/groups/uhttpmock/"; diff --git a/pkgs/development/libraries/usrsctp/default.nix b/pkgs/development/libraries/usrsctp/default.nix index 64b1debc0ce5..af8979c79d13 100644 --- a/pkgs/development/libraries/usrsctp/default.nix +++ b/pkgs/development/libraries/usrsctp/default.nix @@ -13,6 +13,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # https://github.com/sctplab/usrsctp/issues/662 + postPatch = '' + substituteInPlace usrsctplib/CMakeLists.txt \ + --replace '$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} + ''; + meta = with lib; { homepage = "https://github.com/sctplab/usrsctp"; description = "A portable SCTP userland stack"; diff --git a/pkgs/development/libraries/valhalla/default.nix b/pkgs/development/libraries/valhalla/default.nix index dded351d3105..1052277f6f37 100644 --- a/pkgs/development/libraries/valhalla/default.nix +++ b/pkgs/development/libraries/valhalla/default.nix @@ -34,6 +34,12 @@ stdenv.mkDerivation rec { "-DENABLE_BENCHMARKS=OFF" ]; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/libvalhalla.pc \ + --replace '=''${prefix}//' '=/' \ + --replace '=''${exec_prefix}//' '=/' + ''; + meta = with lib; { description = "Open Source Routing Engine for OpenStreetMap"; homepage = "https://valhalla.readthedocs.io/"; diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 0e1a01032f62..d27d2bf008cf 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.224.0"; + version = "1.3.224.1"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index b825214dbb55..0c3e48289cbc 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.3.224.0"; + version = "1.3.224.1"; src = (assert version == vulkan-headers.version; fetchFromGitHub { diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index 7983806a3090..88dd403a31fd 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace CMakeLists.txt \ --replace /etc/wildmidi $out/etc + # https://github.com/Mindwerks/wildmidi/issues/236 + substituteInPlace src/wildmidi.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ ''; postInstall = '' diff --git a/pkgs/development/libraries/xsimd/default.nix b/pkgs/development/libraries/xsimd/default.nix index 79bfdf9712ad..7d0af99645ec 100644 --- a/pkgs/development/libraries/xsimd/default.nix +++ b/pkgs/development/libraries/xsimd/default.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { in "-${builtins.concatStringsSep ":" filteredTests}"; + # https://github.com/xtensor-stack/xsimd/issues/748 + postPatch = '' + substituteInPlace xsimd.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + meta = with lib; { description = "C++ wrappers for SIMD intrinsics"; homepage = "https://github.com/xtensor-stack/xsimd"; diff --git a/pkgs/development/libraries/xtensor/default.nix b/pkgs/development/libraries/xtensor/default.nix index fe978998d637..3503c6894efe 100644 --- a/pkgs/development/libraries/xtensor/default.nix +++ b/pkgs/development/libraries/xtensor/default.nix @@ -26,6 +26,12 @@ stdenv.mkDerivation rec { checkInputs = [ gtest ]; checkTarget = "xtest"; + # https://github.com/xtensor-stack/xtensor/issues/2542 + postPatch = '' + substituteInPlace xtensor.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + meta = with lib; { description = "Multi-dimensional arrays with broadcasting and lazy computing."; homepage = "https://github.com/xtensor-stack/xtensor"; diff --git a/pkgs/development/libraries/zxing-cpp/default.nix b/pkgs/development/libraries/zxing-cpp/default.nix index 126ef2bc69d6..b9d61e5af626 100644 --- a/pkgs/development/libraries/zxing-cpp/default.nix +++ b/pkgs/development/libraries/zxing-cpp/default.nix @@ -26,6 +26,17 @@ stdenv.mkDerivation rec { "-DBUILD_BLACKBOX_TESTS=OFF" ]; + # https://github.com/nu-book/zxing-cpp/issues/335 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'configure_file(zxing.pc.in' \ + 'include(GNUInstallDirs) + configure_file(zxing.pc.in' + substituteInPlace zxing.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { homepage = "https://github.com/nu-book/zxing-cpp"; description = "C++ port of zxing (a Java barcode image processing library)"; diff --git a/pkgs/development/lua-modules/default.nix b/pkgs/development/lua-modules/default.nix deleted file mode 100644 index 0c8bc1814b53..000000000000 --- a/pkgs/development/lua-modules/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -# inspired by pkgs/development/haskell-modules/default.nix -{ pkgs, lib -, lua -, overrides ? (final: prev: {}) -}: - -let - - inherit (lib) extends; - - initialPackages = (pkgs.callPackage ../../top-level/lua-packages.nix { - inherit lua; - }); - - overridenPackages = import ./overrides.nix { inherit pkgs; }; - - generatedPackages = if (builtins.pathExists ./generated-packages.nix) then - (final: prev: pkgs.callPackage ./generated-packages.nix { inherit (final) callPackage; } final prev) else (final: prev: {}); - - extensible-self = lib.makeExtensible - (extends overrides - (extends overridenPackages - (extends generatedPackages - initialPackages - ) - ) - ); -in - extensible-self diff --git a/pkgs/development/lua-modules/nfd/default.nix b/pkgs/development/lua-modules/nfd/default.nix index 6605202f6bd1..ab6e1b83d79b 100644 --- a/pkgs/development/lua-modules/nfd/default.nix +++ b/pkgs/development/lua-modules/nfd/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, buildLuarocksPackage, lua, maintainers, pkg-config +{ fetchFromGitHub, buildLuarocksPackage, lua, pkg-config, lib , substituteAll, zenity }: buildLuarocksPackage { @@ -35,7 +35,7 @@ buildLuarocksPackage { description = "A tiny, neat lua library that portably invokes native file open and save dialogs."; homepage = "https://github.com/Alloyed/nativefiledialog/tree/master/lua"; - license.fullName = "zlib"; - maintainers = [ maintainers.scoder12 ]; + license = lib.licenses.zlib; + maintainers = [ lib.maintainers.scoder12 ]; }; } diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 56e23c73f5d7..e5d5e1118553 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -1,11 +1,52 @@ -{ pkgs }: +# do not add pkgs, it messes up splicing +{ stdenv +, cmake +, cyrus_sasl +, dbus +, expat +, fetchFromGitHub +, fetchpatch +, fetchurl +, fixDarwinDylibNames +, glib +, glibc +, gmp +, gnulib +, gnum4 +, gobject-introspection +, installShellFiles +, lib +, libevent +, libiconv +, libmpack +, libmysqlclient +, libuuid +, libuv +, libyaml +, mariadb +, mpfr +, neovim-unwrapped +, openssl_1_1 +, pcre +, pkg-config +, postgresql +, readline +, sqlite +, unbound +, vimPlugins +, vimUtils +, yajl +, zlib +, zziplib +}: + final: prev: with prev; { ##########################################3 #### manual fixes for generated packages ##########################################3 - bit32 = prev.bit32.overrideAttrs(oa: { + bit32 = prev.bit32.overrideAttrs (oa: { # Small patch in order to no longer redefine a Lua 5.2 function that Luajit # 2.1 also provides, see https://github.com/LuaJIT/LuaJIT/issues/325 for # more @@ -14,9 +55,9 @@ with prev; ]; }); - busted = prev.busted.overrideAttrs(oa: { + busted = prev.busted.overrideAttrs (oa: { nativeBuildInputs = oa.nativeBuildInputs ++ [ - pkgs.installShellFiles + installShellFiles ]; postConfigure = '' substituteInPlace ''${rockspecFilename} \ @@ -29,88 +70,86 @@ with prev; ''; }); + cqueues = (prev.luaLib.overrideLuarocks prev.cqueues (drv: { + externalDeps = [ + { name = "CRYPTO"; dep = openssl_1_1; } + { name = "OPENSSL"; dep = openssl_1_1; } + ]; + disabled = luaOlder "5.1" || luaAtLeast "5.4"; + })).overrideAttrs (oa: rec { + # Parse out a version number without the Lua version inserted + version = with lib; let + version' = prev.cqueues.version; + rel = splitVersion version'; + date = head rel; + rev = last (splitString "-" (last rel)); + in + "${date}-${rev}"; + + nativeBuildInputs = oa.nativeBuildInputs ++ [ + gnum4 + ]; + + # Upstream rockspec is pointlessly broken into separate rockspecs, per Lua + # version, which doesn't work well for us, so modify it + postConfigure = let inherit (prev.cqueues) pname; in + '' + # 'all' target auto-detects correct Lua version, which is fine for us as + # we only have the right one available :) + sed -Ei ''${rockspecFilename} \ + -e 's|lua == 5.[[:digit:]]|lua >= 5.1, <= 5.3|' \ + -e 's|build_target = "[^"]+"|build_target = "all"|' \ + -e 's|version = "[^"]+"|version = "${version}"|' + specDir=$(dirname ''${rockspecFilename}) + cp ''${rockspecFilename} "$specDir/${pname}-${version}.rockspec" + rockspecFilename="$specDir/${pname}-${version}.rockspec" + ''; + }); + + cyrussasl = prev.luaLib.overrideLuarocks prev.cyrussasl (drv: { + externalDeps = [ + { name = "LIBSASL"; dep = cyrus_sasl; } + ]; + }); + fennel = prev.fennel.overrideAttrs(oa: { nativeBuildInputs = oa.nativeBuildInputs ++ [ - pkgs.installShellFiles + installShellFiles ]; postInstall = '' installManPage fennel.1 ''; }); - cqueues = (prev.lib.overrideLuarocks prev.cqueues (drv: { - externalDeps = [ - { name = "CRYPTO"; dep = pkgs.openssl_1_1; } - { name = "OPENSSL"; dep = pkgs.openssl_1_1; } - ]; - disabled = luaOlder "5.1" || luaAtLeast "5.4"; - })).overrideAttrs(oa: rec { - # Parse out a version number without the Lua version inserted - version = with pkgs.lib; let - version' = prev.cqueues.version; - rel = splitVersion version'; - date = head rel; - rev = last (splitString "-" (last rel)); - in "${date}-${rev}"; - - nativeBuildInputs = oa.nativeBuildInputs ++ [ - pkgs.gnum4 - ]; - - # Upstream rockspec is pointlessly broken into separate rockspecs, per Lua - # version, which doesn't work well for us, so modify it - postConfigure = let inherit (prev.cqueues) pname; in '' - # 'all' target auto-detects correct Lua version, which is fine for us as - # we only have the right one available :) - sed -Ei ''${rockspecFilename} \ - -e 's|lua == 5.[[:digit:]]|lua >= 5.1, <= 5.3|' \ - -e 's|build_target = "[^"]+"|build_target = "all"|' \ - -e 's|version = "[^"]+"|version = "${version}"|' - specDir=$(dirname ''${rockspecFilename}) - cp ''${rockspecFilename} "$specDir/${pname}-${version}.rockspec" - rockspecFilename="$specDir/${pname}-${version}.rockspec" - ''; - }); - - cyrussasl = prev.lib.overrideLuarocks prev.cyrussasl (drv: { - externalDeps = [ - { name = "LIBSASL"; dep = pkgs.cyrus_sasl; } - ]; - }); - - http = prev.http.overrideAttrs(oa: { + http = prev.http.overrideAttrs (oa: { patches = [ - (pkgs.fetchpatch { + (fetchpatch { name = "invalid-state-progression.patch"; url = "https://github.com/daurnimator/lua-http/commit/cb7b59474a.diff"; sha256 = "1vmx039n3nqfx50faqhs3wgiw28ws416rhw6vh6srmh9i826dac7"; }) ]; /* TODO: separate docs derivation? (pandoc is heavy) - nativeBuildInputs = [ pandoc ]; - makeFlags = [ "-C doc" "lua-http.html" "lua-http.3" ]; + nativeBuildInputs = [ pandoc ]; + makeFlags = [ "-C doc" "lua-http.html" "lua-http.3" ]; */ }); - ldbus = prev.lib.overrideLuarocks prev.ldbus (drv: { + ldbus = prev.luaLib.overrideLuarocks prev.ldbus (drv: { extraVariables = { - DBUS_DIR="${pkgs.dbus.lib}"; - DBUS_ARCH_INCDIR="${pkgs.dbus.lib}/lib/dbus-1.0/include"; - DBUS_INCDIR="${pkgs.dbus.dev}/include/dbus-1.0"; + DBUS_DIR = "${dbus.lib}"; + DBUS_ARCH_INCDIR = "${dbus.lib}/lib/dbus-1.0/include"; + DBUS_INCDIR = "${dbus.dev}/include/dbus-1.0"; }; - buildInputs = with pkgs; [ + buildInputs = [ dbus ]; }); - lush-nvim = prev.lib.overrideLuarocks prev.lush-nvim (drv: rec { - doCheck = false; - }); - - ljsyscall = prev.lib.overrideLuarocks prev.ljsyscall (drv: rec { + ljsyscall = prev.luaLib.overrideLuarocks prev.ljsyscall (drv: rec { version = "unstable-20180515"; # package hasn't seen any release for a long time - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "justincormack"; repo = "ljsyscall"; rev = "e587f8c55aad3955dddab3a4fa6c1968037b5c6e"; @@ -123,98 +162,104 @@ with prev; ''; disabled = luaOlder "5.1" || luaAtLeast "5.3"; - propagatedBuildInputs = with pkgs.lib; optional (!isLuaJIT) luaffi; + propagatedBuildInputs = with lib; optional (!isLuaJIT) luaffi; }); lgi = prev.lgi.overrideAttrs (oa: { nativeBuildInputs = oa.nativeBuildInputs ++ [ - pkgs.pkg-config + pkg-config ]; buildInputs = [ - pkgs.glib - pkgs.gobject-introspection + glib + gobject-introspection ]; patches = [ - (pkgs.fetchpatch { + (fetchpatch { name = "lgi-find-cairo-through-typelib.patch"; url = "https://github.com/psychon/lgi/commit/46a163d9925e7877faf8a4f73996a20d7cf9202a.patch"; sha256 = "0gfvvbri9kyzhvq3bvdbj2l6mwvlz040dk4mrd5m9gz79f7w109c"; }) ]; + # https://github.com/lgi-devs/lgi/pull/300 + postPatch = '' + substituteInPlace lgi/Makefile tests/Makefile \ + --replace 'PKG_CONFIG =' 'PKG_CONFIG ?=' + ''; + # there is only a rockspec.in in the repo, the actual rockspec must be generated preConfigure = '' make rock ''; }); - lmathx = prev.lib.overrideLuarocks prev.lmathx (drv: + lmathx = prev.luaLib.overrideLuarocks prev.lmathx (drv: if luaAtLeast "5.1" && luaOlder "5.2" then { version = "20120430.51-1"; - knownRockspec = (pkgs.fetchurl { - url = "https://luarocks.org/lmathx-20120430.51-1.rockspec"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/lmathx-20120430.51-1.rockspec"; sha256 = "148vbv2g3z5si2db7rqg5bdily7m4sjyh9w6r3jnx3csvfaxyhp0"; }).outPath; - src = pkgs.fetchurl { - url = "https://web.tecgraf.puc-rio.br/~lhf/ftp/lua/5.1/lmathx.tar.gz"; + src = fetchurl { + url = "https://web.tecgraf.puc-rio.br/~lhf/ftp/lua/5.1/lmathx.tar.gz"; sha256 = "0sa553d0zlxhvpsmr4r7d841f16yq4wr3fg7i07ibxkz6yzxax51"; }; } else - if luaAtLeast "5.2" && luaOlder "5.3" then { - version = "20120430.52-1"; - knownRockspec = (pkgs.fetchurl { - url = "https://luarocks.org/lmathx-20120430.52-1.rockspec"; - sha256 = "14rd625sipakm72wg6xqsbbglaxyjba9nsajsfyvhg0sz8qjgdya"; - }).outPath; - src = pkgs.fetchurl { - url = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/5.2/lmathx.tar.gz"; - sha256 = "19dwa4z266l2njgi6fbq9rak4rmx2fsx1s0p9sl166ar3mnrdwz5"; - }; - } else - { - disabled = luaOlder "5.1" || luaAtLeast "5.5"; - # works fine with 5.4 as well - postConfigure = '' - substituteInPlace ''${rockspecFilename} \ - --replace 'lua ~> 5.3' 'lua >= 5.3, < 5.5' - ''; - }); + if luaAtLeast "5.2" && luaOlder "5.3" then { + version = "20120430.52-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/lmathx-20120430.52-1.rockspec"; + sha256 = "14rd625sipakm72wg6xqsbbglaxyjba9nsajsfyvhg0sz8qjgdya"; + }).outPath; + src = fetchurl { + url = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/5.2/lmathx.tar.gz"; + sha256 = "19dwa4z266l2njgi6fbq9rak4rmx2fsx1s0p9sl166ar3mnrdwz5"; + }; + } else + { + disabled = luaOlder "5.1" || luaAtLeast "5.5"; + # works fine with 5.4 as well + postConfigure = '' + substituteInPlace ''${rockspecFilename} \ + --replace 'lua ~> 5.3' 'lua >= 5.3, < 5.5' + ''; + }); - lmpfrlib = prev.lib.overrideLuarocks prev.lmpfrlib (drv: { + lmpfrlib = prev.luaLib.overrideLuarocks prev.lmpfrlib (drv: { externalDeps = [ - { name = "GMP"; dep = pkgs.gmp; } - { name = "MPFR"; dep = pkgs.mpfr; } + { name = "GMP"; dep = gmp; } + { name = "MPFR"; dep = mpfr; } ]; unpackPhase = '' cp $src $(stripHash $src) ''; }); - lrexlib-gnu = prev.lib.overrideLuarocks prev.lrexlib-gnu (drv: { + lrexlib-gnu = prev.luaLib.overrideLuarocks prev.lrexlib-gnu (drv: { buildInputs = [ - pkgs.gnulib + gnulib ]; }); - lrexlib-pcre = prev.lib.overrideLuarocks prev.lrexlib-pcre (drv: { + lrexlib-pcre = prev.luaLib.overrideLuarocks prev.lrexlib-pcre (drv: { externalDeps = [ - { name = "PCRE"; dep = pkgs.pcre; } + { name = "PCRE"; dep = pcre; } ]; }); - lrexlib-posix = prev.lib.overrideLuarocks prev.lrexlib-posix (drv: { + lrexlib-posix = prev.luaLib.overrideLuarocks prev.lrexlib-posix (drv: { buildInputs = [ - pkgs.glibc.dev + glibc.dev ]; }); - lua-iconv = prev.lib.overrideLuarocks prev.lua-iconv (drv: { + lua-iconv = prev.luaLib.overrideLuarocks prev.lua-iconv (drv: { buildInputs = [ - pkgs.libiconv + libiconv ]; }); - lua-lsp = prev.lua-lsp.overrideAttrs(oa: { + lua-lsp = prev.lua-lsp.overrideAttrs (oa: { # until Alloyed/lua-lsp#28 postConfigure = '' substituteInPlace ''${rockspecFilename} \ @@ -222,59 +267,60 @@ with prev; ''; }); - lua-zlib = prev.lib.overrideLuarocks prev.lua-zlib (drv: { + lua-zlib = prev.luaLib.overrideLuarocks prev.lua-zlib (drv: { buildInputs = [ - pkgs.zlib.dev + zlib.dev ]; disabled = luaOlder "5.1" || luaAtLeast "5.4"; }); - luadbi-mysql = prev.lib.overrideLuarocks prev.luadbi-mysql (drv: { + luadbi-mysql = prev.luaLib.overrideLuarocks prev.luadbi-mysql (drv: { extraVariables = { # Can't just be /include and /lib, unfortunately needs the trailing 'mysql' - MYSQL_INCDIR="${pkgs.libmysqlclient.dev}/include/mysql"; - MYSQL_LIBDIR="${pkgs.libmysqlclient}/lib/mysql"; + MYSQL_INCDIR = "${libmysqlclient.dev}/include/mysql"; + MYSQL_LIBDIR = "${libmysqlclient}/lib/mysql"; }; buildInputs = [ - pkgs.mariadb.client - pkgs.libmysqlclient + mariadb.client + libmysqlclient ]; }); - luadbi-postgresql = prev.lib.overrideLuarocks prev.luadbi-postgresql (drv: { + luadbi-postgresql = prev.luaLib.overrideLuarocks prev.luadbi-postgresql (drv: { buildInputs = [ - pkgs.postgresql + postgresql ]; }); - luadbi-sqlite3 = prev.lib.overrideLuarocks prev.luadbi-sqlite3 (drv: { + luadbi-sqlite3 = prev.luaLib.overrideLuarocks prev.luadbi-sqlite3 (drv: { externalDeps = [ - { name = "SQLITE"; dep = pkgs.sqlite; } + { name = "SQLITE"; dep = sqlite; } ]; }); - luaevent = prev.lib.overrideLuarocks prev.luaevent (drv: { + luaevent = prev.luaLib.overrideLuarocks prev.luaevent (drv: { propagatedBuildInputs = [ luasocket ]; externalDeps = [ - { name = "EVENT"; dep = pkgs.libevent; } + { name = "EVENT"; dep = libevent; } ]; disabled = luaOlder "5.1" || luaAtLeast "5.4"; }); - luaexpat = prev.lib.overrideLuarocks prev.luaexpat (drv: { + luaexpat = prev.luaLib.overrideLuarocks prev.luaexpat (drv: { externalDeps = [ - { name = "EXPAT"; dep = pkgs.expat; } + { name = "EXPAT"; dep = expat; } ]; }); # TODO Somehow automatically amend buildInputs for things that need luaffi # but are in luajitPackages? - luaffi = prev.lib.overrideLuarocks prev.luaffi (drv: { + luaffi = prev.luaLib.overrideLuarocks prev.luaffi (drv: { # The packaged .src.rock version is pretty old, and doesn't work with Lua 5.3 - src = pkgs.fetchFromGitHub { - owner = "facebook"; repo = "luaffifb"; + src = fetchFromGitHub { + owner = "facebook"; + repo = "luaffifb"; rev = "532c757e51c86f546a85730b71c9fef15ffa633d"; sha256 = "1nwx6sh56zfq99rcs7sph0296jf6a9z72mxknn0ysw9fd7m1r8ig"; }; @@ -282,56 +328,60 @@ with prev; disabled = luaOlder "5.1" || luaAtLeast "5.4" || isLuaJIT; }); - luaossl = prev.lib.overrideLuarocks prev.luaossl (drv: { + luaossl = prev.luaLib.overrideLuarocks prev.luaossl (drv: { externalDeps = [ # https://github.com/wahern/luaossl/pull/199 - { name = "CRYPTO"; dep = pkgs.openssl_1_1; } - { name = "OPENSSL"; dep = pkgs.openssl_1_1; } + { name = "CRYPTO"; dep = openssl_1_1; } + { name = "OPENSSL"; dep = openssl_1_1; } ]; }); - luasec = prev.lib.overrideLuarocks prev.luasec (drv: { + luasec = prev.luaLib.overrideLuarocks prev.luasec (drv: { externalDeps = [ - { name = "OPENSSL"; dep = pkgs.openssl_1_1; } + { name = "OPENSSL"; dep = openssl_1_1; } ]; }); - luasql-sqlite3 = prev.lib.overrideLuarocks prev.luasql-sqlite3 (drv: { + luasql-sqlite3 = prev.luaLib.overrideLuarocks prev.luasql-sqlite3 (drv: { externalDeps = [ - { name = "SQLITE"; dep = pkgs.sqlite; } + { name = "SQLITE"; dep = sqlite; } ]; }); - luasystem = prev.lib.overrideLuarocks prev.luasystem (drv: pkgs.lib.optionalAttrs pkgs.stdenv.isLinux { - buildInputs = [ pkgs.glibc.out ]; + luasystem = prev.luaLib.overrideLuarocks prev.luasystem (drv: lib.optionalAttrs stdenv.isLinux { + buildInputs = [ glibc.out ]; }); - luazip = prev.lib.overrideLuarocks prev.luazip (drv: { + luazip = prev.luaLib.overrideLuarocks prev.luazip (drv: { buildInputs = [ - pkgs.zziplib + zziplib ]; }); - lua-yajl = prev.lib.overrideLuarocks prev.lua-yajl (drv: { + lua-yajl = prev.luaLib.overrideLuarocks prev.lua-yajl (drv: { buildInputs = [ - pkgs.yajl + yajl ]; }); - luaunbound = prev.lib.overrideLuarocks prev.luaunbound(drv: { + luaunbound = prev.luaLib.overrideLuarocks prev.luaunbound (drv: { externalDeps = [ - { name = "libunbound"; dep = pkgs.unbound; } + { name = "libunbound"; dep = unbound; } ]; }); - luuid = (prev.lib.overrideLuarocks prev.luuid (drv: { + lush-nvim = prev.luaLib.overrideLuarocks prev.lush-nvim (drv: rec { + doCheck = false; + }); + + luuid = (prev.luaLib.overrideLuarocks prev.luuid (drv: { externalDeps = [ - { name = "LIBUUID"; dep = pkgs.libuuid; } + { name = "LIBUUID"; dep = libuuid; } ]; disabled = luaOlder "5.1" || (luaAtLeast "5.4"); - })).overrideAttrs(oa: { + })).overrideAttrs (oa: { meta = oa.meta // { - platforms = pkgs.lib.platforms.linux; + platforms = lib.platforms.linux; }; # Trivial patch to make it work in both 5.1 and 5.2. Basically just the # tiny diff between the two upstream versions placed behind an #if. @@ -342,41 +392,42 @@ with prev; patches = [ ./luuid.patch ]; - postConfigure = let inherit (prev.luuid) version pname; in '' - sed -Ei ''${rockspecFilename} -e 's|lua >= 5.2|lua >= 5.1,|' - ''; + postConfigure = let inherit (prev.luuid) version pname; in + '' + sed -Ei ''${rockspecFilename} -e 's|lua >= 5.2|lua >= 5.1,|' + ''; }); # as advised in https://github.com/luarocks/luarocks/issues/1402#issuecomment-1080616570 # we shouldn't use luarocks machinery to build complex cmake components - libluv = pkgs.stdenv.mkDerivation { + libluv = stdenv.mkDerivation { pname = "libluv"; inherit (prev.luv) version meta src; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_MODULE=OFF" - "-DWITH_SHARED_LIBUV=ON" - "-DLUA_BUILD_TYPE=System" - "-DWITH_LUA_ENGINE=${if isLuaJIT then "LuaJit" else "Lua"}" - ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_MODULE=OFF" + "-DWITH_SHARED_LIBUV=ON" + "-DLUA_BUILD_TYPE=System" + "-DWITH_LUA_ENGINE=${if isLuaJIT then "LuaJit" else "Lua"}" + ]; - # to make sure we dont use bundled deps - postUnpack = '' - rm -rf deps/lua deps/libuv - ''; + # to make sure we dont use bundled deps + postUnpack = '' + rm -rf deps/lua deps/libuv + ''; - buildInputs = [ pkgs.libuv final.lua ]; + buildInputs = [ libuv final.lua ]; - nativeBuildInputs = [ pkgs.pkg-config pkgs.cmake ] - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.fixDarwinDylibNames ]; + nativeBuildInputs = [ pkg-config cmake ] + ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; }; - luv = prev.lib.overrideLuarocks prev.luv (drv: { + luv = prev.luaLib.overrideLuarocks prev.luv (drv: { - buildInputs = [ pkgs.pkg-config pkgs.libuv ]; + buildInputs = [ pkg-config libuv ]; # Use system libuv instead of building local and statically linking extraVariables = { @@ -394,68 +445,68 @@ with prev; }); - lyaml = prev.lib.overrideLuarocks prev.lyaml (oa: { + lyaml = prev.luaLib.overrideLuarocks prev.lyaml (oa: { buildInputs = [ - pkgs.libyaml + libyaml ]; }); - mpack = prev.lib.overrideLuarocks prev.mpack (drv: { - buildInputs = [ pkgs.libmpack ]; + mpack = prev.luaLib.overrideLuarocks prev.mpack (drv: { + buildInputs = [ libmpack ]; # the rockspec doesn't use the makefile so you may need to export more flags USE_SYSTEM_LUA = "yes"; USE_SYSTEM_MPACK = "yes"; }); - rapidjson = prev.rapidjson.overrideAttrs(oa: { + rapidjson = prev.rapidjson.overrideAttrs (oa: { preBuild = '' sed -i '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt sed -i '/set(CMAKE_C_FLAGS/d' CMakeLists.txt ''; }); - readline = (prev.lib.overrideLuarocks prev.readline (drv: { + readline = (prev.luaLib.overrideLuarocks prev.readline (drv: { unpackCmd = '' unzip "$curSrc" tar xf *.tar.gz ''; - propagatedBuildInputs = prev.readline.propagatedBuildInputs ++ [ pkgs.readline.out ]; + propagatedBuildInputs = prev.readline.propagatedBuildInputs ++ [ readline.out ]; extraVariables = rec { - READLINE_INCDIR = "${pkgs.readline.dev}/include"; + READLINE_INCDIR = "${readline.dev}/include"; HISTORY_INCDIR = READLINE_INCDIR; }; })).overrideAttrs (old: { # Without this, source root is wrongly set to ./readline-2.6/doc setSourceRoot = '' - sourceRoot=./readline-${pkgs.lib.versions.majorMinor old.version} + sourceRoot=./readline-${lib.versions.majorMinor old.version} ''; }); - sqlite = prev.lib.overrideLuarocks prev.sqlite (drv: { + sqlite = prev.luaLib.overrideLuarocks prev.sqlite (drv: { doCheck = true; - checkInputs = [ final.plenary-nvim pkgs.neovim-unwrapped ]; + checkInputs = [ final.plenary-nvim neovim-unwrapped ]; # we override 'luarocks test' because otherwise neovim doesn't find/load the plenary plugin checkPhase = '' - export LIBSQLITE="${pkgs.sqlite.out}/lib/libsqlite3.so" + export LIBSQLITE="${sqlite.out}/lib/libsqlite3.so" export HOME="$TMPDIR"; nvim --headless -i NONE \ - -u test/minimal_init.vim --cmd "set rtp+=${pkgs.vimPlugins.plenary-nvim}" \ + -u test/minimal_init.vim --cmd "set rtp+=${vimPlugins.plenary-nvim}" \ -c "PlenaryBustedDirectory test/auto/ { minimal_init = './test/minimal_init.vim' }" ''; }); - std-_debug = prev.std-_debug.overrideAttrs(oa: { + std-_debug = prev.std-_debug.overrideAttrs (oa: { # run make to generate lib/std/_debug/version.lua preConfigure = '' make all ''; }); - std-normalize = prev.std-normalize.overrideAttrs(oa: { + std-normalize = prev.std-normalize.overrideAttrs (oa: { # run make to generate lib/std/_debug/version.lua preConfigure = '' make all @@ -464,8 +515,8 @@ with prev; # TODO just while testing, remove afterwards # toVimPlugin should do it instead - gitsigns-nvim = prev.gitsigns-nvim.overrideAttrs(oa: { - nativeBuildInputs = oa.nativeBuildInputs or [] ++ [ pkgs.vimUtils.vimGenDocHook ]; + gitsigns-nvim = prev.gitsigns-nvim.overrideAttrs (oa: { + nativeBuildInputs = oa.nativeBuildInputs or [ ] ++ [ vimUtils.vimGenDocHook ]; }); # aliases diff --git a/pkgs/development/ocaml-modules/wayland/default.nix b/pkgs/development/ocaml-modules/wayland/default.nix index 12c385eac72c..f7ade2ec8070 100644 --- a/pkgs/development/ocaml-modules/wayland/default.nix +++ b/pkgs/development/ocaml-modules/wayland/default.nix @@ -12,15 +12,13 @@ buildDunePackage rec { pname = "wayland"; - version = "1.0"; + version = "1.1"; - minimumOCamlVersion = "4.08"; - - useDune2 = true; + minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/talex5/ocaml-wayland/releases/download/v${version}/wayland-${version}.tbz"; - sha256 = "bf8fd0057242d11f1c265c11cfa5de3c517ec0ad5994eae45e1efe3aac034510"; + sha256 = "0b7czgh08i6xcx3fsz6vd19sfyngwi0i27jdzg8cnjgrgwnagv6d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 15ddfbe9f7a5..4a6c14b5709b 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -24,12 +24,12 @@ let in buildPythonPackage rec { pname = "cython"; - version = "0.29.30"; + version = "0.29.32"; src = fetchPypi { pname = "Cython"; inherit version; - sha256 = "sha256-IjW2Laj+b6i5lCLI5YPy+5XhQ4Z9M3tcdeS5oahl+eM="; + hash = "sha256-hzPPR1i3kwTypOOev6xekjQbzke8zrJsElQ5iy+MGvc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index 694f3138c928..9118f5a6fcf3 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.2.1"; + version = "1.2.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8FSl/0dDSS8aqezEcXLLM7QrnZk8/8wUbJ3hfnF7Awc="; + sha256 = "sha256-NySGmzY7pjCicqX4n2jAcDUhN7j9F1dlABe34G/aFj8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index 402fab32f55a..e2facc919347 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OqOfiYMpwhVv9SXfppznCeQtd6qxi/SRdxnW8mCqagg="; + sha256 = "sha256-9WiAmTjEmrvaiYJiI8mStjCv0jxjgWCteEDP40dxDZc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aeppl/default.nix b/pkgs/development/python-modules/aeppl/default.nix index 73c2da783d58..2edf88c4cf4a 100644 --- a/pkgs/development/python-modules/aeppl/default.nix +++ b/pkgs/development/python-modules/aeppl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aeppl"; - version = "0.0.33"; + version = "0.0.35"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "aesara-devs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-P4QgEt/QfIeCx/wpaCncXtjrDM2uiOIuObxPlTtn1CY="; + hash = "sha256-HUcLa/9fTUBJYszo1SiG08t7DQiNSd8EsINkJpAeLsY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix index 5d91bc4de885..d4f3c1160517 100644 --- a/pkgs/development/python-modules/aesara/default.nix +++ b/pkgs/development/python-modules/aesara/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aesara"; - version = "2.7.9"; + version = "2.8.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "aesara-devs"; repo = "aesara"; rev = "refs/tags/rel-${version}"; - hash = "sha256-s7qqFSY4teL2uiGg6CkpPtr7lNNAj61nCn83Zr7/JaQ="; + hash = "sha256-Mt1IweQkPqxv+ynezdFHTJXU/oTOwhPkY49GzFJpPaM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 7063ba63387c..49f3b39b737e 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pythonOlder , pyvex +, setuptools }: buildPythonPackage rec { @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-dfogVQZ6RP1GyuoiTEC/VLancb+ZmdM1xPSngLbcmYs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyvex ]; diff --git a/pkgs/development/python-modules/aioaseko/default.nix b/pkgs/development/python-modules/aioaseko/default.nix index 1c31dac5f596..d6d69c6ee466 100644 --- a/pkgs/development/python-modules/aioaseko/default.nix +++ b/pkgs/development/python-modules/aioaseko/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-nJRVNBYfBcLYnBsTpQZYMHYWh0+hQObVKJ7sOXFwDjc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 81977915fd52..6bc62a3854d3 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.3.4"; + version = "2.4.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZVTr6ldk9m9L5USk/KoJU+6A5gDde9gYukiT1yvxK/s="; + sha256 = "sha256-+f4GmMxJeGG9tUzRYWHIBAMfdYralIDDVUDyDAwHg4U="; }; # relax version constraints: aiobotocore works with newer botocore versions diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 67decf5ced07..23d44b798b22 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "10.13.0"; + version = "10.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,9 +21,14 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ZaNrSkRH9pFhzZncCs37k1M0w5svPfrY0WxePUnUlms="; + sha256 = "sha256-ASFErnWUNcq/30AOYM596w+j0FOYGuQ3Tj4OdczWanM="; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "protobuf>=3.12.2,<4.0" "protobuf>=3.12.2" + ''; + propagatedBuildInputs = [ noiseprotocol protobuf diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix index 38bd95989f6a..f4b8c306c1ab 100644 --- a/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/pkgs/development/python-modules/aiogithubapi/default.nix @@ -25,6 +25,14 @@ buildPythonPackage rec { hash = "sha256-5gKANZtDhIoyfyLdS15JDWTxHBFkaHDUlbVVhRs7MSE="; }; + postPatch = '' + # Upstream is releasing with the help of a CI to PyPI, GitHub releases + # are not in their focus + substituteInPlace pyproject.toml \ + --replace 'version = "0"' 'version = "${version}"' \ + --replace 'backoff = "^1.10.0"' 'backoff = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; @@ -41,12 +49,9 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # Upstream is releasing with the help of a CI to PyPI, GitHub releases - # are not in their focus - substituteInPlace pyproject.toml \ - --replace 'version = "0"' 'version = "${version}"' - ''; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; pythonImportsCheck = [ "aiogithubapi" diff --git a/pkgs/development/python-modules/aiomusiccast/default.nix b/pkgs/development/python-modules/aiomusiccast/default.nix index 470e84eb6cce..186765377c4f 100644 --- a/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/pkgs/development/python-modules/aiomusiccast/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , poetry-core , aiohttp +, setuptools }: buildPythonPackage rec { @@ -31,6 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + setuptools ]; # upstream has no tests diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index a23b1eca77ca..3c2a0e48d329 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -7,6 +7,7 @@ , pbr , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -27,6 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + setuptools ]; checkInputs = [ diff --git a/pkgs/development/python-modules/aiosenz/default.nix b/pkgs/development/python-modules/aiosenz/default.nix index beb561861470..3aab4e1451c2 100644 --- a/pkgs/development/python-modules/aiosenz/default.nix +++ b/pkgs/development/python-modules/aiosenz/default.nix @@ -5,6 +5,7 @@ , httpx , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -21,6 +22,10 @@ buildPythonPackage rec { sha256 = "sha256-ODdWPS14zzptxuS6mff51f0s1SYnIqjF40DmvT0sL0w="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ httpx authlib diff --git a/pkgs/development/python-modules/aioserial/default.nix b/pkgs/development/python-modules/aioserial/default.nix index c8c521edbe65..2d15e2794da8 100644 --- a/pkgs/development/python-modules/aioserial/default.nix +++ b/pkgs/development/python-modules/aioserial/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "aioserial"; - version = "1.3.0"; + version = "1.3.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "080j3ws3j2arj2f16mzqn1qliy0bzmb0gzk5jvm5ldkhsf1s061h"; + sha256 = "sha256-cCvwOw64S47y2NrFy5JeHmhdzpj3exJVabxv0rO1gig="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/amazon-ion/default.nix b/pkgs/development/python-modules/amazon-ion/default.nix index 0e97eda4701f..365e4cc14a64 100644 --- a/pkgs/development/python-modules/amazon-ion/default.nix +++ b/pkgs/development/python-modules/amazon-ion/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "amazon-ion"; - version = "0.9.2"; + version = "0.9.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { repo = "ion-python"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-BLlKxm63KsmMFajS4uJne/LPNXboOfy4uVm8HqO9Wfo="; + hash = "sha256-FLwzHcge+vLcRY4gOzrxS3kWlprCkRXX5KeGOoTJDSw="; }; postPatch = '' @@ -37,6 +37,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # ValueError: Exceeds the limit (4300) for integer string conversion + "test_roundtrips" + ]; + pythonImportsCheck = [ "amazon.ion" ]; diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix index 71c07c07cc9b..ecf326a9a21a 100644 --- a/pkgs/development/python-modules/amqtt/default.nix +++ b/pkgs/development/python-modules/amqtt/default.nix @@ -11,6 +11,7 @@ , pytestCheckHook , pythonOlder , pyyaml +, setuptools , transitions , websockets }: @@ -29,6 +30,11 @@ buildPythonPackage rec { hash = "sha256-8T1XhBSOiArlUQbQ41LsUogDgOurLhf+M8mjIrrAC4s="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'transitions = "^0.8.0"' 'transitions = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; @@ -37,6 +43,7 @@ buildPythonPackage rec { docopt passlib pyyaml + setuptools transitions websockets ]; diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix index 5847e3ad0f9e..e2e4e7c93fb9 100644 --- a/pkgs/development/python-modules/ansi/default.nix +++ b/pkgs/development/python-modules/ansi/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook }: @@ -16,6 +17,10 @@ buildPythonPackage rec { hash = "sha256-2gu2Dba3LOjMhbCCZrBqzlOor5KqDYThhe8OP8J3O2M="; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ansible-doctor/default.nix b/pkgs/development/python-modules/ansible-doctor/default.nix index afd5b3918fa7..c07a1e5d5f3e 100644 --- a/pkgs/development/python-modules/ansible-doctor/default.nix +++ b/pkgs/development/python-modules/ansible-doctor/default.nix @@ -52,9 +52,13 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' \ + --replace 'Jinja2 = "3.1.2"' 'Jinja2 = "*"' \ + --replace 'anyconfig = "0.13.0"' 'anyconfig = "*"' \ + --replace 'environs = "9.5.0"' 'environs = "*"' \ --replace 'jsonschema = "4.15.0"' 'jsonschema = "*"' \ - --replace 'nested-lookup = "0.2.25"' 'nested-lookup = "*"' \ - --replace 'pathspec = "0.10.1"' 'pathspec = "*"' + --replace '"ruamel.yaml" = "0.17.21"' '"ruamel.yaml" = "*"' \ + --replace 'python-json-logger = "2.0.4"' 'python-json-logger = "*"' ''; # Module has no tests diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/development/python-modules/ansible-later/default.nix index 9e0af254b3f9..c989dba4d16c 100644 --- a/pkgs/development/python-modules/ansible-later/default.nix +++ b/pkgs/development/python-modules/ansible-later/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "ansible-later"; - version = "2.0.16"; + version = "2.0.20"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "thegeeklab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AlLy8rqqNrJtoI01OHq8W1Oi8iN8RiBdtq2sZ7zlTyM="; + hash = "sha256-LoJ02PGOo/qrwH4PJYI0CFZ/cMxhjNj1JiUPnK2FIlA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 90da98520120..d8a3e2e674dc 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -4,7 +4,9 @@ , setuptools-scm , ansible-compat , ansible-core +, black , enrich +, filelock , flaky , jsonschema , pythonOlder @@ -20,13 +22,13 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.4.0"; + version = "6.5.2"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xadjBsrpBqJgz3KGyofE0DukSSsu17/qIa0R/fPH6NE="; + sha256 = "sha256-9EMsdMDyiyhwoYi0mZWS9jOAQvMNDG9O4RsyRAyp/+Q="; }; postPatch = '' @@ -42,7 +44,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ ansible-compat ansible-core + black enrich + filelock jsonschema pytest # yes, this is an actual runtime dependency pyyaml diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index d2f7dba38669..f90085431718 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -20,7 +20,7 @@ let pname = "ansible"; - version = "6.2.0"; + version = "6.3.0"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-va8rL9km/xifveL+/nI0cz8yw2/EEwM/pdk5RfvcBqY="; + sha256 = "sha256-1fqfwVqNRcjVJHqWRbC0j5ldc1sSxNplVmbUhQYnNSY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 0ef8a492a639..0488e7e0fd9d 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-JitAp536AM0EnE+LWlKceoYIk/gYxnbOUPtX7CK5SiM="; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index c09610c3be1f..ff626a5b4813 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "arrow"; - version = "1.2.2"; + version = "1.2.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Bcrx/T2aEaETWytvCYh0IRU7lFWOXvTQkLVntHFzrCs="; + sha256 = "sha256-OTSzDKG58pI3bZ2xWxlEYIjRLsWGKbw/DaKP1V+2M6E="; }; postPatch = '' diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix index ab68c91d5d6b..fec7e2aa3b7e 100644 --- a/pkgs/development/python-modules/astor/default.nix +++ b/pkgs/development/python-modules/astor/default.nix @@ -1,8 +1,13 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: buildPythonPackage rec { pname = "astor"; version = "0.8.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -10,14 +15,15 @@ buildPythonPackage rec { }; # disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89 - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; + disabledTests = [ - "check_expressions" - "check_astunparse" - "convert_stdlib" - "codegen_as_submodule" - "positional_only_arguments" - "codegen_from_root" + # https://github.com/berkerpeksag/astor/issues/196 + "test_convert_stdlib" + # https://github.com/berkerpeksag/astor/issues/212 + "test_huge_int" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index 3d78ae7690b3..4a07d2ac96ec 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "asttokens"; - version = "2.0.5"; + version = "2.0.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mlTBFPAsepSA1WVQkyVGo/H+cdigLxvHzNDuPuNc9NU="; + sha256 = "sha256-xh4WJG7Pss3ilYQGtMjrwEPJ5tc6qoPJQWc7NeXTp2s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/asyauth/default.nix b/pkgs/development/python-modules/asyauth/default.nix index 1fd2aa6efbbf..7ff95908c7e1 100644 --- a/pkgs/development/python-modules/asyauth/default.nix +++ b/pkgs/development/python-modules/asyauth/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyauth"; - version = "0.0.3"; + version = "0.0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8qSYaPgidfDH8aebLFtLhLxt253xTHTkC0xwV346KdM="; + hash = "sha256-dKoTagJa3zszr/E2p1HsrtOOdykQw1lsKAEy56zweOQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix index a4bbb82af97a..185f64d58f6e 100644 --- a/pkgs/development/python-modules/atenpdu/default.nix +++ b/pkgs/development/python-modules/atenpdu/default.nix @@ -1,7 +1,7 @@ { lib -, async-timeout , buildPythonPackage , fetchPypi +, async-timeout , pysnmp , pythonOlder }: diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index 16f0f0ddffd9..286b79bcb675 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "atpublic"; - version = "3.0.1"; + version = "3.1.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "bb072b50e6484490404e5cb4034e782aaa339fdd6ac36434e53c10791aef18bf"; + sha256 = "sha256-MJjuEtAQfMUAnWH06A5e3PrEzaK9qgRkSvdYJ8sSGxg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aurorapy/default.nix b/pkgs/development/python-modules/aurorapy/default.nix index 00eb71e3d7da..8bbce350ad8d 100644 --- a/pkgs/development/python-modules/aurorapy/default.nix +++ b/pkgs/development/python-modules/aurorapy/default.nix @@ -5,6 +5,7 @@ , pyserial , pytestCheckHook , pythonOlder +, setuptools , six }: @@ -22,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-rGwfGq3zdoG9NCGqVN29Q4bWApk5B6CRdsW9ctWgOec="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ future pyserial diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 57e09385f8a6..a6e6de722744 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -48,14 +48,14 @@ buildPythonPackage rec { pname = "autobahn"; - version = "22.6.1"; + version = "22.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+2PpRtXC3Q32gIUehOZWJKSUzofJmfKklE5PLYG/RJg="; + sha256 = "sha256-i0Yuouaq1rTcDtRfuAC2y/6wMl5/5pg5B/Ei8r5KH+k="; }; postPatch = '' diff --git a/pkgs/development/python-modules/autocommand/default.nix b/pkgs/development/python-modules/autocommand/default.nix new file mode 100644 index 000000000000..0c8dfc54036c --- /dev/null +++ b/pkgs/development/python-modules/autocommand/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "autocommand"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "Lucretiel"; + repo = "autocommand"; + rev = version; + sha256 = "sha256-bjoVGfP57qhvPuHHcMP8JQddAaW4/fEyatElk1UEPZo="; + }; + + # fails with: SyntaxError: invalid syntax + doCheck = false; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "autocommand" ]; + + meta = with lib; { + description = " Autocommand turns a python function into a CLI program "; + homepage = "https://github.com/Lucretiel/autocommand"; + license = licenses.lgpl3; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/autopage/default.nix b/pkgs/development/python-modules/autopage/default.nix index 4ebaa9f8c905..e7bdc0d240ae 100644 --- a/pkgs/development/python-modules/autopage/default.nix +++ b/pkgs/development/python-modules/autopage/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, setuptools }: buildPythonPackage rec { pname = "autopage"; @@ -11,6 +11,10 @@ buildPythonPackage rec { sha256 = "sha256-Ab4+5hu3FOkJD8xcEPTPVGw5YzHGIMauUKIyGyjtMZk="; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "autopage" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 80c57ef732c2..59dfac756b5d 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -1,31 +1,39 @@ -{ lib, fetchPypi, buildPythonPackage, pycodestyle, glibcLocales +{ lib +, fetchPypi +, buildPythonPackage +, pycodestyle +, glibcLocales , toml +, pytestCheckHook }: buildPythonPackage rec { pname = "autopep8"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "44f0932855039d2c15c4510d6df665e4730f2b8582704fa48f9c55bd3e17d979"; + sha256 = "sha256-ypsag+U6f61l1zHceiotUKpI9DhQQHxZ9qGjBsQgEUI="; }; propagatedBuildInputs = [ pycodestyle toml ]; - # One test fails: - # FAIL: test_recursive_should_not_crash_on_unicode_filename (test.test_autopep8.CommandLineTests) -# doCheck = false; + checkInputs = [ + glibcLocales + pytestCheckHook + ]; - checkInputs = [ glibcLocales ]; + disabledTests = [ + # missing tox.ini file from pypi package + "test_e101_skip_innocuous" + ]; LC_ALL = "en_US.UTF-8"; meta = with lib; { description = "A tool that automatically formats Python code to conform to the PEP 8 style guide"; - homepage = "https://pypi.python.org/pypi/autopep8/"; + homepage = "https://pypi.org/project/autopep8/"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index a6aa50b2de0c..088965d7dfd2 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -6,6 +6,7 @@ # build , cython , pkg-config +, setuptools # runtime , ffmpeg @@ -33,6 +34,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython pkg-config + setuptools ]; buildInputs = [ diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 352fd019cf94..2db4ac2208fb 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -18,14 +18,14 @@ , typing-extensions }: buildPythonPackage rec { - version = "1.24.2"; + version = "1.25.1"; pname = "azure-core"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-Dzog0kVlm/gfs2cAcKVBDI1KQymNWpgeYtzjkwAKkIQ="; + sha256 = "sha256-PBzzaGUOduwAnAfNEXSpXNy0cbJHu3LRgkX31WwYCbI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index a177f824fa2e..e6d36a87c982 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-eventhub"; - version = "5.10.0"; + version = "5.10.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "8c83fbe96a420813599a9a3c66adc315b7208f56d5a50a20aa04a8aa7062b074"; + sha256 = "sha256-LV+o7dMVCFIQfq9d2wYY34LghIP5FN06zDpUPtkELFQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix index 650b54c9dd15..51f5985e84d0 100644 --- a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "2.1.0"; + version = "2.2.0"; pname = "azure-mgmt-appconfiguration"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-6s3KfWOlzkoq7uxuDbFMYmW22rOYHtgQgYQ6RMFQiQ8="; + sha256 = "sha256-R2COS22pCtFp3oV98LLn/X2LkPOVUCasEONhFIhEdBQ="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix index 83e1163df467..b2e9c6e3adf5 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerinstance"; - version = "9.2.0"; + version = "10.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-3rElVUvbGqF99ppZanUUrwFGtCAXak2zhMVOd6n9bkY="; + sha256 = "sha256-TDGrC7YO05Ywa8uEINqqw4Wxag65aklIUwS+2aVMHwA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index de3bca44c5cf..77c1ece09b29 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "20.2.0"; + version = "20.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-+XNJbI4LTxx8kcNr6dDlcaGujrqriKaEPb0deo6YbkM="; + sha256 = "sha256-p2q1fzpPrwYKUAilPTGzRDlkT9OKqnjZVN2jslY/WSw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix index 2a4b00432f19..c250246af26a 100644 --- a/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "1.3.1"; + version = "1.3.2"; pname = "azure-mgmt-core"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-yJ6/GMInvJih7sypVGC4p+IwWQ1FbI+pwtWs3GcPeAg="; + sha256 = "sha256-B/Sv6COlXXBLBI1h7f3BMYwFHtWfJEAyEmNQvpXp1QE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index d1a717802432..db6df3583b68 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "7.0.0"; + version = "8.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-NMwcqgvxwma+aXUhL8OQm+tpH+MCCjHMALf0Ii8bQlo="; + hash = "sha256-/6ySVfCjr1YiiZIZJElrd1EfirV+TJvE/FvKs7UhoKo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index c6907efc9977..915b2bf96330 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "2.7.0"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-g7av5MFy4QNg+81PqDGznHXUZsHhnaauaJV/B6GMy4A="; + hash = "sha256-LH2YdWuRC5mzImF6ImkOixHBcgc7Yoi0Rai5m64/aiU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix index ea5fbd1c1020..feefdabc1e79 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iothub"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-nsAeVhs5N8bpwYenmRwJmqF/IAqz/ulSoYIeOU5l0eM="; + sha256 = "sha256-ml+koj52l5o0toAcnsGtsw0tGnO5F/LKq56ovzdmx/A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-media/default.nix b/pkgs/development/python-modules/azure-mgmt-media/default.nix index 57ccffcf997f..9d0f2a216873 100644 --- a/pkgs/development/python-modules/azure-mgmt-media/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-media/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-media"; - version = "10.0.0"; + version = "10.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-KKUeibEAUqKsjjjqpzYBFaQUGniY3rbe+lfCnL0+lpY="; + hash = "sha256-lm3rL9x+R4FCqrIyZG7jc3Yro6xUcDs1wRNNo1XQJIk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/pkgs/development/python-modules/azure-mgmt-redis/default.nix index c7890b55b04c..9d476dfc8074 100644 --- a/pkgs/development/python-modules/azure-mgmt-redis/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-redis/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-redis"; - version = "13.1.0"; + version = "14.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ece913e5fc7f157e945809e557443f79ff7691cabca4bbc5ecb266352f843179"; + sha256 = "sha256-WErNQiinmxBNyaOAqbHWGk2OLxtM9o63wDEQGf+iL6Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix index 71257c46c4f2..5094dc3ec6a8 100644 --- a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-subscription"; - version = "3.0.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "157bd9123a5814473a9cd131832ea614c478548722ec01f47b35d778dc307d55"; + sha256 = "sha256-TiVbTOm5JDV7uMUAmzyIogFNMgOySV4iVvoCe/hOgA4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index 6a3caa03e649..3b3499a780f0 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "12.13.0"; + version = "12.13.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-U/DUzTKXCsn/m5dT+D3S+z+aww4dAecWOMQ2xQm/2IQ="; + sha256 = "sha256-iZxLjiZxgS0s948QdVaifbsSjKqiuwYJTnKj1YNnQK8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/backoff/default.nix b/pkgs/development/python-modules/backoff/default.nix index 9671b7b5a267..e62533f491cb 100644 --- a/pkgs/development/python-modules/backoff/default.nix +++ b/pkgs/development/python-modules/backoff/default.nix @@ -1,8 +1,16 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, poetry, pytest-asyncio, responses }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pytest-asyncio +, responses +}: buildPythonPackage rec { pname = "backoff"; version = "2.1.2"; + format = "pyproject"; src = fetchFromGitHub { owner = "litl"; @@ -11,11 +19,19 @@ buildPythonPackage rec { sha256 = "sha256-eKd1g3UxXlpSlNlik80RKXRaw4mZyvAWl3i2GNuZ3hI="; }; - format = "pyproject"; + nativeBuildInputs = [ + poetry-core + ]; - nativeBuildInputs = [ poetry ]; + checkInputs = [ + pytest-asyncio + pytestCheckHook + responses + ]; - checkInputs = [ pytestCheckHook pytest-asyncio responses ]; + pythonImportsCheck = [ + "backoff" + ]; meta = with lib; { description = "Function decoration for backoff and retry"; diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index 592b5b22d47d..a4848c676a94 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -1,32 +1,56 @@ { lib , buildPythonPackage +, rustPlatform , setuptools +, setuptools-rust , isPyPy , fetchPypi , pythonOlder , cffi , pytestCheckHook -, six +, libiconv +, stdenv + # for passthru.tests +, asyncssh +, django_4 +, fastapi +, paramiko +, twisted }: buildPythonPackage rec { pname = "bcrypt"; - version = "3.2.2"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QzxBDCF3BXcF2iqfLNAd0VdJOyp6wUyFk6FrPatra/s="; + hash = "sha256-xZwXD8kiX6rQTd4bph2FtBOUbozi5fX1/zDf1nKD8xk="; + }; + + cargoRoot = "src/_bcrypt"; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sourceRoot = "${pname}-${version}/${cargoRoot}"; + name = "${pname}-${version}"; + hash = "sha256-HvfRLyUhlXVuvxWrtSDKx3rMKJbjvuiMcDY6g+pYFS0="; }; nativeBuildInputs = [ setuptools - ]; + setuptools-rust + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + # Remove when https://github.com/NixOS/nixpkgs/pull/190093 lands. + buildInputs = lib.optional stdenv.isDarwin libiconv; propagatedBuildInputs = [ - six cffi ]; @@ -42,6 +66,10 @@ buildPythonPackage rec { "bcrypt" ]; + passthru.tests = { + inherit asyncssh django_4 fastapi paramiko twisted; + }; + meta = with lib; { description = "Modern password hashing for your software and your servers"; homepage = "https://github.com/pyca/bcrypt/"; diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index fe2cd731a1ce..617b87bc12f1 100644 --- a/pkgs/development/python-modules/biliass/default.nix +++ b/pkgs/development/python-modules/biliass/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "biliass"; - version = "1.3.4"; + version = "1.3.5"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kktK+6rLwYhkG7LiTBlgBbiIN8apweg4l8pJSTjKQU4="; + sha256 = "sha256-kgoQUX2l5YENEozcnfluwvcAO1ZSxlfHPVIa9ABW6IU="; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 697df2a5d146..4af50c6fdb45 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -1,4 +1,5 @@ { lib +, aiofile , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.10.3"; + version = "0.10.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-3jCxncR7bD0DDAH6vt28eBal9cVI9liLbBCX0IJ2bQ8="; + hash = "sha256-o4h84WM/p4gVrxv7YDNgwDpyBYu7Aileagwc8PXNwPs="; }; nativeBuildInputs = [ @@ -32,6 +33,7 @@ buildPythonPackage rec { PBR_VERSION = version; propagatedBuildInputs = [ + aiofile httpx pycryptodome pyjwt @@ -43,6 +45,10 @@ buildPythonPackage rec { time-machine ]; + pythonImportsCheck = [ + "bimmer_connected" + ]; + meta = with lib; { description = "Library to read data from the BMW Connected Drive portal"; homepage = "https://github.com/bimmerconnected/bimmer_connected"; diff --git a/pkgs/development/python-modules/bincopy/default.nix b/pkgs/development/python-modules/bincopy/default.nix index df6f31450d6f..7af89c7aed87 100644 --- a/pkgs/development/python-modules/bincopy/default.nix +++ b/pkgs/development/python-modules/bincopy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bincopy"; - version = "17.10.3"; + version = "17.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HDSqwrCXf2U0uzfa4Vb9Euu9ZSm6eFD9bcMf6eieicY="; + sha256 = "sha256-rk7jYr9jUz7TUckoYkv74rr5D9fJLD3h7UFBH0XeleE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 7ee76f2f2fe8..f49c4c9de47d 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.5.1"; + version = "2.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jTj2B1EAgJmmWdWs+zXvQVAYPv/Vsr+mwQGZJw3fTJw="; + hash = "sha256-VtPxbdgHscVnMqJEzgccE17pc9PtyZKUGMGyTFQ5oP0="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/bitbox02/default.nix b/pkgs/development/python-modules/bitbox02/default.nix index 358a4d163f3e..d11db2c8457d 100644 --- a/pkgs/development/python-modules/bitbox02/default.nix +++ b/pkgs/development/python-modules/bitbox02/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitbox02"; - version = "6.0.0"; + version = "6.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wTateh3dJycFNozLaQbAzXF0avr2ofBdjlqqcOBLr/0="; + sha256 = "sha256-mVA0CdbGGJn44R6xHnophmsnVMsCwDrPNM3vmXVa7dg="; }; propagatedBuildInputs = [ base58 ecdsa hidapi noiseprotocol protobuf semver typing-extensions ]; diff --git a/pkgs/development/python-modules/bitcoin-utils-fork-minimal/default.nix b/pkgs/development/python-modules/bitcoin-utils-fork-minimal/default.nix index 868641641fc9..c548ce0bbf32 100644 --- a/pkgs/development/python-modules/bitcoin-utils-fork-minimal/default.nix +++ b/pkgs/development/python-modules/bitcoin-utils-fork-minimal/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "bitcoin-utils-fork-minimal"; - version = "0.4.11.4"; + version = "0.4.11.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-n3tEQkl6KBAno4LY67lZme3TIvsm35VA2yyfWYuIE1c="; + hash = "sha256-DzibvC8qr/5ync59cfFB7tBmZWkPs/hKh+e5OC4lcEw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bitlist/default.nix b/pkgs/development/python-modules/bitlist/default.nix index 1e7f24144645..5d5a84da8bfb 100644 --- a/pkgs/development/python-modules/bitlist/default.nix +++ b/pkgs/development/python-modules/bitlist/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , nose , parts , pytestCheckHook @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-rpXQKkV2RUuYza+gfpGEH3kFJ+hjuNGKV2i46eXQUUI="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ parts ]; diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index d62167fa1051..6a0ee020e6d4 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -1,6 +1,7 @@ { lib , async-timeout , bleak +, dbus-fast , buildPythonPackage , fetchFromGitHub , poetry-core @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "1.11.0"; + version = "1.16.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,10 +20,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; - hash = "sha256-I9nXLzy+OmfaQJBTeBSL/yhhrdNnldd42d5QwRDK9Q4="; + rev = "refs/tags/v${version}"; + hash = "sha256-IDfamUZB9WJH+ybZ0ULBSEd1koMHTZ1/DaFTf6oviM8="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=bleak_retry_connector --cov-report=term-missing:skip-covered" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -30,6 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ async-timeout bleak + dbus-fast ]; checkInputs = [ @@ -37,10 +44,12 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=bleak_retry_connector --cov-report=term-missing:skip-covered" "" - ''; + disabledTests = [ + # broken mocking + "test_establish_connection_can_cache_services_services_missing" + "test_establish_connection_with_dangerous_use_cached_services" + "test_establish_connection_without_dangerous_use_cached_services" + ]; pythonImportsCheck = [ "bleak_retry_connector" diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index cb897b31fc81..283cc88ab965 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -2,8 +2,9 @@ , async-timeout , bluez , buildPythonPackage -, dbus-next -, fetchPypi +, dbus-fast +, fetchFromGitHub +, poetry-core , pytestCheckHook , pythonOlder , typing-extensions @@ -11,19 +12,25 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.16.0"; + version = "0.17.0"; format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-pUn0PjxdjeRkxytLkFU0w/R4F0bpgV7NUxtyVd4uGcc="; + src = fetchFromGitHub { + owner = "hbldh"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-AnH23AWrLw2jq6gSbx9VoGD8QXeCH5dN7FSVVdj4b3w="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ async-timeout - dbus-next + dbus-fast typing-extensions ]; diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 290e1928414f..c935c3728b01 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "blis"; - version = "0.9.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aZ4coUlnFjcLS5tSfFjYQr+JKGPY2UTNoy+HIO08tCk="; + sha256 = "sha256-fOrEZoAfnZfss04Q3e2MJM9eCSfqfoNNocydLtP8Nm8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index 64ffc5ff4b3e..5ac33d77cf14 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "block-io"; - version = "2.0.5"; + version = "2.0.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "af70c3be444f2f2d07c0603cef547b51bbd9f4fbd4aadebd8f1e8ee73ccbc5e5"; + sha256 = "sha256-M7czfpagXqoWWSu4enB3Z2hc2GtAaskI6cnJzJdpC8I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 834df14102f0..698f252909ef 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.42"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.24.75"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-3z1u8CMEvXw3EQkJNsCS1dtzXdoQneysHiNsPvf9t68="; + sha256 = "sha256-e/oiQt+bH6c+F/TX959rIlYPVdXaLifleOWF725LFKc="; }; 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 d7e525897604..c6905d2de667 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.42"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.27.75"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-OKGApmZsWpsGmnXsPPN0/ypkw+kMnySpFoWLzesERW0="; + sha256 = "sha256-+LHaK0HojFjbUdsMbv9spWQliUjOSlrH6WrDWkabDU8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index 6532312ab71b..ebcf03652605 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "bottle"; - version = "0.12.21"; + version = "0.12.23"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "787c61b6cc02b9c229bf2663011fac53dd8fc197f7f8ad2eeede29d888d7887e"; + sha256 = "sha256-aD3jqjmfsm6HsnTbz3CxplE4XUWRMXFjh6vcN5LgQWc="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix index 469f2af96f72..37cb627b1288 100644 --- a/pkgs/development/python-modules/boxx/default.nix +++ b/pkgs/development/python-modules/boxx/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "boxx"; - version = "0.10.5"; + version = "0.10.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6qO/aPegHk+1PAu8qzIkC3fULh2WjgJcqNui+XEaLQw="; + hash = "sha256-npPwYhDTujBpTnPyhvZbA+EK4jU8nnHSBgSw9xlTcJM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index b66f81d032e2..f919d5cabe29 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "bpython"; - version = "0.22.1"; + version = "0.23"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-H7HgpSMyV5/E49z3XiF5avZ6rivkYBeez8zpUwpJogA="; + hash = "sha256-nwB4q8iHxIrwiGkeL2R5fWyplKwPS8A8ONBvZX18BSo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bsblan/default.nix b/pkgs/development/python-modules/bsblan/default.nix index e371079b3605..760d300f905a 100644 --- a/pkgs/development/python-modules/bsblan/default.nix +++ b/pkgs/development/python-modules/bsblan/default.nix @@ -11,6 +11,7 @@ , pytest-mock , pytestCheckHook , pythonOlder +, setuptools , yarl }: @@ -30,6 +31,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index e4a7d69f34f6..1ef401b8c0a2 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , fetchFromGitHub , filelock -, flit-core , importlib-metadata , packaging , pep517 @@ -12,6 +11,7 @@ , pytest-xdist , pytestCheckHook , pythonOlder +, setuptools , toml , tomli }: @@ -31,7 +31,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - flit-core + setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index e93ea007baa8..b1add1a764c0 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -11,6 +11,7 @@ let withPlugins = plugins: buildPythonPackage { pname = "${package.pname}-with-plugins"; inherit (package) version; + format = "other"; dontUnpack = true; dontBuild = true; diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index 7a2407950576..5d635d5a52b2 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "cartopy"; - version = "0.20.3"; + version = "0.21.0"; src = fetchPypi { inherit version; pname = "Cartopy"; - sha256 = "sha256-DWD6Li+9d8TR9rH507WIlmFH8HwbF50tNFcKweG0kAY="; + sha256 = "sha256-zh06KKEy6UyJrDN2mlD4H2VjSrK9QFVjF+Fb1srRzkI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 53c7c397f981..8bef6cf2148e 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { "-o cache_dir=$(mktemp -d)" # See https://github.com/certbot/certbot/issues/8746 "-W ignore::ResourceWarning" + "-W ignore::DeprecationWarning" ]; doCheck = true; diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index bf963ce16aa1..d18d75bd3720 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "cherrypy"; - version = "18.7.0"; + version = "18.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "CherryPy"; inherit version; - hash = "sha256-cpRS95jKdWOQBG7zGAQ8roZKRoFN6vPmvTTclZrxmN4="; + hash = "sha256-m0jPuoovFtW2QZzGV+bVHbAFujXF44JORyi7A7vH75s="; }; postPatch = '' diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index e516e7eac8f9..9286c28f4e53 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, setuptools , cachetools , decorator , fetchFromGitHub @@ -26,6 +27,10 @@ buildPythonPackage rec { hash = "sha256-G4Tes9X7dz+bBTJCdbr3o4nTlN2c4Ixtl6iwZv0XYvA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cachetools decorator diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 0b6326fc4efa..9976093489b8 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -10,6 +10,7 @@ , pythonOlder , pyvex , pyxbe +, setuptools , sortedcontainers }: @@ -40,6 +41,10 @@ buildPythonPackage rec { hash = "sha256-ORNlmdkAlMj1CaWj5pDve0yJe3TEv9IfKOwqRd+gVH4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cffi minidump diff --git a/pkgs/development/python-modules/cleo/default.nix b/pkgs/development/python-modules/cleo/default.nix index e79983b1bb29..e81ff175d533 100644 --- a/pkgs/development/python-modules/cleo/default.nix +++ b/pkgs/development/python-modules/cleo/default.nix @@ -1,26 +1,53 @@ -{ lib, buildPythonPackage, fetchPypi -, clikit }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, crashtest +, poetry-core +, pylev +, pytest-mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "cleo"; - version = "0.8.1"; + version = "1.0.0a5"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "3d0e22d30117851b45970b6c14aca4ab0b18b1b53c8af57bed13208147e4069f"; + src = fetchFromGitHub { + owner = "python-poetry"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-FtGGIRF/tA2OWEjkCFwa1HHg6VY+5E5mAiJC/zjUC1g="; }; - propagatedBuildInputs = [ - clikit + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'crashtest = "^0.3.1"' 'crashtest = "*"' + ''; + + nativeBuildInputs = [ + poetry-core ]; - # The Pypi tarball doesn't include tests, and the GitHub source isn't - # buildable until we bootstrap poetry, see - # https://github.com/NixOS/nixpkgs/pull/53599#discussion_r245855665 - doCheck = false; + propagatedBuildInputs = [ + crashtest + pylev + ]; + + pythonImportsCheck = [ + "cleo" + "cleo.application" + "cleo.commands.command" + "cleo.helpers" + ]; + + checkInputs = [ + pytest-mock + pytestCheckHook + ]; meta = with lib; { - homepage = "https://github.com/sdispater/cleo"; + homepage = "https://github.com/python-poetry/cleo"; description = "Allows you to create beautiful and testable command-line interfaces"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix index 5384fb01c5cb..a144a51e2ca7 100644 --- a/pkgs/development/python-modules/clevercsv/default.nix +++ b/pkgs/development/python-modules/clevercsv/default.nix @@ -9,19 +9,19 @@ , regex , tabview , python -, unittestCheckHook +, pytestCheckHook }: buildPythonPackage rec { pname = "clevercsv"; - version = "0.7.1"; + version = "0.7.4"; format = "setuptools"; src = fetchFromGitHub { owner = "alan-turing-institute"; repo = "CleverCSV"; rev = "v${version}"; - sha256 = "sha256-ynS3G2ZcEqVlC2d6n5ZQ1Em5lh/dWESj9jEO8C4WzZQ="; + sha256 = "sha256-2OLvVJbqV/wR+Quq0cAlR/vCUe1/Km/nALwfoHD9B+U="; }; propagatedBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { tabview ]; - checkInputs = [ unittestCheckHook ]; + checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "clevercsv" @@ -48,7 +48,14 @@ buildPythonPackage rec { ''; # their ci only runs unit tests, there are also integration and fuzzing tests - unittestFlagsArray = [ "-v" "-f" "-s" "./tests/test_unit" ]; + pytestFlagsArray = [ + "./tests/test_unit" + ]; + + disabledTestPaths = [ + # ModuleNotFoundError: No module named 'wilderness' + "tests/test_unit/test_console.py" + ]; meta = with lib; { description = "CleverCSV is a Python package for handling messy CSV files"; diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index 39c5a497c8d8..d8ff545c848e 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -3,6 +3,7 @@ , fetchPypi , autopage , cmd2 +, importlib-metadata , installShellFiles , openstackdocstheme , pbr @@ -16,11 +17,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "3.10.1"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BFruPzxkRxll161QfOhHSk4vIIFfu1QFp3D4WWoqAKA="; + sha256 = "sha256-Ow0w56z1DjwhSjnuPmaqLytZV+Kh3jc+F7uo6Yx1AaU="; }; postPatch = '' @@ -38,6 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ autopage cmd2 + importlib-metadata pbr prettytable pyparsing diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix index 1f6be754be19..af366cdbec06 100644 --- a/pkgs/development/python-modules/clikit/default.nix +++ b/pkgs/development/python-modules/clikit/default.nix @@ -1,26 +1,63 @@ -{ lib, buildPythonPackage, fetchPypi -, isPy27, pythonAtLeast -, pylev, pastel, typing ? null, enum34 ? null, crashtest }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, pythonAtLeast +, poetry-core + +# propagates +, pylev +, pastel + +# python36+ +, crashtest + +# python2 +, typing +, enum34 + +# tests +, pytest-mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "clikit"; version = "0.6.2"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "0ngdkmb73gkp5y00q7r9k1cdlfn0wyzws2wrqlshc4hlkbdyabj4"; + src = fetchFromGitHub { + owner = "sdispater"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-xAsUNhVQBjtSFHyjjnicAKRC3+Tdn3AdGDUYhmOOIdA="; }; - propagatedBuildInputs = [ - pylev pastel - ] - ++ lib.optionals (pythonAtLeast "3.6") [ crashtest ] - ++ lib.optionals isPy27 [ typing enum34 ]; + postPatch = '' + substituteInPlace pyproject.toml --replace \ + 'crashtest = { version = "^0.3.0", python = "^3.6" }' \ + 'crashtest = { version = "*", python = "^3.6" }' + ''; - # The Pypi tarball doesn't include tests, and the GitHub source isn't - # buildable until we bootstrap poetry, see - # https://github.com/NixOS/nixpkgs/pull/53599#discussion_r245855665 - doCheck = false; + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pylev + pastel + ] + ++ lib.optionals (pythonAtLeast "3.6") [ crashtest ] + ++ lib.optionals isPy27 [ typing enum34 ]; + + checkInputs = [ + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "clikit" + ]; meta = with lib; { homepage = "https://github.com/sdispater/clikit"; diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index 1b0caeaaf266..f1e5b16320b6 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -2,6 +2,9 @@ , buildPythonPackage , fetchPypi +# build +, setuptools + # propagtes , sigtools , six @@ -21,6 +24,7 @@ buildPythonPackage rec { pname = "clize"; version = "4.2.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; @@ -29,9 +33,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "docutils ~= 0.17.0" "docutils" + --replace "docutils ~= 0.17.0" "docutils" \ + --replace "attrs>=19.1.0,<22" "attrs>=19.1.0" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ attrs docutils diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index d33f4dbee358..13f99462da53 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "cloudpickle"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-uyM+h2pYSR2VkKZ2+Tx6VHOgj3R9Wrnff5zlZLPnk44="; + hash = "sha256-P0IZRpxVRTz+RzflZLZ8KhSRCdq/fyQkeJSLiV9hEG8="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index 1d5a2047a7c3..9e7ecae4450b 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "1.61.3"; + version = "1.120.3"; format = "wheel"; src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - sha256 = "sha256-Y8CnbX9rhtk8sebJKo5kyqFwCkJgBjz3dgm58VHRPhY="; + sha256 = "sha256-rtOpA0yTEiSvzUgG1IuaIXlLrdqVT85vnR5yOdi44c0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index 690a54813f41..9c1be8c68333 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "colorlog"; - version = "6.6.0"; + version = "6.7.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NE9zIEAJ5Mg8W2vrALPEXccPza48gNuRngpBcdAG/eg="; + sha256 = "sha256-vZS9IcHhP6x70xU/S8On3A6wl0uLwv3xqYnkdPblguU="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 42bf9d15a675..6b1d873069a8 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "commoncode"; - version = "30.2.0"; + version = "31.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7kcDWfw4M7boe0ABO4ob1d+XO1YxS924mtGETvHoNf0="; + sha256 = "sha256-iX7HjsbW9rUgG35XalqfXh2+89vEiwish90FGOpkzRo="; }; postPatch = '' @@ -57,7 +57,15 @@ buildPythonPackage rec { pytest-xdist ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = [ + # chinese character translates different into latin + "test_safe_path_posix_style_chinese_char" + # OSError: [Errno 84] Invalid or incomplete multibyte or wide character + "test_os_walk_can_walk_non_utf8_path_from_unicode_path" + "test_resource_iter_can_walk_non_utf8_path_from_unicode_path" + "test_walk_can_walk_non_utf8_path_from_unicode_path" + "test_resource_iter_can_walk_non_utf8_path_from_unicode_path_with_dirs" + ] ++ lib.optionals stdenv.isDarwin [ # expected result is tailored towards the quirks of upstream's # CI environment on darwin "test_searchable_paths" diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 9467003e9dd9..3c130acdc2fc 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -1,26 +1,27 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm }: +{ lib, stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, setuptools-scm }: buildPythonPackage rec { pname = "configparser"; - version = "5.2.0"; + version = "5.3.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1b35798fdf1713f1c3139016cfcbc461f09edbf099d1fb658d4b7479fcaa3daa"; + sha256 = "sha256-i+JngktUHAmwjbEkkX9Iq1JabD6DcBHzEweBoiTFcJA="; }; - # No tests available - doCheck = false; - nativeBuildInputs = [ setuptools-scm ]; + checkInputs = [ pytestCheckHook ]; + preConfigure = '' export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 ''; meta = with lib; { description = "Updated configparser from Python 3.7 for Python 2.6+."; - license = licenses.mit; homepage = "https://github.com/jaraco/configparser"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 6893458d5cc7..b96929640806 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "coverage"; - version = "6.4.2"; + version = "6.4.4"; # uses f strings disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bDzP6Jw28+W5g3ue5QdHIxAWTzUsn+MyEgt2TJ1grb4="; + sha256 = "sha256-4WxFtyast4Dh5viLKG08ELORSrA0OPMhF8SqUtfzDVg="; }; # No tests in archive diff --git a/pkgs/development/python-modules/crashtest/default.nix b/pkgs/development/python-modules/crashtest/default.nix index 5b084cdd8c84..da01d77cd072 100644 --- a/pkgs/development/python-modules/crashtest/default.nix +++ b/pkgs/development/python-modules/crashtest/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "crashtest"; - version = "0.3.1"; + version = "0.4.0"; disabled = !(pythonAtLeast "3.6"); src = fetchPypi { inherit pname version; - sha256 = "42ca7b6ce88b6c7433e2ce47ea884e91ec93104a4b754998be498a8e6c3d37dd"; + sha256 = "sha256-1imwDx1OecMWkJ9Ot2O7yym1ENZfveE2Whzrk6t/pMg="; }; # has tests, but only on GitHub, however the pyproject build fails for me diff --git a/pkgs/development/python-modules/cronsim/default.nix b/pkgs/development/python-modules/cronsim/default.nix index d09d30c50f34..dc9caf3f53c0 100644 --- a/pkgs/development/python-modules/cronsim/default.nix +++ b/pkgs/development/python-modules/cronsim/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "cronsim"; - version = "2.2"; + version = "2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LMMZni8Cipo10mxAQbRadWpPvum76JQuzlrLvFvTt5o="; + hash = "sha256-ebFYIOANXZLmM6cbovwBCJH8Wr/HlJbOR9YGp8Jw7pc="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 873d1b99356a..c80e9a119941 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -27,19 +27,19 @@ let in buildPythonPackage rec { pname = "cryptography"; - version = "37.0.4"; # Also update the hash in vectors.nix + version = "38.0.1"; # Also update the hash in vectors.nix disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Y/nBfA4kdMy+vJMCzi8HtVs7P8shHe0YpC1XZPXBCoI="; + hash = "sha256-HbPYB6FJMfoxf5ZDVpXZ7Dhr57hLYYzGHPpdCLCuM9c="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-f8r6QclTwkgK20CNe9i65ZOqvSUeDc4Emv6BFBhh1hI="; + hash = "sha256-o8l13fnfEUvUdDasq3LxSPArozRHKVsZfQg9DNR6M6Q="; }; cargoRoot = "src/rust"; diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 3059d01a4091..7f33c6cb84f3 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cryptography_vectors"; inherit version; - hash = "sha256-WmFABRDiiTelZUtAxupOPlk8Wq8MIIHFuRLw58+IPqg="; + hash = "sha256-BDH9EHwfutA3dwSnBRlFs7ORFp/dxPb6C9TtxrbiNd0="; }; # No tests included diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index ffe017698df1..aba974e02704 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -9,12 +9,12 @@ let inherit (cudaPackages) cudatoolkit cudnn cutensor nccl; in buildPythonPackage rec { pname = "cupy"; - version = "10.6.0"; + version = "11.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-9jWpfd4l4LSptJewdQaaurm/huHcKv48+XOZDCLTJV8="; + sha256 = "sha256-4TtvmQrd172HCQWvQp+tUQhNCFf4YA3TIGod9aRoTt0="; }; # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index b05cb770a4bd..80b80e32b75b 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -1,21 +1,35 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, blessings, mock, nose, pyte, cwcwidth, typing ? null}: +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, blessed +, backports-cached-property +, pyte +, pytestCheckHook +, cwcwidth +}: buildPythonPackage rec { pname = "curtsies"; - version = "0.3.10"; + version = "0.4.0"; + format = "pyproject"; + src = fetchPypi { inherit pname version; - sha256 = "11efbb153d9cb22223dd9a44041ea0c313b8411e246e7f684aa843f6aa9c1600"; + hash = "sha256-yynvzjP+85WinvpWjyf1kTF4Rp+zqrEUCA1spiZBQv4="; }; - propagatedBuildInputs = [ blessings cwcwidth ] - ++ lib.optionals (pythonOlder "3.5") [ typing ]; + propagatedBuildInputs = [ + backports-cached-property + blessed + cwcwidth + ]; - checkInputs = [ mock pyte nose ]; - - checkPhase = '' - nosetests tests - ''; + checkInputs = [ + pyte + pytestCheckHook + ]; meta = with lib; { broken = stdenv.isDarwin; diff --git a/pkgs/development/python-modules/cwcwidth/default.nix b/pkgs/development/python-modules/cwcwidth/default.nix index f6bab4ffc4bc..fc57df26230a 100644 --- a/pkgs/development/python-modules/cwcwidth/default.nix +++ b/pkgs/development/python-modules/cwcwidth/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, cython, pytestCheckHook }: +{ lib, buildPythonPackage, fetchPypi, cython, pytestCheckHook, setuptools }: buildPythonPackage rec { pname = "cwcwidth"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "sha256-wNZH4S46SxWogeHYT3lpN1FmSEieARJXI33CF51rGVE="; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ cython setuptools ]; checkInputs = [ pytestCheckHook ]; preCheck = '' diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 454e2e8f2ccf..cb4f7e074ffa 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -1,11 +1,12 @@ { stdenv, lib, buildPythonPackage, pythonOlder, fetchPypi, ncurses, importlib-metadata }: buildPythonPackage rec { - pname = "cx_Freeze"; + pname = "cx-freeze"; version = "6.11.1"; src = fetchPypi { - inherit pname version; + pname = "cx_Freeze"; + inherit version; sha256 = "sha256-jzowyeM5TykGVeNG07RgkQZWswrGNHqHSZu1rTZcbnw="; }; @@ -17,8 +18,11 @@ buildPythonPackage rec { ]; # timestamp need to come after 1980 for zipfiles and nix store is set to epoch - prePatch = '' + postPatch = '' substituteInPlace cx_Freeze/freezer.py --replace "os.stat(module.file).st_mtime" "time.time()" + + substituteInPlace setup.cfg \ + --replace "setuptools>=59.0.1,<=60.10.0" "setuptools>=59.0.1" ''; # fails to find Console even though it exists on python 3.x diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index cc56413eea39..0eaebec17784 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "dask-jobqueue"; - version = "0.7.4"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XoQwazgJuFvhoEezhhGu2YvIp+VFAe7dhGIEVnuQ5kM="; + hash = "sha256-VCD6Oos9aSkbrzymQnqm2RV5uFzTj05VgPuhJ5PpyAk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 8453b3e0ec9c..8502c01956ec 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2022.7.0"; + version = "2022.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - hash = "sha256-O5/TNeta0V0v9WTpPmF/kJMJ40ANo6rcRtzurr5/SwA="; + hash = "sha256-4Tok9eYhi2FF+8bpKnwKT3KIRGHIMtxczTkZ6qD8x7g="; }; propagatedBuildInputs = [ @@ -97,9 +97,8 @@ buildPythonPackage rec { "--reruns 3" # Don't run tests that require network access "-m 'not network'" - # Ignore warning about pyarrow 5.0.0 feautres - "-W" - "ignore::FutureWarning" + # DeprecationWarning: The 'sym_pos' keyword is deprecated and should be replaced by using 'assume_a = "pos"'. 'sym_pos' will be removed in SciPy 1.11.0. + "-W" "ignore::DeprecationWarning" ]; disabledTests = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index 7a494e55d8c6..92bbb9f54db2 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "10.4.6"; + version = "10.4.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Dezqn6rZysRhDQFUuTgXdoJL9dn21Bx2QlryBG9MtR0="; + sha256 = "sha256-T5KGJQryiE2+x9u+AcvTm6dLpU3kh20sCu0CTwpeJao="; }; sourceRoot = "."; diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 6d113b178c5a..5c151d518bb9 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -29,7 +29,15 @@ buildPythonPackage rec { sha256 = "sha256-bDup3q93Zq+pvwsy/lQy2byOMjG6C/+7813hWQMbZRU="; }; + patches = [ + ./regex-compat.patch + ]; + postPatch = '' + substituteInPlace setup.py --replace \ + 'regex !=2019.02.19,!=2021.8.27,<2022.3.15' \ + 'regex' + # https://github.com/scrapinghub/dateparser/issues/1053 substituteInPlace tests/test_search.py --replace \ "('June 2020', datetime.datetime(2020, 6, datetime.datetime.utcnow().day, 0, 0))," \ diff --git a/pkgs/development/python-modules/dateparser/regex-compat.patch b/pkgs/development/python-modules/dateparser/regex-compat.patch new file mode 100644 index 000000000000..4c69d14f1023 --- /dev/null +++ b/pkgs/development/python-modules/dateparser/regex-compat.patch @@ -0,0 +1,11 @@ +--- a/dateparser/languages/locale.py ++++ b/dateparser/languages/locale.py +@@ -169,7 +169,7 @@ class Locale: + if normalize: + value = list(map(normalize_unicode, value)) + pattern = '|'.join(sorted(value, key=len, reverse=True)) +- pattern = DIGIT_GROUP_PATTERN.sub(r'?P\d+', pattern) ++ pattern = pattern.replace(r'\d+', r'?P\d+') + pattern = re.compile(r'^(?:{})$'.format(pattern), re.UNICODE | re.IGNORECASE) + relative_dictionary[pattern] = key + return relative_dictionary diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 623ee4a7888d..24723fdafada 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -43,6 +43,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "dbus_fast" + "dbus_fast.aio" + "dbus_fast.service" + "dbus_fast.message" ]; disabledTests = [ @@ -77,6 +80,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/Bluetooth-Devices/dbus-fast/releases/tag/v${version}"; description = "Faster version of dbus-next"; homepage = "https://github.com/bluetooth-devices/dbus-fast"; license = licenses.mit; diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index 6a2d3bacb12e..a60d4ae45a4e 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -4,6 +4,7 @@ , pythonOlder , stdenv , packaging +, setuptools , importlib-resources , dbus-next }: @@ -21,6 +22,10 @@ buildPythonPackage rec { sha256 = "sha256-lOXoiWY6gyWBL4RLrvslqcMmwtjMTOaHJZzsDO+C/F4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.9") [ diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 7e2a315b413e..bb1aae2e8e50 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "devpi-common"; - version = "3.6.0"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "fc14aa6b74d4d9e27dc2e9cbff000ed9be5cd723d3ac9672e66e4e8fce797227"; + sha256 = "sha256-O015TOlvFcN7hxwV4SgGmo6vanMuWb+i9KZOYhYZLJM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index ec4e8ecdc6f5..ae14cc008c8d 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -1,15 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +}: buildPythonPackage rec { pname = "distlib"; - version = "0.3.4"; + version = "0.3.6"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "e4b58818180336dc9c529bfb9a0b58728ffc09ad92027a3f30b7cd91e3458579"; - extension = "zip"; + hash = "sha256-FLrS2bBNOjYSesl/MLEqGSaPIRBj2PjuT0cQiJbhG0Y="; }; + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "distlib" + "distlib.database" + "distlib.locators" + "distlib.index" + "distlib.markers" + "distlib.metadata" + "distlib.util" + "distlib.resources" + ]; + # Tests use pypi.org. doCheck = false; diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 646899d36cf8..0b9236feeb00 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "distributed"; - version = "2022.7.0"; + version = "2022.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5oq6i+PiDl0RIKvKyEGQn/GAIXCKhBKvpY/xU8T6sKw="; + hash = "sha256-upj1TipRhhvulyuhX4bfbQSWar9m7Xu3mIsi48G+ewE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix index 698e2a0c3052..a28c9dd05a58 100644 --- a/pkgs/development/python-modules/dj-database-url/default.nix +++ b/pkgs/development/python-modules/dj-database-url/default.nix @@ -1,14 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, django +}: buildPythonPackage rec { pname = "dj-database-url"; - version = "0.5.0"; + version = "1.0.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "4aeaeb1f573c74835b0686a2b46b85990571159ffc21aa57ecd4d1e1cb334163"; + hash = "sha256-zPPocY913dFHoeIS/KiO7NqnIXWe5I44tIVIHHe8o9w="; }; + propagatedBuildInputs = [ + django + ]; + # Tests access a DB via network doCheck = false; diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index b3596e1e4444..e1ca5f418afb 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -7,8 +7,8 @@ , setuptools-scm # runtime -, ldap , django +, python-ldap # tests , python @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django - ldap + python-ldap ]; # ValueError: SCHEMADIR is None, ldap schemas are missing. diff --git a/pkgs/development/python-modules/django-cryptography/default.nix b/pkgs/development/python-modules/django-cryptography/default.nix index 6443e74aa378..0aa6df4f2d2c 100644 --- a/pkgs/development/python-modules/django-cryptography/default.nix +++ b/pkgs/development/python-modules/django-cryptography/default.nix @@ -5,7 +5,9 @@ , fetchFromGitHub , lib , python -, pythonOlder }: +, pythonOlder +, setuptools +}: buildPythonPackage rec { pname = "django-cryptography"; @@ -20,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-C3E2iT9JdLvF+1g+xhZ8dPDjjh25JUxLAtTMnalIxPk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cryptography django diff --git a/pkgs/development/python-modules/django-formtools/default.nix b/pkgs/development/python-modules/django-formtools/default.nix index c85d5d3fcc75..11a1fb071696 100644 --- a/pkgs/development/python-modules/django-formtools/default.nix +++ b/pkgs/development/python-modules/django-formtools/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "django-formtools"; - version = "2.3"; + version = "2.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "9663b6eca64777b68d6d4142efad8597fe9a685924673b25aa8a1dcff4db00c3"; + sha256 = "sha256-3rkyvlWx2UGeN9xNZd+/640we3HIwR/VLxWaul/A3u0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 4d4e9265defa..96ee036d1259 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -5,6 +5,9 @@ , pythonOlder , substituteAll +# build +, setuptools + # patched in , fetchpatch , geos @@ -64,6 +67,10 @@ buildPythonPackage rec { }) ]; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ asgiref sqlparse diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix index 7c659c4173f7..0523678bb074 100644 --- a/pkgs/development/python-modules/docformatter/default.nix +++ b/pkgs/development/python-modules/docformatter/default.nix @@ -1,22 +1,25 @@ { lib , buildPythonPackage , pythonOlder -, fetchPypi +, fetchFromGitHub , untokenize +, mock , pytestCheckHook }: buildPythonPackage rec { pname = "docformatter"; - version = "1.4"; + version = "1.5.0"; disabled = pythonOlder "3.6"; format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "064e6d81f04ac96bc0d176cbaae953a0332482b22d3ad70d47c8a7f2732eef6f"; + src = fetchFromGitHub { + owner = "PyCQA"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-GSfsM6sPSLOIH0YJYFVTB3SigI62/ps51mA2iZ7GOEg="; }; propagatedBuildInputs = [ @@ -24,6 +27,7 @@ buildPythonPackage rec { ]; checkInputs = [ + mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index f70fcebb26f3..0a01d5e4792e 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -2,39 +2,49 @@ , stdenv , buildPythonPackage , fetchPypi -, isPy27 -, backports_ssl_match_hostname -, mock +, pythonOlder +, packaging , paramiko , pytestCheckHook , requests -, six +, setuptools-scm +, urllib3 , websocket-client }: buildPythonPackage rec { pname = "docker"; - version = "5.0.3"; + version = "6.0.0"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "d916a26b62970e7c2f554110ed6af04c7ccff8e9f81ad17d0d40c75637e227fb"; + sha256 = "sha256-GeMwRwr0AWfSk7A1JXjB+iLXSzTT7fXU/5DrwgO7svE="; }; - nativeBuildInputs = lib.optional isPy27 mock; + nativeBuildInputs = [ + setuptools-scm + ]; propagatedBuildInputs = [ - paramiko + packaging requests - six + urllib3 websocket-client - ] ++ lib.optional isPy27 backports_ssl_match_hostname; + ]; + + passthru.optional-dependencies.ssh = [ + paramiko + ]; checkInputs = [ pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - pytestFlagsArray = [ "tests/unit" ]; + pytestFlagsArray = [ + "tests/unit" + ]; # Deselect socket tests on Darwin because it hits the path length limit for a Unix domain socket disabledTests = lib.optionals stdenv.isDarwin [ "api_test" "stream_response" "socket_file" ]; diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix index a1036e099ea8..f59b7ba73662 100644 --- a/pkgs/development/python-modules/dpkt/default.nix +++ b/pkgs/development/python-modules/dpkt/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dpkt"; - version = "1.9.7.2"; + version = "1.9.8"; src = fetchPypi { inherit pname version; - sha256 = "80f977667ebbad2b5c4f7b7f45ee8bea6622fb71723f68a9a8fe6274520c853b"; + sha256 = "sha256-Q/hobkVdpQUoNf0e2iaJ1R3jZwqsl5mxsAz9IDkn7kU="; }; # Project has no tests diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix index 92081e08067c..dac0eddf751b 100644 --- a/pkgs/development/python-modules/dufte/default.nix +++ b/pkgs/development/python-modules/dufte/default.nix @@ -6,11 +6,13 @@ , matplotlib , numpy , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "dufte"; version = "0.2.29"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -19,7 +21,10 @@ buildPythonPackage rec { rev = "v${version}"; hash = "sha256:0ccsmpj160xj6w503a948aw8icj55mw9414xnmijmmjvlwhm0p48"; }; - format = "pyproject"; + + nativeBuildInputs = [ + setuptools + ]; propagatedBuildInputs = [ matplotlib diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 4b0fb7d224a0..412009cc637a 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -8,11 +8,12 @@ , geventhttpclient , git , glibcLocales +, gnupg , gpgme , mock -, pkgs , urllib3 , paramiko +, pytestCheckHook , pythonOlder }: @@ -42,13 +43,28 @@ buildPythonPackage rec { git glibcLocales gpgme - pkgs.gnupg + gnupg mock paramiko + pytestCheckHook ]; doCheck = !stdenv.isDarwin; + disabledTests = [ + # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpsqwlbpd1/\xc0' + "test_no_decode_encode" + # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpwmtfyvo2/refs.git/refs/heads/\xcd\xee\xe2\xe0\xff\xe2\xe5\xf2\xea\xe01' + "test_cyrillic" + # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/tmpfseetobk/test/\xc0' + "test_commit_no_encode_decode" + ]; + + disabledTestPaths = [ + # missing test inputs + "dulwich/contrib/test_swift_smoke.py" + ]; + pythonImportsCheck = [ "dulwich" ]; diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix index ca23b81eba11..65a9f4b0dcb0 100644 --- a/pkgs/development/python-modules/dunamai/default.nix +++ b/pkgs/development/python-modules/dunamai/default.nix @@ -6,6 +6,7 @@ , importlib-metadata , packaging , pytestCheckHook +, setuptools }: buildPythonPackage rec { @@ -39,6 +40,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook + setuptools ]; pythonImportsCheck = [ "dunamai" ]; diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 23755f10652b..1507156112d1 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools , tabulate }: @@ -21,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-4sixsWZNnI3UJRlFyB21eAdUCgF8iIZ56ECgIeFV/u8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ dvc-render tabulate # will be available as dvc-render.optional-dependencies.table diff --git a/pkgs/development/python-modules/easydict/default.nix b/pkgs/development/python-modules/easydict/default.nix index e1898d3fc9e4..fd1ebf8d9f3d 100644 --- a/pkgs/development/python-modules/easydict/default.nix +++ b/pkgs/development/python-modules/easydict/default.nix @@ -1,15 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +}: buildPythonPackage rec { pname = "easydict"; - version = "1.9"; + version = "1.10"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "3f3f0dab07c299f0f4df032db1f388d985bb57fa4c5be30acd25c5f9a516883b"; + sha256 = "sha256-Edyywgqqu/7kwYi0vBQ+9r4ESzTb8M5aWTJCwmlaCA8="; }; - docheck = false; # No tests in archive + doCheck = false; # No tests in archive + + pythonImportsCheck = [ + "easydict" + ]; meta = with lib; { homepage = "https://github.com/makinacorpus/easydict"; diff --git a/pkgs/development/python-modules/entry-points-txt/default.nix b/pkgs/development/python-modules/entry-points-txt/default.nix index 0e73f9768115..f6ec759b0a0a 100644 --- a/pkgs/development/python-modules/entry-points-txt/default.nix +++ b/pkgs/development/python-modules/entry-points-txt/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-klFSt3Od7xYgenpMP4DBFoZeQanGrmtJxDm5qeZ1Psc="; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix index 7b6a1a696fe4..bc99c09b402b 100644 --- a/pkgs/development/python-modules/etebase/default.nix +++ b/pkgs/development/python-modules/etebase/default.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "etebase"; - version = "0.31.2"; + version = "0.31.5"; src = fetchFromGitHub { owner = "etesync"; repo = "etebase-py"; rev = "v${version}"; - hash = "sha256-enGmfXW8eV6FgdHfJqXr1orAsGbxDz9xUY6T706sf5U="; + hash = "sha256-87t3toMaApnOSPBKfTGGLo2VRLqU8irFac9lg3kA1eE="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-4eJvFf6aY+DYkrYgam5Ok9941PX4uQOmtRznEY0+1TE="; + hash = "sha256-Qg0aJ6CZaPxGneIs4o402A+fhI/nlJ9X/XdMFqkD/YY="; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/eth-abi/default.nix b/pkgs/development/python-modules/eth-abi/default.nix index 7bf0f9b49710..dc9b2f7895cd 100644 --- a/pkgs/development/python-modules/eth-abi/default.nix +++ b/pkgs/development/python-modules/eth-abi/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "eth-abi"; - version = "3.0.0"; + version = "3.0.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-abi"; rev = "v${version}"; - sha256 = "sha256-qiuyGVOy+n8l3jSqwMGnBXcDrOxIiJ0lNP4lq/EQEhU="; + sha256 = "sha256-xrZpT/9zwDtjSwSPDDse+Aq8plPm26OR/cIrliZUpLY="; }; postPatch = '' @@ -33,6 +33,9 @@ buildPythonPackage rec { parsimonious ]; + # lots of: TypeError: isinstance() arg 2 must be a type or tuple of types + doCheck = false; + checkInputs = [ hypothesis pytestCheckHook diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix index efdde22b8b90..903d9bf95018 100644 --- a/pkgs/development/python-modules/eth-keys/default.nix +++ b/pkgs/development/python-modules/eth-keys/default.nix @@ -41,6 +41,16 @@ buildPythonPackage rec { ++ lib.optional (!isPyPy) eth-hash.optional-dependencies.pysha3 ++ lib.optional isPyPy eth-hash.optional-dependencies.pycryptodome; + disabledTests = [ + # tests are broken + "test_compress_decompress_inversion" + "test_public_key_generation_is_equal" + "test_signing_is_equal" + "test_native_to_coincurve_recover" + "test_public_key_compression_is_equal" + "test_public_key_decompression_is_equal" + ]; + pythonImportsCheck = [ "eth_keys" ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 86149cbd865a..354b10749938 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "evdev"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WzOxdPfIRXbn3WBx5Di/WtIn2pXv1DVqOf5Mg1VBL+Y="; + sha256 = "sha256-7PoBtchPfoxs7TNnrJUoj0PNhO+/1919DNv8DRjIemo="; }; buildInputs = [ linuxHeaders ]; diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix index 5fe9e716ddb6..1475b44e0016 100644 --- a/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/pkgs/development/python-modules/exceptiongroup/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "exceptiongroup"; - version = "1.0.0rc8"; + version = "1.0.0rc9"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aZDCTwa40zyAZc/kPl6KS/o4TgNYvgNq+cxgtjIb0Ro="; + hash = "sha256-kIakoh75sxxyGBx3wECgdLoIie5Wp7KJ/wr7DZdlX5Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/exdown/default.nix b/pkgs/development/python-modules/exdown/default.nix index d369b3645ab6..f7b4a38ee476 100644 --- a/pkgs/development/python-modules/exdown/default.nix +++ b/pkgs/development/python-modules/exdown/default.nix @@ -3,6 +3,7 @@ , isPy27 , fetchPypi , pythonOlder +, setuptools , importlib-metadata , pytestCheckHook }: @@ -19,6 +20,10 @@ buildPythonPackage rec { sha256 = "sha256-r0SCigkUpOiba4MDf80+dLjOjjruVNILh/raWfvjXA0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; checkInputs = [ diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index a464d0372b51..9b8e6f7574a1 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "faker"; - version = "13.15.0"; + version = "14.2.0"; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-oSb6ZvVOZaZ/kT3MaYydAj3vcneIJTa94paPyscBv9U="; + hash = "sha256-bbVuLEOit0JQ0cMy7yX+99wH3LbF+rUynde0RnuO17k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix index 8051fbb55bfb..89d047e968aa 100644 --- a/pkgs/development/python-modules/falcon/default.nix +++ b/pkgs/development/python-modules/falcon/default.nix @@ -6,6 +6,7 @@ # build , cython +, setuptools # tests , aiofiles @@ -38,7 +39,9 @@ buildPythonPackage rec { hash = "sha256-Y6bD0GCXhqpvMV+/i1v59p2qWZ91f2ey7sPQrVALY54="; }; - nativeBuildInputs = lib.optionals (!isPyPy) [ + nativeBuildInputs = [ + setuptools + ] ++ lib.optionals (!isPyPy) [ cython ]; diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index ef8a62bc8e8e..7072e4b3378c 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , diskcache , more-itertools , pytestCheckHook @@ -18,6 +19,10 @@ buildPythonPackage rec { hash = "sha256-FVhHp8BZ/wQQyr5AcuDo94LlflixhjZ0SnheSdHuDVQ="; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ diskcache more-itertools diff --git a/pkgs/development/python-modules/fe25519/default.nix b/pkgs/development/python-modules/fe25519/default.nix index 4c2d10278e0c..9e32640b8476 100644 --- a/pkgs/development/python-modules/fe25519/default.nix +++ b/pkgs/development/python-modules/fe25519/default.nix @@ -6,6 +6,7 @@ , parts , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -20,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-/grXAiWERDeTCWgFnNC1Ok8D5I9MBlwd1501TW0yK5c="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ bitlist fountains diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 5fdbd8c441fe..7afb72545147 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.7.1"; + version = "3.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Og/YUWatnbq1TJrslnN7dEEG3F8VwLCaZ0SkRSmfzwQ="; + hash = "sha256-VUR8qmZvIZjFtrE6JtIITSb6WxFcANBlZkshJGgMTtw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/finitude/default.nix b/pkgs/development/python-modules/finitude/default.nix index eb4115914e10..aa6687a30862 100644 --- a/pkgs/development/python-modules/finitude/default.nix +++ b/pkgs/development/python-modules/finitude/default.nix @@ -5,6 +5,7 @@ , pyserial , pythonOlder , pyyaml +, setuptools }: buildPythonPackage rec { @@ -21,6 +22,10 @@ buildPythonPackage rec { sha256 = "sha256-yCI5UCRDhw+dJoTKyjmHbAGBm3by2AyxHKlqCywnLcs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyserial prometheus-client diff --git a/pkgs/development/python-modules/flask-mailman/default.nix b/pkgs/development/python-modules/flask-mailman/default.nix new file mode 100644 index 000000000000..aa8ffae24370 --- /dev/null +++ b/pkgs/development/python-modules/flask-mailman/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, mkdocs-material-extensions +, flask +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "flask-mailman"; + version = "0.3.0"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "waynerv"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-cfLtif+48M6fqOkBbi4PJRFpf9FRXCPesktFQky34eU="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + flask + mkdocs-material-extensions + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "flask_mailman" ]; + + meta = with lib; { + homepage = "https://github.com/waynerv/flask-mailman"; + description = "Flask extension providing simple email sending capabilities."; + license = licenses.bsd3; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index 7af6ea692cae..4c1b46fc86bb 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -9,7 +9,8 @@ # extras: common , bcrypt , bleach -, flask_mail +, flask-mailman +, qrcode # extras: fsqla , flask-sqlalchemy @@ -19,7 +20,6 @@ # extras: mfa , cryptography , phonenumbers -, pyqrcode # propagates , blinker @@ -39,17 +39,18 @@ , peewee , pony , pytestCheckHook +, python-dateutil , zxcvbn }: buildPythonPackage rec { pname = "flask-security-too"; - version = "4.1.5"; + version = "5.0.1"; src = fetchPypi { pname = "Flask-Security-Too"; inherit version; - sha256 = "sha256-98jKcHDv/+mls7QVWeGvGcmoYOGCspxM7w5/2RjJxoM="; + sha256 = "sha256-Q247oFmE8BDid0EFXGm8EsxFVmlG5NgFmQomKMNlZZQ="; }; propagatedBuildInputs = [ @@ -71,7 +72,8 @@ buildPythonPackage rec { common = [ bcrypt bleach - flask_mail + flask-mailman + qrcode ]; fsqla = [ flask-sqlalchemy @@ -81,7 +83,6 @@ buildPythonPackage rec { mfa = [ cryptography phonenumbers - pyqrcode ]; }; @@ -93,6 +94,7 @@ buildPythonPackage rec { peewee pony pytestCheckHook + python-dateutil zxcvbn ] ++ passthru.optional-dependencies.babel diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix index 28972b62b977..6a595e29079e 100644 --- a/pkgs/development/python-modules/fontparts/default.nix +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "fontParts"; - version = "0.10.7"; + version = "0.10.8"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-u0hKI2LLWAUGIVRECk6b5y7UKgJHUx2I8R5Q+qkKxcg="; + sha256 = "sha256-LwEhvLqx3Vu1omc/QrGCptQD25Tbv9Ok5eTURL3hvEQ="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/fountains/default.nix b/pkgs/development/python-modules/fountains/default.nix index 1d65c4e643c8..2b95431ac4e0 100644 --- a/pkgs/development/python-modules/fountains/default.nix +++ b/pkgs/development/python-modules/fountains/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , bitlist , pythonOlder }: @@ -17,6 +18,10 @@ buildPythonPackage rec { hash = "sha256-9ASOgqkE1vwCKGAZXEJaHoABMXomIWTGv3jAsNssdsU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ bitlist ]; diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index 171d2b0556ab..b1300b4e1146 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -10,21 +10,21 @@ buildPythonPackage rec { pname = "freezegun"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-tMZO+ydea8aNxudxsX/+D/D5C4GipRiQQ1ULZRmSa6Q="; + hash = "sha256-zSLRugaUE4RBDNln2KmdWuJEL1ffr+/y/aXejcXAVEY="; }; patches = lib.optionals (pythonAtLeast "3.10") [ # Staticmethods in 3.10+ are now callable, prevent freezegun to attempt to decorate them (fetchpatch { url = "https://github.com/spulec/freezegun/pull/397/commits/e63874ce75a74a1159390914045fe8e7955b24c4.patch"; - sha256 = "sha256-FNABqVN5DFqVUR88lYzwbfsZj3xcB9/MvQtm+I2VjnI="; + hash = "sha256-FNABqVN5DFqVUR88lYzwbfsZj3xcB9/MvQtm+I2VjnI="; }) ]; diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index e2b1e11278b7..28a089296481 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -5,6 +5,7 @@ , python , libev , greenlet +, setuptools , zope_event , zope_interface , pythonOlder @@ -22,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-9ItkV4w2e5H6eTv46qr0mVy5PIvEWGDkc7+GgHCtCU4="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ libev ]; diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index 97ff89852d3b..8164d6099a45 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "glean-parser"; - version = "6.1.2"; + version = "6.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-EqD+ztwRRNd/pXHgQi/z/qTbrcOB1jG+qACmsvWPT38="; + hash = "sha256-PKUc1PYfM4MxDFErV4zYyHl/mkPQNvIcjNaDekenHc8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix index 8ede9275db89..68d50c435fc2 100644 --- a/pkgs/development/python-modules/glean-sdk/default.nix +++ b/pkgs/development/python-modules/glean-sdk/default.nix @@ -11,24 +11,25 @@ , pythonOlder , rustc , rustPlatform +, semver , setuptools-rust }: buildPythonPackage rec { pname = "glean-sdk"; - version = "51.1.0"; + version = "51.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Rt+N/sqX7IyoXbytzF9UkyXsx0vQXbGs+XJkaMhevE0="; + hash = "sha256-4EXCYthMabdmxWYltcnO0UTNeAYXwXQeRfwxt1WD3Ug="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-oY94YVs6I+/klogyajBoCrYexp9oUSrQ6znWVbigf2E="; + hash = "sha256-qOGoonutuIY+0UVaVSVVt0NbqEICdNs3qHWG0Epmkl0="; }; nativeBuildInputs = [ @@ -42,6 +43,7 @@ buildPythonPackage rec { cffi glean-parser iso8601 + semver ]; checkInputs = [ diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index d2d526ea60df..e10ae6927f63 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -19,20 +20,25 @@ buildPythonPackage rec { sha256 = "sha256-RDd0KR7NjBTlgeQ/E4mnLnB2n4NCPoAt2a62NGdzCZE="; }; - checkInputs = [ - pytestCheckHook - ]; - postPatch = '' substituteInPlace setup.cfg \ --replace "'marcelblijleven@gmail.com" "marcelblijleven@gmail.com" \ --replace "version: file: VERSION" "version = ${version}" ''; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "goodwe" ]; + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { description = "Python library for connecting to GoodWe inverter"; homepage = "https://github.com/marcelblijleven/goodwe"; diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index 50b58e5a3f15..89139485ca37 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.8.2"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BvckTGQDIrUIsSWQO7VwG+urzogy+Fq6kzXsALPQLtw="; + sha256 = "sha256-4WwVoReJvFo0V6+ygYo1QKA/NB5ucQ1/m79s3i70p8g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 845bb25638f5..73f8310cc0d8 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.57.0"; + version = "2.61.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7EQSVFsMWXioM7sDmTpGEhrSxwDzKvDLoj+EObP1+wI="; + sha256 = "sha256-3goMt7sY6/9c99x4K0ikiKFL12hLU4eZ8xvtq33iuD8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix index 6e4e2d283f6f..f51cac5d8a5c 100644 --- a/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.5.1"; + version = "1.5.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1crkhcf56U6DAx9xVG2e9hCxQ04OjQq2QgLs434cCv0="; + sha256 = "sha256-D0pIR1vQEt/7aIxMo0uDlxvt+fwS2DxCurU/lxMHAjo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gql/default.nix b/pkgs/development/python-modules/gql/default.nix index 0c8b2bd9378a..2adcf894dcca 100644 --- a/pkgs/development/python-modules/gql/default.nix +++ b/pkgs/development/python-modules/gql/default.nix @@ -1,6 +1,7 @@ { lib , aiofiles , aiohttp +, backoff , botocore , buildPythonPackage , fetchFromGitHub @@ -8,6 +9,7 @@ , mock , parse , pytest-asyncio +, pytest-console-scripts , pytestCheckHook , pythonOlder , requests @@ -34,6 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + backoff botocore graphql-core requests @@ -48,10 +51,19 @@ buildPythonPackage rec { mock parse pytest-asyncio + pytest-console-scripts pytestCheckHook vcrpy ]; + preCheck = '' + export PATH=$out/bin:$PATH + ''; + + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + disabledTests = [ # Tests requires network access "test_execute_result_error" diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index b78373294326..a9aadb85210b 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/pkgs/development/python-modules/gradient/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "gradient"; - version = "2.0.5"; + version = "2.0.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-D0JX6tk6SY5seH9m21hwMZ2TnaAG6OrHo+ucJEredd0="; + hash = "sha256-pqyyNzx2YPP3qmWQbzGd3q2HzCkrWlIVSJZeFrGm9dk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 4264a8252610..12f3044f0680 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "greenlet"; - version = "1.1.2"; + version = "1.1.3"; disabled = isPyPy; # builtin for pypy src = fetchPypi { inherit pname version; - sha256 = "e30f5ea4ae2346e62cedde8794a56858a67b878dd79f7df76a0767e356b1744a"; + sha256 = "sha256-vLbG3R1r5tONbbKDdH0H/aCJ/4xVmoNSNlYKRBA0BFU="; }; checkInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 9fdcdce48927..d386deb44221 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -9,6 +9,11 @@ buildPythonPackage rec { sha256 = "1178f2ea531f80cc2027ec64728df6ffc8e98cf1df61652a496eafd612127183"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'protobuf>=3.12.0, < 4.0dev' 'protobuf' + ''; + outputs = [ "out" "dev" ]; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index e14223c1fd6d..52c7be56bc72 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -8,7 +8,7 @@ , python , pygobject3 , gobject-introspection -, gst-plugins-base +, gst_all_1 , isPy3k }: @@ -28,22 +28,27 @@ buildPythonPackage rec { # Python 2.x is not supported. disabled = !isPy3k; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja pkg-config - python gobject-introspection - gst-plugins-base + gst_all_1.gst-plugins-base ]; propagatedBuildInputs = [ - gst-plugins-base + gst_all_1.gst-plugins-base pygobject3 ]; mesonFlags = [ "-Dpygi-overrides-dir=${placeholder "out"}/${python.sitePackages}/gi/overrides" + # Exec format error during configure + "-Dpython=${python.pythonForBuild.interpreter}" ]; doCheck = true; diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix index fef545f6bf92..7760346f9dba 100644 --- a/pkgs/development/python-modules/gvm-tools/default.nix +++ b/pkgs/development/python-modules/gvm-tools/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "gvm-tools"; - version = "22.6.1"; + version = "22.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pU/KNdWt+Iy/YiIAQFFgkaGHOvXK6v4Loia9MD4qmWc="; + sha256 = "sha256-I+fnVRxkv8MjPOBElRZv2aigAOA0gGm5xoK+bFohfZA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index ce8154d362eb..8a9e0c1e20cd 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -7,6 +7,7 @@ , pytestCheckHook , python-slugify , pythonOlder +, setuptools , voluptuous , websocket-client , xmltodict @@ -26,6 +27,10 @@ buildPythonPackage rec { sha256 = "sha256-OWEF1CJ4ZW64P4w3M+uur/NKCmjhS1c19izA041cC8A="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp python-slugify diff --git a/pkgs/development/python-modules/hangups/default.nix b/pkgs/development/python-modules/hangups/default.nix index 18dd31f8af56..9782a89114a9 100644 --- a/pkgs/development/python-modules/hangups/default.nix +++ b/pkgs/development/python-modules/hangups/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "protobuf>=3.1.0,<3.20" "protobuf" \ + --replace "protobuf>=3.1.0,<4" "protobuf" \ --replace "MechanicalSoup>=0.6.0,<0.13" "MechanicalSoup" ''; diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index c6b17872ea8d..a1c07368c0de 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "acme==" "acme>=" \ - --replace "cryptography>=2.8,<37.0" "cryptography" \ + --replace "cryptography>=2.8,<38.0" "cryptography" \ --replace "pycognito==" "pycognito>=" \ --replace "snitun==" "snitun>=" \ ''; diff --git a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix index 0092f4b657a4..4e1a32236f0d 100644 --- a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix +++ b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "hatch-fancy-pypi-readme"; - version = "22.3.0"; + version = "22.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "hatch_fancy_pypi_readme"; inherit version; - hash = "sha256-fUZR+PB4JZMckoc8tRE3IUqTi623p1m4XB2Vv3T4bvo="; + hash = "sha256-3t8roLgaKXWrsd7ukxCy64XSI4D9oNUoaedgtUNapZY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix index 636d46dfdd7f..6006c30219e1 100644 --- a/pkgs/development/python-modules/hatchling/default.nix +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -20,7 +20,7 @@ let pname = "hatchling"; - version = "1.8.0"; + version = "1.9.0"; in buildPythonPackage { inherit pname version; @@ -28,7 +28,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-pPmC/coHF9jEa/57UBMC+QqvKlMChF1VC0nIc5aB/rI="; + sha256 = "sha256-tXxzYvQ3uUJuS5QiiiHSrFgE+7KrywGt3iVEo1uzA80="; }; # listed in backend/src/hatchling/ouroboros.py diff --git a/pkgs/development/python-modules/headerparser/default.nix b/pkgs/development/python-modules/headerparser/default.nix index 6a07f1f07ca7..3c1fd4fff9d3 100644 --- a/pkgs/development/python-modules/headerparser/default.nix +++ b/pkgs/development/python-modules/headerparser/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytest-mock , pytestCheckHook , pythonOlder @@ -21,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-KJJt85iC/4oBoIelB2zUJVyHSppFem/22v6F30P5nYM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/homeconnect/default.nix b/pkgs/development/python-modules/homeconnect/default.nix index a3e5c2ddb1dc..edf600921f1a 100644 --- a/pkgs/development/python-modules/homeconnect/default.nix +++ b/pkgs/development/python-modules/homeconnect/default.nix @@ -4,6 +4,7 @@ , requests , requests-oauthlib , pythonOlder +, setuptools , six }: @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-wCx8Jh3NBTnYI+essH9toacjUaT4fS61SaAAZDCYZ4g="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests requests-oauthlib diff --git a/pkgs/development/python-modules/http-parser/default.nix b/pkgs/development/python-modules/http-parser/default.nix index d98785576f48..d0fc242c9896 100644 --- a/pkgs/development/python-modules/http-parser/default.nix +++ b/pkgs/development/python-modules/http-parser/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytest +, cython +, setuptools +, pytestCheckHook }: buildPythonPackage rec { @@ -12,15 +14,22 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "benoitc"; repo = pname; - rev = version; - sha256 = "05byv1079qi7ypvzm13yf5nc23ink6gr6c5wrhq7fwld4syscy2q"; + rev = "refs/tags/${version}"; + hash = "sha256-WHimvSaNcncwzLwwk5+ZNg7BbHF+hPr39SfidEDYfhU="; }; - checkInputs = [ pytest ]; + nativeBuildInputs = [ + setuptools + ]; - checkPhase = "pytest testing/"; - pythonImportsCheck = [ "http_parser" ]; + pythonImportsCheck = [ + "http_parser" + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "HTTP request/response parser for python in C"; diff --git a/pkgs/development/python-modules/http-sfv/default.nix b/pkgs/development/python-modules/http-sfv/default.nix index abee83637215..55b318ff40de 100644 --- a/pkgs/development/python-modules/http-sfv/default.nix +++ b/pkgs/development/python-modules/http-sfv/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools , typing-extensions }: @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-zl0Rk4QbzCVmYZ6TnVq+C+oe27Imz5fEQY9Fco5lo5s="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ typing-extensions ]; diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 1e8afe9e543a..59c758b25aa6 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.50.1"; + version = "6.54.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-G7OXlYaCPBfdXtmX/f/6i2LRCZZk5yvzhLc6sissuRo="; + hash = "sha256-mr8ctmAzRgWNVpW+PZlOhaQ0l28P0U8PxvjoVjfHX78="; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix index dd0112860105..bf321edb38be 100644 --- a/pkgs/development/python-modules/idna/default.nix +++ b/pkgs/development/python-modules/idna/default.nix @@ -1,19 +1,27 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , pytestCheckHook }: buildPythonPackage rec { pname = "idna"; - version = "3.3"; + version = "3.4"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"; + sha256 = "sha256-gU9Sjo3q19MpgzuRxfqofWC/cYJM0Sp1MLVSYGPQLLQ="; }; - checkInputs = [ pytestCheckHook ]; + nativeBuildInputs = [ + flit-core + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = { homepage = "https://github.com/kjd/idna/"; diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index 89537a8dfa2b..7e5d7e1448ac 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "importlib-resources"; - version = "5.8.0"; + version = "5.9.0"; format = "pyproject"; disabled = isPy27; src = fetchPypi { pname = "importlib_resources"; inherit version; - sha256 = "sha256-VoyfFssgT53syNbSSlcu7qJ9rLtM7p5rA6gCVzZ2l1E="; + sha256 = "sha256-VIHpf7Ra+Nzy95iVJiVZHFj+WZ0HNdhrEPVN4IamFoE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/in-place/default.nix b/pkgs/development/python-modules/in-place/default.nix index 6490aea35983..7114fae94e98 100644 --- a/pkgs/development/python-modules/in-place/default.nix +++ b/pkgs/development/python-modules/in-place/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , lib , pytestCheckHook +, setuptools }: buildPythonPackage rec { @@ -20,6 +21,10 @@ buildPythonPackage rec { substituteInPlace tox.ini --replace "--cov=in_place --no-cov-on-fail" "" ''; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "in_place" ]; diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index bb98c5bd679f..6e64c946b980 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -3,22 +3,25 @@ , fetchPypi , isPy27 , setuptools-scm +, pydantic , pytestCheckHook }: buildPythonPackage rec { pname = "inflect"; - version = "5.6.2"; + version = "6.0.0"; disabled = isPy27; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qtx+1zko9eAUEpeUu6wDBYzKNdCpc6X8TrRcf6JgBfk="; + sha256 = "sha256-C8FRbsJyXi2CIXB6YSJFCTy28c6iCc/Yy9T8Xpb6Y2U="; }; nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ pydantic ]; + checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "inflect" ]; diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index e3f981964b65..36bd9961903c 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.15.1"; + version = "6.15.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-N6zDJUyqig2vzd3cjchjpgrRtGSHtoruNh2aFb2pgRI="; + sha256 = "sha256-uB1XsOFxZwhEvynNwRVisQENPahxFcRRPg7mYKg2h2U="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix index 567c033e243f..1fbf03cfa797 100644 --- a/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/pkgs/development/python-modules/ipyvuetify/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipyvuetify"; - version = "1.8.2"; + version = "1.8.4"; # GitHub version tries to run npm (Node JS) src = fetchPypi { inherit pname version; - sha256 = "sha256-uFjS7lv8kDRultRqqu2++1eieLs67dLolVurTXWls8A="; + sha256 = "sha256-viBWeFLGuKQKs9wXO3EULTNorrW25P2DFX1t5OmUcW0="; }; propagatedBuildInputs = [ ipyvue ]; diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index 62737e74785a..b4689b207756 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -6,18 +6,19 @@ , lib , nbformat , pytestCheckHook +, pytz , traitlets , widgetsnbextension }: buildPythonPackage rec { pname = "ipywidgets"; - version = "7.7.1"; + version = "8.0.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Xy+ht6+uGvMsiAiMmCitl43pPd2jk9ftQU5VP+6T3Ks="; + hash = "sha256-CMt1xuCpaDYUfL/cVVgK4E0T4F0m/7w3e04caLqiix8="; }; propagatedBuildInputs = [ @@ -26,6 +27,7 @@ buildPythonPackage rec { jupyterlab-widgets traitlets nbformat + pytz widgetsnbextension ]; diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index d21f79b6ba9b..466d51266216 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -2,6 +2,7 @@ , colorama , hypothesis , poetry-core +, setuptools , pylama , pytestCheckHook }: @@ -20,6 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + setuptools ]; checkInputs = [ diff --git a/pkgs/development/python-modules/jaraco_logging/default.nix b/pkgs/development/python-modules/jaraco_logging/default.nix index d8ff10d95b62..1fa4e6dfed9f 100644 --- a/pkgs/development/python-modules/jaraco_logging/default.nix +++ b/pkgs/development/python-modules/jaraco_logging/default.nix @@ -1,20 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm -, tempora, six +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, setuptools-scm +, tempora +, six }: buildPythonPackage rec { - pname = "jaraco.logging"; - version = "3.1.0"; + pname = "jaraco-logging"; + version = "3.1.2"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - sha256 = "150dc8701207b28bc65a16f0e91c07250a8d1b9da324ce674c0e375774944f13"; + pname = "jaraco.logging"; + inherit version; + sha256 = "sha256-k6cLizdnd5rWx7Vu6YV5ztd7afFqu8rnSfYsLFnmeTE="; }; pythonNamespaces = [ "jaraco" ]; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ tempora six ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + tempora + six + ]; # test no longer packaged with pypi doCheck = false; @@ -25,5 +39,6 @@ buildPythonPackage rec { description = "Support for Python logging facility"; homepage = "https://github.com/jaraco/jaraco.logging"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index 2bdf376ffe23..341c744a4293 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -2,22 +2,26 @@ , buildPythonPackage , fetchPypi , pythonOlder +, autocommand , importlib-resources , jaraco_functools , jaraco-context +, inflect +, pathlib2 +, pytestCheckHook , setuptools-scm }: buildPythonPackage rec { pname = "jaraco.text"; - version = "3.8.1"; + version = "3.9.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RQlXw/j7mlU9nT5gc4czqxxcwns2pGM0KtuTfppwqz4="; + sha256 = "sha256-1XzURIpYgCAxhCXgQZTol/lvwjuSuC/5MIok1cvys/s="; }; pythonNamespaces = [ @@ -29,14 +33,19 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + autocommand jaraco-context jaraco_functools + inflect ] ++ lib.optional (pythonOlder "3.9") [ importlib-resources ]; - # no tests in pypi package - doCheck = false; + checkInputs = [ + pytestCheckHook + ] ++ lib.optional (pythonOlder "3.10") [ + pathlib2 + ]; pythonImportsCheck = [ "jaraco.text" diff --git a/pkgs/development/python-modules/javaproperties/default.nix b/pkgs/development/python-modules/javaproperties/default.nix index e3eee7d72e9b..3132c873246f 100644 --- a/pkgs/development/python-modules/javaproperties/default.nix +++ b/pkgs/development/python-modules/javaproperties/default.nix @@ -1,6 +1,9 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools , six -, pytest +, pytestCheckHook , python-dateutil }: @@ -16,13 +19,26 @@ buildPythonPackage rec { sha256 = "16rcdw5gd4a21v2xb1j166lc9z2dqcv68gqvk5mvpnm0x6nwadgp"; }; - propagatedBuildInputs = [ six ]; + nativeBuildInputs = [ + setuptools + ]; - checkInputs = [ python-dateutil pytest ]; - checkPhase = '' - rm tox.ini - pytest -k 'not dumps and not time' --ignore=test/test_propclass.py - ''; + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + python-dateutil + pytestCheckHook + ]; + + disabledTests = [ + "time" + ]; + + disabledTestPaths = [ + "test/test_propclass.py" + ]; meta = with lib; { description = "Microsoft Azure API Management Client Library for Python"; diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 456c9108593e..12ba67b71244 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -35,6 +35,7 @@ , giflib , grpc , libjpeg_turbo +, protobuf , python , snappy , zlib @@ -49,7 +50,6 @@ }: let - inherit (cudaPackages) cudatoolkit cudnn nccl; pname = "jaxlib"; @@ -120,7 +120,7 @@ let numpy openssl pkgs.flatbuffers - pkgs.protobuf + protobuf pybind11 scipy six @@ -158,7 +158,7 @@ let build --action_env=PYENV_ROOT build --python_path="${python}/bin/python" build --distinct_host_configuration=false - build --define PROTOBUF_INCLUDE_PATH="${pkgs.protobuf}/include" + build --define PROTOBUF_INCLUDE_PATH="${protobuf}/include" '' + lib.optionalString cudaSupport '' build --action_env CUDA_TOOLKIT_PATH="${cudatoolkit_joined}" build --action_env CUDNN_INSTALL_PATH="${cudnn}" @@ -268,8 +268,8 @@ let sed -i 's@-lprotobuf@-l:libprotobuf.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD sed -i 's@-lprotoc@-l:libprotoc.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD '' else if stdenv.cc.isClang then '' - sed -i 's@-lprotobuf@${pkgs.protobuf}/lib/libprotobuf.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD - sed -i 's@-lprotoc@${pkgs.protobuf}/lib/libprotoc.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD + sed -i 's@-lprotobuf@${protobuf}/lib/libprotobuf.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD + sed -i 's@-lprotoc@${protobuf}/lib/libprotoc.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD '' else throw "Unsupported stdenv.cc: ${stdenv.cc}"); installPhase = '' diff --git a/pkgs/development/python-modules/json-stream/default.nix b/pkgs/development/python-modules/json-stream/default.nix index 5ccda914b226..022b25d9db52 100644 --- a/pkgs/development/python-modules/json-stream/default.nix +++ b/pkgs/development/python-modules/json-stream/default.nix @@ -4,6 +4,7 @@ , pytestCheckHook , pythonOlder , requests +, setuptools }: buildPythonPackage rec { @@ -18,6 +19,10 @@ buildPythonPackage rec { hash = "sha256-6VWAaTjzVDss01aFI53Lg0oNuus5u4TRF/co9DHOhLU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/jsonschema-spec/default.nix b/pkgs/development/python-modules/jsonschema-spec/default.nix new file mode 100644 index 000000000000..4e11bd4a27e2 --- /dev/null +++ b/pkgs/development/python-modules/jsonschema-spec/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, poetry-core +, jsonschema +, pathable +, pyyaml +, typing-extensions +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jsonschema-spec"; + version = "0.1.2"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "p1c2u"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-RfkD2fVH9OUTe0XNpHO6brQ4+8zbMpae6AgdeFpYXa8="; + }; + + postPatch = '' + sed -i "/--cov/d" pyproject.toml + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + jsonschema + pathable + pyyaml + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/p1c2u/jsonschema-spec/releases/tag/${version}"; + description = "JSONSchema Spec with object-oriented paths"; + homepage = "https://github.com/p1c2u/jsonschema-spec"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index 2ccbacbf61c8..536389fb3b10 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -2,6 +2,7 @@ , attrs , buildPythonPackage , fetchPypi +, hatch-fancy-pypi-readme , hatch-vcs , hatchling , importlib-metadata @@ -14,25 +15,22 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "4.13.0"; + version = "4.16.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-N3ZRLfT1P3Tm4o/jVxe1siPBdWh1SGmEoxvJFl5/ySA="; + sha256 = "sha256-FlBZ8Hbv9pcbrlt0L8App7TvP5vPBMFOR3anYF3hSyM="; }; - patches = [ - ./remove-fancy-pypi-readme.patch - ]; - postPatch = '' patchShebangs json/bin/jsonschema_suite ''; nativeBuildInputs = [ + hatch-fancy-pypi-readme hatch-vcs hatchling ]; diff --git a/pkgs/development/python-modules/jsonschema/remove-fancy-pypi-readme.patch b/pkgs/development/python-modules/jsonschema/remove-fancy-pypi-readme.patch deleted file mode 100644 index 7124e5a6263b..000000000000 --- a/pkgs/development/python-modules/jsonschema/remove-fancy-pypi-readme.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/pyproject.toml 2022-08-21 05:04:18.443484836 +0200 -+++ b/pyproject.toml 2022-08-21 05:04:50.789353514 +0200 -@@ -76,30 +76,6 @@ - Changelog = "https://github.com/python-jsonschema/jsonschema/blob/main/CHANGELOG.rst" - Source = "https://github.com/python-jsonschema/jsonschema" - --[tool.hatch.metadata.hooks.fancy-pypi-readme] --content-type = "text/x-rst" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --path = "README.rst" --end-before = ".. start cut from PyPI" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --path = "README.rst" --start-after = ".. end cut from PyPI\n\n\n" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --text = """ -- -- --Release Information --------------------- -- --""" -- --[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]] --path = "CHANGELOG.rst" --pattern = "(^v.+?)\nv" -- - [tool.isort] - from_first = true - include_trailing_comma = true diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index a03910f6ce0b..7753f201a928 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "jupyter-book"; - version = "0.13.0"; + version = "0.13.1"; format = "flit"; @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0a956677e7bbee630dd66641c09a84091277887d6dcdd381a676f00fa9de2074"; + sha256 = "sha256-RgpC/H4J3kbdZsKuwYu7EOKCqcgM2v4uUsm6PVFknQE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix index 6df956de5208..598cef9a8e58 100644 --- a/pkgs/development/python-modules/jupyter-client/default.nix +++ b/pkgs/development/python-modules/jupyter-client/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "7.3.4"; + version = "7.3.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qppsMgVLKQN0+V9zuwyukUVcWN+4T2XIWRkSuPZebVY="; + sha256 = "sha256-PFhGahuNVdugvzzgg05PW3dguvmNHXPbCt1vGd6ezR0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter-packaging/default.nix b/pkgs/development/python-modules/jupyter-packaging/default.nix index ae700d9a8068..1ee870bfd573 100644 --- a/pkgs/development/python-modules/jupyter-packaging/default.nix +++ b/pkgs/development/python-modules/jupyter-packaging/default.nix @@ -7,26 +7,32 @@ , packaging , pytestCheckHook , pytest-timeout +, setuptools , tomlkit }: buildPythonPackage rec { pname = "jupyter-packaging"; - version = "0.12.2"; + version = "0.12.3"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { pname = "jupyter_packaging"; inherit version; - sha256 = "sha256-C5nq7PVrnR2Z57y2Yy2RSo6laY2kCyOLqJIno0FX3jI="; + sha256 = "sha256-nZsrY7l//WeovFORwypCG8QVsmSjLJnk2NjdMdqunPQ="; }; nativeBuildInputs = [ hatchling ]; - propagatedBuildInputs = [ deprecation packaging tomlkit ]; + propagatedBuildInputs = [ + deprecation + packaging + setuptools + tomlkit + ]; checkInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index 3052167d1d31..b8914a2a45a0 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "jupyterlab-git"; - version = "0.39.0"; + version = "0.39.2"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "jupyterlab_git"; inherit version; - sha256 = "sha256-2BMSbZ5ICISavg1JON7fiKd4e4vAyWW+geSgxbMowis="; + sha256 = "sha256-+wzKAK5jdrlPjtVDgp7QqOyXaBDzzkRJI+6hcbOcnpo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/pkgs/development/python-modules/jupyterlab-widgets/default.nix index 26794fbc77b5..7077d39cb742 100644 --- a/pkgs/development/python-modules/jupyterlab-widgets/default.nix +++ b/pkgs/development/python-modules/jupyterlab-widgets/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "jupyterlab-widgets"; - version = "2.0.0b1"; + version = "3.0.3"; src = fetchPypi { pname = "jupyterlab_widgets"; inherit version; - sha256 = "1xinfk3bhqmfp9ygfpi8b87h4ky8dv3sdr96035psx1jjgyyw8bi"; + sha256 = "sha256-x2cYE5m0yotke+/i2ROxJg9Rv52O+behRjLUwae1Nr0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index b300d14b25c5..0053c50ef0c0 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.4.6"; + version = "3.4.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-41mci8dM7gZBFfluOIzSeipyUbHcAvStG/in/1Jw8Xk="; + sha256 = "sha256-TcSKsJgOOvLpId/ybgAT3QOxBLG2fw2FtnRI4W4lMR4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index edb928e682b7..32f4ad3a5995 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "keras"; - version = "2.9.0"; + version = "2.10.0"; format = "wheel"; src = fetchPypi { inherit format pname version; - sha256 = "sha256-VZESVvic/JNDyfvkth7EWi0z2Jcpy+GrncrPiwe4tqs="; + sha256 = "sha256-JqbiwlIudGjd6iJxCpmzKQSTdo/AijnnXRFzoONFL98="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 743220e89ee7..3d6c49859372 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -6,6 +6,7 @@ , setuptools-scm , importlib-metadata , dbus-python +, jaraco_classes , jeepney , secretstorage , pytestCheckHook @@ -13,28 +14,29 @@ buildPythonPackage rec { pname = "keyring"; - version = "23.7.0"; - disabled = pythonOlder "3.7"; - + version = "23.9.3"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eC4c0RMukb9Fn80kO88lsyYBXBrAsZjkQI+R+meRBis="; + hash = "sha256-abAd2DxC9ZAlD+eh9QP8IpsU3oOFcxSxkzo92/WVxKU="; }; nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ - importlib-metadata + propagatedBuildInputs = [ + jaraco_classes ] ++ lib.optionals stdenv.isLinux [ jeepney secretstorage - dbus-python + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata ]; + pythonImportsCheck = [ "keyring" "keyring.backend" diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index 45a85f0fd8fd..7b46634d9f4a 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "keyrings.alt"; - version = "4.1.1"; + version = "4.2.0"; format = "pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-6HFSuVYvqCK1Ew7jECVRK02m5tsNrzjIcFZtCLhK3tY="; + sha256 = "sha256-K6PVZEG6Bjf1+cCWBo9nAQrART+dC2Jt4qowGTU7ZDE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/labmath/default.nix b/pkgs/development/python-modules/labmath/default.nix index 5eaeeba9a06d..602cc060128d 100644 --- a/pkgs/development/python-modules/labmath/default.nix +++ b/pkgs/development/python-modules/labmath/default.nix @@ -1,4 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +}: buildPythonPackage rec { pname = "labmath"; @@ -10,6 +14,10 @@ buildPythonPackage rec { sha256 = "sha256-dzJ4szPxnck0Cgc5IEp5FBmHvIyAC0rqKRVrkt20ntQ="; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "labmath" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/language-data/default.nix b/pkgs/development/python-modules/language-data/default.nix index 98d4885b1e94..803df3abaea5 100644 --- a/pkgs/development/python-modules/language-data/default.nix +++ b/pkgs/development/python-modules/language-data/default.nix @@ -4,6 +4,7 @@ , marisa-trie , poetry-core , pythonOlder +, setuptools }: buildPythonApplication rec { @@ -22,6 +23,7 @@ buildPythonApplication rec { nativeBuildInputs = [ poetry-core + setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lc7001/default.nix b/pkgs/development/python-modules/lc7001/default.nix index 0683794eda50..5e78d42471ce 100644 --- a/pkgs/development/python-modules/lc7001/default.nix +++ b/pkgs/development/python-modules/lc7001/default.nix @@ -4,6 +4,7 @@ , fetchPypi , pythonOlder , poetry-core +, setuptools }: buildPythonPackage rec { @@ -20,6 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix deleted file mode 100644 index ceaf4f6bf83a..000000000000 --- a/pkgs/development/python-modules/ldap/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ buildPythonPackage, fetchPypi -, pyasn1, pyasn1-modules -, pythonAtLeast, pytestCheckHook -, openldap, cyrus_sasl, lib, stdenv }: - -buildPythonPackage rec { - pname = "python-ldap"; - version = "3.4.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-sWRwoJg6rwmgD/uPQLaaJEbz0L5jmiKSVrzjgfyyaPc="; - }; - - propagatedBuildInputs = [ pyasn1 pyasn1-modules ]; - - checkInputs = [ pytestCheckHook ]; - buildInputs = [ openldap cyrus_sasl ]; - - preCheck = '' - # Needed by tests to setup a mockup ldap server. - export BIN="${openldap}/bin" - export SBIN="${openldap}/bin" - export SLAPD="${openldap}/libexec/slapd" - export SCHEMA="${openldap}/etc/schema" - ''; - - disabledTests = lib.optionals (pythonAtLeast "3.9") [ - # See https://github.com/python-ldap/python-ldap/issues/407 - "test_simple_bind_noarg" - ]; - - doCheck = !stdenv.isDarwin; - - meta = with lib; { - description = "Python modules for implementing LDAP clients"; - homepage = "https://www.python-ldap.org/"; - license = licenses.psfl; - }; -} diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index a3cb21c10972..4697c80680af 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pbr, ldap, prettytable, fixtures, testresources, testtools }: +, pbr, python-ldap, prettytable, fixtures, testresources, testtools }: buildPythonPackage rec { pname = "ldappool"; @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pbr ]; - propagatedBuildInputs = [ ldap prettytable ]; + propagatedBuildInputs = [ python-ldap prettytable ]; checkInputs = [ fixtures testresources testtools ]; diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix index 37347331b587..699d2b0e5b20 100644 --- a/pkgs/development/python-modules/liquidctl/default.nix +++ b/pkgs/development/python-modules/liquidctl/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pythonOlder , installShellFiles +, setuptools , docopt , hidapi , pyusb @@ -25,7 +26,10 @@ buildPythonPackage rec { sha256 = "sha256-2mXWih3LchJ/YsjuwHwWse7SNJYx1vxtovl8vasKV4w="; }; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + setuptools + ]; propagatedBuildInputs = [ docopt diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index b928fe59c1cd..d53d40ca3079 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.38.1"; + version = "0.39.1"; disabled = isPyPy || !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-BiKoYwH8+BzFDX7VtL6+mSwDBYDUE6hEOzKO1PTYJWE="; + sha256 = "sha256-tDq9fILoBSYcQl1QM1vppsT4QmTjTW1uR1IHMAAF1XI="; }; nativeBuildInputs = [ llvm ]; diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix index 6ccef341fadf..607ac5a00d74 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "localstack-ext"; - version = "1.0.4"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YNj4V/mv8gn+TEPBejgyMIuSXYmIXNjk5xruyVbf1qA="; + sha256 = "sha256-EpFkam2xqRSiIhLkcBFSFKr9j0P5oRP4CIUVcjKT5gM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 2fa85598fb15..12374ed1938b 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -53,6 +53,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # Expected: (,) Got: Failure instance: Traceback (failure with no frames): : + "test_welcome" + ]; + postPatch = lib.optionalString stdenv.isLinux '' sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py ''; diff --git a/pkgs/development/python-modules/matplotlib-inline/default.nix b/pkgs/development/python-modules/matplotlib-inline/default.nix index d863239430dc..deb2a68f2504 100644 --- a/pkgs/development/python-modules/matplotlib-inline/default.nix +++ b/pkgs/development/python-modules/matplotlib-inline/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "matplotlib-inline"; - version = "0.1.3"; + version = "0.1.6"; src = fetchPypi { inherit pname version; - sha256 = "a04bfba22e0d1395479f866853ec1ee28eea1485c1d69a6faf00dc3e24ff34ee"; + sha256 = "sha256-+Ifl8Qupjo0rFQ3c9HAsHl+LOiAAXrD3S/29Ng7m8wQ="; }; propagatedBuildInputs = [ @@ -20,7 +20,12 @@ buildPythonPackage rec { # wants to import ipython, which creates a circular dependency doCheck = false; - pythonImportsCheck = [ "matplotlib_inline" ]; + + # + pythonImportsCheck = [ + # tries to import matplotlib, which can't work with doCheck disabled + #"matplotlib_inline" + ]; passthru.tests = { inherit ipython; }; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 933fd3865d6b..ad32c3db7eb6 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -17,7 +17,7 @@ let in buildPythonPackage rec { - version = "3.5.2"; + version = "3.5.3"; pname = "matplotlib"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "18h78s5ld1i6mz00w258hy29909nfr3ddq6ry9kq18agw468bks8"; + sha256 = "sha256-M5ysSLgN28i/0F2q4KOnNBRlGoWWkEwqiBz9Httl8mw="; }; XDG_RUNTIME_DIR = "/tmp"; @@ -112,6 +112,9 @@ buildPythonPackage rec { echo "[libs] system_freetype=true system_qhull=true" > mplsetup.cfg + + substituteInPlace setup.py \ + --replace "setuptools_scm>=4,<7" "setuptools_scm>=4" ''; # Matplotlib needs to be built against a specific version of freetype in diff --git a/pkgs/development/python-modules/matrix-common/default.nix b/pkgs/development/python-modules/matrix-common/default.nix index 0637ad549e92..4abec9e31548 100644 --- a/pkgs/development/python-modules/matrix-common/default.nix +++ b/pkgs/development/python-modules/matrix-common/default.nix @@ -2,20 +2,34 @@ , lib , buildPythonPackage , fetchPypi +, setuptools , attrs +, unittestCheckHook }: buildPythonPackage rec { - pname = "matrix_common"; + pname = "matrix-common"; version = "1.3.0"; format = "pyproject"; src = fetchPypi { - inherit pname version; + pname = "matrix_common"; + inherit version; sha256 = "sha256-YuEhzM2fJDQXtX7DenbcRK6xmKelxnr9a4J1mS/yq9E="; }; - propagatedBuildInputs = [ attrs ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + attrs + ]; + + checkInputs = [ + unittestCheckHook + ]; + pythonImportsCheck = [ "matrix_common" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix index 921ba4d33604..114685e2f46d 100644 --- a/pkgs/development/python-modules/mdformat/default.nix +++ b/pkgs/development/python-modules/mdformat/default.nix @@ -6,6 +6,7 @@ , poetry-core , pytestCheckHook , pythonOlder +, setuptools , tomli , typing-extensions }: @@ -26,6 +27,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix index 03a64588f85b..4174c18d10bf 100644 --- a/pkgs/development/python-modules/mdit-py-plugins/default.nix +++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools , markdown-it-py , pytest-regressions , pytestCheckHook @@ -21,6 +22,10 @@ buildPythonPackage rec { sha256 = "sha256-3zFSTjqwjUV6+fU6falYbIzj/Hp7E/9EXKZIi00tkg4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ markdown-it-py ]; diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix index 1df5a7f47807..2e8d4044ce3b 100644 --- a/pkgs/development/python-modules/meshio/default.nix +++ b/pkgs/development/python-modules/meshio/default.nix @@ -7,6 +7,7 @@ , exdown , pytestCheckHook , rich +, setuptools }: buildPythonPackage rec { @@ -19,6 +20,10 @@ buildPythonPackage rec { sha256 = "sha256-4kBpLX/yecErE8bl17QDYpqGrStE6SMJWLPwDB7DafA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ numpy netcdf4 diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 596b622f6793..2432abe7b09c 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,16 +18,16 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.95"; + version = "1.3.36"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-CMw7PbM82AjbhrCYnRuxF9WFJqr6gvCEkTyG2vKM7FM="; + hash = "sha256-mv4sj9W8bWSaqiPlBdW0v0QAPr9beD/sOgrfJH68S5o="; }; propagatedBuildInputs = [ @@ -43,6 +43,12 @@ buildPythonPackage rec { timeago ]; + passthru.optional-dependencies = { + tunnel = [ + pytap2 + ]; + }; + checkInputs = [ pytap2 pytestCheckHook @@ -56,9 +62,47 @@ buildPythonPackage rec { "meshtastic" ]; + disabledTests = [ + # AttributeError: 'HardwareMessage'... + "test_handleFromRadio_with_my_info" + "test_handleFromRadio_with_node_info" + "test_main_ch_longsfast_on_non_primary_channel" + "test_main_ch_set_name_with_ch_index" + "test_main_configure_with_camel_case_keys" + "test_main_configure_with_snake_case" + "test_main_export_config_called_from_main" + "test_main_export_config_use_camel" + "test_main_export_config" + "test_main_get_with_invalid" + "test_main_get_with_valid_values_camel" + "test_main_getPref_invalid_field_camel" + "test_main_getPref_invalid_field" + "test_main_getPref_valid_field_bool_camel" + "test_main_getPref_valid_field_bool" + "test_main_getPref_valid_field_camel" + "test_main_getPref_valid_field_string_camel" + "test_main_getPref_valid_field_string" + "test_main_getPref_valid_field" + "test_main_set_invalid_wifi_passwd" + "test_main_set_valid_camel_case" + "test_main_set_valid_wifi_passwd" + "test_main_set_valid" + "test_main_set_with_invalid" + "test_main_setPref_ignore_incoming_0" + "test_main_setPref_ignore_incoming_123" + "test_main_setPref_invalid_field_camel" + "test_main_setPref_invalid_field" + "test_main_setPref_valid_field_int_as_string" + "test_readGPIOs" + "test_setURL_empty_url" + "test_watchGPIOs" + "test_writeConfig_with_no_radioConfig" + "test_writeGPIOs" + ]; + meta = with lib; { description = "Python API for talking to Meshtastic devices"; - homepage = "https://meshtastic.github.io/Meshtastic-python/"; + homepage = "https://github.com/meshtastic/Meshtastic-python"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix new file mode 100644 index 000000000000..18c00a95e856 --- /dev/null +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, colorama +, meson +, ninja +, pyproject-metadata +, tomli +}: + +buildPythonPackage rec { + pname = "meson-python"; + version = "0.8.1"; + format = "pyproject"; + + src = fetchPypi { + inherit version; + pname = "meson_python"; + hash = "sha256-RC8fpM9dtQ7qYRcKYFnBD6/XCXf12980QcEGzSOwXkw="; + }; + + nativeBuildInputs = [ + meson + ninja + pyproject-metadata + tomli + ]; + + propagatedBuildInputs = [ + meson + ninja + pyproject-metadata + tomli + ]; + + # Ugly work-around. Drop ninja dependency. + # We already have ninja, but it comes without METADATA. + # Building ninja-python-distributions is the way to go. + postPatch = '' + substituteInPlace pyproject.toml --replace "'ninja'," "" + ''; + + meta = { + description = "Meson Python build backend (PEP 517)"; + homepage = "https://github.com/FFY00/meson-python"; + license = [ lib.licenses.mit ]; + maintainers = [ lib.maintainers.fridh ]; + }; +} diff --git a/pkgs/development/python-modules/mesonpep517/default.nix b/pkgs/development/python-modules/mesonpep517/default.nix index 5e33ae9c1033..b896076e2dc8 100644 --- a/pkgs/development/python-modules/mesonpep517/default.nix +++ b/pkgs/development/python-modules/mesonpep517/default.nix @@ -3,6 +3,7 @@ , fetchPypi , meson , ninja +, setuptools , toml }: @@ -18,6 +19,10 @@ buildPythonPackage rec { sha256 = "sha256-Fyo7JfLqHJqbahEjVDt/0xJxOfVLqLn3xNJ4lSB7KIw="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ toml ]; # postPatch = '' diff --git a/pkgs/development/python-modules/metakernel/default.nix b/pkgs/development/python-modules/metakernel/default.nix index 417b4d914e63..5cc40f4a6ca6 100644 --- a/pkgs/development/python-modules/metakernel/default.nix +++ b/pkgs/development/python-modules/metakernel/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "metakernel"; - version = "0.29.0"; + version = "0.29.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+B8ywp7q42g8H+BPFK+D1VyLfyqgnrYIN3ai/mdcwcA="; + sha256 = "sha256-A++uLR4hhOQYmA6o9wBTejFju3CpbK0hwIs7XFscddQ="; }; propagatedBuildInputs = [ ipykernel ]; diff --git a/pkgs/development/python-modules/meteofrance-api/default.nix b/pkgs/development/python-modules/meteofrance-api/default.nix index 5e738adb62bf..4e8d96c3301b 100644 --- a/pkgs/development/python-modules/meteofrance-api/default.nix +++ b/pkgs/development/python-modules/meteofrance-api/default.nix @@ -1,7 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub -, poetry +, fetchpatch +, poetry-core , pytestCheckHook , pythonOlder , pytz @@ -25,9 +26,16 @@ buildPythonPackage rec { hash = "sha256-X8f0z9ZPXH7Wc3GqHmPptxpNxbHeezdOzw4gZCprumU="; }; + patches = [ + (fetchpatch { + # Switch to poetry-core + url = "https://github.com/hacf-fr/meteofrance-api/commit/7536993fe38dfe3d0833da3fd750be9277aeffa6.patch"; + hash = "sha256-/4VgzoJxhaXoj1N1GNLJNvkQvv6IW9OcBJV6vg6kthM="; + }) + ]; + nativeBuildInputs = [ - # Doesn't work with poetry-core at the moment - poetry + poetry-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index e44e0adb1e1c..9a114514969a 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "minio"; - version = "7.1.11"; + version = "7.1.12"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "minio"; repo = "minio-py"; rev = "refs/tags/${version}"; - sha256 = "sha256-Mf6ZisUCZaLznCMlmKDNwJ695P6Ut45no1lzX5w5CA8="; + hash = "sha256-9BjKoBQdkqkNK6StsiP0L3S5Dn8y53K5VghUIpIt46k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 16a5e22ac6a4..883bbb513501 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, setuptools }: buildPythonPackage rec { @@ -15,6 +16,10 @@ buildPythonPackage rec { sha256 = "9ee0a66053e2267aba772c71e06891fa8f1af6d4b01d5e84e267b4570d4d9808"; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 1b89d73864b0..4b4cf1315b5f 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -117,6 +117,8 @@ buildPythonPackage rec { "test_integration" "test_contentview_flowview" "test_flowview" + # ValueError: Exceeds the limit (4300) for integer string conversion + "test_roundtrip_big_integer" ]; dontUsePytestXdist = true; diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 1e9203f4abe0..b79673e2b240 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -10,7 +10,9 @@ , pytestCheckHook , pytest-mock , aiohttp +, fastapi , gevent +, httpx , redis , requests , sure @@ -19,12 +21,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.10.6"; + version = "3.10.8"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-pD6WiK3OgDD2Xy9r59KOB9TT/LNiQa/DWRXA+w76oe8="; + sha256 = "sha256-aiofKFE9CPLMVJm+IT6VmtJSsVuH7ucpv5Kp1w7d2FE="; }; propagatedBuildInputs = [ @@ -38,7 +40,9 @@ buildPythonPackage rec { pytestCheckHook pytest-mock aiohttp + fastapi gevent + httpx redis requests sure diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index 9f3ce69394fa..1735148c58ec 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "8.13.0"; + version = "8.14.0"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pCkBoKWxadkl9vIXzVoZDjLvVDYJBbnDnufbUxO/7A8="; + sha256 = "sha256-wJRDzT1UOLja/M2GemvBywiUOJ6Qy1PSJ0VrCwvMt1A="; }; nativeBuildInouts = [ diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 355ad0766c62..220c3aa3caa1 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -36,16 +36,21 @@ buildPythonPackage rec { pname = "moto"; - version = "3.1.16"; + version = "4.0.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-y+itipSfUZdx5dJbZwc4YEdX+2fNR0110UwgZ3WC6B8="; + sha256 = "sha256-iutWdX5oavPkpj+Qr7yXPLIxrarYfFzonmiTbBCbC+k="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "werkzeug>=0.5,<2.2.0" "werkzeug>=0.5" + ''; + propagatedBuildInputs = [ aws-xray-sdk boto3 @@ -96,6 +101,7 @@ buildPythonPackage rec { "--deselect=tests/test_iotdata/test_iotdata.py::test_delete_field_from_device_shadow" "--deselect=tests/test_iotdata/test_iotdata.py::test_publish" "--deselect=tests/test_s3/test_server.py::test_s3_server_bucket_versioning" + "--deselect=tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header" # Disalbe test that require docker daemon "--deselect=tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda" diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix index 11d0bed476af..01d9d58b23db 100644 --- a/pkgs/development/python-modules/mpv/default.nix +++ b/pkgs/development/python-modules/mpv/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "mpv"; - version = "0.5.2"; + version = "1.0.1"; disabled = isPy27; src = fetchFromGitHub { owner = "jaseg"; repo = "python-mpv"; rev = "v${version}"; - sha256 = "0ffskpynhl1252h6a05087lvpjgn1cn2z3caiv3i666dn1n79fjd"; + sha256 = "sha256-UCJ1PknnWQiFciTEMxTUqDzz0Z8HEWycLuQqYeyQhoM="; }; buildInputs = [ mpv ]; diff --git a/pkgs/development/python-modules/multimethod/default.nix b/pkgs/development/python-modules/multimethod/default.nix index fe2bb2ef45c1..ef8004d20829 100644 --- a/pkgs/development/python-modules/multimethod/default.nix +++ b/pkgs/development/python-modules/multimethod/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook }: @@ -16,6 +17,10 @@ buildPythonPackage rec { sha256 = "09vrxzv8q0lqsbh6d83wjdd29ja66rj31y7wmyha14jk603fd9k0"; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix index 23587889f6a3..6e2b5bd49d89 100644 --- a/pkgs/development/python-modules/murmurhash/default.nix +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "murmurhash"; - version = "1.0.7"; + version = "1.0.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ywo5br0xykTYm07KNvp06oquckrfCvqi3naAw1Cyk28="; + sha256 = "sha256-i7A6rYQoN6ZLDB0u0itQ66hfn6UUdsi8CnfDZql58fM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix index 791cb708be5c..433f06a0c50b 100644 --- a/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/pkgs/development/python-modules/myfitnesspal/default.nix @@ -2,6 +2,7 @@ , fetchPypi , buildPythonPackage , blessed +, browser-cookie3 , keyring , keyrings-alt , lxml @@ -18,18 +19,19 @@ buildPythonPackage rec { pname = "myfitnesspal"; - version = "1.17.0"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UXFvKQtC44EvscYWXK7KI/do3U0wTWI3zKwvsRdzKrs="; + sha256 = "sha256-xkO4rzjQTf1H4ZtJlzx6dT6BnfSg3VZU8pXdJFraTAI="; }; propagatedBuildInputs = [ blessed + browser-cookie3 keyring keyrings-alt lxml diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index f1c7d83a6bae..007fd2fd015f 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "mypy-protobuf"; - version = "3.2.0"; + version = "3.3.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cwqhUzfDjwRG++CPbGwjcO4B05USU2nUtw4IseLuMO4="; + sha256 = "sha256-JPOwrssGZW6YP1jgfHMqkFd7nXrz4QZvwrZju/A3Akg="; }; propagatedBuildInputs = [ protobuf types-protobuf grpcio-tools ]; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index a517427d8033..e62a84ae91dd 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -13,6 +13,7 @@ , pytestCheckHook , python , pythonOlder +, setuptools , six , typed-ast , typing-extensions @@ -35,6 +36,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + setuptools types-typed-ast ]; diff --git a/pkgs/development/python-modules/nats-python/default.nix b/pkgs/development/python-modules/nats-python/default.nix index 5bf5b2a6d21c..9662dddd5ddb 100644 --- a/pkgs/development/python-modules/nats-python/default.nix +++ b/pkgs/development/python-modules/nats-python/default.nix @@ -4,6 +4,7 @@ , fetchpatch , poetry-core , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -32,6 +33,10 @@ buildPythonPackage rec { }) ]; + propagatedBuildInputs = [ + setuptools + ]; + # Tests require a running NATS server doCheck = false; diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 3b3682b335e9..065367e36dd6 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "natsort"; - version = "8.1.0"; + version = "8.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-x8Hz8nw3Vxmk38qzU5Cf458mwgMqBiqMgMyETqrKBEU="; + hash = "sha256-V/hbcsaIsJ4FPNrDAt1bW1PfX3OuILSHT8v/2L94PRE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index e5185aa37f66..fabee5f10a2b 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , fastjsonschema +, flit-core , pytestCheckHook , glibcLocales , ipython_genutils @@ -9,21 +10,36 @@ , testpath , jsonschema , jupyter_core +, pep440 }: buildPythonPackage rec { pname = "nbformat"; - version = "5.4.0"; + version = "5.5.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RLpcpqy4DF1aUA8eW4Pt6MvjZNWklcTIz2Cq8bplZQE="; + sha256 = "sha256-nr4w5sOz5bR9Of8KOJehrPUj0r+vy04tBM23D4pmxQc="; }; + nativeBuildInputs = [ + flit-core + ]; + LC_ALL="en_US.utf8"; + propagatedBuildInputs = [ + fastjsonschema + ipython_genutils + jsonschema + jupyter_core + pep440 + testpath + traitlets + ]; + checkInputs = [ pytestCheckHook glibcLocales ]; - propagatedBuildInputs = [ ipython_genutils traitlets testpath jsonschema jupyter_core fastjsonschema ]; preCheck = '' mkdir tmp diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 69b8599db5d7..0e6a156a4a9e 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "3.2.1"; + version = "3.2.2"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = version; - sha256 = "sha256-BBDCk/vWm9Y2oGw0aujqlueaB+ww7F2YP2cw5VqIzfQ="; + sha256 = "sha256-WVE8evbfWdQNsuDEQF7WfEYDQEKGKXElKQBkUn7bJ1I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix index d6be449eb1b1..2c3873981e88 100644 --- a/pkgs/development/python-modules/neo/default.nix +++ b/pkgs/development/python-modules/neo/default.nix @@ -3,24 +3,26 @@ , fetchPypi , nose , numpy +, packaging , quantities , pythonOlder }: buildPythonPackage rec { pname = "neo"; - version = "0.10.2"; + version = "0.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LUIYsIJtruqIDhVSJwYAKew4oAI4zrXwlxONlGfGOZs="; + sha256 = "sha256-zfjhMko/u9Hv1WGNzTfPxJexmXkjvXELWYRywdhGZ0o="; }; propagatedBuildInputs = [ numpy + packaging quantities ]; diff --git a/pkgs/development/python-modules/nested-lookup/default.nix b/pkgs/development/python-modules/nested-lookup/default.nix index 7e56158ff145..dc186606f41c 100644 --- a/pkgs/development/python-modules/nested-lookup/default.nix +++ b/pkgs/development/python-modules/nested-lookup/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage -, fetchFromGitHub +, fetchPypi , lib , pytestCheckHook , six @@ -7,14 +7,11 @@ buildPythonPackage rec { pname = "nested-lookup"; - version = "0.2.23"; + version = "0.2.25"; - src = fetchFromGitHub { - owner = "russellballestrini"; - repo = "nested-lookup"; - # https://github.com/russellballestrini/nested-lookup/issues/47 - rev = "c1b0421479efa378545bc71efa3b72882e8fec17"; - sha256 = "sha256-jgfYLSsFLQSsOH4NzbDPKFIG+tWWZ1zTWcZEaX2lthg="; + src = fetchPypi { + inherit pname version; + hash = "sha256-b6gydIyQOB8ikdhQgJ4ySSUZ7l8lPWpay8Kdk37KAug="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index 3acf8cdf6385..7c026be5cd26 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.8.4"; + version = "2.8.6"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XlPwJ8DVZ88fiE27KDIk31JWROQ6/RFF1kydiKNYR2I="; + sha256 = "sha256-vSt3MDAIYMvS2v6OWvif9cmmXDl1s1J5nYemI4tDAaY="; }; propagatedBuildInputs = [ decorator setuptools ]; diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 85df64f20933..576724c9c256 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.9.1"; + version = "0.9.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3YIbT/KzuH9eSwNOoPlfzkN1rOWG3o7Rfmpme94ZJdc="; + sha256 = "sha256-jajTg12SzXuKbMkkVaSJ1+f1mUz2T8cbzmU+NidzueQ="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 42d05d24775b..fc221085f98e 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -49,12 +49,12 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.8.3"; + version = "1.8.4"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-Z/qa0NotxWFzweFHRm/MbJImivV8AZl68yiQ1jNvcAQ="; + sha256 = "sha256-yoG6iLfF7ugBL4eNC9OLINIzBj1YgF4TVngFKb77qak="; }; postPatch = '' diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix index 31fd824ee3da..c4a52a0e114b 100644 --- a/pkgs/development/python-modules/nose/default.nix +++ b/pkgs/development/python-modules/nose/default.nix @@ -1,8 +1,11 @@ { lib , buildPythonPackage , fetchPypi +, isPy3k +, isPyPy , python , coverage +, buildPackages }: buildPythonPackage rec { @@ -23,20 +26,18 @@ buildPythonPackage rec { --replace "from setuptools.command.build_py import Mixin2to3" "from distutils.util import Mixin2to3" ''; - preBuild = lib.optionalString - ((python.isPy3k or false) && (python.pname != "pypy3")) - '' - 2to3 -wn nose functional_tests unit_tests + preBuild = lib.optionalString (isPy3k && (!isPyPy)) '' + ${python.pythonForBuild}/bin/2to3 -wn nose functional_tests unit_tests ''; propagatedBuildInputs = [ coverage ]; - doCheck = false; # lot's of transient errors, too much hassle - checkPhase = if python.is_py3k or false then '' - ${python}/bin/${python.executable} setup.py build_tests + doCheck = false; # lot's of transient errors, too much hassle + checkPhase = if isPy3k then '' + ${python.pythonForBuild.interpreter} setup.py build_tests '' else "" + '' rm functional_tests/test_multiprocessing/test_concurrent_shared.py* # see https://github.com/nose-devs/nose/commit/226bc671c73643887b36b8467b34ad485c2df062 - ${python}/bin/${python.executable} selftest.py + ${python.pythonForBuild.interpreter} selftest.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/num2words/default.nix b/pkgs/development/python-modules/num2words/default.nix index 8679da592cb6..9e8c0961680e 100644 --- a/pkgs/development/python-modules/num2words/default.nix +++ b/pkgs/development/python-modules/num2words/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "0.5.11"; + version = "0.5.12"; pname = "num2words"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bGhOIiDYrbNhLSyAepdyzDJplj+81395ebaJp39gQ9Q="; + sha256 = "sha256-fnwLDwgEBao6HdnTKxypCzvwO6sXuOVNsF4beDAaCYg="; }; propagatedBuildInputs = [ docopt ]; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 9953ddec3690..2ca0e08ba5b1 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -5,10 +5,11 @@ , fetchPypi , python , buildPythonPackage +, setuptools , numpy , llvmlite -, setuptools , libcxx +, importlib-metadata , substituteAll # CUDA-only dependencies: @@ -22,39 +23,38 @@ let inherit (cudaPackages) cudatoolkit; in buildPythonPackage rec { - version = "0.55.2"; + version = "0.56.2"; pname = "numba"; + format = "setuptools"; disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-5CjZ4R2bpZKEnMyfegCQA+t9MGEgB+Nlr+dDznEYxvQ="; + hash = "sha256-NJLwpdCeJX/FIfU3emxrkH7sGSDRRznwskWLnSmUalo="; }; postPatch = '' - # numpy substituteInPlace setup.py \ - --replace "1.23" "2" - - substituteInPlace numba/__init__.py \ - --replace "(1, 22)" "(2, 0)" + --replace "setuptools<60" "setuptools" ''; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + nativeBuildInputs = lib.optional cudaSupport [ + addOpenGLRunpath + ]; + propagatedBuildInputs = [ numpy llvmlite setuptools + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-metadata ] ++ lib.optionals cudaSupport [ cudatoolkit cudatoolkit.lib ]; - nativeBuildInputs = lib.optional cudaSupport [ - addOpenGLRunpath - ]; - patches = lib.optionals cudaSupport [ (substituteAll { src = ./cuda_path.patch; diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index 438a54127a07..3137fa7acd37 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -4,6 +4,7 @@ , isPy27 , setuptools-scm , cython +, entrypoints , numpy , msgpack , pytestCheckHook @@ -13,12 +14,12 @@ buildPythonPackage rec { pname = "numcodecs"; - version = "0.10.0"; + version = "0.10.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-LdQlZOd3KpOFkjsCo2Pjzt8FPOkwlKkGRIXn9ppvHJI="; + sha256 = "sha256-IoOMaz/Zhr2cckA5uIhwBX95DiKyDm4cu6oN4ULdWcQ="; }; nativeBuildInputs = [ @@ -28,6 +29,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + entrypoints numpy msgpack ]; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 68add2cdc26c..6f13a90e2ec3 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -11,7 +11,6 @@ , lapack , writeTextFile , cython -, setuptoolsBuildHook , pythonOlder }: @@ -41,19 +40,14 @@ let }; in buildPythonPackage rec { pname = "numpy"; - - # Attention! v1.22.0 breaks scipy and by extension scikit-learn, so - # build both to verify they don't break. - # https://github.com/scipy/scipy/issues/15414 - version = "1.23.1"; - - format = "pyproject.toml"; + version = "1.23.3"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-10jvNJv+8uEZS1naN+1aKcGeqNfmNCAZkhuiuk/YtiQ="; + hash = "sha256-Ub9JwM0dUr4KJAqmbzRYr8S5XYmT0tBPDZH6YMEK9s0="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ @@ -63,7 +57,7 @@ in buildPythonPackage rec { ./numpy-distutils-C++.patch ]; - nativeBuildInputs = [ gfortran cython setuptoolsBuildHook ]; + nativeBuildInputs = [ gfortran cython ]; buildInputs = [ blas lapack ]; # we default openblas to build with 64 threads @@ -89,7 +83,7 @@ in buildPythonPackage rec { checkPhase = '' runHook preCheck - pushd dist + pushd "$out" ${python.interpreter} -c 'import numpy; numpy.test("fast", verbose=10)' popd runHook postCheck diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index 117d5cfdd14f..5b8fb246641a 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -10,14 +10,20 @@ buildPythonPackage rec { pname = "nunavut"; version = "1.8.3"; + format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "sha256-JI+0IpQWikE6vXfpZHWsVjx3JPaVJ/f4oAjTSNs1Wuk="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pydsdl ~= 1.16" "pydsdl" + ''; + propagatedBuildInputs = [ importlib-resources pydsdl diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 08a34aed2155..4e1b032de0ec 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "15.0.1"; + version = "15.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-LjC/Ly3wQL55gjCyoWZikvK6ByiS1CEsZXK0/lmzmGA="; + hash = "sha256-0dmHPJtm4a+XMpGWi5Vz0lN4vYxkfzDXO42PsnsaC4U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index 3a2f5cb1bddc..078e4a383445 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "oauthlib"; - version = "3.2.0"; + version = "3.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-41JFURG8G8BjlAlNu2+lbj84XR/trAk1U5OPYxPq+5M="; + hash = "sha256-9Du0REnN7AkvMmejXsWc7Uy+YF8MYeLK+QnYHbrPhPA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index 2471df794fc0..2060b2cf4787 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "openapi-schema-validator"; - version = "0.3.0"; + version = "0.3.4"; format = "pyproject"; src = fetchFromGitHub { owner = "p1c2u"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Ms00nR3dpJ0hGtHvVa5B29dasYtBP8igxrgMm0NiArc="; + sha256 = "sha256-0nKAeqZCfzYFsV18BDsSws/54FmRoy7lQSHguI6m3Sc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 2edd46419654..7ca4be89a32d 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -2,9 +2,13 @@ , buildPythonPackage , fetchFromGitHub , poetry-core +, setuptools # propagates +, importlib-resources , jsonschema +, jsonschema-spec +, lazy-object-proxy , openapi-schema-validator , pyyaml @@ -18,7 +22,7 @@ buildPythonPackage rec { pname = "openapi-spec-validator"; - version = "0.4.0"; + version = "0.5.1"; format = "pyproject"; # no tests via pypi sdist @@ -26,20 +30,19 @@ buildPythonPackage rec { owner = "p1c2u"; repo = pname; rev = version; - hash = "sha256-mGgHlDZTUo72RNZ/448gkGdza4EntYU9YoBpSKDUCeA="; + hash = "sha256-8VhD57dNG0XrPUdcq39GEfHUAgdDwJ8nv+Lp57OpTLg="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'openapi-schema-validator = "^0.2.0"' 'openapi-schema-validator = "*"' - ''; - nativeBuildInputs = [ poetry-core + setuptools ]; propagatedBuildInputs = [ + importlib-resources jsonschema + jsonschema-spec + lazy-object-proxy openapi-schema-validator pyyaml ]; @@ -69,8 +72,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/p1c2u/openapi-spec-validator"; + changelog = "https://github.com/p1c2u/openapi-spec-validator/releases/tag/${version}"; description = "Validates OpenAPI Specs against the OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0.0 specification"; + homepage = "https://github.com/p1c2u/openapi-spec-validator"; license = licenses.asl20; maintainers = with maintainers; [ rvl ]; }; diff --git a/pkgs/development/python-modules/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix index 0a04006704c1..b2d1a028b955 100644 --- a/pkgs/development/python-modules/openstackdocstheme/default.nix +++ b/pkgs/development/python-modules/openstackdocstheme/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "openstackdocstheme"; - version = "2.4.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dFrZTObRDKB8aw1/i6febpttymbY3cPzA3ckNuhVt4c="; + sha256 = "sha256-csbU+am2OXp4xJ60P4Cp2i7TCz+PnRg3BCcc9+PyPM8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 599efa2f50a2..d649d6ccbbac 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -16,20 +16,20 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.7.12"; + version = "3.8.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ijl"; repo = pname; rev = version; - hash = "sha256-ImFISSn4FZqUgxQhVbyyTsC1xNpBoJhb/+BvvQkv5gE="; + hash = "sha256-P1n0r5181Wt4tml2SKMI7pDNh2YakCp1I+cvQM6RRWg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-uQJtATSCYSdVBeQocmiGapeAIYL+iYBGLgL8YjUn/3U="; + hash = "sha256-8k0DetamwLqkdcg8V/D2J5ja6IJSLi50CE+ZjFa7Hdc="; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix index 3706a4577bf5..f809bfc5f2ac 100644 --- a/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "oslo-concurrency"; - version = "5.0.0"; + version = "5.0.1"; src = fetchPypi { pname = "oslo.concurrency"; inherit version; - sha256 = "sha256-n0aUbp+KcqBvFP49xBiaTT3TmGKDFSU5OjEZvbvniX4="; + sha256 = "sha256-DfvzYJX0Y3/7tl5cJB9MJYUavTtyjd2tnwc5YwKnJUQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index 45e400856ba7..fe207cbd5c46 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "oslo-utils"; - version = "6.0.0"; + version = "6.0.1"; src = fetchPypi { pname = "oslo.utils"; inherit version; - sha256 = "sha256-CpLiTESWht7CgAlXZr4+uOV/EyXNpMbyEpVBVk5ei6g="; + sha256 = "sha256-mwRU+ZQV0MqsXIYFNxbXRtGY7Oxm5nLY5eY4a2+6orY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index 10e7580af616..c2783642b514 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi, python-dateutil, requests, pytz, pyproj , pytest, pyyaml } : buildPythonPackage rec { pname = "OWSLib"; - version = "0.26.0"; + version = "0.27.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jEywYzjrZAXCrs7QttCFaCqmHw8uUo8ceI1o3FDflBs="; + sha256 = "sha256-4QKqJETf4MhDmrHhd2zA+kfOoowJuKKCEsiTxgF8F5s="; }; # as now upstream https://github.com/geopython/OWSLib/pull/824 diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 2c4f20478339..9125b96a014c 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchPypi , python +, pythonOlder , cython , numpy , python-dateutil @@ -27,12 +28,13 @@ buildPythonPackage rec { pname = "pandas"; - version = "1.4.3"; + version = "1.4.4"; format = "setuptools"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-L/d4hGjnWRdXTwgM1GgbJ+GnvzZGH+lotJqHtaVNAHw="; + hash = "sha256-q2wNc4YXtnUYPl8o2zK1FItpStm7oKQMPqJtlrQx22c="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/pandoc-xnos/default.nix b/pkgs/development/python-modules/pandoc-xnos/default.nix index ce365708b35d..dcc1e4709003 100644 --- a/pkgs/development/python-modules/pandoc-xnos/default.nix +++ b/pkgs/development/python-modules/pandoc-xnos/default.nix @@ -3,6 +3,7 @@ , lib , pandocfilters , psutil +, setuptools }: buildPythonPackage rec { @@ -17,9 +18,21 @@ buildPythonPackage rec { sha256 = "sha256-beiGvN0DS6s8wFjcDKozDuwAM2OApX3lTRaUDRUqLeU="; }; - propagatedBuildInputs = [ pandocfilters psutil ]; + nativeBuildInputs = [ + setuptools + ]; - pythonImportsCheck = [ "pandocxnos" ]; + propagatedBuildInputs = [ + pandocfilters + psutil + ]; + + pythonImportsCheck = [ + "pandocxnos" + ]; + + # tests need some patching + doCheck = false; meta = with lib; { description = "Pandoc filter suite providing facilities for cross-referencing in markdown documents"; diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index 9a0046940035..616dad5e8cb6 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -11,6 +11,7 @@ , pynacl , pytest-relaxed , pytestCheckHook +, six }: buildPythonPackage rec { @@ -20,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-AD5r7nwDTCH7sFG/g9wKnuQQYgTdPFMFTHFFLMTsOTg="; + hash = "sha256-AD5r7nwDTCH7sFG/g9wKnuQQYgTdPFMFTHFFLMTsOTg="; }; patches = [ @@ -28,31 +29,37 @@ buildPythonPackage rec { # https://github.com/paramiko/paramiko/pull/1606/ (fetchpatch { url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch"; - sha256 = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA="; + hash = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA="; + }) + (fetchpatch { + name = "fix-sftp-tests.patch"; + url = "https://github.com/paramiko/paramiko/commit/47cfed55575c21ac558e6d00a4ab1814406be651.patch"; + hash = "sha256-H3nKT8+4CTEDoiqnlhFfuKnc/65GGfwwAm9H2lwrlK8="; }) ]; propagatedBuildInputs = [ + bcrypt cryptography pyasn1 + six ] ++ passthru.optional-dependencies.ed25519; # remove on 3.0 update - checkInputs = [ - invoke - mock - pytest-relaxed - pytestCheckHook - ]; + passthru.optional-dependencies = { + gssapi = [ pyasn1 gssapi ]; + ed25519 = [ pynacl bcrypt ]; + invoke = [ invoke ]; + }; - # with python 3.9.6+, the deprecation warnings will fail the test suite - # see: https://github.com/pyinvoke/invoke/issues/829 - # pytest-relaxed does not work with pytest 6 - # see: https://github.com/bitprophet/pytest-relaxed/issues/12 - doCheck = false; + checkInputs = [ + mock + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); disabledTestPaths = [ - "tests/test_sftp.py" - "tests/test_config.py" + # disable tests that require pytest-relaxed, which is broken + "tests/test_client.py" + "tests/test_ssh_gss.py" ]; pythonImportsCheck = [ @@ -61,12 +68,6 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - passthru.optional-dependencies = { - gssapi = [ pyasn1 gssapi ]; - ed25519 = [ pynacl bcrypt ]; - invoke = [ invoke ]; - }; - meta = with lib; { homepage = "https://github.com/paramiko/paramiko/"; description = "Native Python SSHv2 protocol library"; diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/pkgs/development/python-modules/parsimonious/default.nix index d517e9433e41..f22b1b605e34 100644 --- a/pkgs/development/python-modules/parsimonious/default.nix +++ b/pkgs/development/python-modules/parsimonious/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "parsimonious"; - version = "0.9.0"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sq0a5jovZb149eCorFEKmPNgekPx2yqNRmNqXZ5KMME="; + hash = "sha256-goFgDaGA7IrjVCekq097gr/sHj0eUvgMtg6oK5USUBw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index 9b5a94fa9107..7f6fa7b510f7 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "partd"; - version = "1.2.0"; + version = "1.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "aa67897b84d522dcbc86a98b942afab8c6aa2f7f677d904a616b74ef5ddbc3eb"; + sha256 = "sha256-zpGrzcYXjWaLyqQxeRpakX2QI0HLGT9UP+RF1JRmBIU="; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/parts/default.nix b/pkgs/development/python-modules/parts/default.nix index ba54ce2e70a6..48fdcaa0d1bf 100644 --- a/pkgs/development/python-modules/parts/default.nix +++ b/pkgs/development/python-modules/parts/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -16,6 +17,10 @@ buildPythonPackage rec { hash = "sha256-gOPDqXF05bQcG0Kv0+akBrikRr/CfHB9/tM/TJDPHdM="; }; + nativeBuildInputs = [ + setuptools + ]; + # Project has no tests doCheck = false; diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index 3a39f7ac7d58..0ced7c057545 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -28,9 +28,15 @@ buildPythonPackage rec { ++ passthru.optional-dependencies.bcrypt ++ passthru.optional-dependencies.totp; + disabledTests = [ + # timming sensitive + "test_dummy_verify" + ]; + meta = with lib; { description = "A password hashing library for Python"; homepage = "https://foss.heptapod.net/python-libs/passlib"; license = licenses.bsdOriginal; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index 6a0281b756ec..121f83df2898 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -1,17 +1,25 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, setuptools }: buildPythonPackage rec { - pname = "pathspec"; - version = "0.9.0"; + pname = "pathspec"; + version = "0.10.1"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1"; + hash = "sha256-es5hYbYh0x55AutrWuFI0Sz9I/SiSbn/trn+4SCEMj0="; }; + nativeBuildInputs = [ + setuptools + ]; + meta = { description = "Utility library for gitignore-style pattern matching of file paths"; homepage = "https://github.com/cpburnz/python-path-specification"; diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 7fb0574f75a0..0fe9ac5a7367 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pbr"; - version = "5.9.0"; + version = "5.10.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6Nyi9LQ1YO3vWIE5afUqVs7wIxRsu4kxYm24DmwcQwg="; + sha256 = "sha256-z8xP+OaYJW/BfqP/eWR4sFCFJYWqW6557NBbKrezm5o="; }; # importlib-metadata could be added here if it wouldn't cause an infinite recursion diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix index 9cfe5a5e9244..156226536bcf 100644 --- a/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/pkgs/development/python-modules/pdm-pep517/default.nix @@ -4,17 +4,18 @@ , fetchPypi , git , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "pdm-pep517"; - version = "1.0.2"; + version = "1.0.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nVoqpYlvNzN1UJeUXsKnUc0Z7jOZMG4JlRQBSx5JrfE="; + sha256 = "sha256-OS+MK0fG7CBVDLjhniS529Jzc0E/BntW7Ndfl2f5MBU="; }; preCheck = '' @@ -25,8 +26,10 @@ buildPythonPackage rec { ''; checkInputs = [ + setuptools pytestCheckHook git + setuptools ]; meta = with lib; { diff --git a/pkgs/development/python-modules/peco/default.nix b/pkgs/development/python-modules/peco/default.nix index 72450237a542..961b0c623d92 100644 --- a/pkgs/development/python-modules/peco/default.nix +++ b/pkgs/development/python-modules/peco/default.nix @@ -4,6 +4,7 @@ , fetchPypi , pydantic , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -18,6 +19,10 @@ buildPythonPackage rec { hash = "sha256-zL0tBTwm+l5eyxlWr2xoE+nLpMfUKri1/yD+WgTUqHQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp pydantic diff --git a/pkgs/development/python-modules/pep517/default.nix b/pkgs/development/python-modules/pep517/default.nix index ad58cdb72d4d..9848e2780173 100644 --- a/pkgs/development/python-modules/pep517/default.nix +++ b/pkgs/development/python-modules/pep517/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "pep517"; - version = "0.12.0"; + version = "0.13.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0"; + sha256 = "sha256-rmmSfFwXK+Gt2SA3JtS4TPPrrR7c1fcfzcdG5m6Cn1k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 4ae1daa17951..94da7af29643 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -5,6 +5,7 @@ , passlib , pythonOlder , scramp +, setuptools }: buildPythonPackage rec { @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-gLT03ksCVIMreUhRHg3UY0LRwERszU/diStj0C5PvHs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ passlib scramp diff --git a/pkgs/development/python-modules/pgpy/default.nix b/pkgs/development/python-modules/pgpy/default.nix index a53711a4de62..336d077f2aad 100644 --- a/pkgs/development/python-modules/pgpy/default.nix +++ b/pkgs/development/python-modules/pgpy/default.nix @@ -1,6 +1,14 @@ -{ lib, pythonOlder, fetchFromGitHub, buildPythonPackage -, six, enum34, pyasn1, cryptography -, pytestCheckHook }: +{ lib +, pythonOlder +, fetchFromGitHub +, fetchpatch +, buildPythonPackage +, six +, enum34 +, pyasn1 +, cryptography +, pytestCheckHook +}: buildPythonPackage rec { pname = "pgpy"; @@ -10,9 +18,19 @@ buildPythonPackage rec { owner = "SecurityInnovation"; repo = "PGPy"; rev = "v${version}"; - sha256 = "03pch39y3hi4ici6y6lvz0j0zram8dw2wvnmq1zyjy3vyvm1ms4a"; + hash = "sha256-iuga6vZ7eOl/wNVuLnhDVeUPJPibGm8iiyTC4dOA7A4="; }; + patches = [ + # Fixes the issue in https://github.com/SecurityInnovation/PGPy/issues/402. + # by pulling in https://github.com/SecurityInnovation/PGPy/pull/403. + (fetchpatch { + name = "crytography-38-support.patch"; + url = "https://github.com/SecurityInnovation/PGPy/commit/d84597eb8417a482433ff51dc6b13060d4b2e686.patch"; + hash = "sha256-dviXCSGtPguROHVZ1bt/eEfpATjehm8jZ5BeVjxdb8U="; + }) + ]; + propagatedBuildInputs = [ six pyasn1 diff --git a/pkgs/development/python-modules/phone-modem/default.nix b/pkgs/development/python-modules/phone-modem/default.nix index 3d5a9d783727..0202e2c411b4 100644 --- a/pkgs/development/python-modules/phone-modem/default.nix +++ b/pkgs/development/python-modules/phone-modem/default.nix @@ -17,6 +17,11 @@ buildPythonPackage rec { sha256 = "sha256-7NahK9l67MdT/dDVXsq+y0Z4cZxZ/WUW2kPpE4Wz6j0="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "aioserial==1.3.0" "aioserial" + ''; + propagatedBuildInputs = [ aioserial ]; diff --git a/pkgs/development/python-modules/piep/default.nix b/pkgs/development/python-modules/piep/default.nix index c99f408db62f..8db4f09a9249 100644 --- a/pkgs/development/python-modules/piep/default.nix +++ b/pkgs/development/python-modules/piep/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "0.9.2"; + version = "0.10.0"; pname = "piep"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0b5anpsq16xkiisws95jif5s5mplkl1kdnhy0w0i6m0zcy50jnxq"; + sha256 = "sha256-aM7KQJZr1P0Hs2ReyRj2ItGUo+fRJ+TU3lLAU2Mu8KA="; }; propagatedBuildInputs = [ pygments ]; diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 84521397a707..2486a77dd771 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { "network" "test_direct_reference_with_extras" "test_local_duplicate_subdependency_combined" + "test_bad_setup_file" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 9956b6038d14..1287ec7017e3 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pip"; - version = "22.1.2"; + version = "22.2.2"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = version; - sha256 = "sha256-Id/oz0e59WWpafR1cIYIogvOgxKGKVqrwNON32BU9zU="; + sha256 = "sha256-SLjmxFUFmvgy8E8kxfc6lxxCRo+GN4L77pqkWkRR8aE="; name = "${pname}-${version}-source"; }; diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index b6dbfe53d8d9..945093dffd0b 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -2,31 +2,51 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, tox +, diff-cover +, graphviz +, hatchling +, hatch-vcs +, pytest-mock +, pytestCheckHook , pip +, virtualenv }: buildPythonPackage rec { pname = "pipdeptree"; - version = "2.2.1"; + version = "2.3.1"; format = "pyproject"; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "naiquevin"; repo = "pipdeptree"; - rev = "${version}"; - sha256 = "sha256-CL0li/79qptOtOGLwder5s0+6zv7+PUnl+bD6p+XBtA="; + rev = "refs/tags/${version}"; + hash = "sha256-X3SVQzBg+QjBSewRsfiyLqIea0duhe1nUf8ancWLvcI="; }; - propagatedBuildInputs = [ + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + hatchling + hatch-vcs + ]; + + propagatedBuildInput = [ pip ]; + passthru.optional-dependencies = { + graphviz = [ graphviz ]; + }; + checkInputs = [ - tox - ]; + diff-cover + pytest-mock + pytestCheckHook + virtualenv + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "pipdeptree" diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 79c7784e23bb..f150945a37cb 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "5.9.0"; + version = "5.10.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sFNucrvAs88WmsH9AHWdd6rnuxKuN4zcdcXcNi9d5XY="; + sha256 = "sha256-TTbZhZt6FTsnNWLe7tjCklh6Ry6x/VfNQVjsidne+ts="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index 8d1fcbed3a7f..46aebb519500 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -9,25 +9,22 @@ buildPythonPackage rec { pname = "pluggy"; version = "1.0.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; sha256 = "4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"; }; - checkPhase = '' - py.test - ''; - - # To prevent infinite recursion with pytest - doCheck = false; - nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + # To prevent infinite recursion with pytest + doCheck = false; + meta = { description = "Plugin and hook calling mechanisms for Python"; homepage = "https://github.com/pytest-dev/pluggy"; diff --git a/pkgs/development/python-modules/plugincode/default.nix b/pkgs/development/python-modules/plugincode/default.nix index 2e54d5604e19..e3265ec5b34d 100644 --- a/pkgs/development/python-modules/plugincode/default.nix +++ b/pkgs/development/python-modules/plugincode/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "plugincode"; - version = "30.0.0"; + version = "31.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QjcQCvhlaBzcbBB8MIhbsx4cRy7XkdvUcmG7rM48Sos="; + hash = "sha256-0BfdHQn/Kgct4ZT34KhMgMC3nS0unE3iL7DiWDhXDSk="; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index 5922d67fc8b7..737985ece249 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -1,51 +1,42 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, build , git , importlib-metadata -, intreehooks -, pathlib2 , pep517 , pytest-mock , pytestCheckHook +, setuptools , tomlkit -, typing ? null , virtualenv }: buildPythonPackage rec { pname = "poetry-core"; - version = "1.0.8"; + version = "1.1.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "sha256-cs9SMGD9RdW8Wx/IAMq6gkOUBsney5r19hyGva98grk="; + sha256 = "sha256-WUgBrO9h1E7N2SVFD47UPv39DMx1yQviV5tcNPmR+/g="; }; - postPatch = lib.optionalString (pythonOlder "3.8") '' - # remove >1.0.3 - substituteInPlace pyproject.toml \ - --replace 'importlib-metadata = {version = "^1.7.0", python = "~2.7 || >=3.5, <3.8"}' \ - 'importlib-metadata = {version = ">=1.7.0", python = "~2.7 || >=3.5, <3.8"}' - ''; - - nativeBuildInputs = [ - intreehooks - ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata - ] ++ lib.optionals isPy27 [ - pathlib2 - typing ]; checkInputs = [ + build git pep517 pytest-mock pytestCheckHook + setuptools tomlkit virtualenv ]; diff --git a/pkgs/development/python-modules/poetry-plugin-export/default.nix b/pkgs/development/python-modules/poetry-plugin-export/default.nix new file mode 100644 index 000000000000..bd953fb61278 --- /dev/null +++ b/pkgs/development/python-modules/poetry-plugin-export/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +}: + +buildPythonPackage rec { + pname = "poetry-plugin-export"; + version = "1.0.6"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "python-poetry"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-wZbXIAGKTvbcYN1Sx9MCPVIiHxHzdpbLOVShHBEWUVU="; + }; + + postPatch = '' + sed -i '/poetry =/d' pyproject.toml + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + # infinite recursion with poetry + doCheck = false; + pythonImportsCheck = []; + + meta = with lib; { + description = "Poetry plugin to export the dependencies to various formats"; + license = licenses.mit; + homepage = "https://github.com/python-poetry/poetry-plugin-export"; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 22de7d71bcc8..3105187c98a7 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -1,99 +1,109 @@ { lib +, backports-cached-property , buildPythonPackage , cachecontrol , cachy , cleo -, clikit , crashtest , dataclasses -, entrypoints +, deepdiff +, dulwich , fetchFromGitHub -, fetchpatch +, flatdict , html5lib , httpretty , importlib-metadata +, installShellFiles , intreehooks +, jsonschema , keyring , lockfile , packaging , pexpect , pkginfo +, platformdirs , poetry-core +, poetry-plugin-export , pytest-mock +, pytest-xdist , pytestCheckHook , pythonAtLeast , pythonOlder , requests , requests-toolbelt , shellingham +, stdenv , tomlkit +, urllib3 , virtualenv +, xattr }: buildPythonPackage rec { pname = "poetry"; - version = "1.1.14"; + version = "1.2.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; - rev = version; - sha256 = "sha256-n/GZOUoIMxWlULDqOe59Gt7Hz/+Mc4QcZT+1+HtQovs="; + rev = "refs/tags/${version}"; + hash = "sha256-+Nsg7oPh9tAHEKt1R9C+nY9UPy+9vbf/+A6vQWgTi+4="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'importlib-metadata = {version = "^1.6.0", python = "<3.8"}' \ - 'importlib-metadata = {version = ">=1.6", python = "<3.8"}' \ - --replace 'version = "^21.2.0"' 'version = ">=21.2"' \ - --replace 'packaging = "^20.4"' 'packaging = "*"' + --replace 'crashtest = "^0.3.0"' 'crashtest = "*"' ''; nativeBuildInputs = [ - intreehooks + installShellFiles ]; propagatedBuildInputs = [ cachecontrol cachy cleo - clikit crashtest - entrypoints + dulwich html5lib + jsonschema keyring - lockfile packaging pexpect pkginfo + platformdirs poetry-core + poetry-plugin-export requests requests-toolbelt shellingham tomlkit virtualenv - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses - ] ++ lib.optionals (pythonOlder "3.8") [ + ] ++ lib.optionals (stdenv.isDarwin) [ + xattr + ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata - ]; + ] ++ lib.optionals (pythonOlder "3.8") [ + backports-cached-property + ] ++ cachecontrol.optional-dependencies.filecache; postInstall = '' - mkdir -p "$out/share/bash-completion/completions" - "$out/bin/poetry" completions bash > "$out/share/bash-completion/completions/poetry" - mkdir -p "$out/share/zsh/vendor-completions" - "$out/bin/poetry" completions zsh > "$out/share/zsh/vendor-completions/_poetry" - mkdir -p "$out/share/fish/vendor_completions.d" - "$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish" + installShellCompletion --cmd poetry \ + --bash <($out/bin/poetry completions bash) \ + --fish <($out/bin/poetry completions fish) \ + --zsh <($out/bin/poetry completions zsh) \ ''; checkInputs = [ + deepdiff + flatdict pytestCheckHook httpretty pytest-mock + pytest-xdist ]; preCheck = '' @@ -119,16 +129,6 @@ buildPythonPackage rec { "test_info_setup_complex_pep517_error" ]; - patches = [ - # The following patch addresses a minor incompatibility with - # pytest-mock. This is addressed upstream in - # https://github.com/python-poetry/poetry/pull/3457 - (fetchpatch { - url = "https://github.com/python-poetry/poetry/commit/8ddceb7c52b3b1f35412479707fa790e5d60e691.diff"; - sha256 = "yHjFb9xJBLFOqkOZaJolKviTdtST9PMFwH9n8ud2Y+U="; - }) - ]; - # Allow for package to use pep420's native namespaces pythonNamespaces = [ "poetry" diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index 358af52ef70f..5cfc6b553b2a 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "22.9.3"; + version = "22.9.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YqOeeivOscH1YtYXu348ozY25vHFkD9q1OFJ/jfZJLk="; + hash = "sha256-CZ2Y3ePRfwj9VbdoQjdQMs9+/cdixkRovGISv9T+pYU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index a2dfaf8e4837..c2bbeab96daa 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -9,6 +9,7 @@ , pyqt-builder , poppler , pkg-config +, setuptools , fetchpatch }: @@ -32,7 +33,7 @@ buildPythonPackage rec { ]; buildInputs = [ qtbase.dev poppler pyqt-builder ]; - nativeBuildInputs = [ pkg-config qmake sip ]; + nativeBuildInputs = [ pkg-config qmake sip setuptools ]; propagatedBuildInputs = [ pyqt5.dev ]; format = "pyproject"; diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix index b88bccfc534b..f9b8f7993ffd 100644 --- a/pkgs/development/python-modules/portpicker/default.nix +++ b/pkgs/development/python-modules/portpicker/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , psutil , pythonOlder }: @@ -17,6 +18,10 @@ buildPythonPackage rec { hash = "sha256-xVaDrXJfXACkG8fbAiUiPovgJLH6Vk0DntM5Dk/Uj7M="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ psutil ]; diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index cefa13610081..1065781cde18 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , chardet , requests , ruamel-yaml @@ -21,9 +22,29 @@ buildPythonPackage rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-kGANMHfWwhW3ZBw2ZVCJZR/bV2EPhcydMKhDeDTVwcQ="; + hash = "sha256-kGANMHfWwhW3ZBw2ZVCJZR/bV2EPhcydMKhDeDTVwcQ="; }; + patches = [ + # Fix for openapi-spec-validator 0.5.0+: + # https://github.com/RonnyPfannschmidt/prance/pull/132 + (fetchpatch { + name = "1-openapi-spec-validator-upgrade.patch"; + url = "https://github.com/RonnyPfannschmidt/prance/commit/55503c9b12b685863c932ededac996369e7d288a.patch"; + hash = "sha256-7SOgFsk2aaaaAYS8WJ9axqQFyEprurn6Zn12NcdQ9Bg="; + }) + (fetchpatch { + name = "2-openapi-spec-validator-upgrade.patch"; + url = "https://github.com/RonnyPfannschmidt/prance/commit/7e59cc69c6c62fd04875105773d9d220bb58fea6.patch"; + hash = "sha256-j6vmY3NqDswp7v9682H+/MxMGtFObMxUeL9Wbiv9hYw="; + }) + (fetchpatch { + name = "3-openapi-spec-validator-upgrade.patch"; + url = "https://github.com/RonnyPfannschmidt/prance/commit/7e575781d83845d7ea0c2eff57644df9b465c7af.patch"; + hash = "sha256-rexKoQ+TH3QmP20c3bA+7BLMLc+fkVhn7xsq+gle1Aw="; + }) + ]; + postPatch = '' substituteInPlace setup.cfg \ --replace "--cov=prance --cov-report=term-missing --cov-fail-under=90" "" \ diff --git a/pkgs/development/python-modules/preprocess-cancellation/default.nix b/pkgs/development/python-modules/preprocess-cancellation/default.nix index 44a54810e443..5d2b722e6434 100644 --- a/pkgs/development/python-modules/preprocess-cancellation/default.nix +++ b/pkgs/development/python-modules/preprocess-cancellation/default.nix @@ -3,6 +3,7 @@ , pythonOlder , fetchFromGitHub , poetry-core +, setuptools , shapely , pytestCheckHook }: @@ -40,6 +41,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index 21e7a455da88..922f85990db7 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "prettytable"; - version = "3.3.0"; + version = "3.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EY61T9J5QEm4EIk2U7IJUjSd9tO8F2Tn+s2KGAZPqbA="; + sha256 = "sha256-fX3YTQsgby2qxEcacvKZ1pB/NFFgZP6yg44zOk4lZ70="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index f87558e5194c..038575794bd3 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.30"; + version = "3.0.31"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - sha256 = "sha256-hZsoPFC95F9fl4Kfd6RnTRwfzYhTk2Txsoo3gFz9icA="; + sha256 = "sha256-mtqVLJ0Xh/Uv9tXzSE0LTfiVJ4fAh+32offCyx6ogUg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index 266294325c17..3d3646d5c839 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.22.0"; + version = "1.22.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-wuZpP99oxAWmQoImkVqGJdIdBRN5NZiuMoehIQR42Ow="; + sha256 = "sha256-bH39Ei3++AGf9lR0a+T1sdnIC7p4f+lhG1CN2Ivjovo="; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 197da3c76ce6..3815a64eec60 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "psutil"; - version = "5.9.1"; + version = "5.9.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-V/GBm12elc37DIgailt9VC7Qt8Ui1XVwaoC+3ISMiVQ="; + sha256 = "sha256-/rhhoQtsO7AHAQY7N+Svx1T4IX8PCcQigFhr1qxxK1w="; }; # We have many test failures on various parts of the package: diff --git a/pkgs/development/python-modules/pushover/default.nix b/pkgs/development/python-modules/pushover/default.nix index bc8509b450bc..0f8a5f2779c1 100644 --- a/pkgs/development/python-modules/pushover/default.nix +++ b/pkgs/development/python-modules/pushover/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = true; # Relies on 2to3 via setuptools description = "Bindings and command line utility for the Pushover notification service"; homepage = "https://github.com/Thibauth/python-pushover"; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/py-canary/default.nix b/pkgs/development/python-modules/py-canary/default.nix index 68a33ae11173..e849e147e42d 100644 --- a/pkgs/development/python-modules/py-canary/default.nix +++ b/pkgs/development/python-modules/py-canary/default.nix @@ -6,6 +6,7 @@ , pythonOlder , requests , requests-mock +, setuptools }: buildPythonPackage rec { @@ -22,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-873XAf0jOX5pjrNRELEcTWCauk80FUYxTu7G7jc3MHE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/py-eth-sig-utils/default.nix b/pkgs/development/python-modules/py-eth-sig-utils/default.nix index 1dfc8904fe00..3ef63cd1926e 100644 --- a/pkgs/development/python-modules/py-eth-sig-utils/default.nix +++ b/pkgs/development/python-modules/py-eth-sig-utils/default.nix @@ -26,6 +26,9 @@ buildPythonPackage rec { rlp ]; + # lots of: isinstance() arg 2 must be a type or tuple of types + doCheck = false; + checkPhase = '' ${python.interpreter} -m unittest ''; diff --git a/pkgs/development/python-modules/py-tree-sitter/default.nix b/pkgs/development/python-modules/py-tree-sitter/default.nix index 9d7b82986976..f087bac5c10e 100644 --- a/pkgs/development/python-modules/py-tree-sitter/default.nix +++ b/pkgs/development/python-modules/py-tree-sitter/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, setuptools +}: buildPythonPackage rec { pname = "py-tree-sitter"; @@ -13,6 +18,10 @@ buildPythonPackage rec { fetchSubmodules = true; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "tree_sitter" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix index dac1ecb9ec1f..3f7a7e188232 100644 --- a/pkgs/development/python-modules/py4j/default.nix +++ b/pkgs/development/python-modules/py4j/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "py4j"; - version = "0.10.9.5"; + version = "0.10.9.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-J2pKPFohVN8YYO8zA6knRg4C6XsEfcCkfBw/uMzjTbY="; + sha256 = "sha256-C25TFbs62lz2KsZR0Qe7LrwC3vPe6dlUjjuqxkTqjbs="; }; # No tests in archive diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 0474ed4e67cf..5fb31f9fdde2 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "4.6.0"; + version = "4.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sa6kw8hnWGt++qgNVNs7cQ9LJK64CVv871aP8n08pRA="; + hash = "sha256-sVu518B+PDSpW6MhYtNWkPpwuT471VfGuDDtpL7Mo/U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index bddb9fb52200..18717f40f4fe 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -14,12 +14,12 @@ }: buildPythonPackage rec { - version = "0.15.1"; + version = "0.15.3"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AlNQegTb/qQ+sfdaH3GqsEviEHa/6WwASIgAC4AuOPI="; + sha256 = "sha256-TZnJebxLwgnP9woC0downJv4xrAzjioLZuvqd8fzxGE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 8f01ddd49adf..327a44690da3 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { "-DBoost_INCLUDE_DIR=${lib.getDev boost}/include" "-DEIGEN3_INCLUDE_DIR=${lib.getDev eigen}/include/eigen3" "-DBUILD_TESTING=on" + "-DPYTHON_EXECUTABLE:FILEPATH=${python.pythonForBuild.interpreter}" ] ++ lib.optionals (python.isPy3k && !stdenv.cc.isClang) [ "-DPYBIND11_CXX_STANDARD=-std=c++17" ]; diff --git a/pkgs/development/python-modules/pybravia/default.nix b/pkgs/development/python-modules/pybravia/default.nix index 3273a82cd0cf..89aedb3de0bf 100644 --- a/pkgs/development/python-modules/pybravia/default.nix +++ b/pkgs/development/python-modules/pybravia/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pybravia"; - version = "0.2.2"; + version = "0.2.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Drafteed"; repo = pname; rev = "v${version}"; - hash = "sha256-jKDZ5MzWRgXYmtnYDyi232pKJX+oRGLmSsdlBiN5veQ="; + hash = "sha256-ZM1XJnEYMNcbVOkpcI1ml7Cck2CXA2QXEpJMx3RwtSQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix index c8e8fdb7b3d9..74dc59aefbe8 100644 --- a/pkgs/development/python-modules/pycares/default.nix +++ b/pkgs/development/python-modules/pycares/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pycares"; - version = "4.2.1"; + version = "4.2.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-c1tPdf0PWVxOkYTaGM2Hc39GvIGmTqQfTtzitraNRtI="; + sha256 = "sha256-4fV6gAQ3AIBpS9b7lpof/JFxpZxoJNVPeRwbLk0pg4U="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 9dce1cfa7938..727a46375bed 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -21,6 +21,11 @@ buildPythonPackage rec { sha256 = "sha256-nlfcmFpKBdtb3NXaIZy/bO0lVIygk/jXS8EHs8VU7AA="; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "protobuf>=3.19.1,<4" "protobuf>=3.19.1" + ''; + propagatedBuildInputs = [ casttube protobuf diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix index 3583826f69a3..a0048e7e75c9 100644 --- a/pkgs/development/python-modules/pycountry/default.nix +++ b/pkgs/development/python-modules/pycountry/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , pytestCheckHook }: @@ -13,6 +14,10 @@ buildPythonPackage rec { sha256 = "sha256-shY6JGxYWJTYCPGHg+GRN8twoMGPs2dI3AH8bxCcFkY="; }; + propagatedBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pydispatcher/default.nix b/pkgs/development/python-modules/pydispatcher/default.nix index d949b16d1057..902f39e6b970 100644 --- a/pkgs/development/python-modules/pydispatcher/default.nix +++ b/pkgs/development/python-modules/pydispatcher/default.nix @@ -1,23 +1,22 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook }: buildPythonPackage rec { - version = "2.0.5"; + version = "2.0.6"; pname = "pydispatcher"; src = fetchPypi { - inherit pname version; - sha256 = "1bswbmhlbqdxlgbxlb6xrlm4k253sg8nvpl1whgsys8p3fg0cw2m"; + pname = "PyDispatcher"; + inherit version; + hash = "sha256-PX5PQ8cAAKHcox+SaU6Z0BAZNPpuq11UVadYhY2G35U="; }; - checkInputs = [ pytest ]; - - checkPhase = '' - py.test - ''; + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { homepage = "http://pydispatcher.sourceforge.net/"; diff --git a/pkgs/development/python-modules/pyeapi/default.nix b/pkgs/development/python-modules/pyeapi/default.nix index aa9e0983b7e3..c5d7f822d202 100644 --- a/pkgs/development/python-modules/pyeapi/default.nix +++ b/pkgs/development/python-modules/pyeapi/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, setuptools , mock , netaddr , pytestCheckHook @@ -22,6 +23,10 @@ buildPythonPackage rec { sha256 = "13chya6wix5jb82k67gr44bjx35gcdwz80nsvpv0gvzs6shn4d7b"; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ netaddr ]; diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 9f9dbe7fd7bf..bac9202a2b22 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "4.6.2"; + version = "4.6.3"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jdnIAgvNCB8llleoadXq+cynuzZzx/A7+uiyi751mbY="; + sha256 = "sha256-bfEqfPZXY3obA2vCAFlyfGQvkpkOkP7i+wA9qjzabKE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyfma/default.nix b/pkgs/development/python-modules/pyfma/default.nix index 2e26cee84da4..103446dbe68f 100644 --- a/pkgs/development/python-modules/pyfma/default.nix +++ b/pkgs/development/python-modules/pyfma/default.nix @@ -6,11 +6,13 @@ , pybind11 , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pyfma"; version = "0.1.6"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { @@ -19,7 +21,10 @@ buildPythonPackage rec { rev = version; sha256 = "12i68jj9n1qj9phjnj6f0kmfhlsd3fqjlk9p6d4gs008azw5m8yn"; }; - format = "pyproject"; + + nativeBuildInputs = [ + setuptools + ]; buildInputs = [ pybind11 diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 3780122f19f7..15f57612ac66 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pygraphviz"; - version = "1.9"; + version = "1.10"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-+hj3xs6ig0Gk5GbtDPBWgrCmgoiv6N18lCZ4L3wa4Bw="; + hash = "sha256-RX4JOoiBKJAyUaJmqMwWtLqT8/YzSz6/7ZLHRxp02Gc="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix index a4c04ce79ee6..ffe11cc140b3 100644 --- a/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/pkgs/development/python-modules/pyhamcrest/default.nix @@ -1,20 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi -, mock, pytest -, six +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, hatch-vcs +, numpy +, pythonOlder +, pytest-xdist +, pytestCheckHook }: -buildPythonPackage rec { - pname = "PyHamcrest"; - version = "2.0.3"; - src = fetchPypi { - inherit pname version; - sha256 = "dfb19cf6d71743e086fbb761ed7faea5aacbc8ec10c17a08b93ecde39192a3db"; +buildPythonPackage rec { + pname = "pyhamcrest"; + version = "2.0.4"; + format = "pyproject"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "hamcrest"; + repo = "PyHamcrest"; + rev = "refs/tags/V${version}"; + hash = "sha256-CIkttiijbJCR0zdmwM5JvFogQKYuHUXHJhdyWonHcGk="; }; - checkInputs = [ mock pytest ]; - propagatedBuildInputs = [ six ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - doCheck = false; # pypi tarball does not include tests + nativeBuildInputs = [ + hatchling + hatch-vcs + ]; + + checkInputs = [ + numpy + pytest-xdist + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/hamcrest/PyHamcrest"; diff --git a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix index 4675e48a5646..5763a4c4bed6 100644 --- a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix +++ b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix @@ -58,6 +58,8 @@ buildPythonPackage rec { "test_revocation_mode_hard_aiohttp_autofetch" # The path could not be validated because no revocation information could be found for intermediate certificate 1 "test_revocation_mode_hard" + # certificate expired 2022-09-17 + "test_revocation_mode_soft" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pyintesishome/default.nix b/pkgs/development/python-modules/pyintesishome/default.nix index fb8fd6dac4d4..3eb0b22b52fe 100644 --- a/pkgs/development/python-modules/pyintesishome/default.nix +++ b/pkgs/development/python-modules/pyintesishome/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyintesishome"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "jnimmo"; repo = "pyIntesisHome"; rev = "refs/tags/${version}"; - sha256 = "sha256-PMRTRQYckqD8GRatyj7IMAiFPbi91HvX19Jwe28rIPg="; + sha256 = "sha256-+pXGB7mQszbBp4KhOYzDKoGFoUHATWLbOU6QwMIpGWU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyjnius/default.nix b/pkgs/development/python-modules/pyjnius/default.nix index b53dd83205f3..84f7a337a661 100644 --- a/pkgs/development/python-modules/pyjnius/default.nix +++ b/pkgs/development/python-modules/pyjnius/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pyjnius"; - version = "1.4.1"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "8bc1a1b06fb11df8dd8b8d56f5ecceab614d4ba70cf559c64ae2f146423d53ce"; + sha256 = "sha256-/AY3zaSuEo7EqWrDJ9NS6H6oZnZLAdliZyhwvlOana4="; }; propagatedBuildInputs = [ six diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index 41e2b86202d7..5875112c99fd 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -10,6 +10,7 @@ , pydocstyle , pyflakes , vulture +, setuptools , isort , pylint , pytestCheckHook @@ -43,6 +44,7 @@ let pylama = buildPythonPackage rec { pycodestyle pydocstyle pyflakes + setuptools vulture ]; diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index d7e18191aa3f..054401128bea 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -7,6 +7,7 @@ , pytest-timeout , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -23,6 +24,10 @@ buildPythonPackage rec { hash = "sha256-dw/uCEY4+kpgNjbjgvw+kSfluziIK6NvIKo5QIjt+GQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cryptography ]; diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 9ebe37f4b8da..285a729eb894 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pymongo"; - version = "4.1.1"; + version = "4.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-17jyXJsAQ8uvd7i4lYFOM+ejyAeglzd8B+G9SZRgMNU="; + sha256 = "sha256-cvM49qq9N9NDvZ0f3T3pIRBNOVdmvMXNxAOeTC3Zd2Y="; }; # Tests call a running mongodb instance diff --git a/pkgs/development/python-modules/pynisher/default.nix b/pkgs/development/python-modules/pynisher/default.nix index 942192c57dc5..8dc5d1eaa9f6 100644 --- a/pkgs/development/python-modules/pynisher/default.nix +++ b/pkgs/development/python-modules/pynisher/default.nix @@ -1,26 +1,26 @@ { lib , buildPythonPackage -, docutils , fetchPypi , psutil , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "pynisher"; - version = "0.6.4"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ER2RqtRxN1wFCakSQV/5AFPvkJEA+s9BJRE4OvEHwSQ="; + hash = "sha256-5FJQCN+yO1gh7HK47MRR/SAr8Qzix3bfrjyzsakBQXA="; }; propagatedBuildInputs = [ psutil - docutils + typing-extensions ]; # No tests in the Pypi archive diff --git a/pkgs/development/python-modules/pyotp/default.nix b/pkgs/development/python-modules/pyotp/default.nix index 16916666a0d5..8b64a713d9f4 100644 --- a/pkgs/development/python-modules/pyotp/default.nix +++ b/pkgs/development/python-modules/pyotp/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyotp"; - version = "2.6.0"; + version = "2.7.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d28ddfd40e0c1b6a6b9da961c7d47a10261fb58f378cb00f05ce88b26df9c432"; + sha256 = "sha256-zpifq6Dfd9wDK0XlHGzKQrzyCJbI09HnzXWaU9x9bLU="; }; pythonImportsCheck = [ "pyotp" ]; diff --git a/pkgs/development/python-modules/pypng/default.nix b/pkgs/development/python-modules/pypng/default.nix index 968e9310318a..129300b08158 100644 --- a/pkgs/development/python-modules/pypng/default.nix +++ b/pkgs/development/python-modules/pypng/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, setuptools }: buildPythonPackage rec { @@ -12,10 +13,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "drj11"; repo = "pypng"; - rev = "${pname}-${version}"; + rev = "refs/tags/${pname}-${version}"; sha256 = "sha256-JU1GCSTm2s6Kczn6aRcF5DizPJVpizNtnAMJxTBi9vo="; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "png" ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyproject-metadata/default.nix b/pkgs/development/python-modules/pyproject-metadata/default.nix new file mode 100644 index 000000000000..5cd5b92073bc --- /dev/null +++ b/pkgs/development/python-modules/pyproject-metadata/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, wheel +, packaging +, pytestCheckHook +, tomli +}: + +buildPythonPackage rec { + pname = "pyproject-metadata"; + version = "0.5.0"; + format = "pyproject"; + + src = fetchPypi rec { + inherit pname version; + hash = "sha256-6YN9I3V8XJ//+19/N8+be8LZc30OlZt/XV8YmVFulww="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + packaging + ]; + + checkInputs = [ + pytestCheckHook + tomli + ]; + + # Many broken tests, and missing test files + doCheck = false; + + meta = with lib; { + description = "PEP 621 metadata parsing"; + homepage = "https://github.com/FFY00/python-pyproject-metadata"; + license = licenses.mit; + maintainers = with maintainers; [ fridh ]; + }; +} diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix index cfc7fbf2ded3..b983bedc4098 100644 --- a/pkgs/development/python-modules/pypugjs/default.nix +++ b/pkgs/development/python-modules/pypugjs/default.nix @@ -1,21 +1,45 @@ -{ lib, buildPythonPackage, fetchPypi, six, chardet, nose -, django, jinja2, tornado, pyramid, pyramid_mako, Mako }: +{ lib +, buildPythonPackage +, charset-normalizer +, django +, fetchFromGitHub +, jinja2 +, Mako +, nose +, pyramid +, pyramid_mako +, pytestCheckHook +, six +, tornado +}: buildPythonPackage rec { pname = "pypugjs"; - version = "5.9.11"; + version = "5.9.12"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-kStaT1S8cPJF+iDFk/jLGKi3JVOMmtf7PzeYDKCdD0E="; + src = fetchFromGitHub { + owner = "kakulukia"; + repo = "pypugjs"; + rev = "v${version}"; + sha256 = "sha256-6tIhKCa8wg01gNFygCS6GdUHfbWBu7wOZeMkCExRR34="; }; - propagatedBuildInputs = [ six chardet ]; - checkInputs = [ nose django jinja2 tornado pyramid pyramid_mako Mako ]; + propagatedBuildInputs = [ six charset-normalizer ]; - checkPhase = '' - nosetests pypugjs - ''; + checkInputs = [ + django + jinja2 + Mako + nose + tornado + pyramid + pyramid_mako + pytestCheckHook + ]; + + pytestCheckFlags = [ + "pypugjs/testsuite" + ]; meta = with lib; { description = "PugJS syntax template adapter for Django, Jinja2, Mako and Tornado templates"; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index cc8f4bac2f04..b78f16233ea5 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, setuptools , isPy27 , fetchPypi , pkg-config @@ -61,6 +62,7 @@ buildPythonPackage rec { nativeBuildInputs = with libsForQt5; [ pkg-config qmake + setuptools lndir sip qtbase diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index 12021e52271b..c86fe165d4fc 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -32,6 +32,7 @@ in buildPythonPackage rec { qtsvg qtwebengine pyqt-builder + pythonPackages.setuptools ]; buildInputs = [ diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix index 64f2d9c45f92..71d73e9a29f5 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.3.0"; + version = "3.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lifenGICnllPe/W9xmyp1Jkh7dRfph6u2+2uNvlARMw="; + sha256 = "sha256-eBEv0rpM0IOaMHWjXDgF0yFK+NNr49cI8fxVi0sfbXs="; }; nativeBuildInputs = [ @@ -79,6 +79,8 @@ buildPythonPackage rec { "test/unit/test_quantum_computer.py" "test/unit/test_qvm.py" "test/unit/test_reference_wavefunction.py" + # Out-dated + "test/unit/test_qpu_client.py" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/pyrituals/default.nix b/pkgs/development/python-modules/pyrituals/default.nix index e7674fd3ea77..b73ca1862735 100644 --- a/pkgs/development/python-modules/pyrituals/default.nix +++ b/pkgs/development/python-modules/pyrituals/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -18,6 +19,10 @@ buildPythonPackage rec { sha256 = "0ynjz7khp67bwxjp580w3zijxr9yn44nmnbvkxjxq9scyb2mjf6g"; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp ]; # Project has no tests diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index b14119c32807..b0cc9c7f91cd 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pyro-ppl"; - version = "1.8.1"; + version = "1.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit version pname; - hash = "sha256-18BJ6y50haYStN2ZwkwwnMhgx8vGsZczhwNPVDbRyNY="; + hash = "sha256-4Afl0ROCpY78+4+61xxy6vEGbIZsaNxURXDEGMGCiks="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index f5c4d936aebd..2d9efdf39e2d 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -4,20 +4,25 @@ , importlib-metadata , mitogen , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pyroute2"; - version = "0.7.2"; + version = "0.7.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hahWY7BIO8c6DmCgG+feZdNikbYWycFCl0E6P1uEQ/M="; + hash = "sha256-cEEEDbHC0Yf7zNFRSFsSRMQddYvoIXhYR5RjcOtrtwY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ mitogen ] ++ lib.optionals (pythonOlder "3.8") [ @@ -38,7 +43,6 @@ buildPythonPackage rec { "pr2modules.nftables" "pr2modules.nslink" "pr2modules.protocols" - "pr2modules.proxy" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index 1f1d97f19fa5..f5d76eda9b94 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "PySDL2"; - version = "0.9.11"; + version = "0.9.14"; # The tests use OpenGL using find_library, which would have to be # patched; also they seem to actually open X windows and test stuff # like "screensaver disabling", which would have to be cleverly @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "93e51057d39fd583b80001d42b21d5a3f71e30d489d85924d944b2c7350e2da6"; + sha256 = "sha256-JAkfjZ5DdkZZHH921bru49OqbNiuSSpRxwJuUzifGHo="; }; # Deliberately not in propagated build inputs; users can decide diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index dfce66ee52df..a596a2226c5e 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sed -i "s/'pypandoc'//" setup.py substituteInPlace setup.py \ - --replace py4j==0.10.9.3 'py4j>=0.10.9,<0.11' + --replace py4j== 'py4j>=' ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysqlcipher3/default.nix b/pkgs/development/python-modules/pysqlcipher3/default.nix index 9c98664af1ca..acb71deab0b1 100644 --- a/pkgs/development/python-modules/pysqlcipher3/default.nix +++ b/pkgs/development/python-modules/pysqlcipher3/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pysqlcipher3"; - version = "1.0.4"; + version = "1.1.0"; disabled = pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; - sha256 = "75d6b9d023d7ab76c841f97fd9d108d87516e281268e61518411d08cb7062663"; + sha256 = "sha256-Lo75+2y2jZJrQZj9xrJvVRGWmOo8fI5iXzEURn00Y3E="; }; buildInputs = [ sqlcipher ]; diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 24f7c6bde6d9..497b516a6636 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.18.27"; + version = "0.19.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-80GzOKZRsjWHLEGhNrYIWdUMiel5ztcobwRhrlyjzpY="; + hash = "sha256-1vzHd6ouWZrc951a5s0OsjeMbEluP/kS7LDiZ3YOUqk="; }; propagatedBuildInputs = [ @@ -30,6 +30,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # mismatch in expected data structure + "test_parse_advertisement_data_curtain" + ]; + pythonImportsCheck = [ "switchbot" ]; diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index a2fa23834a6e..e38af1f89309 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -1,5 +1,12 @@ -{ buildPythonPackage, fetchFromGitHub, lib, packaging, pillow, tesseract, substituteAll +{ buildPythonPackage +, fetchFromGitHub +, lib +, packaging +, pillow +, tesseract +, substituteAll , pytestCheckHook +, setuptools }: buildPythonPackage rec { @@ -21,6 +28,10 @@ buildPythonPackage rec { }) ]; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ tesseract ]; diff --git a/pkgs/development/python-modules/pytest-astropy-header/default.nix b/pkgs/development/python-modules/pytest-astropy-header/default.nix index acc555035822..4d95058b9354 100644 --- a/pkgs/development/python-modules/pytest-astropy-header/default.nix +++ b/pkgs/development/python-modules/pytest-astropy-header/default.nix @@ -6,29 +6,21 @@ , pytest-cov , pytestCheckHook , numpy -, astropy -, scipy -, h5py -, scikitimage +, setuptools-scm }: buildPythonPackage rec { pname = "pytest-astropy-header"; - version = "0.1.2"; + version = "0.2.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1y87agr324p6x5gvhziymxjlw54pyn4gqnd49papbl941djpkp5g"; + sha256 = "77891101c94b75a8ca305453b879b318ab6001b370df02be2c0b6d1bb322db10"; }; - patches = [ (fetchpatch { - url = "https://github.com/astropy/pytest-astropy-header/pull/16.patch"; - sha256 = "11ln63zq0kgsdx1jw3prlzpcdbxmc99p9cwr18s0x6apy0k6df31"; - }) - (fetchpatch { - url = "https://github.com/astropy/pytest-astropy-header/pull/29.patch"; - sha256 = "18l434c926r5z1iq3b6lpnp0lrssszars9y1y9hs6216r60jgjpl"; - }) + + nativeBuildInputs = [ + setuptools-scm ]; buildInputs = [ @@ -37,12 +29,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytest-cov numpy - scipy - h5py - scikitimage - astropy ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix index 45ad26ab279e..1e1f386eef44 100644 --- a/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/pkgs/development/python-modules/pytest-astropy/default.nix @@ -1,10 +1,12 @@ { lib , buildPythonPackage , fetchPypi +, attrs , hypothesis , pytest , pytest-arraydiff , pytest-astropy-header +, pytest-cov , pytest-doctestplus , pytest-filter-subpackage , pytest-mock @@ -33,9 +35,11 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + attrs hypothesis pytest-arraydiff pytest-astropy-header + pytest-cov pytest-doctestplus pytest-filter-subpackage pytest-mock diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index c690e01778b6..a9973da9c142 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -7,17 +7,21 @@ buildPythonPackage rec { pname = "pytest-check"; - version = "1.0.5"; + version = "1.0.9"; format = "flit"; src = fetchPypi { - pname = "pytest_check"; - inherit version; - sha256 = "sha256-ucjbax3uPB5mFivQebgcCDKWy3Ex6YQVGcKKQIGKSHU="; + inherit pname version; + hash = "sha256-zVMQTzpPw2RPcCi1XiOHZvbWWhKiB9MbzUyLoA2yP9k="; }; - buildInputs = [ pytest ]; - checkInputs = [ pytestCheckHook ]; + buildInputs = [ + pytest + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "pytest plugin allowing multiple failures per test"; diff --git a/pkgs/development/python-modules/pytest-console-scripts/default.nix b/pkgs/development/python-modules/pytest-console-scripts/default.nix index 32ccd22c9692..b01d2d2b7d0a 100644 --- a/pkgs/development/python-modules/pytest-console-scripts/default.nix +++ b/pkgs/development/python-modules/pytest-console-scripts/default.nix @@ -1,11 +1,12 @@ { lib , buildPythonPackage +, mock , fetchPypi , pytestCheckHook , python -, mock -, setuptools-scm , pythonOlder +, setuptools-scm +, setuptools }: buildPythonPackage rec { @@ -26,6 +27,10 @@ buildPythonPackage rec { setuptools-scm ]; + propagatedBuildInputs = [ + setuptools + ]; + checkInputs = [ mock pytestCheckHook diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index 7d1b29fbd34b..d6da25139893 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -1,4 +1,5 @@ { lib +, fetchpatch , buildPythonPackage , pythonOlder , fetchPypi @@ -19,6 +20,15 @@ buildPythonPackage rec { sha256 = "ba4f243de3cb4c2486ed9e70752c80dd4b636f7ccb27d4eba763c35ed0cd316e"; }; + patches = [ + # https://github.com/tholo/pytest-flake8/issues/87 + # https://github.com/tholo/pytest-flake8/pull/88 + (fetchpatch { + url = "https://github.com/tholo/pytest-flake8/commit/976e6180201f7808a3007c8c5903a1637b18c0c8.patch"; + hash = "sha256-Hbcpz4fTXtXRnIWuKuDhOVpGx9H1sdQRKqxadk2s+uE="; + }) + ]; + propagatedBuildInputs = [ flake8 ]; @@ -32,6 +42,5 @@ buildPythonPackage rec { homepage = "https://github.com/tholo/pytest-flake8"; maintainers = with lib.maintainers; [ jluttine ]; license = lib.licenses.bsd2; - broken = true; # https://github.com/tholo/pytest-flake8/issues/87 }; } diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index b64f3365dd6f..cde2bf81a6e3 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pytest-localserver"; - version = "0.6.0"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3cR5q6lqfaDnocx9OjA+UFgtbVBYA+j2e4JyGPn+D2U="; + sha256 = "sha256-8ZtJDHyh7QW/5LxrSQgRgFph5ycfBCTTwPpNQ4k6Xc0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-logdog/default.nix b/pkgs/development/python-modules/pytest-logdog/default.nix index c626a1cfac9e..bba0f092fd3f 100644 --- a/pkgs/development/python-modules/pytest-logdog/default.nix +++ b/pkgs/development/python-modules/pytest-logdog/default.nix @@ -4,6 +4,7 @@ , pytest , pytestCheckHook , pythonOlder +, setuptools , setuptools-scm }: @@ -31,6 +32,9 @@ buildPythonPackage rec { pytest ]; + propagatedBuildInputs = [ + setuptools + ]; checkInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/pytest-test-utils/default.nix b/pkgs/development/python-modules/pytest-test-utils/default.nix index 51e9972cbad3..fd5022dac4f8 100644 --- a/pkgs/development/python-modules/pytest-test-utils/default.nix +++ b/pkgs/development/python-modules/pytest-test-utils/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook , pytest , pythonOlder @@ -20,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-5gB+hnJR2+NQd/n7RGrX1bzfKt8Np7IbWw61SZgNVJY="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix index 1b45c06969d3..c6262b7f1e0e 100644 --- a/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pytest-xprocess"; - version = "0.19.0"; + version = "0.20.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GCDFSdZx7bLInCX/HjjHDs2g/v4oDxPEWiyMbWbXtQ4="; + sha256 = "sha256-AhZ1IsTcdZ+RxKsZhUY5zR6fbgq/ynXhGWgrVB0b1j8="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 1523326de0bf..7690b84fd3fa 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "7.1.2"; + version = "7.1.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oGoEJUU4ZKJwvEXnH3gzMKdCje+0Iw+15qcx/eBuzUU="; + sha256 = "sha256-TzZf7C3/nBFi+DTZ8YrxuhMGLbDHCL97lG+KXHYYDDk="; }; outputs = [ @@ -69,7 +69,7 @@ buildPythonPackage rec { # - files are not needed after tests are finished pytestRemoveBytecodePhase () { # suffix is defined at: - # https://github.com/pytest-dev/pytest/blob/7.1.2/src/_pytest/assertion/rewrite.py#L51-L53 + # https://github.com/pytest-dev/pytest/blob/7.1.3/src/_pytest/assertion/rewrite.py#L51-L53 find $out -name "*-pytest-*.py[co]" -delete } preDistPhases+=" pytestRemoveBytecodePhase" diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index a805c3e6c623..85e5034d6ebc 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "0.20.0"; + version = "0.21.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-t+OwSllpPELDb5qxzCrMRvpd+MeOF4/DOo1M0FyNSY8="; + sha256 = "sha256-t30IJ0Y549NBRd+mxwCOZt8PBLe+enX9DVKSwZHXkEU="; }; propagatedBuildInputs = [ click ]; diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index e5728dabeffc..d1ae7b80bf23 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, gnupg }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, gnupg +, pytestCheckHook +}: buildPythonPackage rec { pname = "python-gnupg"; @@ -18,6 +24,19 @@ buildPythonPackage rec { --replace "os.environ.get('GPGBINARY', 'gpg')" "os.environ.get('GPGBINARY', '${gnupg}/bin/gpg')" ''; + nativeBuildInputs = [ + setuptools + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # network access + "test_search_keys" + ]; + pythonImportsCheck = [ "gnupg" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/python-ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix new file mode 100644 index 000000000000..7b3c2bdbc0ba --- /dev/null +++ b/pkgs/development/python-modules/python-ldap/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pyasn1 +, pyasn1-modules +, pythonAtLeast +, pythonOlder +, pytestCheckHook +, openldap +, cyrus_sasl +}: + +buildPythonPackage rec { + pname = "python-ldap"; + version = "3.4.3"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "refs/tags/python-ldap-${version}"; + hash = "sha256-/ehvSs2qjuTPhaaOP0agPbWyyRugBpUlPq/Ny9t2C58="; + }; + + buildInputs = [ + openldap + cyrus_sasl + ]; + + propagatedBuildInputs = [ + pyasn1 + pyasn1-modules + ]; + + checkInputs = [ + pytestCheckHook + ]; + + preCheck = '' + # Needed by tests to setup a mockup ldap server. + export BIN="${openldap}/bin" + export SBIN="${openldap}/bin" + export SLAPD="${openldap}/libexec/slapd" + export SCHEMA="${openldap}/etc/schema" + ''; + + doCheck = !stdenv.isDarwin; + + meta = with lib; { + description = "Python modules for implementing LDAP clients"; + homepage = "https://www.python-ldap.org/"; + license = licenses.psfl; + }; +} diff --git a/pkgs/development/python-modules/python-pam/default.nix b/pkgs/development/python-modules/python-pam/default.nix index 16883ee9426e..b19d2c623d0c 100644 --- a/pkgs/development/python-modules/python-pam/default.nix +++ b/pkgs/development/python-modules/python-pam/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pam , six , toml @@ -24,6 +25,10 @@ buildPythonPackage rec { --replace 'find_library("pam_misc")' '"${pam}/lib/libpam_misc.so"' ''; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ pam ]; diff --git a/pkgs/development/python-modules/python-rabbitair/default.nix b/pkgs/development/python-modules/python-rabbitair/default.nix index 7ebc98426d99..6578a0777525 100644 --- a/pkgs/development/python-modules/python-rabbitair/default.nix +++ b/pkgs/development/python-modules/python-rabbitair/default.nix @@ -5,6 +5,7 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools , typing-extensions , zeroconf }: @@ -23,6 +24,10 @@ buildPythonPackage rec { hash = "sha256-CGr7NvnGRNTiKq5BpB/zmfgyd/2ggTbO0nj+Q+MavTs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cryptography zeroconf diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 8b3a6ba091cc..677322fc50d1 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "13.13"; + version = "13.14"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QpbYGji35e8fl5VlESjlj7NUZ4uNxNuTyhZsloKMV7I="; + hash = "sha256-6TkdQ+sRI94md6nSTqh4qdUyfWWyQZr7plP0dtJq7MM="; }; propagatedBuildInputs = [ @@ -39,7 +39,8 @@ buildPythonPackage rec { substituteInPlace requirements.txt \ --replace "APScheduler==3.6.3" "APScheduler" \ - --replace "cachetools==4.2.2" "cachetools" + --replace "cachetools==4.2.2" "cachetools" \ + --replace "tornado==6.1" "tornado" ''; setupPyGlobalFlags = "--with-upstream-urllib3"; diff --git a/pkgs/development/python-modules/python-vagrant/default.nix b/pkgs/development/python-modules/python-vagrant/default.nix index 9984931e3a98..b8ae4eba788c 100644 --- a/pkgs/development/python-modules/python-vagrant/default.nix +++ b/pkgs/development/python-modules/python-vagrant/default.nix @@ -1,4 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +}: buildPythonPackage rec { version = "1.0.0"; @@ -10,6 +14,10 @@ buildPythonPackage rec { sha256 = "sha256-qP6TzPL/N+zJXsL0nqdKkabOc6TbShapjdJtOXz9CeU="; }; + nativeBuildInputs = [ + setuptools + ]; + # The tests try to connect to qemu doCheck = false; diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix index 64879d01969f..6d005a22292a 100644 --- a/pkgs/development/python-modules/pythonfinder/default.nix +++ b/pkgs/development/python-modules/pythonfinder/default.nix @@ -9,6 +9,7 @@ , packaging , pytest-cov , pytest-timeout +, setuptools }: buildPythonPackage rec { @@ -23,6 +24,10 @@ buildPythonPackage rec { sha256 = "sha256-N/q9zi2SX38ivSpnjrx+bEzdR9cS2ivSgy42SR8cl+Q="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ attrs cached-property diff --git a/pkgs/development/python-modules/pytz-deprecation-shim/default.nix b/pkgs/development/python-modules/pytz-deprecation-shim/default.nix index eccf8399ee29..e438936f7e49 100644 --- a/pkgs/development/python-modules/pytz-deprecation-shim/default.nix +++ b/pkgs/development/python-modules/pytz-deprecation-shim/default.nix @@ -5,6 +5,7 @@ , pythonOlder , backports-zoneinfo , python-dateutil +, setuptools , tzdata , hypothesis , pytestCheckHook @@ -23,6 +24,8 @@ buildPythonPackage rec { sha256 = "af097bae1b616dde5c5744441e2ddc69e74dfdcb0c263129610d85b87445a59d"; }; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = (lib.optionals (pythonAtLeast "3.6" && pythonOlder "3.9") [ backports-zoneinfo ]) ++ (lib.optionals (pythonOlder "3.6") [ diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index 58ac098c17cc..718ee964588e 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytz"; - version = "2022.1"; + version = "2022.2.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HnYOL+aoFjvAs9mhnE+ENCr6Cir/6/qoSwG5eKAuyqc="; + sha256 = "sha256-zqIhQXIE8tGiqgPdrj6GeSGXHQ128U2Hq7RBRBW73PU="; }; checkInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index 24784afc842d..aa54e5169697 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyudev"; - version = "0.23.2"; + version = "0.24.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Mq41hbMgpRvCg+CgQAD9iiVZnttEVB4vUDT2r+5dFcw="; + sha256 = "sha256-sqOv4cmep1H4KWZSVX6sVZh02iobHsBiUXhwbsWjRfM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 60a010aa0b05..aa25a6a5dc34 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -21,6 +21,7 @@ , python-dotenv , pythonOlder , pytz +, setuptools , termcolor , typer , ffmpeg @@ -46,6 +47,10 @@ buildPythonPackage rec { --replace "pydantic!=1.9.1" "pydantic" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiofiles aiohttp diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 586b2bf29ee3..0328328b825f 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -8,6 +8,7 @@ , future , pycparser , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -22,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-qMWJk+vq8JyHjkEScpnlfRG7NzmyH6VyoZLNMAz6BWI="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ archinfo bitstring diff --git a/pkgs/development/python-modules/pyweatherflowrest/default.nix b/pkgs/development/python-modules/pyweatherflowrest/default.nix index a36f3a2ccfc2..b1384496325b 100644 --- a/pkgs/development/python-modules/pyweatherflowrest/default.nix +++ b/pkgs/development/python-modules/pyweatherflowrest/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -19,6 +20,11 @@ buildPythonPackage rec { sha256 = "1swyqdnvhwaigqhjn5a22gi8if4bl8alfrigln4qa0jl9z03kg09"; }; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index ea61a50560da..480247d01bb0 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "23.2.0"; + version = "23.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-pR8SqHGarZ3PtV1FYCLxa5CryN3n08qTzjEgtA4/oWk="; + hash = "sha256-KzgaqGfs59CoLzCgx/PUOHt88uBpfjPvqlvtbFeEq80="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix index 3e43b0d069ca..46622bc3e991 100644 --- a/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -17,7 +17,7 @@ in buildPythonPackage rec { disabled = !isPy3k; - nativeBuildInputs = [ sip qmake pyqt-builder qscintilla ]; + nativeBuildInputs = [ sip qmake pyqt-builder qscintilla pythonPackages.setuptools ]; buildInputs = [ qtbase ]; propagatedBuildInputs = [ pyqt5 ] ++ lib.optionals stdenv.isDarwin [ qtmacextras ]; diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index a1483518f92b..aae38c944958 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "5.3.1"; + version = "5.3.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tzcj+sQ5OLaE3LI3qIUQ3HchxDpybOqK3heaKSfAovM="; + sha256 = "sha256-jq3wEug6sBgpWAPCR8arfqzT1aseHYig83/c/auSlaM="; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 31c05ce48f4e..97d2111677f3 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "QtPy"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yozUIXF1GGNEKZ7kwPfnrc82LHCFK6NbJVpTQHcCXAY="; + sha256 = "sha256-2F8bEh8kpBrSbFXERuZqvbfFKIOfjE8R8VbsRUGQORQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/radicale_infcloud/default.nix b/pkgs/development/python-modules/radicale_infcloud/default.nix index 5d3540e01956..580ab59e630b 100644 --- a/pkgs/development/python-modules/radicale_infcloud/default.nix +++ b/pkgs/development/python-modules/radicale_infcloud/default.nix @@ -1,23 +1,27 @@ -{ lib, fetchFromGitHub, buildPythonPackage }: +{ lib, fetchFromGitHub, buildPythonPackage, radicale }: buildPythonPackage { pname = "radicale_infcloud"; - version = "2017-07-27"; + version = "unstable-2022-04-18"; src = fetchFromGitHub { owner = "Unrud"; repo = "RadicaleInfCloud"; - rev = "972757bf4c6be8b966ee063e3741ced29ba8169f"; - sha256 = "1c9ql9nv8kwi791akwzd19dcqzd916i7yxzbnrismzw4f5bhgzsk"; + rev = "53d3a95af5b58cfa3242cef645f8d40c731a7d95"; + sha256 = "sha256-xzBWIx2OOkCtBjlff1Z0VqgMhxWtgiOKutXUadT3tIo="; }; - doCheck = false; # Tries to import radicale, circular dependency + propagatedBuildInputs = [ radicale ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "radicale" ]; meta = with lib; { homepage = "https://github.com/Unrud/RadicaleInfCloud/"; description = "Integrate InfCloud into Radicale's web interface"; license = with licenses; [ agpl3 gpl3 ]; - platforms = platforms.all; - maintainers = with maintainers; [ aneeshusa ]; + maintainers = with maintainers; [ aneeshusa erictapen ]; }; } diff --git a/pkgs/development/python-modules/radio_beam/default.nix b/pkgs/development/python-modules/radio_beam/default.nix index bcb099887695..aa56e223237b 100644 --- a/pkgs/development/python-modules/radio_beam/default.nix +++ b/pkgs/development/python-modules/radio_beam/default.nix @@ -4,21 +4,22 @@ , setuptools-scm , astropy , numpy +, matplotlib , scipy , six , pytestCheckHook -, pytest-doctestplus +, pytest-astropy }: buildPythonPackage rec { pname = "radio_beam"; - version = "0.3.3"; + version = "0.3.4"; format = "pyproject"; src = fetchPypi { inherit version; pname = "radio-beam"; - sha256 = "e34902d91713ccab9f450b9d3e82317e292cf46a30bd42f9ad3c9a0519fcddcd"; + sha256 = "e032257f1501303873f251c00c74b1188180785c79677fb4443098d517852309"; }; nativeBuildInputs = [ @@ -34,14 +35,10 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytest-doctestplus + matplotlib + pytest-astropy ]; - # Tests must be run in the build directory - preCheck = '' - cd build/lib - ''; - meta = { description = "Tools for Beam IO and Manipulation"; homepage = "http://radio-astro-tools.github.io"; diff --git a/pkgs/development/python-modules/rangehttpserver/default.nix b/pkgs/development/python-modules/rangehttpserver/default.nix index 217bffb174b8..006dc747fe6f 100644 --- a/pkgs/development/python-modules/rangehttpserver/default.nix +++ b/pkgs/development/python-modules/rangehttpserver/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , nose , requests }: @@ -17,6 +18,10 @@ buildPythonPackage rec { sha256 = "1sy9j6y8kp5jiwv2vd652v94kspp1yd4dwxrfqfn6zwnfyv2mzv5"; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ nose requests diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index ad3bac33e24e..b42523dc8bf5 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -41,6 +41,7 @@ in buildPythonPackage rec { pname = "rdkit"; version = "2022.03.5"; + format = "other"; src = let diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 512a7162f0e3..1bd2d8b5d871 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "regex"; - version = "2022.3.2"; + version = "2022.9.13"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-eeWvH/JYvA/gvdb2m8SuM5NaiY48vvu8zyLoiif6BTs="; + hash = "sha256-8HNztuVqbzoN89dbZRonjKe9NXp5YHiiapWOoc4FiP0="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index 02a6b149eb0b..1f75683a5b1d 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "reproject"; - version = "0.8"; + version = "0.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Z54sY3R6GViTvMLHrJclrAZ1dH4/9bzIrgqDd9nFbJY="; + hash = "sha256-zhjI4MjlCV9zR0nNcss+C36CZXY/imGsalfKMGacfi0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix index 85d7c47baae3..85b9d9fe35fb 100644 --- a/pkgs/development/python-modules/requests-mock/default.nix +++ b/pkgs/development/python-modules/requests-mock/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "requests-mock"; - version = "1.9.3"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "8d72abe54546c1fc9696fa1516672f1031d72a55a1d66c85184f972a24ba0eba"; + sha256 = "sha256-WcnDJBmp+xroPsJC2Y6InEW9fXpl1IN1zCQ+wIRBZYs="; }; patchPhase = '' diff --git a/pkgs/development/python-modules/requests-wsgi-adapter/default.nix b/pkgs/development/python-modules/requests-wsgi-adapter/default.nix new file mode 100644 index 000000000000..77386c21a869 --- /dev/null +++ b/pkgs/development/python-modules/requests-wsgi-adapter/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "requests-wsgi-adapter"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-WncJ6Qq/SdGB9sMqo3eUU39yXeD23UI2K8jIyQgSyHg="; + }; + + propagatedBuildInputs = [ + requests + ]; + + # tests are not contained in pypi-release + doCheck = false; + + meta = with lib; { + description = "WSGI Transport Adapter for Requests"; + homepage = "https://github.com/seanbrant/requests-wsgi-adapter"; + license = licenses.bsd3; + maintainers = with maintainers; [ betaboon ]; + }; +} diff --git a/pkgs/development/python-modules/requirements-parser/default.nix b/pkgs/development/python-modules/requirements-parser/default.nix index 3d51f4741af6..3e26c91014a4 100644 --- a/pkgs/development/python-modules/requirements-parser/default.nix +++ b/pkgs/development/python-modules/requirements-parser/default.nix @@ -4,6 +4,7 @@ , poetry-core , pytestCheckHook , pythonOlder +, setuptools , types-setuptools }: @@ -26,6 +27,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + setuptools types-setuptools ]; diff --git a/pkgs/development/python-modules/rich-rst/default.nix b/pkgs/development/python-modules/rich-rst/default.nix index 4c543febb813..f15e565bd043 100644 --- a/pkgs/development/python-modules/rich-rst/default.nix +++ b/pkgs/development/python-modules/rich-rst/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , docutils , rich }: @@ -17,6 +18,10 @@ buildPythonPackage rec { sha256 = "sha256-s48hdJo1LIRXTf+PeSBa6y/AH1NLmnyAafFydJ+exDk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ docutils rich ]; # Module has no tests diff --git a/pkgs/development/python-modules/rlax/default.nix b/pkgs/development/python-modules/rlax/default.nix index adff2f0ac5d3..c23f7d9cce3a 100644 --- a/pkgs/development/python-modules/rlax/default.nix +++ b/pkgs/development/python-modules/rlax/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "rlax"; - version = "0.1.2"; + version = "0.1.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hAG0idz5VkGVvxaJWoxlVZ8myeHF6ndDxB0SyJm7qV8="; + sha256 = "sha256-a4qyJ5W9fs4TSTQQZS/NptlcSr2Nhw0pvnk+sGEsbyY="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/rpi-bad-power/default.nix b/pkgs/development/python-modules/rpi-bad-power/default.nix index 205cefad6143..8c0dbd61c3a5 100644 --- a/pkgs/development/python-modules/rpi-bad-power/default.nix +++ b/pkgs/development/python-modules/rpi-bad-power/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook }: @@ -19,6 +20,10 @@ buildPythonPackage { hash = "sha256:1yvfz28blq4fdnn614n985vbs5hcw1gm3i9am53k410sfs7ilvkk"; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "rpi_bad_power" ]; diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix index ccfd237862d7..0a70f8d8b088 100644 --- a/pkgs/development/python-modules/rsa/default.nix +++ b/pkgs/development/python-modules/rsa/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "rsa"; - version = "4.8"; + version = "4.9"; src = fetchPypi { inherit pname version; - sha256 = "5c6bd9dc7a543b7fe4304a631f8a8a3b674e2bbfc49c2ae96200cdbe55df6b17"; + sha256 = "sha256-44RkpJxshdfxNRsBJmYUh6fgoUpQ8WdexQ6zTU8g7yE="; }; checkInputs = [ unittest2 mock ]; diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index bb4d5828284f..343d637db0ab 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2022.5.0"; + version = "2022.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tAo8v6+Ay6uvDjMjMRF8ysaSkO/aw0cYT7OrYAP3BGU="; + hash = "sha256-PKBwGomp4SWijekIKdGflvQd2x2LQ3kHbCntgsSvhs0="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 77d4cc5aa280..b35eb7118d57 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.103.0"; + version = "2.109.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0iXIUWvoL6+kT+KaJq7yzdEzYA0orKBbQkGAVUYcSKk="; + hash = "sha256-hs71bIoByh5S1ncsku+y4X2i0yU65FknJE05lEmnru4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index 40c52962e51d..40e391347702 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -60,13 +60,13 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "31.0.0b4"; + version = "31.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-sPFHaIbbWw/wk3Q1PBDj5O4il9ntigoyanecg938a9A="; + hash = "sha256-/QLW+rxkDbrv/78xiXOuSNaQvY+0oYZQV0/m60CEZLk="; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index e35c1bb69109..ae1627f888f3 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -2,6 +2,7 @@ , black , buildPythonPackage , fetchPypi +, setuptools-scm , cachecontrol , lockfile , mistune @@ -13,16 +14,20 @@ buildPythonPackage rec { pname = "schema-salad"; - version = "8.3.20220626185350"; + version = "8.3.20220913105718"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-g8h3dAdN+tbdLRO3ctmsW+ZLiyhU0zPd1XR+XvEBpwo="; + hash = "sha256-18/xLIq1+yM8iQBIeXvRIO4A5GqZS/3qOKXmi439+sQ="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ cachecontrol lockfile @@ -35,6 +40,10 @@ buildPythonPackage rec { pytestCheckHook ] ++ passthru.optional-dependencies.pycodegen; + preCheck = '' + rm tox.ini + ''; + disabledTests = [ # Setup for these tests requires network access "test_secondaryFiles" @@ -52,6 +61,7 @@ buildPythonPackage rec { }; meta = with lib; { + broken = true; # disables on outdated version of mistune description = "Semantic Annotations for Linked Avro Data"; homepage = "https://github.com/common-workflow-language/schema_salad"; license = with licenses; [ asl20 ]; diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index 6a97bcd46846..3512f1ddd06f 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "1.1.1"; + version = "1.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Pne3Ho5kT4bItb5/HChe9ZfeTDhJYTie4+nKNsRFslY="; + sha256 = "sha256-fCLRMFsW8I1XdRpOo2Bx4iFe+0wJy3kYP6pOjoKj2/g="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix index 21baa7bfa37e..e419cb8b63e5 100644 --- a/pkgs/development/python-modules/scikits-odes/default.nix +++ b/pkgs/development/python-modules/scikits-odes/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "scikits.odes"; - version = "2.6.4"; + version = "2.6.5"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-fS9E0kO+ZEcGjiWQPAQHa52zOz9RafNSBPNKypm0GhA="; + sha256 = "sha256-MP1pNkr0fAyWWVHJVHiaVEn1UsbVsjU9MZHHAQYtPYI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 4b6342691d43..aa578d21d257 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -5,7 +5,10 @@ , buildPythonPackage , cython , gfortran +, meson-python +, pkg-config , pythran +, wheel , nose , pytest , pytest-xdist @@ -15,14 +18,15 @@ buildPythonPackage rec { pname = "scipy"; - version = "1.8.1"; + version = "1.9.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nj+xsOiW8UqFqpoo1fdV2q7rVMiXt0bfelXMsCs0DzM="; + sha256 = "sha256-JtKMRokA5tX9s30oEqtG2wzNIsY7qglQV4cfqjpJi8k="; }; - nativeBuildInputs = [ cython gfortran pythran ]; + nativeBuildInputs = [ cython gfortran meson-python pythran pkg-config wheel ]; buildInputs = [ numpy.blas pybind11 ]; @@ -30,11 +34,6 @@ buildPythonPackage rec { checkInputs = [ nose pytest pytest-xdist ]; - # Remove tests because of broken wrapper - prePatch = '' - rm scipy/linalg/tests/test_lapack.py - ''; - doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); preConfigure = '' @@ -42,10 +41,6 @@ buildPythonPackage rec { export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES ''; - preBuild = '' - ln -s ${numpy.cfg} site.cfg - ''; - # disable stackprotector on aarch64-darwin for now # # build error: @@ -58,7 +53,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck - pushd dist + pushd "$out" ${python.interpreter} -c "import scipy; scipy.test('fast', verbose=10, parallel=$NIX_BUILD_CORES)" popd runHook postCheck diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index f7443094f4aa..95805b270438 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -10,6 +10,7 @@ , pygit2 , pygtrie , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -26,6 +27,16 @@ buildPythonPackage rec { hash = "sha256-lFeYo7OVT0az+mYgERcVuuT9rX29+E2+WwfdDlMRm+I="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "asyncssh>=2.7.1,<2.9" "asyncssh>=2.7.1" \ + --replace "pathspec>=0.9.0,<0.10.0" "pathspec" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ asyncssh dulwich @@ -37,11 +48,6 @@ buildPythonPackage rec { pygtrie ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "asyncssh>=2.7.1,<2.9" "asyncssh>=2.7.1" - ''; - # Requires a running Docker instance doCheck = false; diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 72e1c832da08..0657b91b8786 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -30,15 +30,15 @@ buildPythonPackage rec { pname = "scrapy"; - version = "2.6.2"; + version = "2.6.3"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit version; pname = "Scrapy"; - sha256 = "55e21181165f25337105fff1efc8393296375cea7de699a7e703bbd265595f26"; + hash = "sha256-vf8arzVHwuVAQ206uGgLIQOTJ71dOi74nDQWWZLT5fM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix index dc794513fc4c..f67d68b0dddd 100644 --- a/pkgs/development/python-modules/screeninfo/default.nix +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -2,25 +2,33 @@ , lib , buildPythonApplication , dataclasses -, fetchPypi +, fetchFromGitHub , libX11 , libXinerama , libXrandr +, poetry-core , pytestCheckHook , pythonOlder }: buildPythonApplication rec { pname = "screeninfo"; - version = "0.8"; + version = "0.8.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "9501bf8b8458c7d1be4cb0ac9abddddfa80b932fb3f65bfcb54f5586434b1dc5"; + src = fetchFromGitHub { + owner = "rr-"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-TEy4wff0eRRkX98yK9054d33Tm6G6qWrd9Iv+ITcFmA="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ dataclasses ]; @@ -40,7 +48,7 @@ buildPythonApplication rec { disabledTestPaths = [ # We don't have a screen - "screeninfo/test_screeninfo.py" + "tests/test_screeninfo.py" ]; pythonImportsCheck = [ "screeninfo" ]; diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 7a533ddf7e9a..24a5399d45a2 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildPythonPackage -, fetchFromGitHub +, fetchPypi , flit-core , matplotlib , pytestCheckHook @@ -18,14 +18,14 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; - src = fetchFromGitHub { - repo = "seaborn"; - owner = "mwaskom"; - rev = "v${version}"; - sha256 = "sha256-rJQRsUYFF0LoksE+q+CbxAxdI/Pi9k1qWR2G3PD1MkI="; + src = fetchPypi { + inherit pname version; + hash = "sha256-iT8XKS2LrKYWwVeN21jrJcctYi9U/F7jKcggfcm1eyM="; }; - nativeBuildInputs = [ flit-core ]; + nativeBuildInputs = [ + flit-core + ]; propagatedBuildInputs = [ matplotlib diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix index a9f336d18df9..59584ee9170f 100644 --- a/pkgs/development/python-modules/secretstorage/default.nix +++ b/pkgs/development/python-modules/secretstorage/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "secretstorage"; - version = "3.3.2"; + version = "3.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "SecretStorage"; inherit version; - hash = "sha256-Co65ZFsyCIHCIugnwm9M/PVTY+izdKAhmB74hmV6kS8="; + hash = "sha256-JANTPvNp7KbSuoFxhXbF4PVk1cyhtY9zqLI+fU7uvXc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 101135794385..4c7eedf281d3 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "selenium"; - version = "4.3.0"; + version = "4.4.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "SeleniumHQ"; repo = "selenium"; - rev = "refs/tags/selenium-${version}"; # check if there is a newer tag with -python suffix - sha256 = "sha256-tD2sJGVBwqB0uOM3zwdNn71+ILYEHPAvWHvoJN24w6E="; + rev = "refs/tags/selenium-${version}-python"; # check if there is a newer tag with -python suffix + hash = "sha256-sJJ3i4mnGp5fDgo64p6B2vRCqp/Wm99VoyRLyy4nBH8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index a86b51c005ba..00fd16f15642 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -28,11 +28,6 @@ buildPythonPackage rec { sed -i "/--no-cov-on-fail/d" setup.cfg ''; - preCheck = '' - # Confuses source vs dist imports in pytest - rm -r dist - ''; - disabledTestPaths = [ # Don't test the documentation "docs/*.rst" diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix index 8a35d3ed71a6..1741c76b3d4f 100644 --- a/pkgs/development/python-modules/send2trash/default.nix +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -1,7 +1,8 @@ { lib, stdenv , buildPythonPackage , fetchFromGitHub -, pytest +, setuptools +, pytestCheckHook }: buildPythonPackage rec { @@ -12,13 +13,23 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hsoft"; repo = "send2trash"; - rev = version; - sha256 = "sha256-kDUEfyMTk8CXSxTEi7E6kl09ohnWHeaoif+EIaIJh9Q="; + rev = "refs/tags/${version}"; + hash = "sha256-kDUEfyMTk8CXSxTEi7E6kl09ohnWHeaoif+EIaIJh9Q="; }; + nativeBuildInputs = [ + setuptools + ]; + doCheck = !stdenv.isDarwin; - checkPhase = "HOME=$TMPDIR pytest"; - checkInputs = [ pytest ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Send file to trash natively under macOS, Windows and Linux"; diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix index c48b7b9e1b3c..cfcd221c5abb 100644 --- a/pkgs/development/python-modules/setproctitle/default.nix +++ b/pkgs/development/python-modules/setproctitle/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "setproctitle"; - version = "1.2.3"; + version = "1.3.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7PKLHAenmddvQyblCBV7ca7aB7hLkDaOpFHAcQ29MsA="; + sha256 = "sha256-ufuXkHyDDSYPoGWO1Yr9SKhrK4iqxSETXDUv9/00d/0="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 883ca18e93e4..9fab8747b67f 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -10,7 +10,7 @@ let pname = "setuptools"; - version = "63.2.0"; + version = "65.3.0"; # Create an sdist of setuptools sdist = stdenv.mkDerivation rec { @@ -19,8 +19,8 @@ let src = fetchFromGitHub { owner = "pypa"; repo = pname; - rev = "v${version}"; - hash = "sha256-GyQjc0XulUxl3Btpj7Q6KHTpd1FDZnXCYviYjjgK7tY="; + rev = "refs/tags/v${version}"; + hash = "sha256-LPguGVWvwEMZpJFuXWLVFzIlzw+/QSMjVi2oYh0cI0s="; name = "${pname}-${version}-source"; }; @@ -77,5 +77,6 @@ in buildPythonPackage rec { license = with licenses; [ psfl zpl20 ]; platforms = python.meta.platforms; priority = 10; + maintainers = teams.python.members; }; } diff --git a/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch b/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch index ae844ecd2d3f..1dfaf8c6d5f7 100644 --- a/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch +++ b/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch @@ -1,8 +1,8 @@ diff --git a/setuptools/_distutils/cygwinccompiler.py b/setuptools/_distutils/cygwinccompiler.py -index 445e2e51..2fdbdcca 100644 +index 2c4da5b5..e2cd8803 100644 --- a/setuptools/_distutils/cygwinccompiler.py +++ b/setuptools/_distutils/cygwinccompiler.py -@@ -131,14 +131,19 @@ class CygwinCCompiler(UnixCCompiler): +@@ -97,14 +97,19 @@ class CygwinCCompiler(UnixCCompiler): self.cxx = os.environ.get('CXX', 'g++') self.linker_dll = self.cc @@ -15,14 +15,14 @@ index 445e2e51..2fdbdcca 100644 compiler_cxx='%s -mcygwin -O -Wall' % self.cxx, + compiler_so_cxx='%s -mcygwin -mdll -O -Wall' % self.cxx, linker_exe='%s -mcygwin' % self.cc, - linker_so=('%s -mcygwin %s' % (self.linker_dll, shared_option)), + linker_so=('{} -mcygwin {}'.format(self.linker_dll, shared_option)), + linker_exe_cxx='%s -mcygwin' % self.cxx, + linker_so_cxx=('%s -mcygwin %s' % + (self.linker_dll_cxx, shared_option)), ) # Include the appropriate MSVC runtime library if Python was built -@@ -170,9 +175,12 @@ class CygwinCCompiler(UnixCCompiler): +@@ -136,9 +141,12 @@ class CygwinCCompiler(UnixCCompiler): raise CompileError(msg) else: # for other files use the C-compiler try: @@ -38,24 +38,24 @@ index 445e2e51..2fdbdcca 100644 except DistutilsExecError as msg: raise CompileError(msg) -@@ -323,9 +331,12 @@ class Mingw32CCompiler(CygwinCCompiler): +@@ -275,9 +283,12 @@ class Mingw32CCompiler(CygwinCCompiler): self.set_executables( compiler='%s -O -Wall' % self.cc, compiler_so='%s -mdll -O -Wall' % self.cc, + compiler_so_cxx='%s -mdll -O -Wall' % self.cxx, compiler_cxx='%s -O -Wall' % self.cxx, linker_exe='%s' % self.cc, - linker_so='%s %s' % (self.linker_dll, shared_option), + linker_so='{} {}'.format(self.linker_dll, shared_option), + linker_exe_cxx='%s' % self.cxx, + linker_so_cxx='%s %s' % (self.linker_dll_cxx, shared_option) ) # Maybe we should also append -mthreads, but then the finished diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py -index e41d51ee..f7ded14b 100644 +index 3dd8185f..cb374a94 100644 --- a/setuptools/_distutils/sysconfig.py +++ b/setuptools/_distutils/sysconfig.py -@@ -280,6 +280,7 @@ def customize_compiler(compiler): +@@ -289,6 +289,7 @@ def customize_compiler(compiler): # noqa: C901 cflags, ccshared, ldshared, @@ -63,7 +63,7 @@ index e41d51ee..f7ded14b 100644 shlib_suffix, ar, ar_flags, -@@ -289,11 +290,14 @@ def customize_compiler(compiler): +@@ -298,11 +299,14 @@ def customize_compiler(compiler): # noqa: C901 'CFLAGS', 'CCSHARED', 'LDSHARED', @@ -78,7 +78,7 @@ index e41d51ee..f7ded14b 100644 if 'CC' in os.environ: newcc = os.environ['CC'] if 'LDSHARED' not in os.environ and ldshared.startswith(cc): -@@ -305,19 +309,27 @@ def customize_compiler(compiler): +@@ -314,19 +318,27 @@ def customize_compiler(compiler): # noqa: C901 cxx = os.environ['CXX'] if 'LDSHARED' in os.environ: ldshared = os.environ['LDSHARED'] @@ -107,7 +107,7 @@ index e41d51ee..f7ded14b 100644 if 'AR' in os.environ: ar = os.environ['AR'] if 'ARFLAGS' in os.environ: -@@ -326,13 +338,17 @@ def customize_compiler(compiler): +@@ -335,13 +347,17 @@ def customize_compiler(compiler): # noqa: C901 archiver = ar + ' ' + ar_flags cc_cmd = cc + ' ' + cflags @@ -127,10 +127,10 @@ index e41d51ee..f7ded14b 100644 ) diff --git a/setuptools/_distutils/unixccompiler.py b/setuptools/_distutils/unixccompiler.py -index 4be74fdf..66f95aef 100644 +index 4ab771a4..17abac83 100644 --- a/setuptools/_distutils/unixccompiler.py +++ b/setuptools/_distutils/unixccompiler.py -@@ -112,9 +112,12 @@ class UnixCCompiler(CCompiler): +@@ -116,9 +116,12 @@ class UnixCCompiler(CCompiler): 'preprocessor': None, 'compiler': ["cc"], 'compiler_so': ["cc"], @@ -144,7 +144,7 @@ index 4be74fdf..66f95aef 100644 'archiver': ["ar", "-cr"], 'ranlib': None, } -@@ -174,8 +177,13 @@ class UnixCCompiler(CCompiler): +@@ -182,8 +185,13 @@ class UnixCCompiler(CCompiler): def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): compiler_so = compiler_fixup(self.compiler_so, cc_args + extra_postargs) @@ -159,7 +159,7 @@ index 4be74fdf..66f95aef 100644 except DistutilsExecError as msg: raise CompileError(msg) -@@ -243,7 +251,8 @@ class UnixCCompiler(CCompiler): +@@ -251,7 +259,8 @@ class UnixCCompiler(CCompiler): # building an executable or linker_so (with shared options) # when building a shared library. building_exe = target_desc == CCompiler.EXECUTABLE diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix index a08920a39e2b..d6334251bff4 100644 --- a/pkgs/development/python-modules/sh/default.nix +++ b/pkgs/development/python-modules/sh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sh"; - version = "1.14.2"; + version = "1.14.3"; src = fetchPypi { inherit pname version; - sha256 = "9d7bd0334d494b2a4609fe521b2107438cdb21c0e469ffeeb191489883d6fe0d"; + sha256 = "sha256-5ARbbHMtnOddVxx59awiNO3Zrk9fqdWbCXBQgr3KGMc="; }; patches = [ diff --git a/pkgs/development/python-modules/sharkiq/default.nix b/pkgs/development/python-modules/sharkiq/default.nix index e41205fba737..0b99c15564fd 100644 --- a/pkgs/development/python-modules/sharkiq/default.nix +++ b/pkgs/development/python-modules/sharkiq/default.nix @@ -1,17 +1,20 @@ { lib , aiohttp , buildPythonPackage -, fetchPypi +, fetchFromGitHub , requests }: buildPythonPackage rec { pname = "sharkiq"; - version = "0.0.1"; + version = "1.0.2"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "e5efb0ad13a66cf6a097da5c128347ef7bd0b2abe53a8ca65cbc847ec1190c8b"; + src = fetchFromGitHub { + owner = "JeffResc"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-UG460uEv1U/KTuVEcXMZlVbK/7REFpotkUk4U7z7KpA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix index 1d1a1fc46bdd..341d3f3c32e3 100644 --- a/pkgs/development/python-modules/shellingham/default.nix +++ b/pkgs/development/python-modules/shellingham/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytest-mock , pytestCheckHook , pythonOlder @@ -8,17 +9,21 @@ buildPythonPackage rec { pname = "shellingham"; - version = "1.4.0"; + version = "1.5.0"; format = "pyproject"; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sarugaku"; repo = pname; - rev = version; - sha256 = "0f686ym3ywjffis5jfqkhsshjgii64060hajysczflhffrjn9jcp"; + rev = "refs/tags/${version}"; + hash = "sha256-CIO5mBFph+5cO7U4NRjMRtQCTbopJDEGlAGBkxjieFw="; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix index a296a721a8e0..ddc4b56654e6 100644 --- a/pkgs/development/python-modules/simpleeval/default.nix +++ b/pkgs/development/python-modules/simpleeval/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook }: @@ -16,6 +17,10 @@ buildPythonPackage rec { sha256 = "0khgl729q5133fgc00d550f4r77707rkkn7r56az4v8bvx0q8xp4"; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix index 703cc2332a17..5b486e0163cc 100644 --- a/pkgs/development/python-modules/skein/default.nix +++ b/pkgs/development/python-modules/skein/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { inherit pname version; hash = "sha256-nXTqsJNX/LwAglPcPZkmdYPfF+vDLN+nNdZaDFTrHzE="; }; + # Update this hash if bumping versions jarHash = "sha256-x2KH6tnoG7sogtjrJvUaxy0PCEA8q/zneuI969oBOKo="; skeinJar = callPackage ./skeinjar.nix { inherit pname version jarHash; }; diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix index a874e668e475..02d66aa84e8c 100644 --- a/pkgs/development/python-modules/skodaconnect/default.nix +++ b/pkgs/development/python-modules/skodaconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "skodaconnect"; - version = "1.1.25"; + version = "1.1.26"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lendy007"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Zky1PShQE/V2pSJURYTQHnsqdfsD3k7DWMnDidmwfxs="; + hash = "sha256-zuS19oM3V+o0yiby6yOX2RSxXY3m5qhqjlX2v9jmpIk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index b124a7c887e9..668cdb1643da 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -9,12 +9,13 @@ , google-cloud-storage , requests , moto +, paramiko , pytestCheckHook }: buildPythonPackage rec { pname = "smart-open"; - version = "6.0.0"; + version = "6.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "RaRe-Technologies"; repo = "smart_open"; rev = "v${version}"; - sha256 = "sha256-FEIJ1DBW0mz7n+J03C1Lg8uAs2ZxI0giM7+mvuNPyGg="; + sha256 = "sha256-AtFIluoI2QeHUX2dclEmOxsv/cEtusWq7GyViRBhL5g="; }; propagatedBuildInputs = [ @@ -37,6 +38,7 @@ buildPythonPackage rec { checkInputs = [ moto + paramiko pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sniffio/default.nix b/pkgs/development/python-modules/sniffio/default.nix index 5b91bade0098..86e37168c899 100644 --- a/pkgs/development/python-modules/sniffio/default.nix +++ b/pkgs/development/python-modules/sniffio/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "sniffio"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"; + sha256 = "sha256-5gMFxeXTFPU4klm38iqqM9j33uSXYxGSNK83VcVbkQE="; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 500a392b1162..8e957b0ee373 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -5,6 +5,7 @@ , cffi , charset-normalizer , fetchPypi +, filelock , idna , oscrypto , pycryptodomex @@ -14,18 +15,19 @@ , pytz , requests , setuptools +, typing-extensions }: buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.7.9"; + version = "2.7.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HQ/d7luqdG1BriuP8QXzZk5JZwwLJH1JQIN3BtEDpM4="; + hash = "sha256-M50YI6aB7fSVRLeAqxLKtsxJIC1oWLcb9Mvah9/C/zU="; }; propagatedBuildInputs = [ @@ -33,6 +35,7 @@ buildPythonPackage rec { certifi cffi charset-normalizer + filelock idna oscrypto pycryptodomex @@ -41,6 +44,7 @@ buildPythonPackage rec { pytz requests setuptools + typing-extensions ]; postPatch = '' diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 84009008e9af..33824e9f0247 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -1,18 +1,22 @@ -{ buildPythonPackage -, lib +{ lib +, buildPythonPackage , fetchPypi , six , snowflake-connector-python , sqlalchemy +, pythonOlder }: buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.4.1"; + version = "1.4.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dJK1biZ6rEpS4kTncfJzHjBLktDZSsqvSGekbmfhves="; + hash = "sha256-zKWDQSd8G1H+EFMYHHSVyAtJNxZ6+z1rkESi5dsVpVc="; }; propagatedBuildInputs = [ @@ -23,11 +27,14 @@ buildPythonPackage rec { # Pypi does not include tests doCheck = false; - pythonImportsCheck = [ "snowflake.sqlalchemy" ]; + + pythonImportsCheck = [ + "snowflake.sqlalchemy" + ]; meta = with lib; { description = "Snowflake SQLAlchemy Dialect"; - homepage = "https://www.snowflake.net/"; + homepage = "https://github.com/snowflakedb/snowflake-sqlalchemy"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index d21f5d17cd27..f6985a613380 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.1.7"; + version = "1.1.8"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-lrC1JEQu3/YX4o5azs4UDTsrtfim3IJyD6plCbx5G3E="; + hash = "sha256-e7YuBEq2yggW5G2pJ0Rjw9z3c1jqgRKCifYSfnzblVs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index e4f5868d8457..cc1c01adf288 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.4.0"; + version = "3.4.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-PM0an1Z1nl8Pnv31cRmgZwKtWcBF3eCzgwtUclk+Ce8="; + hash = "sha256-WcXPXTSKbA5kpZrFz+bNhdCOhmM3hwyV0exhYdUx5GM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index d317f11dea42..c9023285568b 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "spglib"; - version = "1.16.5"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Lqzv1TzGRLqakMRoH9bJNLa92BjBE9fzGZBOB41dq5M="; + sha256 = "sha256-9fHKuDWuwbjXjL9CmJxUWWoomkqDP93J8MX1XKwbwsE="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix b/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix new file mode 100644 index 000000000000..2da9c2d92f6a --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, sphinx +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-asyncio"; + version = "0.3.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-mf0m4P5+34ckSnGpnDFv0Mm1CFbCUZrMqSfr50EAci4="; + }; + + propagatedBuildInputs = [ + sphinx + ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "sphinxcontrib.asyncio" + ]; + + meta = with lib; { + description = "Sphinx extension to add asyncio-specific markups"; + homepage = "https://github.com/aio-libs/sphinxcontrib-asyncio"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 3742d15b356a..743be37b5130 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.3.2"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-urI7Ak25NZzsUYLiR+cIdfcd3ECoJx/RNT3gj0QPJtw="; + sha256 = "sha256-7luJo7S/n88jDJRhJx1WuF5jhmeRHrrdxinbBbXuRxc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index edcee3fe9323..85fe9ed37e72 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -46,13 +46,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.3.2"; + version = "5.3.3"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KJkamNMXr4Mi9Y6B7aKExoiqWKoExCFlELChCrQL6mQ="; + sha256 = "sha256-vWhwn07zgHX7/7uAz0ekNwnAiKLECCBzBq47TtTaHfE="; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 25e5b0006619..4b13f996e954 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -1,39 +1,134 @@ { stdenv , lib +, isPyPy +, pythonOlder , fetchPypi , buildPythonPackage -, isPy3k -, pythonOlder + +# build +, cython + +# propagates , greenlet , importlib-metadata +, typing-extensions + +# optionals +, aiosqlite +, asyncmy +, asyncpg +, cx_oracle +, mariadb +, mypy +, mysql-connector +, mysqlclient +# TODO: oracledb +, pg8000 +, psycopg +, psycopg2 +, psycopg2cffi +# TODO: pymssql +, pymysql +, pyodbc +# TODO: sqlcipher3 + +# tests , mock -, pysqlite ? null , pytestCheckHook }: buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.40"; + version = "1.4.41"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RKZgUGCAzJdeHfpXdv5fYxXdxiane1C/Du4YsDieomU="; + hash = "sha256-ApL3DReX48VOhi5vMK5HQBRki8nHI+FKL9pzCtsKl5E="; }; + nativeBuildInputs = lib.optionals (!isPyPy) [ + cython + ]; + propagatedBuildInputs = [ greenlet + typing-extensions ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + passthru.optional-dependencies = rec { + asyncio = [ + greenlet + ]; + mypy = [ + #mypy + ]; + mssql = [ + pyodbc + ]; + mssql_pymysql = [ + # TODO: pymssql + ]; + mssql_pyodbc = [ + pyodbc + ]; + mysql = [ + mysqlclient + ]; + mysql_connector = [ + mysql-connector + ]; + mariadb_connector = [ + mariadb + ]; + oracle = [ + cx_oracle + ]; + oracle_oracledb = [ + # TODO: oracledb + ]; + postgresql = [ + psycopg2 + ]; + postgresql_pg8000 = [ + pg8000 + ]; + postgresql_asyncpg = [ + asyncpg + ] ++ asyncio; + postgresql_psycopg2binary = [ + psycopg2 + ]; + postgresql_psycopg2cffi = [ + psycopg2cffi + ]; + postgresql_psycopg = [ + psycopg + ]; + pymysql = [ + pymysql + ]; + aiomysql = [ + aiomysql + ] ++ asyncio; + asyncmy = [ + asyncmy + ] ++ asyncio; + aiosqlite = [ + aiosqlite + typing-extensions + ] ++ asyncio; + sqlcipher = [ + # TODO: sqlcipher3 + ]; + }; + checkInputs = [ pytestCheckHook mock - ] ++ lib.optional (!isPy3k) pysqlite; - - postInstall = '' - sed -e 's:--max-worker-restart=5::g' -i setup.cfg - ''; + ]; # disable mem-usage tests on mac, has trouble serializing pickle files disabledTests = lib.optionals stdenv.isDarwin [ @@ -42,8 +137,9 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_${builtins.replaceStrings [ "." ] [ "_" ] version}"; + description = "The Python SQL toolkit and Object Relational Mapper"; homepage = "http://www.sqlalchemy.org/"; - description = "A Python SQL toolkit and Object Relational Mapper"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/stestr/default.nix b/pkgs/development/python-modules/stestr/default.nix index 2071d20a75f8..bb6dc7e54b20 100644 --- a/pkgs/development/python-modules/stestr/default.nix +++ b/pkgs/development/python-modules/stestr/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "stestr"; - version = "3.2.1"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wj7nq0QSKNiDZZBKIk+4RC2gwCifkBz0qUIukpt76c0="; + sha256 = "sha256-A2Y+q62KcxaoRJFo78WCVmpdOvnHf8QALX3IPnf28q0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index aad3afda8adf..88dca4a51d4a 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "4.0.4"; + version = "4.0.5"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-O4VjxcuJVgUjjz3VWyczCjJxvJvAL94MBnGsRn54Ld4="; + hash = "sha256-7I23WtSeZPtHULJ7sNAbOdwAuzjiPE6WW2ukKUCMODs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/suseapi/default.nix b/pkgs/development/python-modules/suseapi/default.nix index bcf35d1f5f70..83925dd64d93 100644 --- a/pkgs/development/python-modules/suseapi/default.nix +++ b/pkgs/development/python-modules/suseapi/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , django , suds-jurko -, ldap +, python-ldap , mechanize , beautifulsoup4 , pyxdg @@ -24,7 +24,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - django suds-jurko ldap mechanize beautifulsoup4 pyxdg python-dateutil requests + django suds-jurko python-ldap mechanize beautifulsoup4 pyxdg python-dateutil requests ]; buildInputs = [ httpretty ]; diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index 17765a375298..c00230e501d2 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sympy"; - version = "1.10.1"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WTnu/9+eFSFyYBRjYmwCKiwn51z2J43o1AHVDJ1YeHs="; + sha256 = "sha256-4yOA3OY8t8AQjtUlVwCS/UUWi9ri+qF+UoIh73Lohlg="; }; checkInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/teletype/default.nix b/pkgs/development/python-modules/teletype/default.nix index 999454edf83f..83cfb471e0d2 100644 --- a/pkgs/development/python-modules/teletype/default.nix +++ b/pkgs/development/python-modules/teletype/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -16,6 +17,10 @@ buildPythonPackage rec { hash = "sha256-uBppM4w9GlMgYqKFGw1Rcjvq+mnU04K3E74jCgK9YYo="; }; + nativeBuildInputs = [ + setuptools + ]; + # no tests doCheck = false; diff --git a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix index a32be33a37a8..2cb1629ffe67 100644 --- a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix +++ b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix @@ -1,4 +1,7 @@ -{ lib, fetchPypi, buildPythonPackage +{ lib +, fetchPypi +, buildPythonPackage +, setuptools , gviz-api , protobuf , werkzeug @@ -17,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-2LzXSdPrzS5G63ONvchdEL4aJD75eU9dF1pMqLcfbto="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ gviz-api protobuf diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index 4e7087deb326..d3cc30cdad68 100644 --- a/pkgs/development/python-modules/tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "tensorboard"; - version = "2.9.1"; + version = "2.10.0"; format = "wheel"; disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-uqcn95F3b55YQdNHEncgzu1LvVnDa0BgS5X7KuYCknY="; + hash = "sha256-dskaXolZzSIIzDLLF6DLACutq7ZqBqwq8Cp4EPSaWeM="; }; postPatch = '' @@ -41,8 +41,8 @@ buildPythonPackage rec { pushd unpacked/tensorboard-${version} substituteInPlace tensorboard-${version}.dist-info/METADATA \ - --replace "google-auth (<2,>=1.6.3)" "google-auth (<3,>=1.6.3)" \ - --replace "google-auth-oauthlib (<0.5,>=0.4.1)" "google-auth-oauthlib (<0.6,>=0.4.1)" + --replace "google-auth-oauthlib (<0.5,>=0.4.1)" "google-auth-oauthlib (<0.6,>=0.4.1)" \ + --replace "protobuf (<3.20,>=3.9.2)" "protobuf (>=3.9.2)" popd wheel pack ./unpacked/tensorboard-${version} diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/default.nix index b52a96a3ea5b..24fb681f3b6f 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/default.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "tensorflow-estimator"; - version = "2.9.0"; + version = "2.10.0"; format = "wheel"; src = fetchPypi { pname = "tensorflow_estimator"; inherit version format; - hash = "sha256-6XYrswL1G8HrLzXRnwGQpqLYCddU1d73iMQyj+N0Z0Q="; + hash = "sha256-8yTqF81X8W4zvxiHEdUHfmsuX1oSwyjW4BoHsjiI7c0="; }; propagatedBuildInputs = [ mock numpy absl-py ]; diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix index 5204e2158dc7..994d821d9a25 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -21,6 +21,11 @@ buildPythonPackage rec { ./build.patch ]; + postPatch = '' + substituteInPlace setup.py \ + --replace 'protobuf>=3.13,<4' 'protobuf>=3.13' + ''; + # Default build pulls in Bazel + extra deps, given the actual build # is literally three lines (see below) - replace it with custom build. preBuild = '' diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 338affcbf156..31fff4832052 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -76,7 +76,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.10.0-rc0"; + version = "2.10.0"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -190,7 +190,7 @@ let owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - hash = "sha256-zN8I0wxKrxWcI0RuOqDz6srdW0Q+kgaZhJdXM46N1e8="; + hash = "sha256-Y6cujiMoQXKQlsLBr7d0T278ltdd00IfsTRycJbRVN4="; }; # On update, it can be useful to steal the changes from gentoo @@ -445,7 +445,8 @@ in buildPythonPackage { -e "s/'gast[^']*',/'gast',/" \ -e "/'libclang[^']*',/d" \ -e "/'keras[^']*')\?,/d" \ - -e "/'tensorflow-io-gcs-filesystem[^']*',/d" + -e "/'tensorflow-io-gcs-filesystem[^']*',/d" \ + -e "s/'protobuf[^']*',/'protobuf',/" \ ''; # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow diff --git a/pkgs/development/python-modules/termcolor/default.nix b/pkgs/development/python-modules/termcolor/default.nix index e440dab114fa..b1cfc0dc0461 100644 --- a/pkgs/development/python-modules/termcolor/default.nix +++ b/pkgs/development/python-modules/termcolor/default.nix @@ -1,17 +1,34 @@ { lib , buildPythonPackage , fetchPypi +, hatch-vcs +, hatchling +, pytestCheckHook }: buildPythonPackage rec { pname = "termcolor"; - version = "1.1.0"; + version = "2.0.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"; + sha256 = "sha256-ayz3aekzZKJnbh3lanwM/yz1vQfzfpzICw3WMg6/44g="; }; + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + pythonImportsCheck = [ + "termcolor" + ]; + + checkInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Termcolor"; homepage = "https://pypi.python.org/pypi/termcolor"; diff --git a/pkgs/development/python-modules/termplotlib/default.nix b/pkgs/development/python-modules/termplotlib/default.nix index fde1080491e0..89fd114ad739 100644 --- a/pkgs/development/python-modules/termplotlib/default.nix +++ b/pkgs/development/python-modules/termplotlib/default.nix @@ -6,6 +6,7 @@ , exdown , numpy , gnuplot +, setuptools }: buildPythonPackage rec { @@ -19,6 +20,10 @@ buildPythonPackage rec { sha256 = "1qfrv2w7vb2bbjvd5lqfq57c23iqkry0pwmif1ha3asmz330rja1"; }; + nativeBuildInputs = [ + setuptools + ]; + format = "pyproject"; checkInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 79faa769ddf3..51ee2803f3cf 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.1.0"; + version = "8.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6q6pHcVsBBUWqCnEYEI6iu9TVwAWEMjWOVvOldglSgs="; + sha256 = "sha256-m5AoKYTzy6rJjgNn3xsa+eSDYjG8Bj361yQqnQ3VK80="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 2452c6bb4453..8e4bacad9aac 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2022.5.4"; + version = "2022.8.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sDFHoVhit8HZDUdDUZfxSb73pSwlrWfPH5tGX6pxuNI="; + hash = "sha256-PnTg/UiDhHfrz0Dgm3eAvQle5ZILIjj0heLGhGOj3LQ="; }; propagatedBuildInputs = [ @@ -40,6 +40,8 @@ buildPythonPackage rec { "test_write_ome" # Test file is missing "test_write_predictor" + "test_issue_imagej_hyperstack_arg" + "test_issue_description_overwrite" # AssertionError "test_write_bigtiff" "test_write_imagej_raw" diff --git a/pkgs/development/python-modules/tiler/default.nix b/pkgs/development/python-modules/tiler/default.nix index 0c1e44f1400d..de4517ff3278 100644 --- a/pkgs/development/python-modules/tiler/default.nix +++ b/pkgs/development/python-modules/tiler/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , numpy , tqdm , pytestCheckHook @@ -16,6 +17,10 @@ buildPythonPackage rec { sha256 = "sha256-2HWO/iJ9RCWNVmw2slu9F/+Mchk3evB5/F8EfbuMI/Y="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ numpy tqdm diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index 6ecacbca809d..b9454f9ad097 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , asgineer +, bcrypt , itemdb , jinja2 , markdown @@ -26,6 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ asgineer + bcrypt itemdb jinja2 markdown diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index 6430bef1aa88..6bd461db75a2 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.11.1"; + version = "0.11.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YZAfgf9AF5URGc0NHtm3rzHIIdaEXIxHdYe73NXlhU4="; + sha256 = "sha256-MjWpAQ+uVDI+cnw6wG+3IHUv5mNbNCbjedrsYPvUSoM="; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix index 603afe3ad59c..a9722b053bfb 100644 --- a/pkgs/development/python-modules/toposort/default.nix +++ b/pkgs/development/python-modules/toposort/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { @@ -13,6 +14,10 @@ buildPythonPackage rec { sha256 = "sha256-3cIYLEKRKkQFEb1/9dPmocq8Osy8Z0oyWMjEHL+7ISU="; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "toposort" ]; diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index cc9a96a1cba7..ea14b92abf5c 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.25.1"; + version = "3.26.0"; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-wTgyeBX1O8baT+VrrsXyXwBiKuae8/5OHjhXIOIkhvk="; + sha256 = "sha256-RPPDR8aMLGh5nX1E8YCPnTlvyKGlAMvGJCUzdceuEH4="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 81e447457c5a..6da72cde5ea5 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.64.0"; + version = "4.64.1"; src = fetchPypi { inherit pname version; - sha256 = "13a0spki37rdbx54nspcni3bpsp4d7p5ln570yipf1r01v9mbgj0"; + sha256 = "sha256-X09oKgBJUcG0ULx1PHEOkoDFdGzm/+3uJT3by/VM8eQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index 0a32f931d132..30bff404032e 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "traitlets"; - version = "5.3.0"; + version = "5.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-C7nx+fAXqo7Bh9ixsqemYmoqHYdxFrq6UqEpv6Ek+OI="; + sha256 = "sha256-PyxOQ14nFZL+Q5DxdG6laDbjoID4Tngz8PgB2WE/7Dk="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index 9e6b1a5056da..ebe3c858543e 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "traits"; - version = "6.3.2"; + version = "6.4.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "4520ef4a675181f38be4a5bab1b1d5472691597fe2cfe4faf91023e89407e2c6"; + sha256 = "sha256-eLssyv1gr/YGUVqsRt5kZooKgctcVMZQuYd6hBqp6BI="; }; # Circular dependency diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix index e50dec28ef50..24bfa14b8c4b 100644 --- a/pkgs/development/python-modules/transitions/default.nix +++ b/pkgs/development/python-modules/transitions/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "transitions"; - version = "0.8.11"; + version = "0.9.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eyDTKQbqTWDub2wfXcnJ8XiAJCXFsVUhPrDyXCd/BOQ="; + sha256 = "sha256-L1TRG9siV3nX5ykBHpOp+3F2aM49xl+NT1pde6L0jhA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index f681d2b369f0..ce39ed5d1a05 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "6.4.4"; + version = "6.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eTYm3anMKhgoaB8t5jald5XRD3PIVijJP4vmh0pA9lE="; + sha256 = "sha256-AF8LG68K+CvHpFOIoGbxD+lF7IVwBDk8K06I4uTNguI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ttls/default.nix b/pkgs/development/python-modules/ttls/default.nix index 9f5917749e67..ea1d3b789152 100644 --- a/pkgs/development/python-modules/ttls/default.nix +++ b/pkgs/development/python-modules/ttls/default.nix @@ -5,6 +5,7 @@ , fetchFromGitHub , poetry-core , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -28,6 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp colour + setuptools ]; # Module has no tests diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 6689a2ce80d3..fa6c4726222c 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch , python , appdirs , attrs @@ -44,7 +45,7 @@ buildPythonPackage rec { pname = "twisted"; - version = "22.4.0"; + version = "22.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -53,9 +54,17 @@ buildPythonPackage rec { pname = "Twisted"; inherit version; extension = "tar.gz"; - sha256 = "sha256-oEeZD1ffrh4L0rffJSbU8W3NyEN3TcEIt4xS8qXxNoA="; + hash = "sha256-5bYN458tHaFT++GHTYhf4/y9sh/MRG+nWaU+j8NRO+0="; }; + patches = [ + (fetchpatch { + name = "fix-test_openFileDescriptors.patch"; + url = "https://github.com/twisted/twisted/commit/47f47634940141466177261b20bb43c300531e38.patch"; + hash = "sha256-wacnF166PnZHXJEqTlPZUdDILJIVHOcnC2a34SQumvs="; + }) + ]; + __darwinAllowLocalNetworking = true; propagatedBuildInputs = [ @@ -76,9 +85,6 @@ buildPythonPackage rec { echo 'ListingTests.test_oldFile.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py echo 'ListingTests.test_oldSingleDigitDayOfMonth.skip = "Timezone issue"'>> src/twisted/conch/test/test_cftp.py - echo 'PTYProcessTestsBuilder_AsyncioSelectorReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py - echo 'PTYProcessTestsBuilder_SelectReactorTests.test_openFileDescriptors.skip = "invalid syntax"'>> src/twisted/internet/test/test_process.py - echo 'UNIXTestsBuilder_AsyncioSelectorReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py echo 'UNIXTestsBuilder_SelectReactorTests.test_sendFileDescriptorTriggersPauseProducing.skip = "sendFileDescriptor producer was not paused"'>> src/twisted/internet/test/test_unix.py @@ -91,8 +97,6 @@ buildPythonPackage rec { echo 'MulticastTests.test_multicast.skip = "Reactor was unclean"'>> src/twisted/test/test_udp.py echo 'MulticastTests.test_multiListen.skip = "No such device"'>> src/twisted/test/test_udp.py - echo 'DomishExpatStreamTests.test_namespaceWithWhitespace.skip = "syntax error: line 1, column 0"'>> src/twisted/words/test/test_domish.py - # not packaged substituteInPlace src/twisted/test/test_failure.py \ --replace "from cython_test_exception_raiser import raiser # type: ignore[import]" "raiser = None" diff --git a/pkgs/development/python-modules/twitter/default.nix b/pkgs/development/python-modules/twitter/default.nix index e9676c0fa707..64ca41f60c2f 100644 --- a/pkgs/development/python-modules/twitter/default.nix +++ b/pkgs/development/python-modules/twitter/default.nix @@ -2,25 +2,30 @@ , buildPythonPackage , fetchPypi , setuptools-scm +, certifi , pythonOlder }: buildPythonPackage rec { pname = "twitter"; - version = "1.19.4"; + version = "1.19.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-g7jSSEpsdEihGuHG9MJTNVFe6NyB272vEsvAocRo72U="; + hash = "sha256-gN3WmuLuuIMT/u3uoxvxGf1ueVQe5bN6u5xD0jMZThA="; }; nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ + certifi + ]; + doCheck = false; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/types-typed-ast/default.nix b/pkgs/development/python-modules/types-typed-ast/default.nix index ca45ec7039ba..485c6b0d5af1 100644 --- a/pkgs/development/python-modules/types-typed-ast/default.nix +++ b/pkgs/development/python-modules/types-typed-ast/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-typed-ast"; - version = "1.5.6"; + version = "1.5.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-UzmUeAz3KbdAwUdQZsRAdi8pqZvalRHU+mhdXuOoQ4k="; + hash = "sha256-FW+6ypA+hXH+cLsLVi/7qSp8vbe6yacTNRyifYgYO6c="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/typing-inspect/default.nix b/pkgs/development/python-modules/typing-inspect/default.nix index d54016049364..e79eb6823efa 100644 --- a/pkgs/development/python-modules/typing-inspect/default.nix +++ b/pkgs/development/python-modules/typing-inspect/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "typing-inspect"; - version = "0.7.1"; + version = "0.8.0"; src = fetchPypi { inherit version; pname = "typing_inspect"; - sha256 = "1al2lyi3r189r5xgw90shbxvd88ic4si9w7n3d9lczxiv6bl0z84"; + sha256 = "sha256-ix/wxACUO2FF34EZxBwkTKggfx8QycBXru0VYOSAbj0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix index ee8166abb946..c701d3683cdb 100644 --- a/pkgs/development/python-modules/tzdata/default.nix +++ b/pkgs/development/python-modules/tzdata/default.nix @@ -5,18 +5,23 @@ , pytest-subtests , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "tzdata"; - version = "2022.1"; + version = "2022.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-i1NqjsY9wHUTQrOYQZOjEY+Pyir+JXUrubf//TmFUtM="; + hash = "sha256-IfTw1yQVcu+n96T9q7BS5htV3EgnTmhCaXzN9SU+VFE="; }; + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook pytest-subtests diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 1a087c10d8f1..6fb474aefc2b 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.5.3"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-guhfOMvddC4E+oOmvpeG8GsXEfqLcSHVdtj3w8fF2Vs="; + sha256 = "sha256-LDG3ShCFbszyWNc8TQjlysTWBgo0uYNIkL/UK8sTg1A="; }; patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index ee2fede8e9f8..15e71e9544d9 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, isPyPy , pytestCheckHook , pythonOlder , setuptools-scm @@ -9,12 +8,12 @@ buildPythonPackage rec { pname = "ujson"; - version = "5.4.0"; - disabled = isPyPy || pythonOlder "3.7"; + version = "5.5.0"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-a5U+CUQeMHUEEwdV5b1rFYUBeNWR9mKSu6RgjE9/mwA="; + sha256 = "sha256-slB3qXHH2ke9aEapEqdH9pY3dtkHIMiGA7G1XYF5B4A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/unearth/default.nix b/pkgs/development/python-modules/unearth/default.nix new file mode 100644 index 000000000000..c12074136930 --- /dev/null +++ b/pkgs/development/python-modules/unearth/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +, cached-property +, packaging +, pdm-pep517 +, requests + +, flask +, pytest-httpserver +, pytestCheckHook +, requests-wsgi-adapter +, trustme +}: + +buildPythonPackage rec { + pname = "unearth"; + version = "0.6.1"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-S3v719NKEWc9gN+uf6u/khwTmqx4OD+wyhapDTtTpm4="; + }; + + nativeBuildInputs = [ + pdm-pep517 + ]; + + propagatedBuildInputs = [ + packaging + requests + ] ++ lib.optionals (pythonOlder "3.8") [ + cached-property + ]; + + checkInputs = [ + flask + pytest-httpserver + pytestCheckHook + requests-wsgi-adapter + trustme + ]; + + meta = with lib; { + homepage = "https://github.com/frostming/unearth"; + description = "A utility to fetch and download python packages"; + license = licenses.mit; + maintainers = with maintainers; [ betaboon ]; + }; +} diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 3cdbdd3a111b..ec63f5f21ed9 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.26.11"; + version = "1.26.12"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-6m6PshCxnZUPq5O2DJAJImxjoogIvIOG4FMB4liDrAo="; + hash = "sha256-P6ls9CPmmHmX/DJq6N85bbKot8ZndH1H3djsupH0p04="; }; # FIXME: remove backwards compatbility hack diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index da17c78a5eb9..c7b1d8103dd2 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -3,10 +3,12 @@ , buildPythonPackage , pythonOlder , fetchPypi +, cython , libuv , CoreServices , ApplicationServices - # Check Inputs + +# Check Inputs , aiohttp , psutil , pyopenssl @@ -15,14 +17,19 @@ buildPythonPackage rec { pname = "uvloop"; - version = "0.16.0"; + version = "0.17.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f74bc20c7b67d1c27c72601c78cf95be99d5c2cdd4514502b4f3eb0933ff1228"; + hash = "sha256-Dd9rr5zxGhoixxSH858Vss9461vefltF+7meip2RueE="; }; + nativeBuildInputs = [ + cython + ]; + buildInputs = [ libuv ] ++ lib.optionals stdenv.isDarwin [ @@ -32,9 +39,10 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; checkInputs = [ - aiohttp pytestCheckHook psutil + ] ++ lib.optionals (pythonOlder "3.11") [ + aiohttp ]; LIBUV_CONFIGURE_HOST = stdenv.hostPlatform.config; @@ -46,16 +54,21 @@ buildPythonPackage rec { "--strict" "--tb=native" # Depend on pyopenssl - "--deselect tests/test_tcp.py::Test_UV_TCPSSL::test_flush_before_shutdown" - "--deselect tests/test_tcp.py::Test_UV_TCPSSL::test_renegotiation" + "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_flush_before_shutdown" + "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_renegotiation" # test gets stuck in epoll_pwait on hydras aarch64 builders # https://github.com/MagicStack/uvloop/issues/412 - "--deselect tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data" + "--deselect=tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data" + # Tries to import cythonized file for which the .pyx file is not shipped via PyPi + "--deselect=tests/test_libuv_api.py::Test_UV_libuv::test_libuv_get_loop_t_ptr" + # Tries to run "env", but fails to find it + "--deselect=tests/test_process.py::Test_UV_Process::test_process_env_2" + "--deselect=tests/test_process.py::Test_AIO_Process::test_process_env_2" ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # Flaky test: https://github.com/MagicStack/uvloop/issues/412 - "--deselect tests/test_tcp.py::Test_UV_TCPSSL::test_shutdown_timeout_handler_not_set" + "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_shutdown_timeout_handler_not_set" # Broken: https://github.com/NixOS/nixpkgs/issues/160904 - "--deselect tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost" + "--deselect=tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index 8dbc7b50546e..9abd727e725c 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "vcrpy"; - version = "4.2.0"; + version = "4.2.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-lFILhvt2WSWtyMd/+TToml4VbCjnSjFDICF+8bRUr+A="; + sha256 = "sha256-fNPoGixJLgHCgfGAvMKoa1ILFz0rZWy12J2ZR1Qj4BM="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 3fba7cdb50c5..f0b365761f6c 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.15.1"; + version = "20.16.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KIFxE0ov87+xovVPEZ53zRuBwp/BJlojVvPo0Ux9WMQ="; + sha256 = "sha256-In6huZlP3F6jGXe6M4PvKW10cuqFvp1nMuQqkcBOgNo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/w3lib/default.nix b/pkgs/development/python-modules/w3lib/default.nix index d7074269e6a9..9c98f4d0926c 100644 --- a/pkgs/development/python-modules/w3lib/default.nix +++ b/pkgs/development/python-modules/w3lib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "w3lib"; - version = "1.22.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1pv02lvvmgz2qb61vz1jkjc04fgm4hpfvaj5zm4i3mjp64hd1mha"; + sha256 = "sha256-E98V+MF7Fj3g/V+qiSwa0UPhkN/L25hTS7l16zfGx9Y="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index 16c89ae63a0d..2f751e8105e4 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "wasabi"; - version = "0.9.1"; + version = "0.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rabxPptw7ya/lfrQ/r396+IAXimgitWPS7rjg6lymM8="; + sha256 = "sha256-yONyeBvhknKUI4KxTZkxTRdVGNeCIFfLepcBDEJZ0kk="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix index a73703f12a11..1e1823095b0b 100644 --- a/pkgs/development/python-modules/websocket-client/default.nix +++ b/pkgs/development/python-modules/websocket-client/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "websocket-client"; - version = "1.3.3"; + version = "1.4.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1YxfKE1qm/g3natCMln+j4W3DV+l0pFtV5GoRZSxIrE="; + sha256 = "sha256-+WEetlyCQaZ/s3O+8ECzz4rTd6n2VGoStiC2UR6Oqe8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wheel-filename/default.nix b/pkgs/development/python-modules/wheel-filename/default.nix index 3140870289d8..d4dd51ab2c89 100644 --- a/pkgs/development/python-modules/wheel-filename/default.nix +++ b/pkgs/development/python-modules/wheel-filename/default.nix @@ -1,9 +1,9 @@ { lib -, attrs , buildPythonPackage , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -20,8 +20,8 @@ buildPythonPackage rec { hash = "sha256-M3XGHG733X5qKuMS6mvFSFHYOwWPaBMXw+w0eYo6ByE="; }; - buildInputs = [ - attrs + nativeBuildInputs = [ + setuptools ]; checkInputs = [ diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index 7609eb376f1c..7b077d14c58e 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -1,34 +1,31 @@ { lib , buildPythonPackage , fetchPypi +, jupyter-packaging , notebook , ipywidgets }: buildPythonPackage rec { pname = "widgetsnbextension"; - version = "3.6.1"; + version = "4.0.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-nISuZMKJPHy+Lqr8dQUiGnlcJ9aJOEVANKxIcxmnWxA="; + hash = "sha256-NIJIZMBisLMDCteCENta5qOWDfth1bJ1YtZjF3TeAoY="; }; - # setup.py claims to require notebook, but the source doesn't have any imports - # in it. - postPatch = '' - substituteInPlace setup.py --replace "'notebook>=4.4.1'," "" - ''; - - propagatedBuildInputs = [ ]; + nativeBuildInputs = [ + jupyter-packaging + ]; # No tests in archive doCheck = false; meta = { description = "IPython HTML widgets for Jupyter"; - homepage = "http://ipython.org/"; + homepage = "https://github.com/jupyter-widgets/ipywidgets/tree/master/python/widgetsnbextension"; license = ipywidgets.meta.license; # Build from same repo maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/wsgidav/default.nix b/pkgs/development/python-modules/wsgidav/default.nix index 882f4091040f..4c61b476486e 100644 --- a/pkgs/development/python-modules/wsgidav/default.nix +++ b/pkgs/development/python-modules/wsgidav/default.nix @@ -10,6 +10,7 @@ , python-pam , pyyaml , requests +, setuptools , webtest }: @@ -27,6 +28,10 @@ buildPythonPackage rec { hash = "sha256-LQdS9d2DB4PXqRSzmtZCSyCQI47ncLCG+RSB+goZYoA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ defusedxml jinja2 diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index bcc9428b460b..ce9f0c0d7a37 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "wsproto"; - version = "1.1.0"; + version = "1.2.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ouVr/Vx82DwTadg7X+zNbTd5i3SHKGbmJhbg7PERvag="; + sha256 = "sha256-rVZfJuy5JYij5DvD2WFk3oTNmQJIKxMNDduqlmSoUGU="; }; propagatedBuildInputs = [ h11 ]; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 5d0ac813e498..2d10f0ddb572 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "xarray"; - version = "2022.3.0"; + version = "2022.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OYNEv30XBHeqzv9wIQ4R69aa9rFW/hOXgFTSXEhylEA="; + sha256 = "sha256-ECjRmEk/ZrsVvTXc/dEd79gxy+469lif/xb0G93WfoQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION="${version}"; diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/pkgs/development/python-modules/xlsx2csv/default.nix index e22c0d965919..21a40f0c35f3 100644 --- a/pkgs/development/python-modules/xlsx2csv/default.nix +++ b/pkgs/development/python-modules/xlsx2csv/default.nix @@ -1,17 +1,23 @@ { lib , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { pname = "xlsx2csv"; - version = "0.7.8"; + version = "0.8.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "c3aaf0c5febd9c5e48488026e7a58af37a67bf3da5e221cc57d371328b3b7dd3"; + sha256 = "sha256-LCaOUJt3ZspKJPLzYwLpGHBcXq0vzeP0vV8cphUvfiw="; }; + nativeBuildInputs = [ + setuptools + ]; + meta = with lib; { homepage = "https://github.com/dilshod/xlsx2csv"; description = "Convert xlsx to csv"; diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix index 0224c03ab3e8..1aec0cc114ec 100644 --- a/pkgs/development/python-modules/xmlsec/default.nix +++ b/pkgs/development/python-modules/xmlsec/default.nix @@ -15,19 +15,14 @@ buildPythonPackage rec { pname = "xmlsec"; - version = "1.3.12"; + version = "1.3.13"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "2c86ac6ce570c9e04f04da0cd5e7d3db346e4b5b1d006311606368f17c756ef9"; + sha256 = "sha256-kW9deOgEH2zZORq7plnajJSk/vcZbRJtQK8f9Bfyz4Y="; }; - # https://github.com/mehcode/python-xmlsec/issues/84#issuecomment-632930116 - patches = [ - ./reset-lxml-in-tests.patch - ]; - nativeBuildInputs = [ pkg-config pkgconfig setuptools-scm ]; buildInputs = [ xmlsec libxslt libxml2 libtool ]; diff --git a/pkgs/development/python-modules/xmlsec/reset-lxml-in-tests.patch b/pkgs/development/python-modules/xmlsec/reset-lxml-in-tests.patch deleted file mode 100644 index 0968583faa63..000000000000 --- a/pkgs/development/python-modules/xmlsec/reset-lxml-in-tests.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/tests/base.py b/tests/base.py -index b05de1d..5ec356f 100644 ---- a/tests/base.py -+++ b/tests/base.py -@@ -94,6 +94,7 @@ class TestMemoryLeaks(unittest.TestCase): - - def load_xml(self, name, xpath=None): - """returns xml.etree""" -+ etree.set_default_parser(parser=etree.XMLParser()) - root = etree.parse(self.path(name)).getroot() - if xpath is None: - return root -diff --git a/tests/test_doc_examples.py b/tests/test_doc_examples.py -index 2fc490f..53d2377 100644 ---- a/tests/test_doc_examples.py -+++ b/tests/test_doc_examples.py -@@ -42,3 +42,5 @@ def test_doc_example(example): - """ - with cd(example.parent): - runpy.run_path(str(example)) -+ from lxml import etree -+ etree.set_default_parser(parser=etree.XMLParser()) diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index b82e87016159..58d47d1fff9c 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.27.1"; + version = "1.28.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5ogyS1hWCraKGjz/LApHTj/tNx3+jaXRuYF7ffVQOc4="; + sha256 = "sha256-nj2N3RbQWDIUxf3/6AbJNECGch8QdDX2i62ZDlqIgms="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix index a82bf972546d..42caebb92e8b 100644 --- a/pkgs/development/python-modules/yangson/default.nix +++ b/pkgs/development/python-modules/yangson/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "yangson"; - version = "1.4.13"; + version = "1.4.14"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SuKpSwIjZioyqmxlcKJ+UXP+ADfJwUwCCttmMAiEkZ4="; + sha256 = "sha256-OMqtZ/kPj7ge235nuyrfCzawG6AOAqfJPzQHF8cW4Ok="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 08866ac39074..249bf974322e 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "yarl"; - version = "1.7.2"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RTmbRtYMJTMnpGDpmFZ1IAn87l9dPICy98DK4cONVt0="; + sha256 = "sha256-r4h4RbjC4GDrVgX/crby3SqrenYTeTc/2J0xT0dSq78="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zope-cachedescriptors/default.nix b/pkgs/development/python-modules/zope-cachedescriptors/default.nix index 4cbf9386b6cb..7696e078343e 100644 --- a/pkgs/development/python-modules/zope-cachedescriptors/default.nix +++ b/pkgs/development/python-modules/zope-cachedescriptors/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "zope-cachedescriptors"; - version = "4.3.1"; + version = "4.4"; format = "setuptools"; src = fetchPypi { pname = "zope.cachedescriptors"; inherit version; - sha256 = "1f4d1a702f2ea3d177a1ffb404235551bb85560100ec88e6c98691734b1d194a"; + sha256 = "sha256-1FxIdIb334HymS8aAJEmJL93JZ2DxdmKp2tnhxbj0Ro="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix index 993568f6ffd9..f1bc3bf72f74 100644 --- a/pkgs/development/python-modules/zope-hookable/default.nix +++ b/pkgs/development/python-modules/zope-hookable/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "zope-hookable"; - version = "5.1.0"; + version = "5.2"; src = fetchPypi { pname = "zope.hookable"; inherit version; - sha256 = "8fc3e6cd0486c6af48e3317c299def719b57538332a194e0b3bc6a772f4faa0e"; + sha256 = "sha256-TDAYvPKznPXMz0CCb3mbS4wUAFbbeA+WywyjMqJDvSk="; }; checkInputs = [ zope_testing ]; diff --git a/pkgs/development/python-modules/zope_size/default.nix b/pkgs/development/python-modules/zope_size/default.nix index 6945dddceaa3..bf7a44f8a026 100644 --- a/pkgs/development/python-modules/zope_size/default.nix +++ b/pkgs/development/python-modules/zope_size/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "zope.size"; - version = "4.3"; + version = "4.4"; src = fetchPypi { inherit pname version; - sha256 = "6f3eb687c9181e3b7400c5cd4d4209a2f676475b7b85c99ee11de2404b3493ec"; + sha256 = "sha256-bhv3QJdZtNpyAuL6/aZXWD1Acx8661VweWaItJPpkHk="; }; propagatedBuildInputs = [ zope_i18nmessageid zope_interface ]; diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index 273326baeb2a..1b838354c4cf 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zope.testrunner"; - version = "5.5"; + version = "5.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/LhQZWGIoM380kmjt9Mw1JsVv7+DoQ8YW//cD6uQE+U="; + sha256 = "sha256-ahDTg1RZ7tO8hDHyGq9gS8dU/4OSopeXzSDlqUHBQ74="; }; propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index 8599c7495ad9..db33c7f36772 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "zstd"; - version = "1.5.2.5"; + version = "1.5.2.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PEKbFmo7MksJg7/1OuCSi5dkxpOgF/Yv+2sg5hNeM48="; + sha256 = "sha256-9ECFjRmIkOX/UX3/MtFejDG7c1BqiW+br20BTv5i9/w="; }; postPatch = '' diff --git a/pkgs/development/python2-modules/numpy/default.nix b/pkgs/development/python2-modules/numpy/default.nix index b1d71bd66f36..0bb01ef6812a 100644 --- a/pkgs/development/python2-modules/numpy/default.nix +++ b/pkgs/development/python2-modules/numpy/default.nix @@ -9,7 +9,7 @@ , writeTextFile , isPyPy , cython -, setuptoolsBuildHook +, setuptools }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -39,7 +39,7 @@ let in buildPythonPackage rec { pname = "numpy"; version = "1.16.6"; - format = "pyproject.toml"; + format = "pyproject"; src = fetchPypi { inherit pname version; @@ -47,7 +47,7 @@ in buildPythonPackage rec { sha256 = "e5cf3fdf13401885e8eea8170624ec96225e2174eb0c611c6f26dd33b489e3ff"; }; - nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ]; + nativeBuildInputs = [ gfortran pytest cython setuptools ]; buildInputs = [ blas lapack ]; patches = lib.optionals python.hasDistutilsCxxPatch [ @@ -73,7 +73,7 @@ in buildPythonPackage rec { checkPhase = '' runHook preCheck - pushd dist + pushd "$out" ${python.interpreter} -c 'import numpy; numpy.test("fast", verbose=10)' popd runHook postCheck diff --git a/pkgs/development/python2-modules/pygtk/default.nix b/pkgs/development/python2-modules/pygtk/default.nix index 08e1520c4c85..20e9498ea30e 100644 --- a/pkgs/development/python2-modules/pygtk/default.nix +++ b/pkgs/development/python2-modules/pygtk/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { pname = "pygtk"; outputs = [ "out" "dev" ]; version = "2.24.0"; + format = "other"; disabled = isPy3k; diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 04f97c68c6a6..4961173658ed 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -1,14 +1,31 @@ -{ buildRubyGem, ruby }: +{ lib, buildRubyGem, ruby, writeScript }: buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.3.20"; - source.sha256 = "sha256-gJJ3vHzrJo6XpHS1iwLb77jd9ZB39GGLcOJQSrgaBHw="; + version = "2.3.22"; + source.sha256 = "sha256-vOfZB6poOsiYPULaGhUXD9aSxlBGeK2ghF70ouz0IJ4="; dontPatchShebangs = true; + passthru.updateScript = writeScript "gem-update-script" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts jq + + set -eu -o pipefail + + latest_version=$(curl -s https://rubygems.org/api/v1/gems/${gemName}.json | jq --raw-output .version) + update-source-version ${gemName} "$latest_version" + ''; + postFixup = '' sed -i -e "s/activate_bin_path/bin_path/g" $out/bin/bundle ''; + + meta = with lib; { + description = "Manage your Ruby application's gem dependencies"; + homepage = "https://bundler.io"; + license = licenses.mit; + maintainers = with maintainers; [anthonyroussel]; + }; } diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index 922524ac4d5b..6a0fb74af51f 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , zlib @@ -8,9 +9,7 @@ , elfutils , python3 , libiberty -# TODO: switch back to latest versions when upstream ports -# to binutils-2.39: https://github.com/SimonKagstrom/kcov/issues/381 -, libopcodes_2_38 +, libopcodes , runCommand , gcc , rustc @@ -29,10 +28,20 @@ let sha256 = "sha256-6LoIo2/yMUz8qIpwJVcA3qZjjF+8KEM1MyHuyHsQD38="; }; + patches = [ + # Pull upstream patch for binutils-2/39 support: + # https://github.com/SimonKagstrom/kcov/pull/383 + (fetchpatch { + name = "binutils-2.39.patch"; + url = "https://github.com/SimonKagstrom/kcov/commit/fd1a4fd2f02cee49afd74e427e38c61b89154582.patch"; + hash = "sha256-licQkC8qDg2i6No3j0yKEU6i+Owi4lhrnfGvETkzz7w="; + }) + ]; + preConfigure = "patchShebangs src/bin-to-c-source.py"; nativeBuildInputs = [ cmake pkg-config python3 ]; - buildInputs = [ curl zlib elfutils libiberty libopcodes_2_38 ]; + buildInputs = [ curl zlib elfutils libiberty libopcodes ]; strictDeps = true; diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index f459468de20a..733bd2f969c7 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { license = with lib.licenses; [ mit bsd2 ]; maintainers = with lib.maintainers; [ pierron thoughtpolice ]; - platforms = lib.platforms.x86; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/development/tools/build-managers/cmake/check-pc-files-hook.sh b/pkgs/development/tools/build-managers/cmake/check-pc-files-hook.sh new file mode 100644 index 000000000000..94d1b7b53556 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/check-pc-files-hook.sh @@ -0,0 +1,18 @@ +cmakePcfileCheckPhase() { + while IFS= read -rd $'\0' file; do + grepout=$(grep --line-number '}//nix/store' "$file" || true) + if [ -n "$grepout" ]; then + { + echo "Broken paths found in a .pc file! $file" + echo "The following lines have issues (specifically '//' in paths)." + echo "$grepout" + echo "It is very likely that paths are being joined improperly." + echo 'ex: "${prefix}/@CMAKE_INSTALL_LIBDIR@" should be "@CMAKE_INSTALL_FULL_LIBDIR@"' + echo "Please see https://github.com/NixOS/nixpkgs/issues/144170 for more details." + exit 1 + } 1>&2 + fi + done < <(find "${!outputDev}" -iname "*.pc" -print0) +} + +postFixupHooks+=(cmakePcfileCheckPhase) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 7badaccf8ab1..722c8b63034b 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -61,13 +61,15 @@ stdenv.mkDerivation rec { outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" "info" ]; setOutputFlags = false; - setupHook = ./setup-hook.sh; + setupHooks = [ + ./setup-hook.sh + ./check-pc-files-hook.sh + ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ + nativeBuildInputs = setupHooks ++ [ pkg-config - setupHook ] ++ lib.optionals buildDocs [ texinfo ] ++ lib.optionals qt5UI [ wrapQtAppsHook ]; diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index abc3dbefb9c2..ffa582b56187 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "ninja"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "ninja-build"; repo = "ninja"; rev = "v${version}"; - sha256 = "sha256-xZwMdwvg29lauHKk9M318Vz7pXZFhf3kFcyOTBdjmJM="; + sha256 = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI="; }; nativeBuildInputs = [ python3 re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ]; diff --git a/pkgs/development/tools/check-jsonschema/default.nix b/pkgs/development/tools/check-jsonschema/default.nix index 068bc752d32c..dd49074300af 100644 --- a/pkgs/development/tools/check-jsonschema/default.nix +++ b/pkgs/development/tools/check-jsonschema/default.nix @@ -4,13 +4,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "check-jsonschema"; - version = "0.16.2"; + version = "0.18.3"; src = fetchFromGitHub { owner = "python-jsonschema"; repo = "check-jsonschema"; rev = version; - sha256 = "sha256-rPjXua5kITr+I+jqeAO2iGUFVhjkLnQkXlUzRvkXduA="; + sha256 = "sha256-9Ejcxr/22rJu8JoC7WspLfzF08elz4TaGagDeV0zIXk="; }; propagatedBuildInputs = [ @@ -27,6 +27,11 @@ buildPythonApplication rec { responses ]; + pytestFlagsArray = [ + # DeprecationWarning: Accessing jsonschema.draft3_format_checker is deprecated and will be removed in a future release. Instead, use the FORMAT_CHECKER attribute on the corresponding Validator. + "-W" "ignore::DeprecationWarning" + ]; + preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 export no_proxy='*'; diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 1ecd394268cd..7dd67dcebd33 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { doCheck = false; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd fly \ --bash <($out/bin/fly completion --shell bash) \ --fish <($out/bin/fly completion --shell fish) \ diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 5a8a6c4a0754..5dcc556660fa 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -43,13 +43,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.296.2"; + version = "2.297.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-Cpg17N4LXjMpKx9SB6Bq/1eKJH5B8yVDUwjxak7xykY="; + hash = "sha256-Bp8uNBnjhP3AR29N7C4cPmOp6FeJ+zny4+5Gmn/PGTA="; }; nativeBuildInputs = [ @@ -336,7 +336,7 @@ stdenv.mkDerivation rec { description = "Self-hosted runner for GitHub Actions"; homepage = "https://github.com/actions/runner"; license = licenses.mit; - maintainers = with maintainers; [ veehaitch newam kfollesdal ]; + maintainers = with maintainers; [ veehaitch newam kfollesdal aanderse ]; platforms = attrNames runtimeIds; }; } diff --git a/pkgs/development/tools/continuous-integration/github-runner/deps.nix b/pkgs/development/tools/continuous-integration/github-runner/deps.nix index 9af18a7d04e8..55ecd3f5d8cc 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/deps.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/deps.nix @@ -3,11 +3,11 @@ (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.4"; sha256 = "00fkczf69z2rwarcd8kjjdp47517a0ca6lggn72qbilsp03a5scj"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.6"; sha256 = "1z50gqg0jimk98yd0zr2vxn087h3h1qn08fdcqbaxfgpcw30yi87"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0ndah9cqkgswhi60wrnni10j1d2hdg8jljij83lk1wbfqbng86jm"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.2.0"; sha256 = "sha256-ckbeFz5ArvZUE7w3EYiciBIGlmbmjwpxqWeAOEKgHgU="; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "5.2.1"; sha256 = "1gpka9jm2gl6f07pcwzwvaxw9xq1a19i9fskn0qs921c5grhlp3g"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "5.2.1"; sha256 = "03v6145vr1winq8xxfikydicds4f10qmy1ybyz2gfimnzzx51w00"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.2.0"; sha256 = "sha256-IXyc+oc7EwalDaq+UkkWx3bhZC/H+SZ8rTHMi87Allk="; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.6"; sha256 = "0hlxq0k60ras0wj7d7q94dxd8nzjcry0kixxs6z1hyrbm4q0y3ls"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.6"; sha256 = "117rz4gm7ihns5jlc2x05h7kdcgrl0ic4v67dzfbbr9kpra1bmcw"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0fjbjh7yxqc9h47ix37y963xi9f9y99jvl26cw3x3kvjlb8x0bgj"; }) @@ -22,8 +22,8 @@ (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1-rc2-24027"; sha256 = "1j1458jska7540ng7fdf5i06k2vy71mxl5dld4x5s8gfndxpdzdj"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) (fetchNuGet { pname = "Microsoft.NETCore.Windows.ApiSets"; version = "1.0.1-rc2-24027"; sha256 = "034m9p417iq3yzipg393wp4bddsh80di9iad78vvvh7w5difdv0x"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.0.0"; sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.0.0"; sha256 = "06mn31cgpp7d8lwdyjanh89prc66j37dchn74vrd9s588rq0y70r"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.2.0"; sha256 = "sha256-OwtuyH4rBS2S2mp1rlUQcVxFPS04OWBcUa59+VjVBVA="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.2.0"; sha256 = "sha256-ty2fxo3mQESh+cpsGfhSpMCEqmvPdzZE0EK8BkeHaIg="; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1-rc2-24027"; sha256 = "1rvb076s4ksvmbvnxi4sv2f9f22izqp2rca0scjqya5x1qhcgkp0"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.4.0"; sha256 = "088j2anh1rnkxdcycw5kgp97ahk7cj741y6kask84880835arsb6"; }) @@ -34,7 +34,7 @@ (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) diff --git a/pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch b/pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch index 2bfda30e3244..a2599afe4471 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch +++ b/pkgs/development/tools/continuous-integration/github-runner/patches/dir-proj.patch @@ -1,21 +1,21 @@ -From 4267ee7fa5169b4fd5ce732118769e559806a390 Mon Sep 17 00:00:00 2001 -From: Vincent Haupert -Date: Sat, 13 Mar 2021 21:52:03 +0100 -Subject: [PATCH] Patch dir.proj +From 5a850bb7946ce5c0620ac5f072d93a77cc064219 Mon Sep 17 00:00:00 2001 +From: Aaron Andersen +Date: Thu, 29 Sep 2022 10:12:28 -0400 +Subject: [PATCH] [PATCH] Patch dir.proj Don't execute Git for GitInfoCommitHash property Don't restore for build target Don't restore for test target --- - src/dir.proj | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) + src/dir.proj | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/dir.proj b/src/dir.proj -index 1c91e0c..8b27d3f 100644 +index 056a312..f029720 100644 --- a/src/dir.proj +++ b/src/dir.proj @@ -2,9 +2,6 @@ - - @@ -24,30 +24,22 @@ index 1c91e0c..8b27d3f 100644 -@@ -39,14 +36,13 @@ +@@ -41,14 +38,13 @@ - - + - - + -+ ++ -@@ -84,4 +80,4 @@ - - - -- -\ No newline at end of file -+ -- -2.30.1 - +2.36.2 diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index eb2e1f6055b2..8cdb533da8e0 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "doxygen"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "doxygen"; repo = "doxygen"; rev = "Release_${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-Dnr8d+ngSBkgL/BITvsvoERAHQyEXCoQDltbnQ2nXKM="; + sha256 = "sha256-968LGj2b8qLs/YQ1DxC1s/xf5qUwnrd8xu5iKrqNN+Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix index 06bd51bd31c5..f3bededcda8c 100644 --- a/pkgs/development/tools/metal-cli/default.nix +++ b/pkgs/development/tools/metal-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "metal-cli"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+G3PBYeez1dcUELc4j6CRgxDCDWCxpOfI52QlvMVkrY="; + sha256 = "sha256-bXea270m0+JAQ3j+JhkiVNds2X7rogcIqJIqRK7DS2g="; }; - vendorSha256 = "sha256-rf0EWMVvuoPUMTQKi/FnUbE2ZAs0C7XosHAzCgwB5wg="; + vendorSha256 = "sha256-bCVHPpdQSlEU7smoQzpiLZMQVPUQO8UhylrpDf0MSmk="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/millet/default.nix index ab22e97c5bcd..abd786167a44 100644 --- a/pkgs/development/tools/millet/default.nix +++ b/pkgs/development/tools/millet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.3.9"; + version = "0.3.11"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mG8vpcBcFACfVa8IFuax81pDeiloi0ustbAy6MOYpZs="; + sha256 = "sha256-6xuqzeYTbBirkleyrza4y1i2m4sWhTHizq5BtAtoIHo="; }; - cargoSha256 = "sha256-QoD5c2QZRKRO0gV+buvJN6d2RgfkA65AHibwJ4Kg/q8="; + cargoSha256 = "sha256-DZCeEd/bg8/IlJ/3XgPc28tI8w8j/nH99Bj3HffuqtU="; postPatch = '' rm .cargo/config.toml @@ -27,5 +27,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/azdavis/millet/raw/v${version}/docs/changelog.md"; license = [ licenses.mit /* or */ licenses.asl20 ]; maintainers = with maintainers; [ marsam ]; + mainProgram = "lang-srv"; }; } diff --git a/pkgs/development/tools/misc/binutils/0001-Revert-libtool.m4-fix-the-NM-nm-over-here-B-option-w.patch b/pkgs/development/tools/misc/binutils/0001-Revert-libtool.m4-fix-the-NM-nm-over-here-B-option-w.patch new file mode 100644 index 000000000000..b5083d81d71c --- /dev/null +++ b/pkgs/development/tools/misc/binutils/0001-Revert-libtool.m4-fix-the-NM-nm-over-here-B-option-w.patch @@ -0,0 +1,42 @@ +This reverts upstream commit caf606c90d55305967b9253447dda93d2f1835ab +until https://sourceware.org/PR29547 is fixed. + +--- a/libtool.m4 ++++ b/libtool.m4 +@@ -3214,31 +3214,25 @@ AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, + lt_nm_to_check="$lt_nm_to_check nm" + fi + fi +- for lt_tmp_nm in "$lt_nm_to_check"; do ++ for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. +- # Strip out any user-provided options from the nm to test twice, +- # the first time to test to see if nm (rather than its options) has +- # an explicit path, the second time to yield a file which can be +- # nm'ed itself. +- tmp_nm_path="`$ECHO "$lt_tmp_nm" | sed 's, -.*$,,'`" +- case "$tmp_nm_path" in ++ case "$lt_tmp_nm" in + */*|*\\*) tmp_nm="$lt_tmp_nm";; + *) tmp_nm="$ac_dir/$lt_tmp_nm";; + esac +- tmp_nm_to_nm="`$ECHO "$tmp_nm" | sed 's, -.*$,,'`" +- if test -f "$tmp_nm_to_nm" || test -f "$tmp_nm_to_nm$ac_exeext" ; then ++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored +- case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in ++ case `"$tmp_nm" -B "$tmp_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in + *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) +- case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in ++ case `"$tmp_nm" -p "$tmp_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in + *$tmp_nm*) + lt_cv_path_NM="$tmp_nm -p" + break diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index a25c1ce87b07..e5ecc365d48b 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -32,12 +32,12 @@ assert enableGold -> execFormatIsELF stdenv.targetPlatform; let inherit (stdenv) buildPlatform hostPlatform targetPlatform; - version = "2.38"; + version = "2.39"; srcs = { normal = fetchurl { url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; - sha256 = "sha256-Bw7HHPB3pqWOC5WfBaCaNQFTeMLYpR6Q866r/jBZDvg="; + sha256 = "sha256-2iSoT+8iAQLdJAQt8G/eqFHCYUpTd/hu/6KPM7exYUg="; }; vc4-none = fetchFromGitHub { owner = "itszor"; @@ -69,7 +69,9 @@ stdenv.mkDerivation { ./deterministic.patch - # Breaks nm BSD flag detection + # Breaks nm BSD flag detection, heeds an upstream fix: + # https://sourceware.org/PR29547 + ./0001-Revert-libtool.m4-fix-the-NM-nm-over-here-B-option-w.patch ./0001-Revert-libtool.m4-fix-nm-BSD-flag-detection.patch # Required for newer macos versions @@ -83,11 +85,12 @@ stdenv.mkDerivation { # cross-compiling. ./always-search-rpath.patch - # Fixed in 2.39 - # https://sourceware.org/bugzilla/show_bug.cgi?id=28885 - # https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=99852365513266afdd793289813e8e565186c9e6 - # https://github.com/NixOS/nixpkgs/issues/170946 - ./deterministic-temp-prefixes.patch + # Upstream backport of https://sourceware.org/PR29451: + # Don't emit 0-sized debug entries for objects without size. + # Without the change elfutils on i686-linux fail dwarf validity test: + # https://sourceware.org/PR29450 + # Remove once 2.40 releases. + ./gas-dwarf-zero-PR29451.patch ] ++ lib.optional targetPlatform.isiOS ./support-ios.patch # This patch was suggested by Nick Clifton to fix @@ -105,17 +108,6 @@ stdenv.mkDerivation { (if stdenv.targetPlatform.isMusl then substitute { src = ./mips64-default-n64.patch; replacements = [ "--replace" "gnuabi64" "muslabi64" ]; } else ./mips64-default-n64.patch) - # On PowerPC, when generating assembly code, GCC generates a `.machine` - # custom instruction which instructs the assembler to generate code for this - # machine. However, some GCC versions generate the wrong one, or make it - # too strict, which leads to some confusing "unrecognized opcode: wrtee" - # or "unrecognized opcode: eieio" errors. - # - # To remove when binutils 2.39 is released. - # - # Upstream commit: - # https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=cebc89b9328eab994f6b0314c263f94e7949a553 - ++ lib.optional stdenv.targetPlatform.isPower ./ppc-make-machine-less-strict.patch ; outputs = [ "out" "info" "man" ]; @@ -190,6 +182,11 @@ stdenv.mkDerivation { # for us to do is not leave it to chance, and force the program prefix to be # what we want it to be. "--program-prefix=${targetPrefix}" + + # Unconditionally disable: + # - musl target needs porting: https://sourceware.org/PR29477 + # - all targets rely on javac: https://sourceware.org/PR29479 + "--disable-gprofng" ] ++ lib.optionals withAllTargets [ "--enable-targets=all" ] ++ lib.optionals enableGold [ "--enable-gold" "--enable-plugins" ] @@ -201,10 +198,6 @@ stdenv.mkDerivation { # Fails doCheck = false; - # Remove on next bump. It's a vestige of past conditional. Stays here to avoid - # mass rebuild. - postFixup = ""; - # Break dependency on pkgsBuildBuild.gcc when building a cross-binutils stripDebugList = if stdenv.hostPlatform != stdenv.targetPlatform then "bin lib ${stdenv.hostPlatform.config}" else null; diff --git a/pkgs/development/tools/misc/binutils/deterministic-temp-prefixes.patch b/pkgs/development/tools/misc/binutils/deterministic-temp-prefixes.patch deleted file mode 100644 index 3c27340b9c04..000000000000 --- a/pkgs/development/tools/misc/binutils/deterministic-temp-prefixes.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 99852365513266afdd793289813e8e565186c9e6 Mon Sep 17 00:00:00 2001 -From: Nick Clifton -Date: Wed, 23 Mar 2022 11:39:49 +0000 -Subject: [PATCH] dlltool: Use the output name as basis for deterministic temp - prefixes - - PR 28885 - * dlltool.c (main): use imp_name rather than dll_name when - generating a temporary file name. ---- - binutils/ChangeLog | 9 +++++++++ - binutils/dlltool.c | 7 ++++--- - 2 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/binutils/dlltool.c b/binutils/dlltool.c -index d95bf3f5470..89871510b45 100644 ---- a/binutils/dlltool.c -+++ b/binutils/dlltool.c -@@ -3992,10 +3992,11 @@ main (int ac, char **av) - if (tmp_prefix == NULL) - { - /* If possible use a deterministic prefix. */ -- if (dll_name) -+ if (imp_name || delayimp_name) - { -- tmp_prefix = xmalloc (strlen (dll_name) + 2); -- sprintf (tmp_prefix, "%s_", dll_name); -+ const char *input = imp_name ? imp_name : delayimp_name; -+ tmp_prefix = xmalloc (strlen (input) + 2); -+ sprintf (tmp_prefix, "%s_", input); - for (i = 0; tmp_prefix[i]; i++) - if (!ISALNUM (tmp_prefix[i])) - tmp_prefix[i] = '_'; --- -2.31.1 - diff --git a/pkgs/development/tools/misc/binutils/gas-dwarf-zero-PR29451.patch b/pkgs/development/tools/misc/binutils/gas-dwarf-zero-PR29451.patch new file mode 100644 index 000000000000..5f1293f8f732 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/gas-dwarf-zero-PR29451.patch @@ -0,0 +1,71 @@ +https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=d7abcbcea5ddd40a3bf28758b62f35933c59f996 + +Don't emit 0-sized debug entries for objects without size. +Without the change elfutils on i686-linux fail dwarf validity test: + https://sourceware.org/PR29450 +--- a/gas/dwarf2dbg.c ++++ b/gas/dwarf2dbg.c +@@ -2882,6 +2882,7 @@ out_debug_info (segT info_seg, segT abbrev_seg, segT line_seg, segT str_seg, + { + const char *name; + size_t len; ++ expressionS size = { .X_op = O_constant }; + + /* Skip warning constructs (see above). */ + if (symbol_get_bfdsym (symp)->flags & BSF_WARNING) +@@ -2895,6 +2896,18 @@ out_debug_info (segT info_seg, segT abbrev_seg, segT line_seg, segT str_seg, + if (!S_IS_DEFINED (symp) || !S_IS_FUNCTION (symp)) + continue; + ++#if defined (OBJ_ELF) /* || defined (OBJ_MAYBE_ELF) */ ++ size.X_add_number = S_GET_SIZE (symp); ++ if (size.X_add_number == 0 && IS_ELF ++ && symbol_get_obj (symp)->size != NULL) ++ { ++ size.X_op = O_add; ++ size.X_op_symbol = make_expr_symbol (symbol_get_obj (symp)->size); ++ } ++#endif ++ if (size.X_op == O_constant && size.X_add_number == 0) ++ continue; ++ + subseg_set (str_seg, 0); + name_sym = symbol_temp_new_now_octets (); + name = S_GET_NAME (symp); +@@ -2920,29 +2933,17 @@ out_debug_info (segT info_seg, segT abbrev_seg, segT line_seg, segT str_seg, + emit_expr (&exp, sizeof_address); + + /* DW_AT_high_pc */ +- exp.X_op = O_constant; +-#if defined (OBJ_ELF) /* || defined (OBJ_MAYBE_ELF) */ +- exp.X_add_number = S_GET_SIZE (symp); +- if (exp.X_add_number == 0 && IS_ELF +- && symbol_get_obj (symp)->size != NULL) +- { +- exp.X_op = O_add; +- exp.X_op_symbol = make_expr_symbol (symbol_get_obj (symp)->size); +- } +-#else +- exp.X_add_number = 0; +-#endif + if (DWARF2_VERSION < 4) + { +- if (exp.X_op == O_constant) +- exp.X_op = O_symbol; +- exp.X_add_symbol = symp; +- emit_expr (&exp, sizeof_address); ++ if (size.X_op == O_constant) ++ size.X_op = O_symbol; ++ size.X_add_symbol = symp; ++ emit_expr (&size, sizeof_address); + } +- else if (exp.X_op == O_constant) +- out_uleb128 (exp.X_add_number); ++ else if (size.X_op == O_constant) ++ out_uleb128 (size.X_add_number); + else +- emit_leb128_expr (symbol_get_value_expression (exp.X_op_symbol), 0); ++ emit_leb128_expr (symbol_get_value_expression (size.X_op_symbol), 0); + } + + /* End of children. */ diff --git a/pkgs/development/tools/misc/binutils/libbfd.nix b/pkgs/development/tools/misc/binutils/libbfd.nix index eed23a746d2a..16737a7b5ee8 100644 --- a/pkgs/development/tools/misc/binutils/libbfd.nix +++ b/pkgs/development/tools/misc/binutils/libbfd.nix @@ -1,5 +1,6 @@ { lib, stdenv -, fetchpatch, gnu-config, autoreconfHook, bison, binutils-unwrapped +, buildPackages +, gnu-config, autoreconfHook, bison, binutils-unwrapped, texinfo , libiberty, libintl, zlib }: @@ -11,10 +12,6 @@ stdenv.mkDerivation { patches = binutils-unwrapped.patches ++ [ ./build-components-separately.patch - (fetchpatch { - url = "https://raw.githubusercontent.com/mxe/mxe/e1d4c144ee1994f70f86cf7fd8168fe69bd629c6/src/bfd-1-disable-subdir-doc.patch"; - sha256 = "0pzb3i74d1r7lhjan376h59a7kirw15j7swwm8pz3zy9lkdqkj6q"; - }) ]; # We just want to build libbfd @@ -31,8 +28,9 @@ stdenv.mkDerivation { dontUpdateAutotoolsGnuConfigScripts = true; strictDeps = true; - nativeBuildInputs = [ autoreconfHook bison ]; + nativeBuildInputs = [ autoreconfHook bison texinfo ]; buildInputs = [ libiberty zlib ] ++ lib.optionals stdenv.isDarwin [ libintl ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; configurePlatforms = [ "build" "host" ]; configureFlags = [ diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix index be4d646a5397..e85ddbaed742 100644 --- a/pkgs/development/tools/misc/cvise/default.nix +++ b/pkgs/development/tools/misc/cvise/default.nix @@ -17,6 +17,7 @@ buildPythonApplication rec { pname = "cvise"; version = "2.5.0"; + format = "other"; src = fetchFromGitHub { owner = "marxin"; @@ -69,10 +70,6 @@ buildPythonApplication rec { "test_simple_reduction" ]; - dontUsePipInstall = true; - dontUseSetuptoolsBuild = true; - dontUseSetuptoolsCheck = true; - meta = with lib; { homepage = "https://github.com/marxin/cvise"; description = "Super-parallel Python port of C-Reduce"; diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 0817c78d4803..01b0f39567eb 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -1,4 +1,5 @@ -{lib, stdenv, fetchFromGitHub +{lib, stdenv, fetchFromGitHub, buildPackages +, fetchpatch , curl, makeWrapper, which, unzip , lua # for 'luarocks pack' @@ -20,7 +21,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-G6HDap3pspeQtGDBq+ukN7kftDaT/CozMVdYM60F6HI="; }; - patches = [ ./darwin-3.7.0.patch ]; + patches = [ + ./darwin-3.7.0.patch + # follow standard environmental variables + # https://github.com/luarocks/luarocks/pull/1433 + (fetchpatch { + url = "https://github.com/luarocks/luarocks/commit/d719541577a89909185aa8de7a33cf73b7a63ac3.diff"; + sha256 = "sha256-rMnhZFqLEul0wnsxvw9nl6JXVanC5QgOZ+I/HJ0vRCM="; + }) + ]; postPatch = lib.optionalString stdenv.targetPlatform.isDarwin '' substituteInPlace src/luarocks/core/cfg.lua --subst-var-by 'darwinMinVersion' '${stdenv.targetPlatform.darwinMinVersion}' @@ -43,12 +52,15 @@ stdenv.mkDerivation rec { fi ''; - nativeBuildInputs = [ makeWrapper installShellFiles ]; + nativeBuildInputs = [ makeWrapper installShellFiles lua unzip ]; - buildInputs = [ lua curl which ]; + buildInputs = [ curl which ]; postInstall = '' sed -e "1s@.*@#! ${lua}/bin/lua$LUA_SUFFIX@" -i "$out"/bin/* + substituteInPlace $out/etc/luarocks/* \ + --replace '${lua.luaOnBuild}' '${lua}' + for i in "$out"/bin/*; do test -L "$i" || { wrapProgram "$i" \ @@ -58,7 +70,7 @@ stdenv.mkDerivation rec { --suffix LUA_CPATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" } done - + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd luarocks --bash <($out/bin/luarocks completion bash) installShellCompletion --cmd luarocks --zsh <($out/bin/luarocks completion zsh) ''; @@ -76,6 +88,10 @@ stdenv.mkDerivation rec { export LUA_PATH="src/?.lua;''${LUA_PATH:-}" ''; + disallowedReferences = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + lua.luaOnBuild + ]; + passthru = { updateScript = nix-update-script { attrPath = pname; diff --git a/pkgs/development/tools/mongosh/gen/composition.nix b/pkgs/development/tools/mongosh/gen/composition.nix index e18894fddb30..6740fed1bf8f 100644 --- a/pkgs/development/tools/mongosh/gen/composition.nix +++ b/pkgs/development/tools/mongosh/gen/composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: let nodeEnv = import ../../../node-packages/node-env.nix { diff --git a/pkgs/development/tools/mongosh/gen/packages.nix b/pkgs/development/tools/mongosh/gen/packages.nix index 43c6cb0f86ce..04dd83757a1d 100644 --- a/pkgs/development/tools/mongosh/gen/packages.nix +++ b/pkgs/development/tools/mongosh/gen/packages.nix @@ -13,22 +13,22 @@ let sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="; }; }; - "@babel/code-frame-7.16.7" = { + "@babel/code-frame-7.18.6" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"; - sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"; + sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/compat-data-7.17.10" = { + "@babel/compat-data-7.19.3" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.17.10"; + version = "7.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz"; - sha512 = "GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.3.tgz"; + sha512 = "prBHMK4JYYK+wDjJF1q99KK4JLL+egWS4nmNqdlMUgCExMZ+iZW0hGhyC3VEbsPjvaN0TBhW//VIFwBrk8sEiw=="; }; }; "@babel/core-7.16.12" = { @@ -40,211 +40,211 @@ let sha512 = "dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg=="; }; }; - "@babel/core-7.17.12" = { + "@babel/core-7.19.3" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.17.12"; + version = "7.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.17.12.tgz"; - sha512 = "44ODe6O1IVz9s2oJE3rZ4trNNKTX9O7KpQpfAP4t8QII/zwrVRHL7i2pxhqtcY7tqMLrrKfMlBKnm1QlrRFs5w=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz"; + sha512 = "WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ=="; }; }; - "@babel/generator-7.17.12" = { + "@babel/generator-7.19.3" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.17.12"; + version = "7.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.17.12.tgz"; - sha512 = "V49KtZiiiLjH/CnIW6OjJdrenrGoyh6AmKQ3k2AZFKozC1h846Q4NYlZ5nqAigPDUXfGzC88+LOUuG8yKd2kCw=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.19.3.tgz"; + sha512 = "fqVZnmp1ncvZU757UzDheKZpfPgatqY59XtW2/j/18H7u76akb8xqvjw82f+i2UKd/ksYsSick/BCLQUUtJ/qQ=="; }; }; - "@babel/helper-compilation-targets-7.17.10" = { + "@babel/helper-compilation-targets-7.19.3" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.17.10"; + version = "7.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz"; - sha512 = "gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz"; + sha512 = "65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg=="; }; }; - "@babel/helper-environment-visitor-7.16.7" = { + "@babel/helper-environment-visitor-7.18.9" = { name = "_at_babel_slash_helper-environment-visitor"; packageName = "@babel/helper-environment-visitor"; - version = "7.16.7"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz"; - sha512 = "SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag=="; + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz"; + sha512 = "3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="; }; }; - "@babel/helper-function-name-7.17.9" = { + "@babel/helper-function-name-7.19.0" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.17.9"; + version = "7.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz"; - sha512 = "7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz"; + sha512 = "WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w=="; }; }; - "@babel/helper-hoist-variables-7.16.7" = { + "@babel/helper-hoist-variables-7.18.6" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz"; - sha512 = "m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"; + sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; }; }; - "@babel/helper-module-imports-7.16.7" = { + "@babel/helper-module-imports-7.18.6" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz"; - sha512 = "LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz"; + sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; }; - "@babel/helper-module-transforms-7.17.12" = { + "@babel/helper-module-transforms-7.19.0" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.17.12"; + version = "7.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.12.tgz"; - sha512 = "t5s2BeSWIghhFRPh9XMn6EIGmvn8Lmw5RVASJzkIx1mSemubQQBNIZiQD7WzaFmaHIrjAec4x8z9Yx8SjJ1/LA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz"; + sha512 = "3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ=="; }; }; - "@babel/helper-plugin-utils-7.17.12" = { + "@babel/helper-plugin-utils-7.19.0" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.17.12"; + version = "7.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz"; - sha512 = "JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz"; + sha512 = "40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw=="; }; }; - "@babel/helper-simple-access-7.17.7" = { + "@babel/helper-simple-access-7.18.6" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.17.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz"; - sha512 = "txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz"; + sha512 = "iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g=="; }; }; - "@babel/helper-split-export-declaration-7.16.7" = { + "@babel/helper-split-export-declaration-7.18.6" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz"; - sha512 = "xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz"; + sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; }; }; - "@babel/helper-validator-identifier-7.16.7" = { + "@babel/helper-string-parser-7.18.10" = { + name = "_at_babel_slash_helper-string-parser"; + packageName = "@babel/helper-string-parser"; + version = "7.18.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz"; + sha512 = "XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw=="; + }; + }; + "@babel/helper-validator-identifier-7.19.1" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.16.7"; + version = "7.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"; - sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"; + sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="; }; }; - "@babel/helper-validator-option-7.16.7" = { + "@babel/helper-validator-option-7.18.6" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz"; - sha512 = "TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"; + sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; }; }; - "@babel/helpers-7.17.9" = { + "@babel/helpers-7.19.0" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.17.9"; + version = "7.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz"; - sha512 = "cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz"; + sha512 = "DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg=="; }; }; - "@babel/highlight-7.17.12" = { + "@babel/highlight-7.18.6" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz"; - sha512 = "7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz"; + sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/parser-7.17.12" = { + "@babel/parser-7.19.3" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.17.12"; + version = "7.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.12.tgz"; - sha512 = "FLzHmN9V3AJIrWfOpvRlZCeVg/WLdicSnTMsLur6uDj9TT8ymUlG9XxURdW/XvuygK+2CW0poOJABdA4m/YKxA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.19.3.tgz"; + sha512 = "pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ=="; }; }; - "@babel/plugin-transform-destructuring-7.17.12" = { + "@babel/plugin-transform-destructuring-7.18.13" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.17.12"; + version = "7.18.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.12.tgz"; - sha512 = "P8pt0YiKtX5UMUL5Xzsc9Oyij+pJE6JuC+F1k0/brq/OOGs5jDa1If3OY0LRWGvJsJhI+8tsiecL3nJLc0WTlg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz"; + sha512 = "TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow=="; }; }; - "@babel/plugin-transform-parameters-7.17.12" = { + "@babel/plugin-transform-parameters-7.18.8" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.17.12"; + version = "7.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz"; - sha512 = "6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz"; + sha512 = "ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.16.7" = { + "@babel/plugin-transform-shorthand-properties-7.18.6" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz"; - sha512 = "hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz"; + sha512 = "eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw=="; }; }; - "@babel/runtime-7.17.9" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.17.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz"; - sha512 = "lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg=="; - }; - }; - "@babel/template-7.16.7" = { + "@babel/template-7.18.10" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.16.7"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz"; - sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz"; + sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; }; }; - "@babel/traverse-7.17.12" = { + "@babel/traverse-7.19.3" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.17.12"; + version = "7.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.12.tgz"; - sha512 = "zULPs+TbCvOkIFd4FrG53xrpxvCBwLIgo6tO0tJorY7YV2IWFxUfS/lXDJbGgfyYt9ery/Gxj2niwttNnB0gIw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.3.tgz"; + sha512 = "qh5yf6149zhq2sgIXmwjnsvmnNQC2iw70UFjp4olxucKrWd/dvlUsBI88VSLUsnMNF7/vnOiA+nk1+yLoCqROQ=="; }; }; - "@babel/types-7.17.12" = { + "@babel/types-7.19.3" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.17.12"; + version = "7.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.17.12.tgz"; - sha512 = "rH8i29wcZ6x9xjzI5ILHL/yZkbQnCERdHlogKuIb4PUr7do4iT8DPekrTbBLWTnRQm6U0GYABbTMSzijmEqlAg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.19.3.tgz"; + sha512 = "hGCaQzIY22DJlDh9CH7NOxgKkFjBk0Cw9xDO1Xmh2151ti7wiGfQ3LauXzL4HP1fmFlTX6XjpRETTpUcv7wQLw=="; }; }; "@hapi/hoek-9.3.0" = { @@ -274,202 +274,202 @@ let sha512 = "sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w=="; }; }; - "@jridgewell/gen-mapping-0.3.1" = { + "@jridgewell/gen-mapping-0.3.2" = { name = "_at_jridgewell_slash_gen-mapping"; packageName = "@jridgewell/gen-mapping"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz"; - sha512 = "GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg=="; + url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"; + sha512 = "mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A=="; }; }; - "@jridgewell/resolve-uri-3.0.7" = { + "@jridgewell/resolve-uri-3.1.0" = { name = "_at_jridgewell_slash_resolve-uri"; packageName = "@jridgewell/resolve-uri"; - version = "3.0.7"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz"; - sha512 = "8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA=="; + url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"; + sha512 = "F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="; }; }; - "@jridgewell/set-array-1.1.1" = { + "@jridgewell/set-array-1.1.2" = { name = "_at_jridgewell_slash_set-array"; packageName = "@jridgewell/set-array"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz"; - sha512 = "Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ=="; + url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"; + sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; }; }; - "@jridgewell/sourcemap-codec-1.4.13" = { + "@jridgewell/sourcemap-codec-1.4.14" = { name = "_at_jridgewell_slash_sourcemap-codec"; packageName = "@jridgewell/sourcemap-codec"; - version = "1.4.13"; + version = "1.4.14"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz"; - sha512 = "GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w=="; + url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"; + sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; }; }; - "@jridgewell/trace-mapping-0.3.13" = { + "@jridgewell/trace-mapping-0.3.15" = { name = "_at_jridgewell_slash_trace-mapping"; packageName = "@jridgewell/trace-mapping"; - version = "0.3.13"; + version = "0.3.15"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz"; - sha512 = "o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w=="; + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz"; + sha512 = "oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g=="; }; }; - "@mongodb-js/devtools-connect-1.4.2" = { + "@mongodb-js/devtools-connect-1.4.3" = { name = "_at_mongodb-js_slash_devtools-connect"; packageName = "@mongodb-js/devtools-connect"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-1.4.2.tgz"; - sha512 = "rNbjzMPQWxKbMc5hEL+BZPSvoh/f9k2DvqE7ilR7B/NjSt2QFo66nz5RFQbQchaB1XA8+K73ch2SPlYrZl0Exw=="; + url = "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-1.4.3.tgz"; + sha512 = "Y7j5XZo+bmphN/IERA9p++91ZYEXPagONUVP7seQ04ha2jHwB6lr6WudPWcRw7NkzPj/PuEjA50lJXtt2ilA3Q=="; }; }; - "@mongosh/arg-parser-1.4.2" = { + "@mongosh/arg-parser-1.6.0" = { name = "_at_mongosh_slash_arg-parser"; packageName = "@mongosh/arg-parser"; - version = "1.4.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-1.4.2.tgz"; - sha512 = "jRGIuVwIsIH7EP2fWJa0V5D2/3qo+D9d+h25Zm0DNEPcV097nzZCQD2maHAfM47Cy3Yrq94ZnbNsmme1BDfF9Q=="; + url = "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-1.6.0.tgz"; + sha512 = "9f31TdgjR9hhIhgntkde8rK8SMccWjiKYj6uRwlUgvJniZYEDg3Jg7/wqif53W33bc6rV70p2hiRhRMkZZhHYg=="; }; }; - "@mongosh/async-rewriter2-1.4.2" = { + "@mongosh/async-rewriter2-1.6.0" = { name = "_at_mongosh_slash_async-rewriter2"; packageName = "@mongosh/async-rewriter2"; - version = "1.4.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-1.4.2.tgz"; - sha512 = "P6YEwvAbhLVze2BjPXfCK1qc+aSrNWgmDWMoOvwsqfE7at+HNwf/GuPRH5gq9yL1ABm27nYsPpMf+ZK08fy0Mw=="; + url = "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-1.6.0.tgz"; + sha512 = "F/5RJDynNzWCQNG/AmgzNC6euz4A2ZkHUmzELox5Fhr3KfB53daJ+R0itevhR9AIwSi6fqrKqEPToMAsc4l1UQ=="; }; }; - "@mongosh/autocomplete-1.4.2" = { + "@mongosh/autocomplete-1.6.0" = { name = "_at_mongosh_slash_autocomplete"; packageName = "@mongosh/autocomplete"; - version = "1.4.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-1.4.2.tgz"; - sha512 = "7H6dKF5PgSGE1YpABWYcAyI8HoTFN+Xpg74bVqeCMX2XyDYEgea/bvHWF3TzH0RSvCgme5oD2s36+8XqV9ehlw=="; + url = "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-1.6.0.tgz"; + sha512 = "kMSnwoJz2Kn6sxRRa+cNfw+rTuLOcSD+bW29/cs0CtZaKHnT5ODH8QIecpWyMWzDQ4CFYo5vDgqOaS0ZyiWz3g=="; }; }; - "@mongosh/cli-repl-1.4.2" = { + "@mongosh/cli-repl-1.6.0" = { name = "_at_mongosh_slash_cli-repl"; packageName = "@mongosh/cli-repl"; - version = "1.4.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-1.4.2.tgz"; - sha512 = "KpzE+a2g9ouGwveBB7GpEohm04krEQLGzMcqHFQBAMM7L53hBMSw0ZwFQtmh+ZwKGR6fSnQYbh923T0yl0RzUw=="; + url = "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-1.6.0.tgz"; + sha512 = "O2T1uKzWVSPJyrYJboqMPG4Obb6ZpFxWp2DMq9UynuXT9x2DnNc0Z55CHX0WHSlVHJAxcee1EKF3BMgTDSRk5Q=="; }; }; - "@mongosh/editor-1.4.2" = { + "@mongosh/editor-1.6.0" = { name = "_at_mongosh_slash_editor"; packageName = "@mongosh/editor"; - version = "1.4.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/editor/-/editor-1.4.2.tgz"; - sha512 = "DWeQKMPX7AGnEdX4o1RIRQ1T6ugX94pZPPgUYGllViyICTGu1oPTyH79Fj+ZUHMUQPGKvVcTHH4afg/ePbV+hw=="; + url = "https://registry.npmjs.org/@mongosh/editor/-/editor-1.6.0.tgz"; + sha512 = "2olIwsXo+UHbKBDSNsjnDKs6RVc3V6D2kSdT5BMseRSzcqaWH6yMW4EWtuo22Sn2uWxpyWfn4xHpQ1lTjb+U8w=="; }; }; - "@mongosh/errors-1.4.2" = { + "@mongosh/errors-1.6.0" = { name = "_at_mongosh_slash_errors"; packageName = "@mongosh/errors"; - version = "1.4.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/errors/-/errors-1.4.2.tgz"; - sha512 = "7oXUztbH5FKsiU2+RcDIhA8QIPqL0fpHjJa8GIIcuMyERPx1CnJsrbbQEayNznc+FZ4w2tmuzy2Fes8wmfoqEg=="; + url = "https://registry.npmjs.org/@mongosh/errors/-/errors-1.6.0.tgz"; + sha512 = "6VLsCNFhGyGiEWgPNfUTUc1tFBHTAVDHlsbcZrxSLAhimkJf1jOy1A9i/vH+PNnNWJ50MMakM6kwlMltWmH91Q=="; }; }; - "@mongosh/history-1.4.2" = { + "@mongosh/history-1.6.0" = { name = "_at_mongosh_slash_history"; packageName = "@mongosh/history"; - version = "1.4.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/history/-/history-1.4.2.tgz"; - sha512 = "DC6bXz7nfTacKNF+b2KzQ9Or5wMSJ+xwuWq8j2P0uLFJZihtlaUDAmSCGoWEYP71+pEpsOFM1eYHPq50bqw1bA=="; + url = "https://registry.npmjs.org/@mongosh/history/-/history-1.6.0.tgz"; + sha512 = "chR+rsAOxidVrbm+cGgR1FuNAZRy5sl+Ft4T2/fmGFTCQzhGpjvNoZ95EsR0AA1VTr9SknDymjvzmi9jJPtWGA=="; }; }; - "@mongosh/i18n-1.4.2" = { + "@mongosh/i18n-1.6.0" = { name = "_at_mongosh_slash_i18n"; packageName = "@mongosh/i18n"; - version = "1.4.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/i18n/-/i18n-1.4.2.tgz"; - sha512 = "m7TUQf8MKJwVjpsmpf6DQF8XtTo978AFaOMz8CSapNP8HHARcMXYmurOUqYRJk8fFVXRjRi8XxlwQjH0dkbAuA=="; + url = "https://registry.npmjs.org/@mongosh/i18n/-/i18n-1.6.0.tgz"; + sha512 = "9Uhz/dTKfzF83vZO3gxx+xR+M1xVfcL39+H+D7t3wwVOUsU5OJ6YbhZIt+Wmnund+L9941Cb1HfeeGBLDZKukA=="; }; }; - "@mongosh/js-multiline-to-singleline-1.4.2" = { + "@mongosh/js-multiline-to-singleline-1.6.0" = { name = "_at_mongosh_slash_js-multiline-to-singleline"; packageName = "@mongosh/js-multiline-to-singleline"; - version = "1.4.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-1.4.2.tgz"; - sha512 = "K31Ra+BEvJeyyvbhpe2atKJ+38w+ctUwxlMt2Cjl/I/zxwAD6ecEsN4smZpbOf/IFwHvYizGVqH2ceZoaV//FQ=="; + url = "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-1.6.0.tgz"; + sha512 = "u+e+sGDYHA73vFXLVPdzvf8Pb86unxp1oTF9mKuOfIhM0kSFEcUv6BbSrrtl9tmreekQsOrEwT7jRecqboD8sA=="; }; }; - "@mongosh/logging-1.4.2" = { + "@mongosh/logging-1.6.0" = { name = "_at_mongosh_slash_logging"; packageName = "@mongosh/logging"; - version = "1.4.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/logging/-/logging-1.4.2.tgz"; - sha512 = "FHwAf9VFMtBBzAL6NkFremFu5SepSmgYHmW345gHfcfwyPrxqiXnpiCfXKuGkHBhWYroiuRwoRCua05tt+h8zA=="; + url = "https://registry.npmjs.org/@mongosh/logging/-/logging-1.6.0.tgz"; + sha512 = "VsWBuNJPih3j1GJjwYuOpNsBbyrU9GhLt3QL0Rj+OboG3oiS5sRq6fsk7IwcD5jk29Jk79E96zk1DG6oNkUq6w=="; }; }; - "@mongosh/service-provider-core-1.4.2" = { + "@mongosh/service-provider-core-1.6.0" = { name = "_at_mongosh_slash_service-provider-core"; packageName = "@mongosh/service-provider-core"; - version = "1.4.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-1.4.2.tgz"; - sha512 = "lI92M7lxKowxataEQBk2TKjAN7m3uZ7Oqpe5ujl1yKT5tR3cqUaZCWC3Zdxh7QdqKwDgfEhHIbssqHB8GsstWg=="; + url = "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-1.6.0.tgz"; + sha512 = "tq0BEvIPub7syCcjjVVV77ABXjfoyddcT4tsQ7YKCsQQctMGvDw82sQtheBF3ie/d1UHEBVA7Drp6l6VA1r0GQ=="; }; }; - "@mongosh/service-provider-server-1.4.2" = { + "@mongosh/service-provider-server-1.6.0" = { name = "_at_mongosh_slash_service-provider-server"; packageName = "@mongosh/service-provider-server"; - version = "1.4.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-1.4.2.tgz"; - sha512 = "0nqRXdpONrrXUhBmMdjWEf5SYKT1eV9m/l9m3CDp+64Nrd9eODe66QwqgkIZ8T/1iusR6GNt7nSCY8+dT3H8Gg=="; + url = "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-1.6.0.tgz"; + sha512 = "80m9eutNZZwh2bZhOLz0FFrrjwp91xS+lE9M+bYREBOIPfOlnUDxkCFpxCeyZNZzi3kiu+nSVC7rcLS6AlDI2w=="; }; }; - "@mongosh/shell-api-1.4.2" = { + "@mongosh/shell-api-1.6.0" = { name = "_at_mongosh_slash_shell-api"; packageName = "@mongosh/shell-api"; - version = "1.4.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-1.4.2.tgz"; - sha512 = "Lan05KEvhIDRttDbts3H19uJNZMUbKvMLXdcJ3FRpH8JKc53wRBETpu247+muuZnGL5EKhm3QMqMlhwHl8dtfw=="; + url = "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-1.6.0.tgz"; + sha512 = "oVi2tFQMl3uDQukKhDFAjCCq3JLyS0a7FBcd4brZaDRouiBLa+cufehz3f4D89pvFlIZx/20tQfASA28HYYHnw=="; }; }; - "@mongosh/shell-evaluator-1.4.2" = { + "@mongosh/shell-evaluator-1.6.0" = { name = "_at_mongosh_slash_shell-evaluator"; packageName = "@mongosh/shell-evaluator"; - version = "1.4.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-1.4.2.tgz"; - sha512 = "X2LLGvoyqwFVLJ+K7Whv+c/vL+ilGy2f/zd862uw9dOAA6xgmz+Ecjco9u8hCpkmtOq3MaXv9AGYPttZi32uzg=="; + url = "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-1.6.0.tgz"; + sha512 = "Ac9AZ7c08DAjawB6B2akiYYzNd4hZkJxNSphb+JNK1rVzGYMv+j2/SZzAOU59pKAlZnLpj/593Q0/7TwQu6t8A=="; }; }; - "@mongosh/snippet-manager-1.4.2" = { + "@mongosh/snippet-manager-1.6.0" = { name = "_at_mongosh_slash_snippet-manager"; packageName = "@mongosh/snippet-manager"; - version = "1.4.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-1.4.2.tgz"; - sha512 = "3CcOKYvzFpwYp+jtHf2zPPUtW4L4apq7Vp4Su/kJ7+XODQySI6QVsf1PyF8KKbbz8eS1QR/USo1AX4KR7gfFsw=="; + url = "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-1.6.0.tgz"; + sha512 = "JJ7Q3rCmMIQLwi5T3nhRD8JdSIFma38o2kIDFrIM8EpxPR36xxuojNoxmiqj8Hqsz5vkKeGKWevg/rNjU+0Log=="; }; }; - "@mongosh/types-1.4.2" = { + "@mongosh/types-1.6.0" = { name = "_at_mongosh_slash_types"; packageName = "@mongosh/types"; - version = "1.4.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/types/-/types-1.4.2.tgz"; - sha512 = "JbjI6XYociDvq25BW/0Kp8cilUVH2jPd8IOxtziceGKd+o/MOmaJv+Fz1s7nSA/BlCy3D4AHHekFhSl/e0YPwg=="; + url = "https://registry.npmjs.org/@mongosh/types/-/types-1.6.0.tgz"; + sha512 = "rKVvrAncZng9C3pE69OMKzAyat7i60/b8tR3ou4zk/w5xg1WV/lEIWksAACu9RBKPItKRlOVkfc6YRF+7z+4dw=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -535,40 +535,40 @@ let sha512 = "azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g=="; }; }; - "@types/babel__traverse-7.17.1" = { + "@types/babel__traverse-7.18.2" = { name = "_at_types_slash_babel__traverse"; packageName = "@types/babel__traverse"; - version = "7.17.1"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.17.1.tgz"; - sha512 = "kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA=="; + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.2.tgz"; + sha512 = "FcFaxOr2V5KZCviw1TnutEMVUVsGt4D2hP1TAfXZAMKuHYW3xQhe3jTxNPWutgCJ3/X1c5yX8ZoGVEItxKbwBg=="; }; }; - "@types/chai-4.3.1" = { + "@types/chai-4.3.3" = { name = "_at_types_slash_chai"; packageName = "@types/chai"; - version = "4.3.1"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/chai/-/chai-4.3.1.tgz"; - sha512 = "/zPMqDkzSZ8t3VtxOa4KPq7uzzW978M9Tvh+j7GHKuo6k6GTLxPJ4J5gE5cjfJ26pnXst0N5Hax8Sr0T2Mi9zQ=="; + url = "https://registry.npmjs.org/@types/chai/-/chai-4.3.3.tgz"; + sha512 = "hC7OMnszpxhZPduX+m+nrx+uFoLkWOMiR4oa/AZF3MuSETYTZmFfJAHqZEM8MVlvfG7BEUcgvtwoCTxBp6hm3g=="; }; }; - "@types/node-17.0.34" = { + "@types/node-18.7.23" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.34"; + version = "18.7.23"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.34.tgz"; - sha512 = "XImEz7XwTvDBtzlTnm8YvMqGW/ErMWBsKZ+hMTvnDIjGCKxwK5Xpc+c/oQjOauwq8M4OS11hEkpjX8rrI/eEgA=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.7.23.tgz"; + sha512 = "DWNcCHolDq0ZKGizjx2DZjR/PqsYwAcYUJmfMWqtVU2MBMG5Mo+xFZrhGId5r/O5HOuMPyQEcM6KUBp5lBZZBg=="; }; }; - "@types/sinon-10.0.11" = { + "@types/sinon-10.0.13" = { name = "_at_types_slash_sinon"; packageName = "@types/sinon"; - version = "10.0.11"; + version = "10.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.11.tgz"; - sha512 = "dmZsHlBsKUtBpHriNjlK0ndlvEh8dcb9uV9Afsbt89QIyydpC7NcR+nWlAhASfy3GHnxTl4FX/aKE7XZUt/B4g=="; + url = "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.13.tgz"; + sha512 = "UVjDqJblVNQYvVNUsj0PuYYw0ELRmgt1Nt5Vk0pT5f16ROGfcKJY8o1HVuMOJOpD727RrGB9EGvoaTQE5tgxZQ=="; }; }; "@types/sinon-chai-3.2.8" = { @@ -589,22 +589,22 @@ let sha512 = "9GcLXF0/v3t80caGs5p2rRfkB+a8VBGLJZVih6CNFkx8IZ994wiKKLSRs9nuFwk1HevWs/1mnUmkApGrSGsShA=="; }; }; - "@types/webidl-conversions-6.1.1" = { + "@types/webidl-conversions-7.0.0" = { name = "_at_types_slash_webidl-conversions"; packageName = "@types/webidl-conversions"; - version = "6.1.1"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-6.1.1.tgz"; - sha512 = "XAahCdThVuCFDQLT7R7Pk/vqeObFNL3YqRyFZg+AqAP/W1/w3xHaIxuW7WszQqTbIBOPRcItYJIou3i/mppu3Q=="; + url = "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.0.tgz"; + sha512 = "xTE1E+YF4aWPJJeUzaZI5DRntlkY3+BCVJi0axFptnjGmAoWxkyREIh/XMrfxVLejwQxMCfDXdICo0VLxThrog=="; }; }; - "@types/whatwg-url-8.2.1" = { + "@types/whatwg-url-8.2.2" = { name = "_at_types_slash_whatwg-url"; packageName = "@types/whatwg-url"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.1.tgz"; - sha512 = "2YubE1sjj5ifxievI5Ge1sckb9k/Er66HyR2c+3+I6VDUUg1TLPdYYTEbQ+DjRkS4nTxMJhgWfSfMRD2sl2EYQ=="; + url = "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.2.tgz"; + sha512 = "FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA=="; }; }; "abbrev-1.1.1" = { @@ -670,13 +670,13 @@ let sha512 = "5X4mpYq5J3pdndLmIB0+WtFd/mKWnNYpuTlTzj32wUu/PMmEGOiayQ5UrqgwdBNiaZBtDDh5kddpP7Yg2QaQYA=="; }; }; - "analytics-node-3.5.0" = { + "analytics-node-5.2.0" = { name = "analytics-node"; packageName = "analytics-node"; - version = "3.5.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/analytics-node/-/analytics-node-3.5.0.tgz"; - sha512 = "XgQq6ejZHCehUSnZS4V7QJPLIP7S9OAWwQDYl4WTLtsRvc5fCxIwzK/yihzmIW51v9PnyBmrl9dMcqvwfOE8WA=="; + url = "https://registry.npmjs.org/analytics-node/-/analytics-node-5.2.0.tgz"; + sha512 = "JAc0K7J//QKGGX2mfwBE7wyG/Rh4W0BATB6CncwYhVX1qLjiXwHmB7bYr9PgJIer5M6jKMOhZoO5lxiruQk9BQ=="; }; }; "ansi-escape-sequences-5.1.2" = { @@ -769,13 +769,13 @@ let sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; }; }; - "axios-retry-3.2.5" = { + "axios-retry-3.2.0" = { name = "axios-retry"; packageName = "axios-retry"; - version = "3.2.5"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.2.5.tgz"; - sha512 = "a8umkKbfIkTiYJQLx3v3TzKM85TGKB8ZQYz4zwykt2fpO64TsRlUhjaPaAb3fqMWCXFm2YhWcd8V5FHDKO9bSA=="; + url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.2.0.tgz"; + sha512 = "RK2cLMgIsAQBDhlIsJR5dOhODPigvel18XUv1dDXW+4k1FzebyfRk+C+orot6WPZOYFKSfhLwHPwVmTVOODQ5w=="; }; }; "balanced-match-1.0.2" = { @@ -796,31 +796,31 @@ let sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; }; }; - "brace-expansion-1.1.11" = { + "brace-expansion-2.0.1" = { name = "brace-expansion"; packageName = "brace-expansion"; - version = "1.1.11"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"; + sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="; }; }; - "browserslist-4.20.3" = { + "browserslist-4.21.4" = { name = "browserslist"; packageName = "browserslist"; - version = "4.20.3"; + version = "4.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz"; - sha512 = "NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz"; + sha512 = "CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw=="; }; }; - "bson-4.6.3" = { + "bson-4.7.0" = { name = "bson"; packageName = "bson"; - version = "4.6.3"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/bson/-/bson-4.6.3.tgz"; - sha512 = "rAqP5hcUVJhXP2MCSNVsf0oM2OGU1So6A9pVRDYayvJ5+hygXHQApf87wd5NlhPM1J9RJnbqxIG/f8QTzRoQ4A=="; + url = "https://registry.npmjs.org/bson/-/bson-4.7.0.tgz"; + sha512 = "VrlEE4vuiO1WTpfof4VmaVolCVYkYTgB9iWgYNOrVlnifpME/06fhFRmONgBhClD5pFC1t9ZWqFUQEQAzY43bA=="; }; }; "buffer-5.7.1" = { @@ -832,13 +832,13 @@ let sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; }; }; - "caniuse-lite-1.0.30001341" = { + "caniuse-lite-1.0.30001412" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001341"; + version = "1.0.30001412"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001341.tgz"; - sha512 = "2SodVrFFtvGENGCv0ChVJIDQ0KPaS1cg7/qtfMaICgeMolDdo/Z2OD32F0Aq9yl6F4YFwGPBS5AaPqNYiW4PoA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001412.tgz"; + sha512 = "+TeEIee1gS5bYOiuf+PS/kp2mrXic37Hl66VY6EAfxasIk5fELTktK2oOezYed12H8w7jt3s512PpulQidPjwA=="; }; }; "chalk-2.4.2" = { @@ -910,7 +910,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; - sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; }; }; "color-name-1.1.4" = { @@ -937,16 +937,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/component-type/-/component-type-1.2.1.tgz"; - sha1 = "8a47901700238e4fc32269771230226f24b415a9"; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + sha512 = "Kgy+2+Uwr75vAi6ChWXgHuLvd+QLD7ssgpaRq2zCvt80ptvAfMc/hijcJxXkBa2wMlEZcJvC2H8Ubo+A9ATHIg=="; }; }; "config-chain-1.1.13" = { @@ -982,7 +973,7 @@ let version = "0.0.2"; src = fetchurl { url = "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"; - sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; + sha512 = "mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow=="; }; }; "debug-4.3.4" = { @@ -994,13 +985,13 @@ let sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; }; }; - "denque-2.0.1" = { + "denque-2.1.0" = { name = "denque"; packageName = "denque"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/denque/-/denque-2.0.1.tgz"; - sha512 = "tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ=="; + url = "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz"; + sha512 = "HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw=="; }; }; "editorconfig-0.15.3" = { @@ -1012,13 +1003,13 @@ let sha512 = "M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g=="; }; }; - "electron-to-chromium-1.4.137" = { + "electron-to-chromium-1.4.267" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.137"; + version = "1.4.267"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz"; - sha512 = "0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.267.tgz"; + sha512 = "ik4QnU3vFRsVgwt0vsn7og28++2cGnsdgqYagaE3ur1f3wj5AzmWu+1k3//SOc6CwkP2xfu46PNfVP6X+SRepg=="; }; }; "emphasize-3.0.0" = { @@ -1045,7 +1036,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; }; }; "escape-string-regexp-4.0.0" = { @@ -1066,13 +1057,13 @@ let sha512 = "CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA=="; }; }; - "follow-redirects-1.15.0" = { + "follow-redirects-1.15.2" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.15.0"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz"; - sha512 = "aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"; + sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; }; }; "format-0.2.2" = { @@ -1081,7 +1072,7 @@ let version = "0.2.2"; src = fetchurl { url = "https://registry.npmjs.org/format/-/format-0.2.2.tgz"; - sha1 = "d6170107e9efdc4ed30c9dc39016df942b5cb58b"; + sha512 = "wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww=="; }; }; "fs-minipass-2.1.0" = { @@ -1099,7 +1090,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; }; }; "gensync-1.0.0-beta.2" = { @@ -1111,13 +1102,13 @@ let sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; }; }; - "glob-7.2.3" = { + "glob-8.0.3" = { name = "glob"; packageName = "glob"; - version = "7.2.3"; + version = "8.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"; - sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; + url = "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz"; + sha512 = "ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ=="; }; }; "globals-11.12.0" = { @@ -1144,7 +1135,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; }; }; "has-flag-4.0.0" = { @@ -1162,7 +1153,7 @@ let version = "9.12.0"; src = fetchurl { url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz"; - sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e"; + sha512 = "qNnYpBDO/FQwYVur1+sQBQw7v0cxso1nOYLklqWh6af8ROwwTVoII5+kf/BVa8354WL4ad6rURHYGUXCbD9mMg=="; }; }; "hijack-stream-1.0.0" = { @@ -1189,7 +1180,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; }; }; "inherits-2.0.4" = { @@ -1210,13 +1201,13 @@ let sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; }; - "ip-1.1.8" = { + "ip-2.0.0" = { name = "ip"; packageName = "ip"; - version = "1.1.8"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz"; - sha512 = "PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="; + url = "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz"; + sha512 = "WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="; }; }; "is-buffer-1.1.6" = { @@ -1237,13 +1228,13 @@ let sha512 = "b/xWWfNO7o+EIVEVy1hYOYP1t1Jbyr5LyVf/Ao6gqeMMLNV8wz8qCDWCXqxaQjbHkg22lSclqE6qhjn4cJVeTA=="; }; }; - "is-retry-allowed-2.2.0" = { + "is-retry-allowed-1.2.0" = { name = "is-retry-allowed"; packageName = "is-retry-allowed"; - version = "2.2.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz"; - sha512 = "XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg=="; + url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz"; + sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg=="; }; }; "isexe-2.0.0" = { @@ -1252,16 +1243,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; }; }; - "joi-17.6.0" = { + "joi-17.6.1" = { name = "joi"; packageName = "joi"; - version = "17.6.0"; + version = "17.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-17.6.0.tgz"; - sha512 = "OX5dG6DTbcr/kbMFj0KGYxuew69HPcAE3K/sZpEV2nP6e/j/C0HV+HNiBPCASxdx5T7DMoa0s8UeHWMnb6n2zw=="; + url = "https://registry.npmjs.org/joi/-/joi-17.6.1.tgz"; + sha512 = "Hl7/iBklIX345OCM1TiFSCZRVaAOLDGlWCp0Df2vWYgBgjkezaR7Kvm3joBciBHQjZj5sxXs859r6eqsRSlG8w=="; }; }; "join-component-1.1.0" = { @@ -1270,16 +1261,16 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/join-component/-/join-component-1.1.0.tgz"; - sha1 = "b8417b750661a392bee2c2537c68b2a9d4977cd5"; + sha512 = "bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="; }; }; - "js-beautify-1.14.3" = { + "js-beautify-1.14.6" = { name = "js-beautify"; packageName = "js-beautify"; - version = "1.14.3"; + version = "1.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.3.tgz"; - sha512 = "f1ra8PHtOEu/70EBnmiUlV8nJePS58y9qKjl4JHfYWlFH6bo7ogZBz//FAZp7jDuXtYnGYKymZPlrg2I/9Zo4g=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.6.tgz"; + sha512 = "GfofQY5zDp+cuHc+gsEXKPpNw2KbPddreEo35O6jT6i0RVK6LhsoYBhq5TvK4/n74wnA0QbK8gGd+jUZwTMKJw=="; }; }; "js-tokens-4.0.0" = { @@ -1333,7 +1324,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; - sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; + sha512 = "0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="; }; }; "lowlight-1.9.2" = { @@ -1381,22 +1372,22 @@ let sha512 = "ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg=="; }; }; - "minimatch-3.1.2" = { + "minimatch-5.1.0" = { name = "minimatch"; packageName = "minimatch"; - version = "3.1.2"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"; - sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz"; + sha512 = "9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg=="; }; }; - "minipass-3.1.6" = { + "minipass-3.3.5" = { name = "minipass"; packageName = "minipass"; - version = "3.1.6"; + version = "3.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz"; - sha512 = "rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ=="; + url = "https://registry.npmjs.org/minipass/-/minipass-3.3.5.tgz"; + sha512 = "rQ/p+KfKBkeNwo04U15i+hOwoVBVmekmm/HcfTkTN2t9pbQKCMm4eN5gFeqgrrSp/kH/7BYYhTIHOxGqzbBPaA=="; }; }; "minizlib-2.1.2" = { @@ -1417,13 +1408,13 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; - "mongodb-4.6.0" = { + "mongodb-4.10.0" = { name = "mongodb"; packageName = "mongodb"; - version = "4.6.0"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-4.6.0.tgz"; - sha512 = "1gsxVXmjFTPJ+CkMG9olE4bcVsyY8lBJN9m5B5vj+LZ7wkBqq3PO8RVmNX9GwCBOBz1KV0zM00vPviUearSv7A=="; + url = "https://registry.npmjs.org/mongodb/-/mongodb-4.10.0.tgz"; + sha512 = "My2QxLTw0Cc1O9gih0mz4mqo145Jq4rLAQx0Glk/Ha9iYBzYpt4I2QFNRIh35uNFNfe8KFQcdwY1/HKxXBkinw=="; }; }; "mongodb-ace-autocompleter-0.11.1" = { @@ -1444,13 +1435,13 @@ let sha512 = "X6bKL2kz2DY2cQp/QKJW3Qfb9YgtHZ4+5W48UAIsuIf0OtS5O4pU6/Mh6MCaVt/4VGejERZFuRXnrufMUFKC7w=="; }; }; - "mongodb-connection-string-url-2.5.2" = { + "mongodb-connection-string-url-2.5.3" = { name = "mongodb-connection-string-url"; packageName = "mongodb-connection-string-url"; - version = "2.5.2"; + version = "2.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.5.2.tgz"; - sha512 = "tWDyIG8cQlI5k3skB6ywaEA5F9f5OntrKKsT/Lteub2zgwSUlhqEN2inGgBTm8bpYJf8QYBdA/5naz65XDpczA=="; + url = "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.5.3.tgz"; + sha512 = "f+/WsED+xF4B74l3k9V/XkTVj5/fxFH2o5ToKXd8Iyi5UhM+sO9u0Ape17Mvl/GkZaFtM0HQnzAG5OTmhKw+tQ=="; }; }; "mongodb-log-writer-1.1.4" = { @@ -1495,7 +1486,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz"; - sha1 = "4f3152e09540fde28c76f44b19bbcd1d5a42478d"; + sha512 = "C40jQ3NzfkP53NsO8kEOFd79p4b9kDXQMwgiY1z8ZwrDZgUyom0AHwGegF4Dm99L+YoYhuaB0ceerUcXmqr1rQ=="; }; }; "nanobus-4.5.0" = { @@ -1534,22 +1525,22 @@ let sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; }; }; - "node-releases-2.0.4" = { + "node-releases-2.0.6" = { name = "node-releases"; packageName = "node-releases"; - version = "2.0.4"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz"; - sha512 = "gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz"; + sha512 = "PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="; }; }; - "nopt-5.0.0" = { + "nopt-6.0.0" = { name = "nopt"; packageName = "nopt"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz"; - sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="; + url = "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz"; + sha512 = "ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g=="; }; }; "numeral-2.0.6" = { @@ -1558,7 +1549,7 @@ let version = "2.0.6"; src = fetchurl { url = "https://registry.npmjs.org/numeral/-/numeral-2.0.6.tgz"; - sha1 = "4ad080936d443c2561aed9f2197efffe25f4e506"; + sha512 = "qaKRmtYPZ5qdw4jWJD6bxEf1FJEqllJrwxCLIm0sQU/A7v2/czigzOb+C2uSiFsa9lBUzeH7M1oK+Q+OLxL3kA=="; }; }; "once-1.4.0" = { @@ -1567,16 +1558,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; - }; - }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; }; }; "path-key-3.1.1" = { @@ -1612,7 +1594,7 @@ let version = "1.2.4"; src = fetchurl { url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"; - sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + sha512 = "vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA=="; }; }; "pseudomap-1.0.2" = { @@ -1621,7 +1603,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; - sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="; }; }; "punycode-2.1.1" = { @@ -1633,15 +1615,6 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; - "regenerator-runtime-0.13.9" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.13.9"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; - sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; - }; - }; "remove-array-items-1.1.1" = { name = "remove-array-items"; packageName = "remove-array-items"; @@ -1730,7 +1703,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; - sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; + sha512 = "fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g=="; }; }; "smart-buffer-4.2.0" = { @@ -1742,13 +1715,13 @@ let sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; }; }; - "socks-2.6.2" = { + "socks-2.7.0" = { name = "socks"; packageName = "socks"; - version = "2.6.2"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.6.2.tgz"; - sha512 = "zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA=="; + url = "https://registry.npmjs.org/socks/-/socks-2.7.0.tgz"; + sha512 = "scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA=="; }; }; "source-map-0.5.7" = { @@ -1757,7 +1730,7 @@ let version = "0.5.7"; src = fetchurl { url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; - sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + sha512 = "LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="; }; }; "sparse-bitfield-3.0.3" = { @@ -1766,7 +1739,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz"; - sha1 = "ff4ae6e68656056ba4b3e792ab3334d38273ca11"; + sha512 = "kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ=="; }; }; "strip-ansi-6.0.1" = { @@ -1820,7 +1793,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; - sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; }; }; "to-fast-properties-2.0.0" = { @@ -1829,7 +1802,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; - sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + sha512 = "/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="; }; }; "tr46-0.0.3" = { @@ -1838,7 +1811,7 @@ let version = "0.0.3"; src = fetchurl { url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; - sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; + sha512 = "N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="; }; }; "tr46-3.0.0" = { @@ -1850,13 +1823,22 @@ let sha512 = "l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA=="; }; }; - "uuid-3.4.0" = { + "update-browserslist-db-1.0.9" = { + name = "update-browserslist-db"; + packageName = "update-browserslist-db"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz"; + sha512 = "/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg=="; + }; + }; + "uuid-8.3.2" = { name = "uuid"; packageName = "uuid"; - version = "3.4.0"; + version = "8.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; - sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; + url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"; + sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; }; }; "webidl-conversions-3.0.1" = { @@ -1865,7 +1847,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; - sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871"; + sha512 = "2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="; }; }; "webidl-conversions-7.0.0" = { @@ -1892,7 +1874,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"; - sha1 = "966454e8765462e37644d3626f6742ce8b70965d"; + sha512 = "saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="; }; }; "which-2.0.2" = { @@ -1910,7 +1892,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; }; }; "yallist-2.1.2" = { @@ -1919,7 +1901,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; - sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="; }; }; "yallist-4.0.0" = { @@ -1946,83 +1928,83 @@ in mongosh = nodeEnv.buildNodePackage { name = "mongosh"; packageName = "mongosh"; - version = "1.4.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/mongosh/-/mongosh-1.4.2.tgz"; - sha512 = "VPXujpv4rb7oRSqtuROhToSx1hz04uRatX5ynW5YrCCx/+AGPoawfzWfaBgm1RkqoBFm88bnsEKSL81bDPAhAw=="; + url = "https://registry.npmjs.org/mongosh/-/mongosh-1.6.0.tgz"; + sha512 = "SZ/FYATnLuxzdLb2iTRNnE228WP0Lykmjs4yPUOZ/QWNMVYssYPOin9BS3Uznd1++miur5/+AqCvjQXKkOhH+Q=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" - sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.17.10" - (sources."@babel/core-7.17.12" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/compat-data-7.19.3" + (sources."@babel/core-7.19.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.17.12" // { + (sources."@babel/generator-7.19.3" // { dependencies = [ - sources."@jridgewell/gen-mapping-0.3.1" + sources."@jridgewell/gen-mapping-0.3.2" ]; }) - (sources."@babel/helper-compilation-targets-7.17.10" // { + (sources."@babel/helper-compilation-targets-7.19.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-environment-visitor-7.16.7" - sources."@babel/helper-function-name-7.17.9" - sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.17.12" - sources."@babel/helper-plugin-utils-7.17.12" - sources."@babel/helper-simple-access-7.17.7" - sources."@babel/helper-split-export-declaration-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.17.9" - sources."@babel/highlight-7.17.12" - sources."@babel/parser-7.17.12" - sources."@babel/plugin-transform-destructuring-7.17.12" - sources."@babel/plugin-transform-parameters-7.17.12" - sources."@babel/plugin-transform-shorthand-properties-7.16.7" - sources."@babel/runtime-7.17.9" - sources."@babel/template-7.16.7" - sources."@babel/traverse-7.17.12" - sources."@babel/types-7.17.12" + sources."@babel/helper-environment-visitor-7.18.9" + sources."@babel/helper-function-name-7.19.0" + sources."@babel/helper-hoist-variables-7.18.6" + sources."@babel/helper-module-imports-7.18.6" + sources."@babel/helper-module-transforms-7.19.0" + sources."@babel/helper-plugin-utils-7.19.0" + sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-split-export-declaration-7.18.6" + sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-validator-identifier-7.19.1" + sources."@babel/helper-validator-option-7.18.6" + sources."@babel/helpers-7.19.0" + sources."@babel/highlight-7.18.6" + sources."@babel/parser-7.19.3" + sources."@babel/plugin-transform-destructuring-7.18.13" + sources."@babel/plugin-transform-parameters-7.18.8" + sources."@babel/plugin-transform-shorthand-properties-7.18.6" + sources."@babel/template-7.18.10" + sources."@babel/traverse-7.19.3" + sources."@babel/types-7.19.3" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@jridgewell/gen-mapping-0.1.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.1.1" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" - sources."@mongodb-js/devtools-connect-1.4.2" - sources."@mongosh/arg-parser-1.4.2" - (sources."@mongosh/async-rewriter2-1.4.2" // { + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/set-array-1.1.2" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.15" + sources."@mongodb-js/devtools-connect-1.4.3" + sources."@mongosh/arg-parser-1.6.0" + (sources."@mongosh/async-rewriter2-1.6.0" // { dependencies = [ sources."@babel/core-7.16.12" sources."semver-6.3.0" ]; }) - sources."@mongosh/autocomplete-1.4.2" - sources."@mongosh/cli-repl-1.4.2" - sources."@mongosh/editor-1.4.2" - sources."@mongosh/errors-1.4.2" - sources."@mongosh/history-1.4.2" - sources."@mongosh/i18n-1.4.2" - sources."@mongosh/js-multiline-to-singleline-1.4.2" - sources."@mongosh/logging-1.4.2" - sources."@mongosh/service-provider-core-1.4.2" - sources."@mongosh/service-provider-server-1.4.2" - sources."@mongosh/shell-api-1.4.2" - sources."@mongosh/shell-evaluator-1.4.2" - (sources."@mongosh/snippet-manager-1.4.2" // { + sources."@mongosh/autocomplete-1.6.0" + sources."@mongosh/cli-repl-1.6.0" + sources."@mongosh/editor-1.6.0" + sources."@mongosh/errors-1.6.0" + sources."@mongosh/history-1.6.0" + sources."@mongosh/i18n-1.6.0" + sources."@mongosh/js-multiline-to-singleline-1.6.0" + sources."@mongosh/logging-1.6.0" + sources."@mongosh/service-provider-core-1.6.0" + sources."@mongosh/service-provider-server-1.6.0" + sources."@mongosh/shell-api-1.6.0" + sources."@mongosh/shell-evaluator-1.6.0" + (sources."@mongosh/snippet-manager-1.6.0" // { dependencies = [ sources."escape-string-regexp-4.0.0" ]; }) - sources."@mongosh/types-1.4.2" + sources."@mongosh/types-1.6.0" sources."@segment/loosely-validate-event-2.0.0" sources."@sideway/address-4.1.4" sources."@sideway/formula-3.0.0" @@ -2030,14 +2012,14 @@ in sources."@types/babel__core-7.1.19" sources."@types/babel__generator-7.6.4" sources."@types/babel__template-7.4.1" - sources."@types/babel__traverse-7.17.1" - sources."@types/chai-4.3.1" - sources."@types/node-17.0.34" - sources."@types/sinon-10.0.11" + sources."@types/babel__traverse-7.18.2" + sources."@types/chai-4.3.3" + sources."@types/node-18.7.23" + sources."@types/sinon-10.0.13" sources."@types/sinon-chai-3.2.8" sources."@types/sinonjs__fake-timers-8.1.2" - sources."@types/webidl-conversions-6.1.1" - sources."@types/whatwg-url-8.2.1" + sources."@types/webidl-conversions-7.0.0" + sources."@types/whatwg-url-8.2.2" sources."abbrev-1.1.1" sources."acorn-7.4.1" sources."acorn-class-fields-0.3.7" @@ -2045,7 +2027,7 @@ in sources."acorn-private-class-elements-0.2.7" sources."acorn-private-methods-0.3.3" sources."acorn-static-class-features-0.2.4" - sources."analytics-node-3.5.0" + sources."analytics-node-5.2.0" sources."ansi-escape-sequences-5.1.2" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" @@ -2055,14 +2037,14 @@ in sources."askpassword-1.2.4" sources."aws4-1.11.0" sources."axios-0.21.4" - sources."axios-retry-3.2.5" + sources."axios-retry-3.2.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" - sources."brace-expansion-1.1.11" - sources."browserslist-4.20.3" - sources."bson-4.6.3" + sources."brace-expansion-2.0.1" + sources."browserslist-4.21.4" + sources."bson-4.7.0" sources."buffer-5.7.1" - sources."caniuse-lite-1.0.30001341" + sources."caniuse-lite-1.0.30001412" sources."chalk-2.4.2" sources."charenc-0.0.2" sources."chownr-2.0.0" @@ -2070,19 +2052,18 @@ in sources."color-name-1.1.3" sources."commander-2.20.3" sources."component-type-1.2.1" - sources."concat-map-0.0.1" sources."config-chain-1.1.13" sources."convert-source-map-1.8.0" sources."cross-spawn-7.0.3" sources."crypt-0.0.2" sources."debug-4.3.4" - sources."denque-2.0.1" + sources."denque-2.1.0" (sources."editorconfig-0.15.3" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."electron-to-chromium-1.4.137" + sources."electron-to-chromium-1.4.267" (sources."emphasize-3.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -2096,12 +2077,12 @@ in sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."fault-1.0.4" - sources."follow-redirects-1.15.0" + sources."follow-redirects-1.15.2" sources."format-0.2.2" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."gensync-1.0.0-beta.2" - sources."glob-7.2.3" + sources."glob-8.0.3" sources."globals-11.12.0" sources."handle-backspaces-1.0.0" sources."has-flag-3.0.0" @@ -2111,14 +2092,14 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."ip-1.1.8" + sources."ip-2.0.0" sources."is-buffer-1.1.6" sources."is-recoverable-error-1.0.2" - sources."is-retry-allowed-2.2.0" + sources."is-retry-allowed-1.2.0" sources."isexe-2.0.0" - sources."joi-17.6.0" + sources."joi-17.6.1" sources."join-component-1.1.0" - sources."js-beautify-1.14.3" + sources."js-beautify-1.14.6" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsesc-2.5.2" @@ -2129,8 +2110,8 @@ in sources."lru-cache-4.1.5" sources."md5-2.3.0" sources."memory-pager-1.5.0" - sources."minimatch-3.1.2" - (sources."minipass-3.1.6" // { + sources."minimatch-5.1.0" + (sources."minipass-3.3.5" // { dependencies = [ sources."yallist-4.0.0" ]; @@ -2141,10 +2122,10 @@ in ]; }) sources."mkdirp-1.0.4" - sources."mongodb-4.6.0" + sources."mongodb-4.10.0" sources."mongodb-ace-autocompleter-0.11.1" sources."mongodb-build-info-1.4.0" - (sources."mongodb-connection-string-url-2.5.2" // { + (sources."mongodb-connection-string-url-2.5.3" // { dependencies = [ sources."tr46-3.0.0" sources."webidl-conversions-7.0.0" @@ -2160,11 +2141,10 @@ in sources."nanoscheduler-1.0.3" sources."nanotiming-7.3.1" sources."node-fetch-2.6.7" - sources."node-releases-2.0.4" - sources."nopt-5.0.0" + sources."node-releases-2.0.6" + sources."nopt-6.0.0" sources."numeral-2.0.6" sources."once-1.4.0" - sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."picocolors-1.0.0" (sources."pretty-repl-3.1.1" // { @@ -2180,7 +2160,6 @@ in sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."punycode-2.1.1" - sources."regenerator-runtime-0.13.9" sources."remove-array-items-1.1.1" sources."remove-trailing-slash-0.1.1" sources."safe-buffer-5.1.2" @@ -2195,7 +2174,7 @@ in sources."shebang-regex-3.0.0" sources."sigmund-1.0.1" sources."smart-buffer-4.2.0" - sources."socks-2.6.2" + sources."socks-2.7.0" sources."source-map-0.5.7" sources."sparse-bitfield-3.0.3" sources."strip-ansi-6.0.1" @@ -2209,7 +2188,8 @@ in sources."text-table-0.2.0" sources."to-fast-properties-2.0.0" sources."tr46-0.0.3" - sources."uuid-3.4.0" + sources."update-browserslist-db-1.0.9" + sources."uuid-8.3.2" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-2.0.2" diff --git a/pkgs/development/tools/mongosh/generate.sh b/pkgs/development/tools/mongosh/generate.sh index cfb60fa21128..e58c9a93f370 100755 --- a/pkgs/development/tools/mongosh/generate.sh +++ b/pkgs/development/tools/mongosh/generate.sh @@ -16,6 +16,6 @@ node2nix \ --output gen/packages.nix \ --composition gen/composition.nix \ --strip-optional-dependencies \ - --nodejs-14 + --nodejs-16 popd 1>/dev/null diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index e21e71907869..118b55197da5 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -43,10 +43,10 @@ stdenv.mkDerivation rec { shared-mime-info wrapGAppsHook gnome.adwaita-icon-theme + glib ]; buildInputs = [ - glib gtk3 json-glib pango diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 0da37f099cea..c9c77fa23233 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.46"; + version = "0.0.47"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "10khkcv2bjsxkwn18vkm025v2qxdiymy8gmky09xz37s51bysvlh"; + sha256 = "sha256-6pwhBcyWKJyV8610hUVTYgz0Ryy1FC4ZU8Alh2LnGCU="; }; - cargoSha256 = "sha256-i0fQ8oEbZen9LD1dccXc4pczBMadP1/fk1cwaNKvVYQ="; + cargoSha256 = "sha256-2nAnlSG1odW2I2642S7qAlDsb94cgRh9AYmxoLX6s/M="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix index 618fbee79b55..2017d5ed21ba 100644 --- a/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/pkgs/development/tools/rust/cargo-edit/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - hash = "sha256-pFQJ2ktn3sMO6DOWlBBe1pJOPytqgqX/EvjGZLnypdY="; + hash = "sha256-xhUI8rkABw3Op3sTctAIL7nCTX6Ejl2jMr0RI4oERIU="; }; - cargoSha256 = "sha256-uTbMiMlCq7qImM5yz1ij0dokJgIMECzdBWst8fwdaoM="; + cargoSha256 = "sha256-7Of641eBgXqa6vaAr4NotDScGPRd+RcTzWRmIn8pEeU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index 910971fbddca..688347f886bc 100644 --- a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.17"; + version = "0.4.18"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-Xlzvfic2uuMTMxAwWbWGii1ZdJglYxRI3iY1YQaufNQ="; + sha256 = "sha256-MQ+T/BwDXPm9xTsujAGrWnIuhJBbij2VaXiRYpNj6ZM="; }; - cargoSha256 = "sha256-3xlKZGRgxOzKtGNQCkZpSKnnczxDNuS4kY1VO/6LxlA="; + cargoSha256 = "sha256-EeUXRcK/4Xl25Q30RnNNF/eAv4zCu6epwrAorfIu21k="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 529fd9195a70..19c487368e78 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.9.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = "cargo-semver-check"; rev = "v${version}"; - sha256 = "0w5qmbjkbd7ss2a3xhx186bykb3ghk6z0dmbz5i06k3acdv52gi7"; + sha256 = "sha256-gB8W/u/Yb/rMMB+654N3Mj4QbTMWGK6cgQKM0lld/10="; }; - cargoSha256 = "sha256-RDFKI++5274bquh4bao10PQbdTOoCWcmueajIm8SvTw="; + cargoSha256 = "sha256-ML4cTNtCvaLFkt1QdA34QvAGhrFTO90xw7fsUD2weqQ="; nativeBuildInputs = [ pkg-config ]; @@ -30,12 +30,13 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # requires nightly version of cargo-rustdoc "--skip=adapter::tests" + "--skip=query::tests" ]; meta = with lib; { description = "A tool to scan your Rust crate for semver violations"; homepage = "https://github.com/obi1kenobi/cargo-semver-check"; license = licenses.asl20; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index 55452bbad530..5f2d8194d064 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.14"; + version = "1.0.15"; src = fetchCrate { inherit pname version; - sha256 = "sha256-hsKrkLkHD5NM3sSVHKIa/dxiW5TszryX8bksGqpZ9fI="; + sha256 = "sha256-vrDPFJB0/kRSZot8LdYO6lPI8oR5G4CZv6Z31gF7XII="; }; - cargoSha256 = "sha256-9ozabY3tsgQa6nsSsF07juOM+oFJSXGcYOz3uju/tLg="; + cargoSha256 = "sha256-dkCfOTZCu9MgqvKJRWwyVfCu1Ul0wDCJznM+N2hPpwo="; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 150df6e25093..327fed92d46f 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "1.3.224.0"; + version = "1.3.224.1"; src = (assert version == spirv-headers.version; fetchFromGitHub { @@ -17,6 +17,21 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers.src}" ]; + # https://github.com/KhronosGroup/SPIRV-Tools/issues/3905 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '-P ''${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake' \ + '-DCMAKE_INSTALL_FULL_LIBDIR=''${CMAKE_INSTALL_FULL_LIBDIR} + -DCMAKE_INSTALL_FULL_INCLUDEDIR=''${CMAKE_INSTALL_FULL_INCLUDEDIR} + -P ''${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake' + substituteInPlace cmake/SPIRV-Tools.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + substituteInPlace cmake/SPIRV-Tools-shared.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + meta = with lib; { inherit (src.meta) homepage; description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules"; diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 1ae5e520e0f7..0484ee47b88e 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -22,7 +22,7 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.224.0"; + version = "1.3.224.1"; # If we were to use "dev" here instead of headers, the setupHook would be # placed in that output instead of "out". @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "sdk-${version}"; - hash = "sha256-MmAxUuV9CVJ6LHUb6ePEiE37meDB1TqPAwLsPdHQ1u8="; + hash = "sha256-5To5Llxl1i1XLaU2tR/O7g7dn2iV3FwLH7gFdXTMXxo="; }); # Include absolute paths to layer libraries in their associated diff --git a/pkgs/development/web/cog/default.nix b/pkgs/development/web/cog/default.nix index a08687e70fd8..c350149f32e2 100644 --- a/pkgs/development/web/cog/default.nix +++ b/pkgs/development/web/cog/default.nix @@ -53,6 +53,12 @@ stdenv.mkDerivation rec { "-DCOG_USE_WEBKITGTK=ON" ]; + # https://github.com/Igalia/cog/issues/438 + postPatch = '' + substituteInPlace core/cogcore.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + ''; + # not ideal, see https://github.com/WebPlatformForEmbedded/libwpe/issues/59 preFixup = '' wrapProgram $out/bin/cog \ diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index a25111bddfe9..3796741f96ca 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -74,6 +74,7 @@ in buildPythonApplication rec { pname = "anki"; inherit version; + format = "other"; src = fetchurl { urls = [ diff --git a/pkgs/misc/openrussian-cli/default.nix b/pkgs/misc/openrussian-cli/default.nix index e6e089e88612..038bdd5a73f1 100644 --- a/pkgs/misc/openrussian-cli/default.nix +++ b/pkgs/misc/openrussian-cli/default.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { cp openrussian $out/bin wrapProgram $out/bin/openrussian \ - --prefix LUA_PATH ';' '${lua.pkgs.lib.genLuaPathAbsStr luaEnv}' \ - --prefix LUA_CPATH ';' '${lua.pkgs.lib.genLuaCPathAbsStr luaEnv}' + --prefix LUA_PATH ';' '${lua.pkgs.luaLib.genLuaPathAbsStr luaEnv}' \ + --prefix LUA_CPATH ';' '${lua.pkgs.luaLib.genLuaCPathAbsStr luaEnv}' runHook postInstall ''; diff --git a/pkgs/os-specific/darwin/xattr/default.nix b/pkgs/os-specific/darwin/xattr/default.nix index 1aa8b49e88aa..a1e3c4914879 100644 --- a/pkgs/os-specific/darwin/xattr/default.nix +++ b/pkgs/os-specific/darwin/xattr/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ ed unifdef + python.pkgs.setuptools ]; makeFlags = [ diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index ab3e2232852b..bb042e31c0e8 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -52,6 +52,10 @@ python.pkgs.buildPythonApplication rec { substituteAll ${./absolute-ausyscall.patch} ./absolute-ausyscall.patch patch -p1 < absolute-ausyscall.patch + + # https://github.com/iovisor/bcc/issues/3996 + substituteInPlace src/cc/libbcc.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ ''; postInstall = '' diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index d424f89fdfb3..2545c73ac588 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -44,6 +44,10 @@ stdenv.mkDerivation rec { }) ]; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ asciidoc docbook_xml_dtd_45 @@ -53,10 +57,10 @@ stdenv.mkDerivation rec { meson ninja pkg-config + glib ] ++ lib.optional (!doCheck) python3; buildInputs = [ - glib polkit systemd ]; @@ -71,7 +75,7 @@ stdenv.mkDerivation rec { dbus gobject-introspection umockdev - (python3.withPackages + (python3.pythonForBuild.withPackages (p: [ p.pygobject3 p.dbus-python p.python-dbusmock ])) ]; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 0cc8ee3cf3f0..09c3ac16071e 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/patch/?id=a3272b93725a406bc98b67373da67a4bdf6fcdb0"; sha256 = "0hyagh2lf6rrfss4z7ca8q3ydya6gg7vfhh25slhpgcn6lnk0xbv"; }) + + # fix build on musl. applied anywhere to prevent patchrot. + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/main/iproute2/min.patch?id=4b78dbe29d18151402052c56af43cc12d04b1a69"; + sha256 = "sha256-0ROZQAN3mUPPgggictr23jyA4JDG7m9vmBUhgRp4ExY="; + }) ]; preConfigure = '' diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 4d08a38dbe85..c58a1b8db07e 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "kbd"; - version = "2.4.0"; + version = "2.5.1"; src = fetchurl { url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz"; - sha256 = "17wvrqz2kk0w87idinhyvd31ih1dp7ldfl2yfx7ailygb0279w2m"; + sha256 = "sha256-zN9FI4emOAlz0pJzY+nLuTn6IGiRWm+Tf/nSRSICRoM="; }; configureFlags = [ diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix index ad01a83ac935..1ba14c5f4714 100644 --- a/pkgs/os-specific/linux/libcap-ng/default.nix +++ b/pkgs/os-specific/linux/libcap-ng/default.nix @@ -1,36 +1,19 @@ -{ lib, stdenv, fetchurl, swig ? null, python2 ? null, python3 ? null }: - -assert python2 != null || python3 != null -> swig != null; +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "libcap-ng"; - # When updating make sure to test that the version with - # all of the python bindings still works version = "0.8.3"; src = fetchurl { - url = "${meta.homepage}/${pname}-${version}.tar.gz"; + url = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${version}.tar.gz"; sha256 = "sha256-vtb2hI4iuy+Dtfdksq7w7TkwVOgDqOOocRyyo55rSS0="; }; - nativeBuildInputs = [ swig ]; - buildInputs = [ python2 python3 ]; - - postPatch = '' - function get_header() { - echo -e "#include <$1>" | gcc -M -xc - | tr ' ' '\n' | grep "$1" | head -n 1 - } - - # Fix some hardcoding of header paths - sed -i "s,/usr/include/linux/capability.h,$(get_header linux/capability.h),g" bindings/python{,3}/Makefile.in - ''; - configureFlags = [ - (if python2 != null then "--with-python" else "--without-python") - (if python3 != null then "--with-python3" else "--without-python3") + "--without-python" ]; - meta = let inherit (lib) platforms licenses; in { + meta = with lib; { description = "Library for working with POSIX capabilities"; homepage = "https://people.redhat.com/sgrubb/libcap-ng/"; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index 6d737ea6bad3..c28c55091ef2 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "mmc-utils"; - version = "unstable-2022-07-13"; + version = "unstable-2022-09-27"; src = fetchzip rec { url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${passthru.rev}.tar.gz"; - passthru.rev = "d7b343fd262880994f041ce2335442e7bd1071f5"; - sha256 = "cTF3xSNvZ1wifItPmflNFd+fpYArPRvinM7Cyg3JoeE="; + passthru.rev = "dfc3b6ecda84d21418fb4408b39c5c71db4c6458"; + sha256 = "G4sBwRW8NOq7CGTADvXgMbcVInStSueGfGsb4ApVaSk="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix=$(out)" ]; diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index 2f8a4feb0301..ac17a18273a7 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numactl"; - version = "2.0.14"; + version = "2.0.15"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0hahpdp5xqy9cbg251bdxqkml341djn2h856g435h4ngz63sr9fs"; + sha256 = "sha256-mowDqCkAHDEV9AWCgAEWL0//sNMUk/K8w3eO7Wg+AwQ="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/os-specific/linux/oxtools/default.nix b/pkgs/os-specific/linux/oxtools/default.nix new file mode 100644 index 000000000000..02afb28e66e0 --- /dev/null +++ b/pkgs/os-specific/linux/oxtools/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub +, glibc, python3 +}: + +stdenv.mkDerivation rec { + pname = "0xtools"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "tanelpoder"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-pe64st3yhVfZi8/sTEfH1cNjx7JpqxDmxMmodpXnqaU="; + }; + + postPatch = '' + substituteInPlace lib/0xtools/proc.py \ + --replace /usr/include/asm/unistd_64.h ${glibc.dev}/include/asm/unistd_64.h + ''; + + buildInputs = [ python3 ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + preInstall = '' + mkdir -p $out/bin + ''; + + meta = with lib; { + description = "Utilities for analyzing application performance"; + homepage = "https://0x.tools"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ astro ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/pkgs/os-specific/linux/power-profiles-daemon/default.nix index 402b2536163c..f2720f40f5d4 100644 --- a/pkgs/os-specific/linux/power-profiles-daemon/default.nix +++ b/pkgs/os-specific/linux/power-profiles-daemon/default.nix @@ -2,6 +2,7 @@ , lib , pkg-config , meson +, mesonEmulatorHook , ninja , fetchFromGitLab , fetchpatch @@ -24,13 +25,6 @@ , nixosTests }: -let - testPythonPkgs = ps: with ps; [ - pygobject3 - dbus-python - python-dbusmock - ]; -in stdenv.mkDerivation rec { pname = "power-profiles-daemon"; version = "0.12"; @@ -58,6 +52,14 @@ stdenv.mkDerivation rec { gobject-introspection wrapGAppsNoGuiHook python3.pkgs.wrapPython + # checkInput but cheked for during the configuring + (python3.pythonForBuild.withPackages (ps: with ps; [ + pygobject3 + dbus-python + python-dbusmock + ])) + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ @@ -81,13 +83,12 @@ stdenv.mkDerivation rec { checkInputs = [ umockdev dbus - (python3.withPackages testPythonPkgs) ]; mesonFlags = [ "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "-Dgtk_doc=true" - "-Dtests=true" + "-Dtests=${lib.boolToString (stdenv.buildPlatform.canExecute stdenv.hostPlatform)}" ]; doCheck = true; diff --git a/pkgs/os-specific/linux/powercap/default.nix b/pkgs/os-specific/linux/powercap/default.nix index 96ec83852d9d..e705b6a34857 100644 --- a/pkgs/os-specific/linux/powercap/default.nix +++ b/pkgs/os-specific/linux/powercap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "powercap"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-l+IpFqBnCYUU825++sUPySD/Ku0TEIX2kt+S0Wml6iA="; }; + # in master post 0.6.0, see https://github.com/powercap/powercap/issues/8 + patches = [ + (fetchpatch { + name = "fix-pkg-config.patch"; + url = "https://github.com/powercap/powercap/commit/278dceb51635686e343edfc357b6020533fff299.patch"; + sha256 = "0h62j63xdn0iqyx4xbia6hlmdjn45camb82z4vv6sb37x9sph7rg"; + }) + ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index ba655e75be54..462151ff64f7 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { preConfigure = '' export SGML_CATALOG_FILES="${docbookFiles}" - export PYTHONPATH=$(find ${python3.pkgs.ldap} -type d -name site-packages) + export PYTHONPATH=$(find ${python3.pkgs.python-ldap} -type d -name site-packages) export PATH=$PATH:${openldap}/libexec configureFlagsArray=( @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { samba nfs-utils p11-kit python3 popt talloc tdb tevent ldb pam openldap pcre2 libkrb5 cifs-utils glib keyutils dbus fakeroot libxslt libxml2 - libuuid python3.pkgs.ldap systemd nspr check cmocka uid_wrapper + libuuid python3.pkgs.python-ldap systemd nspr check cmocka uid_wrapper nss_wrapper ncurses Po4a http-parser jansson jose ]; makeFlags = [ diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 0308c8463951..5b417369a558 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -98,8 +98,8 @@ , withShellCompletions ? true , withTimedated ? true , withTimesyncd ? true -, withTpm2Tss ? !stdenv.hostPlatform.isMusl -, withUserDb ? !stdenv.hostPlatform.isMusl +, withTpm2Tss ? true +, withUserDb ? true , withUtmp ? !stdenv.hostPlatform.isMusl # tests assume too much system access for them to be feasible for us right now , withTests ? false diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix index c9298ecec4e2..74f32cd85991 100644 --- a/pkgs/os-specific/linux/waydroid/default.nix +++ b/pkgs/os-specific/linux/waydroid/default.nix @@ -17,6 +17,7 @@ python3Packages.buildPythonApplication rec { pname = "waydroid"; version = "1.3.0"; + format = "other"; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/servers/headphones/default.nix b/pkgs/servers/headphones/default.nix index f39390f5ea92..9ebf04b80bdd 100644 --- a/pkgs/servers/headphones/default.nix +++ b/pkgs/servers/headphones/default.nix @@ -3,6 +3,7 @@ python3.pkgs.buildPythonApplication rec { pname = "headphones"; version = "0.6.0-beta.5"; + format = "other"; src = fetchFromGitHub { owner = "rembo10"; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 599211c398d5..01dc882c156a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -177,19 +177,6 @@ let }); }) - # pyunifiprotect excludes pydantic==1.9.1 - (self: super: { - pydantic = super.pydantic.overridePythonAttrs (oldAttrs: rec { - version = "1.9.0"; - src = fetchFromGitHub { - owner = "samuelcolvin"; - repo = "pydantic"; - rev = "refs/tags/v${version}"; - hash = "sha256-C4WP8tiMRFmkDkQRrvP3yOSM2zN8pHJmX9cdANIckpM="; - }; - }); - }) - (self: super: { pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec { doCheck = false; # requires pytest-aiohttp>=1.0.0 @@ -363,6 +350,7 @@ in python.pkgs.buildPythonApplication rec { "orjson" "PyJWT" "requests" + "yarl" ]; in '' sed -r -i \ diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 7703bc6b2832..196da7e63953 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -70,6 +70,7 @@ let in lib.listToAttrs (map (component: lib.nameValuePair component ( home-assistant.overridePythonAttrs (old: { pname = "homeassistant-test-${component}"; + format = "other"; dontBuild = true; dontInstall = true; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 555615a83f54..09f58becbab4 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -566,8 +566,8 @@ in name = "vts"; owner = "vozlt"; repo = "nginx-module-vts"; - rev = "v0.2.0"; - sha256 = "sha256-uVGHFJt9KNcM4cdCUcSYL5KxbCiZkFf1eTdafCZXRew="; + rev = "v0.2.1"; + sha256 = "sha256-x4ry5ljPeJQY+7Mp04/xYIGf22d6Nee7CSqHezdK4gQ="; }; }; } diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 69f5ba63e8ed..544e6e2afb45 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -29,13 +29,13 @@ let in buildDotnetModule rec { pname = "jellyfin"; - version = "10.8.4"; # ensure that jellyfin-web has matching version + version = "10.8.5"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; rev = "v${version}"; - sha256 = "dzaySywQ43Vdj0GUGjpKaSgsu5Zu0SKyoOCYHAfp/v8="; + sha256 = "le6yNEK1k0U9ZnkqvBLCiLz0p3rK7jcet7xl/ym+L2g="; }; patches = [ diff --git a/pkgs/servers/jellyfin/disable-warnings.patch b/pkgs/servers/jellyfin/disable-warnings.patch index 7135af916e2d..0127513b5ea7 100644 --- a/pkgs/servers/jellyfin/disable-warnings.patch +++ b/pkgs/servers/jellyfin/disable-warnings.patch @@ -1,8 +1,8 @@ diff --git a/jellyfin.ruleset b/jellyfin.ruleset -index 1c834de82..e8f091f71 100644 +index 5ac5f4923..88621857b 100644 --- a/jellyfin.ruleset +++ b/jellyfin.ruleset -@@ -54,6 +54,29 @@ +@@ -54,6 +54,31 @@ @@ -29,6 +29,8 @@ index 1c834de82..e8f091f71 100644 + + + ++ ++ diff --git a/pkgs/servers/jellyfin/nuget-deps.nix b/pkgs/servers/jellyfin/nuget-deps.nix index ff3acec2569e..efad6840bb70 100644 --- a/pkgs/servers/jellyfin/nuget-deps.nix +++ b/pkgs/servers/jellyfin/nuget-deps.nix @@ -1,3 +1,6 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + { fetchNuGet }: [ (fetchNuGet { pname = "BDInfo"; version = "0.7.6.2"; sha256 = "0i2hrd0s434bg7807q05m4781i0b4469ixpqqzrc5j3cw7y34w4a"; }) (fetchNuGet { pname = "BlurHashSharp"; version = "1.2.0"; sha256 = "01v56mxblgsclyajyvicvznqlsak29di3n4v5rm314k45avsiclp"; }) @@ -11,24 +14,21 @@ (fetchNuGet { pname = "Humanizer.Core"; version = "2.8.26"; sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; }) (fetchNuGet { pname = "Jellyfin.XmlTv"; version = "10.8.0"; sha256 = "0fv923y58z9l97zhlrifmki0x1m7r52avglhrl2h1jjv1x1wkvzx"; }) (fetchNuGet { pname = "libse"; version = "3.6.5"; sha256 = "1h0rm8jbwjp0qgayal48zdzgsqr7c7v9lnc4v8x0r0pxrb4f0x1k"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.6"; sha256 = "1fv3xvqc98l3ma4s8f2g4fklifbj1i24fngcvlhfm4j6s295xjj1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.6"; sha256 = "1z50gqg0jimk98yd0zr2vxn087h3h1qn08fdcqbaxfgpcw30yi87"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0ndah9cqkgswhi60wrnni10j1d2hdg8jljij83lk1wbfqbng86jm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization"; version = "6.0.8"; sha256 = "0lyqamnvhgmk818sv4n9162vri5ysr3lyfai60zpk3kjlqz34j09"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Metadata"; version = "6.0.8"; sha256 = "065mdy88ybiavjxfq2nlx5zsrlyyqga1nbhgddag4q4f49jfc45b"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization"; version = "6.0.9"; sha256 = "0hmiw2k182nmrzk9hnk1l348m3qw6y66lpg2c4s43qnywg7hxafm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Metadata"; version = "6.0.9"; sha256 = "0dq0ilr9mv9prlx16vdhqag4h91ypx9mxq7fk7drfynqvq6s3sc2"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.1.1"; sha256 = "1bb5p4zlnfn88skkvymxfsn0jybqncl4356hwnic9jxdq2d4fz1w"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.3"; sha256 = "1z6x0d8lpcfjr3sxy25493i17vvcg5bsay6c03qan6mnj5aqzw2k"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "6.0.8"; sha256 = "1q3rp78yni4mj8bgr5dg1s99mg0dh3rd2ha4f29vfhvp9gps5khi"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "6.0.8"; sha256 = "1lacqr6mj655vdqrg7pna3a00nzkr5z1c2ddz4l0m28lsfyb7390"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "6.0.8"; sha256 = "1nx66ygn3xs14raa51zhb6a1g58vq4r5b7vm1y5gw7995bcgdgha"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "6.0.8"; sha256 = "1f934bynjb7k2bfdmsslbnvg2gdrr7n1789pk4sglj41raaxdlvl"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "6.0.8"; sha256 = "1sb8qkfkghn3bw21rlnb2gpban7gzs293qps7d2qdxs64nnbjcq7"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "6.0.8"; sha256 = "1qbi5srbgl6y70gq3cdy4qfpw0b5wk447jd353xqgblj0nhpqaxn"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "6.0.8"; sha256 = "19z7w26ksq553x47b0p3qxiib5yz4cfkjdqimb855cly55117jyy"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "6.0.8"; sha256 = "1bnim9p7qv3p2fg0ajkbkbvi8jnbam70hd49shgp0a38y0j6dhd4"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Tools"; version = "6.0.8"; sha256 = "1rh69cxchvxnmwkdjm6ffvfivbk3lbg2ahjp7pd1f40dicxf7rvd"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "6.0.9"; sha256 = "1453zyq14v9fvfzc39656gb6pazq5gwmqb3r2pni4cy5jdgd9rpi"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "6.0.9"; sha256 = "1y5c0l3mckpn9fjvnc65rycym2w1fghwp7dn0srbb14yn8livb0a"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "6.0.9"; sha256 = "1n87lzcbvc7r0z1g2p4g0cp7081zrbkzzvlnn4n7f7jcc1mlbjb2"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "6.0.9"; sha256 = "1y023q4i0v1pxk269i8rmzrndsl35l6lgw8h17a0vimg7ismg3sn"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "6.0.9"; sha256 = "1sj73327s4xyhml3ny7kxafdrp7s1p48niv45mlmy86qqpyps55r"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "6.0.9"; sha256 = "18wfjh8b6j4z9ndil0d6h3bwjx1gxka94z6i4sgn8sg2lz65qlfs"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "6.0.9"; sha256 = "0wdajhdlls17gfvvf01czbl5m12nkac42hx8yyjn3vgcb5vdp81f"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "6.0.9"; sha256 = "0yxsqdfcszxls3s82fminb4dkwz78ywgry18gb9bhsx0y3az3hqz"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Tools"; version = "6.0.9"; sha256 = "0klpcc70xrvn1qnb9ipgrppfg3r8mj4lvg424v40rr7x0bdv7xnq"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "3.0.0"; sha256 = "13a47xcqyi5gz85swxd4mgp7ndgl4kknrvv3xwmbn71hsh953hsh"; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "6.0.0"; sha256 = "0qn30d3pg4rx1x2k525jj4x5g1fxm2v5m0ksz2dmk1gmqalpask8"; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "6.0.1"; sha256 = "0ra0ldbg09r40jzvfqhpb3h42h80nafvka9hg51dja32k3mxn5gk"; }) @@ -55,9 +55,9 @@ (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "3.0.0"; sha256 = "1cm0hycgb33mf1ja9q91wxi3gk13d1p462gdq7gndrya23hw2jm5"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks"; version = "6.0.8"; sha256 = "18h8bccffwvlcjf6bva7b62lyx887hcj3qmd0zzcyn00lc818i8z"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions"; version = "6.0.8"; sha256 = "006sd4b0sh529fka8wwh4hf7n7c4qb3z7rawaqg9j1rwz6i10zvd"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore"; version = "6.0.8"; sha256 = "1gjq3nj81vhfhfzfqs2dfm76lqpbhc0j8kl69m9qzigwsvvcvqpp"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks"; version = "6.0.9"; sha256 = "06mx8zmlmi371ab5pskw8iawy8bbi4vx6rwrcj0andc59zfmg96q"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions"; version = "6.0.9"; sha256 = "1nv2rwq0q7ql63qip5ba45p97yxgva9jg6gnvrnfh2yk2fjwyag2"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore"; version = "6.0.9"; sha256 = "0hxnxq32rflz4nrvssbf9hhvyyay745dabdyhpxq5p41hi13pkik"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "3.1.8"; sha256 = "0z173lsfypzjdx1a352svh1pgk7lgq2wpj5q60i1rgcrd3ib8b21"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "6.0.0"; sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; }) @@ -73,7 +73,7 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.9"; sha256 = "1i24mz3v677bmdysxklm9a3qc87j72lpkfp0l16gh6yqpmhwg7vp"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.1"; sha256 = "17w4x7iakwpn7crg4yk5qkkv5gkx0lfl6anwwhb1554pwak5cwdz"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.2"; sha256 = "1wv54f3p3r2zj1pr9a6z8zqrh2ihm6v6qcw2pjwis1lcc0qb472m"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "3.1.9"; sha256 = "0rpix172cmwwbddh4gm0647x1ql0ly5n68bpz71v915j97anwg90"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) @@ -84,11 +84,6 @@ (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.1.9"; sha256 = "0538fvjz9c27nvc6kv83b0912qvc71wz2w60svl0mscj86ds49wc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.6"; sha256 = "0kygwac98rxq89g83lyzn21kslvgdkcqfd1dnba2ssw7q056fbgy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.6"; sha256 = "0hlxq0k60ras0wj7d7q94dxd8nzjcry0kixxs6z1hyrbm4q0y3ls"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.6"; sha256 = "088ggz1ac5z4ir707xmxiw4dlcaacfgmyvvlgwvsxhnv3fngf8b6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.6"; sha256 = "117rz4gm7ihns5jlc2x05h7kdcgrl0ic4v67dzfbbr9kpra1bmcw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0fjbjh7yxqc9h47ix37y963xi9f9y99jvl26cw3x3kvjlb8x0bgj"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) @@ -152,10 +147,10 @@ (fetchNuGet { pname = "Serilog.Sinks.Graylog"; version = "2.3.0"; sha256 = "1mnji4p1n9rsjxlaal84zkypwqcfciws1si863zz4ld2xvv9adri"; }) (fetchNuGet { pname = "SerilogAnalyzer"; version = "0.15.0.0"; sha256 = "0k83cyzl9520q282vp07zb8rs16a56axv7a31l3m5fb1afq2hv9l"; }) (fetchNuGet { pname = "SharpCompress"; version = "0.32.2"; sha256 = "1p198bl08ia89rf4n6yjpacj3yrz6s574snsfl40l8vlqcdrc1pm"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.79"; sha256 = "0yf7kkzzlqi692c9s27g54xm29fh8vs7wxv8zz5z8lvk432hwvhn"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.79"; sha256 = "08538148f7pmkrfn3lb1167gg8kqw59xlygrsas2x4888h9zlxjh"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.79"; sha256 = "033d36x2i8xan9qbv7fikc9i7z93n46jfk031ds2yiqh850b2am5"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.79"; sha256 = "0gbscj405jw50xh2mbzfq1id4z3cxf00cy75nx13j0c23pyx09j6"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.2"; sha256 = "0fnvp1yxl8gix9qb812pslhp8dvbf12ackvmp4yjdig6ybix77az"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.2"; sha256 = "1jc65bg75kxa2hv33y9584hbar10lirahgnh8s12lk8dpb23a3m3"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.2"; sha256 = "0vsbl3sjz15nsgpbmjs0p6nd1842j4pbb0jvzaqn3w7rrwyl44bk"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.2"; sha256 = "1g1v7x2dnnsljf43m7yl54nx17z9wswlh9qi3b8cl7z1g04800vi"; }) (fetchNuGet { pname = "SkiaSharp.Svg"; version = "1.60.0"; sha256 = "1gja5fdk4dn9l7vqnik29v1x5b4xnp2dpjm4gmpv44r6085i9hz0"; }) (fetchNuGet { pname = "SmartAnalyzers.MultithreadingAnalyzer"; version = "1.1.31"; sha256 = "1qk5s4rx5ma7k2kzkn1h94fsrzmwkivj0z1czsjwmr8z7zhngs2h"; }) (fetchNuGet { pname = "SQLitePCL.pretty.netstandard"; version = "3.1.0"; sha256 = "1r2kqkaw2viyxizsp98xcv5m4lv62s5qp7d7cnx02g4drwxcpk2h"; }) @@ -214,7 +209,7 @@ (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) (fetchNuGet { pname = "System.Text.Json"; version = "4.6.0"; sha256 = "0ism236hwi0k6axssfq58s1d8lihplwiz058pdvl8al71hagri39"; }) (fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "6.0.5"; sha256 = "12fg196sdq3gcjcz365kypfkkmdrprpcw2fvjnww9jqa4yn8v99l"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "6.0.6"; sha256 = "0bkfrnr9618brbl1gvhyqrf5720syawf9dvpk8xfvkxbg7imlpjx"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index aa46426142bd..438d7d0e630f 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { # lib389 (python3.withPackages (ps: with ps; [ setuptools - ldap + python-ldap six pyasn1 pyasn1-modules diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix index 1ca9e702e7ad..ccd77548c0c0 100644 --- a/pkgs/servers/monitoring/plugins/esxi.nix +++ b/pkgs/servers/monitoring/plugins/esxi.nix @@ -6,6 +6,7 @@ let in python3Packages.buildPythonApplication rec { pname = lib.replaceStrings [ "_" ] [ "-" ] bName; version = "20200710"; + format = "other"; src = fetchFromGitHub { owner = "Napsty"; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 4f059b7e84f1..b4db3ee5679f 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -1,19 +1,20 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "collectd-exporter"; version = "0.5.0"; - rev = version; - - goPackagePath = "github.com/prometheus/collectd_exporter"; src = fetchFromGitHub { - rev = "v${version}"; owner = "prometheus"; repo = "collectd_exporter"; + rev = "v${version}"; sha256 = "0vb6vnd2j87iqxdl86j30dk65vrv4scprv200xb83203aprngqgh"; }; + vendorSha256 = null; + + ldflags = [ "-s" "-w" ]; + passthru.tests = { inherit (nixosTests.prometheus-exporters) collectd; }; meta = with lib; { diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 9be43ee501de..82bdc7a31f8b 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost, fmt +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost, fmt, buildPackages # Darwin inputs , AudioToolbox, AudioUnit # Inputs @@ -145,6 +145,8 @@ let ] ++ concatAttrVals features_ nativeFeatureDependencies; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "12.0") '' substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \ --replace kAudioObjectPropertyElement{Main,Master} \ diff --git a/pkgs/servers/nfd/default.nix b/pkgs/servers/nfd/default.nix index 2f0176de2b82..3eda5e2b25dd 100644 --- a/pkgs/servers/nfd/default.nix +++ b/pkgs/servers/nfd/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { description = "Named Data Neworking (NDN) Forwarding Daemon"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = [ maintainers.bertof ]; + maintainers = [ lib.maintainers.bertof ]; }; } diff --git a/pkgs/servers/persistent-evdev/default.nix b/pkgs/servers/persistent-evdev/default.nix index c666e9c8d799..97f0ea01219c 100644 --- a/pkgs/servers/persistent-evdev/default.nix +++ b/pkgs/servers/persistent-evdev/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "persistent-evdev"; version = "unstable-2022-05-07"; + format = "other"; src = fetchFromGitHub { owner = "aiberia"; diff --git a/pkgs/servers/pinnwand/steck.nix b/pkgs/servers/pinnwand/steck.nix index de6f28f30907..ed54c3d20c3d 100644 --- a/pkgs/servers/pinnwand/steck.nix +++ b/pkgs/servers/pinnwand/steck.nix @@ -14,10 +14,16 @@ python3Packages.buildPythonApplication rec { }; postPatch = '' + cat setup.py substituteInPlace setup.py \ - --replace 'click>=7.0,<8.0' 'click' + --replace 'click>=7.0,<8.0' 'click' \ + --replace 'termcolor>=1.1.0,<2.0.0' 'termcolor' ''; + nativeBuildInputs = with python3Packages; [ + setuptools + ]; + propagatedBuildInputs = with python3Packages; [ pkgs.git appdirs diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index a4d0787cbfed..1f5c4a10d4b1 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "monetdb"; - version = "11.43.21"; + version = "11.45.7"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; - sha256 = "sha256-1JfwRMpsEbK+HELwp5BFDkJoJ2yIgHwWvwhGfeaBGsA="; + sha256 = "sha256-hIfi8YfZIExgv+z3YAxvkX8MiiGmOjB+/OryUoRPmDI="; }; postPatch = '' @@ -18,7 +18,14 @@ stdenv.mkDerivation rec { ''; postInstall = '' - rm $out/bin/monetdb_mtest.sh + rm $out/bin/monetdb_mtest.sh \ + $out/bin/mktest.py \ + $out/bin/sqlsample.php \ + $out/bin/sqllogictest.py \ + $out/bin/Mz.py \ + $out/bin/Mtest.py \ + $out/bin/sqlsample.pl \ + $out/bin/malsample.pl ''; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index ef5b58787f33..77d68e1d9aab 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -858,11 +858,11 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { pname = "libX11"; - version = "1.7.2"; + version = "1.8.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libX11-1.7.2.tar.bz2"; - sha256 = "0v7aj8q3rlchdyfwdna7n7vgpyzyir391dlv5rwy9fxagbikbyhw"; + url = "mirror://xorg/individual/lib/libX11-1.8.1.tar.xz"; + sha256 = "1xyry8i7zqmlkvpbyyqwi18rrdw6ycczlvfp63rh2570pfhimi0v"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index dbab8a4774f1..302d56a06636 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -174,7 +174,7 @@ mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.7.2.tar.bz2 +mirror://xorg/individual/lib/libX11-1.8.1.tar.xz mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.14.tar.bz2 mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 diff --git a/pkgs/shells/bash/5.1.nix b/pkgs/shells/bash/5.1.nix index 7cd7fb6905cb..390dab12c947 100644 --- a/pkgs/shells/bash/5.1.nix +++ b/pkgs/shells/bash/5.1.nix @@ -33,7 +33,11 @@ stdenv.mkDerivation rec { sha256 = "1alv68wplnfdm6mh39hm57060xgssb9vqca4yr1cyva0c342n0fc"; }; - hardeningDisable = [ "format" ]; + hardeningDisable = [ "format" ] + # bionic libc is super weird and has issues with fortify outside of its own libc, check this comment: + # https://github.com/NixOS/nixpkgs/pull/192630#discussion_r978985593 + # or you can check libc/include/sys/cdefs.h in bionic source code + ++ optional (stdenv.hostPlatform.libc == "bionic") "fortify"; outputs = [ "out" "dev" "man" "doc" "info" ]; diff --git a/pkgs/shells/fish/wrapper.nix b/pkgs/shells/fish/wrapper.nix index f978f2bdfa4d..c5c55bb71103 100644 --- a/pkgs/shells/fish/wrapper.nix +++ b/pkgs/shells/fish/wrapper.nix @@ -1,25 +1,47 @@ -{ lib, writeShellScriptBin, fish }: +{ lib, writeShellScriptBin, fish, writeTextFile }: -with lib; - -makeOverridable ({ +lib.makeOverridable ({ completionDirs ? [], functionDirs ? [], confDirs ? [], - pluginPkgs ? [] + pluginPkgs ? [], + localConfig ? "", + shellAliases ? {} }: let + aliasesStr = builtins.concatStringsSep "\n" + (lib.mapAttrsToList (k: v: "alias ${k} ${lib.escapeShellArg v}") shellAliases); + + shellAliasesFishConfig = writeTextFile { + name = "wrapfish.aliases.fish"; + destination = "/share/fish/vendor_conf.d/aliases.fish"; + text = '' + status --is-interactive; and begin + # Aliases + ${aliasesStr} + end + ''; + }; + + localFishConfig = writeTextFile { + name = "wrapfish.local.fish"; + destination = "/share/fish/vendor_conf.d/config.local.fish"; + text = localConfig; + }; + vendorDir = kind: plugin: "${plugin}/share/fish/vendor_${kind}.d"; complPath = completionDirs ++ map (vendorDir "completions") pluginPkgs; funcPath = functionDirs ++ map (vendorDir "functions") pluginPkgs; - confPath = confDirs ++ map (vendorDir "conf") pluginPkgs; + confPath = confDirs + ++ (map (vendorDir "conf") pluginPkgs) + ++ (map (vendorDir "conf") [ localFishConfig shellAliasesFishConfig ]); in writeShellScriptBin "fish" '' ${fish}/bin/fish --init-command " - set --prepend fish_complete_path ${escapeShellArgs complPath} - set --prepend fish_function_path ${escapeShellArgs funcPath} - set --local fish_conf_source_path ${escapeShellArgs confPath} + set --prepend fish_complete_path ${lib.escapeShellArgs complPath} + set --prepend fish_function_path ${lib.escapeShellArgs funcPath} + set --local fish_conf_source_path ${lib.escapeShellArgs confPath} for c in \$fish_conf_source_path/*; source \$c; end " "$@" '') diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 92f166c9cfbf..532317dd27cd 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.42"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.25.76"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-5DH3Ik0DHmHfZ+XfFjmC2CL5WRoA9ENgzDeYfCgwtTI="; + hash = "sha256-PSr0zZEGXFxcFSN7QQ5Ux0Z4aCwwm9na+2hIv/gR6+s="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/pkgs/tools/admin/colmena/default.nix b/pkgs/tools/admin/colmena/default.nix index 3343980474c8..aed2febd7029 100644 --- a/pkgs/tools/admin/colmena/default.nix +++ b/pkgs/tools/admin/colmena/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "colmena"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "zhaofengli"; repo = "colmena"; rev = "v${version}"; - sha256 = "sha256-kXc5YD3u+4lLWnih6s5ZjOYT+p0TvC2I7GT9eBAK2Jk="; + sha256 = "sha256-F/Jl1GqSp08fw7PCHiv/ijn/pAP1YOStIhHws291s7A="; }; - cargoSha256 = "sha256-B8gO2m+i3BOsMyB/KHlA4MO+a5UT+ZAN1XJ92X1suec="; + cargoSha256 = "sha256-9HQLSbzHNJRHhGffE0JC9e+CLuUV/xreiv5qc8dH+rU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/docker-credential-helpers/default.nix b/pkgs/tools/admin/docker-credential-helpers/default.nix index c32c8834f8dc..7859145dfdd1 100644 --- a/pkgs/tools/admin/docker-credential-helpers/default.nix +++ b/pkgs/tools/admin/docker-credential-helpers/default.nix @@ -1,50 +1,52 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, pkg-config, libsecret }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, pkg-config, libsecret, testers, docker-credential-helpers }: -buildGoPackage rec { +buildGoModule rec { pname = "docker-credential-helpers"; - version = "0.6.3"; - - goPackagePath = "github.com/docker/docker-credential-helpers"; + version = "0.7.0"; src = fetchFromGitHub { owner = "docker"; repo = pname; rev = "v${version}"; - sha256 = "0xgmwjva3j1s0cqkbajbamj13bgzh5jkf2ir54m9a7w8gjnsh6dx"; + sha256 = "sha256-KtDWrtd88s4Al3iWxIYE+YlhZTzf8/YDVYE2AwxH8ho="; }; + vendorSha256 = null; + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ libsecret ]; + ldflags = [ + "-s" + "-w" + "-X github.com/docker/docker-credential-helpers/credentials.Version=${version}" + ]; + buildPhase = - if stdenv.isDarwin - then '' - cd go/src/${goPackagePath} - go build -ldflags -s -o bin/docker-credential-osxkeychain osxkeychain/cmd/main_darwin.go + let + cmds = if stdenv.isDarwin then [ "osxkeychain" "pass" ] else [ "secretservice" "pass" ]; + in '' - else '' - cd go/src/${goPackagePath} - go build -o bin/docker-credential-secretservice secretservice/cmd/main_linux.go - go build -o bin/docker-credential-pass pass/cmd/main_linux.go + for cmd in ${builtins.toString cmds}; do + go build -ldflags "${builtins.toString ldflags}" -trimpath -o bin/docker-credential-$cmd ./$cmd/cmd + done ''; - installPhase = - if stdenv.isDarwin - then '' - install -Dm755 -t $out/bin bin/docker-credential-osxkeychain - '' - else '' - install -Dm755 -t $out/bin bin/docker-credential-pass - install -Dm755 -t $out/bin bin/docker-credential-secretservice - ''; + installPhase = '' + install -Dm755 -t $out/bin bin/docker-credential-* + ''; + + passthru.tests.version = testers.testVersion { + package = docker-credential-helpers; + command = "docker-credential-pass version"; + }; meta = with lib; { description = "Suite of programs to use native stores to keep Docker credentials safe"; homepage = "https://github.com/docker/docker-credential-helpers"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; - platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ marsam ]; } // lib.optionalAttrs stdenv.isDarwin { mainProgram = "docker-credential-osxkeychain"; }; diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix index 03571ac7cf75..bd216050b200 100644 --- a/pkgs/tools/admin/gixy/default.nix +++ b/pkgs/tools/admin/gixy/default.nix @@ -11,6 +11,9 @@ let rev = "pyparsing_${version}"; sha256 = "14pfy80q2flgzjcx8jkracvnxxnr59kjzp3kdm5nh232gk1v6g6h"; }; + nativeBuildInputs = [ + super.setuptools + ]; }); }; }; diff --git a/pkgs/tools/bluetooth/obexftp/default.nix b/pkgs/tools/bluetooth/obexftp/default.nix index 3d9eda383ddf..8fd031d331c0 100644 --- a/pkgs/tools/bluetooth/obexftp/default.nix +++ b/pkgs/tools/bluetooth/obexftp/default.nix @@ -15,6 +15,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ openobex ]; + # https://sourceforge.net/p/openobex/bugs/66/ + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} + ''; + # There's no such thing like "bluetooth" library; possibly they meant "bluez" but it links correctly without this. postFixup = '' sed -i 's,^Requires: bluetooth,Requires:,' $out/lib/pkgconfig/obexftp.pc diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix index 831644bd4ac0..5d18319ac603 100644 --- a/pkgs/tools/bluetooth/openobex/default.nix +++ b/pkgs/tools/bluetooth/openobex/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { patchPhase = '' sed -i "s!/lib/udev!$out/lib/udev!" udev/CMakeLists.txt sed -i "/if ( PKGCONFIG_UDEV_FOUND )/,/endif ( PKGCONFIG_UDEV_FOUND )/d" udev/CMakeLists.txt + # https://sourceforge.net/p/openobex/bugs/66/ + substituteInPlace CMakeLists.txt \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \ + --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} ''; meta = with lib; { diff --git a/pkgs/tools/filesystems/ubidump/default.nix b/pkgs/tools/filesystems/ubidump/default.nix index bf141c8d94d7..5e325591e6ee 100644 --- a/pkgs/tools/filesystems/ubidump/default.nix +++ b/pkgs/tools/filesystems/ubidump/default.nix @@ -4,6 +4,7 @@ python3.pkgs.buildPythonApplication rec { pname = "ubidump"; version = "unstable-2019-09-11"; + format = "other"; src = fetchFromGitHub { owner = "nlitsme"; @@ -12,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "1hiivlgni4r3nd5n2rzl5qzw6y2wpjpmyls5lybrc8imd6rmj3w2"; }; - propagatedBuildInputs = with python3.pkgs; [ crcmod python-lzo ]; + propagatedBuildInputs = with python3.pkgs; [ crcmod python-lzo setuptools ]; dontBuild = true; diff --git a/pkgs/tools/filesystems/zpool-iostat-viz/default.nix b/pkgs/tools/filesystems/zpool-iostat-viz/default.nix index f5eb7c7f02ef..a9e4dfe8ab74 100644 --- a/pkgs/tools/filesystems/zpool-iostat-viz/default.nix +++ b/pkgs/tools/filesystems/zpool-iostat-viz/default.nix @@ -7,6 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "zpool-iostat-viz"; version = "unstable-2021-11-13"; + format = "other"; src = fetchFromGitHub { owner = "chadmiller"; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 6dbbf7158494..4dd5889706e2 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "10.97.4"; + version = "11.0.0"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4275"; - sha256 = "SEKxjlKNJijOk1MNIktSf/YTLxBq8gEHyjLUVtXG5OI="; + rev = "4444"; + sha256 = "dnWZTTDMxyIJb3jGTByCzUfLGuG9wAN2nCkwVM8F5tE="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index 2a8e999565d1..22943bc12862 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.3.224.0"; + version = "1.3.224.1"; src = (assert version == vulkan-headers.version; fetchFromGitHub { diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index be708e6c605f..4c39671ffac3 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; # The version must match that in vulkan-headers - version = "1.3.224.0"; + version = "1.3.224.1"; src = (assert version == vulkan-headers.version; fetchFromGitHub { diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 93663ec2a2c6..f57cba28439e 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.3.224.0"; + version = "1.3.224.1"; # It's not strictly necessary to have matching versions here, however # since we're using the SDK version we may as well be consistent with diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index 11ad6b8b36af..e025b0ffc58e 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -16,6 +16,10 @@ python3Packages.buildPythonApplication rec { hash = "sha256-ioSNd0Fjk2Fp05lk3HeokIjNYGU0jQEaIDfcFB18mV0="; }; + nativeBuildInputs = [ + python3Packages.setuptools + ]; + postPatch = '' substituteInPlace tests/pty_test.py \ --replace "python3" "${python3Packages.python}/bin/python" diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 7a9a30756ffc..eb1ce13f3108 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -9,6 +9,7 @@ python3.pkgs.buildPythonApplication rec { pname = "autorandr"; version = "1.12.1"; + format = "other"; nativeBuildInputs = [ installShellFiles ]; propagatedBuildInputs = [ python3Packages.packaging ]; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 90fd78ed04c1..a89621e8fe5f 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { # The test tends to fail on btrfs, f2fs and maybe other unusual filesystems. sed '2i echo Skipping dd sparse test && exit 77' -i ./tests/dd/sparse.sh sed '2i echo Skipping du threshold test && exit 77' -i ./tests/du/threshold.sh + sed '2i echo Skipping cp reflink-auto test && exit 77' -i ./tests/cp/reflink-auto.sh sed '2i echo Skipping cp sparse test && exit 77' -i ./tests/cp/sparse.sh sed '2i echo Skipping rm deep-2 test && exit 77' -i ./tests/rm/deep-2.sh sed '2i echo Skipping du long-from-unreadable test && exit 77' -i ./tests/du/long-from-unreadable.sh diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index a6a85808f352..6dcee4967e10 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -5,11 +5,12 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20220920.1"; + version = "20220925.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qmutcnsz3utVUmVZZEYYiemOGdQ4Ima2ueD4LyYaOdU="; + hash = "sha256-jlHS+Hdu1FWV/nJiiferOdyThWyIc21uAFFlh4BD+M4="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index afefc18e18b3..3ea44a8e30c6 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -15,14 +15,14 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2022.9.1"; + version = "2022.9.2"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-j6qzCzPiChvO1WR+ZaVILgONcdOzwlE4TBDnI9R6FjM="; + hash = "sha256-PVJZ2cOguXIh96246AVofTg1ZWqWJPFcDXlPk3Rn+Cs="; }; postPatch = '' @@ -91,6 +91,7 @@ with python.pkgs; buildPythonApplication rec { passthru = { dashboard = esphome-dashboard; + updateScript = callPackage ./update.nix {}; }; meta = with lib; { diff --git a/pkgs/tools/misc/esphome/update.nix b/pkgs/tools/misc/esphome/update.nix new file mode 100644 index 000000000000..ea4137662054 --- /dev/null +++ b/pkgs/tools/misc/esphome/update.nix @@ -0,0 +1,12 @@ +{ writeShellScript +, lib +, git +, nix-update +}: + +writeShellScript "update-esphome" '' + PATH=${lib.makeBinPath [ git nix-update ]} + + nix-update esphome.dashboard + nix-update esphome +'' diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 48d7a009c013..d2c0dfe37166 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "ethtool"; - version = "5.18"; + version = "5.19"; src = fetchurl { url = "mirror://kernel/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-lXey/7znELZZ+yOVmOySvO0cpADKDxKGdiv6ROR4QnA="; + sha256 = "sha256-O3UqMymCeQesOBLygx3+z1HIxBxV0tac+5xTygZEn8Y="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/faketty/default.nix b/pkgs/tools/misc/faketty/default.nix new file mode 100644 index 000000000000..288286aa9b30 --- /dev/null +++ b/pkgs/tools/misc/faketty/default.nix @@ -0,0 +1,24 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "faketty"; + version = "1.0.10"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-Jljq22xbXakwKdf5TXBXzuKuKJOBjf6lzCy8aHrVC3U="; + }; + + cargoSha256 = "sha256-K0hNnqw178b7noHW76DMR0BoYhkrQpPQeHaH6Azt3Xo="; + + postPatch = '' + patchShebangs tests/test.sh + ''; + + meta = with lib; { + description = "A wrapper to execute a command in a pty, even if redirecting the output"; + homepage = "https://github.com/dtolnay/faketty"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index eb14a4a71424..980502a269a4 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "file"; - version = "5.42"; + version = "5.43"; src = fetchurl { urls = [ "https://astron.com/pub/file/${pname}-${version}.tar.gz" "https://distfiles.macports.org/file/${pname}-${version}.tar.gz" ]; - sha256 = "sha256-wHb7TQKcdAc/FcQzYe9XLPuGhAfTRxkLqDSvOxY5sOQ="; + sha256 = "sha256-jIAV6Rrg6NAyHZTHgjmJLvnbxwxK3gAIwOlYlKv7GZE="; }; strictDeps = true; @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isWindows libgnurx; - doCheck = true; + # https://bugs.astron.com/view.php?id=382 + doCheck = !stdenv.hostPlatform.isMusl; makeFlags = lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file"; diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index 9545f71efbb6..71806dcb8d1b 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -1,20 +1,28 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "jdupes"; - version = "1.20.2"; + version = "1.21.0"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "sha256-3hKO+hNwYiJZ9Wn53vM7DHZmtvDhtgtSbW7bCMCT7s0="; + sha256 = "sha256-nDyRaV49bLVHlyqKJ7hf6OBWOLCfmHrTeHryK091c3w="; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. postFetch = "rm -r $out/testdir"; }; + patches = [ + (fetchpatch { + name = "darwin-stack-size.patch"; + url = "https://github.com/jbruchon/jdupes/commit/8f5b06109b44a9e4316f9445da3044590a6c63e2.patch"; + sha256 = "0saq92v0mm5g979chr062psvwp3i3z23mgqrcliq4m07lvwc7i3s"; + }) + ]; + dontConfigure = true; makeFlags = [ diff --git a/pkgs/tools/misc/mloader/default.nix b/pkgs/tools/misc/mloader/default.nix index 8e8854a5e6f2..a943547f17e9 100644 --- a/pkgs/tools/misc/mloader/default.nix +++ b/pkgs/tools/misc/mloader/default.nix @@ -3,12 +3,18 @@ python3Packages.buildPythonApplication rec { pname = "mloader"; version = "1.1.9"; + format = "setuptools"; src = python3Packages.fetchPypi { inherit pname version; sha256 = "81e4dc7117999d502e3345f8e32df8b16cca226b8b508976dde2de81a4cc2b19"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "protobuf~=3.6" "protobuf" + ''; + propagatedBuildInputs = with python3Packages; [ click protobuf diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index b551d16480d4..aa808612a849 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -1,35 +1,27 @@ -{ lib, stdenv, fetchurl, fetchpatch, ncurses, pkg-config }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, pkg-config, cmake }: stdenv.mkDerivation rec { - version = "6.5.0"; + version = "7.0.0"; pname = "multitail"; - src = fetchurl { - url = "https://www.vanheusden.com/multitail/${pname}-${version}.tgz"; - sha256 = "1vd9vdxyxsccl64ilx542ya5vlw2bpg6gnkq1x8cfqy6vxvmx7dj"; + src = fetchFromGitHub { + owner = "folkertvanheusden"; + repo = pname; + rev = version; + sha256 = "sha256-AMW55Bmwn0BsD36qGXI5WmEfydrMBob8NRY3Tyq92vA="; }; - patches = [ - # Fix pending upstream inclusion for ncurses-6.3: - # https://github.com/halturin/multitail/pull/4 - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/halturin/multitail/commit/d7d10f3bce261074c116eba9f924b61f43777662.patch"; - sha256 = "0kyp9l6v92mz6d3h34j11gs5kh3sf2nv76mygqfxb800vd8r0cgg"; - }) - ]; - - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ ncurses ]; - makeFlags = lib.optionals stdenv.isDarwin [ "-f" "makefile.macosx" ]; - installPhase = '' mkdir -p $out/bin - cp multitail $out/bin + cp bin/multitail $out/bin ''; + hardeningDisable = [ "format" ]; + meta = { homepage = "https://github.com/halturin/multitail"; description = "tail on Steroids"; diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index dcbfd58e2f57..5e8a08b71013 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.60.0"; + version = "0.61.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-zES2795gyMQ/VoRR4/dpUsqJlGnxl0Ac9Gb05lboWlI="; + sha256 = "sha256-NwkQDqacH1vZNkHy3OzvR1wmwxO2dAPXa/OkiNMcrjs="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorSha256 = "sha256-9YKeHCFrN7drHJpk2k9M0VGvZ54kSSb9bAiyDFEiX+g="; + vendorSha256 = "sha256-AFizQKKIMveCI9OiJ6wPxsNwDVn9XEWuPzyIqQSXbd4="; preBuild = '' # set the build version, can't be done via ldflags diff --git a/pkgs/tools/misc/pandoc-eqnos/default.nix b/pkgs/tools/misc/pandoc-eqnos/default.nix index 310826c35b06..d808060fc23a 100644 --- a/pkgs/tools/misc/pandoc-eqnos/default.nix +++ b/pkgs/tools/misc/pandoc-eqnos/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , lib , pandoc-xnos +, setuptools }: buildPythonApplication rec { @@ -16,6 +17,10 @@ buildPythonApplication rec { sha256 = "sha256-7GQdfGHhtQs6LZK+ZyMmcPSkoFfBWmATTMejMiFcS7Y="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pandoc-xnos ]; # Different pandoc executables are not available diff --git a/pkgs/tools/misc/pandoc-fignos/default.nix b/pkgs/tools/misc/pandoc-fignos/default.nix index 846d1abe8d7f..7ed7a8e710a7 100644 --- a/pkgs/tools/misc/pandoc-fignos/default.nix +++ b/pkgs/tools/misc/pandoc-fignos/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , lib , pandoc-xnos +, setuptools }: buildPythonApplication rec { @@ -16,6 +17,10 @@ buildPythonApplication rec { sha256 = "sha256-eDwAW0nLB4YqrWT3Ajt9bmX1A43wl+tOPm2St5VpCLk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pandoc-xnos ]; # Different pandoc executables are not available diff --git a/pkgs/tools/misc/pandoc-include/default.nix b/pkgs/tools/misc/pandoc-include/default.nix index a0ce0f96b437..684af986b017 100644 --- a/pkgs/tools/misc/pandoc-include/default.nix +++ b/pkgs/tools/misc/pandoc-include/default.nix @@ -3,6 +3,7 @@ , lib , natsort , panflute +, setuptools }: buildPythonApplication rec { @@ -17,6 +18,10 @@ buildPythonApplication rec { sha256 = "sha256-kuxud7m+sWcNqE8A+Fwb8ATgiUwxQvHeYBTyw1UzX4U="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ natsort panflute ]; pythonImportsCheck = [ "pandoc_include.main" ]; diff --git a/pkgs/tools/misc/pandoc-secnos/default.nix b/pkgs/tools/misc/pandoc-secnos/default.nix index 95c67dde0ec0..507d7df400e3 100644 --- a/pkgs/tools/misc/pandoc-secnos/default.nix +++ b/pkgs/tools/misc/pandoc-secnos/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , lib , pandoc-xnos +, setuptools }: buildPythonApplication rec { @@ -16,6 +17,10 @@ buildPythonApplication rec { sha256 = "sha256-J9KLZvioYM3Pl2UXjrEgd4PuLTwCLYy9SsJIzgw5/jU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pandoc-xnos ]; patches = [ diff --git a/pkgs/tools/misc/pandoc-tablenos/default.nix b/pkgs/tools/misc/pandoc-tablenos/default.nix index f3d67826a454..e1fb785a7a9f 100644 --- a/pkgs/tools/misc/pandoc-tablenos/default.nix +++ b/pkgs/tools/misc/pandoc-tablenos/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , lib , pandoc-xnos +, setuptools }: buildPythonApplication rec { @@ -16,6 +17,10 @@ buildPythonApplication rec { sha256 = "sha256-FwzsRziY3PoySo9hIFuLw6tOO9oQij6oQEyoY8HgnII="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pandoc-xnos ]; # Different pandoc executables are not available diff --git a/pkgs/tools/misc/pferd/default.nix b/pkgs/tools/misc/pferd/default.nix index 8bd95b6fc651..d715e35e580f 100644 --- a/pkgs/tools/misc/pferd/default.nix +++ b/pkgs/tools/misc/pferd/default.nix @@ -15,6 +15,10 @@ python3Packages.buildPythonApplication rec { sha256 = "05f9b7wzld0jcalc7n5h2a6nqjr1w0fxwkd4cih6gkjc9117skii"; }; + nativeBuildInputs = with python3Packages; [ + setuptools + ]; + propagatedBuildInputs = with python3Packages; [ aiohttp beautifulsoup4 diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/tools/misc/topicctl/default.nix index 926b27c905d1..213a44488881 100644 --- a/pkgs/tools/misc/topicctl/default.nix +++ b/pkgs/tools/misc/topicctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "topicctl"; - version = "1.5.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-7dw1UldffSCoJYhICb7v7XWQdXerSkrKonNNio0PkTQ="; + sha256 = "sha256-RbcycZPTZFxvtgwcjZ8d0LUiSzBtMyFxyC0AcwKGlv4="; }; - vendorSha256 = "sha256-P3o4P6CUDB0jIpmgxgYL7D6TJuaWQBCprsE4NLTLELY="; + vendorSha256 = "sha256-/f1uzil3FtKLByFI5qp2Tc52/lajCbx5sNBRRJzjWN8="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix index 0c5cd2949dc0..7825b419ecf1 100644 --- a/pkgs/tools/networking/aardvark-dns/default.nix +++ b/pkgs/tools/networking/aardvark-dns/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "aardvark-dns"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HxikpGeQlwulSedFCwWLADHKMlFrsgC7bMoZ1OxGCUE="; + sha256 = "sha256-pIbhrYiZOZ0GoynnHvp+h5E4O4syiwVhQeczAv1zjTo="; }; - cargoHash = "sha256-uP9caaOdFWs73T8icHE9uXNo63NdZrQ5afXFb4Iy1+I="; + cargoHash = "sha256-2aFvFP64vy0FK0k0Uq6sPVi42E5easxOUlkcZjrjoMs="; meta = with lib; { description = "Authoritative dns server for A/AAAA container records"; diff --git a/pkgs/tools/networking/curl/atomic.patch b/pkgs/tools/networking/curl/atomic.patch deleted file mode 100644 index 77ee610fc117..000000000000 --- a/pkgs/tools/networking/curl/atomic.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 50efb0822aa0e0ab165158dd0a26e65a2290e6d2 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Tue, 28 Jun 2022 09:00:25 +0200 -Subject: [PATCH] easy_lock: switch to using atomic_int instead of bool - -To work with more compilers without requiring separate libs to -link. Like with gcc-12 for RISC-V on Linux. - -Reported-by: Adam Sampson -Fixes #9055 -Closes #9061 ---- - lib/easy_lock.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/easy_lock.h b/lib/easy_lock.h -index 07c85c5ffdd19..9c11bc50c5f20 100644 ---- a/lib/easy_lock.h -+++ b/lib/easy_lock.h -@@ -40,8 +40,8 @@ - #include - #endif - --#define curl_simple_lock atomic_bool --#define CURL_SIMPLE_LOCK_INIT false -+#define curl_simple_lock atomic_int -+#define CURL_SIMPLE_LOCK_INIT 0 - - static inline void curl_simple_lock_lock(curl_simple_lock *lock) - { diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index a62b6c8e27bb..07b9e58589a0 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -3,7 +3,6 @@ , c-aresSupport ? false, c-ares , gnutlsSupport ? false, gnutls , gsaslSupport ? false, gsasl -, patchNetrcRegression ? false , gssSupport ? with stdenv.hostPlatform; ( !isWindows && # disable gss becuase of: undefined reference to `k5_bcmp' @@ -48,21 +47,19 @@ assert !(opensslSupport && wolfsslSupport); stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "7.84.0"; + version = "7.85.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.bz2" "https://github.com/curl/curl/releases/download/curl-${finalAttrs.version}/curl-${finalAttrs.version}.tar.bz2" ]; - sha256 = "sha256-cC+ybnMZCjvXcHGqFG9Qe5gXzE384hjSq4fwDNO8BZ0="; + sha256 = "sha256-IafoNijulhZKwrNv9r+Z1GfHsLYhwffjF9jw2WARU5w="; }; patches = [ ./7.79.1-darwin-no-systemconfiguration.patch - ./sched.patch - ./atomic.patch - ] ++ lib.optional patchNetrcRegression ./netrc-regression.patch; + ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; separateDebugInfo = stdenv.isLinux; diff --git a/pkgs/tools/networking/curl/netrc-regression.patch b/pkgs/tools/networking/curl/netrc-regression.patch deleted file mode 100644 index 90ad3e52d1a2..000000000000 --- a/pkgs/tools/networking/curl/netrc-regression.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/lib/url.c b/lib/url.c -index a56e4b0..9f29593 100644 ---- a/lib/url.c -+++ b/lib/url.c -@@ -2971,6 +2971,12 @@ static CURLcode override_login(struct Curl_easy *data, - /* don't update the user name below */ - userp = NULL; - } -+ /* no user was set but a password, set a blank user */ -+ if(userp && !*userp && passwdp && *passwdp) { -+ *userp = strdup(""); -+ if(!*userp) -+ return CURLE_OUT_OF_MEMORY; -+ } - } - #endif diff --git a/pkgs/tools/networking/curl/sched.patch b/pkgs/tools/networking/curl/sched.patch deleted file mode 100644 index 33f08fa42f24..000000000000 --- a/pkgs/tools/networking/curl/sched.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e2e7f54b7bea521fa8373095d0f43261a720cda0 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Mon, 27 Jun 2022 08:46:21 +0200 -Subject: [PATCH] easy_lock.h: include sched.h if available to fix build - -Patched-by: Harry Sintonen - -Closes #9054 ---- - lib/easy_lock.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/lib/easy_lock.h b/lib/easy_lock.h -index 819f50ce815b8..1f54289ceb2d3 100644 ---- a/lib/easy_lock.h -+++ b/lib/easy_lock.h -@@ -36,6 +36,9 @@ - - #elif defined (HAVE_ATOMIC) - #include -+#if defined(HAVE_SCHED_YIELD) -+#include -+#endif - - #define curl_simple_lock atomic_bool - #define CURL_SIMPLE_LOCK_INIT false diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index fb5e2aad5cce..c6362f544691 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, ncurses, perl, help2man -, apparmorRulesFromClosure +, apparmorRulesFromClosure, fetchpatch }: stdenv.mkDerivation rec { @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { patches = [ # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 ./inetutils-1_9-PATH_PROCNET_DEV.patch + (fetchpatch { + name = "CVE-2022-39028.patch"; + url = "https://sources.debian.org/data/main/i/inetutils/2%3A2.3-5/debian/patches/inetutils-telnetd-EC_EL_null_deref.patch"; + sha256 = "sha256-NYNDbEk3q3EhQdJaR12JBbnjJIRRpOcKLBF/EJJPiGU="; + }) ]; nativeBuildInputs = [ help2man perl /* for `whois' */ ]; diff --git a/pkgs/tools/networking/netavark/default.nix b/pkgs/tools/networking/netavark/default.nix index 29136e3ce4ca..12834f9e26ed 100644 --- a/pkgs/tools/networking/netavark/default.nix +++ b/pkgs/tools/networking/netavark/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "netavark"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NZt62oTD7yFO1+HTuyp+wEd2PuUwtsIrMPHwjfmz3aI="; + sha256 = "sha256-72ft1VZVv6Wxfr3RsJMOVl1Z0KMVGgCsUHKGH+filzg="; }; - cargoHash = "sha256-l+y3mkV6uZJed2nuXNWXDr6Q1UhV0YlfRhpE7rvTRrE="; + cargoHash = "sha256-FboPbOjkGRzOeoXrIkl1l2BXeid4AOiwxCJ6wlGQ66g="; nativeBuildInputs = [ installShellFiles mandown ]; diff --git a/pkgs/tools/networking/networkmanager/libnma/default.nix b/pkgs/tools/networking/networkmanager/libnma/default.nix index 4993068d2a51..00e68176c107 100644 --- a/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -1,6 +1,7 @@ { stdenv , fetchurl , meson +, mesonEmulatorHook , ninja , gettext , gtk-doc @@ -51,6 +52,8 @@ stdenv.mkDerivation rec { docbook_xml_dtd_43 libxml2 vala + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ @@ -72,7 +75,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/nma-ws/nma-eap.c --subst-var-by \ - NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$out" "${pname}-${version}"} + NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$out" "$name"} ''; postInstall = '' diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/tools/networking/photon/default.nix index d3f153e44aed..543d9f1a5b96 100644 --- a/pkgs/tools/networking/photon/default.nix +++ b/pkgs/tools/networking/photon/default.nix @@ -3,6 +3,7 @@ python3Packages.buildPythonApplication rec { pname = "photon"; version = "1.3.0"; + format = "other"; src = fetchFromGitHub { owner = "s0md3v"; diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index 3ad9161c716b..6018e77e5e43 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -25,6 +25,26 @@ stdenv.mkDerivation rec { "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; + postPatch = '' + # https://github.com/shadowsocks/shadowsocks-libev/issues/2901 + substituteInPlace CMakeLists.txt \ + --replace '# pkg-config' \ + '# pkg-config + include(GNUInstallDirs)' + substituteInPlace cmake/shadowsocks-libev.pc.cmake \ + --replace @prefix@ @CMAKE_INSTALL_PREFIX@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_BINDIR@ @CMAKE_INSTALL_FULL_BINDIR@ \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_FULL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_DATAROOTDIR@ @CMAKE_INSTALL_FULL_DATAROOTDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_MANDIR@ @CMAKE_INSTALL_FULL_MANDIR@ + + # https://github.com/dcreager/libcork/issues/173 but needs a different patch (yay vendoring) + substituteInPlace libcork/src/libcork.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + postInstall = '' cp lib/* $out/lib ''; diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index 53f7fceb16c6..6fee9ea187ca 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -41,11 +41,15 @@ stdenv.mkDerivation rec { cp ${libsolv}/share/cmake/Modules/FindLibSolv.cmake cmake/modules/ ''; - # See https://github.com/NixOS/nixpkgs/issues/107428 postPatch = '' + # See https://github.com/NixOS/nixpkgs/issues/107428 substituteInPlace CMakeLists.txt \ --replace "enable_testing()" "" \ --replace "add_subdirectory(tests)" "" + + # https://github.com/rpm-software-management/libdnf/issues/1518 + substituteInPlace libdnf/libdnf.pc.in \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ ''; cmakeFlags = [ diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index cea203c49751..a88127d996f8 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.18.1"; + version = "2.19.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Plw8aN1fhZihPcV7dJrlE5Y1flwous7MvrUCJFmkXuc="; + sha256 = "sha256-WhPEESIPrCDI92HVRz5rr2Zvgtty/5T5ywkvNY8KleU="; }; - vendorSha256 = "sha256-6RB27jFK6HI6CR8D9vAPshsRi3ldoQwTTH6S1gyDqxs="; + vendorSha256 = "sha256-+Aq54AAZ4094xZpTEOD63mHSff3Cm0oOQneJjGTe0To="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 0429074638c3..f69ee083af1f 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub , version , suffix ? "" -, curl , sha256 ? null , src ? fetchFromGitHub { owner = "NixOS"; repo = "nix"; rev = version; inherit sha256; } , patches ? [ ] @@ -25,6 +24,7 @@ in , bzip2 , callPackage , coreutils +, curl , editline , flex , gnutar diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index b3b2bc7c9b7a..46f92a468815 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,7 +1,6 @@ { lib , aws-sdk-cpp , boehmgc -, curl , callPackage , fetchFromGitHub , fetchurl @@ -32,7 +31,7 @@ let common = args: callPackage - (import ./common.nix ({ inherit lib fetchFromGitHub curl; } // args)) + (import ./common.nix ({ inherit lib fetchFromGitHub; } // args)) { inherit Security storeDir stateDir confDir; boehmgc = boehmgc-nix; diff --git a/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch b/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch index e659bf470d39..e4e2b3858ad5 100644 --- a/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch +++ b/pkgs/tools/package-management/nix/patches/boehmgc-coroutine-sp-fallback.patch @@ -1,17 +1,17 @@ diff --git a/pthread_stop_world.c b/pthread_stop_world.c -index 4b2c429..1fb4c52 100644 +index b5d71e62..aed7b0bf 100644 --- a/pthread_stop_world.c +++ b/pthread_stop_world.c -@@ -673,6 +673,8 @@ GC_INNER void GC_push_all_stacks(void) - struct GC_traced_stack_sect_s *traced_stack_sect; - pthread_t self = pthread_self(); - word total_size = 0; +@@ -768,6 +768,8 @@ STATIC void GC_restart_handler(int sig) + /* world is stopped. Should not fail if it isn't. */ + GC_INNER void GC_push_all_stacks(void) + { + size_t stack_limit; + pthread_attr_t pattr; - - if (!EXPECT(GC_thr_initialized, TRUE)) - GC_thr_init(); -@@ -722,6 +724,31 @@ GC_INNER void GC_push_all_stacks(void) + GC_bool found_me = FALSE; + size_t nthreads = 0; + int i; +@@ -851,6 +853,31 @@ GC_INNER void GC_push_all_stacks(void) hi = p->altstack + p->altstack_size; /* FIXME: Need to scan the normal stack too, but how ? */ /* FIXME: Assume stack grows down */ diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 66064139f380..0dfa433e6c40 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { glib polkit python3 - gobject-introspection gst_all_1.gstreamer gst_all_1.gst-plugins-base gtk3 @@ -54,6 +53,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional enableSystemd systemd ++ lib.optional enableBashCompletion bash-completion; nativeBuildInputs = [ + gobject-introspection + glib vala gettext pkg-config diff --git a/pkgs/tools/package-management/pdm/check-update.patch b/pkgs/tools/package-management/pdm/check-update.patch deleted file mode 100644 index 9bc216177e5b..000000000000 --- a/pkgs/tools/package-management/pdm/check-update.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tests/conftest.py b/tests/conftest.py -index d310d36..e15d398 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -252,6 +252,7 @@ def project_no_init(tmp_path, mocker): - old_config_map = Config._config_map.copy() - tmp_path.joinpath("caches").mkdir(parents=True) - p.global_config["cache_dir"] = tmp_path.joinpath("caches").as_posix() -+ p.global_config["check_update"] = False - do_use(p, getattr(sys, "_base_executable", sys.executable)) - with temp_environ(): - os.environ.pop("VIRTUAL_ENV", None) diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 7458262b168a..54c83f0094f5 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -24,28 +24,19 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "1.14.0"; + version = "2.1.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZUbcuIRutSoHW5egCpwCKca2IZCgQsRAd72ueDzGySI="; + hash = "sha256-nKCdthPgheBR4bySQww0I5eI8K5IzLhxiTCCYnQRknI="; }; - # this patch allows us to run additional tests that invoke pdm, which checks - # itself for an update on every invocation by default, drammatically slowing - # down test runs inside the sandbox - # - # the patch is necessary because the fixture is creating a project and - # doesn't appear to respect the settings in `$HOME`; possibly a bug upstream - patches = [ - ./check-update.patch - ]; - propagatedBuildInputs = [ blinker - click + cachecontrol + certifi findpython installer packaging @@ -54,12 +45,17 @@ buildPythonApplication rec { pip platformdirs python-dotenv - pythonfinder + requests-toolbelt resolvelib + rich shellingham tomli tomlkit - ] ++ lib.optionals (pythonOlder "3.8") [ + unearth + virtualenv + ] + ++ cachecontrol.optional-dependencies.filecache + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata typing-extensions ]; @@ -79,14 +75,11 @@ buildPythonApplication rec { ''; disabledTests = [ - # sys.executable and expected executable are different - "test_set_non_exist_python_path" + # fails to locate setuptools (maybe upstream bug) + "test_convert_setup_py_project" # pythonfinder isn't aware of nix's python infrastructure - "test_auto_isolate_site_packages" "test_use_wrapper_python" - "test_find_python_in_path" - # calls pip install and exits != 0 - "test_pre_and_post_hooks" + "test_use_invalid_wrapper_python" ]; meta = with lib; { diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index d8207bb4b30e..af8032b81a50 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,16 +1,16 @@ { stdenv, lib , pkg-config, autoreconfHook , fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages -, sqlite, zstd, fetchpatch, libcap +, sqlite, zstd, libcap }: stdenv.mkDerivation rec { pname = "rpm"; - version = "4.17.1"; + version = "4.18.0"; src = fetchurl { url = "https://ftp.osuosl.org/pub/rpm/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2"; - hash = "sha256-DBG3k0ZucliFH/gr1lyP/Ywtu8cKzIaaXTQVBUmSbl0="; + hash = "sha256-KhcVLXGHqzDt8sL7WGRjvfY4jee1g3SAlVZZ5ekFRVQ="; }; outputs = [ "out" "dev" "man" ]; @@ -38,13 +38,6 @@ stdenv.mkDerivation rec { "--sharedstatedir=/com" ] ++ lib.optional stdenv.isLinux "--with-cap"; - patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Fix build for macOS aarch64 - (fetchpatch { - url = "https://github.com/rpm-software-management/rpm/commit/ad87ced3990c7e14b6b593fa411505e99412e248.patch"; - hash = "sha256-WYlxPGcPB5lGQmkyJ/IpGoqVfAKtMxKzlr5flTqn638="; - }) - ]; - postPatch = '' substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' "" ''; diff --git a/pkgs/tools/security/adenum/default.nix b/pkgs/tools/security/adenum/default.nix index 8bcac264d95d..24d318968ad8 100644 --- a/pkgs/tools/security/adenum/default.nix +++ b/pkgs/tools/security/adenum/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ impacket pwntools - ldap + python-ldap ] ++ [ john ]; diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 3ed4c71a5db1..5d2f83b03767 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.14.8"; + version = "1.14.9"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - hash = "sha256-i8hnMRwFrJOS8eNKgNMzyh7XsbEyMLTQeJJxZAMcV+A="; + hash = "sha256-yVmEqT+pVU3ww1PUs30pr7fE3pprhVnDhlErdMD/KL8="; }; - vendorHash = "sha256-IJj9md86MHPa32QHEMEsBRpv0L8xs6oDOT/tCs4ZpFk="; + vendorHash = "sha256-efmBuaH4ZMYZixcafe7mB1jj5h0o8RE+kMB3K35aG4k="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix index 585af9e48e14..8cc132a80021 100644 --- a/pkgs/tools/security/gopass/git-credential.nix +++ b/pkgs/tools/security/gopass/git-credential.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "git-credential-gopass"; - version = "1.14.7"; + version = "1.14.9"; src = fetchFromGitHub { owner = "gopasspw"; repo = pname; rev = "v${version}"; - hash = "sha256-wxaghZth3soT1r7Hh9oYoyhE0pslo1HPUv2TEvZpMrU=="; + hash = "sha256-ULR/Rbl9wt7Vmb9d46/fVkihz10mlIwKA0tUTSU0PSk="; }; - vendorHash = "sha256-K6nYgy+fLvMQCse3CN8sGBkTW6fw1eSN5TjEOzzOToY="; + vendorHash = "sha256-7wDDHgLLoSIh/Qojz6cudUBN/HzS+ViZn0IZPRymAfg="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/tools/security/gopass/hibp.nix index 97d65df86854..abbfe4c34a1b 100644 --- a/pkgs/tools/security/gopass/hibp.nix +++ b/pkgs/tools/security/gopass/hibp.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gopass-hibp"; - version = "1.14.7"; + version = "1.14.9"; src = fetchFromGitHub { owner = "gopasspw"; repo = pname; rev = "v${version}"; - hash = "sha256-A9CrqDKALbe46WYDOLByzqHVm4Z9rAbhpakGnkCPobI="; + hash = "sha256-hakRd581apcP0Nw+j5O3y7ERjIai0FmfXPBQz5ARZaQ="; }; - vendorHash = "sha256-7JnARe14TSjz4D64MAEAnw/BhAaZ5JxVuRMObbRP3iU="; + vendorHash = "sha256-TX/4DL1LxM6ldfEViFj3PYtGgI8oAYJfoQvV5gjc4CA="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix index 939311199c83..6b27eb5cb2b2 100644 --- a/pkgs/tools/security/gopass/jsonapi.nix +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gopass-jsonapi"; - version = "1.14.7"; + version = "1.14.9"; src = fetchFromGitHub { owner = "gopasspw"; repo = pname; rev = "v${version}"; - hash = "sha256-2JfiwlJx7L2OhtAduq+4jxBquvvIq4Dwy6yr/SyX++E="; + hash = "sha256-dyscOIlJjZ8P6sEMC9YqhAAI6ewruyztnxOawLfYUWE="; }; - vendorHash = "sha256-9T920rk51aTO7/6GhCPRM2rBD/b5wl09btyE5zPh6yU="; + vendorHash = "sha256-AAicxPFPYiEB8L33lp4hVaM0bCU1sshdPBV1P55eI/4="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/tools/security/gopass/summon.nix index 2643e2962482..f385181e6454 100644 --- a/pkgs/tools/security/gopass/summon.nix +++ b/pkgs/tools/security/gopass/summon.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gopass-summon-provider"; - version = "1.14.7"; + version = "1.14.9"; src = fetchFromGitHub { owner = "gopasspw"; repo = pname; rev = "v${version}"; - hash = "sha256-fIj28f+uqMdEzD5d0Zn0VF3jeVS4Ixs5WE+GLzTAD+A="; + hash = "sha256-6uPW83/BnFtjfqCq5D3qpAZkqJG94ROUrgFbsEJBBcg="; }; - vendorHash = "sha256-K6nYgy+fLvMQCse3CN8sGBkTW6fw1eSN5TjEOzzOToY="; + vendorHash = "sha256-7wDDHgLLoSIh/Qojz6cudUBN/HzS+ViZn0IZPRymAfg="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/ioccheck/default.nix b/pkgs/tools/security/ioccheck/default.nix index 439567ecb038..fb5c887a8bf9 100644 --- a/pkgs/tools/security/ioccheck/default.nix +++ b/pkgs/tools/security/ioccheck/default.nix @@ -75,7 +75,8 @@ buildPythonApplication rec { substituteInPlace pyproject.toml \ --replace '"hurry.filesize" = "^0.9"' "" \ --replace 'vt-py = ">=0.6.1,<0.8.0"' 'vt-py = ">=0.6.1"' \ - --replace 'backoff = "^1.10.0"' 'backoff = ">=1.10.0"' + --replace 'backoff = "^1.10.0"' 'backoff = ">=1.10.0"' \ + --replace 'termcolor = "^1.1.0"' 'termcolor = "*"' ''; pythonImportsCheck = [ diff --git a/pkgs/tools/security/ldapmonitor/default.nix b/pkgs/tools/security/ldapmonitor/default.nix index 83035de4d20c..410aa4ca87ed 100644 --- a/pkgs/tools/security/ldapmonitor/default.nix +++ b/pkgs/tools/security/ldapmonitor/default.nix @@ -19,8 +19,8 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ impacket - ldap ldap3 + python-ldap ]; installPhase = '' diff --git a/pkgs/tools/security/pass2csv/default.nix b/pkgs/tools/security/pass2csv/default.nix index 1817d63f1ee6..2e48f541ca84 100644 --- a/pkgs/tools/security/pass2csv/default.nix +++ b/pkgs/tools/security/pass2csv/default.nix @@ -2,6 +2,7 @@ , fetchPypi , lib , python-gnupg +, setuptools }: buildPythonApplication rec { @@ -14,6 +15,10 @@ buildPythonApplication rec { sha256 = "03a11bd0b0905737f4adb21d87aa1653d84cc1d9b5dcfdfb8a29092245d65db8"; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ python-gnupg ]; diff --git a/pkgs/tools/security/silenthound/default.nix b/pkgs/tools/security/silenthound/default.nix index d1a86adf0189..92b651bc9a83 100644 --- a/pkgs/tools/security/silenthound/default.nix +++ b/pkgs/tools/security/silenthound/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ colorama - ldap + python-ldap ]; dontBuild = true; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index c99face8d7d8..8da3df2773f0 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -336,6 +336,7 @@ latexindent = perlPackages.buildPerlPackage rec { pygmentex = python3Packages.buildPythonApplication rec { pname = "pygmentex"; inherit (src) version; + format = "other"; src = lib.head (builtins.filter (p: p.tlType == "run") texlive.pygmentex.pkgs); diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 49276196c449..d1c4d1035f3f 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -50,9 +50,9 @@ with localPython.pkgs; buildPythonApplication rec { substituteInPlace setup.py \ --replace "six>=1.11.0,<1.15.0" "six==1.16.0" \ --replace "requests>=2.20.1,<=2.26" "requests==2.28.1" \ - --replace "jmespath>=0.7.1,<1.0.0" "jmespath==1.0.1" \ - --replace "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<1.27.49" \ - --replace "pathspec==0.9.0" "pathspec>=0.9.0" + --replace "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<1.27.76" \ + --replace "pathspec==0.9.0" "pathspec>=0.10.0,<0.11.0" \ + --replace "termcolor == 1.1.0" "termcolor>=2.0.0,<2.1.0" ''; buildInputs = [ diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix index 8c7708c3e3db..3931fe9c3da0 100644 --- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix +++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -1,17 +1,19 @@ { lib , fetchFromGitHub , ocamlPackages +, pkg-config +, libdrm }: ocamlPackages.buildDunePackage rec { pname = "wayland-proxy-virtwl"; - version = "unstable-2021-12-05"; + version = "unstable-2022-09-22"; src = fetchFromGitHub { owner = "talex5"; repo = pname; - rev = "d7f58d405514dd031f2f12e402c8c6a58e62a885"; - sha256 = "0riwaqdlrx2gzkrb02v4zdl4ivpmz9g5w87lj3bhqs0l3s6c249s"; + rev = "5940346db2a4427f21c7b30a2593b179af36a935"; + sha256 = "0jnr5q52nb3yqr7ykvvb902xsad24cdi9imkslcsa5cnzb4095rw"; }; postPatch = '' @@ -19,21 +21,22 @@ ocamlPackages.buildDunePackage rec { rm -r ocaml-wayland ''; - useDune2 = true; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.12"; strictDeps = true; nativeBuildInputs = [ ocamlPackages.ppx_cstruct + pkg-config ]; - buildInputs = with ocamlPackages; [ + buildInputs = [ libdrm ] ++ (with ocamlPackages; [ + dune-configurator wayland cmdliner logs cstruct-lwt ppx_cstruct - ]; + ]); doCheck = true; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 605eff766916..a2328a1f3f91 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -56,6 +56,9 @@ mapAliases ({ accounts-qt = throw "'accounts-qt' has been renamed to/replaced by 'libsForQt5.accounts-qt'"; # Converted to throw 2022-02-22 adobeReader = throw "'adobeReader' has been renamed to/replaced by 'adobe-reader'"; # Converted to throw 2022-02-22 adobe_flex_sdk = throw "'adobe_flex_sdk' has been renamed to/replaced by 'apache-flex-sdk'"; # Converted to throw 2022-02-22 + adoptopenjdk-hotspot-bin-17 = throw "AdoptOpenJDK is now Temurin. Use temurin-bin-17"; # added 2022-07-02 + adoptopenjdk-jre-hotspot-bin-17 = throw "AdoptOpenJDK is now Temurin and JRE is no longer provided. Use temurin-bin-17"; # added 2022-07-02 + aesop = throw "aesop has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05 ag = throw "'ag' has been renamed to/replaced by 'silver-searcher'"; # Converted to throw 2022-02-22 aircrackng = throw "'aircrackng' has been renamed to/replaced by 'aircrack-ng'"; # Converted to throw 2022-02-22 airtame = throw "airtame has been removed due to being unmaintained"; # Added 2022-01-19 @@ -937,6 +940,7 @@ mapAliases ({ prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 prometheus-mesos-exporter = throw "prometheus-mesos-exporter is deprecated and archived by upstream"; # Added 2022-04-05 prometheus-unifi-exporter = throw "prometheus-unifi-exporter is deprecated and archived by upstream, use unifi-poller instead"; # Added 2022-06-03 + protobuf3_11 = throw "protobuf3_11 does not receive updates anymore and has been removed"; # Added 2022-09-28 proxytunnel = throw "proxytunnel has been removed from nixpkgs, because it has not been update upstream since it was added to nixpkgs in 2008 and has therefore bitrotted."; # added 2021-12-15 pulseaudio-hsphfpd = throw "pulseaudio-hsphfpd upstream has been abandoned"; # Added 2022-03-23 pulseaudio-modules-bt = throw "pulseaudio-modules-bt has been abandoned, and is superseded by pulseaudio's native bt functionality"; # Added 2022-04-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ebeef52afc8..b95a9bb2f5b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3891,6 +3891,8 @@ with pkgs; facter = callPackage ../tools/system/facter { }; + faketty = callPackage ../tools/misc/faketty { }; + fasd = callPackage ../tools/misc/fasd { }; fastJson = callPackage ../development/libraries/fastjson { }; @@ -4526,7 +4528,9 @@ with pkgs; online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools; - onnxruntime = callPackage ../development/libraries/onnxruntime { }; + onnxruntime = callPackage ../development/libraries/onnxruntime { + protobuf = protobuf3_19; + }; xkbd = callPackage ../applications/misc/xkbd { }; @@ -10196,19 +10200,7 @@ with pkgs; podman-tui = callPackage ../applications/virtualization/podman-tui { }; - pods = callPackage ../applications/virtualization/pods { - # taken from #182618, remove when merged - libadwaita = libadwaita.overrideAttrs (_: rec { - version = "1.2.0"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "libadwaita"; - rev = version; - hash = "sha256-3lH7Vi9M8k+GSrCpvruRpLrIpMoOakKbcJlaAc/FK+U="; - }; - }); - }; + pods = callPackage ../applications/virtualization/pods { }; pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; @@ -13068,6 +13060,29 @@ with pkgs; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; + temurin-bin-17 = javaPackages.compiler.temurin-bin.jdk-17; + temurin-jre-bin-17 = javaPackages.compiler.temurin-bin.jre-17; + temurin-bin-16 = javaPackages.compiler.temurin-bin.jdk-16; + temurin-bin-11 = javaPackages.compiler.temurin-bin.jdk-11; + temurin-jre-bin-11 = javaPackages.compiler.temurin-bin.jre-11; + temurin-bin-8 = javaPackages.compiler.temurin-bin.jdk-8; + temurin-jre-bin-8 = javaPackages.compiler.temurin-bin.jre-8; + + temurin-bin = temurin-bin-17; + temurin-jre-bin = temurin-jre-bin-17; + + semeru-bin-17 = javaPackages.compiler.semeru-bin.jdk-17; + semeru-jre-bin-17 = javaPackages.compiler.semeru-bin.jre-17; + semeru-bin-16 = javaPackages.compiler.semeru-bin.jdk-16; + semeru-jre-bin-16 = javaPackages.compiler.semeru-bin.jre-16; + semeru-bin-11 = javaPackages.compiler.semeru-bin.jdk-11; + semeru-jre-bin-11 = javaPackages.compiler.semeru-bin.jre-11; + semeru-bin-8 = javaPackages.compiler.semeru-bin.jdk-8; + semeru-jre-bin-8 = javaPackages.compiler.semeru-bin.jre-8; + + semeru-bin = semeru-bin-17; + semeru-jre-bin = semeru-jre-bin-17; + adoptopenjdk-bin-17-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix { inherit lib; }; adoptopenjdk-bin-17-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix { inherit lib; }; @@ -13078,113 +13093,25 @@ with pkgs; then callPackage adoptopenjdk-bin-17-packages-linux.jre-hotspot {} else callPackage adoptopenjdk-bin-17-packages-darwin.jre-hotspot {}; - adoptopenjdk-bin-16-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix { inherit lib; }; - adoptopenjdk-bin-16-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix { inherit lib; }; + adoptopenjdk-hotspot-bin-16 = javaPackages.compiler.adoptopenjdk-16.jdk-hotspot; + adoptopenjdk-jre-hotspot-bin-16 = javaPackages.compiler.adoptopenjdk-16.jre-hotspot; + adoptopenjdk-openj9-bin-16 = javaPackages.compiler.adoptopenjdk-16.jdk-openj9; + adoptopenjdk-jre-openj9-bin-16 = javaPackages.compiler.adoptopenjdk-16.jre-openj9; - adoptopenjdk-hotspot-bin-16 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-16-packages-linux.jdk-hotspot {} - else callPackage adoptopenjdk-bin-16-packages-darwin.jdk-hotspot {}; - adoptopenjdk-jre-hotspot-bin-16 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-16-packages-linux.jre-hotspot {} - else callPackage adoptopenjdk-bin-16-packages-darwin.jre-hotspot {}; + adoptopenjdk-hotspot-bin-15 = javaPackages.compiler.adoptopenjdk-15.jdk-hotspot; + adoptopenjdk-jre-hotspot-bin-15 = javaPackages.compiler.adoptopenjdk-15.jre-hotspot; + adoptopenjdk-openj9-bin-15 = javaPackages.compiler.adoptopenjdk-15.jdk-openj9; + adoptopenjdk-jre-openj9-bin-15 = javaPackages.compiler.adoptopenjdk-15.jre-openj9; - adoptopenjdk-openj9-bin-16 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-16-packages-linux.jdk-openj9 {} - else callPackage adoptopenjdk-bin-16-packages-darwin.jdk-openj9 {}; + adoptopenjdk-hotspot-bin-11 = javaPackages.compiler.adoptopenjdk-11.jdk-hotspot; + adoptopenjdk-jre-hotspot-bin-11 = javaPackages.compiler.adoptopenjdk-11.jre-hotspot; + adoptopenjdk-openj9-bin-11 = javaPackages.compiler.adoptopenjdk-11.jdk-openj9; + adoptopenjdk-jre-openj9-bin-11 = javaPackages.compiler.adoptopenjdk-11.jre-openj9; - adoptopenjdk-jre-openj9-bin-16 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-16-packages-linux.jre-openj9 {} - else callPackage adoptopenjdk-bin-16-packages-darwin.jre-openj9 {}; - - adoptopenjdk-bin-15-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk15-linux.nix { inherit lib; }; - adoptopenjdk-bin-15-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk15-darwin.nix { inherit lib; }; - - adoptopenjdk-hotspot-bin-15 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-15-packages-linux.jdk-hotspot {} - else callPackage adoptopenjdk-bin-15-packages-darwin.jdk-hotspot {}; - adoptopenjdk-jre-hotspot-bin-15 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-15-packages-linux.jre-hotspot {} - else callPackage adoptopenjdk-bin-15-packages-darwin.jre-hotspot {}; - - adoptopenjdk-openj9-bin-15 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-15-packages-linux.jdk-openj9 {} - else callPackage adoptopenjdk-bin-15-packages-darwin.jdk-openj9 {}; - - adoptopenjdk-jre-openj9-bin-15 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-15-packages-linux.jre-openj9 {} - else callPackage adoptopenjdk-bin-15-packages-darwin.jre-openj9 {}; - - adoptopenjdk-bin-14-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk14-linux.nix { inherit lib; }; - adoptopenjdk-bin-14-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk14-darwin.nix { inherit lib; }; - - adoptopenjdk-hotspot-bin-14 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-14-packages-linux.jdk-hotspot {} - else callPackage adoptopenjdk-bin-14-packages-darwin.jdk-hotspot {}; - adoptopenjdk-jre-hotspot-bin-14 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-14-packages-linux.jre-hotspot {} - else callPackage adoptopenjdk-bin-14-packages-darwin.jre-hotspot {}; - - adoptopenjdk-openj9-bin-14 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-14-packages-linux.jdk-openj9 {} - else callPackage adoptopenjdk-bin-14-packages-darwin.jdk-openj9 {}; - - adoptopenjdk-jre-openj9-bin-14 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-14-packages-linux.jre-openj9 {} - else callPackage adoptopenjdk-bin-14-packages-darwin.jre-openj9 {}; - - adoptopenjdk-bin-13-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix { inherit lib; }; - adoptopenjdk-bin-13-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix { inherit lib; }; - - adoptopenjdk-hotspot-bin-13 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-13-packages-linux.jdk-hotspot {} - else callPackage adoptopenjdk-bin-13-packages-darwin.jdk-hotspot {}; - adoptopenjdk-jre-hotspot-bin-13 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-13-packages-linux.jre-hotspot {} - else callPackage adoptopenjdk-bin-13-packages-darwin.jre-hotspot {}; - - adoptopenjdk-openj9-bin-13 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-13-packages-linux.jdk-openj9 {} - else callPackage adoptopenjdk-bin-13-packages-darwin.jdk-openj9 {}; - - adoptopenjdk-jre-openj9-bin-13 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-13-packages-linux.jre-openj9 {} - else callPackage adoptopenjdk-bin-13-packages-darwin.jre-openj9 {}; - - adoptopenjdk-bin-11-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix { inherit lib; }; - adoptopenjdk-bin-11-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk11-darwin.nix { inherit lib; }; - - adoptopenjdk-hotspot-bin-11 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-11-packages-linux.jdk-hotspot {} - else callPackage adoptopenjdk-bin-11-packages-darwin.jdk-hotspot {}; - adoptopenjdk-jre-hotspot-bin-11 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-11-packages-linux.jre-hotspot {} - else callPackage adoptopenjdk-bin-11-packages-darwin.jre-hotspot {}; - - adoptopenjdk-openj9-bin-11 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-11-packages-linux.jdk-openj9 {} - else callPackage adoptopenjdk-bin-11-packages-darwin.jdk-openj9 {}; - - adoptopenjdk-jre-openj9-bin-11 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {} - else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {}; - - adoptopenjdk-bin-8-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk8-linux.nix { inherit lib; }; - adoptopenjdk-bin-8-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix { inherit lib; }; - - adoptopenjdk-hotspot-bin-8 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-8-packages-linux.jdk-hotspot {} - else callPackage adoptopenjdk-bin-8-packages-darwin.jdk-hotspot {}; - adoptopenjdk-jre-hotspot-bin-8 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-8-packages-linux.jre-hotspot {} - else callPackage adoptopenjdk-bin-8-packages-darwin.jre-hotspot {}; - - adoptopenjdk-openj9-bin-8 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-8-packages-linux.jdk-openj9 {} - else callPackage adoptopenjdk-bin-8-packages-darwin.jdk-openj9 {}; - - adoptopenjdk-jre-openj9-bin-8 = if stdenv.isLinux - then callPackage adoptopenjdk-bin-8-packages-linux.jre-openj9 {} - else callPackage adoptopenjdk-bin-8-packages-darwin.jre-openj9 {}; + adoptopenjdk-hotspot-bin-8 = javaPackages.compiler.adoptopenjdk-8.jdk-hotspot; + adoptopenjdk-jre-hotspot-bin-8 = javaPackages.compiler.adoptopenjdk-8.jre-hotspot; + adoptopenjdk-openj9-bin-8 = javaPackages.compiler.adoptopenjdk-8.jdk-openj9; + adoptopenjdk-jre-openj9-bin-8 = javaPackages.compiler.adoptopenjdk-8.jre-openj9; adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11; adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11; @@ -18861,7 +18788,7 @@ with pkgs; gtkimageview = callPackage ../development/libraries/gtkimageview { }; glib = callPackage ../development/libraries/glib (let - glib-untested = glib.override { doCheck = false; }; + glib-untested = glib.overrideAttrs (_: { doCheck = false; }); in { # break dependency cycles # these things are only used for tests, they don't get into the closure @@ -20096,9 +20023,7 @@ with pkgs; # On non-GNU systems we need GNU Gettext for libintl. libintl = if stdenv.hostPlatform.libc != "glibc" then gettext else null; - libid3tag = callPackage ../development/libraries/libid3tag { - gperf = gperf_3_0; - }; + libid3tag = callPackage ../development/libraries/libid3tag { }; libidn = callPackage ../development/libraries/libidn { }; @@ -21396,17 +21321,18 @@ with pkgs; prospector = callPackage ../development/tools/prospector { }; - protobuf = protobuf3_19; + # https://github.com/protocolbuffers/protobuf/issues/10418 + protobuf = if stdenv.hostPlatform.is32bit then protobuf3_20 else + protobuf3_21; protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.nix { }; protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { }; protobuf3_19 = callPackage ../development/libraries/protobuf/3.19.nix { }; protobuf3_17 = callPackage ../development/libraries/protobuf/3.17.nix { }; - protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { }; protobuf3_8 = callPackage ../development/libraries/protobuf/3.8.nix { }; protobuf3_7 = callPackage ../development/libraries/protobuf/3.7.nix { }; - protobufc = callPackage ../development/libraries/protobufc/1.3.nix { }; + protobufc = callPackage ../development/libraries/protobufc { }; protolock = callPackage ../development/libraries/protolock { }; @@ -24841,11 +24767,7 @@ with pkgs; libcap = callPackage ../os-specific/linux/libcap { }; - libcap_ng = callPackage ../os-specific/linux/libcap-ng { - swig = null; # Currently not using the python2/3 bindings - python2 = null; # Currently not using the python2 bindings - python3 = null; # Currently not using the python3 bindings - }; + libcap_ng = callPackage ../os-specific/linux/libcap-ng { }; libnotify = callPackage ../development/libraries/libnotify { }; @@ -24948,6 +24870,8 @@ with pkgs; open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { }; open-vm-tools-headless = open-vm-tools.override { withX = false; }; + oxtools = callPackage ../os-specific/linux/oxtools { }; + air = callPackage ../development/tools/air { }; delve = callPackage ../development/tools/delve { }; @@ -28139,14 +28063,12 @@ with pkgs; firefox-unwrapped = firefoxPackages.firefox; firefox-esr-102-unwrapped = firefoxPackages.firefox-esr-102; - firefox-esr-91-unwrapped = firefoxPackages.firefox-esr-91; firefox-esr-unwrapped = firefoxPackages.firefox-esr-102; firefox = wrapFirefox firefox-unwrapped { }; firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; }; firefox-esr = firefox-esr-102; - firefox-esr-91 = wrapFirefox firefox-esr-91-unwrapped { }; firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { }; firefox-esr-wayland = wrapFirefox firefox-esr-102-unwrapped { forceWayland = true; }; @@ -29077,6 +28999,12 @@ with pkgs; inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {}); + inlyne = callPackage ../applications/misc/inlyne { + inherit (xorg) libX11 libXcursor libXi libXrandr libxcb; + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) AppKit ApplicationServices CoreFoundation CoreGraphics CoreServices CoreText CoreVideo Foundation Metal QuartzCore Security; + }; + inspectrum = callPackage ../applications/radio/inspectrum { }; inputplug = callPackage ../tools/X11/inputplug { }; @@ -31745,10 +31673,6 @@ with pkgs; thunderbird = wrapThunderbird thunderbird-unwrapped { }; thunderbird-wayland = wrapThunderbird thunderbird-unwrapped { forceWayland = true; }; - thunderbird-91-unwrapped = thunderbirdPackages.thunderbird-91; - thunderbird-91 = wrapThunderbird thunderbird-91-unwrapped { }; - thunderbird-91-wayland = wrapThunderbird thunderbird-91-unwrapped { forceWayland = true; }; - thunderbird-bin = wrapThunderbird thunderbird-bin-unwrapped { applicationName = "thunderbird"; pname = "thunderbird-bin"; @@ -31759,16 +31683,6 @@ with pkgs; generated = import ../applications/networking/mailreaders/thunderbird-bin/release_sources.nix; }; - thunderbird-bin-91 = wrapThunderbird thunderbird-bin-91-unwrapped { - applicationName = "thunderbird"; - pname = "thunderbird-bin"; - desktopName = "Thunderbird"; - }; - thunderbird-bin-91-unwrapped = callPackage ../applications/networking/mailreaders/thunderbird-bin { - inherit (gnome) adwaita-icon-theme; - generated = import ../applications/networking/mailreaders/thunderbird-bin/91_sources.nix; - }; - thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; ticpp = callPackage ../development/libraries/ticpp { }; @@ -32372,7 +32286,9 @@ with pkgs; weston = callPackage ../applications/window-managers/weston { }; - whalebird = callPackage ../applications/misc/whalebird { }; + whalebird = callPackage ../applications/misc/whalebird { + electron = electron_19; + }; wio = callPackage ../applications/window-managers/wio { wlroots = wlroots_0_14; @@ -33086,6 +33002,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + taro = callPackage ../applications/blockchains/taro { }; + terra-station = callPackage ../applications/blockchains/terra-station { }; tessera = callPackage ../applications/blockchains/tessera { }; @@ -36134,7 +36052,6 @@ with pkgs; storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; inherit (darwin.apple_sdk.frameworks) Security; - curl = curl.override { patchNetrcRegression = true; }; }); nix = nixVersions.stable; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index c246040a9747..302b301b115e 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -193,6 +193,18 @@ in { inherit openjdk18-bootstrap; openjfx = openjfx17; }; + + temurin-bin = recurseIntoAttrs (callPackage ( + if stdenv.isLinux + then ../development/compilers/temurin-bin/jdk-linux.nix + else ../development/compilers/temurin-bin/jdk-darwin.nix + ) {}); + + semeru-bin = recurseIntoAttrs (callPackage ( + if stdenv.isLinux + then ../development/compilers/semeru-bin/jdk-linux.nix + else ../development/compilers/semeru-bin/jdk-darwin.nix + ) {}); }; mavenPlugins = recurseIntoAttrs (callPackage ../development/java-modules/mavenPlugins.nix { }); diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 012a4d1e0c77..3617e7632333 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -1,76 +1,65 @@ /* This file defines the composition for Lua packages. It has - been factored out of all-packages.nix because there are many of - them. Also, because most Nix expressions for Lua packages are - trivial, most are actually defined here. I.e. there's no function - for each package in a separate file: the call to the function would - be almost as must code as the function itself. */ + been factored out of all-packages.nix because there are many of + them. Also, because most Nix expressions for Lua packages are + trivial, most are actually defined here. I.e. there's no function + for each package in a separate file: the call to the function would + be almost as must code as the function itself. */ -{ fetchurl, stdenv, lua, unzip, pkg-config -, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat -, autoreconfHook, gnum4 -, postgresql, cyrus_sasl -, fetchFromGitHub, which, writeText -, pkgs +{ pkgs +, stdenv , lib -}@args: +, lua +}: + + +self: let - packages = ( self: + inherit (self) callPackage; -let - callPackage = pkgs.newScope self; + buildLuaApplication = args: buildLuarocksPackage ({ namePrefix = ""; } // args); - buildLuaApplication = args: buildLuarocksPackage ({namePrefix="";} // args ); + buildLuarocksPackage = lib.makeOverridable (callPackage ../development/interpreters/lua-5/build-lua-package.nix { }); - buildLuarocksPackage = lib.makeOverridable(callPackage ../development/interpreters/lua-5/build-lua-package.nix { - inherit lua; - inherit (pkgs) lib; - inherit (luaLib) toLuaModule; - }); - - luaLib = import ../development/lua-modules/lib.nix { - inherit (pkgs) lib; - inherit pkgs lua; - }; + luaLib = callPackage ../development/lua-modules/lib.nix { }; #define build lua package function - buildLuaPackage = callPackage ../development/lua-modules/generic { - inherit writeText; - }; + buildLuaPackage = callPackage ../development/lua-modules/generic { }; getPath = drv: pathListForVersion: lib.concatMapStringsSep ";" (path: "${drv}/${path}") pathListForVersion; in { + + # Dont take luaPackages from "global" pkgs scope to avoid mixing lua versions + luaPackages = self; + # helper functions for dealing with LUA_PATH and LUA_CPATH - lib = luaLib; + inherit luaLib; getLuaPath = drv: getPath drv luaLib.luaPathList; getLuaCPath = drv: getPath drv luaLib.luaCPathList; - inherit (callPackage ../development/interpreters/lua-5/hooks { inherit (args) lib;}) + inherit (callPackage ../development/interpreters/lua-5/hooks { }) luarocksMoveDataFolder luarocksCheckHook lua-setup-hook; - inherit lua callPackage; + inherit lua; inherit buildLuaPackage buildLuarocksPackage buildLuaApplication; inherit (luaLib) luaOlder luaAtLeast isLua51 isLua52 isLua53 isLuaJIT requiredLuaModules toLuaModule hasLuaModule; # wraps programs in $out/bin with valid LUA_PATH/LUA_CPATH wrapLua = callPackage ../development/interpreters/lua-5/wrap-lua.nix { - inherit lua lib; inherit (pkgs.buildPackages) makeSetupHook makeWrapper; }; - luarocks = callPackage ../development/tools/misc/luarocks/default.nix { - inherit lua lib; - }; + luarocks = callPackage ../development/tools/misc/luarocks/default.nix { }; # a fork of luarocks used to generate nix lua derivations from rockspecs luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }; - luxio = buildLuaPackage { + luxio = callPackage ({ fetchurl, which, pkg-config }: buildLuaPackage { pname = "luxio"; version = "13"; @@ -102,14 +91,13 @@ in maintainers = with maintainers; [ richardipsum ]; platforms = platforms.unix; }; - }; + }); nfd = callPackage ../development/lua-modules/nfd { - inherit (lib) maintainers; inherit (pkgs.gnome) zenity; }; - vicious = luaLib.toLuaModule( stdenv.mkDerivation rec { + vicious = (callPackage ({ fetchFromGitHub }: stdenv.mkDerivation rec { pname = "vicious"; version = "2.5.1"; @@ -130,12 +118,11 @@ in meta = with lib; { description = "A modular widget library for the awesome window manager"; - homepage = "https://vicious.rtfd.io"; - license = licenses.gpl2Plus; + homepage = "https://vicious.rtfd.io"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ makefu mic92 McSinyx ]; - platforms = platforms.linux; + platforms = platforms.linux; }; - }); + }) {}); -}); -in packages +} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index acda1e472c7b..e41b075ce710 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -90,6 +90,8 @@ mapAliases ({ influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 jupyter_client = jupyter-client; # added 2021-10-15 Keras = keras; # added 2021-11-25 + ldap = python-ldap; # added 2022-09-16 + lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 loo-py = loopy; # added 2022-05-03 Markups = markups; # added 2022-02-14 MechanicalSoup = throw "'MechanicalSoup' has been renamed to/replaced by 'mechanicalsoup'"; # Converted to throw 2022-09-24 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 756545bb54c3..e68e86822916 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -119,6 +119,7 @@ in { pythonCatchConflictsHook pythonImportsCheckHook pythonNamespacesHook + pythonOutputDistHook pythonRecompileBytecodeHook pythonRelaxDepsHook pythonRemoveBinBytecodeHook @@ -888,6 +889,8 @@ in { autobahn = callPackage ../development/python-modules/autobahn { }; + autocommand = callPackage ../development/python-modules/autocommand { }; + autograd = callPackage ../development/python-modules/autograd { }; autoit-ripper = callPackage ../development/python-modules/autoit-ripper { }; @@ -2202,10 +2205,10 @@ in { cython = callPackage ../development/python-modules/Cython { }; cython_3 = self.cython.overridePythonAttrs (old: rec { - version = "3.0.0a10"; + version = "3.0.0a11"; src = old.src.override { inherit version; - sha256 = "342e95121a3d1a67cbcf7b340391eb40cc5ce3d2a79d7873e005e8783353d89d"; + hash = "sha256-5GckkfsxVGuau2Nnf2OOc4CF3JMhOYFwlW72+/wOFyY="; }; patches = [ ]; }); @@ -2825,7 +2828,9 @@ in { dugong = callPackage ../development/python-modules/dugong { }; - dulwich = callPackage ../development/python-modules/dulwich { }; + dulwich = callPackage ../development/python-modules/dulwich { + inherit (pkgs) gnupg; + }; dunamai = callPackage ../development/python-modules/dunamai { }; @@ -3024,6 +3029,7 @@ in { etebase = callPackage ../development/python-modules/etebase { inherit (pkgs.darwin.apple_sdk.frameworks) Security; + openssl = pkgs.openssl_1_1; }; etebase-server = callPackage ../servers/etebase { }; @@ -3364,6 +3370,8 @@ in { flask_mail = callPackage ../development/python-modules/flask-mail { }; + flask-mailman = callPackage ../development/python-modules/flask-mailman { }; + flask_marshmallow = callPackage ../development/python-modules/flask-marshmallow { }; flask_migrate = callPackage ../development/python-modules/flask-migrate { }; @@ -4052,8 +4060,8 @@ in { }; gst-python = callPackage ../development/python-modules/gst-python { - inherit (pkgs) meson; - inherit (pkgs.gst_all_1) gst-plugins-base; + # inherit (pkgs) meson won't work because it won't be spliced + inherit (pkgs.buildPackages) meson; }; gtfs-realtime-bindings = callPackage ../development/python-modules/gtfs-realtime-bindings { }; @@ -4705,6 +4713,7 @@ in { # pin to `cudaPackages_11_6` instead. cudaPackages = pkgs.cudaPackages_11_6; IOKit = pkgs.darwin.apple_sdk_11_0.IOKit; + protobuf = pkgs.protobuf3_20; # jaxlib-build 0.3.15 won't build with protobuf 3.21 }; jaxlib = self.jaxlib-build; @@ -4843,6 +4852,8 @@ in { jsonschema_3 = callPackage ../development/python-modules/jsonschema/3_x.nix { }; + jsonschema-spec = callPackage ../development/python-modules/jsonschema-spec { }; + jsonstreams = callPackage ../development/python-modules/jsonstreams { }; json-tricks = callPackage ../development/python-modules/json-tricks { }; @@ -5078,10 +5089,6 @@ in { lc7001 = callPackage ../development/python-modules/lc7001 { }; - ldap = callPackage ../development/python-modules/ldap { - inherit (pkgs) openldap cyrus_sasl; - }; - ldap3 = callPackage ../development/python-modules/ldap3 { }; ldapdomaindump = callPackage ../development/python-modules/ldapdomaindump { }; @@ -5671,6 +5678,8 @@ in { mesonpep517 = callPackage ../development/python-modules/mesonpep517 { }; + meson-python = callPackage ../development/python-modules/meson-python { }; + messagebird = callPackage ../development/python-modules/messagebird { }; metakernel = callPackage ../development/python-modules/metakernel { }; @@ -7142,6 +7151,8 @@ in { poetry-dynamic-versioning = callPackage ../development/python-modules/poetry-dynamic-versioning { }; + poetry-plugin-export = callPackage ../development/python-modules/poetry-plugin-export { }; + poetry-semver = callPackage ../development/python-modules/poetry-semver { }; poetry2conda = callPackage ../development/python-modules/poetry2conda { }; @@ -8278,6 +8289,8 @@ in { pyproj = callPackage ../development/python-modules/pyproj { }; + pyproject-metadata = callPackage ../development/python-modules/pyproject-metadata { }; + pyprosegur = callPackage ../development/python-modules/pyprosegur { }; pyptlib = callPackage ../development/python-modules/pyptlib { }; @@ -8957,6 +8970,10 @@ in { python_keyczar = callPackage ../development/python-modules/python_keyczar { }; + python-ldap = callPackage ../development/python-modules/python-ldap { + inherit (pkgs) openldap cyrus_sasl; + }; + python-ldap-test = callPackage ../development/python-modules/python-ldap-test { }; python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { }; @@ -9438,7 +9455,9 @@ in { rachiopy = callPackage ../development/python-modules/rachiopy { }; - radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud { }; + radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud { + radicale = pkgs.radicale.override { python3 = python; }; + }; radio_beam = callPackage ../development/python-modules/radio_beam { }; @@ -9602,6 +9621,8 @@ in { requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket { }; + requests-wsgi-adapter = callPackage ../development/python-modules/requests-wsgi-adapter { }; + requirements-detector = callPackage ../development/python-modules/requirements-detector { }; requirements-parser = callPackage ../development/python-modules/requirements-parser { }; @@ -10405,6 +10426,8 @@ in { sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { }; + sphinxcontrib-asyncio = callPackage ../development/python-modules/sphinxcontrib-asyncio { }; + sphinxcontrib-autoapi = callPackage ../development/python-modules/sphinxcontrib-autoapi { }; sphinxcontrib-bayesnet = callPackage ../development/python-modules/sphinxcontrib-bayesnet { }; @@ -11395,6 +11418,8 @@ in { uncompyle6 = callPackage ../development/python-modules/uncompyle6 { }; + unearth = callPackage ../development/python-modules/unearth { }; + unicodecsv = callPackage ../development/python-modules/unicodecsv { }; unicodedata2 = callPackage ../development/python-modules/unicodedata2 { };