diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md index 00bd524b0c5..734bf2b6389 100644 --- a/doc/languages-frameworks/gnome.section.md +++ b/doc/languages-frameworks/gnome.section.md @@ -68,7 +68,7 @@ preFixup = '' Fortunately, there is [`wrapGAppsHook`]{#ssec-gnome-hooks-wrapgappshook}. It works in conjunction with other setup hooks that populate environment variables, and it will then wrap all executables in `bin` and `libexec` directories using said variables. -For convenience, it also adds `dconf.lib` for a GIO module implementing a GSettings backend using `dconf`, `gtk3` for GSettings schemas, and `librsvg` for GdkPixbuf loader to the closure. In case you are packaging a program without a graphical interface, you might want to use [`wrapGAppsNoGuiHook`]{#ssec-gnome-hooks-wrapgappsnoguihook}, which runs the same script as `wrapGAppsHook` but does not bring `gtk3` and `librsvg` into the closure. +For convenience, it also adds `dconf.lib` for a GIO module implementing a GSettings backend using `dconf`, `gtk3` for GSettings schemas, and `librsvg` for GdkPixbuf loader to the closure. There is also [`wrapGAppsHook4`]{#ssec-gnome-hooks-wrapgappshook4}, which replaces GTK 3 with GTK 4. And in case you are packaging a program without a graphical interface, you might want to use [`wrapGAppsNoGuiHook`]{#ssec-gnome-hooks-wrapgappsnoguihook}, which runs the same script as `wrapGAppsHook` but does not bring `gtk3` and `librsvg` into the closure. - `wrapGAppsHook` itself will add the package’s `share` directory to `XDG_DATA_DIRS`. diff --git a/lib/customisation.nix b/lib/customisation.nix index 37a7951896b..c17cb0d0f8e 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -219,16 +219,17 @@ rec { /* Like the above, but aims to support cross compilation. It's still ugly, but hopefully it helps a little bit. */ - makeScopeWithSplicing = splicePackages: newScope: otherSplices: keep: f: + makeScopeWithSplicing = splicePackages: newScope: otherSplices: keep: extra: f: let - spliced = splicePackages { + spliced0 = splicePackages { pkgsBuildBuild = otherSplices.selfBuildBuild; pkgsBuildHost = otherSplices.selfBuildHost; pkgsBuildTarget = otherSplices.selfBuildTarget; pkgsHostHost = otherSplices.selfHostHost; pkgsHostTarget = self; # Not `otherSplices.selfHostTarget`; pkgsTargetTarget = otherSplices.selfTargetTarget; - } // keep self; + }; + spliced = extra spliced0 // spliced0 // keep self; self = f self // { newScope = scope: newScope (spliced // scope); callPackage = newScope spliced; # == self.newScope {}; @@ -239,6 +240,7 @@ rec { newScope otherSplices keep + extra (lib.fixedPoints.extends g f); packages = f; }; diff --git a/lib/modules.nix b/lib/modules.nix index d515ee24d16..99b9a8a31ea 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -23,6 +23,7 @@ let isAttrs isBool isFunction + isList isString length mapAttrs @@ -127,7 +128,7 @@ rec { let collected = collectModules (specialArgs.modulesPath or "") (modules ++ [ internalModule ]) - ({ inherit lib options config; } // specialArgs); + ({ inherit lib options config specialArgs; } // specialArgs); in mergeModules prefix (reverseList collected); options = merged.matchedOptions; @@ -188,6 +189,9 @@ rec { loadModule = args: fallbackFile: fallbackKey: m: if isFunction m || isAttrs m then unifyModuleSyntax fallbackFile fallbackKey (applyIfFunction fallbackKey m args) + else if isList m then + let defs = [{ file = fallbackFile; value = m; }]; in + throw "Module imports can't be nested lists. Perhaps you meant to remove one level of lists? Definitions: ${showDefs defs}" else unifyModuleSyntax (toString m) (toString m) (applyIfFunction (toString m) (import m) args); /* @@ -295,13 +299,11 @@ rec { # a module will resolve strictly the attributes used as argument but # not their values. The values are forwarding the result of the # evaluation of the option. - requiredArgs = builtins.attrNames (lib.functionArgs f); context = name: ''while evaluating the module argument `${name}' in "${key}":''; - extraArgs = builtins.listToAttrs (map (name: { - inherit name; - value = builtins.addErrorContext (context name) - (args.${name} or config._module.args.${name}); - }) requiredArgs); + extraArgs = builtins.mapAttrs (name: _: + builtins.addErrorContext (context name) + (args.${name} or config._module.args.${name}) + ) (lib.functionArgs f); # Note: we append in the opposite order such that we can add an error # context on the explicited arguments of "args" too. This update diff --git a/lib/strings.nix b/lib/strings.nix index 2e502588bf8..49fa0196a0b 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -659,7 +659,7 @@ rec { Example: isStorePath "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11/bin/python" => false - isStorePath "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11/" + isStorePath "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11" => true isStorePath pkgs.python => true @@ -667,7 +667,7 @@ rec { => false */ isStorePath = x: - if isCoercibleToString x then + if !(isList x) && isCoercibleToString x then let str = toString x; in substring 0 1 str == "/" && dirOf str == storeDir diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 2eddeec07b1..2e57c2f8e2a 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -175,6 +175,9 @@ checkConfigOutput "true" config.submodule.config ./declare-submoduleWith-noshort ## submoduleWith should merge all modules in one swoop checkConfigOutput "true" config.submodule.inner ./declare-submoduleWith-modules.nix checkConfigOutput "true" config.submodule.outer ./declare-submoduleWith-modules.nix +# Should also be able to evaluate the type name (which evaluates freeformType, +# which evaluates all the modules defined by the type) +checkConfigOutput "submodule" options.submodule.type.description ./declare-submoduleWith-modules.nix ## Paths should be allowed as values and work as expected checkConfigOutput "true" config.submodule.enable ./declare-submoduleWith-path.nix diff --git a/lib/tests/modules/declare-submoduleWith-modules.nix b/lib/tests/modules/declare-submoduleWith-modules.nix index 4736ab41751..a8b82d17688 100644 --- a/lib/tests/modules/declare-submoduleWith-modules.nix +++ b/lib/tests/modules/declare-submoduleWith-modules.nix @@ -8,9 +8,6 @@ default = false; }; } - { - outer = true; - } ]; }; default = {}; @@ -25,6 +22,7 @@ }) { inner = true; + outer = true; } ]; } diff --git a/lib/types.nix b/lib/types.nix index 31ce440bcb4..d709791d6d0 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -147,9 +147,13 @@ rec { , # The deprecation message to display when this type is used by an option # If null, the type isn't deprecated deprecationMessage ? null + , # The types that occur in the definition of this type. This is used to + # issue deprecation warnings recursively. Can also be used to reuse + # nested types + nestedTypes ? {} }: { _type = "option-type"; - inherit name check merge emptyValue getSubOptions getSubModules substSubModules typeMerge functor deprecationMessage; + inherit name check merge emptyValue getSubOptions getSubModules substSubModules typeMerge functor deprecationMessage nestedTypes; description = if description == null then name else description; }; @@ -365,6 +369,7 @@ rec { getSubModules = elemType.getSubModules; substSubModules = m: listOf (elemType.substSubModules m); functor = (defaultFunctor name) // { wrapped = elemType; }; + nestedTypes.elemType = elemType; }; nonEmptyListOf = elemType: @@ -389,6 +394,7 @@ rec { getSubModules = elemType.getSubModules; substSubModules = m: attrsOf (elemType.substSubModules m); functor = (defaultFunctor name) // { wrapped = elemType; }; + nestedTypes.elemType = elemType; }; # A version of attrsOf that's lazy in its values at the expense of @@ -413,6 +419,7 @@ rec { getSubModules = elemType.getSubModules; substSubModules = m: lazyAttrsOf (elemType.substSubModules m); functor = (defaultFunctor name) // { wrapped = elemType; }; + nestedTypes.elemType = elemType; }; # TODO: drop this in the future: @@ -421,6 +428,7 @@ rec { deprecationMessage = "Mixing lists with attribute values is no longer" + " possible; please use `types.attrsOf` instead. See" + " https://github.com/NixOS/nixpkgs/issues/1800 for the motivation."; + nestedTypes.elemType = elemType; }; # Value of given type but with no merging (i.e. `uniq list`s are not concatenated). @@ -433,6 +441,7 @@ rec { getSubModules = elemType.getSubModules; substSubModules = m: uniq (elemType.substSubModules m); functor = (defaultFunctor name) // { wrapped = elemType; }; + nestedTypes.elemType = elemType; }; # Null or value of ... @@ -451,6 +460,7 @@ rec { getSubModules = elemType.getSubModules; substSubModules = m: nullOr (elemType.substSubModules m); functor = (defaultFunctor name) // { wrapped = elemType; }; + nestedTypes.elemType = elemType; }; functionTo = elemType: mkOptionType { @@ -535,6 +545,9 @@ rec { substSubModules = m: submoduleWith (attrs // { modules = m; }); + nestedTypes = lib.optionalAttrs (freeformType != null) { + freeformType = freeformType; + }; functor = defaultFunctor name // { type = types.submoduleWith; payload = { @@ -596,6 +609,8 @@ rec { then functor.type mt1 mt2 else null; functor = (defaultFunctor name) // { wrapped = [ t1 t2 ]; }; + nestedTypes.left = t1; + nestedTypes.right = t2; }; # Any of the types in the given list @@ -627,6 +642,8 @@ rec { substSubModules = m: coercedTo coercedType coerceFunc (finalType.substSubModules m); typeMerge = t1: t2: null; functor = (defaultFunctor name) // { wrapped = finalType; }; + nestedTypes.coercedType = coercedType; + nestedTypes.finalType = finalType; }; # Obsolete alternative to configOf. It takes its option diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 1305e0947c7..5317bdb9f42 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -1,5 +1,6 @@ { package ? null , maintainer ? null +, predicate ? null , path ? null , max-workers ? null , include-overlays ? false @@ -69,6 +70,11 @@ let */ packagesWith = packagesWithPath []; + /* Recursively find all packages in `pkgs` with updateScript matching given predicate. + */ + packagesWithUpdateScriptMatchingPredicate = cond: + packagesWith (path: pkg: builtins.hasAttr "updateScript" pkg && cond path pkg); + /* Recursively find all packages in `pkgs` with updateScript by given maintainer. */ packagesWithUpdateScriptAndMaintainer = maintainer': @@ -79,7 +85,7 @@ let else builtins.getAttr maintainer' lib.maintainers; in - packagesWith (path: pkg: builtins.hasAttr "updateScript" pkg && + packagesWithUpdateScriptMatchingPredicate (path: pkg: (if builtins.hasAttr "maintainers" pkg.meta then (if builtins.isList pkg.meta.maintainers then builtins.elem maintainer pkg.meta.maintainers @@ -120,6 +126,8 @@ let packages = if package != null then [ (packageByName package pkgs) ] + else if predicate != null then + packagesWithUpdateScriptMatchingPredicate predicate pkgs else if maintainer != null then packagesWithUpdateScriptAndMaintainer maintainer pkgs else if path != null then @@ -139,6 +147,10 @@ let to run update script for specific package, or + % nix-shell maintainers/scripts/update.nix --arg predicate '(path: pkg: builtins.isList pkg.updateScript && builtins.length pkg.updateScript >= 1 && (let script = builtins.head pkg.updateScript; in builtins.isAttrs script && script.name == "gnome-update-script"))' + + to run update script for all packages matching given predicate, or + % nix-shell maintainers/scripts/update.nix --argstr path gnome3 to run update script for all package under an attribute path. diff --git a/maintainers/scripts/update.py b/maintainers/scripts/update.py index 8cc2bcbd67c..eb26a472e92 100644 --- a/maintainers/scripts/update.py +++ b/maintainers/scripts/update.py @@ -39,6 +39,9 @@ async def run_update_script(nixpkgs_root: str, merge_lock: asyncio.Lock, temp_di if temp_dir is not None: worktree, _branch = temp_dir + # Ensure the worktree is clean before update. + await check_subprocess('git', 'reset', '--hard', '--quiet', 'HEAD', cwd=worktree) + # Update scripts can use $(dirname $0) to get their location but we want to run # their clones in the git worktree, not in the main nixpkgs repo. update_script_command = map(lambda arg: re.sub(r'^{0}'.format(re.escape(nixpkgs_root)), worktree, arg), update_script_command) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index e3e6dc48433..bee1cddbecf 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -27,7 +27,7 @@ The default Linux kernel was updated to the 5.10 LTS series, coming from the 5.4 LTS series. - GNOME desktop environment was upgraded to 3.38, see its release notes. + GNOME desktop environment was upgraded to 40, see the release notes for 40.0 and 3.38. diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 7800a49e410..270a5969cda 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -735,6 +735,7 @@ class Machine: shell_path = os.path.join(self.state_dir, "shell") self.shell_socket = create_socket(shell_path) + display_available = any(x in os.environ for x in ["DISPLAY", "WAYLAND_DISPLAY"]) qemu_options = ( " ".join( [ @@ -744,7 +745,7 @@ class Machine: "-device virtio-serial", "-device virtconsole,chardev=shell", "-device virtio-rng-pci", - "-serial stdio" if "DISPLAY" in os.environ else "-nographic", + "-serial stdio" if display_available else "-nographic", ] ) + " " diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 1418420afcd..7a4738599b0 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -162,12 +162,14 @@ let isolinuxCfg = concatStringsSep "\n" ([ baseIsolinuxCfg ] ++ optional config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry); + refindBinary = if targetArch == "x64" || targetArch == "aa64" then "refind_${targetArch}.efi" else null; + # Setup instructions for rEFInd. refind = - if targetArch == "x64" then + if refindBinary != null then '' # Adds rEFInd to the ISO. - cp -v ${pkgs.refind}/share/refind/refind_x64.efi $out/EFI/boot/ + cp -v ${pkgs.refind}/share/refind/${refindBinary} $out/EFI/boot/ '' else "# No refind for ${targetArch}" @@ -186,7 +188,10 @@ let # Fonts can be loaded? # (This font is assumed to always be provided as a fallback by NixOS) - if loadfont (hd0)/EFI/boot/unicode.pf2; then + if loadfont /EFI/boot/unicode.pf2; then + set with_fonts=true + fi + if [ "\$textmode" != "true" -a "\$with_fonts" == "true" ]; then # Use graphical term, it can be either with background image or a theme. # input is "console", while output is "gfxterm". # This enables "serial" input and output only when possible. @@ -207,11 +212,11 @@ let ${ # When there is a theme configured, use it, otherwise use the background image. if config.isoImage.grubTheme != null then '' # Sets theme. - set theme=(hd0)/EFI/boot/grub-theme/theme.txt + set theme=/EFI/boot/grub-theme/theme.txt # Load theme fonts - $(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont (hd0)/EFI/boot/grub-theme/%P\n") + $(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont /EFI/boot/grub-theme/%P\n") '' else '' - if background_image (hd0)/EFI/boot/efi-background.png; then + if background_image /EFI/boot/efi-background.png; then # Black background means transparent background when there # is a background image set... This seems undocumented :( set color_normal=black/black @@ -264,6 +269,8 @@ let cat < $out/EFI/boot/grub.cfg + set with_fonts=false + set textmode=false # If you want to use serial for "terminal_*" commands, you need to set one up: # Example manual configuration: # → serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1 @@ -273,8 +280,28 @@ let export with_serial clear set timeout=10 + + # This message will only be viewable when "gfxterm" is not used. + echo "" + echo "Loading graphical boot menu..." + echo "" + echo "Press 't' to use the text boot menu on this console..." + echo "" + ${grubMenuCfg} + hiddenentry 'Text mode' --hotkey 't' { + loadfont /EFI/boot/unicode.pf2 + set textmode=true + terminal_output gfxterm console + } + hiddenentry 'GUI mode' --hotkey 'g' { + $(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont /EFI/boot/grub-theme/%P\n") + set textmode=false + terminal_output gfxterm + } + + # If the parameter iso_path is set, append the findiso parameter to the kernel # line. We need this to allow the nixos iso to be booted from grub directly. if [ \''${iso_path} ] ; then @@ -337,11 +364,15 @@ let } } - menuentry 'rEFInd' --class refind { - # UUID is hard-coded in the derivation. - search --set=root --no-floppy --fs-uuid 1234-5678 - chainloader (\$root)/EFI/boot/refind_x64.efi - } + ${lib.optionalString (refindBinary != null) '' + # GRUB apparently cannot do "chainloader" operations on "CD". + if [ "\$root" != "cd0" ]; then + menuentry 'rEFInd' --class refind { + # \$root defaults to the drive the EFI is found on. + chainloader (\$root)/EFI/boot/${refindBinary} + } + fi + ''} menuentry 'Firmware Setup' --class settings { fwsetup clear diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index 41483d80a2d..24a259bb4d2 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -37,7 +37,7 @@ in enableProfilePath = mkEnableOption "exposing the Disnix profiles in the system's PATH"; profiles = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = [ "default" ]; example = [ "default" ]; description = "Names of the Disnix profiles to expose in the system's PATH"; @@ -53,6 +53,7 @@ in environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService; environment.variables.PATH = lib.optionals cfg.enableProfilePath (map (profileName: "/nix/var/nix/profiles/disnix/${profileName}/bin" ) cfg.profiles); + environment.variables.DISNIX_REMOTE_CLIENT = lib.optionalString (cfg.enableMultiUser) "disnix-client"; services.dbus.enable = true; services.dbus.packages = [ pkgs.disnix ]; diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 1985f130881..1e33381de24 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -298,7 +298,7 @@ in { ProtectKernelModules = true; ProtectKernelTunables = true; ProtectProc = "invisible"; - ProcSubset = "pid"; + ProcSubset = "all"; ProtectSystem = "strict"; RemoveIPC = true; ReadWritePaths = let @@ -308,9 +308,10 @@ in { allowPaths = if isList value then value else singleton value; in [ "${cfg.configDir}" ] ++ allowPaths; RestrictAddressFamilies = [ - "AF_UNIX" "AF_INET" "AF_INET6" + "AF_NETLINK" + "AF_UNIX" ] ++ optionals (useComponent "bluetooth_tracker" || useComponent "bluetooth_le_tracker") [ "AF_BLUETOOTH" ]; diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index 007024c04ce..c2ee1c0df7f 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -149,8 +149,9 @@ in { description = "Real time performance monitoring"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = (with pkgs; [ curl gawk which ]) ++ lib.optional cfg.python.enable - (pkgs.python3.withPackages cfg.python.extraPackages); + path = (with pkgs; [ curl gawk iproute2 which ]) + ++ lib.optional cfg.python.enable (pkgs.python3.withPackages cfg.python.extraPackages) + ++ lib.optional config.virtualisation.libvirtd.enable (config.virtualisation.libvirtd.package); environment = { PYTHONPATH = "${cfg.package}/libexec/netdata/python.d/python_modules"; } // lib.optionalAttrs (!cfg.enableAnalyticsReporting) { @@ -182,6 +183,9 @@ in { ConfigurationDirectory = "netdata"; ConfigurationDirectoryMode = "0755"; # Capabilities + AmbientCapabilities = [ + "CAP_SETUID" # is required for cgroups and cgroups-network plugins + ]; CapabilityBoundingSet = [ "CAP_DAC_OVERRIDE" # is required for freeipmi and slabinfo plugins "CAP_DAC_READ_SEARCH" # is required for apps plugin @@ -191,6 +195,8 @@ in { "CAP_SYS_PTRACE" # is required for apps plugin "CAP_SYS_RESOURCE" # is required for ebpf plugin "CAP_NET_RAW" # is required for fping app + "CAP_SYS_CHROOT" # is required for cgroups plugin + "CAP_SETUID" # is required for cgroups and cgroups-network plugins ]; # Sandboxing ProtectSystem = "full"; diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index bd74e1a9cdb..1d483627e9e 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -112,7 +112,7 @@ let http://tools.ietf.org/html/rfc4366#section-3.1 ''; }; - name = mkOpt types.string '' + name = mkOpt types.str '' Name of the remote read config, which if specified must be unique among remote read configs. The name will be used in metrics and logging in place of a generated value to help users distinguish between remote read configs. @@ -174,7 +174,7 @@ let write_relabel_configs = mkOpt (types.listOf promTypes.relabel_config) '' List of remote write relabel configurations. ''; - name = mkOpt types.string '' + name = mkOpt types.str '' Name of the remote write config, which if specified must be unique among remote write configs. The name will be used in metrics and logging in place of a generated value to help users distinguish between remote write configs. diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 61482596763..8a0685c3d96 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -3,6 +3,10 @@ with lib; let + package = if cfg.allowAuxiliaryImperativeNetworks + then pkgs.wpa_supplicant_ro_ssids + else pkgs.wpa_supplicant; + cfg = config.networking.wireless; configFile = if cfg.networks != {} || cfg.extraConfig != "" || cfg.userControlled.enable then pkgs.writeText "wpa_supplicant.conf" '' ${optionalString cfg.userControlled.enable '' @@ -47,6 +51,16 @@ in { description = "Force a specific wpa_supplicant driver."; }; + allowAuxiliaryImperativeNetworks = mkEnableOption "support for imperative & declarative networks" // { + description = '' + Whether to allow configuring networks "imperatively" (e.g. via + wpa_supplicant_gui) and declaratively via + . + + Please note that this adds a custom patch to wpa_supplicant. + ''; + }; + networks = mkOption { type = types.attrsOf (types.submodule { options = { @@ -211,9 +225,9 @@ in { message = ''options networking.wireless."${name}".{psk,pskRaw,auth} are mutually exclusive''; }); - environment.systemPackages = [ pkgs.wpa_supplicant ]; + environment.systemPackages = [ package ]; - services.dbus.packages = [ pkgs.wpa_supplicant ]; + services.dbus.packages = [ package ]; services.udev.packages = [ pkgs.crda ]; # FIXME: start a separate wpa_supplicant instance per interface. @@ -230,13 +244,17 @@ in { wantedBy = [ "multi-user.target" ]; stopIfChanged = false; - path = [ pkgs.wpa_supplicant ]; + path = [ package ]; - script = '' + script = let + configStr = if cfg.allowAuxiliaryImperativeNetworks + then "-c /etc/wpa_supplicant.conf -I ${configFile}" + else "-c ${configFile}"; + in '' if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ] then echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead." fi - iface_args="-s -u -D${cfg.driver} -c ${configFile}" + iface_args="-s -u -D${cfg.driver} ${configStr}" ${if ifaces == [] then '' for i in $(cd /sys/class/net && echo *); do DEVTYPE= diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 7bec073e26f..1dec111b829 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -402,6 +402,7 @@ in mr ${getLib pkgs.util-linuxMinimal.out}/lib/libuuid.so*, mr ${getLib pkgs.xz}/lib/liblzma*.so*, mr ${getLib pkgs.zlib}/lib/libz*.so*, + mr ${getLib pkgs.brotli}/lib/libbrotli*.so*, r @{PROC}/sys/kernel/random/uuid, r @{PROC}/sys/vm/overcommit_memory, diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index b6e87c89e0a..5b578cd8c4a 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -168,10 +168,15 @@ in type = lib.types.str; default = "keycloak"; description = '' - Username to use when connecting to the database. - This is also used for automatic provisioning of the database. - Changing this after the initial installation doesn't delete the - old user and can cause further problems. + Username to use when connecting to an external or manually + provisioned database; has no effect when a local database is + automatically provisioned. + + To use this with a local database, set to + false and create the database and user + manually. The database should be called + keycloak. ''; }; @@ -588,8 +593,8 @@ in PSQL=${config.services.postgresql.package}/bin/psql db_password="$(<'${cfg.databasePasswordFile}')" - $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${cfg.databaseUsername}'" | grep -q 1 || $PSQL -tAc "CREATE ROLE ${cfg.databaseUsername} WITH LOGIN PASSWORD '$db_password' CREATEDB" - $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = 'keycloak'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "keycloak" OWNER "${cfg.databaseUsername}"' + $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='keycloak'" | grep -q 1 || $PSQL -tAc "CREATE ROLE keycloak WITH LOGIN PASSWORD '$db_password' CREATEDB" + $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = 'keycloak'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "keycloak" OWNER "keycloak"' ''; }; @@ -607,9 +612,9 @@ in set -eu db_password="$(<'${cfg.databasePasswordFile}')" - ( echo "CREATE USER IF NOT EXISTS '${cfg.databaseUsername}'@'localhost' IDENTIFIED BY '$db_password';" + ( echo "CREATE USER IF NOT EXISTS 'keycloak'@'localhost' IDENTIFIED BY '$db_password';" echo "CREATE DATABASE keycloak CHARACTER SET utf8 COLLATE utf8_unicode_ci;" - echo "GRANT ALL PRIVILEGES ON keycloak.* TO '${cfg.databaseUsername}'@'localhost';" + echo "GRANT ALL PRIVILEGES ON keycloak.* TO 'keycloak'@'localhost';" ) | ${config.services.mysql.package}/bin/mysql -N ''; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 99e6edfba26..81203c7622a 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -273,6 +273,7 @@ in services.accounts-daemon.enable = true; services.dleyna-renderer.enable = mkDefault true; services.dleyna-server.enable = mkDefault true; + services.power-profiles-daemon.enable = mkDefault true; services.gnome3.at-spi2-core.enable = true; services.gnome3.evolution-data-server.enable = true; services.gnome3.gnome-keyring.enable = true; @@ -365,10 +366,10 @@ in gnome-bluetooth gnome-color-manager gnome-control-center - gnome-getting-started-docs gnome-shell gnome-shell-extensions gnome-themes-extra + pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in. pkgs.nixos-artwork.wallpapers.simple-dark-gray pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom pkgs.gnome-user-docs diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index f79eb64b5a6..a214e91cfd3 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -218,14 +218,14 @@ in # We duplicate upstream's udev rules manually to make wayland with nvidia configurable services.udev.extraRules = '' # disable Wayland on Cirrus chipsets - ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="${gdm}/libexec/gdm-disable-wayland" + ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false" # disable Wayland on Hi1710 chipsets - ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="${gdm}/libexec/gdm-disable-wayland" + ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false" ${optionalString (!cfg.gdm.nvidiaWayland) '' - DRIVER=="nvidia", RUN+="${gdm}/libexec/gdm-disable-wayland" + DRIVER=="nvidia", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false" ''} # disable Wayland when modesetting is disabled - IMPORT{cmdline}="nomodeset", RUN+="${gdm}/libexec/gdm-disable-wayland" + IMPORT{cmdline}="nomodeset", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false" ''; systemd.user.services.dbus.wantedBy = [ "default.target" ]; diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 9dbca4e33f3..6751ca3f2ee 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, modules, baseModules, ... }: +{ config, lib, pkgs, modules, baseModules, specialArgs, ... }: with lib; @@ -13,7 +13,7 @@ let # !!! fix this children = mapAttrs (childName: childConfig: (import ../../../lib/eval-config.nix { - inherit baseModules; + inherit baseModules specialArgs; system = config.nixpkgs.initialSystem; modules = (optionals childConfig.inheritParentConfig modules) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e39c525a604..c34bf3623b6 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -387,6 +387,7 @@ in sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {}; strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; sudo = handleTest ./sudo.nix {}; + sway = handleTest ./sway.nix {}; switchTest = handleTest ./switch-test.nix {}; sympa = handleTest ./sympa.nix {}; syncthing = handleTest ./syncthing.nix {}; diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix index e5d7009bb7b..6c2846a1636 100644 --- a/nixos/tests/installed-tests/default.nix +++ b/nixos/tests/installed-tests/default.nix @@ -97,6 +97,7 @@ in gsconnect = callInstalledTest ./gsconnect.nix {}; ibus = callInstalledTest ./ibus.nix {}; libgdata = callInstalledTest ./libgdata.nix {}; + librsvg = callInstalledTest ./librsvg.nix {}; glib-testing = callInstalledTest ./glib-testing.nix {}; libjcat = callInstalledTest ./libjcat.nix {}; libxmlb = callInstalledTest ./libxmlb.nix {}; diff --git a/nixos/tests/installed-tests/librsvg.nix b/nixos/tests/installed-tests/librsvg.nix new file mode 100644 index 00000000000..378e7cce3ff --- /dev/null +++ b/nixos/tests/installed-tests/librsvg.nix @@ -0,0 +1,9 @@ +{ pkgs, makeInstalledTest, ... }: + +makeInstalledTest { + tested = pkgs.librsvg; + + testConfig = { + virtualisation.memorySize = 2047; + }; +} diff --git a/nixos/tests/keycloak.nix b/nixos/tests/keycloak.nix index 45d8677af56..136e83b3e02 100644 --- a/nixos/tests/keycloak.nix +++ b/nixos/tests/keycloak.nix @@ -20,6 +20,7 @@ let services.keycloak = { enable = true; inherit frontendUrl databaseType initialAdminPassword; + databaseUsername = "bogus"; databasePasswordFile = pkgs.writeText "dbPassword" "wzf6vOCbPp6cqTH"; }; environment.systemPackages = with pkgs; [ diff --git a/nixos/tests/sway.nix b/nixos/tests/sway.nix new file mode 100644 index 00000000000..fad7f7dc4e6 --- /dev/null +++ b/nixos/tests/sway.nix @@ -0,0 +1,92 @@ +import ./make-test-python.nix ({ pkgs, lib, ...} : + +{ + name = "sway"; + meta = { + maintainers = with lib.maintainers; [ primeos synthetica ]; + }; + + machine = { config, ... }: { + # Automatically login on tty1 as a normal user: + imports = [ ./common/user-account.nix ]; + services.getty.autologinUser = "alice"; + + environment = { + # For glinfo and wayland-info: + systemPackages = with pkgs; [ mesa-demos wayland-utils ]; + # Use a fixed SWAYSOCK path (for swaymsg): + variables."SWAYSOCK" = "/tmp/sway-ipc.sock"; + # For convenience: + shellAliases = { + test-x11 = "glinfo | head -n 3 | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok"; + test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok"; + }; + }; + + # Automatically configure and start Sway when logging in on tty1: + programs.bash.loginShellInit = '' + if [ "$(tty)" = "/dev/tty1" ]; then + set -e + + mkdir -p ~/.config/sway + sed s/Mod4/Mod1/ /etc/sway/config > ~/.config/sway/config + + sway --validate + sway && touch /tmp/sway-exit-ok + fi + ''; + + programs.sway.enable = true; + + virtualisation.memorySize = 1024; + # Need to switch to a different VGA card / GPU driver than the default one (std) so that Sway can launch: + virtualisation.qemu.options = [ "-vga virtio" ]; + }; + + enableOCR = true; + + testScript = { nodes, ... }: '' + start_all() + machine.wait_for_unit("multi-user.target") + + # To check the version: + print(machine.succeed("sway --version")) + + # Wait for Sway to complete startup: + machine.wait_for_file("/run/user/1000/wayland-1") + machine.wait_for_file("/tmp/sway-ipc.sock") + + # Test XWayland: + machine.succeed( + "su - alice -c 'swaymsg exec WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY=invalid alacritty'" + ) + machine.wait_for_text("alice@machine") + machine.send_chars("test-x11\n") + machine.wait_for_file("/tmp/test-x11-exit-ok") + print(machine.succeed("cat /tmp/test-x11.out")) + machine.screenshot("alacritty_glinfo") + machine.succeed("pkill alacritty") + + # Start a terminal (Alacritty) on workspace 3: + machine.send_key("alt-3") + machine.succeed( + "su - alice -c 'swaymsg exec WINIT_UNIX_BACKEND=wayland DISPLAY=invalid alacritty'" + ) + machine.wait_for_text("alice@machine") + machine.send_chars("test-wayland\n") + machine.wait_for_file("/tmp/test-wayland-exit-ok") + print(machine.succeed("cat /tmp/test-wayland.out")) + machine.screenshot("alacritty_wayland_info") + machine.send_key("alt-shift-q") + machine.wait_until_fails("pgrep alacritty") + + # Test swaynag: + machine.send_key("alt-shift-e") + machine.wait_for_text("You pressed the exit shortcut.") + machine.screenshot("sway_exit") + + # Exit Sway and verify process exit status 0: + machine.succeed("su - alice -c 'swaymsg exit || true'") + machine.wait_for_file("/tmp/sway-exit-ok") + ''; +}) diff --git a/nixos/tests/wmderland.nix b/nixos/tests/wmderland.nix index d121ed98b7a..6de0cd9212e 100644 --- a/nixos/tests/wmderland.nix +++ b/nixos/tests/wmderland.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "wmderland"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ takagiy ]; }; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 36320a01061..1bbed0613c8 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -28,6 +28,7 @@ , ffmpeg , soundtouch , pcre /*, portaudio - given up fighting their portaudio.patch */ +, linuxHeaders , at-spi2-core ? null , dbus ? null , epoxy ? null @@ -41,24 +42,35 @@ }: # TODO -# - as of 2.4.2, GTK2 is still the recommended version ref https://www.audacityteam.org/download/source/ check if that changes in future versions +# - as of 3.0.2, GTK2 is still the recommended version ref https://www.audacityteam.org/download/source/ check if that changes in future versions # - detach sbsms +let + wxGTK-audacity = wxGTK.overrideAttrs (oldAttrs: rec { + src = fetchFromGitHub { + owner = "audacity"; + repo = "wxWidgets"; + rev = "07e7d832c7a337aedba3537b90b2c98c4d8e2985"; + sha256 = "1mawnkcrmqj98jp0jxlnh9xkc950ca033ccb51c7035pzmi9if9a"; + fetchSubmodules = true; + }; + }); +in stdenv.mkDerivation rec { pname = "audacity"; - version = "2.4.2"; + version = "3.0.2"; src = fetchFromGitHub { owner = "audacity"; repo = "audacity"; rev = "Audacity-${version}"; - sha256 = "sha256-hpRTo5B0EMyzORopsNPOgv6mohBkwJfWfCLnPvFmdFI="; + sha256 = "035qq2ff16cdl2cb9iply2bfjmhfl1dpscg79x6c9l0i9m8k41zj"; }; patches = [ (fetchpatch { - url = "https://github.com/audacity/audacity/commit/a070b5d8a8ba10fb86edba6aeb8fdab0f66ba408.patch"; - sha256 = "sha256-8UZupGcN+/tytAhyy5T1P0nufvsQPeyLgOUMGt7l8Oc="; + url = "https://github.com/audacity/audacity/commit/007852e51fcbb5f1f359d112f28b8984a604dac6.patch"; + sha256 = "0zp2iydd46analda9cfnbmzdkjphz5m7dynrdj5qdnmq6j3px9fw"; name = "audacity_xdg_paths.patch"; }) ]; @@ -68,6 +80,10 @@ stdenv.mkDerivation rec { touch src/RevisionIdent.h ''; + preConfigure = '' + substituteInPlace src/FileNames.cpp --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h + ''; + # workaround for a broken cmake. Drop it with a later version to see if it works. # https://github.com/NixOS/nixpkgs/issues/94905 cmakeFlags = lib.optional stdenv.isLinux "-DCMAKE_OSX_ARCHITECTURES="; @@ -86,7 +102,14 @@ stdenv.mkDerivation rec { "-lswscale" ]; - nativeBuildInputs = [ cmake gettext pkg-config python3 ]; + nativeBuildInputs = [ + cmake + gettext + pkg-config + python3 + ] ++ lib.optionals stdenv.isLinux [ + linuxHeaders + ]; buildInputs = [ alsaLib @@ -110,8 +133,8 @@ stdenv.mkDerivation rec { sratom suil twolame - wxGTK - wxGTK.gtk + wxGTK-audacity + wxGTK-audacity.gtk ] ++ lib.optionals stdenv.isLinux [ at-spi2-core dbus diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index b84b4e6aa9a..0b82bbd8d84 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm -, qtbase, qtx11extras +, qtbase, qtx11extras, qttools , taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf , qca2, pkg-config, sparsehash, config, makeWrapper, gst_plugins }: @@ -45,6 +45,7 @@ let qjson qtbase qtx11extras + qttools sqlite taglib ] diff --git a/pkgs/applications/audio/mousai/default.nix b/pkgs/applications/audio/mousai/default.nix index 502842c7aa7..e705c3590ad 100644 --- a/pkgs/applications/audio/mousai/default.nix +++ b/pkgs/applications/audio/mousai/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "mousai"; - version = "0.3.1"; + version = "0.3.2"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "SeaDve"; repo = "Mousai"; rev = "v${version}"; - sha256 = "0x57dci0prhlj79h74yh79cazn48rn0bckz5j3z4njk4fwc3fvfx"; + sha256 = "sha256-sBB2kqlC+2qPgQinhGxY8lq9unxgQoOOhDP5o1pUWMo="; }; postPatch = '' diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 0abc933d628..c5ef0352503 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -1,16 +1,17 @@ -{ fetchurl, lib, stdenv, pkg-config, libao, json_c, libgcrypt, ffmpeg_3, curl }: +{ fetchurl, lib, stdenv, pkg-config, libao, json_c, libgcrypt, ffmpeg, curl }: stdenv.mkDerivation rec { - name = "pianobar-2020.11.28"; + pname = "pianobar"; + version = "2020.11.28"; src = fetchurl { - url = "http://6xq.net/projects/pianobar/${name}.tar.bz2"; + url = "https://6xq.net/projects/pianobar/${pname}-${version}.tar.bz2"; sha256 = "1znlwybfpxsjqr1jmr8j0ci8wzmpzmk2yxb0qcx9w9a8nnbgnfv5"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libao json_c libgcrypt ffmpeg_3 curl + libao json_c libgcrypt ffmpeg curl ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 785c334e152..28d0ae6f5f4 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,4 +1,9 @@ -{ lib, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 +{ lib +, python3Packages +, fetchFromGitHub +, gettext +, chromaprint +, qt5 , enablePlayback ? true , gst_all_1 }: @@ -10,43 +15,45 @@ let else pythonPackages.pyqt5 ; -in pythonPackages.buildPythonApplication rec { +in +pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.5.6"; + version = "2.6.2"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "1mkbg44bm642mlpfxsdlw947var6a3sf9m6c897b4n0742hsdkbc"; + sha256 = "1dhkdzc3601rhg8pqljbv3dz7j0mx75brpfhlizhgwgv65qk3ifj"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] - ++ lib.optionals (pyqt5.multimediaEnabled) [ - qt5.qtmultimedia.bin - gst_all_1.gstreamer - gst_all_1.gst-vaapi - gst_all_1.gst-libav - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - ] + ++ lib.optionals (pyqt5.multimediaEnabled) [ + qt5.qtmultimedia.bin + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-vaapi + gst_all_1.gstreamer + ] ; propagatedBuildInputs = with pythonPackages; [ - pyqt5 - mutagen chromaprint - discid dateutil + discid + fasteners + mutagen + pyqt5 ]; # In order to spare double wrapping, we use: preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") '' - + lib.optionalString (pyqt5.multimediaEnabled) '' - makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - '' + + lib.optionalString (pyqt5.multimediaEnabled) '' + makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + '' ; meta = with lib; { diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 740757a639e..ba51fc1af56 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -1,28 +1,58 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, gtk3, intltool, itstool, libxml2, brasero -, libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes -, gsettings-desktop-schemas, wrapGAppsHook }: +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, glib +, gtk3 +, itstool +, libxml2 +, brasero +, libcanberra-gtk3 +, gnome3 +, gst_all_1 +, libmusicbrainz5 +, libdiscid +, isocodes +, gsettings-desktop-schemas +, wrapGAppsHook +}: -let +stdenv.mkDerivation rec { pname = "sound-juicer"; - version = "3.24.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "19qg4xv0f9rkq34lragkmhii1llxsa87llbl28i759b0ks4f6sny"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "08d5d81rz9sj3m5paw8fwbgxmhlbr7bcjdzpmzj832qvg8smydxf"; }; - nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ]; - buildInputs = [ - glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme - gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gst_all_1.gst-libav + nativeBuildInputs = [ + meson + ninja + pkg-config + itstool + libxml2 + wrapGAppsHook ]; - NIX_CFLAGS_COMPILE="-Wno-error=format-nonliteral"; + buildInputs = [ + glib + gtk3 + brasero + libcanberra-gtk3 + gnome3.adwaita-icon-theme + gsettings-desktop-schemas + libmusicbrainz5 + libdiscid + isocodes + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-libav + ]; passthru = { updateScript = gnome3.updateScript { @@ -34,7 +64,7 @@ in stdenv.mkDerivation rec { description = "A Gnome CD Ripper"; homepage = "https://wiki.gnome.org/Apps/SoundJuicer"; maintainers = [ maintainers.bdimcheff ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index 15963faf06b..cd43b5d53a2 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -1,5 +1,4 @@ { fetchFromGitLab -, fetchpatch , lib , python3Packages , gobject-introspection @@ -16,26 +15,16 @@ python3Packages.buildPythonApplication rec { pname = "sublime-music"; - version = "0.11.11"; + version = "0.11.12"; format = "pyproject"; src = fetchFromGitLab { owner = "sublime-music"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r4Tn/7CGDny8Aa4kF4PM5ZKMYthMJ7801X3zPdvXh4Q="; + sha256 = "sha256-fcEdpht+xKJRTaD3gKoRdf6O2SAPlZHZ61Jy8bdTKjs="; }; - patches = [ - # Switch to poetry-core: - # https://gitlab.com/sublime-music/sublime-music/-/merge_requests/60 - (fetchpatch { - name = "use-poetry-core.patch"; - url = "https://gitlab.com/sublime-music/sublime-music/-/commit/9b0af19dbdfdcc5a0fa23e73bb34c7135a8c2855.patch"; - sha256 = "sha256-cXG0RvrnBpme6yKWM0nfqMqoK0qPT6spflJ9AaaslVg="; - }) - ]; - nativeBuildInputs = [ gobject-introspection python3Packages.poetry-core diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index ef7133630b5..577175fcff2 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip"; - sha256 = "0lqzr68n2c6aifw2vbyars91wn1chmgb9xfdk463g4vjqiava3ih"; + sha256 = "10lqbm1grw0sqasx7i6528cishv5ksdf9zbb3ygxd8c1iwaxzhb9"; }; nativeBuildInputs = [ unzip ]; @@ -44,7 +44,5 @@ stdenv.mkDerivation rec { homepage = "http://www.warmplace.ru/soft/sunvox/"; maintainers = with maintainers; [ puffnfresh ]; platforms = [ "i686-linux" "x86_64-linux" ]; - # hash mismatch - broken = true; }; } diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix new file mode 100644 index 00000000000..26cfb818980 --- /dev/null +++ b/pkgs/applications/audio/transcribe/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchzip, lib, wrapGAppsHook, alsaLib, atk, cairo, gdk-pixbuf +, glib, gst_all_1, gtk3, libSM, libX11, libpng12, pango, zlib }: + +stdenv.mkDerivation rec { + pname = "transcribe"; + version = "9.00"; + + src = if stdenv.hostPlatform.system == "x86_64-linux" then + fetchzip { + url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-9.00.0.tar.gz"; + sha256 = "0mgjx0hnps3jmc2d9hkskxbmwcqf7f9jx595j5sc501br1l84sdf"; + } + else throw "Platform not supported"; + + nativeBuildInputs = [ wrapGAppsHook ]; + + buildInputs = with gst_all_1; [ gst-plugins-base gst-plugins-good + gst-plugins-bad gst-plugins-ugly ]; + + dontPatchELF = true; + + libPath = with gst_all_1; lib.makeLibraryPath [ + stdenv.cc.cc glib gtk3 atk pango cairo gdk-pixbuf alsaLib + libX11 libSM libpng12 gstreamer gst-plugins-base zlib + ]; + + installPhase = '' + mkdir -p $out/bin $out/libexec $out/share/doc + cp transcribe $out/libexec + cp xschelp.htb readme_gtk.html $out/share/doc + cp -r gtkicons $out/share/icons + ln -s $out/share/doc/xschelp.htb $out/libexec + patchelf \ + --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + $out/libexec/transcribe + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH_1_0" + --prefix LD_LIBRARY_PATH : "${libPath}" + ) + ''; + + postFixup = '' + ln -s $out/libexec/transcribe $out/bin/ + ''; + + meta = with lib; { + description = "Software to help transcribe recorded music"; + longDescription = '' + The Transcribe! application is an assistant for people who want + to work out a piece of music from a recording, in order to write + it out, or play it themselves, or both. It doesn't do the + transcribing for you, but it is essentially a specialised player + program which is optimised for the purpose of transcription. It + has many transcription-specific features not found on + conventional music players. + ''; + homepage = "https://www.seventhstring.com/xscribe/"; + license = licenses.unfree; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 4ab491cb9a9..ccd121f5da7 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -12,7 +12,7 @@ , coreutils , libsoup , libsecret -, libhandy_0 +, libhandy , wrapGAppsHook , libgpgerror , json-glib @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "deja-dup"; - version = "42.6"; + version = "42.7"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - sha256 = "0grwlfakrnr9ij7h8lsfazlws6qix8pl50dr94cpxnnbjga9xn9z"; + sha256 = "1q66wccnph78cp1r5mln2iq4bcqdrrchxq3c1pjrzkmzwc6l93gz"; }; patches = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { glib gtk3 libsecret - libhandy_0 + libhandy libgpgerror json-glib ]; diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 73e067b5b55..4310f809bac 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -8,17 +8,17 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PJaJ9fCva9UUBcQrnVa2c7dk4koi6AyX6bj3JStUMwM="; + sha256 = "sha256-85aUR7MvaPeRilC+4oj6XW2IEUvxRUsVz63tQ/Jc7xw="; }; runVend = true; - vendorSha256 = "sha256-qLpwrV9NkmUO0yoK2/gwb5oe/lky/w/P0QVoFSTNuMU="; + vendorSha256 = "sha256-8zhVQ8FUdzog7h9RBfuq8uBp0zjulXbDOLAPljp4deA="; doCheck = false; diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index 82b6f2c1adb..b4b5d13f140 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -10,26 +10,20 @@ , darwin }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { pname = "openethereum"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "openethereum"; repo = "openethereum"; rev = "v${version}"; - sha256 = "143w0b0ff1s73qzr844l25w90d2y2z0b3w2fr5kkbc1wsnpcq7jp"; + sha256 = "1g48fkznvr9fs3j9zy2d9pcwnahmyghxg2b9bsn2mxpyczmfqrki"; }; - cargoSha256 = "1gm02pcfll362add8a0dcb0sk0mag8z0q23b87yb6fs870bqvhib"; + cargoSha256 = "02nlm5ariv4dr6b3rckzs7hw1xrl83yvhimrzb0g5l0j0sxh1nhc"; - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; - nativeBuildInputs = [ - cmake - llvmPackages.clang - llvmPackages.libclang - pkg-config - ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ systemd ] diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index abe7ab56431..d5c6a1a8795 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.8.30"; + version = "0.9.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-9GCk1gqlQJhuoiKRi7J1qcJlZjlq2ObGicp5tGGDhrY="; + sha256 = "sha256-Y52VFTjRFyC38ZNt6NMtVRA2pn6Y4B/NC4EEuDvIFQQ="; }; - cargoSha256 = "sha256-pWqbcargCEkisdGnj08VQdRqjocR7zZhWukhYjfZDqI="; + cargoSha256 = "sha256-0GrExza6uPF/eFWrXlM4MpCD7TMk2y+uEc5SDj/UQkg="; nativeBuildInputs = [ clang ]; @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { description = "Polkadot Node Implementation"; homepage = "https://polkadot.network"; license = licenses.gpl3Only; - maintainers = with maintainers; [ akru andresilva asymmetric RaghavSood ]; + maintainers = with maintainers; [ akru andresilva asymmetric FlorianFranzen RaghavSood ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix index 3c56e0bbb2b..a43feff97a3 100644 --- a/pkgs/applications/blockchains/turbo-geth.nix +++ b/pkgs/applications/blockchains/turbo-geth.nix @@ -2,28 +2,29 @@ buildGoModule rec { pname = "turbo-geth"; - version = "2021.02.01"; + version = "2021.04.05"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9z0Hogu/VgGxvgQMKIImv+qyTqTmR40JS4NNIOk5EZI="; + sha256 = "sha256-RTPNJASNFyZ6tDJj0WOqALyxRsOLJzPy0qA1c2sSxys="; }; - vendorSha256 = "sha256-Ho68+SzYELQN4DE57LNSXeHIu43zAOb7HK/jx7PFdXk="; + vendorSha256 = "01c7lb6n00ws60dfybir0z5dbn6h68p5s4hbq0ga2g7drf3l3y0p"; runVend = true; subPackages = [ "cmd/tg" - "cmd/restapi" + "cmd/evm" "cmd/rpcdaemon" + "cmd/rlpdump" ]; meta = with lib; { homepage = "https://github.com/ledgerwatch/turbo-geth/"; description = "Ethereum node and geth fork focused on scalability and modularity"; - license = with licenses; [ lgpl3 gpl3 ]; + license = with licenses; [ lgpl3Plus gpl3Plus ]; maintainers = with maintainers; [ xwvvvvwx ]; }; } diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 6726790d50f..13062ae9261 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -94,8 +94,8 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { ])); in '' substituteInPlace lisp/emacs-lisp/comp.el --replace \ - "(defcustom comp-native-driver-options nil" \ - "(defcustom comp-native-driver-options '(${backendPath})" + "(defcustom native-comp-driver-options nil" \ + "(defcustom native-comp-driver-options '(${backendPath})" '')) "" ]; @@ -175,7 +175,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { (comp-trampoline-compile (intern (pop argv))))" mkdir -p $out/share/emacs/native-lisp $out/bin/emacs --batch \ - --eval "(add-to-list 'comp-eln-load-path \"$out/share/emacs/native-lisp\")" \ + --eval "(add-to-list 'native-comp-eln-load-path \"$out/share/emacs/native-lisp\")" \ -f batch-native-compile $out/share/emacs/site-lisp/site-start.el ''; diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el index 01a6422d731..3f9ec25d99f 100644 --- a/pkgs/applications/editors/emacs/site-start.el +++ b/pkgs/applications/editors/emacs/site-start.el @@ -47,11 +47,11 @@ least specific (the system profile)" ;;; Set up native-comp load path. (when (featurep 'comp) ;; Append native-comp subdirectories from `NIX_PROFILES'. - (setq comp-eln-load-path + (setq native-comp-eln-load-path (append (mapcar (lambda (profile-dir) (concat profile-dir "/share/emacs/native-lisp/")) (nix--profile-paths)) - comp-eln-load-path))) + native-comp-eln-load-path))) ;;; Make `woman' find the man pages (defvar woman-manpath) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index da7b70cecd2..50f29901042 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "3.38.2"; + version = "3.40.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "jFNco64yoZC1TZbTIHGVf+wBYYQHo2JRiMZFHngzYTs="; + sha256 = "16kikslvcfjqj4q3j857mq9i8cyd965b3lvfzcwijc91x3ylr15j"; }; nativeBuildInputs = [ @@ -99,7 +99,6 @@ stdenv.mkDerivation rec { ''; mesonFlags = [ - "-Dpython_libprefix=${python3.libPrefix}" "-Ddocs=true" # Making the build system correctly detect clang header and library paths @@ -135,7 +134,10 @@ stdenv.mkDerivation rec { done ''; - passthru.updateScript = gnome3.updateScript { packageName = pname; }; + passthru.updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; meta = with lib; { description = "An IDE for writing GNOME-based software"; diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 7967b78f13c..277863244a5 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -1,21 +1,49 @@ -{ lib, stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee -, tepl, amtk, gnome3, glib, pkg-config, intltool, itstool, libxml2 }: -let +{ lib +, stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, gtk-doc +, vala +, gobject-introspection +, wrapGAppsHook +, gsettings-desktop-schemas +, gspell +, gtksourceview4 +, libgee +, tepl +, amtk +, gnome3 +, glib +, pkg-config +, intltool +, itstool +, libxml2 +}: + +stdenv.mkDerivation rec { version = "3.38.0"; pname = "gnome-latex"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xqd49pgi82dygqnxj08i1v22b0vwwhx3zvdinhrx4jny339yam8"; }; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - configureFlags = ["--disable-dconf-migration"]; + patches = [ + # Fix build with latest tepl. + (fetchpatch { + url = "https://gitlab.gnome.org/Archive/gnome-latex/commit/e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9.patch"; + sha256 = "H8cbp5hDZoXytEdKE2D/oYHNKIbEFwxQoEaC4JMfGHY="; + }) + ]; nativeBuildInputs = [ pkg-config + autoreconfHook + gtk-doc + vala + gobject-introspection wrapGAppsHook itstool intltool @@ -33,9 +61,18 @@ in stdenv.mkDerivation { tepl ]; + configureFlags = [ + "--disable-dconf-migration" + ]; + doCheck = true; - passthru.updateScript = gnome3.updateScript { packageName = pname; }; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + + passthru.updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; meta = with lib; { homepage = "https://wiki.gnome.org/Apps/GNOME-LaTeX"; diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 6d04fa6851a..3e6e88dd228 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -58,10 +58,11 @@ let # add to nvim's 'embedded rc' this: # let g:_host_prog=$out/bin/nvim- # Or this: - # let g:loaded_${prog}_provider=1 + # let g:loaded_${prog}_provider=0 # While the latter tells nvim that this provider is not available hostprog_check_table = { node = withNodeJs; + python = false; python3 = withPython3; ruby = withRuby; }; @@ -107,7 +108,7 @@ let if withProg then "let g:${prog}_host_prog='${placeholder "out"}/bin/nvim-${prog}'" else - "let g:loaded_${prog}_provider=1" + "let g:loaded_${prog}_provider=0" ; # to keep backwards compatibility diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index e0b75e74064..01cbddcc283 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -2,6 +2,8 @@ , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices +, Foundation +, testVersion, imagemagick }: let @@ -50,7 +52,10 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] - ++ lib.optional stdenv.isDarwin ApplicationServices; + ++ lib.optionals stdenv.isDarwin [ + ApplicationServices + Foundation + ]; propagatedBuildInputs = [ bzip2 freetype libjpeg lcms2 ] @@ -72,6 +77,9 @@ stdenv.mkDerivation rec { done ''; + passthru.tests.version = + testVersion { package = imagemagick; }; + meta = with lib; { homepage = "http://www.imagemagick.org/"; description = "A software suite to create, edit, compose, or convert bitmap images"; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 2491d8d3a8a..08d3f122aab 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , substituteAll , autoreconfHook , pkg-config @@ -34,6 +33,7 @@ , libexif , gettext , makeWrapper +, gtk-doc , xorg , glib-networking , libmypaint @@ -53,13 +53,13 @@ let python = python2.withPackages (pp: [ pp.pygtk ]); in stdenv.mkDerivation rec { pname = "gimp"; - version = "2.10.22"; + version = "2.10.24"; outputs = [ "out" "dev" ]; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1fqqyshakvdarf1jipk2n33ibqr23ni22z3d8srq13bpydblpf1d"; + sha256 = "17lq6ns5qhspd171zqh76yf98xnn5n0hcl7hbhbx63cc6ribf6xx"; }; patches = [ @@ -73,12 +73,6 @@ in stdenv.mkDerivation rec { # Use absolute paths instead of relying on PATH # to make sure plug-ins are loaded by the correct interpreter. ./hardcode-plugin-interpreters.patch - - # Fix crash without dot. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/f83fd22c4b8701ffc4ce14383e5e22756a4bce04.patch"; - sha256 = "POuvBhOSStO7hBGp4HgNx5F9pElFRoqN3W+i3u4zOnk="; - }) ]; nativeBuildInputs = [ @@ -87,6 +81,7 @@ in stdenv.mkDerivation rec { intltool gettext makeWrapper + gtk-doc ]; buildInputs = [ diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index a710d6c1e47..358847086a1 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , at-spi2-core , babl , dbus @@ -22,6 +21,7 @@ , gtk3 , itstool , libdazzle +, libhandy , libgdata , libxml2 , meson @@ -36,32 +36,17 @@ stdenv.mkDerivation rec { pname = "gnome-photos"; - version = "3.38.0"; + version = "40.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1i64w69kk3sdf9vn7npnwrhy8qjwn0vizq200x3pgmbrfm3kjzv6"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1bzi79plw6ji6qlckhxnwfnswy6jpnhzmmyanml2i2xg73hp6bg0"; }; patches = [ ./installed-tests-path.patch - - # Port to Tracker 3 - # https://gitlab.gnome.org/GNOME/gnome-photos/-/merge_requests/135 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/f39a85bb1a82093f4ba615494ff7e95609674fc2.patch"; - sha256 = "M5r5WuB1JpUBVN3KxNvpMiPWj0pIpT+ImQMOiGtUgT4="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/3d847ff80d429cadf0bc59aa50caa37bf27c0201.patch"; - sha256 = "zGjSL1qpWVJ/5Ifgh2CbhFSBR/WDAra8F+YUOemyxyU="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/2eb923726147b05c936dee64b205d833525db1df.patch"; - sha256 = "vCA6NXHzmNf2GoLqzWwIyziC6puJgJ0QTLeKWsAEFAE="; - }) ]; nativeBuildInputs = [ @@ -99,6 +84,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk3 libdazzle + libhandy libgdata tracker tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 26de91ee225..14993f6f533 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.10.2"; + version = "3.11.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "/erkKBg3j5s8qwBgTu61t8Cnpez+ad4IuZOGd0ZDXJM="; + sha256 = "11bvcimamdcksgqj1ymh54yzhpwc5j8glda8brqqhwq3h2wj0j9d"; }; nativeBuildInputs = [ @@ -97,6 +97,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 56ebbeb3722..c7d4a77ea2a 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -9,14 +9,14 @@ pythonPackages.buildPythonPackage rec { pname = "hydrus"; - version = "436"; + version = "438"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-FXm8VUEY0OZ6/dc/qNwOXekhv5H2C9jjg/eNDoMvMn0=="; + sha256 = "sha256-iBJkbVUlsjt26SbDe92eIrWKQwWBhkjjeLM14Pm/obc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 11340fa7468..bea288e2958 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -5,6 +5,7 @@ , cmake , double-conversion , fetchurl +, fetchpatch , gettext , gdl , ghostscript @@ -71,6 +72,13 @@ stdenv.mkDerivation rec { # e.g., those from the "Effects" menu. python3 = "${python3Env}/bin/python"; }) + + # Fix build with glib 2.68 + # https://gitlab.com/inkscape/inkscape/-/merge_requests/2790 + (fetchpatch { + url = "https://gitlab.com/inkscape/inkscape/-/commit/eb24388f1730918edd9565d9e5d09340ec0b3b08.patch"; + sha256 = "d2FHRWcOzi0Vsr6t0MuLu3rWpvhFKuuvoXd4/NKUSJI="; + }) ]; postPatch = '' diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index cc9763961f8..eed3a4fac12 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -4,7 +4,7 @@ , flac, lame, libmad, libmpcdec, libvorbis , libsamplerate, libsndfile, taglib , cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager -, ffmpeg_3, libmusicbrainz3, normalize, sox, transcode, kinit +, ffmpeg, libmusicbrainz3, normalize, sox, transcode, kinit }: mkDerivation { @@ -25,7 +25,7 @@ mkDerivation { # cd/dvd cdparanoia libdvdcss libdvdread # others - ffmpeg_3 libmusicbrainz3 shared-mime-info + ffmpeg libmusicbrainz3 shared-mime-info ]; propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; postFixup = diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 0b3e21cc03a..9f062aa20fc 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, appimageTools , makeWrapper , electron_11 , openssl @@ -8,21 +8,15 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "8.0.30"; + version = "8.0.33-53.BETA"; src = fetchurl { - url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - hash = "sha256-j+fp/f8nta+OOuOFU4mmUrGYlVmAqdaXO4rLJ0in+m8="; + url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; + hash = "sha256-YUYER+UiM1QEDgGl0P9bIT65YVacUnuGtQVkV91teEU="; }; nativeBuildInputs = [ makeWrapper ]; - appimageContents = appimageTools.extractType2 { - name = "${pname}-${version}"; - inherit src; - }; - - dontUnpack = true; dontConfigure = true; dontBuild = true; @@ -35,20 +29,33 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/share/1password # Applications files. - cp -a ${appimageContents}/{locales,resources} $out/share/${pname} + cp -a {locales,resources} $out/share/${pname} + install -Dm0755 -t $out/share/${pname} {1Password-BrowserSupport,1Password-KeyringHelper} # Desktop file. - install -Dt $out/share/applications ${appimageContents}/${pname}.desktop + install -Dt $out/share/applications resources/${pname}.desktop substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + --replace 'Exec=/opt/1Password/${pname}' 'Exec=${pname}' # Icons. - cp -a ${appimageContents}/usr/share/icons $out/share + cp -a resources/icons $out/share # Wrap the application with Electron. makeWrapper "${electron_11}/bin/electron" "$out/bin/${pname}" \ --add-flags "$out/share/${pname}/resources/app.asar" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibs}" + + # Set the interpreter for the helper binaries and wrap them with + # the runtime libraries. + interp="$(cat $NIX_CC/nix-support/dynamic-linker)" + patchelf --set-interpreter $interp \ + $out/share/$pname/{1Password-BrowserSupport,1Password-KeyringHelper} + + wrapProgram $out/share/${pname}/1Password-BrowserSupport \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibs}" + + wrapProgram $out/share/${pname}/1Password-KeyringHelper \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibs}" ''; passthru.updateScript = ./update.sh; diff --git a/pkgs/applications/misc/1password-gui/update.sh b/pkgs/applications/misc/1password-gui/update.sh index 7703aba9984..8ebdaca7117 100755 --- a/pkgs/applications/misc/1password-gui/update.sh +++ b/pkgs/applications/misc/1password-gui/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnused common-updater-scripts -version="$(curl -sL https://onepassword.s3.amazonaws.com/linux/debian/dists/edge/main/binary-amd64/Packages | sed -r -n 's/^Version: (.*)-[0-9]+/\1/p' | head -n1)" +version="$(curl -sL https://onepassword.s3.amazonaws.com/linux/debian/dists/edge/main/binary-amd64/Packages | sed -r -n 's/^Version: (.*)/\1/p' | head -n1)" update-source-version _1password-gui "$version" diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 4bfb6a65edc..f45bff666cf 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "1.8.0"; + version = "1.9.1"; src = if stdenv.isLinux then fetchzip { url = { @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { "aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm_v${version}.zip"; }.${stdenv.hostPlatform.system}; sha256 = { - "i686-linux" = "teoxscan+EZ76Q0sfKT6nt1w/LSsmDoiN2oh+NGO/4A="; - "x86_64-linux" = "nRK2GSwhQe5OgcAdR1fg0vUp3fzEkhwU/teIwsEEemw="; - "aarch64-linux" = "0932bspm1likky1n0rg15d01gspkm1fns2ma82qyb91yr6d18ddk"; + "i686-linux" = "1x5khnp6yqrjf513x3y6l38rb121nib7d4aiz4cz7fh029kxjhd1"; + "x86_64-linux" = "1ar8lzkndl7xzcinv93rzg8q25vb23fggbjkhgchgc5x9wkwk8hw"; + "aarch64-linux" = "1q81pk6qmp96p1dbhx1ijln8f54rac8r81d4ghqx9v756s9szrr1"; }.${stdenv.hostPlatform.system}; stripRoot = false; } else fetchurl { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg"; - sha256 = "0pycia75vdfh6gxfd2hr32cxrryfxydid804n0v76l2fpr9v9v3d"; + sha256 = "0904wwy3wdhfvbkvpdap8141a9gqmn0dw45ikrzsqpg7pv1r2zch"; }; buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ]; diff --git a/pkgs/applications/misc/devdocs-desktop/default.nix b/pkgs/applications/misc/devdocs-desktop/default.nix index fe15d90f254..85298bc3c75 100644 --- a/pkgs/applications/misc/devdocs-desktop/default.nix +++ b/pkgs/applications/misc/devdocs-desktop/default.nix @@ -1,13 +1,13 @@ { lib, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }: let - version = "0.7.1"; + version = "0.7.2"; pname = "devdocs-desktop"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/egoist/devdocs-desktop/releases/download/v${version}/DevDocs-${version}.AppImage"; - sha256 = "5bba99a34c90a65eff67aface0b7446cbf43d620a1c195f27e7bb33ab6d3d0c2"; + sha256 = "sha256-4ugpzh0Dweae6tKb6uqRhEW9HT+iVIo8MQRbVKTdRFw="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/misc/djvulibre/CVE-2019-15142.patch b/pkgs/applications/misc/djvulibre/CVE-2019-15142.patch deleted file mode 100644 index 89ff3759451..00000000000 --- a/pkgs/applications/misc/djvulibre/CVE-2019-15142.patch +++ /dev/null @@ -1,72 +0,0 @@ -commit 970fb11a296b5bbdc5e8425851253d2c5913c45e -Author: Leon Bottou -Date: Tue Mar 26 20:36:31 2019 -0400 - - Fix bug#296 - -diff --git a/libdjvu/DjVmDir.cpp b/libdjvu/DjVmDir.cpp -index a6a39e0..0a0fac6 100644 ---- a/libdjvu/DjVmDir.cpp -+++ b/libdjvu/DjVmDir.cpp -@@ -299,42 +299,44 @@ DjVmDir::decode(const GP &gstr) - memcpy((char*) strings+strings_size, buffer, length); - } - DEBUG_MSG("size of decompressed names block=" << strings.size() << "\n"); -- if (strings[strings.size()-1] != 0) -- { -- int strings_size=strings.size(); -- strings.resize(strings_size+1); -- strings[strings_size] = 0; -- } -+ int strings_size=strings.size(); -+ strings.resize(strings_size+3); -+ memset((char*) strings+strings_size, 0, 4); - -- // Copy names into the files -+ // Copy names into the files - const char * ptr=strings; - for(pos=files_list;pos;++pos) - { - GP file=files_list[pos]; -- -+ if (ptr >= (const char*)strings + strings_size) -+ G_THROW( "DjVu document is corrupted (DjVmDir)" ); - file->id=ptr; - ptr+=file->id.length()+1; - if (file->flags & File::HAS_NAME) - { -- file->name=ptr; -- ptr+=file->name.length()+1; -- } else -+ file->name=ptr; -+ ptr+=file->name.length()+1; -+ } -+ else - { - file->name=file->id; - } - if (file->flags & File::HAS_TITLE) - { -- file->title=ptr; -- ptr+=file->title.length()+1; -- } else -- file->title=file->id; -- /* msr debug: multipage file, file->title is null. -+ file->title=ptr; -+ ptr+=file->title.length()+1; -+ } -+ else -+ { -+ file->title=file->id; -+ } -+ /* msr debug: multipage file, file->title is null. - DEBUG_MSG(file->name << ", " << file->id << ", " << file->title << ", " << - file->offset << ", " << file->size << ", " << - file->is_page() << "\n"); */ - } - -- // Check that there is only one file with SHARED_ANNO flag on -+ // Check that there is only one file with SHARED_ANNO flag on - int shared_anno_cnt=0; - for(pos=files_list;pos;++pos) - { diff --git a/pkgs/applications/misc/djvulibre/CVE-2019-15143.patch b/pkgs/applications/misc/djvulibre/CVE-2019-15143.patch deleted file mode 100644 index ef1905338fb..00000000000 --- a/pkgs/applications/misc/djvulibre/CVE-2019-15143.patch +++ /dev/null @@ -1,39 +0,0 @@ -commit b1f4e1b2187d9e5010cd01ceccf20b4a11ce723f -Author: Leon Bottou -Date: Tue Mar 26 20:45:46 2019 -0400 - - fix for bug #297 - -diff --git a/libdjvu/DjVmDir.cpp b/libdjvu/DjVmDir.cpp -index 0a0fac6..5a49015 100644 ---- a/libdjvu/DjVmDir.cpp -+++ b/libdjvu/DjVmDir.cpp -@@ -309,7 +309,7 @@ DjVmDir::decode(const GP &gstr) - { - GP file=files_list[pos]; - if (ptr >= (const char*)strings + strings_size) -- G_THROW( "DjVu document is corrupted (DjVmDir)" ); -+ G_THROW( ByteStream::EndOfFile ); - file->id=ptr; - ptr+=file->id.length()+1; - if (file->flags & File::HAS_NAME) -diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp -index 0e487f0..c2fdbe4 100644 ---- a/libdjvu/GBitmap.cpp -+++ b/libdjvu/GBitmap.cpp -@@ -890,11 +890,13 @@ GBitmap::read_rle_raw(ByteStream &bs) - int c = 0; - while (n >= 0) - { -- bs.read(&h, 1); -+ if (bs.read(&h, 1) <= 0) -+ G_THROW( ByteStream::EndOfFile ); - int x = h; - if (x >= (int)RUNOVERFLOWVALUE) - { -- bs.read(&h, 1); -+ if (bs.read(&h, 1) <= 0) -+ G_THROW( ByteStream::EndOfFile ); - x = h + ((x - (int)RUNOVERFLOWVALUE) << 8); - } - if (c+x > ncolumns) diff --git a/pkgs/applications/misc/djvulibre/CVE-2019-15144.patch b/pkgs/applications/misc/djvulibre/CVE-2019-15144.patch deleted file mode 100644 index 6094be88338..00000000000 --- a/pkgs/applications/misc/djvulibre/CVE-2019-15144.patch +++ /dev/null @@ -1,111 +0,0 @@ -commit e15d51510048927f172f1bf1f27ede65907d940d -Author: Leon Bottou -Date: Mon Apr 8 22:25:55 2019 -0400 - - bug 299 fixed - -diff --git a/libdjvu/GContainer.h b/libdjvu/GContainer.h -index 96b067c..0140211 100644 ---- a/libdjvu/GContainer.h -+++ b/libdjvu/GContainer.h -@@ -550,52 +550,61 @@ public: - template void - GArrayTemplate::sort(int lo, int hi) - { -- if (hi <= lo) -- return; -- if (hi > hibound || lo hibound || lo=lo) && !(data[j]<=tmp)) -- data[j+1] = data[j]; -- data[j+1] = tmp; -+ for (int i=lo+1; i<=hi; i++) -+ { -+ int j = i; -+ TYPE tmp = data[i]; -+ while ((--j>=lo) && !(data[j]<=tmp)) -+ data[j+1] = data[j]; -+ data[j+1] = tmp; -+ } -+ return; - } -- return; -- } -- // -- determine suitable quick-sort pivot -- TYPE tmp = data[lo]; -- TYPE pivot = data[(lo+hi)/2]; -- if (pivot <= tmp) -- { tmp = pivot; pivot=data[lo]; } -- if (data[hi] <= tmp) -- { pivot = tmp; } -- else if (data[hi] <= pivot) -- { pivot = data[hi]; } -- // -- partition set -- int h = hi; -- int l = lo; -- while (l < h) -- { -- while (! (pivot <= data[l])) l++; -- while (! (data[h] <= pivot)) h--; -- if (l < h) -+ // -- determine median-of-three pivot -+ TYPE tmp = data[lo]; -+ TYPE pivot = data[(lo+hi)/2]; -+ if (pivot <= tmp) -+ { tmp = pivot; pivot=data[lo]; } -+ if (data[hi] <= tmp) -+ { pivot = tmp; } -+ else if (data[hi] <= pivot) -+ { pivot = data[hi]; } -+ // -- partition set -+ int h = hi; -+ int l = lo; -+ while (l < h) - { -- tmp = data[l]; -- data[l] = data[h]; -- data[h] = tmp; -- l = l+1; -- h = h-1; -+ while (! (pivot <= data[l])) l++; -+ while (! (data[h] <= pivot)) h--; -+ if (l < h) -+ { -+ tmp = data[l]; -+ data[l] = data[h]; -+ data[h] = tmp; -+ l = l+1; -+ h = h-1; -+ } -+ } -+ // -- recurse, small partition first -+ // tail-recursion elimination -+ if (h - lo <= hi - l) { -+ sort(lo,h); -+ lo = l; // sort(l,hi) -+ } else { -+ sort(l,hi); -+ hi = h; // sort(lo,h) - } - } -- // -- recursively restart -- sort(lo, h); -- sort(l, hi); - } - - template inline TYPE& diff --git a/pkgs/applications/misc/djvulibre/CVE-2019-15145.patch b/pkgs/applications/misc/djvulibre/CVE-2019-15145.patch deleted file mode 100644 index 01108f9ee73..00000000000 --- a/pkgs/applications/misc/djvulibre/CVE-2019-15145.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 9658b01431cd7ff6344d7787f855179e73fe81a7 -Author: Leon Bottou -Date: Mon Apr 8 22:55:38 2019 -0400 - - fix bug #298 - -diff --git a/libdjvu/GBitmap.h b/libdjvu/GBitmap.h -index e8e0c9b..ca89a19 100644 ---- a/libdjvu/GBitmap.h -+++ b/libdjvu/GBitmap.h -@@ -566,7 +566,7 @@ GBitmap::operator[](int row) - { - if (!bytes) - uncompress(); -- if (row<0 || row>=nrows) { -+ if (row<0 || row>=nrows || !bytes) { - #ifndef NDEBUG - if (zerosize < bytes_per_row + border) - G_THROW( ERR_MSG("GBitmap.zero_small") ); -@@ -581,7 +581,7 @@ GBitmap::operator[](int row) const - { - if (!bytes) - ((GBitmap*)this)->uncompress(); -- if (row<0 || row>=nrows) { -+ if (row<0 || row>=nrows || !bytes) { - #ifndef NDEBUG - if (zerosize < bytes_per_row + border) - G_THROW( ERR_MSG("GBitmap.zero_small") ); diff --git a/pkgs/applications/misc/djvulibre/CVE-2019-18804.patch b/pkgs/applications/misc/djvulibre/CVE-2019-18804.patch deleted file mode 100644 index 132fed79488..00000000000 --- a/pkgs/applications/misc/djvulibre/CVE-2019-18804.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit c8bec6549c10ffaa2f2fbad8bbc629efdf0dd125 -Author: Leon Bottou -Date: Thu Oct 17 22:20:31 2019 -0400 - - Fixed bug 309 - -diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp -index 00752a0..f81eaeb 100644 ---- a/libdjvu/IW44EncodeCodec.cpp -+++ b/libdjvu/IW44EncodeCodec.cpp -@@ -405,7 +405,7 @@ filter_fv(short *p, int w, int h, int rowsize, int scale) - int y = 0; - int s = scale*rowsize; - int s3 = s+s+s; -- h = ((h-1)/scale)+1; -+ h = (h>0) ? ((h-1)/scale)+1 : 0; - y += 1; - p += s; - while (y-3 < h) -diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp -index 6d0df3b..7109952 100644 ---- a/tools/ddjvu.cpp -+++ b/tools/ddjvu.cpp -@@ -279,7 +279,7 @@ render(ddjvu_page_t *page, int pageno) - prect.h = (ih * 100) / dpi; - } - /* Process aspect ratio */ -- if (flag_aspect <= 0) -+ if (flag_aspect <= 0 && iw>0 && ih>0) - { - double dw = (double)iw / prect.w; - double dh = (double)ih / prect.h; diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index d4384e829cf..5119dd48e0d 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "djvulibre"; - version = "3.5.27"; + version = "3.5.28"; src = fetchurl { url = "mirror://sourceforge/djvu/${pname}-${version}.tar.gz"; - sha256 = "0psh3zl9dj4n4r3lx25390nx34xz0bg0ql48zdskhq354ljni5p6"; + sha256 = "1p1fiygq9ny8aimwc4vxwjc6k9ykgdsq1sq06slfbzalfvm0kl7w"; }; outputs = [ "bin" "dev" "out" ]; @@ -24,21 +24,10 @@ stdenv.mkDerivation rec { libiconv ]; - patches = [ - ./CVE-2019-18804.patch - # This one is needed to make the following - # two CVE patches apply cleanly - ./fix_hongfuzz_crash.patch - ./CVE-2019-15142.patch - ./CVE-2019-15143.patch - ./CVE-2019-15144.patch - ./CVE-2019-15145.patch - ]; - meta = with lib; { description = "The big set of CLI tools to make/modify/optimize/show/export DJVU files"; homepage = "http://djvu.sourceforge.net"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ Anton-Latukha ]; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/djvulibre/fix_hongfuzz_crash.patch b/pkgs/applications/misc/djvulibre/fix_hongfuzz_crash.patch deleted file mode 100644 index 609b41cd9db..00000000000 --- a/pkgs/applications/misc/djvulibre/fix_hongfuzz_crash.patch +++ /dev/null @@ -1,51 +0,0 @@ -commit 89d71b01d606e57ecec2c2930c145bb20ba5bbe3 -Author: Leon Bottou -Date: Fri Jul 13 08:46:22 2018 -0400 - - fix hongfuzz crash. - -diff --git a/libdjvu/DjVmDir.cpp b/libdjvu/DjVmDir.cpp -index d322323..a6a39e0 100644 ---- a/libdjvu/DjVmDir.cpp -+++ b/libdjvu/DjVmDir.cpp -@@ -299,7 +299,13 @@ DjVmDir::decode(const GP &gstr) - memcpy((char*) strings+strings_size, buffer, length); - } - DEBUG_MSG("size of decompressed names block=" << strings.size() << "\n"); -- -+ if (strings[strings.size()-1] != 0) -+ { -+ int strings_size=strings.size(); -+ strings.resize(strings_size+1); -+ strings[strings_size] = 0; -+ } -+ - // Copy names into the files - const char * ptr=strings; - for(pos=files_list;pos;++pos) -diff --git a/libdjvu/miniexp.cpp b/libdjvu/miniexp.cpp -index 6a5cd90..828addc 100644 ---- a/libdjvu/miniexp.cpp -+++ b/libdjvu/miniexp.cpp -@@ -1065,7 +1065,7 @@ print_c_string(const char *s, char *d, int flags, size_t len) - c = (unsigned char)(*s++); - if (char_quoted(c, flags)) - { -- char buffer[10]; -+ char buffer[16]; /* 10+1 */ - static const char *tr1 = "\"\\tnrbf"; - static const char *tr2 = "\"\\\t\n\r\b\f"; - buffer[0] = buffer[1] = 0; -diff --git a/tools/csepdjvu.cpp b/tools/csepdjvu.cpp -index 7ed13ad..fab9472 100644 ---- a/tools/csepdjvu.cpp -+++ b/tools/csepdjvu.cpp -@@ -1834,7 +1834,7 @@ main(int argc, const char **argv) - ByteStream::create(GURL::Filename::UTF8(arg),"rb"); - BufferByteStream ibs(*fbs); - do { -- char pagename[16]; -+ char pagename[20]; - sprintf(pagename, "p%04d.djvu", ++pageno); - if (opts.verbose > 1) - DjVuPrintErrorUTF8("%s","--------------------\n"); diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 766ec9a55d9..0c5afe6cb4e 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -1,20 +1,61 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, gettext, python3, - pkg-config, libxml2, json-glib , sqlite, itstool, yelp-tools, - vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection, - libsoup, webkitgtk +{ lib +, stdenv +, fetchFromGitHub +, meson +, fetchpatch +, ninja +, gettext +, python3 +, pkg-config +, libxml2 +, json-glib +, sqlite +, itstool +, yelp-tools +, vala +, gsettings-desktop-schemas +, gtk3 +, gnome3 +, desktop-file-utils +, wrapGAppsHook +, gobject-introspection +, libsoup +, glib-networking +, webkitgtk }: stdenv.mkDerivation rec { pname = "font-manager"; - version = "0.8.5-1"; + version = "0.8.6"; src = fetchFromGitHub { owner = "FontManager"; repo = "master"; rev = version; - sha256 = "1p0hfnf06892hn25a6zv8fnhbh4ln11nn2fv1vjqs63rr59fprbk"; + sha256 = "0a18rbdy9d0fj0vnsc2rm7xlh17vjqn4kdyrq0ldzlzkb6zbdk2k"; }; + patches = [ + # Fix some Desktop Settings with GNOME 40. + # https://github.com/FontManager/font-manager/issues/215 + (fetchpatch { + url = "https://github.com/FontManager/font-manager/commit/b28f325d7951a66ebf1a2a432ee09fd22048a033.patch"; + sha256 = "dKbrXGb9a4JuG/4x9vprMlh5J17HKJFifRWq9BWp1ow="; + }) + (fetchpatch { + url = "https://github.com/FontManager/font-manager/commit/2147204d4c4c6b58161230500186c3a5d4eeb1c1.patch"; + sha256 = "2/PFLwf7h76fIIN4+lyjg/L0KVU1hhRQCfwCAGDpb00="; + }) + (fetchpatch { + url = "https://github.com/FontManager/font-manager/commit/3abc541ef8606727c72af7631c021809600336ac.patch"; + sha256 = "rJPnW+7uuFLxTf5tk+Rzo+xkw2+uzU6BkzPXLeR/RGc="; + }) + (fetchpatch { + url = "https://github.com/FontManager/font-manager/commit/03a822f0d7b72442cd2ffcc8668da265d3535e0d.patch"; + sha256 = "3Z2UqK5VV2bIwpGd1tA7fivd7ooIuV6CxTJhzgOAkIM="; + }) + ]; + nativeBuildInputs = [ pkg-config meson @@ -34,12 +75,18 @@ stdenv.mkDerivation rec { libxml2 json-glib sqlite + gsettings-desktop-schemas # for font settings gtk3 gnome3.adwaita-icon-theme libsoup + glib-networking # for SSL so that Google Fonts can load webkitgtk ]; + mesonFlags = [ + "-Dreproducible=true" # Do not hardcode build directory… + ]; + postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix index 4ae1e8aede8..dab8ccb29b7 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/applications/misc/free42/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dU8c+tpt+4nCWQj3P2rl6CJNtWFcXaYb3ZESg8hAllQ="; + sha256 = "sha256-2TOYvZBI2EW9xjbjA4Bh+TgjbyEXRzOByalLYBW8Ba8="; }; nativeBuildInputs = [ copyDesktopItems pkg-config ]; diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index f03e8569712..71c494d311a 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fuzzel"; - version = "1.5.3"; + version = "1.5.4"; src = fetchzip { url = "https://codeberg.org/dnkl/fuzzel/archive/${version}.tar.gz"; - sha256 = "sha256-n2eXS4NdOBgn48KOJ+0sQeNMKL7OxB8tUB99narQG0o="; + sha256 = "sha256-Zg9KrRf2ntg2FU6lhllt/Fd63KJak6zB7hu4ujj/9AI="; }; nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/pkgs/applications/misc/gnome-multi-writer/default.nix index 89a967d718b..c97a492e1bd 100644 --- a/pkgs/applications/misc/gnome-multi-writer/default.nix +++ b/pkgs/applications/misc/gnome-multi-writer/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gnome-multi-writer"; - version = "3.32.1"; + version = "3.35.90"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1apdd8yi12zagf82k376a9wmdm27wzwdxpm2wf2pnwkaf786rmdw"; + sha256 = "07vgzjjdrxcp7h73z13h9agafxb4vmqx5i81bcfyw0ilw9kkdzmp"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gxkb/default.nix b/pkgs/applications/misc/gxkb/default.nix index ea1f6b9715f..7f2b93f1495 100644 --- a/pkgs/applications/misc/gxkb/default.nix +++ b/pkgs/applications/misc/gxkb/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gxkb"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "zen-tools"; repo = "gxkb"; rev = "v${version}"; - sha256 = "sha256-pRVzhNoTMtiwqaxCGVImbvdRmLbZ2bst1IdMA2IKpYc="; + sha256 = "sha256-KIlosBNfGSYCgtxBuSVeSfHaLsANdLgG/P5UtAL6Hms="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index a885b1643fe..b446fe6223d 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, testVersion +, hello +}: stdenv.mkDerivation rec { pname = "hello"; @@ -11,6 +16,9 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests.version = + testVersion { package = hello; }; + meta = with lib; { description = "A program that produces a familiar, friendly greeting"; longDescription = '' diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 0f9ca5c4b84..b8ea6b83b90 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.82.1"; + version = "0.83.1"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6poWFcApwCos3XvS/Wq1VJyf5xTUWtqWNFXIhjNsXVs="; + sha256 = "sha256-c9T3a6J78uLumBTy/DgE4gbxCmEXVGKd9JyF9dyrL6g="; }; - vendorSha256 = "sha256-pJBm+yyy1DbH28oVBQA+PHSDtSg3RcgbRlurrwnnEls="; + vendorSha256 = "sha256-ddCyMmZ5RIZWzT2RYNnSW795oR7PIRudl3QTjsXtBGk="; doCheck = false; diff --git a/pkgs/applications/misc/kratos/default.nix b/pkgs/applications/misc/kratos/default.nix new file mode 100644 index 00000000000..7f7b89618eb --- /dev/null +++ b/pkgs/applications/misc/kratos/default.nix @@ -0,0 +1,42 @@ +{ fetchFromGitHub, buildGoModule, lib, stdenv }: + +buildGoModule rec { + pname = "kratos"; + version = "0.6.0-alpha.1"; + + src = fetchFromGitHub { + owner = "ory"; + repo = "kratos"; + rev = "v${version}"; + sha256 = "0lnrm7ma203b5a0vxgm9zqsbs3nigx0kng5zymrjvrzll1gd79wm"; + }; + + vendorSha256 = "16qg44k97l6719hib8vbv0j15x6gvs9d6738d2y990a2qiqbsqpw"; + + subPackages = [ "." ]; + + buildFlags = [ "-tags sqlite" ]; + + doCheck = false; + + preBuild = '' + # Patch shebangs + files=( + test/e2e/run.sh + script/testenv.sh + script/test-envs.sh + persistence/sql/migratest/update_fixtures.sh + ) + patchShebangs "''${files[@]}" + + # patchShebangs doesn't work for this Makefile, do it manually + substituteInPlace Makefile --replace '/bin/bash' '${stdenv.shell}' + ''; + + meta = with lib; { + maintainers = with maintainers; [ mrmebelman ]; + homepage = "https://www.ory.sh/kratos/"; + license = licenses.asl20; + description = "An API-first Identity and User Management system that is built according to cloud architecture best practices"; + }; +} diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 9fa4089c4cd..aa23f187967 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, perl , alsaLib, libevdev, libopus, udev, SDL2 -, ffmpeg_3, pkg-config, xorg, libvdpau, libpulseaudio, libcec +, ffmpeg, pkg-config, xorg, libvdpau, libpulseaudio, libcec , curl, expat, avahi, enet, libuuid, libva }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ alsaLib libevdev libopus udev SDL2 - ffmpeg_3 pkg-config xorg.libxcb libvdpau libpulseaudio libcec + ffmpeg pkg-config xorg.libxcb libvdpau libpulseaudio libcec xorg.libpthreadstubs curl expat avahi enet libuuid libva ]; diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 72d68431b8c..71bc4daad77 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -35,13 +35,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.38.2"; + version = "40.0"; format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "UAX/LhHdH3E/WswZA6JwEZvFjDD9uMn4K8rHFJfGwjw="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0hq0zdcn80ficpcffbk667907v6m7dih3dhyc7ss01mrj3iyw000"; }; patches = [ diff --git a/pkgs/applications/misc/orca/fix-paths.patch b/pkgs/applications/misc/orca/fix-paths.patch index ffb56dbe239..037b323c8cb 100644 --- a/pkgs/applications/misc/orca/fix-paths.patch +++ b/pkgs/applications/misc/orca/fix-paths.patch @@ -1,6 +1,8 @@ +diff --git a/src/orca/debug.py b/src/orca/debug.py +index e79482ed4..cbf3a24ec 100644 --- a/src/orca/debug.py +++ b/src/orca/debug.py -@@ -474,7 +474,7 @@ +@@ -502,7 +502,7 @@ def traceit(frame, event, arg): return traceit def getOpenFDCount(pid): @@ -9,7 +11,7 @@ procs = procs.decode('UTF-8').split('\n') files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs)) -@@ -482,7 +482,7 @@ +@@ -510,7 +510,7 @@ def getOpenFDCount(pid): def getCmdline(pid): try: @@ -18,7 +20,7 @@ cmdline = openFile.read() openFile.close() except: -@@ -492,7 +492,7 @@ +@@ -520,7 +520,7 @@ def getCmdline(pid): return cmdline def pidOf(procName): @@ -27,9 +29,11 @@ shell=True, stdout=subprocess.PIPE).stdout pids = openFile.read() +diff --git a/src/orca/orca.py b/src/orca/orca.py +index 2fe0a0bf2..087526556 100644 --- a/src/orca/orca.py +++ b/src/orca/orca.py -@@ -239,7 +239,7 @@ +@@ -285,7 +285,7 @@ def updateKeyMap(keyboardEvent): def _setXmodmap(xkbmap): """Set the keyboard map using xkbcomp.""" @@ -38,7 +42,7 @@ stdin=subprocess.PIPE, stdout=None, stderr=None) p.communicate(xkbmap) -@@ -297,7 +297,7 @@ +@@ -363,7 +363,7 @@ def _storeXmodmap(keyList): """ global _originalXmodmap @@ -47,7 +51,7 @@ def _restoreXmodmap(keyList=[]): """Restore the original xmodmap values for the keys in keyList. -@@ -309,7 +309,7 @@ +@@ -375,7 +375,7 @@ def _restoreXmodmap(keyList=[]): global _capsLockCleared _capsLockCleared = False @@ -56,9 +60,11 @@ stdin=subprocess.PIPE, stdout=None, stderr=None) p.communicate(_originalXmodmap) +diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in +index 8c9d40153..eec0d5437 100644 --- a/src/orca/orca_bin.py.in +++ b/src/orca/orca_bin.py.in -@@ -59,7 +59,7 @@ +@@ -62,7 +62,7 @@ class ListApps(argparse.Action): name = "[DEAD]" try: @@ -67,12 +73,12 @@ except: cmdline = '(exception encountered)' else: -@@ -192,7 +192,7 @@ +@@ -197,7 +197,7 @@ def inGraphicalDesktop(): def otherOrcas(): """Returns the pid of any other instances of Orca owned by this user.""" -- openFile = subprocess.Popen('pgrep -u %s orca' % os.getuid(), -+ openFile = subprocess.Popen('@pgrep@ -u %s orca' % os.getuid(), +- openFile = subprocess.Popen('pgrep -u %s -x orca' % os.getuid(), ++ openFile = subprocess.Popen('@pgrep@ -u %s -x orca' % os.getuid(), shell=True, stdout=subprocess.PIPE).stdout pids = openFile.read() diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 61877fa0ede..3b41f63351b 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "91.0.4472.27", - "sha256": "09mhrzfza9a2zfsnxskbdbk9cwxnswgprhnyv3pj0f215cva20sq", - "sha256bin64": "1iwjf993pmhm9r92h4hskfxqc9fhky3aabvmdsqys44251j3hvwg", + "version": "91.0.4472.38", + "sha256": "13kikqyxs7p25j7mxnr42614y92vmwsjqfd51dwdjh7wc2hb644a", + "sha256bin64": "1kjawp7q6r1r50h69jwrw84gqrya1jc8bq6x7bdplxlzgvy9qs3z", "deps": { "gn": { "version": "2021-04-06", @@ -31,15 +31,15 @@ } }, "dev": { - "version": "92.0.4491.6", - "sha256": "0dwmcqzr7ysy7555l5amzppz8rxgxbgf6fy8lq4ykn2abx4m8n8a", - "sha256bin64": "041j6nm49w03qadwlsav50avdp6pwf1a8asybgvkjaxy4fpck376", + "version": "92.0.4496.0", + "sha256": "1kk1bybl6nx3z80agyljsvdb7yi3nna14aag71xhv4n6pygqfgdi", + "sha256bin64": "0b12ab20g5vay9x8j1zpj9zapdmm3him7rrm15jvsdakn60czdpr", "deps": { "gn": { - "version": "2021-04-06", + "version": "2021-04-29", "url": "https://gn.googlesource.com/gn", - "rev": "dba01723a441c358d843a575cb7720d54ddcdf92", - "sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x" + "rev": "6771ce569fb4803dad7a427aa2e2c23e960b917e", + "sha256": "0lv1zs38qr862hwxrd3g6wz3l6v8j6p7b60nxyc5fhiglqxqz0im" } } }, diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 6b8079d5245..db1b6eccefa 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,975 +1,975 @@ { - version = "88.0"; + version = "88.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ach/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ach/firefox-88.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "12d09c3e723cf3853792d11bfa3344a3cf63cbfea150de441c46e552248d1532"; + sha256 = "fbe4ef0bfa83e9e90930de50c565eb7759e5f57dcc3421c09704461e1bab3211"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/af/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/af/firefox-88.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "60a0fee46e702ae161639eb3d06e893f157516667606fda241b997ffd356e768"; + sha256 = "12d3645ba8482adea46ffb3fac4b0da13e6b95987b9a3725c758268f9b7919bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/an/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/an/firefox-88.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "6b0583486643dc144c42b369cb54cac5ec28ac997e58ca3c29c0dc12701702cd"; + sha256 = "4617ff8785b07993c7c81ad277c08ed3cde61ae64fd2700707b413f52085b5fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ar/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ar/firefox-88.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "149f7789dc5b356c336ef48788cff922bc69e9daa3bd4c32550cda0683695108"; + sha256 = "6647d9d711be4cc63ea5a302666dd69be48dcb089884ba0f9855c6cc32ba9beb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ast/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ast/firefox-88.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "55259f1a56bfb5867a17751d8ed8bfd673aaf26c4c97a70dcf99c88e427605d2"; + sha256 = "0e2e27f7357d2598b681ba029e63fb752f63c557da18b3e1d2a65678528246be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/az/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/az/firefox-88.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "36cc39d24f416717c1b07ab3aec2803c2811603a394c5e7cc3d6545655a883bd"; + sha256 = "66f48578e7a4ebd2b64c3c11a803bd668aa63d5c72dcac8cb8e5e610ace3c54c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/be/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/be/firefox-88.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "06cc01d0f235d423301dd220941d8f67745a1208015f5d2ba0dfceabc5252dad"; + sha256 = "050da876d2fa8875a57a0246c2d72337f2b386f0a9f429906b5f1933f35edb64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/bg/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/bg/firefox-88.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "a8753152946e55be48d55858a4aab8052f94fc9a6fa9192fc59a7664677fb85a"; + sha256 = "ff37f9a70ead543dc7b5b36c5c99e3f1bffd474ff154cbba854270793240317f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/bn/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/bn/firefox-88.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "12daf255bb459ea1e576aef02f008dbceb752700eb91f569761e5d3b10e17891"; + sha256 = "cdc0248a70211e73efd73d4c2a202b9d68837f1e9b6eff23c46a114da6a30c45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/br/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/br/firefox-88.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "8811d1da23da1286a4e2aca81e898a0466665386de80ff1217cac0f399396eaa"; + sha256 = "30cd2111be00e2cf7526910d02b90f0b7440ebc47e76a447ac41ac073797de64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/bs/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/bs/firefox-88.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "1386daaf4d583a980a57a0d8c3a631ed28b46f3988a0184ed0c5c8a03e44e7d6"; + sha256 = "2880580aec6a53f9b9341d3d31acf82bba3934d5086eed84649b4ff4d5874ccc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ca-valencia/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ca-valencia/firefox-88.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "15fbee8c563462b43c128c2c0d7c74d9453db32f078e6d49ff0600e73eefe4d1"; + sha256 = "81826cc131a301933bbce8b1bd5629265657b27193ab264434fadf4cd1db6b18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ca/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ca/firefox-88.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "0120c9adddfe03e4ed476ca290a0f59cc8fef4064984cde4016bbf12bcbb4730"; + sha256 = "8ed6ff9b83193b815a9ee3ba066ecd7b9841d1022ce4edcdb0d18ab283c406a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/cak/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/cak/firefox-88.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "7c0d355eb7ab709df66f5b77ede2824e3fdda646b61fd50df7762027c55dc971"; + sha256 = "b74da38062d948de36f58f33146e1cfe2a114000c041b3d13863ca4d0fb7b072"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/cs/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/cs/firefox-88.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4b39fd4bc0c214f3409a446abe13d749a6c25908811f788513d850ebef648b41"; + sha256 = "86ccaa52061c1c0740cf49e9f6566fd64e447c51a2f3d4576341a728631e51d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/cy/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/cy/firefox-88.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "40ca21bb7c715c4adfaee536a42929b10af1faefb73f8103e927b7e8cc1367fd"; + sha256 = "2ada972ae4bb948e7968a2e647cabb4e9a0de0f25b878894288e0c456a7c10c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/da/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/da/firefox-88.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "b311e549c38b5a49cef0c9a597e208d8d929cc828617e662b289f0d455f4bf46"; + sha256 = "d1b75371b0104dc9c845108abe73194675aa59d7034c23fe223e4aee73ad1933"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/de/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/de/firefox-88.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "8916772413c5a615ae4b8ddc2721d5af5ff64cc4c5799fe00873f0a29854f64a"; + sha256 = "727e5845111ed3650d71f1a73567a2a08983a60200ecdba51fb56a0818a7c139"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/dsb/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/dsb/firefox-88.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "c0b1c757f55dfb6657fd4090b5e3084af3cca1c2526f9a90efcab844fa5ea974"; + sha256 = "0c22bee8cce6f437fd656be89f223fd5e5ca9b1103104410902aa54849c1f9a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/el/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/el/firefox-88.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "04251f33971a40988df8cbdb2875bf2f24e8c878a11661568a45ed7d4b040de2"; + sha256 = "882791aee0b2d41468199e432aa075f139ff18f7849a8104c5734e98f9064dee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/en-CA/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/en-CA/firefox-88.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "5505a96cfe87f15df89b908f6a769766767d86f98ec878324e5eb26963666ffe"; + sha256 = "92f2d7fc7f73af9d649d51e99d9a116e1624911a018f10a1d5e98372a70b0390"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/en-GB/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/en-GB/firefox-88.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "e3a8649ef6107c61c6638317f367db5157acc8ce8989730d2fab7a3bd8c38d95"; + sha256 = "b8714d6c55b9daad6aee75aa923efb90ae49298e6da24a6b917aeaf340d9cf7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/en-US/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/en-US/firefox-88.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "043e9ded27d8f86ff881c1f95a2626b5bbd7361990d7977320f8e9beaea63c93"; + sha256 = "cd2dcac9fb08ab63738b35b143696ce05f42ead465003e6164f7a090ffc72416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/eo/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/eo/firefox-88.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "0deeafcdd14dddc9c31e8f68c819bdebd54e8fe6a480c6dfd723ee90da409fb4"; + sha256 = "c6cb9b0c77712246307c4753c1af3a73031e7bc8fd519c00bbc9fd57c179e0f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/es-AR/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/es-AR/firefox-88.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "b7dd60ba63a4408d94b015ee1529cc5f0c0ee4dfcfe515ed1f8eb7e183973022"; + sha256 = "eb1d036f9610eef44af2d32e758c9a29bfb9bc545033e467efc4f1a42b6a82d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/es-CL/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/es-CL/firefox-88.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "35fd7dc8d273c73c7fd334ec726da2415140497e81004a453fe144aabb8c9317"; + sha256 = "0f485aedeaaba00409cb1967c78206c67e488813599f75f2a4dba9e70843672f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/es-ES/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/es-ES/firefox-88.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "c7f801a3d4cfe52b3a9c29c9f2d633d078e13b85fde25fe837e887865040f52d"; + sha256 = "b529792912d9cb51bb0ff6718e3306433e3ce60d2411eb2096f148356f53dcd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/es-MX/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/es-MX/firefox-88.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "9e295a332dc7e043dce50f3a7092c89b1fd2ffbcfe99d25f9df34eed33b7b34e"; + sha256 = "b85b49e105589866a09371258091af3d07b1a6ba9f3e602352d0647dab6d239f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/et/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/et/firefox-88.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "c023f6c1a279c3e3d0043b535d3e1666f44a7b079905f0c0ebc4dec3edeee8fa"; + sha256 = "fc1d6961720be961f92991c1881fdf884629ebeaec9b3dc994b8a554d6c74ce8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/eu/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/eu/firefox-88.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "ee39a51081690cc9d13dc68d9cec458ad1c7055ae765ebb26299ae5267c8c8aa"; + sha256 = "85479fe2eeea6e87ed42a11447cecb002b454367a1ca5d0474a07a0537bacd06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/fa/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/fa/firefox-88.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "c61aff504e777a48272d61fe0648584f57b509a21f0f2f1269918ed5450e1131"; + sha256 = "e6a82eb02c3a55b098137303a634c74a728011a50952842021772d5d98740496"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ff/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ff/firefox-88.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "39e47a89cb93b9cfa11030cb227cd9bfaf20434c7a70b91e5aa1ef4afbdf89cc"; + sha256 = "b0f5370a62f414c469b14cb046ab8da2391325215e4025fc28998f3b7ac2b015"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/fi/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/fi/firefox-88.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e71195871fe81b3b6125b8fa2415fd3fc9dd51a01f82ed7ba7f76840b58607b1"; + sha256 = "977bdef5c8c249fb347792553bcc8df45d918847ab8be8acf2c0ed693149f10a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/fr/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/fr/firefox-88.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "2341c8cdd77a355e83d795e007ee1b5f3da783c090f2424914681666e72939d8"; + sha256 = "116e04692aa319a97ec8d459006bba6306f47b35ab4851d58c8cb458a41c67b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/fy-NL/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/fy-NL/firefox-88.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "23f3ef8f9ca2552c2aa4c3159ff266b49e113888c855553fcec3920e8c317e23"; + sha256 = "c7ad0294c58dcbfebb086e0831fcf9fe6a97451cedc2c19da5eefc6c288d5196"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ga-IE/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ga-IE/firefox-88.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "52b5cba15c62fa709f56d9f767e6f6eb8741480eb8e325e9a9a2c4c4d72a63ce"; + sha256 = "8b828caf41bb1ac0b4696a84f5a83d43bb0345cada7877f6889b7b1b057bc167"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/gd/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/gd/firefox-88.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "0a9ee7c11ff6d16d2b98fb6933102a310261e2a1f715935e162f535328662d3e"; + sha256 = "877a2c355503b27d80945b81050269ceda6514629b196dbd89158406965b07fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/gl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/gl/firefox-88.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "795d38d83d728f550b6fe3efd238a7eb2760e9724bb86ba146190b141dbce8db"; + sha256 = "a286beeaf4d40f5b0d37c9323985521ba8f86a67f7f48420e5cf6c461e920b1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/gn/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/gn/firefox-88.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "ffff3d3bd7b0ff27629c3a9776b5e4eb16eb1ddd14aa01dc4073e573ac2674b8"; + sha256 = "508c3424921cfce56148199a133e0dd1704ebbdb2d20c5169d23c42ecb5d449e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/gu-IN/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/gu-IN/firefox-88.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "7a745004a27a87c965c3b3c7a3c9179bcffb8114fae7d90a51d0bc092884da43"; + sha256 = "2975ba7be697f7592b1f8c8b0f4099b06363a72096935b7483881f62739a37e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/he/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/he/firefox-88.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "76ff3a975d0092bcfc98094e5ebfc638a192b0053b2d3c85be96d3dfe63e910c"; + sha256 = "06bc66687abc0a4451aa636c9415e066081ff7d80203fc08556a7a590d948d37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/hi-IN/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/hi-IN/firefox-88.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "6136353eff44b6234a111e622fda3882221107fd54ea0910fc659a9ad9afecfc"; + sha256 = "d80a4be0f997a9dc84509f87160e7f915845c8adae99eeb5e40f704b07fa9ce1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/hr/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/hr/firefox-88.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "a71b3730bb4916214122daf8ad3847a58d7d4fc0b4ff583080f64c6721962c83"; + sha256 = "603a831c5f88c6f7a3c3ac7b5236c4818cd89027374ef6fe518012f721ae710b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/hsb/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/hsb/firefox-88.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "9128347b9d06a6025b4dd4d7f864b0c8a8a3f49b786e79106e39514bffa14a87"; + sha256 = "3f88023c28b4ed29d5b4cd24db70c5a4aafd661763f17e563fd50a2d52df8e06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/hu/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/hu/firefox-88.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "489550b063134a992e284d895e738c994109f700338b9158ef8c91c171ce66ec"; + sha256 = "0796975d470dd462812babb11089c5686bee7a47c499cf2064a9030386d8205d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/hy-AM/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/hy-AM/firefox-88.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "16b015356550f9a73ba2fcbb9e0a36936204da476da359f2e3bae57c08353e29"; + sha256 = "3d6bb583508b0c2523519852c8bdca1d8c522e4c7ee52e16cc40a3bbcfb2f28c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ia/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ia/firefox-88.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "9a543e14b7974e94e8ac6dab92a860b7cec778910f91060207c576cfd5ea1bd4"; + sha256 = "5cb92b254d22838db46edfe62bdd566a3d34bfba58deaa7d36a4efd7e257c8eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/id/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/id/firefox-88.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "970652219ba2228cbdd187d45a49f64cb8020220ac94e798896c5668bea90a44"; + sha256 = "aabf5e60d4cb953c712538326beaf053693a61008e00551d46e5261d284d804e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/is/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/is/firefox-88.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "d7011bb2ddb09d6f446ae9d8f790f0bb5382605385c8dbf04e200fe6e63c495a"; + sha256 = "31131cb9fe7500c7f83aac790b08ad87aeede79d59ef2ebbf19c7fa376140e6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/it/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/it/firefox-88.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "a58681975cf3a79e32413d9b21655b6ace0ee2ab0df9ac45485344bf2f2f3fc7"; + sha256 = "4de9bba3bd048e96980abbf2180ca6664566f88b0b095c4dcd5eb940d9eb1137"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ja/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ja/firefox-88.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "b86e095903bc54db0bf0c6bbdc25184768c1537d57ccacf71a0da1d946bcf398"; + sha256 = "a073f1e1c466b875da47e46c55bc2b784b3f407273089db33025a9d99da5d7b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ka/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ka/firefox-88.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "e7e5277b9e239a8738f96378c87de3e204df9f530936a535aad991b6690f541d"; + sha256 = "c834937d4a011ec3bf1c08b93e66cc8b6f7fcbdb2f2f64db09e1fe39b39698c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/kab/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/kab/firefox-88.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "27b5edd4248feeb06f7c342a6f48b63ed98bfcd1d44f8ff467a204019b80263b"; + sha256 = "031907892957f23243df5d037111ba838af23adae39c62965376915b0b85c68a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/kk/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/kk/firefox-88.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "3187839a8941b3ceb64c42e084837ed5c9d01f0c518378fe21e5956bf5d4859d"; + sha256 = "43154e9101e01dafb91103d8f5f1fe12ea6b84039feab5b3ea12fe8b776db5de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/km/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/km/firefox-88.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "6c0df74570cae46c379ee7271608449a31f46c3bce030613cb04edf1ff6d16f8"; + sha256 = "7e5e996c2a12a5f849d989e46cfd762858abc2580fbed99c70b5c2e007114880"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/kn/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/kn/firefox-88.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "30116c65417489496836aa71771a3e4d01ef420d12d080ab8f5d02e6c713a513"; + sha256 = "b9cd7bc9d57b599532f38e1cf2332e6c5284f04c63e45c47480657b84522e657"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ko/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ko/firefox-88.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "e73f7ee38b5061ab6b89b6c9817d1f70c85e4b6eacc22f6780a72c308bd8dfe9"; + sha256 = "500bb904657afda7fd5f723cdd03337a1ceb2f00a17f9a6f107b363c26eb44c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/lij/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/lij/firefox-88.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "c98b27de29c3f98e13b4b3803233f3d99eebe04f33d6761c64464872941a978e"; + sha256 = "061bd89c3b9d9b9c4a76f0df31a17248029482f44679096233a85ab005dbe6ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/lt/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/lt/firefox-88.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "bb12e24f967b51b0ad2c7cfd0111f6c128f854a61d99e8262d64a5a4b2b972f2"; + sha256 = "4c9609e7a9bb11db56c8216f1e4e3e480ccce4cd012ccc590c01396d589f9c8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/lv/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/lv/firefox-88.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "65e19afa82c25c3793297db156bc72fae45754bf709cf15f4a6cd6aebf8af314"; + sha256 = "541c09d7aadcc77306045ce53c0b735887e270c42c53a5066c5dd4408ff8452b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/mk/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/mk/firefox-88.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "f7717adeb13e7592f3940867b47ad6a53172c7b99dbe5904dc78838d7230d22a"; + sha256 = "da4749a1c1417b0c4d00b54571a6e4a86eec5295dd886ed71d5d8287512e6af9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/mr/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/mr/firefox-88.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "db9cc5d8f42595824792ff2cf80e67eab5f54a9cda7f87a0a81582d53c72ab61"; + sha256 = "1bbf941693b2ce0165240aff245c7287536276b84d3592f63f3f42385e79fcfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ms/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ms/firefox-88.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "3daa35a19a5fad78ad81381f48c1e27ebe70f5be03634594f30097645f061593"; + sha256 = "447449f63e8a02e137b02de708c0c6999788b456d838b3b503ad37ac997640f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/my/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/my/firefox-88.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "de0f442f18cd82669b222bfd30aab14d1130e55765aee6992f7632f9b681284d"; + sha256 = "22ce8c15e71c270477f391282792cf9a1375ee377b6c19f0170630c62999da7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/nb-NO/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/nb-NO/firefox-88.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "207136b91b4c830ed9c2bf4ba11b6a9f42696a3cd5b6815de1b9b4d8f265817f"; + sha256 = "7f27637af6797bdfc10a208e76552db8283e1aae82f4d985859b9dbfee377b51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ne-NP/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ne-NP/firefox-88.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "47d3322091d3663d4544d7551ff1127e01b64a773770651fb320f56379b24e9f"; + sha256 = "9853db886cfe679a7f81e17b2e8223f40fee642c0c769cfb0f089b97fe26ee5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/nl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/nl/firefox-88.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "d4e06fd6bc83235dbd1ec49cd8e4bb0a0a62d735221196770f1268c79228b5be"; + sha256 = "e6b99f1b76d4a768d656c062cc044b2fa0a5af66bdfabacc669f5af6b408be0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/nn-NO/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/nn-NO/firefox-88.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "57e49d9d199bb48ba594e21e5b57931785b9404d32259a45164a24123d9d1bb8"; + sha256 = "e1a7400a6a1a49de0a24e2797dea2e3111f1712e6fb855192f82475918df7354"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/oc/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/oc/firefox-88.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "1108761ce4c7cb13077c4ebc6d9704923aa91f5affbae618768b9c855cadd784"; + sha256 = "23d166c8d9ca49331699131390e3653442a014f08b0e8dab51a26156c695b7c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/pa-IN/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/pa-IN/firefox-88.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "bef979c51a367f733a365b3e7153dc7fa7b150d797ec15ed818983d81eaa4044"; + sha256 = "b725c7a5d8e415ba00fe0aab7afd24cad9c1edc6e7edd7e550a89b3004ea1b31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/pl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/pl/firefox-88.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "69bc8bbca55a74d243fecc95d60d2c6075b911375b0bdebf6a4e238ee4f5b2ca"; + sha256 = "b835f1c5dc1da4082a4ff3f6d5ce66b90abc19f465c6f2ff0284b14fc2b44cca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/pt-BR/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/pt-BR/firefox-88.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "c75ff2eca174e9ca9787c6e56e6e956c65027d111e8e05fa80a67df36b438dd7"; + sha256 = "494f7ce43f33ae5d3e7da325b2956b5aa520c99753826a525ac023191212c025"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/pt-PT/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/pt-PT/firefox-88.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "fae035e106d4fd6fc19bcb0c081bb62bc328820b09f2ca40b30eb9542a7de046"; + sha256 = "50ed069473845929d46af61e3fbbfcf9e94db70a54ef0fedd08349c4b7cd1120"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/rm/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/rm/firefox-88.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "cd0ddd73f2281d88b5ecb6a6a92aac7ecb3a0d73074a3f8fc03d16cdcf30cc17"; + sha256 = "c6da3d38bcb69ebccf373159fdfdb9fac2fe3613c321a38d5182baea03e3818c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ro/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ro/firefox-88.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "6d028e81212cfc2e450ce7824771292706b458b6fd6c63764fae2b0804a8ed7e"; + sha256 = "b34610eb3f654053e053375f7c0c93730bb38ee436b1a7970e5375698e9a9ef0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ru/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ru/firefox-88.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "bff057c7306cc5d2c553fc744552bdb249e32a381d34007fd469247a4f22960f"; + sha256 = "dca61fde2dbe956ba0ebe63d461f0a2b816c98567abdeefbb6e451824c22cd21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/si/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/si/firefox-88.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "c73e53ce7498ac770a236f1f606dad29ce3ea6fc03713a223997b6e272cdb5c1"; + sha256 = "24dbd2c0b4b3361c3af2fd3eff703f74fb47ac27a81eee98877c3692fcaa6097"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/sk/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/sk/firefox-88.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "ceafe41adedf9b9a354ddc9117a879b72f4331e4f7ff3ca3cbcce153b6cc7e42"; + sha256 = "2f222a2dd627796a9be5345534450a4b18e4b181c5cea09742b27cd7fff40e8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/sl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/sl/firefox-88.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "3b39bdecfc71fff21040e28301b0c8193119f38e1a0877b168504f31dcc33d19"; + sha256 = "5060e2da8fec071b6f4799c88a2f2e156a9943c9640e35f2958bbeb79a6b8254"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/son/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/son/firefox-88.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "437a98ebc049dd93537a52cfb56e19b1dd1142a61e9eaf0272e5bf490cb82022"; + sha256 = "2ce56f65cddd20c74162b68b7594053dc156fa713d2a5ffcbc4f0aa34b6a4287"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/sq/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/sq/firefox-88.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "51b5da749c31fa8ca7af7b11d67f4b4d15c6924abed95d54c74c3107ba4b8fa2"; + sha256 = "cf68aea0c36405738962057f01c86323d1f71968aaa5eec693b52af55ebfdfcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/sr/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/sr/firefox-88.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "c8a99c7a3a2a7bb2a2e6958f0e7d0d5e13441e758a024a7a2129e6adaaa41cc4"; + sha256 = "5ba52f0c4546532d75668cafd129137543764dad21480d897a99558ad6e3c5d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/sv-SE/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/sv-SE/firefox-88.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a2ec634c6f269de30f6020946e76a42ddb592da4636bfa64d87dd4711a1adbe6"; + sha256 = "8b17ba3c4dc2c625a59b44c64d887377cd7a3472f4562f1e0341b02d2f5daecc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/szl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/szl/firefox-88.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "4bf6b15dd8fd99ed8d144091ae1e6ed4a1d9922d50c9bab6f5569b73ef695213"; + sha256 = "46d70b4b572b48e387083ea199f49e716c559c3331d1cb85999e619f3419576d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ta/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ta/firefox-88.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "959cd948b386e2416c905eb13de3b22b94cf3d6592458dbe52106e6eaef9837f"; + sha256 = "19405af9598548d36ba0cec286829eb6810aad3a5ceda3d038e53c947716f776"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/te/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/te/firefox-88.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "8e1b26c7c4340665ede28290ae8298a877a735f078bf9440fefc65d13c0675d4"; + sha256 = "84e059d870b748b0cccce94180be5b35e0130443a3e31b3e78b16512a0069d25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/th/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/th/firefox-88.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "d724ccdebe9a34909bd379d06c4af9beba245525374ccc090c492c3a95d65115"; + sha256 = "dab86d509bb31c262bab2ec4e9193658e42ff3ef517a69c3757830d947de9798"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/tl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/tl/firefox-88.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "76ec33e8f4a2b75e8f2b3c115c9b366d3c508ad9f1a33c942a7a6062525e51c8"; + sha256 = "e6b94d304eb6e10314abd8b1f893b0b704939250c823bc9ee56575612815fb44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/tr/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/tr/firefox-88.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "6aad672d2b197a23418fcc98347829fa00b9099b8e48812b05c6da5a57ecc175"; + sha256 = "214338ab9d55c50e667d1b79f7735adcfa848e95902f8a50e7c817f6a5096387"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/trs/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/trs/firefox-88.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "061c0feb9d7cdc622d5eef97b8b4fe5153f0900358349c1ec1ca95d7c4a8f744"; + sha256 = "a021fe8271e5a39dee0c4a695a70f52206de3cab0300358966c33c5339147c12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/uk/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/uk/firefox-88.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "77b603973f98b6ccd577a1daad05351b41a04d00b91a144ae9385d76a7c87c42"; + sha256 = "49fc053833d0ab39767ff035edad9ae6c50a5e18e32e627af6bd6bf5a71b0f96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/ur/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/ur/firefox-88.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "e1f814600f1fecf237ba80870c8b70f548e994827618d2cc9c220b4ef15c6404"; + sha256 = "8c3ce3d99d31c1ead914d7b70761cecfe0ca6e11c3f6546ed19e03ed1c823f13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/uz/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/uz/firefox-88.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "032c603683f2e26956809835d38abe4676d9383917d56f5e64735754784161a6"; + sha256 = "a8667b0c2289847b59aeef4d7809b1834872e8702a9a7cd7988afad5778c1261"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/vi/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/vi/firefox-88.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "3504f2c00d2b2225167200a7f1b809a71d2168d6c2cb048c94d221f40417a1a5"; + sha256 = "c885bd7b03ec6bf9f8842c67e34e790d458fe4746eb4f9d28e8fcb402d393c37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/xh/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/xh/firefox-88.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "68611d455147c4aaefaf1ad026d42a9600af923bd261b3326eb4395c7791ba60"; + sha256 = "5f6e840eb00573c70328c05d9caf44ac36c48fca7611ac9a60491df80933def7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/zh-CN/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/zh-CN/firefox-88.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "cbe315c6e9e4c05ee308a04d352c2573d9197b3aa200cfd82195fce852c017f5"; + sha256 = "c6c72206aadd6b54b5456ec7021a5480d5acb33941d371e36c449db229c8e4b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-x86_64/zh-TW/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-x86_64/zh-TW/firefox-88.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "e130ed291b9833c687ba1c11c6abb192c8ea258ee5f7300a5cd5f0154d634d5f"; + sha256 = "d98c58530a4c1a66cae84430b9263f0317221ea217e26a67390faf147a3afb61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ach/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ach/firefox-88.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "099c38d992da934be008e40b4ea0cce6e46f45f838cfb64b5e0b129a10f9f9af"; + sha256 = "3ced1adf6b286ba44757d7b01fddd80dcc733bf9d442589f07c8725ed8d0afa1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/af/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/af/firefox-88.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "56a0573fe7cb11133264363307ce3810177c6f03415ed3bee895765a4e737652"; + sha256 = "ee141cebc464565c4cc45d04a5c6f12220fa693bd4f3b631a029df57a2f514cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/an/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/an/firefox-88.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "f0e12115504b079863d30ffc7e19f497c4563723023a3ad40b293c2d305921c0"; + sha256 = "d14907a7a14ed3263da99f3cec6616e8a3aa91f75366afd15a6018a197139309"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ar/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ar/firefox-88.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "2793fbba47c73a9c86bdb6665c7d28e7af5a0c6145b6751eb0bd38a3ec890818"; + sha256 = "8054273b82ca17b1b1e0d5e838c1de8b363bfc5b8f3ea72e4ba6c17523e1ae66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ast/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ast/firefox-88.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "e55e686603b6b827c49e87d52b547952b09ef0ceb105224b6ede539a5b269c8f"; + sha256 = "bccb4d0af2f07204c7d44771c09d5ab458098b6f388f1a57ded76c91425bdb67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/az/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/az/firefox-88.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "a491479be97c794fc89184e32dec3fb6bd1775139ec0e02fcf0b8679ce8d9697"; + sha256 = "f22ec26b5a52e857869cc22af13672f297878836d7a3969dfa65902f366df918"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/be/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/be/firefox-88.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "5561e4e9730ac83d94e0e19cb7509cbc8986559e49d4386059021ec776b7ce60"; + sha256 = "ca7cf7a1be8fa0043e7fffbf7f28dcc04b27bb0c7b8865e877293e898292ee2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/bg/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/bg/firefox-88.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "8ffbce4041bba8a69fc3cde897e816c2f71a675a0935415d219835535a4644b9"; + sha256 = "f7672b0d6a94dd8bf1b4c997a0cdc8884d4af4e3d30a071a449cd2565bb9ae5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/bn/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/bn/firefox-88.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "826eed8716f6b02858f17d75da1dd39b7914c9b487c074c9065fb49917825b12"; + sha256 = "94608024f27db272438321d59c1dd447288c241a16c87ff958a110c13dcc1add"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/br/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/br/firefox-88.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "3c2dc18b43a925d8bd0c46e3c108a74e07fb122ae72e723c108b9fdf8e0b70a1"; + sha256 = "56baf6c6f57c68bbd7b69ad925e6fe1da4d46b8d2f8711850f31c1e31c3ff793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/bs/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/bs/firefox-88.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "459bd06be3caa151b38fd3260405a8ef9d13fc445be4c6a218fe0074ad7140bf"; + sha256 = "2350f1ad88129e8eeee7179b6bd28a06aa6173125807fbe7896afbf04ecab359"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ca-valencia/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ca-valencia/firefox-88.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "506d8950cdfc9ecea83789d9116c2fbdc7541d756f7e07db710b7dbf7eb51118"; + sha256 = "8ac160032f48d637bf198e0bc06ddb7921d2eead3d14bb056fdb4c3195aacfad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ca/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ca/firefox-88.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "c0ae65141073ebccd18c0e053198db998225150c4c1724bf0d07cf8954198e41"; + sha256 = "f2a94bcbe73b43c9258412514bf02fa834d0018af6c15bb99927236b04d24e90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/cak/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/cak/firefox-88.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "5cc2ed5014cedec417a1cdfe193364031163b0c03c26af49293e54401c071ae1"; + sha256 = "ba366df74b7062c14803427c0c69bb7c28f66e78f6cd9beb81a1fa492f73fda3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/cs/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/cs/firefox-88.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "49ab8e8599bc78d1c7613d6b58f1a3da63af6ad6a4029fcb1977c3181eb190ef"; + sha256 = "7a30c5e10de398f28228af82916d41f0cb8848db29fe7dd034d0ce8bd0bdabba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/cy/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/cy/firefox-88.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "1ded8c796d12aac6d0767b1694f1a3ba7a852c8d9feaa1b1f3158c561539e553"; + sha256 = "4f711ad9dfaf59a35e99284b8eb4cbcf3f459b9f9085b101de70d1a148c5d4b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/da/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/da/firefox-88.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "f17e25561c7cc08b70dc66eb7904f9f4d27eda7ab1e79beca813b6ec86b8774b"; + sha256 = "e064c9517420b95ff16a9d3e7346d21f9a42f506b476762c6372978ed8c16e73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/de/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/de/firefox-88.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "6fdbff1eed3657ef9979d1e63941ed4e9340de8741c03c46075841f1acb10e95"; + sha256 = "c334d22f7e28b188ec50c6aa1269f1c409181747953c157281c2a77b9e173439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/dsb/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/dsb/firefox-88.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "2a8ad12cf7487892097a6673fa9dade3fb30163c5d5fe5ad61c7ec417aba8363"; + sha256 = "da4fadd3a07c19ec04ad1e8a9ed6de780114cd8859419b8119bfb12d6dacc044"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/el/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/el/firefox-88.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "e7b74c223382724059e70608bc62946a792203b5c688d4802de70d25955485e5"; + sha256 = "e44ba8ab5ca51bc7efe4823a0a70b43adbfc75e63932ffbfe47a6fd0af1a7b3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/en-CA/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/en-CA/firefox-88.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "eac978e84c34544bcea96a6c57b59644d7d282c4250942b7acf8365aadbf8e5b"; + sha256 = "1a67ce9de292df925ebec96fd47133735e725b844cdca8a62864f7aac4e16e64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/en-GB/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/en-GB/firefox-88.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "c1c69617ea1e048a2f141592b602745d2e9e556172f896379d5fdfb2b2c5c3c7"; + sha256 = "5350e887e76e323b7c81ab887b679cbb2d49c7d30c618f65c3426ac4717d0612"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/en-US/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/en-US/firefox-88.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "a6f45b2aac37f917c0e3b8450cce94646f8734215d8f04a896f21cdbca7ba77b"; + sha256 = "6f4e0157594d46d10edc3f73e401e31338356d731b8a2673a0726609c675be42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/eo/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/eo/firefox-88.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "73f658ca036879f9a70a1f9205c7da2899b1c1c59e58d957e165ea7bbcd5e34b"; + sha256 = "8b0343f789d3faca9290a33d72fff1ab9664eafc6ad56cf029156ae12cd7abe5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/es-AR/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/es-AR/firefox-88.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "6a5aa32bfb51de74b2d5c3567550ae0ed2820fbc302a48449a3ddc1f65eb279f"; + sha256 = "76f317e2f262cfac1bb0b41be3e108d51174b8532aecc2250f82d17badcd7d1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/es-CL/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/es-CL/firefox-88.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "4c2d5cead45a8535a6c2e1a64bde129cf104ef1d4cf4d85a673c7b3500c1609f"; + sha256 = "160e6d9e69122f2ddfdde25a234f6bea63fe8c7367225cd4dcb6009f0eaceec4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/es-ES/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/es-ES/firefox-88.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "8f8c2bb4af01cb144f751ecc9dd010ea24f557b75d7c08a09eeb023945c4cb62"; + sha256 = "6e205028086cacaf99234afc9f0621da65401651b0a43699dec688f271e1642f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/es-MX/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/es-MX/firefox-88.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "4dedabb4b1e51e22e2eeedbb448f96c4f7e6dd44b3e5fc414a81a22b1e03c73f"; + sha256 = "37eb7eef32fafd273855727fd9bfb6d510c682c94751cc5f4b7b29919215b8c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/et/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/et/firefox-88.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "23b5abc7775a964ba1ee5752f8b61c7edf4c1e1eaf8962b66f13ac638da9ed25"; + sha256 = "633e0339a52de8fd6f77a8066312b2daf57b45bde6cd57adcd0f6ee23240a1ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/eu/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/eu/firefox-88.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "3c87dc6406ca147713e5530b773581333d0c0835cab15d3e3254a4dab5e74e0f"; + sha256 = "3a3504b6b2c05ebd3e62c59a5d601725867986aea7b6a78466068bcdf7e8f064"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/fa/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/fa/firefox-88.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "b20949a6b54614935ca46ab5c7f2d3116ac3323a775ad812096d964cbd05dbc4"; + sha256 = "779667c40298064d4d6cb85b2c9e8f75b5a54874e101899385efb53be4732e60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ff/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ff/firefox-88.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "6f26c249f264b714e22402dc079d54fef92e1092a3ce12fbd61be283835c32a8"; + sha256 = "f372af781709a6e07db786f27fbcbeca71868ff6adca3019a53e51a63115d0f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/fi/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/fi/firefox-88.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "f6bdd115eb26dad32b019c8e854e2bc1f67b7a3d56cd044199ef0cb4c79a3d29"; + sha256 = "a2e622bf0c5ddf95530fb8e02547a7c6f5e23edc61f5b5e387a0144f7d7eb5ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/fr/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/fr/firefox-88.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "bdf941c1a60dd2018d341e439acb7746401298b7492ec1e93b2fc744f3ace4b2"; + sha256 = "92fb6b1a095048633e12033d701190762cfda7a0ca1126e1122f8ae90793e237"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/fy-NL/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/fy-NL/firefox-88.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "cfb472e1e98f0ec8a9a6b24e8f31113ab25fcb7d1a01ddde09004414a0ac7954"; + sha256 = "3fafb1d37961b75f63d46cb43c8dd4e4fa25471d47f1d75601940ea0df87f5fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ga-IE/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ga-IE/firefox-88.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "20aaafb2d88eb09863ffb17c88df2d31aa20089672eef91e19c26795fb083de7"; + sha256 = "0c562ee44f470672ae36f0e383c8ee77f982c9fc3c302572b6fb22ad1e4ad721"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/gd/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/gd/firefox-88.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "af7d5ff85091ffb76cf15c0ed10e1148356fa5c3985e81a38c08c04f5c281064"; + sha256 = "5e29a4496f69c35d1cb2b69cd86091f368faf598a959052023a46366001a22a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/gl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/gl/firefox-88.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "28b4c52dd5191a5990a540029df8bc5ac40d5e38c23e2bbb0a2f9bd73623e74f"; + sha256 = "5f9caa18bc2425943ed6aba3974b5bf8578004b262797402d10ea10fad939afc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/gn/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/gn/firefox-88.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "5834d96a0daaf084c0ddf33490287ec2a3c376420db87904e550cf341953567b"; + sha256 = "38eb2039f153a6e0178b70bf2df455568927888935ab4c1cff7f7d3a31a9c56c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/gu-IN/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/gu-IN/firefox-88.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "025f19f373cbb3bb26029e119653a8fb1b8451166959493a75cbe89e16ae6d0c"; + sha256 = "1a7559932d13c6aa7b1dda6baa384269683de7ea3d37880592615513ee5835d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/he/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/he/firefox-88.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "3f6433e730b5a5ba0d1da4cc1d69e497b115394f5be5a8f91888bcfccfd35d92"; + sha256 = "9819474d9fc40886ec70f5fdc84a84ad2f9244cb43f1cbe6dc9954f51686d913"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/hi-IN/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/hi-IN/firefox-88.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "7ad200b8615fd8a703fd142314d72e4769f07ba420b62009d0985ff850305a4d"; + sha256 = "fb9d266b9d80b685176d8ef3711a7f91aef2b79d4f46a3201f14492c433ac579"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/hr/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/hr/firefox-88.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "b1dbefc5e048a496ea95abf5f25ace36e1d901a0ce4d1525606eb1337ef73212"; + sha256 = "4ea28d2eb6a0c5d888d581d0bd15557d4cce3dc5a09b8c858ccc7cbbeee10c2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/hsb/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/hsb/firefox-88.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "54d82c14cd3dcba66b1efd8d9e44f69827c51f7ffa6bbfcfaa82be3c0881d2f7"; + sha256 = "837f0c17da85db3194385717e13e36e41f01b3f735d33c48794831762b4dbfd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/hu/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/hu/firefox-88.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "e70da56c35e3f133a8942a08a97fc0905887e722d684138329d45195d4281254"; + sha256 = "f9cc01711910a92379872131ec8ba7f0620edf4b83f43308bbd9f7d2f0b4ebab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/hy-AM/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/hy-AM/firefox-88.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "ec8a7e6a0efe5715be61344116489215177dbaf103412a5f726006afcd2c9907"; + sha256 = "9dff255e306dac4d98b12d0d3dc556152ccdcfb8f61e2f3314393fae39eb827d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ia/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ia/firefox-88.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "fe534973e0c2a86425c6d3abfd15d29fda8281924ec5d1c6cf32d067cfc439d5"; + sha256 = "855dd75e2fd4d14158bfe5ac2377105ee4c3a5e2a04fdd6fff1eed939f332a65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/id/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/id/firefox-88.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "6e82306244398be24cd82790ddca2885b14cb1d909e416ef7b2f569a09bdbd34"; + sha256 = "4fde420623110fe68b126d09c3ee72ddc88b1ce8a0f9b0d27990f619933db399"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/is/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/is/firefox-88.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "83c237806e5ae3f6ae926e215caa74ad22e13e375c9b462de663fd836a819a3a"; + sha256 = "d3c352ed8d91105449e50847ca80f484f93ae0d23ff6e7a21f9f66b7c39748bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/it/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/it/firefox-88.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "ff72131ccce409524b044d32fdd18150524033db8841876bfcf39d43c376ce8d"; + sha256 = "6e52fbeda5410c5169ed3a6a6f4279659cf873ac474f4c43d9f78deb740ea853"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ja/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ja/firefox-88.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "6392b53788f0908da45ef6e321445430c8a9db385a134a95c63826fdc0ad289f"; + sha256 = "520f31cd27c1dfebe4fefc1b3fd6de17a4ff7f589e0ba4f8822c968e3a22e7d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ka/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ka/firefox-88.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "a24cd3fd2c46dbe764a4af86f5f79a97d1ef0c3a37bfb61883556c48d987a067"; + sha256 = "74b52e2eb83b0f7f73ab049fcf8b8cc446ccd75d55feaf363f46ecedb35c119d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/kab/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/kab/firefox-88.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "68ea95f04d07ed0c0f0fb92f4ab3ace4abd0c43a878548ffcbed61024efb8a8f"; + sha256 = "c77b40df85b97a7cb41b22188d158f100946b813850371d04a9db0702a3c43e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/kk/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/kk/firefox-88.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "6e190c44a82faa476214369e0b32c2d70d6ec4394a7c289c8c73e8d1b70b1de6"; + sha256 = "0c8a89395c091f2c56e7b992db7dc48f5116cf9c54e179fee976e2f5d9ea07b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/km/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/km/firefox-88.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "532ee78e0cb774ff3a131e6bb48e27701fa136297eb3c119ac9644e05b66bf4b"; + sha256 = "1b5198b18f01ef509943dacd6f9c02fd52c5196c466a054efd5464ee091a75db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/kn/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/kn/firefox-88.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "547b191ab90c4b81209e519f675ced74cc2579f7776005c9f2e8fb677a79ed54"; + sha256 = "91a1facfc9abb247b428c1598cc32f4c932bd8ea3e9c0affdafb156747789611"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ko/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ko/firefox-88.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d8567c735f37308db5e541cbc44bd69aac0b5e86a5e55bb1915f10ab8cac32f6"; + sha256 = "6d98305b42ef4744681fd07031c71b38d10a847981fdf1b5b094c74d1c367817"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/lij/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/lij/firefox-88.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "e70a068ff713889d452cefde7bf19be4bf65349099026c57074d4cd035ba3c1d"; + sha256 = "431aa8855b211010f88efeb95ee46e05f38176e5656ad0c050922bce2ae4a81a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/lt/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/lt/firefox-88.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "9c2a6ebc75cc6becd5d8b73a8c47674ea71a4b97fdde973c2832d9bb76f91f4e"; + sha256 = "da7f416e9223ec1770b28d3d902785cd626496f82e5fd76c3ab091c4a2668a37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/lv/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/lv/firefox-88.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "ad628812c1db1ee9b7ff0f9d2f308db2480427bbdf5b6430474400cf70a82696"; + sha256 = "364742b8aca7ea82e393f9194401f8acbf203dcbb0f8b13cf119d2324e3577de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/mk/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/mk/firefox-88.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "17b3c4004f149f66c0f6feb5a2a644b7b815d2b440fac9df597bed0cafdb06e7"; + sha256 = "0048ddc6ea21b6c06890e914f5fa457435adcd4ec6f57c98a73262fdb8079e2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/mr/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/mr/firefox-88.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "406e1c0435c4ff1233c9da0931ba4ba5a23a3cd1f05ed7202123ca04497f3a83"; + sha256 = "cbeb8be98074c6f57ccd0c917005ff04b8deda3ae8ef03126becd40591295ecc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ms/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ms/firefox-88.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "a312c23b1069438c8b0534007bf17c0b9e5b63d768b3cf24acefda1a257f0f5d"; + sha256 = "cdabbad9cf3b6012b086b5f3997c9338574a57315a5330b602a5ad2bcd40aa59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/my/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/my/firefox-88.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "93c9db14e9e462d89f04e928ac8ef3e3abdc682dc82a1781e76dcd62a2122c2b"; + sha256 = "4f44d11d8a15dd2f5f827377e4a6f64d68440fa5a3595011ee58715b9bce802d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/nb-NO/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/nb-NO/firefox-88.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "321068345667a18ae07435d78371931c55c306df14bccf74e1dbaa582d3e46fc"; + sha256 = "d61b79587b55540f845800462ca1cd52bfc7b380f60dd1bb51f15c16c511c066"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ne-NP/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ne-NP/firefox-88.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "fe92879652c7eccde08e9017f37daaca5f387be0fd7784051d2c0b7e9c83f298"; + sha256 = "3f076d3def39e76a68d12e9e8b2ce7c6d60892fc6187b660f24abe454382a347"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/nl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/nl/firefox-88.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "a8dbdf538cf310d2918026e907e8422a4b5cccb943323f1ec3b391c61341818c"; + sha256 = "003d8a9b1e7e641b8c8eda226a43342f9c4c05fd616f50dd8fb0bcf7a07ef704"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/nn-NO/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/nn-NO/firefox-88.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "5a7ef37d7a2d13a2188781b69c01fc1b648c198aafc6ace0e7c818f58bea6e2d"; + sha256 = "0cca3c831508fb2040b57fd710823dd6c8051defe1c2c71e94b168feefb24b4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/oc/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/oc/firefox-88.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "083eef36f466362ea6726170be55e6410b3394b316d3c0ee866c5a1200db6949"; + sha256 = "b4a2ff73e2bb3f81b3e1522c2cd87b36b3406a961eed68d43972784cb7467474"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/pa-IN/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/pa-IN/firefox-88.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "ed57e8e612d677f69776e3bafcdb174ac73e35d493151e282eb2f7f8a062c62f"; + sha256 = "14b692ec9884d2eee7b6f790413472943e90f80da2fca35121210ee0f9cfc23b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/pl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/pl/firefox-88.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "83523f00d01f1e41b6777789026e820de1a94f9fd413f5c2e9279d4da21697cf"; + sha256 = "a70084487dcdf2a6f5ad386284cf9dc97f7db971a5905e9460ed76bc4db47d20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/pt-BR/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/pt-BR/firefox-88.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "8d5e40ef90329e0fdc39d09b4f2a1492120182020c77a78b588e8eb66515876f"; + sha256 = "038641582e1a02b241860c99f4256e868b5feff4f0392b2c9107d2885894934c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/pt-PT/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/pt-PT/firefox-88.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "571539f8fee1519abd04900ac6ede845f0a500f612cb1b0e0a9b0415174eb45a"; + sha256 = "5bfb803863b648d99cb7a61f1f3a667f66a371e896265003162594c7f769bef0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/rm/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/rm/firefox-88.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "7e1ec5a0f813e8c1415f6a85e3f38bc03a8699a88573f1735345eb4099a0bd66"; + sha256 = "64705af1fa78953feb1281eff94a38be82e2320f6013fe45abf593af2ef9a014"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ro/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ro/firefox-88.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "5618fabc43c88e541160e8d6c515a04dc5a6c0a9aae4302b7be2f906c2559fa3"; + sha256 = "7d9ba545a17b3d4aaa4bd79a990ad931ccddc88aae76a6d3fb95675f38f77f6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ru/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ru/firefox-88.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "aca739451ce91482029101c0010d2fa8f92bb155abd96c601df495dcc1894706"; + sha256 = "2efcc64a1159f30ff00e495eeecde0d9243b0c75a4762f3e6fdd47ebdcbe1e70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/si/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/si/firefox-88.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "6ce0ccfc444784d1a91bb860fe3bf4910cc6a1ac12074d6b113f23028ded5d23"; + sha256 = "b4467e9ff46e28caea70472d9fa25f03137978508f0342d1e646aa77e8916018"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/sk/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/sk/firefox-88.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "eac64804e893db4ef8a241ae1fc33b9cddd6f91e37418977c7879a0b620b56ad"; + sha256 = "536f535124a6052e8d627928d3607cfa0301f90ed87de7701821f14f5fde40dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/sl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/sl/firefox-88.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "0d2531fdaa0259b02264a3b45b5bef081aa196526259dbb1560c53e0683991af"; + sha256 = "2f50d761df9f8e4883972134ec989e8fbafebc29a4712bb4467eb0f2bb17f603"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/son/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/son/firefox-88.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "dd384928a67803465f0a040cf9ce6b8680e44aec0bf8bb940b56026d550b5ba7"; + sha256 = "55e11dde97be10ca510ac23e301a46e5314832bef10cd32e39503cb105d5b489"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/sq/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/sq/firefox-88.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "01523311694f7de9d035b838d94b28083c5800b55ff3ff5ea853c4e668a28495"; + sha256 = "10b41cd2ba7789182902196153491b4fed86d1a655fe1b3fb22cc3bfe95bd7b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/sr/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/sr/firefox-88.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "5e6253d7c7f9f335fa2fd96562ebac2d78091264034f6673c3398fc725496e38"; + sha256 = "133a16999527f53b57123d47a191ba415c04fae837d735a295569e64492ac3b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/sv-SE/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/sv-SE/firefox-88.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "6f8864ffa2195578543b2c36c782cf7fb7ba4bcd7096245695cd8ba89ed0bcc3"; + sha256 = "d0fcfd1cdbdb051cd48cc141e826993ea429683199bf88fbf12ac2372a2a5c03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/szl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/szl/firefox-88.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "b4ccf73a518f9f4ff64adaecaedb4a7dfe116ac9f579cc1713086bc00a62c2bf"; + sha256 = "b9bb3914f6918b64249f3b32f744a8f089bfd37eaebbe983748bff288f54a6d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ta/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ta/firefox-88.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "5e0e58a52836e13f2cd49acd026feaff2d27059c9525501df3892bb29364ca4a"; + sha256 = "0d74e3c6e73fbb99dd6269925567e5127569fb3dded3de80d55a10b45e8a595b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/te/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/te/firefox-88.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "55c0dff310e6a8e239540aa04777a2eab384b4876a78354a87b0b5b51b7994e6"; + sha256 = "d76e37e73ceea536957373bb774e4971041d09fbfb361274b90d763d39fda134"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/th/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/th/firefox-88.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "2a62c240946d8330166371d42fe9c04f246953a61958a9a66d28382bbad902fe"; + sha256 = "fd81d3ec70a449f3122fea36edbc519cf06ef12bebc776ec746d980386ce3c94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/tl/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/tl/firefox-88.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "ed76eb7e7c221bfa0ab06446a3b5ba40728bb61c92a303cdf2ca4099a0f4f8fe"; + sha256 = "53c67df49f0c01f5b2f8cd0e990b4d7794f2363740fa4ec2e61fbf6763830c35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/tr/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/tr/firefox-88.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "36d3142aee1011b41b8a91fb8b5f1e7cbf6011b55acb93b0a24b9fcdb41077ad"; + sha256 = "3d95619bf046b7afa7e8dcdd3b61b6eff44f7e96a2bb4bfe8abe518a729a24bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/trs/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/trs/firefox-88.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "2f8f414f0c0ca102e359df2b24090e23d9a440b971506058be4ab14d2c72e88c"; + sha256 = "2ea46a3f91c465514cd1721f6fc4ff96014b364a8120ef3c5782411c307b2a06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/uk/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/uk/firefox-88.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "671523abb993c10c355f23029dee6f718b1c3934b9dc84c9c9c67a1fea97c08a"; + sha256 = "7ad249c8355e8fab698cc9451f0716b0d88bb26fa7f7f95862c14d79f0b5210f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/ur/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/ur/firefox-88.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "e88871cd7d3bb4eed5a466d46f19b7564bacc2274fd9dca198abf690c09f1173"; + sha256 = "d0f6f7aab4499c7b01a1f2ba6a36f00f83cb3fc7c4f8d477f0cbf9c7df4f9dee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/uz/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/uz/firefox-88.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "d8c6d54bf364fdfce2c47554f2e476dc1578334b5fc7f2c35fe5e75729d0a759"; + sha256 = "49ce46676f8d1735d8a0439a9e0149a66aee20f3bbcd26308f00ab394cc4ac71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/vi/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/vi/firefox-88.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ef62bf56b514342e96c846a8d60da76b13955cab1a65c9d5e06e5add80676d4b"; + sha256 = "afacb2c2cb34b2791f14cb9ebe13a38cc87863b0de15e81f92e65e41b51d8a53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/xh/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/xh/firefox-88.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "30c97916ef8964ec1b15ab08bed806867262fecf07d0e486e8b4821f2839a214"; + sha256 = "c08da22b2ede0799cd802a6750f1b05150e2089521f74100cdac873802a7e39e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/zh-CN/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/zh-CN/firefox-88.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "6aca619cf86cec55e4712c2365e0ffa06c3a13b9df0cf64df80ea6ac07036400"; + sha256 = "55e00d8106a2516bb23f2dc48978a96e5102dffc100790103491447e48834810"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/88.0/linux-i686/zh-TW/firefox-88.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/88.0.1/linux-i686/zh-TW/firefox-88.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "4c60f41d35bc74fdda6b3cbdd0b7bb19883bb2e977bcd04bb50ae014d0f8c3d4"; + sha256 = "849c7e52452bf72983e5e7ce1b958ffc20cdddd4a401b320b3d1a817c027db78"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 9629c590122..05f2524f949 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "88.0"; + ffversion = "88.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "f58f44f2f0d0f54eae5ab4fa439205feb8b9209b1bf2ea2ae0c9691e9e583bae2cbd4033edb5bdf4e37eda5b95fca688499bed000fe26ced8ff4bbc49347ce31"; + sha512 = "e2d7fc950ba49f225c83ee1d799d6318fcf16c33a3b7f40b85c49d5b7865f7e632c703e5fd227a303b56e2565d0796283ebb12d7fd1a02781dcaa45e84cea934"; }; meta = { @@ -32,10 +32,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.10.0esr"; + ffversion = "78.10.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "5e2cf137dc781855542c29df6152fa74ba749801640ade3cf01487ce993786b87a4f603d25c0af9323e67c7e15c75655523428c1c1426527b8623c7ded9f5946"; + sha512 = "a22773d9b3f0dca253805257f358a906769d23f15115e3a8851024f701e27dee45f056f7d34ebf1fcde0a3f91ec299639c2a12556e938a232cdea9e59835fde1"; }; meta = { diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 3598f7b617a..2028c5a7b20 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -30,6 +30,7 @@ , libnotify , libpulseaudio , libuuid +, libxshmfence , mesa , nspr , nss @@ -49,11 +50,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "68.0.3618.63"; + version = "76.0.4017.94"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - sha256 = "1643043ywz94x2yr7xyw7krfq53iwkr8qxlbydzq6zb2zina7jxd"; + sha256 = "sha256-vjSfzkl1jIQ9P1ARDa0eOuD8CmKHIEZ+IwMB2wIVjE8="; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; @@ -94,6 +95,7 @@ in stdenv.mkDerivation rec { libnotify libuuid libxcb + libxshmfence mesa nspr nss diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix index 495c2bb15d6..6e563338958 100644 --- a/pkgs/applications/networking/browsers/vieb/default.nix +++ b/pkgs/applications/networking/browsers/vieb/default.nix @@ -2,13 +2,13 @@ mkYarnPackage rec { pname = "vieb"; - version = "3.4.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "jelmerro"; repo = pname; rev = version; - sha256 = "0h5yzmvs9zhhpg9l7rrgwd4rqd9n00n2ifwqf05kpymzliy6xsnk"; + sha256 = "sha256-7/oB2Inj+iMXzigqbCNJUY7dNrFBals2BOOl+Lp+ESs="; }; packageJSON = ./package.json; @@ -51,8 +51,8 @@ mkYarnPackage rec { meta = with lib; { homepage = "https://vieb.dev/"; description = "Vim Inspired Electron Browser"; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ gebner fortuneteller2k ]; platforms = platforms.unix; - license = licenses.gpl3; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/applications/networking/browsers/vieb/package.json b/pkgs/applications/networking/browsers/vieb/package.json index cf04c6892c8..90bcdb90149 100644 --- a/pkgs/applications/networking/browsers/vieb/package.json +++ b/pkgs/applications/networking/browsers/vieb/package.json @@ -1,11 +1,13 @@ { "name": "vieb", "productName": "Vieb", - "version": "3.4.0", + "version": "4.5.1", "description": "Vim Inspired Electron Browser", + "bin": "app.js", "main": "app/index.js", "scripts": { - "test": "jest -u && eslint .", + "test": "jest --coverage --collectCoverageFrom 'app/**/*.js' -u && eslint app && echo 'All good :)'", + "dev": "electron app --datafolder ./ViebData/", "start": "electron app", "build": "node build.js", "buildall": "node build.js --linux --win --mac", @@ -16,24 +18,29 @@ "repository": "https://github.com/Jelmerro/Vieb", "homepage": "https://vieb.dev", "keywords": [ + "Vim", "Electron", "Browser", "Internet" ], "author": "Jelmer van Arnhem", "email": "Jelmerro@users.noreply.github.com", - "license": "GPL-3.0+", + "license": "GPL-3.0-or-later", "devDependencies": { - "archiver": "^5.2.0", - "electron": "^11.2.1", - "electron-builder": "^22.10.4", - "eslint": "^7.19.0", - "jest": "^26.6.3" + "archiver": "5.3.0", + "electron": "12.0.5", + "electron-builder": "22.10.5", + "eslint": "7.25.0", + "eslint-plugin-compat": "^3.9.0", + "jest": "26.6.3" }, "dependencies": { - "@cliqz/adblocker-electron": "^1.20.0", - "darkreader": "^4.9.27", - "is-svg": "^4.2.1", - "rimraf": "^3.0.2" - } + "7zip-bin": "5.1.1", + "@cliqz/adblocker-electron": "1.20.4", + "is-svg": "4.3.1", + "rimraf": "3.0.2" + }, + "browserslist": [ + "last 2 Chrome versions" + ] } diff --git a/pkgs/applications/networking/browsers/vieb/yarn.lock b/pkgs/applications/networking/browsers/vieb/yarn.lock index 45858ae2b28..5db7b52a5ad 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.lock +++ b/pkgs/applications/networking/browsers/vieb/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"7zip-bin@5.1.1": + version "5.1.1" + resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" + integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== + "7zip-bin@~5.0.3": version "5.0.3" resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f" @@ -21,36 +26,51 @@ dependencies: "@babel/highlight" "^7.12.13" +"@babel/compat-data@^7.13.15": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz#a901128bce2ad02565df95e6ecbf195cf9465919" + integrity sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q== + "@babel/core@^7.1.0", "@babel/core@^7.7.5": - version "7.12.16" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.16.tgz#8c6ba456b23b680a6493ddcfcd9d3c3ad51cab7c" - integrity sha512-t/hHIB504wWceOeaOoONOhu+gX+hpjfeN6YRBT209X/4sibZQfSF1I0HFRRlBe97UZZosGx5XwUg1ZgNbelmNw== + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.0.tgz#47299ff3ec8d111b493f1a9d04bf88c04e728d88" + integrity sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw== dependencies: "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.12.15" - "@babel/helper-module-transforms" "^7.12.13" - "@babel/helpers" "^7.12.13" - "@babel/parser" "^7.12.16" + "@babel/generator" "^7.14.0" + "@babel/helper-compilation-targets" "^7.13.16" + "@babel/helper-module-transforms" "^7.14.0" + "@babel/helpers" "^7.14.0" + "@babel/parser" "^7.14.0" "@babel/template" "^7.12.13" - "@babel/traverse" "^7.12.13" - "@babel/types" "^7.12.13" + "@babel/traverse" "^7.14.0" + "@babel/types" "^7.14.0" convert-source-map "^1.7.0" debug "^4.1.0" - gensync "^1.0.0-beta.1" + gensync "^1.0.0-beta.2" json5 "^2.1.2" - lodash "^4.17.19" - semver "^5.4.1" + semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.12.13", "@babel/generator@^7.12.15": - version "7.12.15" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.15.tgz#4617b5d0b25cc572474cc1aafee1edeaf9b5368f" - integrity sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ== +"@babel/generator@^7.14.0": + version "7.14.1" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.1.tgz#1f99331babd65700183628da186f36f63d615c93" + integrity sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.14.1" jsesc "^2.5.1" source-map "^0.5.0" +"@babel/helper-compilation-targets@^7.13.16": + version "7.13.16" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c" + integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA== + dependencies: + "@babel/compat-data" "^7.13.15" + "@babel/helper-validator-option" "^7.12.17" + browserslist "^4.14.5" + semver "^6.3.0" + "@babel/helper-function-name@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a" @@ -67,34 +87,33 @@ dependencies: "@babel/types" "^7.12.13" -"@babel/helper-member-expression-to-functions@^7.12.13": - version "7.12.16" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.16.tgz#41e0916b99f8d5f43da4f05d85f4930fa3d62b22" - integrity sha512-zYoZC1uvebBFmj1wFAlXwt35JLEgecefATtKp20xalwEK8vHAixLBXTGxNrVGEmTT+gzOThUgr8UEdgtalc1BQ== +"@babel/helper-member-expression-to-functions@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72" + integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.13.12" -"@babel/helper-module-imports@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0" - integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g== +"@babel/helper-module-imports@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977" + integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.13.12" -"@babel/helper-module-transforms@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.13.tgz#01afb052dcad2044289b7b20beb3fa8bd0265bea" - integrity sha512-acKF7EjqOR67ASIlDTupwkKM1eUisNAjaSduo5Cz+793ikfnpe7p4Q7B7EWU2PCoSTPWsQkR7hRUWEIZPiVLGA== +"@babel/helper-module-transforms@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz#8fcf78be220156f22633ee204ea81f73f826a8ad" + integrity sha512-L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw== dependencies: - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-replace-supers" "^7.12.13" - "@babel/helper-simple-access" "^7.12.13" + "@babel/helper-module-imports" "^7.13.12" + "@babel/helper-replace-supers" "^7.13.12" + "@babel/helper-simple-access" "^7.13.12" "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/helper-validator-identifier" "^7.12.11" + "@babel/helper-validator-identifier" "^7.14.0" "@babel/template" "^7.12.13" - "@babel/traverse" "^7.12.13" - "@babel/types" "^7.12.13" - lodash "^4.17.19" + "@babel/traverse" "^7.14.0" + "@babel/types" "^7.14.0" "@babel/helper-optimise-call-expression@^7.12.13": version "7.12.13" @@ -104,26 +123,26 @@ "@babel/types" "^7.12.13" "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.8.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz#174254d0f2424d8aefb4dd48057511247b0a9eeb" - integrity sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA== + version "7.13.0" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af" + integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ== -"@babel/helper-replace-supers@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz#00ec4fb6862546bd3d0aff9aac56074277173121" - integrity sha512-pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg== +"@babel/helper-replace-supers@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804" + integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw== dependencies: - "@babel/helper-member-expression-to-functions" "^7.12.13" + "@babel/helper-member-expression-to-functions" "^7.13.12" "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/traverse" "^7.12.13" - "@babel/types" "^7.12.13" + "@babel/traverse" "^7.13.0" + "@babel/types" "^7.13.12" -"@babel/helper-simple-access@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4" - integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA== +"@babel/helper-simple-access@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6" + integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.13.12" "@babel/helper-split-export-declaration@^7.12.13": version "7.12.13" @@ -132,33 +151,38 @@ dependencies: "@babel/types" "^7.12.13" -"@babel/helper-validator-identifier@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" - integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== +"@babel/helper-validator-identifier@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288" + integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A== -"@babel/helpers@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.13.tgz#3c75e993632e4dadc0274eae219c73eb7645ba47" - integrity sha512-oohVzLRZ3GQEk4Cjhfs9YkJA4TdIDTObdBEZGrd6F/T0GPSnuV6l22eMcxlvcvzVIPH3VTtxbseudM1zIE+rPQ== +"@babel/helper-validator-option@^7.12.17": + version "7.12.17" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831" + integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw== + +"@babel/helpers@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz#ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62" + integrity sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg== dependencies: "@babel/template" "^7.12.13" - "@babel/traverse" "^7.12.13" - "@babel/types" "^7.12.13" + "@babel/traverse" "^7.14.0" + "@babel/types" "^7.14.0" "@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz#8ab538393e00370b26271b01fa08f7f27f2e795c" - integrity sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww== + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf" + integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg== dependencies: - "@babel/helper-validator-identifier" "^7.12.11" + "@babel/helper-validator-identifier" "^7.14.0" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.12.16": - version "7.12.16" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.16.tgz#cc31257419d2c3189d394081635703f549fc1ed4" - integrity sha512-c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.0": + version "7.14.1" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.1.tgz#1bd644b5db3f5797c4479d89ec1817fe02b84c47" + integrity sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -253,28 +277,26 @@ "@babel/parser" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.13.tgz#689f0e4b4c08587ad26622832632735fb8c4e0c0" - integrity sha512-3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.0": + version "7.14.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.0.tgz#cea0dc8ae7e2b1dec65f512f39f3483e8cc95aef" + integrity sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA== dependencies: "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.12.13" + "@babel/generator" "^7.14.0" "@babel/helper-function-name" "^7.12.13" "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/parser" "^7.12.13" - "@babel/types" "^7.12.13" + "@babel/parser" "^7.14.0" + "@babel/types" "^7.14.0" debug "^4.1.0" globals "^11.1.0" - lodash "^4.17.19" -"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.13.tgz#8be1aa8f2c876da11a9cf650c0ecf656913ad611" - integrity sha512-oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ== +"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.13.12", "@babel/types@^7.14.0", "@babel/types@^7.14.1", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.14.1" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.1.tgz#095bd12f1c08ab63eff6e8f7745fa7c9cc15a9db" + integrity sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA== dependencies: - "@babel/helper-validator-identifier" "^7.12.11" - lodash "^4.17.19" + "@babel/helper-validator-identifier" "^7.14.0" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -282,45 +304,45 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cliqz/adblocker-content@^1.20.0": - version "1.20.0" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.20.0.tgz#fcfa2845a577ba8d9af282afbae2fc437b3f1c70" - integrity sha512-KcokmK2B+tAnVMi7nGHgzXUVf78wAODG1Uk+K3tBPf9VAo3mwldYZ472uTj6LUfZv5oeTwe4PwfmPWXWZy3Eew== +"@cliqz/adblocker-content@^1.20.5": + version "1.20.5" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.20.5.tgz#eed410510574cfc83b9b391b95026c880e5a3521" + integrity sha512-Ozp4mQytY3qmiQBsJfpObu1vwRAc8tV2kYqMS81Fx7ShjadYk3S0FtIG1zYcS7uzfQK5qTlFUsORcAEUC4kdAQ== dependencies: - "@cliqz/adblocker-extended-selectors" "^1.20.0" + "@cliqz/adblocker-extended-selectors" "^1.20.5" -"@cliqz/adblocker-electron-preload@^1.20.0": - version "1.20.0" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.20.0.tgz#997b694fbb1b1206e04b1fd570690234cc7ef630" - integrity sha512-brNQFjIoGTMClmFphtoK0EnjOlbqfxr6sA3CrOZiHfG0e07Id5GoU95re8+s8xA+/nd1GrJl/k5/b4aks+S9Gw== +"@cliqz/adblocker-electron-preload@^1.20.4": + version "1.20.5" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.20.5.tgz#0d69ee6cf4ed6865bc4a125d95e10d5b132d5680" + integrity sha512-B58O8DbFfzqxA7RmRStL0El3Vr22CwqFcgchw5FLINq2jw0VFENpLSofyxtspuwyzHoFQSYVhUo8ugbPwqsMYQ== dependencies: - "@cliqz/adblocker-content" "^1.20.0" + "@cliqz/adblocker-content" "^1.20.5" -"@cliqz/adblocker-electron@^1.20.0": - version "1.20.0" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.20.0.tgz#bacfb9feaf1d3dab339b992e3defa111a4b5ed3c" - integrity sha512-zD881g+YxxO4BM6NB5qZtSevg9Cj7QtlCJ4tkcKZnD9MDQsNXQVIFFEWwqhd00kLkTUS0+jT0px9b81cigAPNg== +"@cliqz/adblocker-electron@1.20.4": + version "1.20.4" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.20.4.tgz#6d7de52cff013ef3cd0f4a7850ebfc31f6240a46" + integrity sha512-HaHexPnJL1BBvloXuqmSh8WtpPKYHyZ+o6f+9SciySN4dJAX9BIGTk9D/V6eJWLmy6+wY7/Bpcn2Q4nrYXsqBw== dependencies: - "@cliqz/adblocker" "^1.20.0" - "@cliqz/adblocker-electron-preload" "^1.20.0" + "@cliqz/adblocker" "^1.20.4" + "@cliqz/adblocker-electron-preload" "^1.20.4" tldts-experimental "^5.6.21" -"@cliqz/adblocker-extended-selectors@^1.20.0": - version "1.20.0" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.20.0.tgz#95ede657b670f627b39f92d85a97093cecee6ffe" - integrity sha512-dnBPIngGe1eDWvYX49eP2yyCE2AY1QD5E+8SaXW6lslnjS0GQnkcXCAkkGR2am4Qdk78HAiWTXL65Zt9hdkupA== +"@cliqz/adblocker-extended-selectors@^1.20.5": + version "1.20.5" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.20.5.tgz#5d55aa72281db6f57657f9bffad5bc24fc93087a" + integrity sha512-vJUFZWB3SZuviI4yBxEsz9hejALFl/vZLrhzVm2TKGSYvR42g/thhlTCwqmhszPY11UXznWPMyaE9M5WdpBWFw== -"@cliqz/adblocker@^1.20.0": - version "1.20.0" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.20.0.tgz#514746e9ee72fcd886f1e2e1aaf13b28fc63f232" - integrity sha512-lkEj0Pj1ikwMURrvoFv0YnLfaXFuJI+jexI7zdh4fDmlwRppzDDgOhPXgCczoAlYacJk5x2mf7pan6JybRD9Kw== +"@cliqz/adblocker@^1.20.4": + version "1.20.5" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.20.5.tgz#04edcb9a52897d371a41a2351aa492186019b92a" + integrity sha512-QItVcxe1NkFvANXcDRjX40sq20fSf4Zo8DIyL3QO7nExEGowS12zj0J+6zRaoBCUxFoWgLDg4HQF0+0V7DTHNQ== dependencies: - "@cliqz/adblocker-content" "^1.20.0" - "@cliqz/adblocker-extended-selectors" "^1.20.0" + "@cliqz/adblocker-content" "^1.20.5" + "@cliqz/adblocker-extended-selectors" "^1.20.5" "@remusao/guess-url-type" "^1.1.2" "@remusao/small" "^1.1.2" "@remusao/smaz" "^1.7.1" - "@types/chrome" "^0.0.128" + "@types/chrome" "^0.0.136" "@types/firefox-webext-browser" "^82.0.0" tldts-experimental "^5.6.21" @@ -367,10 +389,10 @@ dir-compare "^2.4.0" fs-extra "^9.0.1" -"@eslint/eslintrc@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz#d736d6963d7003b6514e6324bec9c602ac340318" - integrity sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg== +"@eslint/eslintrc@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547" + integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog== dependencies: ajv "^6.12.4" debug "^4.1.1" @@ -379,7 +401,6 @@ ignore "^4.0.6" import-fresh "^3.2.1" js-yaml "^3.13.1" - lodash "^4.17.20" minimatch "^3.0.4" strip-json-comments "^3.1.1" @@ -577,6 +598,13 @@ dependencies: cross-spawn "^7.0.1" +"@mdn/browser-compat-data@^2.0.7": + version "2.0.7" + resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-2.0.7.tgz#72ec37b9c1e00ce0b4e0309d753be18e2da12ee3" + integrity sha512-GeeM827DlzFFidn1eKkMBiqXFD2oLsnZbaiGhByPl0vcapsRzUL+t9hDoov1swc9rB2jw64R+ihtzC8qOE9wXw== + dependencies: + extend "3.0.2" + "@remusao/guess-url-type@^1.1.2": version "1.2.1" resolved "https://registry.yarnpkg.com/@remusao/guess-url-type/-/guess-url-type-1.2.1.tgz#b3e7c32abdf98d0fb4f93cc67cad580b5fe4ba57" @@ -618,9 +646,9 @@ integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== "@sinonjs/commons@^1.7.0": - version "1.8.2" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz#858f5c4b48d80778fde4b9d541f27edc0d56488b" - integrity sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw== + version "1.8.3" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" + integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ== dependencies: type-detect "4.0.8" @@ -639,9 +667,9 @@ defer-to-connect "^1.0.1" "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7": - version "7.1.12" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d" - integrity sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ== + version "7.1.14" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz#faaeefc4185ec71c389f4501ee5ec84b170cc402" + integrity sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -665,16 +693,16 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": - version "7.11.0" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0" - integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg== + version "7.11.1" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.1.tgz#654f6c4f67568e24c23b367e947098c6206fa639" + integrity sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw== dependencies: "@babel/types" "^7.3.0" -"@types/chrome@^0.0.128": - version "0.0.128" - resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.128.tgz#5dbd8b2539a367353fbe4386f119b510105f8b6a" - integrity sha512-eGc599TDtersMBW1cSnExHm0IHrXrO5xdk6Sa2Dq30ED+hR1rpT1ez0NNcCgvGO52nmktGfyvd3Uyquzv3LL4g== +"@types/chrome@^0.0.136": + version "0.0.136" + resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.136.tgz#7c011b9f997b0156f25a140188a0c5689d3f368f" + integrity sha512-XDEiRhLkMd+SB7Iw3ZUIj/fov3wLd4HyTdLltVszkgl1dBfc3Rb7oPMVZ2Mz2TLqnF7Ow+StbR8E7r9lqpb4DA== dependencies: "@types/filesystem" "*" "@types/har-format" "*" @@ -685,26 +713,26 @@ integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== "@types/filesystem@*": - version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.29.tgz#ee3748eb5be140dcf980c3bd35f11aec5f7a3748" - integrity sha512-85/1KfRedmfPGsbK8YzeaQUyV1FQAvMPMTuWFQ5EkLd2w7szhNO96bk3Rh/SKmOfd9co2rCLf0Voy4o7ECBOvw== + version "0.0.30" + resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.30.tgz#a7373a2edf34d13e298baf7ee1101f738b2efb7e" + integrity sha512-NCoRgmGmLpTT9VFL6Bb6z0jQuqI3d0E5FGl7M0JOv/J5RQYo9s5aOItPYnpckx9MbYQk1APLXcF8f20Vqnf2yA== dependencies: "@types/filewriter" "*" "@types/filewriter@*": - version "0.0.28" - resolved "https://registry.yarnpkg.com/@types/filewriter/-/filewriter-0.0.28.tgz#c054e8af4d9dd75db4e63abc76f885168714d4b3" - integrity sha1-wFTor02d11205jq8dviFFocU1LM= + version "0.0.29" + resolved "https://registry.yarnpkg.com/@types/filewriter/-/filewriter-0.0.29.tgz#a48795ecadf957f6c0d10e0c34af86c098fa5bee" + integrity sha512-BsPXH/irW0ht0Ji6iw/jJaK8Lj3FJemon2gvEqHKpCdDCeemHa+rI3WBGq5z7cDMZgoLjY40oninGxqk+8NzNQ== "@types/firefox-webext-browser@^82.0.0": version "82.0.0" resolved "https://registry.yarnpkg.com/@types/firefox-webext-browser/-/firefox-webext-browser-82.0.0.tgz#4d0f5cfebd7321d2cbf0ccfb6032570f0138b958" integrity sha512-zKHePkjMx42KIUUZCPcUiyu1tpfQXH9VR4iDYfns3HvmKVJzt/TAFT+DFVroos8BI9RH78YgF3Hi/wlC6R6cKA== -"@types/fs-extra@^9.0.5": - version "9.0.7" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.7.tgz#a9ef2ffdab043def080c5bec94c03402f793577f" - integrity sha512-YGq2A6Yc3bldrLUlm17VNWOnUbnEzJ9CMgOeLFtQF3HOCN5lQBO8VyjG00a5acA5NNSM30kHVGp1trZgnVgi1Q== +"@types/fs-extra@^9.0.7": + version "9.0.11" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.11.tgz#8cc99e103499eab9f347dbc6ca4e99fb8d2c2b87" + integrity sha512-mZsifGG4QeQ7hlkhO56u7zt/ycBgGxSVsFI/6lGTU34VtwkiqrrSDgw0+ygs8kFGWcXnFQWMrzF2h7TtDFNixA== dependencies: "@types/node" "*" @@ -748,19 +776,19 @@ "@types/istanbul-lib-report" "*" "@types/minimatch@*": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" - integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== + version "3.0.4" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21" + integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== "@types/node@*": - version "14.14.27" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.27.tgz#c7127f8da0498993e13b1a42faf1303d3110d2f2" - integrity sha512-Ecfmo4YDQPwuqTCl1yBxLV5ihKfRlkBmzUEDcfIRvDxOTGQEeikr317Ln7Gcv0tjA8dVgKI3rniqW2G1OyKDng== + version "15.0.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67" + integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA== -"@types/node@^12.0.12": - version "12.20.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.0.tgz#692dfdecd6c97f5380c42dd50f19261f9f604deb" - integrity sha512-0/41wHcurotvSOTHQUFkgL702c3pyWR1mToSrrX3pGPvGfpHTv3Ksx0M4UVuU5VJfjVb62Eyr1eKO1tWNUCg2Q== +"@types/node@^14.6.2": + version "14.14.44" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz#df7503e6002847b834371c004b372529f3f85215" + integrity sha512-+gaugz6Oce6ZInfI/tK4Pq5wIIkJMEJUu92RB3Eu93mtj4wjjjz9EB5mLp5s1pSsLXdC/CPut/xF20ZzAQJbTA== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -776,9 +804,9 @@ xmlbuilder ">=11.0.1" "@types/prettier@^2.0.0": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.1.tgz#374e31645d58cb18a07b3ecd8e9dede4deb2cccd" - integrity sha512-DxZZbyMAM9GWEzXL+BMZROWz9oo6A9EilwwOMET2UVu2uZTqMWS5S69KVtuVKaRjCUpcrOXRalet86/OpG4kqw== + version "2.2.3" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz#ef65165aea2924c9359205bf748865b8881753c0" + integrity sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA== "@types/stack-utils@^2.0.0": version "2.0.0" @@ -795,14 +823,14 @@ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9" integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA== -"@types/yargs@^15.0.0", "@types/yargs@^15.0.12": +"@types/yargs@^15.0.0", "@types/yargs@^15.0.13": version "15.0.13" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc" integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ== dependencies: "@types/yargs-parser" "*" -abab@^2.0.3: +abab@^2.0.3, abab@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== @@ -830,6 +858,11 @@ acorn@^7.1.1, acorn@^7.4.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== +acorn@^8.1.0: + version "8.2.4" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz#caba24b08185c3b56e3168e97d15ed17f4d31fd0" + integrity sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg== + ajv-keywords@^3.4.1: version "3.5.2" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" @@ -845,10 +878,10 @@ ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.3, ajv@^6.12.4: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^7.0.2: - version "7.1.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.1.0.tgz#f982ea7933dc7f1012eae9eec5a86687d805421b" - integrity sha512-svS9uILze/cXbH0z2myCK2Brqprx/+JJYK5pHicT/GQiBfzzhUVAIT6MwqJg8y4xV/zoGsUeuPuwtoiKSGE15g== +ajv@^8.0.1: + version "8.2.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz#c89d3380a784ce81b2085f48811c4c101df4c602" + integrity sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -868,11 +901,11 @@ ansi-colors@^4.1.1: integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== ansi-escapes@^4.2.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" - integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== + version "4.3.2" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" + integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== dependencies: - type-fest "^0.11.0" + type-fest "^0.21.3" ansi-regex@^3.0.0: version "3.0.0" @@ -912,9 +945,9 @@ anymatch@^2.0.0: normalize-path "^2.1.1" anymatch@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" - integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== dependencies: normalize-path "^3.0.0" picomatch "^2.0.4" @@ -924,27 +957,27 @@ app-builder-bin@3.5.12: resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.12.tgz#bbe174972cc1f481f73d6d92ad47a8b4c7eb4530" integrity sha512-lQARM2AielmFoBeIo6LZigAe+58Wwe07ZWkt+wVeDxzyieNmeWjlvz/V5dKzinydwdHd+CNswN86sww46yijjA== -app-builder-lib@22.10.4: - version "22.10.4" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.10.4.tgz#3fc70821b76beb9c8279d9de22960ef2174da153" - integrity sha512-q7B1cr8Ry4a7o08EKShLfwsnIVf5By7YhVwcoqgEwPKxtoj1qF0kB4wyBP79rJylYi0Zj2cSkJJ/gD/ef9xhoQ== +app-builder-lib@22.10.5: + version "22.10.5" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.10.5.tgz#24a88581c891e5b187a0d569aa44e7c4a0dc8de2" + integrity sha512-/W8nlGamJCtKlQtsMWwU9vb+cX4pTNY+rJWCuc7oXUykVSMS50W7LhQusIjCelNfymUQ1XCu6cXEY/ylqhX12A== dependencies: "7zip-bin" "~5.0.3" "@develar/schema-utils" "~2.6.5" "@electron/universal" "1.0.4" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "22.10.4" + builder-util "22.10.5" builder-util-runtime "8.7.3" chromium-pickle-js "^0.2.0" - debug "^4.3.1" - ejs "^3.1.5" - electron-publish "22.10.4" - fs-extra "^9.0.1" - hosted-git-info "^3.0.7" + debug "^4.3.2" + ejs "^3.1.6" + electron-publish "22.10.5" + fs-extra "^9.1.0" + hosted-git-info "^3.0.8" is-ci "^2.0.0" - isbinaryfile "^4.0.6" - js-yaml "^3.14.1" + istextorbinary "^5.12.0" + js-yaml "^4.0.0" lazy-val "^1.0.4" minimatch "^3.0.4" normalize-package-data "^3.0.0" @@ -969,18 +1002,18 @@ archiver-utils@^2.1.0: normalize-path "^3.0.0" readable-stream "^2.0.0" -archiver@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.2.0.tgz#25aa1b3d9febf7aec5b0f296e77e69960c26db94" - integrity sha512-QEAKlgQuAtUxKeZB9w5/ggKXh21bZS+dzzuQ0RPBC20qtDCbTyzqmisoeJP46MP39fg4B4IcyvR+yeyEBdblsQ== +archiver@5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.3.0.tgz#dd3e097624481741df626267564f7dd8640a45ba" + integrity sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg== dependencies: archiver-utils "^2.1.0" async "^3.2.0" buffer-crc32 "^0.2.1" readable-stream "^3.6.0" readdir-glob "^1.0.0" - tar-stream "^2.1.4" - zip-stream "^4.0.4" + tar-stream "^2.2.0" + zip-stream "^4.1.0" argparse@^1.0.7: version "1.0.10" @@ -989,6 +1022,11 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + arr-diff@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" @@ -1038,6 +1076,11 @@ assign-symbols@^1.0.0: resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= +ast-metadata-inferer@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/ast-metadata-inferer/-/ast-metadata-inferer-0.4.0.tgz#6be85ceeffcf267bd79db8e1ae731da44880b45f" + integrity sha512-tKHdBe8N/Vq2nLAm4YPBVREVZjMux6KrqyPfNQgIbDl0t7HaNSmy8w4OyVHYg/cvyn5BW7o7pVwpjPte89Zhcg== + astral-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" @@ -1145,11 +1188,11 @@ babel-preset-jest@^26.6.2: babel-preset-current-node-syntax "^1.0.0" balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== -base64-js@^1.2.3, base64-js@^1.3.1: +base64-js@^1.3.1, base64-js@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== @@ -1174,6 +1217,11 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" +binaryextensions@^4.15.0: + version "4.15.0" + resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-4.15.0.tgz#c63a502e0078ff1b0e9b00a9f74d3c2b0f8bd32e" + integrity sha512-MkUl3szxXolQ2scI1PM14WOT951KnaTNJ0eMKg7WzOI4kvSxyNo/Cygx4LOBNhwyINhAuSQpJW1rYD9aBSxGaw== + bl@^4.0.3: version "4.1.0" resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" @@ -1196,14 +1244,14 @@ bluebird@^3.5.5: integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== boolean@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.2.tgz#df1baa18b6a2b0e70840475e1d93ec8fe75b2570" - integrity sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g== + version "3.0.3" + resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.3.tgz#0fee0c9813b66bef25a8a6a904bb46736d05f024" + integrity sha512-EqrTKXQX6Z3A2nRmMEIlAIfjQOgFnVO2nqZGpbcsPnYGWBwpFqzlrozU1dy+S2iqfYDLh26ef4KrgTxu9xQrxA== boxen@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.0.0.tgz#64fe9b16066af815f51057adcc800c3730120854" - integrity sha512-5bvsqw+hhgUi3oYGK0Vf4WpIkyemp60WBInn7+WNfoISzAqk/HX4L7WNROq38E6UR/y3YADpv6pEm4BfkeEAdA== + version "5.0.1" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.0.1.tgz#657528bdd3f59a772b8279b831f27ec2c744664b" + integrity sha512-49VBlw+PrWEF51aCmy7QIteYPIFZxSpvqBdP/2itCPPlJ49kj9zg/XPRFrdkne2W+CfwXUls8exMvu1RysZpKA== dependencies: ansi-align "^3.0.0" camelcase "^6.2.0" @@ -1250,6 +1298,17 @@ browser-process-hrtime@^1.0.0: resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== +browserslist@^4.12.2, browserslist@^4.14.5: + version "4.16.6" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" + integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== + dependencies: + caniuse-lite "^1.0.30001219" + colorette "^1.2.2" + electron-to-chromium "^1.3.723" + escalade "^3.1.1" + node-releases "^1.1.71" + bser@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" @@ -1288,22 +1347,22 @@ builder-util-runtime@8.7.3: debug "^4.3.2" sax "^1.2.4" -builder-util@22.10.4: - version "22.10.4" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.10.4.tgz#54e8be83dd0dec28073d866ff087cee8e7ce6cf6" - integrity sha512-XdcbFG3otEkNRKxW2wS1npNviCb/IrzusEQ55lMB+6YEHxBOfTbf8vnPt0pDumfwmxls9xczABU+mfqN/W4uDw== +builder-util@22.10.5: + version "22.10.5" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.10.5.tgz#8d0b04a3be6acc74938679aa90dcb3181b1ae86b" + integrity sha512-/MkLhmyo1gU3xMwXJxccQaRj/9tm5eTd6ZyebTf8SYouY4r3hRser+LxhOm/f8Z9W6oJvfPe0jc9TFsxYfMcsg== dependencies: "7zip-bin" "~5.0.3" "@types/debug" "^4.1.5" - "@types/fs-extra" "^9.0.5" + "@types/fs-extra" "^9.0.7" app-builder-bin "3.5.12" bluebird-lst "^1.0.9" builder-util-runtime "8.7.3" chalk "^4.1.0" - debug "^4.3.1" - fs-extra "^9.0.1" + debug "^4.3.2" + fs-extra "^9.1.0" is-ci "^2.0.0" - js-yaml "^3.14.1" + js-yaml "^4.0.0" source-map-support "^0.5.19" stat-mode "^1.0.0" temp-file "^3.3.7" @@ -1351,6 +1410,11 @@ camelcase@^6.0.0, camelcase@^6.2.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== +caniuse-lite@^1.0.30001166, caniuse-lite@^1.0.30001219: + version "1.0.30001223" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz#39b49ff0bfb3ee3587000d2f66c47addc6e14443" + integrity sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA== + capture-exit@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4" @@ -1373,9 +1437,9 @@ chalk@^2.0.0, chalk@^2.4.2: supports-color "^5.3.0" chalk@^4.0.0, chalk@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== + version "4.1.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" + integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -1490,6 +1554,11 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +colorette@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" + integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== + colors@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" @@ -1519,10 +1588,10 @@ component-emitter@^1.2.1: resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== -compress-commons@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.0.2.tgz#d6896be386e52f37610cef9e6fa5defc58c31bd7" - integrity sha512-qhd32a9xgzmpfoga1VQEiLEwdKZ6Plnpx5UCgIsf89FSolyJ7WnifY4Gtjgv5WR6hWAyRaHxC5MiEhU/38U70A== +compress-commons@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.0.tgz#25ec7a4528852ccd1d441a7d4353cd0ece11371b" + integrity sha512-ofaaLqfraD1YRTkrRKPCrGJ1pFeDG/MVCkVVV2FNGeWquSlqw5wOrwOfPQ1xF2u+blpeWASie5EubHz+vsNIgA== dependencies: buffer-crc32 "^0.2.13" crc32-stream "^4.0.1" @@ -1577,9 +1646,9 @@ copy-descriptor@^0.1.0: integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= core-js@^3.6.5: - version "3.8.3" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz#c21906e1f14f3689f93abcc6e26883550dd92dd0" - integrity sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q== + version "3.11.3" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.11.3.tgz#2835b1f4d10f6d0400bf820cfe6fe64ad067dd3f" + integrity sha512-DFEW9BllWw781Op5KdYGtXfj3s9Cmykzt16bY6elaVuqXHCUwF/5pv0H3IJ7/I3BGjK7OeU+GrjD1ChCkBJPuA== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -1644,18 +1713,13 @@ cssom@~0.3.6: resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== -cssstyle@^2.2.0: +cssstyle@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== dependencies: cssom "~0.3.6" -darkreader@^4.9.27: - version "4.9.27" - resolved "https://registry.yarnpkg.com/darkreader/-/darkreader-4.9.27.tgz#69b641d6a3c22b07fb0424406dfd9a3661b37197" - integrity sha512-DG8zsicuCbAYKaKvLUaiikeei5jN5dIpe0jyaPw4kDa2L5zVnWc/ZxNUYOFriKVAmicwqE5gH5EOfyI0MVt3KA== - dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" @@ -1698,7 +1762,7 @@ decamelize@^1.2.0: resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= -decimal.js@^10.2.0: +decimal.js@^10.2.1: version "10.2.1" resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3" integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw== @@ -1775,9 +1839,9 @@ detect-newline@^3.0.0: integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== detect-node@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" - integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw== + version "2.0.5" + resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.5.tgz#9d270aa7eaa5af0b72c4c9d9b814e7f4ce738b79" + integrity sha512-qi86tE6hRcFHy8jI1m2VG+LaPUR1LhqDa5G8tVjuUXmOrpuAgqsA1pN0+ldgr3aKUH+QLI9hCY/OcRYisERejw== diff-sequences@^26.6.2: version "26.6.2" @@ -1794,16 +1858,16 @@ dir-compare@^2.4.0: commander "2.9.0" minimatch "3.0.4" -dmg-builder@22.10.4: - version "22.10.4" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.10.4.tgz#8dab30754346791eb728091359558fd4a8dbb45f" - integrity sha512-+28HZgKAuyCQnQwLSAwkHUqtMB/egHF5ACUABCB4Nev02/ZfjFPUTF/WloTaEbue34zLLUGxPXh+BJF8Xw26ow== +dmg-builder@22.10.5: + version "22.10.5" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.10.5.tgz#65a33c106ead5a350c7de8997c546559bd6e0e7c" + integrity sha512-58FEpfH8PEFqjbUNka4bYr52snRT8+LSXrP4gy6EZWOVICbOlmTOYj988pfoLam5C5iXb3odmyUQqwWOxlsEUw== dependencies: - app-builder-lib "22.10.4" - builder-util "22.10.4" - fs-extra "^9.0.1" + app-builder-lib "22.10.5" + builder-util "22.10.5" + fs-extra "^9.1.0" iconv-lite "^0.6.2" - js-yaml "^3.14.1" + js-yaml "^4.0.0" sanitize-filename "^1.6.3" optionalDependencies: dmg-license "^1.0.8" @@ -1850,9 +1914,9 @@ dotenv-expand@^5.1.0: integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== dotenv@^8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" - integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== + version "8.6.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" + integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g== duplexer3@^0.1.4: version "0.1.4" @@ -1867,54 +1931,67 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" -ejs@^3.1.5: +editions@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/editions/-/editions-6.1.0.tgz#ba6c6cf9f4bb571d9e53ea34e771a602e5a66549" + integrity sha512-h6nWEyIocfgho9J3sTSuhU/WoFOu1hTX75rPBebNrbF38Y9QFDjCDizYXdikHTySW7Y3mSxli8bpDz9RAtc7rA== + dependencies: + errlop "^4.0.0" + version-range "^1.0.0" + +ejs@^3.1.6: version "3.1.6" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw== dependencies: jake "^10.6.1" -electron-builder@^22.10.4: - version "22.10.4" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.10.4.tgz#e1f400cf41ebb632fbf79aa86c5e0ab1ea1ed7e5" - integrity sha512-V+JtiizJd3kt24TT+0OHG7+oPAzjhhjmQVn9G6OC2WE7VBJxrDuD6lMVRgo6WlU8uvDCh7fTRUsdh0Tnu0GeQA== +electron-builder@22.10.5: + version "22.10.5" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.10.5.tgz#03b156b93e6012609027c3aaa69201a3ad21e454" + integrity sha512-0q/289UUJUhRou6lZKDz/wzK6WprIQ6VXMTmaI+w9qXvSNugPC9UA5s2zXInOkjZOvO/xKnjeyiavrVSHYF3tA== dependencies: - "@types/yargs" "^15.0.12" - app-builder-lib "22.10.4" + "@types/yargs" "^15.0.13" + app-builder-lib "22.10.5" bluebird-lst "^1.0.9" - builder-util "22.10.4" + builder-util "22.10.5" builder-util-runtime "8.7.3" chalk "^4.1.0" - dmg-builder "22.10.4" - fs-extra "^9.0.1" + dmg-builder "22.10.5" + fs-extra "^9.1.0" is-ci "^2.0.0" lazy-val "^1.0.4" read-config-file "6.0.0" sanitize-filename "^1.6.3" - update-notifier "^5.0.1" + update-notifier "^5.1.0" yargs "^16.2.0" -electron-publish@22.10.4: - version "22.10.4" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.10.4.tgz#944b00aa6a7746c31ce900ffd8106d243326dca8" - integrity sha512-cjVM0+9DQoV4TWfH8lVWoelJ89O2i5yDARVp5GCMHrB43XEU0Nr5eKYysgsbOSnZk5W8z1vfGpFWHj+AeAEDYg== +electron-publish@22.10.5: + version "22.10.5" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.10.5.tgz#9cbe46266b6c79d8c6e99840755682e2262d3543" + integrity sha512-dHyuazv3P3j1Xyv7pdwTwAvxWab2pCb0G0Oa6qWQoCc4b1/mRGY00M7AvYW1cPuUijj9zYAf1HmXfM6MifaMlA== dependencies: - "@types/fs-extra" "^9.0.5" + "@types/fs-extra" "^9.0.7" bluebird-lst "^1.0.9" - builder-util "22.10.4" + builder-util "22.10.5" builder-util-runtime "8.7.3" chalk "^4.1.0" - fs-extra "^9.0.1" + fs-extra "^9.1.0" lazy-val "^1.0.4" - mime "^2.4.7" + mime "^2.5.0" -electron@^11.2.1: - version "11.2.3" - resolved "https://registry.yarnpkg.com/electron/-/electron-11.2.3.tgz#8ad1d9858436cfca0e2e5ea7fea326794ae58ebb" - integrity sha512-6yxOc42nDAptHKNlUG/vcOh2GI9x2fqp2nQbZO0/3sz2CrwsJkwR3i3oMN9XhVJaqI7GK1vSCJz0verOkWlXcQ== +electron-to-chromium@^1.3.723: + version "1.3.727" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf" + integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg== + +electron@12.0.5: + version "12.0.5" + resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.5.tgz#005cf4375d2ee4563f5e75dc4da4ef871846a8be" + integrity sha512-z0xYB3sPr0qZcDrHUUWqooPKe3yUzBDxQcgQe3f2TLstA84JIFXBoaIJCPh/fJW0+JdF/ZFVeK2SNgLhYtRV+Q== dependencies: "@electron/get" "^1.0.1" - "@types/node" "^12.0.12" + "@types/node" "^14.6.2" extract-zip "^1.0.3" emittery@^0.7.1: @@ -1952,9 +2029,14 @@ enquirer@^2.3.5: ansi-colors "^4.1.1" env-paths@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43" - integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA== + version "2.2.1" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" + integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== + +errlop@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/errlop/-/errlop-4.1.0.tgz#8e7b8f4f1bf0a6feafce4d14f0c0cf4bf5ef036b" + integrity sha512-vul6gGBuVt0M2TPi1/WrcL86+Hb3Q2Tpu3TME3sbVhZrYf7J1ZMHCodI25RQKCVurh56qTfvgM0p3w5cT4reSQ== error-ex@^1.3.1: version "1.3.2" @@ -1993,18 +2075,32 @@ escape-string-regexp@^4.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== -escodegen@^1.14.1: - version "1.14.3" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" - integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== +escodegen@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" + integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== dependencies: esprima "^4.0.1" - estraverse "^4.2.0" + estraverse "^5.2.0" esutils "^2.0.2" optionator "^0.8.1" optionalDependencies: source-map "~0.6.1" +eslint-plugin-compat@^3.9.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-compat/-/eslint-plugin-compat-3.9.0.tgz#a7a224e09b102b58e7f7dff52c936428ff3e0186" + integrity sha512-lt3l5PHFHVEYSZ5zijcoYvtQJPsBifRiH5N0Et57KwVu7l/yxmHhSG6VJiLMa/lXrg93Qu8049RNQOMn0+yJBg== + dependencies: + "@mdn/browser-compat-data" "^2.0.7" + ast-metadata-inferer "^0.4.0" + browserslist "^4.12.2" + caniuse-lite "^1.0.30001166" + core-js "^3.6.5" + find-up "^4.1.0" + lodash.memoize "4.1.2" + semver "7.3.2" + eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" @@ -2026,17 +2122,17 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== eslint-visitor-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" - integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint@^7.19.0: - version "7.20.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.20.0.tgz#db07c4ca4eda2e2316e7aa57ac7fc91ec550bdc7" - integrity sha512-qGi0CTcOGP2OtCQBgWZlQjcTuP0XkIpYFj25XtRTQSHC+umNnp7UMshr2G8SLsRFYDdAPFeHOsiteadmMH02Yw== +eslint@7.25.0: + version "7.25.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz#1309e4404d94e676e3e831b3a3ad2b050031eb67" + integrity sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw== dependencies: "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.3.0" + "@eslint/eslintrc" "^0.4.0" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -2049,10 +2145,10 @@ eslint@^7.19.0: espree "^7.3.1" esquery "^1.4.0" esutils "^2.0.2" - file-entry-cache "^6.0.0" + file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" glob-parent "^5.0.0" - globals "^12.1.0" + globals "^13.6.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" @@ -2060,7 +2156,7 @@ eslint@^7.19.0: js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" - lodash "^4.17.20" + lodash "^4.17.21" minimatch "^3.0.4" natural-compare "^1.4.0" optionator "^0.9.1" @@ -2101,7 +2197,7 @@ esrecurse@^4.3.0: dependencies: estraverse "^5.2.0" -estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.1.1: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== @@ -2117,9 +2213,9 @@ esutils@^2.0.2: integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== exec-sh@^0.3.2: - version "0.3.4" - resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5" - integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A== + version "0.3.6" + resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc" + integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w== execa@^1.0.0: version "1.0.0" @@ -2199,7 +2295,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: assign-symbols "^1.0.0" is-extendable "^1.0.1" -extend@~3.0.2: +extend@3.0.2, extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== @@ -2253,6 +2349,11 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= +fast-xml-parser@^3.19.0: + version "3.19.0" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz#cb637ec3f3999f51406dd8ff0e6fc4d83e520d01" + integrity sha512-4pXwmBplsCPv8FOY1WRakF970TjNGnGnfbOnLqjlYvMiF1SR3yOHyxMR/YCXpPTOspNF5gwudqktIP4VsWkvBg== + fb-watchman@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" @@ -2267,10 +2368,10 @@ fd-slicer@~1.1.0: dependencies: pend "~1.2.0" -file-entry-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a" - integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA== +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== dependencies: flat-cache "^3.0.4" @@ -2359,7 +2460,7 @@ fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^9.0.1: +fs-extra@^9.0.1, fs-extra@^9.1.0: version "9.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== @@ -2389,7 +2490,7 @@ functional-red-black-tree@^1.0.1: resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= -gensync@^1.0.0-beta.1: +gensync@^1.0.0-beta.2: version "1.0.0-beta.2" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== @@ -2431,9 +2532,9 @@ getpass@^0.1.1: assert-plus "^1.0.0" glob-parent@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" - integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ== + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" @@ -2450,9 +2551,9 @@ glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: path-is-absolute "^1.0.0" global-agent@^2.0.2: - version "2.1.12" - resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.1.12.tgz#e4ae3812b731a9e81cbf825f9377ef450a8e4195" - integrity sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg== + version "2.2.0" + resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.2.0.tgz#566331b0646e6bf79429a16877685c4a1fbf76dc" + integrity sha512-+20KpaW6DDLqhG7JDiJpD1JvNvb8ts+TNl7BPOYcURqCrXqnN1Vf+XVOrkKJAFPqfX+oEhsdzOj1hLWkBTdNJg== dependencies: boolean "^3.0.1" core-js "^3.6.5" @@ -2491,10 +2592,17 @@ globals@^12.1.0: dependencies: type-fest "^0.8.1" +globals@^13.6.0: + version "13.8.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz#3e20f504810ce87a8d72e55aecf8435b50f4c1b3" + integrity sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q== + dependencies: + type-fest "^0.20.2" + globalthis@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.1.tgz#40116f5d9c071f9e8fb0037654df1ab3a83b7ef9" - integrity sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw== + version "1.0.2" + resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz#2a235d34f4d8036219f7e34929b5de9e18166b8b" + integrity sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ== dependencies: define-properties "^1.1.3" @@ -2597,21 +2705,23 @@ has@^1.0.3: function-bind "^1.1.1" hosted-git-info@^2.1.4: - version "2.8.8" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" - integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== -hosted-git-info@^3.0.6, hosted-git-info@^3.0.7: +hosted-git-info@^3.0.8: version "3.0.8" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.8.tgz#6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d" integrity sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw== dependencies: lru-cache "^6.0.0" -html-comment-regex@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7" - integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ== +hosted-git-info@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" + integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== + dependencies: + lru-cache "^6.0.0" html-encoding-sniffer@^2.0.1: version "2.0.1" @@ -2725,11 +2835,6 @@ ini@^1.3.4, ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -ip-regex@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" - integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= - is-accessor-descriptor@^0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" @@ -2762,9 +2867,9 @@ is-ci@^2.0.0: ci-info "^2.0.0" is-core-module@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" - integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== + version "2.3.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887" + integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw== dependencies: has "^1.0.3" @@ -2801,9 +2906,9 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2: kind-of "^6.0.2" is-docker@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156" - integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw== + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" @@ -2875,9 +2980,9 @@ is-obj@^2.0.0: integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== is-path-inside@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017" - integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg== + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" @@ -2887,9 +2992,9 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: isobject "^3.0.1" is-potential-custom-element-name@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397" - integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c= + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" + integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== is-stream@^1.1.0: version "1.1.0" @@ -2901,12 +3006,12 @@ is-stream@^2.0.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== -is-svg@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-4.2.1.tgz#095b496e345fec9211c2a7d5d021003e040d6f81" - integrity sha512-PHx3ANecKsKNl5y5+Jvt53Y4J7MfMpbNZkv384QNiswMKAWIbvcqbPz+sYbFKJI8Xv3be01GSFniPmoaP+Ai5A== +is-svg@4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-4.3.1.tgz#8c63ec8c67c8c7f0a8de0a71c8c7d58eccf4406b" + integrity sha512-h2CGs+yPUyvkgTJQS9cJzo9lYK06WgRiXUqBBHtglSzVKAuH4/oWsqk7LGfbSa1hGk9QcZ0SyQtVggvBA8LZXA== dependencies: - html-comment-regex "^1.1.2" + fast-xml-parser "^3.19.0" is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" @@ -2935,11 +3040,6 @@ isarray@1.0.0, isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= -isbinaryfile@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b" - integrity sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg== - isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -3003,6 +3103,15 @@ istanbul-reports@^3.0.2: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" +istextorbinary@^5.12.0: + version "5.12.0" + resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-5.12.0.tgz#2f84777838668fdf524c305a2363d6057aaeec84" + integrity sha512-wLDRWD7qpNTYubk04+q3en1+XZGS4vYWK0+SxNSXJLaITMMEK+J3o/TlOMyULeH1qozVZ9uUkKcyMA8odyxz8w== + dependencies: + binaryextensions "^4.15.0" + editions "^6.1.0" + textextensions "^5.11.0" + jake@^10.6.1: version "10.8.2" resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" @@ -3377,7 +3486,7 @@ jest-worker@^26.6.2: merge-stream "^2.0.0" supports-color "^7.0.0" -jest@^26.6.3: +jest@26.6.3: version "26.6.3" resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef" integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q== @@ -3391,7 +3500,7 @@ js-tokens@^4.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.13.1, js-yaml@^3.14.1: +js-yaml@^3.13.1: version "3.14.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== @@ -3399,41 +3508,48 @@ js-yaml@^3.13.1, js-yaml@^3.14.1: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= jsdom@^16.4.0: - version "16.4.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb" - integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w== + version "16.5.3" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.3.tgz#13a755b3950eb938b4482c407238ddf16f0d2136" + integrity sha512-Qj1H+PEvUsOtdPJ056ewXM4UJPCi4hhLA8wpiz9F2YvsRBhuFsXxtrIFAgGBDynQA9isAMGE91PfUYbdMPXuTA== dependencies: - abab "^2.0.3" - acorn "^7.1.1" + abab "^2.0.5" + acorn "^8.1.0" acorn-globals "^6.0.0" cssom "^0.4.4" - cssstyle "^2.2.0" + cssstyle "^2.3.0" data-urls "^2.0.0" - decimal.js "^10.2.0" + decimal.js "^10.2.1" domexception "^2.0.1" - escodegen "^1.14.1" + escodegen "^2.0.0" html-encoding-sniffer "^2.0.1" is-potential-custom-element-name "^1.0.0" nwsapi "^2.2.0" - parse5 "5.1.1" + parse5 "6.0.1" request "^2.88.2" - request-promise-native "^1.0.8" - saxes "^5.0.0" + request-promise-native "^1.0.9" + saxes "^5.0.1" symbol-tree "^3.2.4" - tough-cookie "^3.0.1" + tough-cookie "^4.0.0" w3c-hr-time "^1.0.2" w3c-xmlserializer "^2.0.0" webidl-conversions "^6.1.0" whatwg-encoding "^1.0.5" whatwg-mimetype "^2.3.0" - whatwg-url "^8.0.0" - ws "^7.2.3" + whatwg-url "^8.5.0" + ws "^7.4.4" xml-name-validator "^3.0.0" jsesc@^2.5.1: @@ -3597,6 +3713,11 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" +lodash.clonedeep@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= + lodash.defaults@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" @@ -3617,20 +3738,25 @@ lodash.isplainobject@^4.0.6: resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= -lodash.sortby@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" - integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= +lodash.memoize@4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" + integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= + +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= lodash.union@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg= -lodash@^4.17.10, lodash@^4.17.19, lodash@^4.17.20: - version "4.17.20" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" - integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== +lodash@^4.17.10, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.7.0: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" @@ -3707,29 +3833,29 @@ micromatch@^3.1.4: to-regex "^3.0.2" micromatch@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" - integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== dependencies: braces "^3.0.1" - picomatch "^2.0.5" + picomatch "^2.2.3" -mime-db@1.45.0: - version "1.45.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea" - integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w== +mime-db@1.47.0: + version "1.47.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c" + integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw== mime-types@^2.1.12, mime-types@~2.1.19: - version "2.1.28" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd" - integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ== + version "2.1.30" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d" + integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg== dependencies: - mime-db "1.45.0" + mime-db "1.47.0" -mime@^2.4.7: - version "2.5.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.0.tgz#2b4af934401779806ee98026bb42e8c1ae1876b1" - integrity sha512-ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag== +mime@^2.5.0: + version "2.5.2" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" + integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== mimic-fn@^2.1.0: version "2.1.0" @@ -3821,9 +3947,9 @@ node-modules-regexp@^1.0.0: integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= node-notifier@^8.0.0: - version "8.0.1" - resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1" - integrity sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA== + version "8.0.2" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5" + integrity sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg== dependencies: growly "^1.3.0" is-wsl "^2.2.0" @@ -3832,6 +3958,11 @@ node-notifier@^8.0.0: uuid "^8.3.0" which "^2.0.2" +node-releases@^1.1.71: + version "1.1.71" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb" + integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg== + normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -3843,13 +3974,13 @@ normalize-package-data@^2.5.0: validate-npm-package-license "^3.0.1" normalize-package-data@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.0.tgz#1f8a7c423b3d2e85eb36985eaf81de381d01301a" - integrity sha512-6lUjEI0d3v6kFrtgA/lOx4zHCWULXsFNIjHolnZCKCTLA6m/G625cdn3O7eNmT0iD3jfo6HZ9cdImGZwf21prw== + version "3.0.2" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz#cae5c410ae2434f9a6c1baa65d5bc3b9366c8699" + integrity sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg== dependencies: - hosted-git-info "^3.0.6" - resolve "^1.17.0" - semver "^7.3.2" + hosted-git-info "^4.0.1" + resolve "^1.20.0" + semver "^7.3.4" validate-npm-package-license "^3.0.1" normalize-path@^2.1.1: @@ -4028,10 +4159,10 @@ parse-json@^5.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse5@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" - integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== +parse5@6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" + integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== pascalcase@^0.1.1: version "0.1.1" @@ -4073,10 +4204,10 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -picomatch@^2.0.4, picomatch@^2.0.5: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" - integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== +picomatch@^2.0.4, picomatch@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d" + integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg== pify@^3.0.0: version "3.0.0" @@ -4098,13 +4229,13 @@ pkg-dir@^4.2.0: find-up "^4.0.0" plist@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c" - integrity sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ== + version "3.0.2" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.2.tgz#74bbf011124b90421c22d15779cee60060ba95bc" + integrity sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ== dependencies: - base64-js "^1.2.3" + base64-js "^1.5.1" xmlbuilder "^9.0.7" - xmldom "0.1.x" + xmldom "^0.5.0" posix-character-classes@^0.1.0: version "0.1.1" @@ -4152,9 +4283,9 @@ progress@^2.0.0, progress@^2.0.3: integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== prompts@^2.0.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7" - integrity sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ== + version "2.4.1" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz#befd3b1195ba052f9fd2fde8a486c4e82ee77f61" + integrity sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ== dependencies: kleur "^3.0.3" sisteransi "^1.0.5" @@ -4164,7 +4295,7 @@ proto-list@~1.2.1: resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= -psl@^1.1.28: +psl@^1.1.28, psl@^1.1.33: version "1.8.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== @@ -4205,9 +4336,9 @@ rc@^1.2.8: strip-json-comments "~2.0.1" react-is@^17.0.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" - integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== read-config-file@6.0.0: version "6.0.0" @@ -4301,9 +4432,9 @@ remove-trailing-separator@^1.0.1: integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= repeat-element@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" - integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== + version "1.1.4" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" + integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== repeat-string@^1.6.1: version "1.6.1" @@ -4317,7 +4448,7 @@ request-promise-core@1.1.4: dependencies: lodash "^4.17.19" -request-promise-native@^1.0.8: +request-promise-native@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28" integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g== @@ -4389,7 +4520,7 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.10.0, resolve@^1.17.0, resolve@^1.18.1: +resolve@^1.10.0, resolve@^1.18.1, resolve@^1.20.0: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -4409,7 +4540,7 @@ ret@~0.1.10: resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== -rimraf@^3.0.0, rimraf@^3.0.2: +rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -4482,7 +4613,7 @@ sax@^1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -saxes@^5.0.0: +saxes@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== @@ -4501,20 +4632,25 @@ semver-diff@^3.1.1: dependencies: semver "^6.3.0" -"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0: +"semver@2 || 3 || 4 || 5", semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== +semver@7.3.2: + version "7.3.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" + integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== + semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== semver@^7.2.1, semver@^7.3.2, semver@^7.3.4: - version "7.3.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" - integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: lru-cache "^6.0.0" @@ -4758,9 +4894,9 @@ stealthy-require@^1.1.1: integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks= string-length@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1" - integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw== + version "4.0.2" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a" + integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ== dependencies: char-regex "^1.0.2" strip-ansi "^6.0.0" @@ -4783,9 +4919,9 @@ string-width@^3.0.0: strip-ansi "^5.1.0" string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" - integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== + version "4.2.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" + integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" @@ -4873,9 +5009,9 @@ supports-color@^7.0.0, supports-color@^7.1.0: has-flag "^4.0.0" supports-hyperlinks@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47" - integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb" + integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ== dependencies: has-flag "^4.0.0" supports-color "^7.0.0" @@ -4886,16 +5022,19 @@ symbol-tree@^3.2.4: integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== table@^6.0.4: - version "6.0.7" - resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34" - integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g== + version "6.6.0" + resolved "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz#905654b79df98d9e9a973de1dd58682532c40e8e" + integrity sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg== dependencies: - ajv "^7.0.2" - lodash "^4.17.20" + ajv "^8.0.1" + lodash.clonedeep "^4.5.0" + lodash.flatten "^4.4.0" + lodash.truncate "^4.4.2" slice-ansi "^4.0.0" string-width "^4.2.0" + strip-ansi "^6.0.0" -tar-stream@^2.1.4: +tar-stream@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== @@ -4936,22 +5075,27 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= +textextensions@^5.11.0: + version "5.12.0" + resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-5.12.0.tgz#b908120b5c1bd4bb9eba41423d75b176011ab68a" + integrity sha512-IYogUDaP65IXboCiPPC0jTLLBzYlhhw2Y4b0a2trPgbHNGGGEfuHE6tds+yDcCf4mpNDaGISFzwSSezcXt+d6w== + throat@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== -tldts-core@^5.7.6: - version "5.7.6" - resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.6.tgz#af99b4ab79761dfa6c44d1d61a3f76bb5c3def8b" - integrity sha512-VfRarBs7nbY9Af3In4O1A3d7T6eZh+w/IjRPpBo8VgRHAo7LJ+GrzCVo1yoOPmm3tdO1vUXtwBnchWN0dpL6lQ== +tldts-core@^5.7.33: + version "5.7.33" + resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.33.tgz#b2364f30d16e34b48961911408e9dbe3ae94ebdb" + integrity sha512-rESuFr/uhdKG8kXDsR6YBAbvV0k1lEn1ep4PKkej7ubkcWM84P7oqT+eTrr7170inds8jPTtkQBWIqDtwlIrvQ== tldts-experimental@^5.6.21: - version "5.7.6" - resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.6.tgz#10c255872af89ab68659c3a345c7a65015920024" - integrity sha512-FRpjSRsxsa46/PRc2erEx8B9uZQYsdBQPG/s3B7IGhWxi1VG6GOwTJWGyfFBy3LWfge7Kw3Yrh89ZS01tUKMIQ== + version "5.7.33" + resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.33.tgz#4959da5cd345a6167c69815fb6e34471387178b9" + integrity sha512-MlImbiWIutHEAB26JM7sBZLhp0D0Lw1xw+tr382Wz5WtTQGa3zoJ8CE0r63oZq8hj/JLP4gLFlavwrkbxB5H+Q== dependencies: - tldts-core "^5.7.6" + tldts-core "^5.7.33" tmpl@1.0.x: version "1.0.4" @@ -5008,14 +5152,14 @@ tough-cookie@^2.3.3, tough-cookie@~2.5.0: psl "^1.1.28" punycode "^2.1.1" -tough-cookie@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2" - integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg== +tough-cookie@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" + integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg== dependencies: - ip-regex "^2.1.0" - psl "^1.1.28" + psl "^1.1.33" punycode "^2.1.1" + universalify "^0.1.2" tr46@^2.0.2: version "2.0.2" @@ -5067,11 +5211,6 @@ type-detect@4.0.8: resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== -type-fest@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" - integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== - type-fest@^0.13.1: version "0.13.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" @@ -5082,6 +5221,11 @@ type-fest@^0.20.2: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== +type-fest@^0.21.3: + version "0.21.3" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" + integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== + type-fest@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" @@ -5121,7 +5265,7 @@ unique-string@^2.0.0: dependencies: crypto-random-string "^2.0.0" -universalify@^0.1.0: +universalify@^0.1.0, universalify@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== @@ -5139,7 +5283,7 @@ unset-value@^1.0.0: has-value "^0.3.1" isobject "^3.0.0" -update-notifier@^5.0.1: +update-notifier@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw== @@ -5204,14 +5348,14 @@ uuid@^8.3.0: integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== v8-compile-cache@^2.0.3: - version "2.2.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132" - integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q== + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== v8-to-istanbul@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz#5b95cef45c0f83217ec79f8fc7ee1c8b486aee07" - integrity sha512-uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g== + version "7.1.2" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1" + integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" @@ -5234,6 +5378,18 @@ verror@1.10.0, verror@^1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" +version-compare@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/version-compare/-/version-compare-1.1.0.tgz#7b3e67e7e6cec5c72d9c9e586f8854e419ade17c" + integrity sha512-zVKtPOJTC9x23lzS4+4D7J+drq80BXVYAmObnr5zqxxFVH7OffJ1lJlAS7LYsQNV56jx/wtbw0UV7XHLrvd6kQ== + +version-range@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/version-range/-/version-range-1.1.0.tgz#1c233064202ee742afc9d56e21da3b2e15260acf" + integrity sha512-R1Ggfg2EXamrnrV3TkZ6yBNgITDbclB3viwSjbZ3+eK0VVNK4ajkYJTnDz5N0bIMYDtK9MUBvXJUnKO5RWWJ6w== + dependencies: + version-compare "^1.0.0" + w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" @@ -5277,12 +5433,12 @@ whatwg-mimetype@^2.3.0: resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== -whatwg-url@^8.0.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837" - integrity sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw== +whatwg-url@^8.0.0, whatwg-url@^8.5.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz#7752b8464fc0903fec89aa9846fc9efe07351fd3" + integrity sha512-fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg== dependencies: - lodash.sortby "^4.7.0" + lodash "^4.7.0" tr46 "^2.0.2" webidl-conversions "^6.1.0" @@ -5350,10 +5506,10 @@ write-file-atomic@^3.0.0: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" -ws@^7.2.3: - version "7.4.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.3.tgz#1f9643de34a543b8edb124bdcbc457ae55a6e5cd" - integrity sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA== +ws@^7.4.4: + version "7.4.5" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" + integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== xdg-basedir@^4.0.0: version "4.0.0" @@ -5380,20 +5536,20 @@ xmlchars@^2.2.0: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== -xmldom@0.1.x: - version "0.1.31" - resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff" - integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ== +xmldom@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e" + integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA== y18n@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4" - integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ== + version "4.0.3" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" + integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== y18n@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18" - integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg== + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== yallist@^4.0.0: version "4.0.0" @@ -5409,9 +5565,9 @@ yargs-parser@^18.1.2: decamelize "^1.2.0" yargs-parser@^20.2.2: - version "20.2.4" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== + version "20.2.7" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a" + integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== yargs@^15.4.1: version "15.4.1" @@ -5451,11 +5607,11 @@ yauzl@^2.10.0: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" -zip-stream@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.0.4.tgz#3a8f100b73afaa7d1ae9338d910b321dec77ff3a" - integrity sha512-a65wQ3h5gcQ/nQGWV1mSZCEzCML6EK/vyVPcrPNynySP1j3VBbQKh3nhC8CbORb+jfl2vXvh56Ul5odP1bAHqw== +zip-stream@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.1.0.tgz#51dd326571544e36aa3f756430b313576dc8fc79" + integrity sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A== dependencies: archiver-utils "^2.1.0" - compress-commons "^4.0.2" + compress-commons "^4.1.0" readable-stream "^3.6.0" diff --git a/pkgs/applications/networking/browsers/vieb/yarn.nix b/pkgs/applications/networking/browsers/vieb/yarn.nix index e4bfdf72617..a6b67955ada 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.nix +++ b/pkgs/applications/networking/browsers/vieb/yarn.nix @@ -1,6 +1,14 @@ { fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ + { + name = "7zip_bin___7zip_bin_5.1.1.tgz"; + path = fetchurl { + name = "7zip_bin___7zip_bin_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz"; + sha1 = "9274ec7460652f9c632c59addf24efb1684ef876"; + }; + } { name = "7zip_bin___7zip_bin_5.0.3.tgz"; path = fetchurl { @@ -26,19 +34,35 @@ }; } { - name = "_babel_core___core_7.12.16.tgz"; + name = "_babel_compat_data___compat_data_7.14.0.tgz"; path = fetchurl { - name = "_babel_core___core_7.12.16.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.12.16.tgz"; - sha1 = "8c6ba456b23b680a6493ddcfcd9d3c3ad51cab7c"; + name = "_babel_compat_data___compat_data_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz"; + sha1 = "a901128bce2ad02565df95e6ecbf195cf9465919"; }; } { - name = "_babel_generator___generator_7.12.15.tgz"; + name = "_babel_core___core_7.14.0.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.12.15.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.15.tgz"; - sha1 = "4617b5d0b25cc572474cc1aafee1edeaf9b5368f"; + name = "_babel_core___core_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.14.0.tgz"; + sha1 = "47299ff3ec8d111b493f1a9d04bf88c04e728d88"; + }; + } + { + name = "_babel_generator___generator_7.14.1.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.14.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.1.tgz"; + sha1 = "1f99331babd65700183628da186f36f63d615c93"; + }; + } + { + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.16.tgz"; + path = fetchurl { + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.16.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz"; + sha1 = "6e91dccf15e3f43e5556dffe32d860109887563c"; }; } { @@ -58,27 +82,27 @@ }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.16.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.16.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.16.tgz"; - sha1 = "41e0916b99f8d5f43da4f05d85f4930fa3d62b22"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz"; + sha1 = "dfe368f26d426a07299d8d6513821768216e6d72"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.12.13.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz"; - sha1 = "ec67e4404f41750463e455cc3203f6a32e93fcb0"; + name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz"; + sha1 = "c6a369a6f3621cb25da014078684da9196b61977"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.12.13.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.14.0.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.13.tgz"; - sha1 = "01afb052dcad2044289b7b20beb3fa8bd0265bea"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz"; + sha1 = "8fcf78be220156f22633ee204ea81f73f826a8ad"; }; } { @@ -90,27 +114,27 @@ }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.12.13.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.13.0.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz"; - sha1 = "174254d0f2424d8aefb4dd48057511247b0a9eeb"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz"; + sha1 = "806526ce125aed03373bc416a828321e3a6a33af"; }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.12.13.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.13.12.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz"; - sha1 = "00ec4fb6862546bd3d0aff9aac56074277173121"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz"; + sha1 = "6442f4c1ad912502481a564a7386de0c77ff3804"; }; } { - name = "_babel_helper_simple_access___helper_simple_access_7.12.13.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz"; - sha1 = "8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4"; + name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz"; + sha1 = "dd6c538afb61819d205a012c31792a39c7a5eaf6"; }; } { @@ -122,35 +146,43 @@ }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; - sha1 = "c9a1f021917dcb5ccf0d4e453e399022981fc9ed"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz"; + sha1 = "d26cad8a47c65286b15df1547319a5d0bcf27288"; }; } { - name = "_babel_helpers___helpers_7.12.13.tgz"; + name = "_babel_helper_validator_option___helper_validator_option_7.12.17.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.13.tgz"; - sha1 = "3c75e993632e4dadc0274eae219c73eb7645ba47"; + name = "_babel_helper_validator_option___helper_validator_option_7.12.17.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz"; + sha1 = "d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"; }; } { - name = "_babel_highlight___highlight_7.12.13.tgz"; + name = "_babel_helpers___helpers_7.14.0.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz"; - sha1 = "8ab538393e00370b26271b01fa08f7f27f2e795c"; + name = "_babel_helpers___helpers_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz"; + sha1 = "ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62"; }; } { - name = "_babel_parser___parser_7.12.16.tgz"; + name = "_babel_highlight___highlight_7.14.0.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.12.16.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.16.tgz"; - sha1 = "cc31257419d2c3189d394081635703f549fc1ed4"; + name = "_babel_highlight___highlight_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz"; + sha1 = "3197e375711ef6bf834e67d0daec88e4f46113cf"; + }; + } + { + name = "_babel_parser___parser_7.14.1.tgz"; + path = fetchurl { + name = "_babel_parser___parser_7.14.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.1.tgz"; + sha1 = "1bd644b5db3f5797c4479d89ec1817fe02b84c47"; }; } { @@ -258,19 +290,19 @@ }; } { - name = "_babel_traverse___traverse_7.12.13.tgz"; + name = "_babel_traverse___traverse_7.14.0.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.13.tgz"; - sha1 = "689f0e4b4c08587ad26622832632735fb8c4e0c0"; + name = "_babel_traverse___traverse_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.0.tgz"; + sha1 = "cea0dc8ae7e2b1dec65f512f39f3483e8cc95aef"; }; } { - name = "_babel_types___types_7.12.13.tgz"; + name = "_babel_types___types_7.14.1.tgz"; path = fetchurl { - name = "_babel_types___types_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.12.13.tgz"; - sha1 = "8be1aa8f2c876da11a9cf650c0ecf656913ad611"; + name = "_babel_types___types_7.14.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.1.tgz"; + sha1 = "095bd12f1c08ab63eff6e8f7745fa7c9cc15a9db"; }; } { @@ -282,43 +314,43 @@ }; } { - name = "_cliqz_adblocker_content___adblocker_content_1.20.0.tgz"; + name = "_cliqz_adblocker_content___adblocker_content_1.20.5.tgz"; path = fetchurl { - name = "_cliqz_adblocker_content___adblocker_content_1.20.0.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.20.0.tgz"; - sha1 = "fcfa2845a577ba8d9af282afbae2fc437b3f1c70"; + name = "_cliqz_adblocker_content___adblocker_content_1.20.5.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.20.5.tgz"; + sha1 = "eed410510574cfc83b9b391b95026c880e5a3521"; }; } { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.20.0.tgz"; + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.20.5.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.20.0.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.20.0.tgz"; - sha1 = "997b694fbb1b1206e04b1fd570690234cc7ef630"; + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.20.5.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.20.5.tgz"; + sha1 = "0d69ee6cf4ed6865bc4a125d95e10d5b132d5680"; }; } { - name = "_cliqz_adblocker_electron___adblocker_electron_1.20.0.tgz"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.20.4.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron___adblocker_electron_1.20.0.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.20.0.tgz"; - sha1 = "bacfb9feaf1d3dab339b992e3defa111a4b5ed3c"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.20.4.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.20.4.tgz"; + sha1 = "6d7de52cff013ef3cd0f4a7850ebfc31f6240a46"; }; } { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.20.0.tgz"; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.20.5.tgz"; path = fetchurl { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.20.0.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.20.0.tgz"; - sha1 = "95ede657b670f627b39f92d85a97093cecee6ffe"; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.20.5.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.20.5.tgz"; + sha1 = "5d55aa72281db6f57657f9bffad5bc24fc93087a"; }; } { - name = "_cliqz_adblocker___adblocker_1.20.0.tgz"; + name = "_cliqz_adblocker___adblocker_1.20.5.tgz"; path = fetchurl { - name = "_cliqz_adblocker___adblocker_1.20.0.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.20.0.tgz"; - sha1 = "514746e9ee72fcd886f1e2e1aaf13b28fc63f232"; + name = "_cliqz_adblocker___adblocker_1.20.5.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.20.5.tgz"; + sha1 = "04edcb9a52897d371a41a2351aa492186019b92a"; }; } { @@ -354,11 +386,11 @@ }; } { - name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; + name = "_eslint_eslintrc___eslintrc_0.4.0.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz"; - sha1 = "d736d6963d7003b6514e6324bec9c602ac340318"; + name = "_eslint_eslintrc___eslintrc_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz"; + sha1 = "99cc0a0584d72f1df38b900fb062ba995f395547"; }; } { @@ -473,6 +505,14 @@ sha1 = "504af200af6b98e198bce768bc1730c6936ae01d"; }; } + { + name = "_mdn_browser_compat_data___browser_compat_data_2.0.7.tgz"; + path = fetchurl { + name = "_mdn_browser_compat_data___browser_compat_data_2.0.7.tgz"; + url = "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-2.0.7.tgz"; + sha1 = "72ec37b9c1e00ce0b4e0309d753be18e2da12ee3"; + }; + } { name = "_remusao_guess_url_type___guess_url_type_1.2.1.tgz"; path = fetchurl { @@ -530,11 +570,11 @@ }; } { - name = "_sinonjs_commons___commons_1.8.2.tgz"; + name = "_sinonjs_commons___commons_1.8.3.tgz"; path = fetchurl { - name = "_sinonjs_commons___commons_1.8.2.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz"; - sha1 = "858f5c4b48d80778fde4b9d541f27edc0d56488b"; + name = "_sinonjs_commons___commons_1.8.3.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz"; + sha1 = "3802ddd21a50a949b6721ddd72da36e67e7f1b2d"; }; } { @@ -554,11 +594,11 @@ }; } { - name = "_types_babel__core___babel__core_7.1.12.tgz"; + name = "_types_babel__core___babel__core_7.1.14.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.12.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz"; - sha1 = "4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"; + name = "_types_babel__core___babel__core_7.1.14.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz"; + sha1 = "faaeefc4185ec71c389f4501ee5ec84b170cc402"; }; } { @@ -578,19 +618,19 @@ }; } { - name = "_types_babel__traverse___babel__traverse_7.11.0.tgz"; + name = "_types_babel__traverse___babel__traverse_7.11.1.tgz"; path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.11.0.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz"; - sha1 = "b9a1efa635201ba9bc850323a8793ee2d36c04a0"; + name = "_types_babel__traverse___babel__traverse_7.11.1.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.1.tgz"; + sha1 = "654f6c4f67568e24c23b367e947098c6206fa639"; }; } { - name = "_types_chrome___chrome_0.0.128.tgz"; + name = "_types_chrome___chrome_0.0.136.tgz"; path = fetchurl { - name = "_types_chrome___chrome_0.0.128.tgz"; - url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.128.tgz"; - sha1 = "5dbd8b2539a367353fbe4386f119b510105f8b6a"; + name = "_types_chrome___chrome_0.0.136.tgz"; + url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.136.tgz"; + sha1 = "7c011b9f997b0156f25a140188a0c5689d3f368f"; }; } { @@ -602,19 +642,19 @@ }; } { - name = "_types_filesystem___filesystem_0.0.29.tgz"; + name = "_types_filesystem___filesystem_0.0.30.tgz"; path = fetchurl { - name = "_types_filesystem___filesystem_0.0.29.tgz"; - url = "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.29.tgz"; - sha1 = "ee3748eb5be140dcf980c3bd35f11aec5f7a3748"; + name = "_types_filesystem___filesystem_0.0.30.tgz"; + url = "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.30.tgz"; + sha1 = "a7373a2edf34d13e298baf7ee1101f738b2efb7e"; }; } { - name = "_types_filewriter___filewriter_0.0.28.tgz"; + name = "_types_filewriter___filewriter_0.0.29.tgz"; path = fetchurl { - name = "_types_filewriter___filewriter_0.0.28.tgz"; - url = "https://registry.yarnpkg.com/@types/filewriter/-/filewriter-0.0.28.tgz"; - sha1 = "c054e8af4d9dd75db4e63abc76f885168714d4b3"; + name = "_types_filewriter___filewriter_0.0.29.tgz"; + url = "https://registry.yarnpkg.com/@types/filewriter/-/filewriter-0.0.29.tgz"; + sha1 = "a48795ecadf957f6c0d10e0c34af86c098fa5bee"; }; } { @@ -626,11 +666,11 @@ }; } { - name = "_types_fs_extra___fs_extra_9.0.7.tgz"; + name = "_types_fs_extra___fs_extra_9.0.11.tgz"; path = fetchurl { - name = "_types_fs_extra___fs_extra_9.0.7.tgz"; - url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.7.tgz"; - sha1 = "a9ef2ffdab043def080c5bec94c03402f793577f"; + name = "_types_fs_extra___fs_extra_9.0.11.tgz"; + url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.11.tgz"; + sha1 = "8cc99e103499eab9f347dbc6ca4e99fb8d2c2b87"; }; } { @@ -682,27 +722,27 @@ }; } { - name = "_types_minimatch___minimatch_3.0.3.tgz"; + name = "_types_minimatch___minimatch_3.0.4.tgz"; path = fetchurl { - name = "_types_minimatch___minimatch_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz"; - sha1 = "3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"; + name = "_types_minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "f0ec25dbf2f0e4b18647313ac031134ca5b24b21"; }; } { - name = "_types_node___node_14.14.27.tgz"; + name = "_types_node___node_15.0.2.tgz"; path = fetchurl { - name = "_types_node___node_14.14.27.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.27.tgz"; - sha1 = "c7127f8da0498993e13b1a42faf1303d3110d2f2"; + name = "_types_node___node_15.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz"; + sha1 = "51e9c0920d1b45936ea04341aa3e2e58d339fb67"; }; } { - name = "_types_node___node_12.20.0.tgz"; + name = "_types_node___node_14.14.44.tgz"; path = fetchurl { - name = "_types_node___node_12.20.0.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-12.20.0.tgz"; - sha1 = "692dfdecd6c97f5380c42dd50f19261f9f604deb"; + name = "_types_node___node_14.14.44.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz"; + sha1 = "df7503e6002847b834371c004b372529f3f85215"; }; } { @@ -722,11 +762,11 @@ }; } { - name = "_types_prettier___prettier_2.2.1.tgz"; + name = "_types_prettier___prettier_2.2.3.tgz"; path = fetchurl { - name = "_types_prettier___prettier_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.1.tgz"; - sha1 = "374e31645d58cb18a07b3ecd8e9dede4deb2cccd"; + name = "_types_prettier___prettier_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz"; + sha1 = "ef65165aea2924c9359205bf748865b8881753c0"; }; } { @@ -801,6 +841,14 @@ sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; }; } + { + name = "acorn___acorn_8.2.4.tgz"; + path = fetchurl { + name = "acorn___acorn_8.2.4.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz"; + sha1 = "caba24b08185c3b56e3168e97d15ed17f4d31fd0"; + }; + } { name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; path = fetchurl { @@ -818,11 +866,11 @@ }; } { - name = "ajv___ajv_7.1.0.tgz"; + name = "ajv___ajv_8.2.0.tgz"; path = fetchurl { - name = "ajv___ajv_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-7.1.0.tgz"; - sha1 = "f982ea7933dc7f1012eae9eec5a86687d805421b"; + name = "ajv___ajv_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz"; + sha1 = "c89d3380a784ce81b2085f48811c4c101df4c602"; }; } { @@ -842,11 +890,11 @@ }; } { - name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; + name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; path = fetchurl { - name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; - sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61"; + name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz"; + sha1 = "6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"; }; } { @@ -898,11 +946,11 @@ }; } { - name = "anymatch___anymatch_3.1.1.tgz"; + name = "anymatch___anymatch_3.1.2.tgz"; path = fetchurl { - name = "anymatch___anymatch_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz"; - sha1 = "c55ecf02185e2469259399310c173ce31233b142"; + name = "anymatch___anymatch_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz"; + sha1 = "c0557c096af32f106198f4f4e2a383537e378716"; }; } { @@ -914,11 +962,11 @@ }; } { - name = "app_builder_lib___app_builder_lib_22.10.4.tgz"; + name = "app_builder_lib___app_builder_lib_22.10.5.tgz"; path = fetchurl { - name = "app_builder_lib___app_builder_lib_22.10.4.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.10.4.tgz"; - sha1 = "3fc70821b76beb9c8279d9de22960ef2174da153"; + name = "app_builder_lib___app_builder_lib_22.10.5.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.10.5.tgz"; + sha1 = "24a88581c891e5b187a0d569aa44e7c4a0dc8de2"; }; } { @@ -930,11 +978,11 @@ }; } { - name = "archiver___archiver_5.2.0.tgz"; + name = "archiver___archiver_5.3.0.tgz"; path = fetchurl { - name = "archiver___archiver_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/archiver/-/archiver-5.2.0.tgz"; - sha1 = "25aa1b3d9febf7aec5b0f296e77e69960c26db94"; + name = "archiver___archiver_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/archiver/-/archiver-5.3.0.tgz"; + sha1 = "dd3e097624481741df626267564f7dd8640a45ba"; }; } { @@ -945,6 +993,14 @@ sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; }; } + { + name = "argparse___argparse_2.0.1.tgz"; + path = fetchurl { + name = "argparse___argparse_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; + sha1 = "246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"; + }; + } { name = "arr_diff___arr_diff_4.0.0.tgz"; path = fetchurl { @@ -1009,6 +1065,14 @@ sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; } + { + name = "ast_metadata_inferer___ast_metadata_inferer_0.4.0.tgz"; + path = fetchurl { + name = "ast_metadata_inferer___ast_metadata_inferer_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/ast-metadata-inferer/-/ast-metadata-inferer-0.4.0.tgz"; + sha1 = "6be85ceeffcf267bd79db8e1ae731da44880b45f"; + }; + } { name = "astral_regex___astral_regex_2.0.0.tgz"; path = fetchurl { @@ -1122,11 +1186,11 @@ }; } { - name = "balanced_match___balanced_match_1.0.0.tgz"; + name = "balanced_match___balanced_match_1.0.2.tgz"; path = fetchurl { - name = "balanced_match___balanced_match_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + name = "balanced_match___balanced_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; + sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; }; } { @@ -1153,6 +1217,14 @@ sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; } + { + name = "binaryextensions___binaryextensions_4.15.0.tgz"; + path = fetchurl { + name = "binaryextensions___binaryextensions_4.15.0.tgz"; + url = "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-4.15.0.tgz"; + sha1 = "c63a502e0078ff1b0e9b00a9f74d3c2b0f8bd32e"; + }; + } { name = "bl___bl_4.1.0.tgz"; path = fetchurl { @@ -1178,19 +1250,19 @@ }; } { - name = "boolean___boolean_3.0.2.tgz"; + name = "boolean___boolean_3.0.3.tgz"; path = fetchurl { - name = "boolean___boolean_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/boolean/-/boolean-3.0.2.tgz"; - sha1 = "df1baa18b6a2b0e70840475e1d93ec8fe75b2570"; + name = "boolean___boolean_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/boolean/-/boolean-3.0.3.tgz"; + sha1 = "0fee0c9813b66bef25a8a6a904bb46736d05f024"; }; } { - name = "boxen___boxen_5.0.0.tgz"; + name = "boxen___boxen_5.0.1.tgz"; path = fetchurl { - name = "boxen___boxen_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/boxen/-/boxen-5.0.0.tgz"; - sha1 = "64fe9b16066af815f51057adcc800c3730120854"; + name = "boxen___boxen_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/boxen/-/boxen-5.0.1.tgz"; + sha1 = "657528bdd3f59a772b8279b831f27ec2c744664b"; }; } { @@ -1225,6 +1297,14 @@ sha1 = "3c9b4b7d782c8121e56f10106d84c0d0ffc94626"; }; } + { + name = "browserslist___browserslist_4.16.6.tgz"; + path = fetchurl { + name = "browserslist___browserslist_4.16.6.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz"; + sha1 = "d7901277a5a88e554ed305b183ec9b0c08f66fa2"; + }; + } { name = "bser___bser_2.1.1.tgz"; path = fetchurl { @@ -1274,11 +1354,11 @@ }; } { - name = "builder_util___builder_util_22.10.4.tgz"; + name = "builder_util___builder_util_22.10.5.tgz"; path = fetchurl { - name = "builder_util___builder_util_22.10.4.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.10.4.tgz"; - sha1 = "54e8be83dd0dec28073d866ff087cee8e7ce6cf6"; + name = "builder_util___builder_util_22.10.5.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.10.5.tgz"; + sha1 = "8d0b04a3be6acc74938679aa90dcb3181b1ae86b"; }; } { @@ -1321,6 +1401,14 @@ sha1 = "924af881c9d525ac9d87f40d964e5cea982a1809"; }; } + { + name = "caniuse_lite___caniuse_lite_1.0.30001223.tgz"; + path = fetchurl { + name = "caniuse_lite___caniuse_lite_1.0.30001223.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz"; + sha1 = "39b49ff0bfb3ee3587000d2f66c47addc6e14443"; + }; + } { name = "capture_exit___capture_exit_2.0.0.tgz"; path = fetchurl { @@ -1346,11 +1434,11 @@ }; } { - name = "chalk___chalk_4.1.0.tgz"; + name = "chalk___chalk_4.1.1.tgz"; path = fetchurl { - name = "chalk___chalk_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz"; - sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a"; + name = "chalk___chalk_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz"; + sha1 = "c80b3fab28bf6371e6863325eee67e618b77e6ad"; }; } { @@ -1489,6 +1577,14 @@ sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; }; } + { + name = "colorette___colorette_1.2.2.tgz"; + path = fetchurl { + name = "colorette___colorette_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz"; + sha1 = "cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"; + }; + } { name = "colors___colors_1.0.3.tgz"; path = fetchurl { @@ -1530,11 +1626,11 @@ }; } { - name = "compress_commons___compress_commons_4.0.2.tgz"; + name = "compress_commons___compress_commons_4.1.0.tgz"; path = fetchurl { - name = "compress_commons___compress_commons_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.0.2.tgz"; - sha1 = "d6896be386e52f37610cef9e6fa5defc58c31bd7"; + name = "compress_commons___compress_commons_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.0.tgz"; + sha1 = "25ec7a4528852ccd1d441a7d4353cd0ece11371b"; }; } { @@ -1586,11 +1682,11 @@ }; } { - name = "core_js___core_js_3.8.3.tgz"; + name = "core_js___core_js_3.11.3.tgz"; path = fetchurl { - name = "core_js___core_js_3.8.3.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz"; - sha1 = "c21906e1f14f3689f93abcc6e26883550dd92dd0"; + name = "core_js___core_js_3.11.3.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.11.3.tgz"; + sha1 = "2835b1f4d10f6d0400bf820cfe6fe64ad067dd3f"; }; } { @@ -1673,14 +1769,6 @@ sha1 = "ff665a0ddbdc31864b09647f34163443d90b0852"; }; } - { - name = "darkreader___darkreader_4.9.27.tgz"; - path = fetchurl { - name = "darkreader___darkreader_4.9.27.tgz"; - url = "https://registry.yarnpkg.com/darkreader/-/darkreader-4.9.27.tgz"; - sha1 = "69b641d6a3c22b07fb0424406dfd9a3661b37197"; - }; - } { name = "dashdash___dashdash_1.14.1.tgz"; path = fetchurl { @@ -1834,11 +1922,11 @@ }; } { - name = "detect_node___detect_node_2.0.4.tgz"; + name = "detect_node___detect_node_2.0.5.tgz"; path = fetchurl { - name = "detect_node___detect_node_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz"; - sha1 = "014ee8f8f669c5c58023da64b8179c083a28c46c"; + name = "detect_node___detect_node_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.5.tgz"; + sha1 = "9d270aa7eaa5af0b72c4c9d9b814e7f4ce738b79"; }; } { @@ -1858,11 +1946,11 @@ }; } { - name = "dmg_builder___dmg_builder_22.10.4.tgz"; + name = "dmg_builder___dmg_builder_22.10.5.tgz"; path = fetchurl { - name = "dmg_builder___dmg_builder_22.10.4.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.10.4.tgz"; - sha1 = "8dab30754346791eb728091359558fd4a8dbb45f"; + name = "dmg_builder___dmg_builder_22.10.5.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.10.5.tgz"; + sha1 = "65a33c106ead5a350c7de8997c546559bd6e0e7c"; }; } { @@ -1906,11 +1994,11 @@ }; } { - name = "dotenv___dotenv_8.2.0.tgz"; + name = "dotenv___dotenv_8.6.0.tgz"; path = fetchurl { - name = "dotenv___dotenv_8.2.0.tgz"; - url = "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz"; - sha1 = "97e619259ada750eea3e4ea3e26bceea5424b16a"; + name = "dotenv___dotenv_8.6.0.tgz"; + url = "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz"; + sha1 = "061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"; }; } { @@ -1929,6 +2017,14 @@ sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; } + { + name = "editions___editions_6.1.0.tgz"; + path = fetchurl { + name = "editions___editions_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/editions/-/editions-6.1.0.tgz"; + sha1 = "ba6c6cf9f4bb571d9e53ea34e771a602e5a66549"; + }; + } { name = "ejs___ejs_3.1.6.tgz"; path = fetchurl { @@ -1938,27 +2034,35 @@ }; } { - name = "electron_builder___electron_builder_22.10.4.tgz"; + name = "electron_builder___electron_builder_22.10.5.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_22.10.4.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.10.4.tgz"; - sha1 = "e1f400cf41ebb632fbf79aa86c5e0ab1ea1ed7e5"; + name = "electron_builder___electron_builder_22.10.5.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.10.5.tgz"; + sha1 = "03b156b93e6012609027c3aaa69201a3ad21e454"; }; } { - name = "electron_publish___electron_publish_22.10.4.tgz"; + name = "electron_publish___electron_publish_22.10.5.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_22.10.4.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.10.4.tgz"; - sha1 = "944b00aa6a7746c31ce900ffd8106d243326dca8"; + name = "electron_publish___electron_publish_22.10.5.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.10.5.tgz"; + sha1 = "9cbe46266b6c79d8c6e99840755682e2262d3543"; }; } { - name = "electron___electron_11.2.3.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.727.tgz"; path = fetchurl { - name = "electron___electron_11.2.3.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-11.2.3.tgz"; - sha1 = "8ad1d9858436cfca0e2e5ea7fea326794ae58ebb"; + name = "electron_to_chromium___electron_to_chromium_1.3.727.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz"; + sha1 = "857e310ca00f0b75da4e1db6ff0e073cc4a91ddf"; + }; + } + { + name = "electron___electron_12.0.5.tgz"; + path = fetchurl { + name = "electron___electron_12.0.5.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-12.0.5.tgz"; + sha1 = "005cf4375d2ee4563f5e75dc4da4ef871846a8be"; }; } { @@ -2010,11 +2114,19 @@ }; } { - name = "env_paths___env_paths_2.2.0.tgz"; + name = "env_paths___env_paths_2.2.1.tgz"; path = fetchurl { - name = "env_paths___env_paths_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz"; - sha1 = "cdca557dc009152917d6166e2febe1f039685e43"; + name = "env_paths___env_paths_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz"; + sha1 = "420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"; + }; + } + { + name = "errlop___errlop_4.1.0.tgz"; + path = fetchurl { + name = "errlop___errlop_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/errlop/-/errlop-4.1.0.tgz"; + sha1 = "8e7b8f4f1bf0a6feafce4d14f0c0cf4bf5ef036b"; }; } { @@ -2074,11 +2186,19 @@ }; } { - name = "escodegen___escodegen_1.14.3.tgz"; + name = "escodegen___escodegen_2.0.0.tgz"; path = fetchurl { - name = "escodegen___escodegen_1.14.3.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz"; - sha1 = "4e7b81fba61581dc97582ed78cab7f0e8d63f503"; + name = "escodegen___escodegen_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz"; + sha1 = "5e32b12833e8aa8fa35e1bf0befa89380484c7dd"; + }; + } + { + name = "eslint_plugin_compat___eslint_plugin_compat_3.9.0.tgz"; + path = fetchurl { + name = "eslint_plugin_compat___eslint_plugin_compat_3.9.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-compat/-/eslint-plugin-compat-3.9.0.tgz"; + sha1 = "a7a224e09b102b58e7f7dff52c936428ff3e0186"; }; } { @@ -2106,19 +2226,19 @@ }; } { - name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; - sha1 = "21fdc8fbcd9c795cc0321f0563702095751511a8"; + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; + sha1 = "f65328259305927392c938ed44eb0a5c9b2bd303"; }; } { - name = "eslint___eslint_7.20.0.tgz"; + name = "eslint___eslint_7.25.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.20.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.20.0.tgz"; - sha1 = "db07c4ca4eda2e2316e7aa57ac7fc91ec550bdc7"; + name = "eslint___eslint_7.25.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz"; + sha1 = "1309e4404d94e676e3e831b3a3ad2b050031eb67"; }; } { @@ -2178,11 +2298,11 @@ }; } { - name = "exec_sh___exec_sh_0.3.4.tgz"; + name = "exec_sh___exec_sh_0.3.6.tgz"; path = fetchurl { - name = "exec_sh___exec_sh_0.3.4.tgz"; - url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz"; - sha1 = "3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"; + name = "exec_sh___exec_sh_0.3.6.tgz"; + url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz"; + sha1 = "ff264f9e325519a60cb5e273692943483cca63bc"; }; } { @@ -2313,6 +2433,14 @@ sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; } + { + name = "fast_xml_parser___fast_xml_parser_3.19.0.tgz"; + path = fetchurl { + name = "fast_xml_parser___fast_xml_parser_3.19.0.tgz"; + url = "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz"; + sha1 = "cb637ec3f3999f51406dd8ff0e6fc4d83e520d01"; + }; + } { name = "fb_watchman___fb_watchman_2.0.1.tgz"; path = fetchurl { @@ -2330,11 +2458,11 @@ }; } { - name = "file_entry_cache___file_entry_cache_6.0.0.tgz"; + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; path = fetchurl { - name = "file_entry_cache___file_entry_cache_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz"; - sha1 = "7921a89c391c6d93efec2169ac6bf300c527ea0a"; + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha1 = "211b2dd9659cb0394b073e7323ac3c933d522027"; }; } { @@ -2530,11 +2658,11 @@ }; } { - name = "glob_parent___glob_parent_5.1.1.tgz"; + name = "glob_parent___glob_parent_5.1.2.tgz"; path = fetchurl { - name = "glob_parent___glob_parent_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz"; - sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229"; + name = "glob_parent___glob_parent_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; + sha1 = "869832c58034fe68a4093c17dc15e8340d8401c4"; }; } { @@ -2546,11 +2674,11 @@ }; } { - name = "global_agent___global_agent_2.1.12.tgz"; + name = "global_agent___global_agent_2.2.0.tgz"; path = fetchurl { - name = "global_agent___global_agent_2.1.12.tgz"; - url = "https://registry.yarnpkg.com/global-agent/-/global-agent-2.1.12.tgz"; - sha1 = "e4ae3812b731a9e81cbf825f9377ef450a8e4195"; + name = "global_agent___global_agent_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/global-agent/-/global-agent-2.2.0.tgz"; + sha1 = "566331b0646e6bf79429a16877685c4a1fbf76dc"; }; } { @@ -2586,11 +2714,19 @@ }; } { - name = "globalthis___globalthis_1.0.1.tgz"; + name = "globals___globals_13.8.0.tgz"; path = fetchurl { - name = "globalthis___globalthis_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.1.tgz"; - sha1 = "40116f5d9c071f9e8fb0037654df1ab3a83b7ef9"; + name = "globals___globals_13.8.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz"; + sha1 = "3e20f504810ce87a8d72e55aecf8435b50f4c1b3"; + }; + } + { + name = "globalthis___globalthis_1.0.2.tgz"; + path = fetchurl { + name = "globalthis___globalthis_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz"; + sha1 = "2a235d34f4d8036219f7e34929b5de9e18166b8b"; }; } { @@ -2706,11 +2842,11 @@ }; } { - name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; + name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; - sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488"; + name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; + sha1 = "dffc0bf9a21c02209090f2aa69429e1414daf3f9"; }; } { @@ -2722,11 +2858,11 @@ }; } { - name = "html_comment_regex___html_comment_regex_1.1.2.tgz"; + name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; path = fetchurl { - name = "html_comment_regex___html_comment_regex_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz"; - sha1 = "97d4688aeb5c81886a364faa0cad1dda14d433a7"; + name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz"; + sha1 = "5e425507eede4fea846b7262f0838456c4209961"; }; } { @@ -2873,14 +3009,6 @@ sha1 = "a29da425b48806f34767a4efce397269af28432c"; }; } - { - name = "ip_regex___ip_regex_2.1.0.tgz"; - path = fetchurl { - name = "ip_regex___ip_regex_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz"; - sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; - }; - } { name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; path = fetchurl { @@ -2922,11 +3050,11 @@ }; } { - name = "is_core_module___is_core_module_2.2.0.tgz"; + name = "is_core_module___is_core_module_2.3.0.tgz"; path = fetchurl { - name = "is_core_module___is_core_module_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz"; - sha1 = "97037ef3d52224d85163f5597b2b63d9afed981a"; + name = "is_core_module___is_core_module_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz"; + sha1 = "d341652e3408bca69c4671b79a0954a3d349f887"; }; } { @@ -2962,11 +3090,11 @@ }; } { - name = "is_docker___is_docker_2.1.1.tgz"; + name = "is_docker___is_docker_2.2.1.tgz"; path = fetchurl { - name = "is_docker___is_docker_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz"; - sha1 = "4125a88e44e450d384e09047ede71adc2d144156"; + name = "is_docker___is_docker_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz"; + sha1 = "33eeabe23cfe86f14bde4408a02c0cfb853acdaa"; }; } { @@ -3066,11 +3194,11 @@ }; } { - name = "is_path_inside___is_path_inside_3.0.2.tgz"; + name = "is_path_inside___is_path_inside_3.0.3.tgz"; path = fetchurl { - name = "is_path_inside___is_path_inside_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz"; - sha1 = "f5220fc82a3e233757291dddc9c5877f2a1f3017"; + name = "is_path_inside___is_path_inside_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz"; + sha1 = "d231362e53a07ff2b0e0ea7fed049161ffd16283"; }; } { @@ -3082,11 +3210,11 @@ }; } { - name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz"; + name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.1.tgz"; path = fetchurl { - name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz"; - sha1 = "0c52e54bcca391bb2c494b21e8626d7336c6e397"; + name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz"; + sha1 = "171ed6f19e3ac554394edf78caa05784a45bebb5"; }; } { @@ -3106,11 +3234,11 @@ }; } { - name = "is_svg___is_svg_4.2.1.tgz"; + name = "is_svg___is_svg_4.3.1.tgz"; path = fetchurl { - name = "is_svg___is_svg_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/is-svg/-/is-svg-4.2.1.tgz"; - sha1 = "095b496e345fec9211c2a7d5d021003e040d6f81"; + name = "is_svg___is_svg_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/is-svg/-/is-svg-4.3.1.tgz"; + sha1 = "8c63ec8c67c8c7f0a8de0a71c8c7d58eccf4406b"; }; } { @@ -3153,14 +3281,6 @@ sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; } - { - name = "isbinaryfile___isbinaryfile_4.0.6.tgz"; - path = fetchurl { - name = "isbinaryfile___isbinaryfile_4.0.6.tgz"; - url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz"; - sha1 = "edcb62b224e2b4710830b67498c8e4e5a4d2610b"; - }; - } { name = "isexe___isexe_2.0.0.tgz"; path = fetchurl { @@ -3233,6 +3353,14 @@ sha1 = "d593210e5000683750cb09fc0644e4b6e27fd53b"; }; } + { + name = "istextorbinary___istextorbinary_5.12.0.tgz"; + path = fetchurl { + name = "istextorbinary___istextorbinary_5.12.0.tgz"; + url = "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-5.12.0.tgz"; + sha1 = "2f84777838668fdf524c305a2363d6057aaeec84"; + }; + } { name = "jake___jake_10.8.2.tgz"; path = fetchurl { @@ -3481,6 +3609,14 @@ sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; }; } + { + name = "js_yaml___js_yaml_4.1.0.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz"; + sha1 = "c1fb65f8f5017901cdd2c951864ba18458a10602"; + }; + } { name = "jsbn___jsbn_0.1.1.tgz"; path = fetchurl { @@ -3490,11 +3626,11 @@ }; } { - name = "jsdom___jsdom_16.4.0.tgz"; + name = "jsdom___jsdom_16.5.3.tgz"; path = fetchurl { - name = "jsdom___jsdom_16.4.0.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz"; - sha1 = "36005bde2d136f73eee1a830c6d45e55408edddb"; + name = "jsdom___jsdom_16.5.3.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.3.tgz"; + sha1 = "13a755b3950eb938b4482c407238ddf16f0d2136"; }; } { @@ -3705,6 +3841,14 @@ sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; }; } + { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + path = fetchurl { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + }; + } { name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; path = fetchurl { @@ -3738,11 +3882,19 @@ }; } { - name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; + name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; path = fetchurl { - name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; - sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; + name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; + sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe"; + }; + } + { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + path = fetchurl { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; + sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; }; } { @@ -3754,11 +3906,11 @@ }; } { - name = "lodash___lodash_4.17.20.tgz"; + name = "lodash___lodash_4.17.21.tgz"; path = fetchurl { - name = "lodash___lodash_4.17.20.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz"; - sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52"; + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; }; } { @@ -3842,35 +3994,35 @@ }; } { - name = "micromatch___micromatch_4.0.2.tgz"; + name = "micromatch___micromatch_4.0.4.tgz"; path = fetchurl { - name = "micromatch___micromatch_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz"; - sha1 = "4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"; + name = "micromatch___micromatch_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; + sha1 = "896d519dfe9db25fce94ceb7a500919bf881ebf9"; }; } { - name = "mime_db___mime_db_1.45.0.tgz"; + name = "mime_db___mime_db_1.47.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.45.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz"; - sha1 = "cceeda21ccd7c3a745eba2decd55d4b73e7879ea"; + name = "mime_db___mime_db_1.47.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz"; + sha1 = "8cb313e59965d3c05cfbf898915a267af46a335c"; }; } { - name = "mime_types___mime_types_2.1.28.tgz"; + name = "mime_types___mime_types_2.1.30.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.28.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz"; - sha1 = "1160c4757eab2c5363888e005273ecf79d2a0ecd"; + name = "mime_types___mime_types_2.1.30.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz"; + sha1 = "6e7be8b4c479825f85ed6326695db73f9305d62d"; }; } { - name = "mime___mime_2.5.0.tgz"; + name = "mime___mime_2.5.2.tgz"; path = fetchurl { - name = "mime___mime_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.5.0.tgz"; - sha1 = "2b4af934401779806ee98026bb42e8c1ae1876b1"; + name = "mime___mime_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz"; + sha1 = "6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"; }; } { @@ -3986,11 +4138,19 @@ }; } { - name = "node_notifier___node_notifier_8.0.1.tgz"; + name = "node_notifier___node_notifier_8.0.2.tgz"; path = fetchurl { - name = "node_notifier___node_notifier_8.0.1.tgz"; - url = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz"; - sha1 = "f86e89bbc925f2b068784b31f382afdc6ca56be1"; + name = "node_notifier___node_notifier_8.0.2.tgz"; + url = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz"; + sha1 = "f3167a38ef0d2c8a866a83e318c1ba0efeb702c5"; + }; + } + { + name = "node_releases___node_releases_1.1.71.tgz"; + path = fetchurl { + name = "node_releases___node_releases_1.1.71.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz"; + sha1 = "cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"; }; } { @@ -4002,11 +4162,11 @@ }; } { - name = "normalize_package_data___normalize_package_data_3.0.0.tgz"; + name = "normalize_package_data___normalize_package_data_3.0.2.tgz"; path = fetchurl { - name = "normalize_package_data___normalize_package_data_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.0.tgz"; - sha1 = "1f8a7c423b3d2e85eb36985eaf81de381d01301a"; + name = "normalize_package_data___normalize_package_data_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz"; + sha1 = "cae5c410ae2434f9a6c1baa65d5bc3b9366c8699"; }; } { @@ -4210,11 +4370,11 @@ }; } { - name = "parse5___parse5_5.1.1.tgz"; + name = "parse5___parse5_6.0.1.tgz"; path = fetchurl { - name = "parse5___parse5_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz"; - sha1 = "f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"; + name = "parse5___parse5_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz"; + sha1 = "e1a1c085c569b3dc08321184f19a39cc27f7c30b"; }; } { @@ -4282,11 +4442,11 @@ }; } { - name = "picomatch___picomatch_2.2.2.tgz"; + name = "picomatch___picomatch_2.2.3.tgz"; path = fetchurl { - name = "picomatch___picomatch_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz"; - sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad"; + name = "picomatch___picomatch_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz"; + sha1 = "465547f359ccc206d3c48e46a1bcb89bf7ee619d"; }; } { @@ -4314,11 +4474,11 @@ }; } { - name = "plist___plist_3.0.1.tgz"; + name = "plist___plist_3.0.2.tgz"; path = fetchurl { - name = "plist___plist_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz"; - sha1 = "a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c"; + name = "plist___plist_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/plist/-/plist-3.0.2.tgz"; + sha1 = "74bbf011124b90421c22d15779cee60060ba95bc"; }; } { @@ -4386,11 +4546,11 @@ }; } { - name = "prompts___prompts_2.4.0.tgz"; + name = "prompts___prompts_2.4.1.tgz"; path = fetchurl { - name = "prompts___prompts_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz"; - sha1 = "4aa5de0723a231d1ee9121c40fdf663df73f61d7"; + name = "prompts___prompts_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz"; + sha1 = "befd3b1195ba052f9fd2fde8a486c4e82ee77f61"; }; } { @@ -4450,11 +4610,11 @@ }; } { - name = "react_is___react_is_17.0.1.tgz"; + name = "react_is___react_is_17.0.2.tgz"; path = fetchurl { - name = "react_is___react_is_17.0.1.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz"; - sha1 = "5b3531bd76a645a4c9fb6e693ed36419e3301339"; + name = "react_is___react_is_17.0.2.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz"; + sha1 = "e691d4a8e9c789365655539ab372762b0efb54f0"; }; } { @@ -4546,11 +4706,11 @@ }; } { - name = "repeat_element___repeat_element_1.1.3.tgz"; + name = "repeat_element___repeat_element_1.1.4.tgz"; path = fetchurl { - name = "repeat_element___repeat_element_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz"; - sha1 = "782e0d825c0c5a3bb39731f84efee6b742e6b1ce"; + name = "repeat_element___repeat_element_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz"; + sha1 = "be681520847ab58c7568ac75fbfad28ed42d39e9"; }; } { @@ -4777,6 +4937,14 @@ sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; }; } + { + name = "semver___semver_7.3.2.tgz"; + path = fetchurl { + name = "semver___semver_7.3.2.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz"; + sha1 = "604962b052b81ed0786aae84389ffba70ffd3938"; + }; + } { name = "semver___semver_6.3.0.tgz"; path = fetchurl { @@ -4786,11 +4954,11 @@ }; } { - name = "semver___semver_7.3.4.tgz"; + name = "semver___semver_7.3.5.tgz"; path = fetchurl { - name = "semver___semver_7.3.4.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz"; - sha1 = "27aaa7d2e4ca76452f98d3add093a72c943edc97"; + name = "semver___semver_7.3.5.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; + sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; }; } { @@ -5074,11 +5242,11 @@ }; } { - name = "string_length___string_length_4.0.1.tgz"; + name = "string_length___string_length_4.0.2.tgz"; path = fetchurl { - name = "string_length___string_length_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz"; - sha1 = "4a973bf31ef77c4edbceadd6af2611996985f8a1"; + name = "string_length___string_length_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz"; + sha1 = "a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"; }; } { @@ -5098,11 +5266,11 @@ }; } { - name = "string_width___string_width_4.2.0.tgz"; + name = "string_width___string_width_4.2.2.tgz"; path = fetchurl { - name = "string_width___string_width_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz"; - sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; + name = "string_width___string_width_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz"; + sha1 = "dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"; }; } { @@ -5210,11 +5378,11 @@ }; } { - name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz"; + name = "supports_hyperlinks___supports_hyperlinks_2.2.0.tgz"; path = fetchurl { - name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz"; - sha1 = "f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"; + name = "supports_hyperlinks___supports_hyperlinks_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz"; + sha1 = "4f77b42488765891774b70c79babd87f9bd594bb"; }; } { @@ -5226,11 +5394,11 @@ }; } { - name = "table___table_6.0.7.tgz"; + name = "table___table_6.6.0.tgz"; path = fetchurl { - name = "table___table_6.0.7.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz"; - sha1 = "e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34"; + name = "table___table_6.6.0.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz"; + sha1 = "905654b79df98d9e9a973de1dd58682532c40e8e"; }; } { @@ -5273,6 +5441,14 @@ sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; }; } + { + name = "textextensions___textextensions_5.12.0.tgz"; + path = fetchurl { + name = "textextensions___textextensions_5.12.0.tgz"; + url = "https://registry.yarnpkg.com/textextensions/-/textextensions-5.12.0.tgz"; + sha1 = "b908120b5c1bd4bb9eba41423d75b176011ab68a"; + }; + } { name = "throat___throat_5.0.0.tgz"; path = fetchurl { @@ -5282,19 +5458,19 @@ }; } { - name = "tldts_core___tldts_core_5.7.6.tgz"; + name = "tldts_core___tldts_core_5.7.33.tgz"; path = fetchurl { - name = "tldts_core___tldts_core_5.7.6.tgz"; - url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.6.tgz"; - sha1 = "af99b4ab79761dfa6c44d1d61a3f76bb5c3def8b"; + name = "tldts_core___tldts_core_5.7.33.tgz"; + url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.33.tgz"; + sha1 = "b2364f30d16e34b48961911408e9dbe3ae94ebdb"; }; } { - name = "tldts_experimental___tldts_experimental_5.7.6.tgz"; + name = "tldts_experimental___tldts_experimental_5.7.33.tgz"; path = fetchurl { - name = "tldts_experimental___tldts_experimental_5.7.6.tgz"; - url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.6.tgz"; - sha1 = "10c255872af89ab68659c3a345c7a65015920024"; + name = "tldts_experimental___tldts_experimental_5.7.33.tgz"; + url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.33.tgz"; + sha1 = "4959da5cd345a6167c69815fb6e34471387178b9"; }; } { @@ -5362,11 +5538,11 @@ }; } { - name = "tough_cookie___tough_cookie_3.0.1.tgz"; + name = "tough_cookie___tough_cookie_4.0.0.tgz"; path = fetchurl { - name = "tough_cookie___tough_cookie_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz"; - sha1 = "9df4f57e739c26930a018184887f4adb7dca73b2"; + name = "tough_cookie___tough_cookie_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz"; + sha1 = "d822234eeca882f991f0f908824ad2622ddbece4"; }; } { @@ -5433,14 +5609,6 @@ sha1 = "7646fb5f18871cfbb7749e69bd39a6388eb7450c"; }; } - { - name = "type_fest___type_fest_0.11.0.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.11.0.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz"; - sha1 = "97abf0872310fed88a5c466b25681576145e33f1"; - }; - } { name = "type_fest___type_fest_0.13.1.tgz"; path = fetchurl { @@ -5457,6 +5625,14 @@ sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4"; }; } + { + name = "type_fest___type_fest_0.21.3.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.21.3.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz"; + sha1 = "d260a24b0198436e133fa26a524a6d65fa3b2e37"; + }; + } { name = "type_fest___type_fest_0.6.0.tgz"; path = fetchurl { @@ -5602,19 +5778,19 @@ }; } { - name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; path = fetchurl { - name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; - sha1 = "9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"; + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha1 = "2de19618c66dc247dcfb6f99338035d8245a2cee"; }; } { - name = "v8_to_istanbul___v8_to_istanbul_7.1.0.tgz"; + name = "v8_to_istanbul___v8_to_istanbul_7.1.2.tgz"; path = fetchurl { - name = "v8_to_istanbul___v8_to_istanbul_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz"; - sha1 = "5b95cef45c0f83217ec79f8fc7ee1c8b486aee07"; + name = "v8_to_istanbul___v8_to_istanbul_7.1.2.tgz"; + url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz"; + sha1 = "30898d1a7fa0c84d225a2c1434fb958f290883c1"; }; } { @@ -5633,6 +5809,22 @@ sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; } + { + name = "version_compare___version_compare_1.1.0.tgz"; + path = fetchurl { + name = "version_compare___version_compare_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/version-compare/-/version-compare-1.1.0.tgz"; + sha1 = "7b3e67e7e6cec5c72d9c9e586f8854e419ade17c"; + }; + } + { + name = "version_range___version_range_1.1.0.tgz"; + path = fetchurl { + name = "version_range___version_range_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/version-range/-/version-range-1.1.0.tgz"; + sha1 = "1c233064202ee742afc9d56e21da3b2e15260acf"; + }; + } { name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; path = fetchurl { @@ -5690,11 +5882,11 @@ }; } { - name = "whatwg_url___whatwg_url_8.4.0.tgz"; + name = "whatwg_url___whatwg_url_8.5.0.tgz"; path = fetchurl { - name = "whatwg_url___whatwg_url_8.4.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz"; - sha1 = "50fb9615b05469591d2b2bd6dfaed2942ed72837"; + name = "whatwg_url___whatwg_url_8.5.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz"; + sha1 = "7752b8464fc0903fec89aa9846fc9efe07351fd3"; }; } { @@ -5770,11 +5962,11 @@ }; } { - name = "ws___ws_7.4.3.tgz"; + name = "ws___ws_7.4.5.tgz"; path = fetchurl { - name = "ws___ws_7.4.3.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.4.3.tgz"; - sha1 = "1f9643de34a543b8edb124bdcbc457ae55a6e5cd"; + name = "ws___ws_7.4.5.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz"; + sha1 = "a484dd851e9beb6fdb420027e3885e8ce48986c1"; }; } { @@ -5818,27 +6010,27 @@ }; } { - name = "xmldom___xmldom_0.1.31.tgz"; + name = "xmldom___xmldom_0.5.0.tgz"; path = fetchurl { - name = "xmldom___xmldom_0.1.31.tgz"; - url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz"; - sha1 = "b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"; + name = "xmldom___xmldom_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz"; + sha1 = "193cb96b84aa3486127ea6272c4596354cb4962e"; }; } { - name = "y18n___y18n_4.0.1.tgz"; + name = "y18n___y18n_4.0.3.tgz"; path = fetchurl { - name = "y18n___y18n_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz"; - sha1 = "8db2b83c31c5d75099bb890b23f3094891e247d4"; + name = "y18n___y18n_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz"; + sha1 = "b5f259c82cd6e336921efd7bfd8bf560de9eeedf"; }; } { - name = "y18n___y18n_5.0.5.tgz"; + name = "y18n___y18n_5.0.8.tgz"; path = fetchurl { - name = "y18n___y18n_5.0.5.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz"; - sha1 = "8769ec08d03b1ea2df2500acef561743bbb9ab18"; + name = "y18n___y18n_5.0.8.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; + sha1 = "7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"; }; } { @@ -5858,11 +6050,11 @@ }; } { - name = "yargs_parser___yargs_parser_20.2.4.tgz"; + name = "yargs_parser___yargs_parser_20.2.7.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_20.2.4.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz"; - sha1 = "b42890f14566796f85ae8e3a25290d205f154a54"; + name = "yargs_parser___yargs_parser_20.2.7.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz"; + sha1 = "61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"; }; } { @@ -5890,11 +6082,11 @@ }; } { - name = "zip_stream___zip_stream_4.0.4.tgz"; + name = "zip_stream___zip_stream_4.1.0.tgz"; path = fetchurl { - name = "zip_stream___zip_stream_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.0.4.tgz"; - sha1 = "3a8f100b73afaa7d1ae9338d910b321dec77ff3a"; + name = "zip_stream___zip_stream_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.1.0.tgz"; + sha1 = "51dd326571544e36aa3f756430b313576dc8fc79"; }; } ]; diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index 8937404e91d..d17dd059c81 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -17,6 +17,7 @@ , desktop-file-utils , appstream-glib , libpeas +, libgdata , dbus , vala , wrapGAppsHook @@ -65,6 +66,7 @@ stdenv.mkDerivation rec { callaudiod gtk3 libpeas + libgdata # required by some dependency transitively ]; checkInputs = [ diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 4fda7db9f19..d9740c759a1 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.18.0"; in +let version = "0.19.0"; in buildGoPackage { pname = "kubecfg"; @@ -10,7 +10,7 @@ buildGoPackage { owner = "bitnami"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "sha256-TJbuJZDj9ZwEaN8LV/M30+5+IgN8EZCTTBBDB0OgdEE="; + sha256 = "sha256-G3yLpo/6hv6t3i6b/KMgoZqltyGDddg/SsNPF8hNeUg="; }; goPackagePath = "github.com/bitnami/kubecfg"; diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/applications/networking/cluster/lens/default.nix index a4dac9dd624..e6af0146ca5 100644 --- a/pkgs/applications/networking/cluster/lens/default.nix +++ b/pkgs/applications/networking/cluster/lens/default.nix @@ -2,12 +2,12 @@ let pname = "lens"; - version = "4.2.0"; + version = "4.2.4"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lensapp/lens/releases/download/v${version}/Lens-${version}.x86_64.AppImage"; - sha256 = "0g60d1h2dn41qdzdnqavwknqynjqil7s8kcqy01h021r81rdpn2q"; + sha256 = "0fzhv8brwwl1ihx6jqq4pi77489hr6f9hpppqq3n8d2imjsqgvlw"; name="${pname}.AppImage"; }; diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 357424cdddf..70dfdf4e767 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-It/p2Hk4/fkYgHTPynf7p7zs4ajjo0Fv3yTzhrWUusE="; + sha256 = "sha256-Lu1LJ57jF4lMIfQn/zyT2cc/mkc3RPPlu4gI7qv8blI="; }; - vendorSha256 = "sha256-Vg6SHyQkeUvd2hT0JV32y+F0t/qb81MrgOFcr785a8M="; + vendorSha256 = "sha256-fEzA/+iKye8lzH4JoXLPqnwjrXPPNuL8gPPbkYJ1glw="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 754dac6a936..3b55c99b263 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -164,9 +164,9 @@ in rec { }); terraform_0_15 = pluggable (generic { - version = "0.15.1"; - sha256 = "02bqg05wsqld9xybvg7swvmympq5bggkw8vcq91z6vkpawm8z3kg"; - vendorSha256 = "1lnz6b2kjilidvs4flx9vj5j6dxliqdxni96fn2537nqaz4hc7l2"; + version = "0.15.3"; + sha256 = "12dny8f89ry75ljarhdqlwgzv6py75s1wcmb62n5fp9nk03bjf2p"; + vendorSha256 = "13ap1arn81lcxry08j42ck6lgvdcvdxgah6d40pmpkzkw9jcf55b"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/gopher/sacc/default.nix b/pkgs/applications/networking/gopher/sacc/default.nix index 046ae42ebcb..4d18f6a4f4a 100644 --- a/pkgs/applications/networking/gopher/sacc/default.nix +++ b/pkgs/applications/networking/gopher/sacc/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; + CFLAGS = lib.optionals stdenv.isDarwin [ + "-D_DARWIN_C_SOURCE" + ]; + postPatch = '' substituteInPlace config.mk \ --replace curses ncurses \ diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index eef24f75f15..c78141f6eb2 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -20,11 +20,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.2.2"; + version = "1.3.2"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - sha256 = "1gfcp3b5nq43xxz5my8vfhfxnnli726j3hzcgwh9fzrzzd9ic3gx"; + sha256 = "1vjzv8zg9s393xw81klcgbkn4h6j2blzla9iil5kqfrw7wmldskh"; }; buildInputs = [ @@ -55,6 +55,9 @@ python3.pkgs.buildPythonApplication rec { checkInputs = [ xvfb_run dbus.daemon ]; checkPhase = '' + # https://dev.gajim.org/gajim/gajim/-/issues/10478 + rm test/lib/gajim_mocks.py test/unit/test_gui_interface.py + xvfb-run dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ ${python3.interpreter} setup.py test diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix new file mode 100644 index 00000000000..84b6f7ecb37 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -0,0 +1,41 @@ +{ lib +, mkDerivation +, fetchFromSourcehut +, cmake +, extra-cmake-modules +, pkg-config +, kirigami2 +, libdeltachat +, qtmultimedia +}: + +mkDerivation rec { + pname = "kdeltachat"; + version = "unstable-2021-05-03"; + + src = fetchFromSourcehut { + owner = "~link2xt"; + repo = "kdeltachat"; + rev = "dd7455764074c0864234a6a25ab6f87e8d5c3121"; + sha256 = "1vsy2jcisvf9mndxlwif3ghv1n2gz5ycr1qh72kgski38qan621v"; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + ]; + + buildInputs = [ + kirigami2 + libdeltachat + qtmultimedia + ]; + + meta = with lib; { + description = "Delta Chat client using Kirigami framework"; + homepage = "https://git.sr.ht/~link2xt/kdeltachat"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix index 468d7f64c4c..fa314e82dac 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pidgin, intltool, libxml2, gmime, nss }: +{ lib, stdenv, fetchurl, fetchpatch, pidgin, intltool, libxml2, gmime, nss }: stdenv.mkDerivation rec { pname = "pidgin-sipe"; @@ -9,6 +9,20 @@ stdenv.mkDerivation rec { sha256 = "0262sz00iqxylx0xfyr48xikhiqzr8pg7b4b7vwj5iv4qxpxv939"; }; + patches = [ + # add sipe_utils_memdup() function + (fetchpatch { + url = "https://repo.or.cz/siplcs.git/patch/567d0ddc0692adfef5f15d0d383825a9b2ea4b49"; + sha256 = "24L8ZfoOGc3JoTCGxuTNjuHzt5QgFDu1+vSoJpGvde4="; + }) + # replace g_memdup() with sipe_utils_memdup() + # g_memdup is deprecatein newer Glib + (fetchpatch { + url = "https://repo.or.cz/siplcs.git/patch/583a734e63833f03d11798b7b0d59a17d08ae60f"; + sha256 = "Ai6Czpy/FYvBi4GZR7yzch6OcouJgfreI9HcojhGVV4="; + }) + ]; + nativeBuildInputs = [ intltool ]; buildInputs = [ pidgin gmime libxml2 nss ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index edbc28f793b..dc5a8739760 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -76,8 +76,11 @@ let unwrapped = stdenv.mkDerivation rec { doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; # In particular, this detects missing python imports in some of the tools. - postInstallCheck = '' - for f in "''${!outputBin}"/bin/{purple-remote,pidgin}; do + postFixup = let + # TODO: python is a script, so it doesn't work as interpreter on darwin + binsToTest = lib.optionalString stdenv.isLinux "purple-remote," + "pidgin,finch"; + in lib.optionalString doInstallCheck '' + for f in "''${!outputBin}"/bin/{${binsToTest}}; do echo "Testing: $f --help" "$f" --help done diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 3471795b435..3bf5b5075c6 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.38.3"; + version = "3.40.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1s2jpviliazmhnpkh8dc57ga3c3612f2rnc0nfya5ndbi6lpzxhi"; + sha256 = "1kgxdacqqcq8yfkij6vyqlk5r4yqvw7gh7mxqii670hrn1mb2s50"; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; @@ -19,23 +19,17 @@ stdenv.mkDerivation rec { libmspack ]; - # Building with libmspack as reccommended: https://wiki.gnome.org/Apps/Evolution/Building#Build_evolution-ews cmakeFlags = [ + # Building with libmspack as recommended: https://wiki.gnome.org/Apps/Evolution/Building#Build_evolution-ews "-DWITH_MSPACK=ON" + # don't try to install into ${evolution} + "-DFORCE_INSTALL_PREFIX=ON" ]; - PKG_CONFIG_EVOLUTION_SHELL_3_0_ERRORDIR = "${placeholder "out"}/share/evolution/errors"; - PKG_CONFIG_EVOLUTION_SHELL_3_0_PRIVLIBDIR = "${placeholder "out"}/lib/evolution"; - PKG_CONFIG_CAMEL_1_2_CAMEL_PROVIDERDIR = "${placeholder "out"}/lib/evolution-data-server/camel-providers"; - PKG_CONFIG_LIBEDATA_BOOK_1_2_BACKENDDIR = "${placeholder "out"}/lib/evolution-data-server/addressbook-backends"; - PKG_CONFIG_LIBEDATA_CAL_2_0_BACKENDDIR = "${placeholder "out"}/lib/evolution-data-server/calendar-backends"; - PKG_CONFIG_LIBEBACKEND_1_2_MODULEDIR = "${placeholder "out"}/lib/evolution-data-server/registry-modules"; - PKG_CONFIG_EVOLUTION_SHELL_3_0_MODULEDIR = "${placeholder "out"}/lib/evolution/modules"; - PKG_CONFIG_EVOLUTION_DATA_SERVER_1_2_PRIVDATADIR = "${placeholder "out"}/share/evolution-data-server"; - passthru = { updateScript = gnome3.updateScript { packageName = "evolution-ews"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index e17507366ff..e703f5d7401 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.38.4"; + version = "3.40.1"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "NB+S0k4rRMJ4mwA38aiU/xZUh9qksAuA+uMTii4Fr9Q="; + sha256 = "07n4sbgsh0y9hrn52ymvy45ah65ll55gglgvqqi3h9nhkyy64y9g"; }; nativeBuildInputs = [ @@ -114,13 +114,10 @@ stdenv.mkDerivation rec { doCheck = true; - patches = [ - ./moduledir_from_env.patch - ]; - passthru = { updateScript = gnome3.updateScript { packageName = "evolution"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/moduledir_from_env.patch b/pkgs/applications/networking/mailreaders/evolution/evolution/moduledir_from_env.patch deleted file mode 100644 index 2a5edfb9a5a..00000000000 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/moduledir_from_env.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/shell/main.c b/src/shell/main.c -index 5d089225ca..030908d684 100644 ---- a/src/shell/main.c -+++ b/src/shell/main.c -@@ -407,7 +407,15 @@ create_default_shell (void) - } - - /* Load all shared library modules. */ -- module_types = e_module_load_all_in_directory (EVOLUTION_MODULEDIR); -+ const gchar *modules_directory = EVOLUTION_MODULEDIR; -+ const gchar *modules_directory_env; -+ -+ modules_directory_env = g_getenv ("EVOLUTION_MODULEDIR"); -+ if (modules_directory_env && -+ g_file_test (modules_directory_env, G_FILE_TEST_IS_DIR)) -+ modules_directory = g_strdup (modules_directory_env); -+ -+ module_types = e_module_load_all_in_directory (modules_directory); - g_list_free_full (module_types, (GDestroyNotify) g_type_module_unuse); - - flags = G_APPLICATION_HANDLES_OPEN | diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix index ea3f09b8f4c..cfbaa988c71 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix @@ -10,13 +10,7 @@ symlinkJoin { for i in $out/bin/* $out/libexec/**; do if [ ! -d $i ]; then echo wrapping $i - wrapProgram $i \ - --set LD_LIBRARY_PATH "$out/lib" \ - --set EDS_ADDRESS_BOOK_MODULES "$out/lib/evolution-data-server/addressbook-backends/" \ - --set EDS_CALENDAR_MODULES "$out/lib/evolution-data-server/calendar-backends/" \ - --set EDS_CAMEL_PROVIDER_DIR "$out/lib/evolution-data-server/camel-providers/" \ - --set EDS_REGISTRY_MODULES "$out/lib/evolution-data-server/registry-modules/" \ - --set EVOLUTION_MODULEDIR "$out/lib/evolution/modules" + wrapProgram $i --set EDS_EXTRA_PREFIXES "${lib.concatStringsSep ":" plugins}" fi done diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix index 7a453bdb64b..03a81283a65 100644 --- a/pkgs/applications/networking/mailreaders/himalaya/default.nix +++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix @@ -11,16 +11,20 @@ }: rustPlatform.buildRustPackage rec { pname = "himalaya"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "soywod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-s2QZSusJLeo4WIorSj+e1yYqWXFqTt8YF6/Tyz9fHeY="; + sha256 = "sha256:0m95gjdzh94vsbs7cdxlczk29m536acwlg4y55j7rz9cdcjfvzkj"; }; - cargoSha256 = "sha256-u9dLqr5CnrgYiDWAiW9u1zcUWmprOiq5+TfafO8M+WU="; + cargoSha256 = "sha256:0bz91vs5i3qb8rd9yfajavb4lyp24cxmxalzkg2chii4ckr8d3ph"; + + # use --lib flag to avoid test with imap server + # https://github.com/soywod/himalaya/issues/145 + cargoTestFlags = [ "--lib" ]; nativeBuildInputs = [ ] ++ lib.optionals (enableCompletions) [ installShellFiles ] diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 27c06c95d99..b5f938b264e 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "165mpivdhvhavglykwlz0hss2akxd6i6l40rgxs29mjzi52irqw1"; + sha256 = "sha256-lXaIxqUhVhmS1PLyfPn+sjnHxsAELGBhwOR0p90mzJE="; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 7badbc2b10d..c7f2aec32bd 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 = "78.10.0"; + version = "78.10.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/af/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/af/thunderbird-78.10.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "25209094ced8e435c1d2b46f78e618b302b236995454bd494ed2c74357041012"; + sha256 = "123eab708b32d19d703edc4305ef8310da70d3dea85bb679f6186c7a7df961db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/ar/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/ar/thunderbird-78.10.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "8c414c7b5f45f358918360369fb768b9c9051ef870cae22faad70c0fc9dc9ddf"; + sha256 = "013a3676da9c77bf3d39d04d31c581cf355e60dacc2b10c487e92206ee96ea12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/ast/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/ast/thunderbird-78.10.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "650309b5890f67fece320e25fc9e070b560fb37474c00f4f4e08e18ab30ef33a"; + sha256 = "65cf0de5a101e071bad16efd1f25e41129e354149392318c7b8ddf0bda8221aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/be/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/be/thunderbird-78.10.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "2cf57f5c44bf244c59d3cfb849b66ec53308aff381ce39ac16adbb53dcf11064"; + sha256 = "9b9033cdbed84dc753bf29d1434dd26cdd454f7db37542209181d437e7c8ebf2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/bg/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/bg/thunderbird-78.10.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "348b23e62abe077e14235159d829b405b9fcb003dc7230883b10ee4f10b64f33"; + sha256 = "2fd581fddb48b766c5f791241bd62ca4f4ca85127291d05546c061756df7577d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/br/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/br/thunderbird-78.10.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "7baa2d4d149ae3011cb7f9ddc3e5a3f6536f7c8ed712e3a60d7f0c92547f1c18"; + sha256 = "92c262484f24580d5bae39f1a31a1ba82e801069b2873ea055853e877b057193"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/ca/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/ca/thunderbird-78.10.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "368f1b24edae884a2c1e961f938b085478151742b161e5f9016bbb92b3e2ab13"; + sha256 = "0350f707d7a57273ab5f5738f71f58b7b91e0ff5a472896c0684292c6bfd30f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/cak/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/cak/thunderbird-78.10.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "38bb68cbe0054f6deac79ebd72ff5c9f28c9a2b9b638967da7d20442c909df2b"; + sha256 = "30b1cd9b0ca013391e51904a580b3afa6de26c459193c30cd9c812d9e265d9eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/cs/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/cs/thunderbird-78.10.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "810fa4e2e3507d419d55f16d0816a326751d2211675b3ca335b08b9e46f8a65a"; + sha256 = "e504c2d8b0ac193f3e61251133ab0986c220cf7246db1798dbe58bd68760bc96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/cy/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/cy/thunderbird-78.10.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "847867a78b1e583cca457436e57cebaf0c721121f61eb955cffc144cc255270f"; + sha256 = "f315b888b0872dab6eb3bd7911cbe3e5099ad9185aa9af455a452dbf29af771f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/da/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/da/thunderbird-78.10.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "d84a31c096f15d79b23e09f35ed2894dabc855c696b457405e2d638c52898945"; + sha256 = "895c54f8471f38f1a2effe32ba3ba13c34c4fb03ff0e62df05d4ad82f7365976"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/de/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/de/thunderbird-78.10.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "2ad8585b955c60242747daf36855d6fb77658dd2dda75cb3ff8637c8ef07bc75"; + sha256 = "9a5c84531b9dbc21c9ee8e6b1a136f69eac6f0082d5d5652c299dba62f4ac333"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/dsb/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/dsb/thunderbird-78.10.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "84ac04cd5248ef47c49927edcdf71d2e8f7cf96139888289eb4d8898b5224f71"; + sha256 = "c5c3394331c050584592fbb5aeadd50eb263dc06a1860a04e0219a93be1fb269"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/el/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/el/thunderbird-78.10.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "cf2760b5488590a76df140b7c877528bd76446187b673c82087b199e9e8f416d"; + sha256 = "4f2572854aa6b707b590cc89eb47db037e017dc10abcdd3117cc3b89f4a1ed0b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/en-CA/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/en-CA/thunderbird-78.10.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "7006ac951a834ff689f4ee1ab5a0a4e051368cb33ceaea459467536e2f22b74b"; + sha256 = "35e264330b4bd0ac78003ae7ef2636b24d6d0e88634d83d61df8eab379770795"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/en-GB/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/en-GB/thunderbird-78.10.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "e77850b2ff0b91f92ee18990715a75b7c73e226a6cdd9dec6b3fd689c3571053"; + sha256 = "a9be984f78f892a4c79734108191277d5c4cf32672942d60bfb5a239a2d693c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/en-US/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/en-US/thunderbird-78.10.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "e7f324c2e959ca3ce15dddf949927975cb06001243f3b7bd8a0e162edebf837e"; + sha256 = "0b16625e49f5f8bad3d3a01da8b2a3517ae8dbe6e6e91cac39d4f16bc7e11026"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/es-AR/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/es-AR/thunderbird-78.10.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "17be1ad2c43f72ca07ae1060566ac4730e1022d4032efbfa76b6f1beec1bc123"; + sha256 = "25998ad4b812e092d940e7cfc18feb20f631d50d3e87319906324ccc701dbac7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/es-ES/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/es-ES/thunderbird-78.10.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "697acffd0cb7b8c5948fce660528729ae31ee0baae809e4b3d759f9d42a8d7f6"; + sha256 = "0330198edcae1661a5e02c6439ca3a4a02f0edfc7315b357c8f727050054324d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/et/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/et/thunderbird-78.10.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "84789fa2e03dc312a9e6509fd8e938aa333465df8b451d7224cc86ea9059bc5b"; + sha256 = "5f85ddffa2116e7037a27cfd92dbd0ab97dbe33c82b821e02b5acedec44c1b72"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/eu/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/eu/thunderbird-78.10.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "29c7728bb5aef60f53dc914b5d6eed47bddd191198db92b79d0ef144e64c5890"; + sha256 = "00c53932fda84f5d73bc3b93f2f5ddc9c1aa9c40a1e5e6871195d5048d7106a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/fa/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/fa/thunderbird-78.10.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "5ab74aa662aa970ea406a33f05059361e317079c41b755700c44cdc778d04e43"; + sha256 = "b978d8859b2c3b9f5094ceafc4dc2b910f8df49742a37fe7415b7357bf6efb58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/fi/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/fi/thunderbird-78.10.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "578b713326dfef5e59acb1df29dd13f35f7b935ebc5221433c180431943c9424"; + sha256 = "bade37aaa4afaf883cb6d54aa4105cbfa722e1a6ec9e95841e97ee3c03466ea3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/fr/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/fr/thunderbird-78.10.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "2c43647dc70aa1f3bc15a83ec4654b6ec3c6d520d03bcb503f8672e1dba0edfe"; + sha256 = "881b2ab00ce556c2b9bd2b5f5f534e114dee48af09c3d1866a1c3291d9d2bf8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/fy-NL/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/fy-NL/thunderbird-78.10.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "a621165ce74cb20400bd104d43e4ddf196305cc7000cd524916b766662f20b23"; + sha256 = "a8018a23a21eede12a935e13216803e334ae3c0c8479869dfcb601643ed64be7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/ga-IE/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/ga-IE/thunderbird-78.10.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "5e45fb6ea542f24715d96e04d9c30b44584481115fe0d12a30e27ad2cc057faf"; + sha256 = "e51ba276a9a04a8e01cc181150af081f505327a480ce5c07ec73a3a5abaee38e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/gd/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/gd/thunderbird-78.10.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "2ccc8a5394119d98d9b3ca97128e62f18fdb8b86076ff24bca6f29ac3276dc4f"; + sha256 = "29269a33a12b97c2e1fc61c91d2bd1023fcd928e1d468a47541eef01225d6bcc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/gl/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/gl/thunderbird-78.10.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "fc84c102cab3c1b85af2beb68fcabf752c9643407b6b6322e2972d231dec9da9"; + sha256 = "6f52cfa9d62815ab734912ff1af54339fc9e1301ef7176c147c2aa671b32f826"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/he/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/he/thunderbird-78.10.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "cdda0210f15750688490ceeac10608722184ebb05e566be2c8d0dca563d708b5"; + sha256 = "9e244b035d8a029c71e974ac1c687c3a7677b647ea4640ab54e213d438785d13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/hr/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/hr/thunderbird-78.10.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "3e18a65345e29126e7fc82a8da20bb7a8a3b8bd6efdcb143c8814d940a4e42b1"; + sha256 = "948974ab152750153d8024f218c413e3a5544cc6c4ab34ba8cdc680020b2831c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/hsb/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/hsb/thunderbird-78.10.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e9b38d2a15e152210725f2422e283a84086c95edf164f33979f907180e46a568"; + sha256 = "24c89004b45ff5258ab156f61af0bba6e218a7f38bd2ba51816788684979995c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/hu/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/hu/thunderbird-78.10.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "733efd6a1eb66353e0a6dbe74f18f42cec0c7ecc01d1bea865303cba9d4067b8"; + sha256 = "f6f74ef48c55c86c8c06a785b8c9be8212ec6fd8d63e6e2f158c3b91c4ac04c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/hy-AM/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/hy-AM/thunderbird-78.10.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "8798f26cddc10d47992031e21b785e115c46413d36b8b4e518649adaeb3b47ee"; + sha256 = "65cb2d13740ec0b46cd61292c065c76f82bb178f2ff016c7033c318bd72d5e66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/id/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/id/thunderbird-78.10.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "3cb73a2f9ee07cbbf13d562e988410cd644e5e5b87172c960463210bb9651be6"; + sha256 = "d6a717a463ac5c46f4f094355e4eaff4068c9dcc05af2e2cbac2ebb33eb55643"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/is/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/is/thunderbird-78.10.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "3d3bc8d8c12d213635404e559d3b477435fe632ad3e69ea7060a03f30d31b86d"; + sha256 = "c7d568cf58b980ac6fa59f5fa737fa18749318ee8c6c4d865bf4af6b277152e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/it/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/it/thunderbird-78.10.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "4ce44992d22f283f08e16549bc6cfdc416bb6d197bef63702ac279ab8a3366a7"; + sha256 = "2e38bf9742410212de3664e9eaa0f754e46b717666ca74bbdbb80e6b784948aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/ja/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/ja/thunderbird-78.10.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "ecdb393877df52459486628f70024620e2824ad6da8363a9133e64c041fe3812"; + sha256 = "472040ae9dc91d67c0a77f6470e450f964fdc125e4ebb66c90d3c68f31e45a06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/ka/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/ka/thunderbird-78.10.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "f39a3beed17681f36f28a33fb74083143aa33ae51a7836507345b147c04d1d0a"; + sha256 = "7228703d3daf25bb665b9feb30d0410f856538f5b2e5728fcbaedff752bc1041"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/kab/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/kab/thunderbird-78.10.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "fe7b8e90b3c30de00ca5326e3a2a100aa7ba862322c7f386c871b56a22ca4e08"; + sha256 = "e111e139da66ad100c8206e028fbc02052cee95d26fc81b3d430735427f6d2ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/kk/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/kk/thunderbird-78.10.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "b1c8ece7ec8e634b0746664401ca750c1cd3a81b587f6ee918b6166720c3b074"; + sha256 = "db67cbc4e12f07447e66e84b1da7f0acddeafead130d584292057363497b5a8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/ko/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/ko/thunderbird-78.10.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "31f16d08a51315502e0e1da5d11581e2637361b40fd5c0d60852c1546fd45cb7"; + sha256 = "deeb43fe286b1d9138598bd2ed69566ac6c7f741392728619a6aba3d4792fecc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/lt/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/lt/thunderbird-78.10.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "e56f4fd2bbee8bd0379030442355412f9f73e9c67123505242f438ccebc544ee"; + sha256 = "edc1a1ea3767a305ca7cbcc5df371782af0f2f8776afbda8ac922d4ac34161c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/ms/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/ms/thunderbird-78.10.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "13c2feb9ee22a40485f9648b2ad60113b0a463aa7c55cd9bef8cb2a68211bdfb"; + sha256 = "f18e4f2af944b153b853bd2cb7a2607ce1f0d32f3186e6afcbf837edd5335f57"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/nb-NO/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/nb-NO/thunderbird-78.10.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "7e305950c61299fe992891cb2a18a8420c40bb9333b40dd45ca39b92d644cdf9"; + sha256 = "398743239797d93e611a6778ca9943eab1386f0e06256041554a4f63dc8d753d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/nl/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/nl/thunderbird-78.10.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "eeaa3e5b0e72f36cf1a66c0bf040e94258f2547a7e1665fc667bab3cd9f84410"; + sha256 = "7c4af7dedabed5ecb598864df4c7a15ca7c0c3af39e11a8a4b02d502d40bc23b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/nn-NO/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/nn-NO/thunderbird-78.10.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "e870393eef06b6eb2564b00a039c7d19e418e2283f992970df860606099cd70b"; + sha256 = "8f8aac240e51916491be8538fb9e3428b7e0e3248e4eea7be37da302930860e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/pa-IN/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/pa-IN/thunderbird-78.10.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "24b11eb4bb5bc929e89b92cc0faf4011f5ce33dd03d4212ac5c0209ce7901c10"; + sha256 = "0a5fb5d304ffecb3bae49c5e9fc5bed1015cae52f10395f7ccc98bf66b537f3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/pl/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/pl/thunderbird-78.10.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "cace57aae947e8a2ed1b7875c4791d94d8f0d0f865ee0dc0a4a9230081db6477"; + sha256 = "491f72dc04af30e1218a0ec739685ba759935aaeb82001493725e46aceb374aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/pt-BR/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/pt-BR/thunderbird-78.10.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "d36a91d97b8e53720665e3541215889a2ce848de5b87989c52c3022924ae73e7"; + sha256 = "fc5d479cf49b560199d0bcee2991cf49d291facda232ed062f2d5d7c38ffab8e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/pt-PT/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/pt-PT/thunderbird-78.10.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "18f71f0f278037a88af1ff4d87ab8b907cfa3097f11e3b98282c9f9de9d40fee"; + sha256 = "46dc8b9f65cce9b85fc7c5069f190ba880b82ddeaabab841d69b7eb2aba01b9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/rm/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/rm/thunderbird-78.10.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "833e51aaba81212aad670b276498362103aef388cf09b5404a78cb046805be4e"; + sha256 = "03a978808d1d8e9a2672e62d68e5d0fb31ed0813e7e7535f406c81f680998a4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/ro/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/ro/thunderbird-78.10.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "fe033d44674609c319c8bc6939056d8f77ccbabf0badcb059a06bbe028868af2"; + sha256 = "4b499349e7a4fedf1338725055aaf2a6b92b371bf6c578da600d066ff3abcd3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/ru/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/ru/thunderbird-78.10.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "19c26477c691f60c76813b1fc657ff837fe4f160d6e77ffa6f73d9e88e748655"; + sha256 = "a32b65ce9e3d8fd3b9081db3a5c809f3605789b44d816870556ce2916b33c28e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/si/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/si/thunderbird-78.10.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "ae2a50027f0df5e3533bcb5b094987976a040ef1cde810e030ce6e446338ba96"; + sha256 = "8fb707bb227df1e1ffc50c2ec49bc594c553a62184a2cbf9adc1a33f6662721c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/sk/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/sk/thunderbird-78.10.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "9bed8f53737a363314cf67671b64b7bbdd93ff2ab50fe32a781f09cd991e3a96"; + sha256 = "fc16b583acc017e9f15ec62679a224c6e00b4050579ed152ceeaccfc167fa2ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/sl/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/sl/thunderbird-78.10.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "fd38aaf88301b3f58cbf0d63d0545d30f8db4994509f10f76efdcb6b0d4ea977"; + sha256 = "15b18b2e66e4a32784b9b995f33c37d776ee6c2600c8f435412f29a684b8cf4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/sq/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/sq/thunderbird-78.10.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "6fa0d45921f4c2ca8c5c4a2755c8f724b3046a92504fa98bd20084b5be297891"; + sha256 = "1d2803e42b7f06c93f39eda2fd4a5d1852daacdf4def8c931d831686b7ef2d80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/sr/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/sr/thunderbird-78.10.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "1c85bd065b6441c2131f32b9faff5ca425bcd718a0b10052b05ba29a68a93c78"; + sha256 = "d79178b3cf04f47a036d59dda8b651a557a410570f8fbd4de960ac57897e9495"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/sv-SE/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/sv-SE/thunderbird-78.10.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "cfcafa5ef9221bd1cc91f266e2659e769753a2acbac6893528347a5b7db92c2a"; + sha256 = "041dd7b59f7f348fca03f03916b5597130f7aa7d4bb58d4653c95865bf4bec9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/th/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/th/thunderbird-78.10.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "892b23cde316c922ea6fc7b537437885fa8ca2ebfd9b17d177b5f5d5deda30cb"; + sha256 = "cb0ac45cd8dbe4764d2b8bed8e9b142bedd65e8af37d7d2920321999b93af80f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/tr/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/tr/thunderbird-78.10.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "bad99148eb7f2777fc0227db9f6b03a9b31c7aaee19bfe4fbae26227547421e7"; + sha256 = "d60998502a3281a3a483f122406b7c01361e9a3a6d006e435e120ee766f19e31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/uk/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/uk/thunderbird-78.10.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "127c636969dde8cb10121f8fa3ed0c18c35d13ccfd07643a2aa5c3aa78a6f82f"; + sha256 = "0d41350382c75c0da6bd0644eee39808ed88b1b23dfd476be9cd8a122ab1e1f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/uz/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/uz/thunderbird-78.10.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "2c1848c7cb62bf96cb255a39e31099516e7df8d3e34cf68430a323729b571430"; + sha256 = "8b82aae5f995b378a107a252f13256b13c0d4aeafa4ce0c8fc7d7b104c1212be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/vi/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/vi/thunderbird-78.10.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "754e8974cc2284fb7b01f413c0220cb1d99b50831189dd61ab8804e44bf54f48"; + sha256 = "240b29a8101fafc4ecbd11f26986a65aa1192fe030a39669e4f422b239d7165d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/zh-CN/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/zh-CN/thunderbird-78.10.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "f76ee6ce544ff1dd9df931b15e9d25b18971f489b3b9e6f03749976ead068c60"; + sha256 = "fe8a09d310b2a96936e7f9594dccddd557bdacca7bfba1d7dc4d273c9ceccd0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-x86_64/zh-TW/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-x86_64/zh-TW/thunderbird-78.10.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "fc7441b416e541c24b0148450812f350058a6d0fe2a44fa546fb4d059674bc27"; + sha256 = "c1d555e2f2ffa1239151eed66c8b5d58d822814933b7a3577c2e03883535c950"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/af/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/af/thunderbird-78.10.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "5ed18c354dcb22e9999854f5f83d880fed92fd9e4ddb43564c8e69a07c5e29e9"; + sha256 = "dfe40c9c111c48cd4d8a832ec6a6922325bf0ebb0384e9457df3f7e55be0deaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/ar/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/ar/thunderbird-78.10.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "31caadee014741ec0c77307a155bfdf5ba4f7d9b06e1786edf1bf6162d59ef43"; + sha256 = "7c49064bb7c8f20e6594b2925ff3bb09a33da65fde53684d314292433caa735a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/ast/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/ast/thunderbird-78.10.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "e5dfbce6d8dffadda9ad5320d8baadbe185972d0e62d79079833853151b1bd54"; + sha256 = "b41a2cf4592a25398e8f82dad92c302e56cf1cac9fcd0bd7144d9ffc7fc6a8da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/be/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/be/thunderbird-78.10.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "0f6507525b844b405c515b80238a9672012c6950185a2be6523eef3d42bcad50"; + sha256 = "2e5085779f3daba1c6c49c00eb0a507c7f4142b151cb3dd8a7802aba38e2bb5e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/bg/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/bg/thunderbird-78.10.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "002bb9b971851c3ec8eed1e1ce1c28fd97fac788578d53eb0eb130a2c100426d"; + sha256 = "a5f0d0971dcf689b1b2bec001f431dc04a506236323eeb8196d03a5738c8a663"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/br/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/br/thunderbird-78.10.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "adbccb49d9f00198ee4fe2868d3ee4d745c79dda90a8b0b496c6be2a0ab9fada"; + sha256 = "2b499965f20ca7177220c089d531f3222d26b3bdf46d551eb69402632e185976"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/ca/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/ca/thunderbird-78.10.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "efb8a08377c34b49e57c424c86473429b475c9f0bb23e17f6beec2c3d288b9bd"; + sha256 = "126afa2a6bb7dd5241421ef5d7459ae711e897be7f92b205d06028bb7c81a5f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/cak/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/cak/thunderbird-78.10.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "e3775d9aad469ac62c5b86e8441ee8597172cbb9f4f365309c402c42608bf3a9"; + sha256 = "ebc6e8bafc188374705aaee27bbef9af62dbf2dcdbf0439871c87ab152be4914"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/cs/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/cs/thunderbird-78.10.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "a74c7a2c2bb7c0ce6456e808a6d503554c74d9588c59555086ef188e3ec9ad9b"; + sha256 = "b5f2e43c78a65d841e3d393b9d6353d01aee585ea02537ef97f0e49d83f6b620"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/cy/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/cy/thunderbird-78.10.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "83fd84d86dff669f65b95014a222ffa4889f1db16209c133ea02c0d4f893169c"; + sha256 = "15e48422ea4ed918aefc843aba0508e8bc5089b18eed1af09ad318877f487d0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/da/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/da/thunderbird-78.10.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "531984ff00cfcdf957186221d461d61dfb8637474448dd7c3f9c8f21c3d78eb9"; + sha256 = "8b535597f724ad521b6e0fed9cabf24b1eaa6a4fbf133ddf2f6f8445ebf96461"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/de/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/de/thunderbird-78.10.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "bffa31e9ad9fcd17b3d29414d41e7fad2f95e3becfa79e45176a20ce4d7fdbb6"; + sha256 = "079236278b9ee50fc7ecf709c6fa8d918f2b0e7b5523bc0fc40796fe346d583d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/dsb/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/dsb/thunderbird-78.10.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "05101ba58d6929e128f753015220a7d018e6e0fc5b880843c2bd821a53d26064"; + sha256 = "6e2e527b72a4e957cea44f02cac6dcca3d1ed98477c658d0cfad201eacf789ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/el/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/el/thunderbird-78.10.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "121178325199b8e4aaed151f197787e8bf82ffa6c93638322fc75755e9f09608"; + sha256 = "737ec7a65bf6e97463d755852de041b26836b521d498b6f1245a8349991d336d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/en-CA/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/en-CA/thunderbird-78.10.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "9a11bbbe5a320f4507813bde58407ef441b260d17811f7eaa692182fdd1866b4"; + sha256 = "57609382e4a11251305cbeee549cddb87ba6f6fdc57e75733a1114b431e085dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/en-GB/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/en-GB/thunderbird-78.10.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "f5bb637a3b17c7eea22ae7804c13734c60890755273badc4d832035a34fad272"; + sha256 = "6c61127aced3bf35f205a9b22f9b4ef4bcbf7dbc0f63becda8538275e12fcbc9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/en-US/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/en-US/thunderbird-78.10.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "7437fcbaa4c75858b3ceba7abce6237f80017e6c68cf963ed109b81bb73f3553"; + sha256 = "e05836a368c62f24d42d0c2c35e1f6364a1f21fe61031f8e71c5801e75294190"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/es-AR/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/es-AR/thunderbird-78.10.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "6aa396ca00791ed0127321bc9cb9e3fe677f1897bbde157986cb8829a6d1fecf"; + sha256 = "0a8b878de32ccc4e5af0eff23ded1b59c655c3e982df99fb6ae053ed62ce82b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/es-ES/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/es-ES/thunderbird-78.10.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "4eb1605ee60dc731d578117fec45c03fec7f3f99ef29ab7475d4be15004949fc"; + sha256 = "0e0ee036ebc21f67ce574b810f9a0a903eb987b8290848cb44fb0bdf33d316c4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/et/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/et/thunderbird-78.10.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "94555bbc597c622ec1cab4e310a978a638c94d7398beb40cb573555e2f5a86ba"; + sha256 = "cb2e2f08c56b47acfb3a47c5d05878cdd22734e158644bf0501cff6b9871bcb0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/eu/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/eu/thunderbird-78.10.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "77dca056a6c4cd64d6fe5ea60fe6d9c211a1ef1d0accb4685c9c8fea7861e2bf"; + sha256 = "3b3ea74ee478a5541062d3d185f829e14b4470001c8562fb29d2b3705ce017fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/fa/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/fa/thunderbird-78.10.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "8e0b2bb8630c2ca64652fd952656637d1393b5845104f9f2ab08d0ade2a96da6"; + sha256 = "f9ea779fca1c2e817103d0fc3e0cea65b3d93a624641ce7e6a5f2c0e85cf485d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/fi/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/fi/thunderbird-78.10.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "d8ba0d4194628ff7946159bf511d2485d310c42c9fc745c27b751f4c59477ed9"; + sha256 = "222e9db844504a99b5f4b6fa030a1ee64b45a55fa05208ea8c94237405f07eb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/fr/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/fr/thunderbird-78.10.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "ebb2561f50b1d6defb628a07646b70952687f666475ca126bd72dbd7478efe26"; + sha256 = "65ba942bf95b0a5055f08805ee4e75eb907fa33ef38b0d7b5a72ef8f805e9366"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/fy-NL/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/fy-NL/thunderbird-78.10.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "45c7c92986cc792273e5923834bd4f209e25d26e44ac1e155c8f7b539e72ee8e"; + sha256 = "50dbebc2f748bef3da8f4a1901ab10ed5d152f683232c22addfab62e8b8110df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/ga-IE/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/ga-IE/thunderbird-78.10.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "c127d817e6b4759eac5b2af5aaad82670a157857b63bc0869ac1adeb27d38f3c"; + sha256 = "d79d2f46bb160f727576cacfae15845200223781abeae8499c2ded4e1f87f220"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/gd/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/gd/thunderbird-78.10.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "40468c9214fb67dda8cca1f43d03e5621910eb260bde268034a8c967af2bf73f"; + sha256 = "97b974a42b8592ee01512294a8f87313017fc48dafb75c43ba90bd8556d9e8aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/gl/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/gl/thunderbird-78.10.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "55ab753b591c72307b31e9b98a1f426886a4a0007af1507fc8ffbe656d2c92b9"; + sha256 = "64fad7d82e2e41dbf069c9d53eef21480b70ce2f0a2979e4f32f1bdbd864ffd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/he/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/he/thunderbird-78.10.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "2ea8691ac3188d8ca0c20fd7c9e9cba25e8b14eb6ebb338b42303aadaeba07e9"; + sha256 = "1f3095ad3522080a42b3f4a2a90a96342f1c8ace53ebc4a78aa9af7276b1957c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/hr/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/hr/thunderbird-78.10.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "6c5eab557ad07084889b08ae5a79569794a916535ad4b6b23493d2c658e57dc2"; + sha256 = "d96902f4f4be4be9740f1d96c68c6621a9ad9d349146eaac7b81927eeefc6fc6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/hsb/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/hsb/thunderbird-78.10.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "90ea860940cca6152ca92601e25514652ae652aae8df5a0ec9b9bcf59ccfa570"; + sha256 = "80892068dbbbaf6a63b3a5970d3d1a4833f81a2c610c09ac1ff4ce52bcb90a03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/hu/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/hu/thunderbird-78.10.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "71895a707e263bbfdf9a08542bab2fd8609458c3f5229a536333db46b17282be"; + sha256 = "9c013c1b3e9d713e538a30eae94d394bdc9afcdbd1bdf690dbdb16213a706475"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/hy-AM/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/hy-AM/thunderbird-78.10.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "475e4c99597e444316de578c7ec4528e762ff27021189a31fb1d45a7c97b5eee"; + sha256 = "afd694d0c333b2964b13e15e025054fc947721c309ae3723d3999a87abe53fd6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/id/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/id/thunderbird-78.10.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "c25f6bc1478c181dd88e9506b9b81882235c39f280b0065608827e90299ba5f3"; + sha256 = "463ceb756f31d5fbd84e849de560608050c3b758cf6a3e27785fbbac4d7b04b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/is/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/is/thunderbird-78.10.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "eaa68dce6341f5074b3ba15452c24139737988d7af9046e8e3b41fae715ec344"; + sha256 = "6b3a0f5fc40c279c34e9176899fe352e96f5d5fdece8349191723b104496e834"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/it/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/it/thunderbird-78.10.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "5b1ecc37001284b49dd835060f5edf6a982f2e63218ef2dabd652e10c62ca742"; + sha256 = "45c9f4d035f49543ed83b98513c743053401938924c83e9f9d3006bc70a1a55f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/ja/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/ja/thunderbird-78.10.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "eb61857839abcd445389de0349b7e297a0d737e7aa511ddeadd92b2a38419dd2"; + sha256 = "1c1acb2c670b54863110857c2df5ba504c8f70015cb061dcacf0ca9fd62f14fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/ka/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/ka/thunderbird-78.10.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "902c0b7c3247c1d5d6dd80d751a8fbd22756a73414d8fcba072d2b3213b18280"; + sha256 = "45a04e6fdfce419a1dac9433ecab93918dae7a3577cd77c5db653beea29d1539"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/kab/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/kab/thunderbird-78.10.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c91d1f0eeb7b6de618794ac369c323fe514a201d506906b53fa527da2dadabd8"; + sha256 = "59ab2d0f4e2ba2dc9bd57f4d838dac05e266293fa1b9b90b442e6506507574dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/kk/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/kk/thunderbird-78.10.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "dc7115e726c51cb56625e2254b4987b951e972874b0dcd245e40f0477fa462af"; + sha256 = "3be2ec6152f3b853217093cfade25373c70e58591cd1f6b172e5f2cdf9cbd805"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/ko/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/ko/thunderbird-78.10.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "a6d9b6b6c8a0a05fd2dde4545af109369d1158972ebdaf91bdb4c30498c88db6"; + sha256 = "bfdde85ee9605537237f5eb4bb4986b048796e57d1b93aca3c52cc34143721a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/lt/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/lt/thunderbird-78.10.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "4fb6c5ae8fee1c2a829c1adadb99e6e21ba96e61e59a631b88750a00093177ee"; + sha256 = "fb891f7e71b73963e59bd60fecaa681b179558476d15221d4309fb4ff7f0998e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/ms/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/ms/thunderbird-78.10.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "bb4bf6706ad62be4adb23101cf621b9fcc742f757d317071b81dc6860317615e"; + sha256 = "d1b7bc7fa6083999ce11331ef96e47e5203ee94f73156db9b7057b2d358994e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/nb-NO/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/nb-NO/thunderbird-78.10.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "fdbd9715a34e6d4d4c77d1b5d6aa6ec1673907ab1df823a0b95730ea299ac6fe"; + sha256 = "e005186c779dba7820be0feefc9f4fcc20315fca89557d392219f3111f21454a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/nl/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/nl/thunderbird-78.10.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "ee94b20e182fa93360e6a89e6df64c23d8ccaca7394d0716d217b25262a916b7"; + sha256 = "dba086d711796270d66bf911198d3a3df0c959c54a0050c6ac2840971f2bcaa1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/nn-NO/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/nn-NO/thunderbird-78.10.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "9710055906529edba3d62cbc7d17745497ae3dadf1c0c53408952f4c99242c7f"; + sha256 = "bc2a68b6c46b7fa6cf9389b6294b9e3adc1da0c3e580b58e0ea034aaf102b9ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/pa-IN/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/pa-IN/thunderbird-78.10.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "b61f29bc72b49761beb5083a71594a750197ff049d84db5e3eacf322dd312275"; + sha256 = "2707b607a5cf9cb6cd1d6d8e69ee424db9ef0f77ae3453ffe833473c185f8ffd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/pl/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/pl/thunderbird-78.10.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "5a885bd885772dd09eea88a7e3f2d7f766d88281bb2bc1e690832286dbee3fda"; + sha256 = "c59eb3a7ba63202fc64b91ac85921a02673ae8039ea6f8c0ff032c73bcb06f86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/pt-BR/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/pt-BR/thunderbird-78.10.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "228d268675b9781aa5341bf0c8354cb1f3cdc700c7bb608438c2e31b2239e48f"; + sha256 = "e7031469d68b27c0339df23598cc5173b7c159073cf6100b6a6b4e77c7361f55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/pt-PT/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/pt-PT/thunderbird-78.10.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "b69cbaaed70d582319c86d46016122a2a0a3e9abfc3c6393c2fd66b8f50cf855"; + sha256 = "975d6e0f3dcfc68fc1d385cbe8dd66a5e9de65a6493caa21151d77a610f87f41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/rm/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/rm/thunderbird-78.10.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "0ca4301df9ac5b234c8cf71718441c152403fbbb06cb42e2f6061fbc97ce31ca"; + sha256 = "f5743464987a2176ca424aea7e187a952611b4f4c6531c0ff98363ccb38a0ea8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/ro/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/ro/thunderbird-78.10.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "ab06982a3f6134388e6bf8049a80b2d1c6b1a338a3f2744516af2b7ba1d23ae6"; + sha256 = "bd64faa96869fd60ef8b11d1051cea616a139542f8bd95deff9f5cfcb106c215"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/ru/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/ru/thunderbird-78.10.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "858aedefc42e15ca2179ee5e1f09c4f89dbba46e76160cf172c3fa0cb5ed019c"; + sha256 = "d894d4588ae78da76c2893bd151f734b50b946921bf73cd14e045163392ece52"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/si/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/si/thunderbird-78.10.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "5193e29ea9ecaa1d8e13f959f294540bc3cc3e4f161358cb057c5f44b2dba396"; + sha256 = "be0a4fcf8683db260876fa45c71de96edc8cbaac5dc2f2ccc4592665e2f07b54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/sk/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/sk/thunderbird-78.10.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "6d6fb547ded55b374c1556128af1406cd4708f207a90f24778a319cf0fab1e22"; + sha256 = "4c3eb810bf695ca98058c1fd803af0c9ddbd08ce303797b3c87a00dd62d248e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/sl/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/sl/thunderbird-78.10.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "89e246494a9e052e06894d2fae911e4a251b5c24b5bb26c9810277f43bcc211d"; + sha256 = "165d1759756e5e4efc632129d3307364a43f4884157dd2d7572f476ffde945fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/sq/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/sq/thunderbird-78.10.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "d465f5ea13b423cde1e6a6fc4bb8b21f1920fab6a73d4ed7dca16911d4918c2b"; + sha256 = "e3a74c10d298786bdbe40e2ffde2e88d8d25d2c148a8da290df59bab15915c5a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/sr/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/sr/thunderbird-78.10.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "4c9c7e2d0929e2ef65b8c33baa2ea335b8145580f7c2bd88f7c00e3cbad49327"; + sha256 = "4d512b45886767f730da41aba422efad7698ebaf685cf5337b95b63b5f362d60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/sv-SE/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/sv-SE/thunderbird-78.10.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "913c8d546f8aa518d8864c550749889b2fb72a86506bd407db2c0163fe6ea7e0"; + sha256 = "b647da4076d5feb4d80c7d323eb45d20f1385a8959cddf29481eca92a68386c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/th/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/th/thunderbird-78.10.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "52bc9ca0b837c6209a040649dd432d459c7b73c1dcfd967c970dba3dcd0c0e8f"; + sha256 = "89dbad50fcb5e7ce8baa4a9a3f929fb0ada505a2ff4059973fe6ba163e061fad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/tr/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/tr/thunderbird-78.10.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "66eea04e8fa1993bff56b8af517564f782733ba83634a8b9cc452dc5fb1d87af"; + sha256 = "b09b328001662c40d5138751d26c2c818ff9d3fc2fc4fbbcd7fea9c015b0496b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/uk/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/uk/thunderbird-78.10.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "91be59e83c11aac5cd46f687e008794e666b2efce1da572ede42291e9620d9a9"; + sha256 = "109c90943e64fc325ebd5051268bfd899200377cd58a2f2eba9339bbebfd5ebd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/uz/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/uz/thunderbird-78.10.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "b216b0d189828622b7dce32e91f8dcf63f3763c2610ad7b30eaf05a3e92f4b3c"; + sha256 = "83148f68ae6ecba4e8c7f897cdab760813ce3dc58b8827fe3539b7c7ddf160a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/vi/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/vi/thunderbird-78.10.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "af4294bc71e9a4fca7b7ced7fd401ef692163d7044f8b1cd5fa1c25192e98120"; + sha256 = "f8f4bb6120f39d2cf9a9b51e30d67bea0e2e9432086aef96a3b6e00afe6ea75e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/zh-CN/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/zh-CN/thunderbird-78.10.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "f10b21744041485cdd4bb0e68d9167acbe3b55c914ace91ba024c23e3b8f3531"; + sha256 = "cce65dd262920032cca92753709afa28a9c3d6b3aaeb8c64c697d668cb43a6f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.0/linux-i686/zh-TW/thunderbird-78.10.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.10.1/linux-i686/zh-TW/thunderbird-78.10.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "f3df92551c102dd113ace048eca32e4dfc797cedc53fd0ea93ddea6954915316"; + sha256 = "1781baf8aa36350d3e6a5aec22dcd24af3c8133c5a7ac0ffd2cf213a34746a13"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 8e176638da6..5d9aacf515d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -73,13 +73,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.10.0"; + version = "78.10.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "0nywhw1y9g78fpfgmcp6vphdidpnhfxif18qx23j7p20ayymvi2gd3smm4qfr6rlb0dkzyk1vxc2dj47zd8169wlkvr6l1kfsgvrj49"; + "3dy8db83sw7kvv0pqqzrnidpa0s6j4vl32f08pgka68pgaldxbr9ay4m1amvjafykz4mpk161v35g4dzb1xf7sxdfl38621yayf9ypz"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/nym/default.nix b/pkgs/applications/networking/nym/default.nix index 528db85092c..9251862ba6e 100644 --- a/pkgs/applications/networking/nym/default.nix +++ b/pkgs/applications/networking/nym/default.nix @@ -3,36 +3,26 @@ , fetchFromGitHub , pkg-config , openssl -, libredirect -, writeText }: rustPlatform.buildRustPackage rec { pname = "nym"; - version = "0.8.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "nymtech"; repo = "nym"; rev = "v${version}"; - sha256 = "0wzk9qzjyax73lfjbbag412vw1fgk2wmhhry5hdlvdbkim42m5bn"; + sha256 = "sha256-7x+B+6T0cnEOjXevA5n1k/SY1Q2tcu0bbZ9gIGoljw0="; }; - # fix outdated Cargo.lock - cargoPatches = [ (writeText "fix-nym-cargo-lock.patch" '' - --- a/Cargo.lock - +++ b/Cargo.lock - @@ -1826 +1826 @@ - -version = "0.8.0" - +version = "0.8.1" - '') ]; - - cargoSha256 = "0zr5nzmglmvn6xfqgvipbzy8nw5cl3nf7zjmghkqdwi6zj9p9272"; + cargoSha256 = "0a7yja0ihjc66fqlshlaxpnpcpdy7h7gbv6120w2cr605qdnqvkx"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; + patches = [ ./ignore-networking-tests.patch ]; checkType = "debug"; passthru.updateScript = ./update.sh; diff --git a/pkgs/applications/networking/nym/ignore-networking-tests.patch b/pkgs/applications/networking/nym/ignore-networking-tests.patch new file mode 100644 index 00000000000..e971557e7ce --- /dev/null +++ b/pkgs/applications/networking/nym/ignore-networking-tests.patch @@ -0,0 +1,123 @@ +diff --git a/service-providers/network-requester/src/allowed_hosts.rs b/service-providers/network-requester/src/allowed_hosts.rs +index 3026b4ee..fd156682 100644 +--- a/service-providers/network-requester/src/allowed_hosts.rs ++++ b/service-providers/network-requester/src/allowed_hosts.rs +@@ -306,6 +306,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn leaves_a_com_alone() { + let filter = setup(); + assert_eq!( +@@ -315,6 +316,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn trims_subdomains_from_com() { + let filter = setup(); + assert_eq!( +@@ -324,6 +326,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn works_for_non_com_roots() { + let filter = setup(); + assert_eq!( +@@ -333,6 +336,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn works_for_non_com_roots_with_subdomains() { + let filter = setup(); + assert_eq!( +@@ -342,12 +346,14 @@ mod tests { + } + + #[test] ++ #[ignore] + fn returns_none_on_garbage() { + let filter = setup(); + assert_eq!(None, filter.get_domain_root("::/&&%@")); + } + + #[test] ++ #[ignore] + fn returns_none_on_nonsense_domains() { + let filter = setup(); + assert_eq!(None, filter.get_domain_root("flappappa")); +@@ -368,6 +374,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn are_not_allowed() { + let host = "unknown.com"; + let mut filter = setup(); +@@ -375,6 +382,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn get_appended_once_to_the_unknown_hosts_list() { + let host = "unknown.com"; + let mut filter = setup(); +@@ -405,6 +413,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn are_allowed() { + let host = "nymtech.net"; + +@@ -413,6 +422,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn are_allowed_for_subdomains() { + let host = "foomp.nymtech.net"; + +@@ -421,6 +431,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn are_not_appended_to_file() { + let mut filter = setup(&["nymtech.net"]); + +@@ -436,6 +447,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn are_allowed_for_ipv4_addresses() { + let address_good = "1.1.1.1"; + let address_good_port = "1.1.1.1:1234"; +@@ -448,6 +460,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn are_allowed_for_ipv6_addresses() { + let ip_v6_full = "2001:0db8:85a3:0000:0000:8a2e:0370:7334"; + let ip_v6_full_rendered = "2001:0db8:85a3::8a2e:0370:7334"; +@@ -477,6 +490,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn are_allowed_for_ipv4_address_ranges() { + let range1 = "127.0.0.1/32"; + let range2 = "1.2.3.4/24"; +@@ -495,6 +509,7 @@ mod tests { + } + + #[test] ++ #[ignore] + fn are_allowed_for_ipv6_address_ranges() { + let range = "2620:0:2d0:200::7/32"; + diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index f88a2e3d8e8..0e779d6654e 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -18,14 +18,14 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { urls = [ "https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz" "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz" ]; - sha256 = "1qbq6r0yanjappsi8yglw8r54bwf32bjb2i63awmr6pk5kmhhy3r"; + sha256 = "1ai58fsivb8al1279bayl800qavy0kfj40rjhf87g902ap3p4bhh"; }; passthru = { diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 61f318009f7..86a3e48ae8f 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , buildGoModule -, runCommand +, testVersion , seaweedfs }: @@ -20,10 +20,8 @@ buildGoModule rec { subPackages = [ "weed" ]; - passthru.tests.check-version = runCommand "weed-version" { meta.timeout = 3; } '' - ${seaweedfs}/bin/weed version | grep -Fw ${version} - touch $out - ''; + passthru.tests.version = + testVersion { package = seaweedfs; command = "weed version"; }; meta = with lib; { description = "Simple and highly scalable distributed file system"; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 2fa4f0b93c8..556bb1a0b4a 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,16 +4,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.15.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "sha256-d7b1hqW0ZWg74DyW1ZYMT7sIR7H89Ph38XE2Mhh7ySg="; + sha256 = "sha256-AAJLtykSQLM13I77E7LD1W8hXLvZQ3XqgOWrTBGYn3k="; }; - vendorSha256 = "sha256-00DdGJNCZ94Wj6yvVXJYNJZEiGxYbqTkX6wwon0O1tc="; + vendorSha256 = "sha256-cN6Dgztq0/pAwfuBGFtTzK7XKXV7LrkgDGGzjkTDUN8="; doCheck = false; diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index 8633f1daecd..88a063158bd 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -15,6 +15,7 @@ , glib-networking , sqlite , libsoup +, libgdata , gtk3 , pantheon /* granite, icons, maintainers */ , webkitgtk @@ -56,6 +57,7 @@ stdenv.mkDerivation rec { pantheon.granite sqlite webkitgtk + libgdata # required by some dependency transitively ]; postPatch = '' diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 959aa30c037..d2251da7007 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkg-config, makeWrapper, cmake, gtest +{ fetchurl, fetchpatch, lib, stdenv, pkg-config, makeWrapper, cmake, gtest , boost, icu, libxml2, libxslt, gettext, swig, isocodes, gtk3, glibcLocales , webkitgtk, dconf, hicolor-icon-theme, libofx, aqbanking, gwenhywfar, libdbi , libdbiDrivers, guile, perl, perlPackages @@ -25,13 +25,21 @@ in stdenv.mkDerivation rec { pname = "gnucash"; - version = "4.4"; + version = "4.5"; src = fetchurl { url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2"; - sha256 = "sha256-2R4NEmtGHXHeG8GyDZzxQnBDU97AfT5lmdE4QidZ5no="; + sha256 = "sha256-vB9IqEU0iKLp9rg7aGE6pVyuvk0pg0YL2sfghLRs/9w="; }; + patches = [ + # Fix build with GLib 2.68. + (fetchpatch { + url = "https://github.com/Gnucash/gnucash/commit/bbb4113a5a996dcd7bb3494e0be900b275b49a4f.patch"; + sha256 = "Pnvwoq5zutFw7ByduEEANiLM2J50WiXpm2aZ8B2MDMQ="; + }) + ]; + nativeBuildInputs = [ pkg-config makeWrapper cmake gtest ]; buildInputs = [ diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 263a555ab4c..f65781352b3 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -29,6 +29,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/applications/radio/dump1090/default.nix index 65afdccf812..927fa32bd55 100644 --- a/pkgs/applications/radio/dump1090/default.nix +++ b/pkgs/applications/radio/dump1090/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "dump1090"; - version = "4.0"; + version = "5.0"; src = fetchFromGitHub { owner = "flightaware"; repo = pname; rev = "v${version}"; - sha256 = "1zacsqaqsiapljhzw31dwc4nld2rp98jm3ivkyznrhzk9n156p42"; + sha256 = "1fckfcgypmplzl1lidd04jxiabczlfx9mv21d6rbsfknghsjpn03"; }; nativeBuildInputs = [ pkg-config ]; @@ -28,9 +28,13 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share cp -v dump1090 view1090 $out/bin cp -vr public_html $out/share/dump1090 + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/applications/science/logic/key/default.nix b/pkgs/applications/science/logic/key/default.nix index 531081beafa..e9b0cc7540b 100644 --- a/pkgs/applications/science/logic/key/default.nix +++ b/pkgs/applications/science/logic/key/default.nix @@ -5,7 +5,7 @@ , ant , jre , makeWrapper -, runCommand +, testVersion , key }: @@ -51,10 +51,13 @@ in stdenv.mkDerivation rec { --add-flags "-cp $out/share/java/KeY.jar de.uka.ilkd.key.core.Main" ''; - passthru.tests.check-version = runCommand "key-help" {} '' - ${key}/bin/KeY --help | grep 2.5 # Wrong version in the code. On next version change to ${version} - touch $out - ''; + passthru.tests.version = + testVersion { + package = key; + command = "KeY --help"; + # Wrong '2.5' version in the code. On next version change to ${version} + version = "2.5"; + }; meta = with lib; { description = "Java formal verification tool"; diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index b85f8ba47a4..84f7ca72a3c 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.8.3"; + version = "4.8.4"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "sha256-JvJIsSmgDR6gZY8CRBDCSQvNneckVFoRRKCSxgQnZ3U="; + sha256 = "sha256-dg29wHLqo8gtBmxbo7BurN0zBOsqlzc/5K2pUJ8Las4="; }; buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 5324dc8a10b..3b0d3028041 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.20.2"; + version = "0.20.3"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "sha256-FquvC3tL565711OQmq2ddNwpyJQGgn4dhG/TYZdCRU0="; + sha256 = "sha256-rORIrbUqtQZuU6TjjYP7IZHfCPeLnrNy6wInnAwhG48="; }; buildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index 520f33905c9..5422bde2657 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lefthook"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-VrAkmLRsYNDX5VfAxsvjsOv1bv7Nk53OjdaJm/D2GRk="; + sha256 = "sha256-wW8Obh0YmAZHKrXLQ8364+TrAmLIYKRir2qXdWLtVkE="; }; vendorSha256 = "sha256-XR7xJZfgt0Hx2DccdNlwEmuduuVU8IBR0pcIUyRhdko="; diff --git a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix index 766cb417b74..e2314687d8b 100644 --- a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix +++ b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix @@ -2,12 +2,12 @@ let pname = "radicle-upstream"; - version = "0.1.11"; + version = "0.2.3"; name = "${pname}-${version}"; src = fetchurl { url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage"; - sha256 = "1j0xc9ns3andycbrrzkn6ql6739b1dimzlxq17wwpmqhni9nh673"; + sha256 = "sha256-SL6plXZ+o7JchY/t/1702FK57fVjxllHqB8ZOma/43c="; }; contents = appimageTools.extractType2 { inherit name src; }; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 89e3a5ea0b5..95a9f2d7242 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -59,6 +59,7 @@ python3.pkgs.buildPythonApplication rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 7fb26476d8a..c8163caf8ea 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -1,24 +1,34 @@ -{ lib, fetchgit, buildPythonPackage +{ lib +, fetchFromSourcehut +, buildPythonPackage , buildGoModule -, srht, redis, celery, pyyaml, markdown }: - +, srht +, redis +, celery +, pyyaml +, markdown +, ansi2html +, python +}: let - version = "0.63.4"; + version = "0.66.7"; buildWorker = src: buildGoModule { inherit src version; pname = "builds-sr-ht-worker"; - vendorSha256 = "1sbcjp93gb0c4p7dd1gjhmhwr1pygxvrrzp954j2fvxvi38w6571"; + vendorSha256 = "sha256-giOaldV46aBqXyFH/cQVsbUr6Rb4VMhbBO86o48tRZY="; }; -in buildPythonPackage rec { +in +buildPythonPackage rec { inherit version; pname = "buildsrht"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/builds.sr.ht"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "builds.sr.ht"; rev = version; - sha256 = "1w3rb685nqg2h0k3ag681svc400si9r1gy0sdim3wa2qh8glbqni"; + sha256 = "sha256-2MLs/DOXHjEYarXDVUcPZe3o0fmZbzVxn528SE72lhM="; }; nativeBuildInputs = srht.nativeBuildInputs; @@ -29,10 +39,12 @@ in buildPythonPackage rec { celery pyyaml markdown + ansi2html ]; preBuild = '' export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; postInstall = '' @@ -44,8 +56,6 @@ in buildPythonPackage rec { cp ${buildWorker "${src}/worker"}/bin/worker $out/bin/builds.sr.ht-worker ''; - dontUseSetuptoolsCheck = true; - meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/builds.sr.ht"; description = "Continuous integration service for the sr.ht network"; diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index 69f8a7d4e45..d359d524eb2 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -1,24 +1,48 @@ -{ lib, fetchgit, fetchNodeModules, buildPythonPackage -, pgpy, flask, bleach, humanize, html5lib, markdown, psycopg2, pygments -, requests, sqlalchemy, cryptography, beautifulsoup4, sqlalchemy-utils, prometheus_client -, celery, alembic, importlib-metadata, mistletoe -, sassc, nodejs -, writeText }: +{ lib +, fetchgit +, fetchNodeModules +, buildPythonPackage +, pgpy +, flask +, bleach +, misaka +, humanize +, html5lib +, markdown +, psycopg2 +, pygments +, requests +, sqlalchemy +, cryptography +, beautifulsoup4 +, sqlalchemy-utils +, prometheus_client +, celery +, alembic +, importlib-metadata +, mistletoe +, minio +, sassc +, nodejs +, redis +, writeText +}: buildPythonPackage rec { pname = "srht"; - version = "0.65.2"; + version = "0.67.4"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/core.sr.ht"; rev = version; - sha256 = "1jfp1vc8mink3c7ccacgnqx8hpkck82ipxiql38q1y9l8xcsah03"; + sha256 = "sha256-XvzFfcBK5Mq8p7xEBAF/eupUE1kkUBh5k+ByM/WA9bc="; + fetchSubmodules = true; }; node_modules = fetchNodeModules { src = "${src}/srht"; nodejs = nodejs; - sha256 = "0gwa2xb75g7fclrsr7r131kj8ri5gmhd96yw1iws5pmgsn2rlqi1"; + sha256 = "sha256-IWKahdWv3qJ5DNyb1GB9JWYkZxghn6wzZe68clYXij8="; }; patches = [ @@ -34,6 +58,7 @@ buildPythonPackage rec { pgpy flask bleach + misaka humanize html5lib markdown @@ -51,6 +76,8 @@ buildPythonPackage rec { celery alembic importlib-metadata + minio + redis ]; PKGVER = version; diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index 8d2e8ceed33..43d783e1934 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -1,14 +1,16 @@ -{ python38, openssl -, callPackage, recurseIntoAttrs }: +{ python3 +, openssl +, callPackage +, recurseIntoAttrs +}: # To expose the *srht modules, they have to be a python module so we use `buildPythonModule` # Then we expose them through all-packages.nix as an application through `toPythonApplication` # https://github.com/NixOS/nixpkgs/pull/54425#discussion_r250688781 - let fetchNodeModules = callPackage ./fetchNodeModules.nix { }; - python = python38.override { + python = python3.override { packageOverrides = self: super: { srht = self.callPackage ./core.nix { inherit fetchNodeModules; }; @@ -26,7 +28,8 @@ let scmsrht = self.callPackage ./scm.nix { }; }; }; -in with python.pkgs; recurseIntoAttrs { +in +with python.pkgs; recurseIntoAttrs { inherit python; buildsrht = toPythonApplication buildsrht; dispatchsrht = toPythonApplication dispatchsrht; diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix index 5ce140273eb..637c6f9c1df 100644 --- a/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -1,14 +1,21 @@ -{ lib, fetchgit, buildPythonPackage -, srht, pyyaml, PyGithub }: +{ lib +, fetchFromSourcehut +, buildPythonPackage +, srht +, pyyaml +, PyGithub +, python +}: buildPythonPackage rec { pname = "dispatchsrht"; - version = "0.14.9"; + version = "0.15.8"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/dispatch.sr.ht"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "dispatch.sr.ht"; rev = version; - sha256 = "JUffuJTKY4I8CrJc8tJWL+CbJCZtiqtUSO9SgYoeux0="; + sha256 = "sha256-zWCGPjIgMKHXHJUs9aciV7IFgo0rpahon6KXHDwcfss="; }; nativeBuildInputs = srht.nativeBuildInputs; @@ -21,10 +28,9 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; - dontUseSetuptoolsCheck = true; - meta = with lib; { homepage = "https://dispatch.sr.ht/~sircmpwn/dispatch.sr.ht"; description = "Task dispatcher and service integration tool for the sr.ht network"; diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index a25a14f610c..e44fb9cd6c6 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -1,20 +1,32 @@ -{ lib, fetchgit, buildPythonPackage +{ lib +, fetchFromSourcehut +, buildPythonPackage , buildGoModule -, srht, minio, pygit2, scmsrht }: - +, python +, srht +, pygit2 +, scmsrht +}: let - version = "0.61.10"; + version = "0.72.8"; + + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "git.sr.ht"; + rev = version; + sha256 = "sha256-AB2uzajO5PtcpJfbOOTfuDFM6is5K39v3AZJ1hShRNc="; + }; buildShell = src: buildGoModule { inherit src version; pname = "gitsrht-shell"; - vendorSha256 = "1abyv2s5l3bs0iylpgyj3jri2hh1iy8fiadxm7g6l2vl58h0b9ba"; + vendorSha256 = "sha256-aqUFICp0C2reqb2p6JCPAUIRsxzSv0t9BHoNWrTYfqk="; }; buildDispatcher = src: buildGoModule { inherit src version; pname = "gitsrht-dispatcher"; - vendorSha256 = "1lzkf13m54pq0gnn3bcxc80nfg76hgck4l8q8jpaicrsiwgcyrd9"; + vendorSha256 = "sha256-qWXPHo86s6iuRBhRMtmD5jxnAWKdrWHtA/iSUkdw89M="; }; buildKeys = src: buildGoModule { @@ -29,32 +41,24 @@ let vendorSha256 = "0fwzqpjv8x5y3w3bfjd0x0cvqjjak23m0zj88hf32jpw49xmjkih"; }; - buildAPI = src: buildGoModule { - inherit src version; - pname = "gitsrht-api"; - vendorSha256 = "0d6kmsbsgj2q5nddx4w675zbsiarffj9vqplwvqk7dwz4id2wnif"; - }; -in buildPythonPackage rec { - pname = "gitsrht"; - inherit version; + updateHook = buildUpdateHook "${src}/gitsrht-update-hook"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/git.sr.ht"; - rev = version; - sha256 = "0g7aj5wlns0m3kf2aajqjjb5fwk5vbb8frrkdfp4118235h3xcqy"; - }; +in +buildPythonPackage rec { + inherit src version; + pname = "gitsrht"; nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ srht - minio pygit2 scmsrht ]; preBuild = '' export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; postInstall = '' @@ -62,11 +66,11 @@ in buildPythonPackage rec { cp ${buildShell "${src}/gitsrht-shell"}/bin/gitsrht-shell $out/bin/gitsrht-shell cp ${buildDispatcher "${src}/gitsrht-dispatch"}/bin/gitsrht-dispatch $out/bin/gitsrht-dispatch cp ${buildKeys "${src}/gitsrht-keys"}/bin/gitsrht-keys $out/bin/gitsrht-keys - cp ${buildUpdateHook "${src}/gitsrht-update-hook"}/bin/gitsrht-update-hook $out/bin/gitsrht-update-hook - cp ${buildAPI "${src}/api"}/bin/api $out/bin/gitsrht-api + cp ${updateHook}/bin/gitsrht-update-hook $out/bin/gitsrht-update-hook ''; - - dontUseSetuptoolsCheck = true; + passthru = { + inherit updateHook; + }; meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/git.sr.ht"; diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index c8fa64c8b4d..cddb76cabf2 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -1,14 +1,21 @@ -{ lib, fetchhg, buildPythonPackage -, srht, hglib, scmsrht, unidiff }: +{ lib +, fetchhg +, buildPythonPackage +, srht +, hglib +, scmsrht +, unidiff +, python +}: buildPythonPackage rec { pname = "hgsrht"; - version = "0.26.19"; + version = "0.27.4"; src = fetchhg { url = "https://hg.sr.ht/~sircmpwn/hg.sr.ht"; rev = version; - sha256 = "0dc0lgqq8zdaywbd50dlxypk1lv0nffvqr3889v10ycy45qcfymv"; + sha256 = "1c0qfi0gmbfngvds6917fy9ii2iglawn429757rh7b4bvzn7n6mr"; }; nativeBuildInputs = srht.nativeBuildInputs; @@ -22,10 +29,9 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; - dontUseSetuptoolsCheck = true; - meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/hg.sr.ht"; description = "Mercurial repository hosting service for the sr.ht network"; diff --git a/pkgs/applications/version-management/sourcehut/hub.nix b/pkgs/applications/version-management/sourcehut/hub.nix index 8b6d9201997..17cb3fe4b61 100644 --- a/pkgs/applications/version-management/sourcehut/hub.nix +++ b/pkgs/applications/version-management/sourcehut/hub.nix @@ -1,14 +1,18 @@ -{ lib, fetchgit, buildPythonPackage -, srht }: +{ lib +, fetchFromSourcehut +, buildPythonPackage +, srht +}: buildPythonPackage rec { pname = "hubsrht"; - version = "0.11.5"; + version = "0.13.1"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/hub.sr.ht"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "hub.sr.ht"; rev = version; - sha256 = "0cysdfy1z69jaizblbq0ywpcvcnx57rlzg42k98kd9w2mqzj5173"; + sha256 = "sha256-Kqzy4mh5Nn1emzHBco/LVuXro/tW3NX+OYqdEwBSQ/U="; }; nativeBuildInputs = srht.nativeBuildInputs; diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index 98191f564e9..b419b49f7b5 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -1,14 +1,24 @@ -{ lib, fetchgit, buildPythonPackage -, srht, asyncpg, aiosmtpd, pygit2, emailthreads }: +{ lib +, fetchFromSourcehut +, buildPythonPackage +, srht +, asyncpg +, aiosmtpd +, pygit2 +, emailthreads +, redis +, python +}: buildPythonPackage rec { pname = "listssrht"; - version = "0.45.15"; + version = "0.48.19"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/lists.sr.ht"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "lists.sr.ht"; rev = version; - sha256 = "0f3yl5nf385j7mhcrmda7zk58i1y6fm00i479js90xxhjifmqkq6"; + sha256 = "sha256-bsakEMyvWaxiE4/SGcAP4mlGG9jkdHfFxpt9H+TJn/8="; }; nativeBuildInputs = srht.nativeBuildInputs; @@ -19,14 +29,14 @@ buildPythonPackage rec { asyncpg aiosmtpd emailthreads + redis ]; preBuild = '' export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; - dontUseSetuptoolsCheck = true; - meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/lists.sr.ht"; description = "Mailing list service for the sr.ht network"; diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index e3751a6d5c8..bd331f000a7 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -1,14 +1,20 @@ -{ lib, fetchgit, buildPythonPackage -, srht, pygit2 }: +{ lib +, fetchFromSourcehut +, buildPythonPackage +, srht +, pygit2 +, python +}: buildPythonPackage rec { pname = "mansrht"; - version = "0.15.4"; + version = "0.15.12"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/man.sr.ht"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "man.sr.ht"; rev = version; - sha256 = "0spi0yy2myxw4kggy54yskda14c4vaq2ng9dd9krqsajnsy7anrw"; + sha256 = "sha256-MqH/8K9XRvEg6P7GHE6XXtWnhDP3wT8iGoNaFtYQbio="; }; nativeBuildInputs = srht.nativeBuildInputs; @@ -20,10 +26,9 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; - dontUseSetuptoolsCheck = true; - meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/man.sr.ht"; description = "Wiki service for the sr.ht network"; diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index b5b15520d25..a285d484ed2 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -1,26 +1,42 @@ -{ lib, fetchgit, buildPythonPackage +{ lib +, fetchFromSourcehut +, buildPythonPackage , buildGoModule -, pgpy, srht, redis, bcrypt, qrcode, stripe, zxcvbn, alembic, pystache -, sshpubkeys, weasyprint }: - +, pgpy +, srht +, redis +, bcrypt +, qrcode +, stripe +, zxcvbn +, alembic +, pystache +, dnspython +, sshpubkeys +, weasyprint +, prometheus_client +, python +}: let - version = "0.51.2"; + version = "0.53.14"; - buildAPI = src: buildGoModule { + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "meta.sr.ht"; + rev = version; + sha256 = "sha256-/+r/XLDkcSTW647xPMh5bcJmR2xZNNH74AJ5jemna2k="; + }; + + buildApi = src: buildGoModule { inherit src version; pname = "metasrht-api"; - - vendorSha256 = "0k7i7j604wqvzjavmcsw7g2x059jkkgrgz1qyvzlqc0y4ws59xkq"; + vendorSha256 = "sha256-eZyDrr2VcNMxI++18qUy7LA1Q1YDlWCoRtl00L8lfR4="; }; -in buildPythonPackage rec { + +in +buildPythonPackage rec { pname = "metasrht"; - inherit version; - - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/meta.sr.ht"; - rev = version; - sha256 = "0c9y1hzx3dj0awxrhkzrcsmy6q9fqm6v6dbp9y1ria3v47xa3nv7"; - }; + inherit version src; nativeBuildInputs = srht.nativeBuildInputs; @@ -36,19 +52,20 @@ in buildPythonPackage rec { pystache sshpubkeys weasyprint + prometheus_client + dnspython ]; preBuild = '' export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; postInstall = '' mkdir -p $out/bin - cp ${buildAPI "${src}/api"}/bin/api $out/bin/metasrht-api + cp ${buildApi "${src}/api/"}/bin/api $out/bin/metasrht-api ''; - dontUseSetuptoolsCheck = true; - meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/meta.sr.ht"; description = "Account management service for the sr.ht network"; diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index dab518e70ae..0d8c9135493 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -1,14 +1,20 @@ -{ lib, fetchgit, buildPythonPackage -, srht, pyyaml }: +{ lib +, fetchFromSourcehut +, buildPythonPackage +, srht +, pyyaml +, python +}: buildPythonPackage rec { pname = "pastesrht"; - version = "0.11.2"; + version = "0.12.1"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/paste.sr.ht"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "paste.sr.ht"; rev = version; - sha256 = "15hm5165v8a7ryw6i0vlf189slw4rp22cfgzznih18pbml7d0c8s"; + sha256 = "sha256-QQhd2LeH9BLmlHilhsv+9fZ+RPNmEMSmOpFA3dsMBFc="; }; nativeBuildInputs = srht.nativeBuildInputs; @@ -20,10 +26,9 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; - dontUseSetuptoolsCheck = true; - meta = with lib; { homepage = "https://git.sr.ht/~sircmpwn/paste.sr.ht"; description = "Ad-hoc text file hosting service for the sr.ht network"; diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index 615716d03af..1f385265360 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -1,15 +1,22 @@ -{ lib, fetchgit, buildPythonPackage -, srht, redis, pyyaml, buildsrht -, writeText }: +{ lib +, fetchFromSourcehut +, buildPythonPackage +, srht +, redis +, pyyaml +, buildsrht +, writeText +}: buildPythonPackage rec { pname = "scmsrht"; - version = "0.22.4"; + version = "0.22.9"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/scm.sr.ht"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "scm.sr.ht"; rev = version; - sha256 = "1djyrwa44wml9lj3njy6qbxyc3g1msswbh0y9jyjzxh2c02bl3jn"; + sha256 = "sha256-327G6C8FW+iZx+167D7TQsFtV6FGc8MpMVo9L/cUUqU="; }; nativeBuildInputs = srht.nativeBuildInputs; diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index 5e75efb0886..85e1f5637b6 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -1,15 +1,24 @@ -{ lib, fetchgit, buildPythonPackage -, srht, redis, alembic, pystache -, pytest, factory_boy }: +{ lib +, fetchFromSourcehut +, buildPythonPackage +, srht +, redis +, alembic +, pystache +, pytest +, factory_boy +, python +}: buildPythonPackage rec { pname = "todosrht"; - version = "0.62.1"; + version = "0.64.14"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/todo.sr.ht"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "todo.sr.ht"; rev = version; - sha256 = "17fsv2z37sjzqzpvx39nc36xln1ayivzjg309d2vmb94aaym4nz2"; + sha256 = "sha256-huIAhn6h1F5w5ST4/yBwr82kAzyYwhLu+gpRuOQgnsE="; }; nativeBuildInputs = srht.nativeBuildInputs; @@ -23,6 +32,7 @@ buildPythonPackage rec { preBuild = '' export PKGVER=${version} + export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; # pytest tests fail diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix deleted file mode 100644 index 5f12dd6494b..00000000000 --- a/pkgs/applications/video/kino/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -# is this configure option of interest? -#--enable-udev-rules-dir=PATH -# Where to install udev rules (/etc/udev/rules.d) - -#TODO shared version? - - -# This is my config output.. Much TODO ? -#source path /tmp/nix-31998-1/kino-1.2.0/ffmpeg -#C compiler gcc -#make make -#.align is power-of-two no -#ARCH x86_64 (generic) -#build suffix -kino -#big-endian no -#MMX enabled yes -#CMOV enabled no -#CMOV is fast no -#gprof enabled no -#debug symbols yes -#strip symbols yes -#optimize yes -#static yes -#shared no -#postprocessing support no -#software scaler enabled yes -#video hooking no -#network support no -#threading support no -#SDL support no -#Sun medialib support no -#AVISynth enabled no -#liba52 support no -#liba52 dlopened no -#libdts support no -#libfaac enabled no -#libfaad enabled no -#faadbin enabled no -#libgsm enabled no -#libmp3lame enabled no -#libnut enabled no -#libogg enabled no -#libtheora enabled no -#libvorbis enabled no -#x264 enabled no -#XviD enabled no -#zlib enabled no -#AMR-NB float support no -#AMR-NB fixed support no -#AMR-WB float support no -#AMR-WB IF2 support no - -{ lib, stdenv, fetchurl, gtk2, libglade, libxml2, libraw1394, libsamplerate, libdv -, pkg-config, perlPackages, libavc1394, libiec61883, libXv, gettext -, libX11, glib, cairo, intltool, ffmpeg, libv4l -}: - -stdenv.mkDerivation { - name = "kino-1.3.4"; - - src = fetchurl { - url = "mirror://sourceforge/kino/kino-1.3.4.tar.gz"; - sha256 = "020s05k0ma83rq2kfs8x474pqicaqp9spar81qc816ddfrnh8k8i"; - }; - - buildInputs = [ gtk2 libglade libxml2 libraw1394 libsamplerate libdv - pkg-config libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ] # TODOoptional packages - ++ (with perlPackages; [ perl XMLParser ]); - - configureFlags = [ "--enable-local-ffmpeg=no" ]; - - hardeningDisable = [ "format" ]; - - NIX_LDFLAGS = "-lavcodec -lavutil"; - - patches = [ ./kino-1.3.4-v4l1.patch ./kino-1.3.4-libav-0.7.patch ./kino-1.3.4-libav-0.8.patch ]; #./kino-1.3.4-libavcodec-pkg-config.patch ]; - - postInstall = " - rpath=`patchelf --print-rpath \$out/bin/kino`; - for i in $buildInputs; do - echo adding \$i/lib - rpath=\$rpath\${rpath:+:}\$i/lib - done - for i in \$out/bin/*; do - patchelf --set-rpath \"\$rpath\" \"\$i\" - done - "; - - meta = { - description = "Non-linear DV editor for GNU/Linux"; - homepage = "http://www.kinodv.org/"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/video/kino/kino-1.3.4-libav-0.7.patch b/pkgs/applications/video/kino/kino-1.3.4-libav-0.7.patch deleted file mode 100644 index 65c5bc38276..00000000000 --- a/pkgs/applications/video/kino/kino-1.3.4-libav-0.7.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- kino-1.3.4.orig/src/frame.cc 2011-07-17 14:54:59.089481638 +0200 -+++ kino-1.3.4/src/frame.cc 2011-07-17 15:09:23.199481714 +0200 -@@ -1063,7 +1063,12 @@ - AVPicture dest; - int got_picture; - -- avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() ); -+ AVPacket pkt; -+ av_init_packet(&pkt); -+ pkt.data = data; -+ pkt.size = GetFrameSize(); -+ -+ avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt ); - if ( got_picture ) - { - avpicture_fill( &dest, static_cast( rgb ), PIX_FMT_RGB24, GetWidth(), GetHeight() ); -@@ -1123,7 +1128,12 @@ - AVPicture output; - int got_picture; - -- avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() ); -+ AVPacket pkt; -+ av_init_packet(&pkt); -+ pkt.data = data; -+ pkt.size = GetFrameSize(); -+ -+ avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt ); - if ( got_picture ) - { - avpicture_fill( &output, static_cast( yuv ), PIX_FMT_YUV422, GetWidth(), GetHeight() ); -@@ -1156,7 +1166,12 @@ - AVFrame *frame = avcodec_alloc_frame(); - int got_picture; - -- avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() ); -+ AVPacket pkt; -+ av_init_packet(&pkt); -+ pkt.data = data; -+ pkt.size = GetFrameSize(); -+ -+ avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt ); - - int width = GetWidth(), height = GetHeight(); - -@@ -1319,12 +1334,12 @@ - #if defined(HAVE_LIBAVCODEC) - if ( avformatEncoder == NULL ) - { -- avformatEncoder = av_alloc_format_context(); -+ avformatEncoder = avformat_alloc_context(); - if ( avformatEncoder ) - { -- avformatEncoder->oformat = guess_format( "dv", NULL, NULL ); -+ avformatEncoder->oformat = av_guess_format( "dv", NULL, NULL ); - AVStream* vst = av_new_stream( avformatEncoder, 0 ); -- vst->codec->codec_type = CODEC_TYPE_VIDEO; -+ vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = CODEC_ID_DVVIDEO; - vst->codec->bit_rate = 25000000; - vst->start_time = 0; diff --git a/pkgs/applications/video/kino/kino-1.3.4-libav-0.8.patch b/pkgs/applications/video/kino/kino-1.3.4-libav-0.8.patch deleted file mode 100644 index f98cbda0bc4..00000000000 --- a/pkgs/applications/video/kino/kino-1.3.4-libav-0.8.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- kino-1.3.4.orig/src/frame.cc 2012-05-14 19:55:42.153772418 -0700 -+++ kino-1.3.4/src/frame.cc 2012-05-14 20:28:34.448838653 -0700 -@@ -101,8 +101,9 @@ - #if defined(HAVE_LIBAVCODEC) - pthread_mutex_lock( &avcodec_mutex ); - av_register_all(); -- libavcodec = avcodec_alloc_context(); -- avcodec_open( libavcodec, avcodec_find_decoder( CODEC_ID_DVVIDEO ) ); -+ libavcodec = avcodec_alloc_context3(NULL); -+ avcodec_open2( libavcodec, -+ avcodec_find_decoder( CODEC_ID_DVVIDEO ), NULL ); - pthread_mutex_unlock( &avcodec_mutex ); - data = ( unsigned char* ) av_mallocz( 144000 ); - #if defined(HAVE_SWSCALE) -@@ -1338,7 +1339,7 @@ - if ( avformatEncoder ) - { - avformatEncoder->oformat = av_guess_format( "dv", NULL, NULL ); -- AVStream* vst = av_new_stream( avformatEncoder, 0 ); -+ AVStream* vst = avformat_new_stream( avformatEncoder, NULL ); - vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = CODEC_ID_DVVIDEO; - vst->codec->bit_rate = 25000000; -@@ -1364,12 +1365,10 @@ - vst->sample_aspect_ratio = avcodecEncoder->sample_aspect_ratio; - #endif - avcodecEncoder->thread_count = 2; -- avcodec_thread_init( avcodecEncoder, avcodecEncoder->thread_count ); - avcodecEncoder->time_base= isPAL ? ( AVRational ){ 1, 25 } : ( AVRational ){ 1001, 30000 }; - avcodecEncoder->pix_fmt = isPAL ? PIX_FMT_YUV420P : PIX_FMT_YUV411P; - avcodecEncoder->flags |= CODEC_FLAG_INTERLACED_DCT; -- av_set_parameters( avformatEncoder, NULL ); -- avcodec_open( avcodecEncoder, avcodec_find_encoder( CODEC_ID_DVVIDEO ) ); -+ avcodec_open2( avcodecEncoder, avcodec_find_encoder( CODEC_ID_DVVIDEO ), NULL ); - av_new_packet( &avpacketEncoder, 144000 ); - tempImage = ( uint8_t* ) av_malloc( - avpicture_get_size( avcodecEncoder->pix_fmt, avcodecEncoder->width, avcodecEncoder->height ) ); -@@ -1475,16 +1474,16 @@ - - // Encode - bytesInFrame = avcodec_encode_video( avcodecEncoder, avpacketEncoder.data, size, output ); -- url_open_buf( &avformatEncoder->pb, data, bytesInFrame, URL_WRONLY ); -+ avformatEncoder->pb = avio_alloc_context(data, bytesInFrame, 0, NULL, NULL, NULL, NULL); - avpacketEncoder.size = bytesInFrame; - if ( !isEncoderHeaderWritten ) - { -- av_write_header( avformatEncoder ); -+ avformat_write_header( avformatEncoder, NULL ); - isEncoderHeaderWritten = true; - } - av_write_frame( avformatEncoder, &avpacketEncoder ); - #if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0) -- url_close_buf( avformatEncoder->pb ); -+ avio_close( avformatEncoder->pb ); - #else - url_close_buf( &avformatEncoder->pb ); - #endif diff --git a/pkgs/applications/video/kino/kino-1.3.4-libavcodec-pkg-config.patch b/pkgs/applications/video/kino/kino-1.3.4-libavcodec-pkg-config.patch deleted file mode 100644 index d6a8953cf00..00000000000 --- a/pkgs/applications/video/kino/kino-1.3.4-libavcodec-pkg-config.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/kino-1.3.4/configure.in 2009-09-08 02:35:23.000000000 -0400 -+++ b/kino-1.3.4/configure.in 2014-01-27 14:53:01.366063037 -0500 -@@ -221,7 +221,7 @@ - if (test "x$avcodec_include" != x) || (test "x$avcodec_lib" != x) ; then - local_legacy_ffmpeg_test - else -- PKG_CHECK_MODULES(AVCODEC, libavformat, -+ PKG_CHECK_MODULES(AVCODEC, [libavcodec libavformat libavutil], - [ - AC_DEFINE(HAVE_LIBAVCODEC, 1, [Enable FFMPEG libavcodec]) - AC_SUBST(AVCODEC_LIBS) diff --git a/pkgs/applications/video/kino/kino-1.3.4-v4l1.patch b/pkgs/applications/video/kino/kino-1.3.4-v4l1.patch deleted file mode 100644 index 05ec7386709..00000000000 --- a/pkgs/applications/video/kino/kino-1.3.4-v4l1.patch +++ /dev/null @@ -1,21 +0,0 @@ -no-1.3.3.orig/ffmpeg/libavdevice/v4l.c 2011-05-17 02:20:37.161004916 +0400 -+++ kino-1.3.3.orig/ffmpeg/libavdevice/v4l.c 2011-05-17 02:21:57.302377529 +0400 -@@ -26,7 +26,7 @@ - #include - #include - #define _LINUX_TIME_H 1 --#include -+#include - #include - - typedef struct { ---- kino-1.3.3.orig/src/v4l.h 2011-05-17 02:20:38.896969666 +0400 -+++ kino-1.3.3.orig/src/v4l.h 2011-05-17 02:21:39.922730395 +0400 -@@ -40,7 +40,7 @@ - - #define _DEVICE_H_ - #define _LINUX_TIME_H --#include -+#include - - #include "displayer.h" diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 45c96fb180d..b9707e7c249 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -21,13 +21,13 @@ python3Packages.buildPythonApplication rec { pname = "pitivi"; - version = "2020.09.2"; + version = "2021.01"; format = "other"; src = fetchurl { - url = "mirror://gnome/sources/pitivi/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hzvv4wia4rk0kvq16y27imq2qd4q5lg3vx99hdcjdb1x3zqqfg0"; + url = "mirror://gnome/sources/pitivi/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0krzsrv19v3mwhbsm72ica6m3p8ijy0lbd0c3s87yd7pmbwld2c1"; }; patches = [ diff --git a/pkgs/applications/video/recapp/default.nix b/pkgs/applications/video/recapp/default.nix new file mode 100644 index 00000000000..7ec88af821e --- /dev/null +++ b/pkgs/applications/video/recapp/default.nix @@ -0,0 +1,81 @@ +{ lib +, python3 +, fetchFromGitHub +, appstream-glib +, desktop-file-utils +, gettext +, glib +, gobject-introspection +, gtk3 +, gst_all_1 +, libnotify +, librsvg +, meson +, ninja +, pkg-config +, slop +, wrapGAppsHook +}: + +python3.pkgs.buildPythonApplication rec { + pname = "recapp"; + version = "1.1.1"; + + format = "other"; + + src = fetchFromGitHub { + owner = "amikha1lov"; + repo = "RecApp"; + rev = "v${version}"; + sha256 = "08bpfcqgw0lj6j7y5b2i18kffawlzp6pfk4wdpmk29vwmgk9s9yc"; + }; + + postPatch = '' + patchShebangs build-aux/meson + ''; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gettext + glib + gtk3 + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + libnotify + librsvg + gobject-introspection + gtk3 + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pulsectl + pydbus + pygobject3 + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + "--prefix" "PATH" ":" "${lib.makeBinPath [ gst_all_1.gstreamer.dev slop ]}" + ) + ''; + + meta = with lib; { + description = "User friendly Open Source screencaster for Linux written in GTK"; + homepage = "https://github.com/amikha1lov/RecApp"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 0c7cbd853a2..f471ac8c064 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -17,6 +17,7 @@ , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen , cephSupport ? false, ceph +, glusterfsSupport ? false, glusterfs, libuuid , openGLSupport ? sdlSupport, mesa, epoxy, libdrm , virglSupport ? openGLSupport, virglrenderer , libiscsiSupport ? true, libiscsi @@ -72,6 +73,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] ++ optionals xenSupport [ xen ] ++ optionals cephSupport [ ceph ] + ++ optionals glusterfsSupport [ glusterfs libuuid ] ++ optionals openGLSupport [ mesa epoxy libdrm ] ++ optionals virglSupport [ virglrenderer ] ++ optionals libiscsiSupport [ libiscsi ] @@ -142,6 +144,7 @@ stdenv.mkDerivation rec { ++ optional gtkSupport "--enable-gtk" ++ optional xenSupport "--enable-xen" ++ optional cephSupport "--enable-rbd" + ++ optional glusterfsSupport "--enable-glusterfs" ++ optional openGLSupport "--enable-opengl" ++ optional virglSupport "--enable-virglrenderer" ++ optional tpmSupport "--enable-tpm" diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix index 505d1cb1520..de996f080e7 100644 --- a/pkgs/applications/window-managers/cagebreak/default.nix +++ b/pkgs/applications/window-managers/cagebreak/default.nix @@ -1,38 +1,75 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, wayland, scdoc, makeWrapper -, wlroots, wayland-protocols, pixman, libxkbcommon -, cairo , pango, fontconfig, pandoc, systemd, mesa -, withXwayland ? true, xwayland +{ lib +, stdenv +, fetchFromGitHub +, cairo +, fontconfig +, libxkbcommon +, makeWrapper +, mesa +, meson +, ninja , nixosTests +, pandoc +, pango +, pixman +, pkg-config +, scdoc +, systemd +, wayland +, wayland-protocols +, withXwayland ? true , xwayland +, wlroots }: stdenv.mkDerivation rec { pname = "cagebreak"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "project-repo"; - repo = "cagebreak"; + repo = pname; rev = version; - hash = "sha256-F7fqDVbJS6pVgmj6C1/l9PAaz5yzcYpaq6oc6a6v/Qk="; + hash = "sha256-HpAjJHu5sxZKof3ydnU3wcP5GpnH6Ax8m1T1vVoq+oI="; }; - nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + meson + ninja + pandoc + pkg-config + scdoc + wayland + ]; buildInputs = [ - wlroots wayland wayland-protocols pixman libxkbcommon cairo - pango fontconfig pandoc systemd + cairo + fontconfig + libxkbcommon mesa # for libEGL headers + pango + pixman + systemd + wayland + wayland-protocols + wlroots ]; - outputs = [ "out" "contrib" ]; + outputs = [ + "out" + "contrib" + ]; mesonFlags = [ - "-Dxwayland=${lib.boolToString withXwayland}" - "-Dversion_override=${version}" "-Dman-pages=true" + "-Dversion_override=${version}" + "-Dxwayland=${lib.boolToString withXwayland}" ]; + postPatch = '' + sed -i -e 's|||' *.c + ''; + postInstall = '' mkdir -p $contrib/share/cagebreak cp $src/examples/config $contrib/share/cagebreak/config diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index d8a1679bbed..2636d9100d5 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -3,6 +3,7 @@ , libxkbcommon, pcre, json_c, dbus, libevdev , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg , wlroots, wayland-protocols, libdrm +, nixosTests }: stdenv.mkDerivation rec { @@ -41,6 +42,8 @@ stdenv.mkDerivation rec { "-Dsd-bus-provider=libsystemd" ]; + passthru.tests.basic = nixosTests.sway; + meta = with lib; { description = "An i3-compatible tiling Wayland compositor"; longDescription = '' diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index fcbf5bcabe6..571d0eb687c 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -159,7 +159,7 @@ runCommand (add-to-list 'load-path "$out/share/emacs/site-lisp") (add-to-list 'exec-path "$out/bin") ${optionalString nativeComp '' - (add-to-list 'comp-eln-load-path "$out/share/emacs/native-lisp/") + (add-to-list 'native-comp-eln-load-path "$out/share/emacs/native-lisp/") ''} EOF # Link subdirs.el from the emacs distribution @@ -170,7 +170,7 @@ runCommand ${optionalString nativeComp '' $emacs/bin/emacs --batch \ - --eval "(add-to-list 'comp-eln-load-path \"$out/share/emacs/native-lisp/\")" \ + --eval "(add-to-list 'native-comp-eln-load-path \"$out/share/emacs/native-lisp/\")" \ -f batch-native-compile "$siteStart" "$subdirs" ''} ''; diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 4995efd9a4b..142a04f9a10 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -541,4 +541,37 @@ rec { phases = "unpackPhase patchPhase installPhase"; installPhase = "cp -R ./ $out"; }; + + /* Checks the command output contains the specified version + * + * Although simplistic, this test assures that the main program + * can run. While there's no substitute for a real test case, + * it does catch dynamic linking errors and such. It also provides + * some protection against accidentally building the wrong version, + * for example when using an 'old' hash in a fixed-output derivation. + * + * Examples: + * + * passthru.tests.version = testVersion { package = hello; }; + * + * passthru.tests.version = testVersion { + * package = seaweedfs; + * command = "weed version"; + * }; + * + * passthru.tests.version = testVersion { + * package = key; + * command = "KeY --help"; + * # Wrong '2.5' version in the code. Drop on next version. + * version = "2.5"; + * }; + */ + testVersion = + { package, + command ? "${package.meta.mainProgram or package.pname or package.name} --version", + version ? package.version, + }: runCommand "test-version" { nativeBuildInputs = [ package ]; meta.timeout = 60; } '' + ${command} | grep -Fw ${version} + touch $out + ''; } diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index 6e212209187..39fe4235f13 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "3.38.2"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1h9lyn80zccmgi6gpymabgrcj7km0sb1axll5z490qnx74xbn37m"; + url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "09ld9r29nz64s04fmp3b2wwldmfnwxp4w36dkh7mbz5pdd3z7fwk"; }; nativeBuildInputs = [ diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index 5129cf27188..dc0b8cc23eb 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -1,14 +1,12 @@ { lib, stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome3 }: -let +stdenv.mkDerivation rec { pname = "cantarell-fonts"; - version = "0.111"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "0.301"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "05hpnhihwm9sxlq1qn993g03pwkmpjbn0dvnba71r1gfjv0jp2w5"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "3d35db0ac03f9e6b0d5a53577591b714238985f4cfc31a0aa17f26cd74675e83"; }; nativeBuildInputs = [ meson ninja gettext appstream-glib ]; @@ -21,7 +19,7 @@ in stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "12ps2gjv1lmzbmkv16vgjmaahl3ayadpniyrx0z31sqn443r57hq"; + outputHash = "1sczskw2kv3qy39i9mzw2lkl94a90bjgv5ln9acy5kh4gb2zmy7z"; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/data/fonts/inter/default.nix index ed8e9eb13a6..00117840cd5 100644 --- a/pkgs/data/fonts/inter/default.nix +++ b/pkgs/data/fonts/inter/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "3.15"; + version = "3.18"; in fetchzip { name = "inter-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "0dnxczy2avc47wq5fc3psd1zbxbsjz5w24rkh5ynrfgw6n0753n0"; + sha256 = "sha256-+wbN1vSS8v1Z1VIfDNeY9DB8Kr6v7UnFg37EPPAD7wI="; meta = with lib; { homepage = "https://rsms.me/inter/"; diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index 77083268b0c..a7015c83563 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -1,12 +1,12 @@ { lib, fetchzip }: let - version = "0.035"; + version = "0.037"; in fetchzip { name = "JuliaMono-${version}"; url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono.zip"; - sha256 = "sha256:17w8rn37wadxnmakhd6mpmqdx14dsrc3qym4k9b47albl1a34i1j"; + sha256 = "06hyl7fri39s7jxjqayi00r83cbf1ca47h5xq55a19igdm1xl79q"; postFetch = '' mkdir -p $out/share/fonts/truetype @@ -16,7 +16,11 @@ in fetchzip { meta = with lib; { description = "A monospaced font for scientific and technical computing"; longDescription = '' - JuliaMono is a monospaced typeface designed for use in text editing environments that require a wide range of specialist and technical Unicode characters. It was intended as a fun experiment to be presented at the 2020 JuliaCon conference in Lisbon, Portugal (which of course didn’t physically happen in Lisbon, but online). + JuliaMono is a monospaced typeface designed for use in text editing + environments that require a wide range of specialist and technical Unicode + characters. It was intended as a fun experiment to be presented at the + 2020 JuliaCon conference in Lisbon, Portugal (which of course didn’t + physically happen in Lisbon, but online). ''; maintainers = with maintainers; [ suhr ]; platforms = with platforms; all; diff --git a/pkgs/data/fonts/stix-two/default.nix b/pkgs/data/fonts/stix-two/default.nix index 53c4143842d..c05c1273a48 100644 --- a/pkgs/data/fonts/stix-two/default.nix +++ b/pkgs/data/fonts/stix-two/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2.12"; + version = "2.13"; in fetchzip { name = "stix-two-${version}"; url = "https://github.com/stipub/stixfonts/raw/v${version}/zipfiles/STIX${builtins.replaceStrings [ "." ] [ "_" ] version}-all.zip"; - sha256 = "1a6v8p5zbjlv1gfhph0rzkvnmvxf4n1y0mdrdgng01yyl1nngrn9"; + sha256 = "sha256-cBtZe/oq4bQCscSAhJ4YuTSghDleD9O/+3MHOJyI50o="; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index f487edba981..fba9580107a 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -1,14 +1,19 @@ -{ lib, stdenv, fetchurl, gnome3 }: +{ lib, stdenv, fetchurl, gnome3, libxslt }: stdenv.mkDerivation rec { pname = "mobile-broadband-provider-info"; - version = "20190116"; + version = "20201225"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "16y5lc7pfdvai9c8xwb825zc3v46039gghbip13fqslf5gw11fic"; + sha256 = "1g9x2i4xjm2sagaha07n9psacbylrwfrmfqkp17gjwhpyi6w0zqd"; }; + nativeBuildInputs = [ + # fixes configure: error: xsltproc not found + libxslt + ]; + passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix index bcf6d69a65c..7cb28f0a008 100644 --- a/pkgs/data/themes/marwaita/default.nix +++ b/pkgs/data/themes/marwaita/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "8.0"; + version = "9.0"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0ljigm5z13r0idfkjgy5ysq9pzdj66ql269p5phhp47aagmjcv3s"; + sha256 = "12mgs9f8mwfpdpxdwyknw7zvgaqp96kzcv7fcrvrnm9i4ind5zra"; }; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 2f8163adc72..e634037b871 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -60,6 +60,7 @@ python3.pkgs.buildPythonApplication rec { updateScript = gnome3.updateScript { packageName = "accerciser"; attrPath = "gnome3.accerciser"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index 04c6b31563c..75c3060f51d 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -1,6 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , gettext , fetchurl +, fetchpatch , wrapGAppsHook , gnome-video-effects , libcanberra-gtk3 @@ -9,17 +11,13 @@ , glib , clutter-gtk , clutter-gst -, udev , gst_all_1 , itstool -, libgudev , vala , docbook_xml_dtd_43 -, docbook_xsl +, docbook-xsl-nons , appstream-glib , libxslt -, yelp-tools -, gnome-common , gtk-doc , adwaita-icon-theme , librsvg @@ -38,37 +36,37 @@ stdenv.mkDerivation rec { pname = "cheese"; version = "3.38.0"; + outputs = [ "out" "man" "devdoc" ]; + src = fetchurl { url = "mirror://gnome/sources/cheese/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0vyim2avlgq3a48rgdfz5g21kqk11mfb53b2l883340v88mp7ll8"; }; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { packageName = "cheese"; attrPath = "gnome3.cheese"; }; - }; + patches = [ + # Fix build with latest Vala or GLib + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/cheese/commit/7cf6268e54620bbbe5e6e61800c50fb0cb4bea57.patch"; + sha256 = "WJgGNrpZLTahe7Sxr8HdTl+4Mf4VcmJb6DdiInlDcT4="; + }) + ]; nativeBuildInputs = [ appstream-glib docbook_xml_dtd_43 - docbook_xsl + docbook-xsl-nons gettext - gnome-common gtk-doc itstool libxml2 - libxslt + libxslt # for xsltproc meson ninja pkg-config python3 vala wrapGAppsHook - yelp-tools + glib # for glib-compile-schemas ]; buildInputs = [ @@ -86,12 +84,13 @@ stdenv.mkDerivation rec { gst_all_1.gstreamer gtk3 libcanberra-gtk3 - libgudev librsvg - udev ]; - outputs = [ "out" "man" "devdoc" ]; + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; preFixup = '' gappsWrapperArgs+=( @@ -105,13 +104,18 @@ stdenv.mkDerivation rec { ) ''; - enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = "cheese"; + attrPath = "gnome3.cheese"; + }; + }; meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Cheese"; description = "Take photos and videos with your webcam, with fun graphical effects"; maintainers = teams.gnome.members; - license = licenses.gpl3; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 02801cd5a78..c6a2a3a6400 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -1,20 +1,21 @@ { lib, stdenv, fetchurl, glib, gtk3, meson, ninja, pkg-config, gnome3, gettext, itstool, libxml2, libarchive -, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }: +, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales +, unzip, cpio }: stdenv.mkDerivation rec { pname = "file-roller"; - version = "3.38.1"; + version = "3.40.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mxwdbfqizakxq65fa8zlvjf48v5f44lv8ckjw8sl8fk2871784l"; + sha256 = "039w1dcpa5ypmv6sm634alk9vbcdkyvy595vkh5gn032jsiqca2a"; }; LANG = "en_US.UTF-8"; # postinstall.py nativeBuildInputs = [ meson ninja gettext itstool pkg-config libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ]; - buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus ]; + buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus cpio ]; PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; @@ -24,6 +25,12 @@ stdenv.mkDerivation rec { patchShebangs data/set-mime-type-entry.py ''; + postFixup = '' + # Workaround because of https://gitlab.gnome.org/GNOME/file-roller/issues/40 + wrapProgram "$out/bin/file-roller" \ + --prefix PATH : ${lib.makeBinPath [ unzip ]} + ''; + passthru = { updateScript = gnome3.updateScript { packageName = "file-roller"; diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 79d31c3b8c7..1458d509e61 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "3.38.1"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/gedit/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0kc48a399achcz6vlqq0jk0b8ixbrzyv9xb22s5av76m5hyqalq0"; + url = "mirror://gnome/sources/gedit/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "149ngl9qw6h59546lir1pa7hvw23ppsnqlj9mfqphmmn5jl99qsm"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix index bff7c5fb281..2b0aedc9e3e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix @@ -18,7 +18,7 @@ , gdk-pixbuf , gsettings-desktop-schemas , adwaita-icon-theme -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_42 , desktop-file-utils , python3 @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "gnome-books"; - version = "3.34.0"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "153vknqisjn5f105avzm933fsc3v0pjzzbwxlqxf8vjjksh1cmya"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0c41l8m2di8h39bmk2fnhpwglwp6qhljmwqqbihzp4ay9976zrc5"; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gettext libxslt desktop-file-utils - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_42 wrapGAppsHook python3 @@ -77,7 +77,6 @@ stdenv.mkDerivation rec { }; meta = with lib; { - broken = true; # Tracker 3 not supported and it cannot start Tracker 2. homepage = "https://wiki.gnome.org/Apps/Books"; description = "An e-book manager application for GNOME"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 302fb7f8127..779bfe6886d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -19,7 +19,7 @@ , python3 , appstream-glib , spice-protocol -, libhandy_0 +, libhandy , libsoup , libosinfo , systemd @@ -53,11 +53,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "3.38.2"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1zjvng0izbws3506998l3dwsxjbm7wnhqipb8nmqzvi096czvajl"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "seKPLH+3a/T7uGLQ1S6BG5TL6f8W8GdAiWRWhpCILvg="; }; doCheck = true; @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { libcap libcap_ng libgudev - libhandy_0 + libhandy libosinfo librsvg libsecret @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple GNOME 3 application to access remote or virtual systems"; homepage = "https://wiki.gnome.org/Apps/Boxes"; - license = licenses.gpl3; + license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = teams.gnome.members; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index e15125a00bf..fae4149a131 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -25,25 +24,17 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "3.38.2"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0SG7NLCLbqYB9du6Q6SxYTpuVJP8Cx4uzJDGZnEakS0="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0d74hng9jdmwdcjgj4xfrcink2gwkbp1k1mad4wanaf7q31c6f38"; }; patches = [ - # Port to libhandy-1 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-calendar/-/commit/8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch"; - sha256 = "Ue0pWwcbYyCZPHPPoR0dXW5n948/AZ3wVDMTIZDOnyE="; - }) - # https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/84 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/84.patch"; - sha256 = "czG3uIHl3tBnjDUvCOPm8IRp2o7yZYCb0/jWtv3uzIY="; - }) + # A refactor has caused the PR patch to drift enough to need rebasing + ./gtk_image_reset_crash.patch ]; passthru = { diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/gtk_image_reset_crash.patch b/pkgs/desktops/gnome-3/apps/gnome-calendar/gtk_image_reset_crash.patch new file mode 100644 index 00000000000..5065295b57b --- /dev/null +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/gtk_image_reset_crash.patch @@ -0,0 +1,17 @@ +diff --git a/src/gui/views/gcal-year-view.c b/src/gui/views/gcal-year-view.c +index ac32a8f9..532425c1 100644 +--- a/src/gui/views/gcal-year-view.c ++++ b/src/gui/views/gcal-year-view.c +@@ -2158,7 +2158,11 @@ update_weather (GcalYearView *self) + if (!updated) + { + gtk_label_set_text (self->temp_label, ""); +- gtk_image_clear (self->weather_icon); ++ /* FIXME: This should never be NULL, but it somehow is. ++ * https://gitlab.gnome.org/GNOME/gnome-calendar/issues/299 ++ */ ++ if (self->weather_icon != NULL) ++ gtk_image_clear (self->weather_icon); + } + } + diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index 3a65be9440e..b5abee28380 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , meson , ninja @@ -13,6 +14,7 @@ , gobject-introspection , gjs , libunistring +, libhandy , gsettings-desktop-schemas , adwaita-icon-theme , gnome-desktop @@ -20,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "3.34.0"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-characters/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mqaxsa7hcmvid3zbzvxpfkp7s01ghiq6kaibmd3169axrr8ahql"; + url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0z2xa4w921bzpzj6gv88pvbrijcnnwni6jxynwz0ybaravyzaqha"; }; nativeBuildInputs = [ @@ -46,6 +48,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk3 libunistring + libhandy pango ]; @@ -76,10 +79,10 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Design/Apps/CharacterMap"; + homepage = "https://wiki.gnome.org/Apps/Characters"; description = "Simple utility application to find and insert unusual characters"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index a2caaf068eb..cd91cef6687 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "3.38.0"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-clocks/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0f24g76ax59qnms1rjfyf1i0sa84nadgbr0r6m26p90w1w2wnmnr"; + url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "02d3jg46sn8d9gd4dsaly22gg5vkbz2gpq4pmwpvncb4rsqk7sn2"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix deleted file mode 100644 index 82c40fc429d..00000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - pname = "gnome-getting-started-docs"; - version = "3.38.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-getting-started-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "EPviPyw85CdTmk4wekYWlNOHCyMgBGT3BbfYGvmTyFk="; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-getting-started-docs"; attrPath = "gnome3.gnome-getting-started-docs"; }; - }; - - buildInputs = [ intltool itstool libxml2 ]; - - meta = with lib; { - homepage = "https://live.gnome.org/DocumentationProject"; - description = "Help a new user get started in GNOME"; - maintainers = teams.gnome.members; - license = licenses.cc-by-sa-30; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index f0a80bc525a..673013c8e60 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "3.38.4"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-1WQekf/kePsqqcpIliJczxjsLqTZjjV2UXmBin2+RKM="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-mAXUwFs6NpV0bTdisoFr/+bZ19VuF7y7nZ1B3C0CYxo="; }; doCheck = true; @@ -82,6 +82,11 @@ stdenv.mkDerivation rec { "Exec=$out/bin/gnome-maps" ''; + preCheck = '' + # “time.js” included by “timeTest” and “translationsTest” depends on “org.gnome.desktop.interface” schema. + export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:$XDG_DATA_DIRS" + ''; + passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index be456071e41..b50ce59980f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -30,13 +30,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.38.2"; + version = "40.0"; format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0c2051wngf3jrifl5bv5kyqcci459n62vixxkryiryjcaqwbd1am"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1djqhd4jccvk352hwxjhiwjgbnv1qnpv450f2c6w6581vcn9pq38"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index c6d4a30ab0a..afeddd1bb99 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -12,10 +12,11 @@ , gtk3 , evolution-data-server , gnome-online-accounts +, json-glib , libuuid -, libhandy_0 +, curl +, libhandy , webkitgtk -, zeitgeist , gnome3 , libxml2 , gsettings-desktop-schemas @@ -24,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gnome-notes"; - version = "3.38.0"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/bijiben/${lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; - sha256 = "H/bMCsbGKQe/KgmhchXt0vF7dNrKs6XIminDBJFyvis="; + url = "mirror://gnome/sources/bijiben/${lib.versions.major version}/bijiben-${version}.tar.xz"; + sha256 = "1gvvb2klkzbmyzwkjgmscdiqcl8lyz9b0rxb4igjz079csq6z805"; }; doCheck = true; @@ -53,19 +54,19 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 + json-glib libuuid - libhandy_0 # doesn't support libhandy-1 yet + curl + libhandy webkitgtk tracker gnome-online-accounts - zeitgeist gsettings-desktop-schemas evolution-data-server gnome3.adwaita-icon-theme ]; mesonFlags = [ - "-Dzeitgeist=true" "-Dupdate_mimedb=false" ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix index 6cc5c2ab783..3b34fae714c 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gnome-sound-recorder"; - version = "3.38.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "2Z6k+WPsEInpzVl6fUQ5ihHs7xMeQUInGhyQwVuqRSE="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "00b55vsfzx877b7mj744abzjws7zclz71wbvh0axsrbl9l84ranl"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index 9a5079dfc64..6cbfea0f5cf 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -1,19 +1,49 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection -, libgweather, meson, ninja, geoclue2, gnome-desktop, python3, gsettings-desktop-schemas }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gnome3 +, gtk3 +, libhandy +, wrapGAppsHook +, gjs +, gobject-introspection +, libgweather +, meson +, ninja +, geoclue2 +, gnome-desktop +, python3 +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "3.36.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-weather/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11z75ky6xp9hx7lm24xng7ydr20bzh4d6p9sbi9c8ccz2m3fdrk8"; + url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1vxfcvga5waangq3rzwdrdxyy5sw40vv0l463lc651s0n8xafd9a"; }; - nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook python3 ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + wrapGAppsHook + python3 + ]; + buildInputs = [ - gtk3 gjs gobject-introspection gnome-desktop - libgweather gnome3.adwaita-icon-theme geoclue2 gsettings-desktop-schemas + gtk3 + libhandy + gjs + gobject-introspection + gnome-desktop + libgweather + gnome3.adwaita-icon-theme + geoclue2 + gsettings-desktop-schemas ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 60ec6792e5d..e44f094be1b 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "seahorse"; - version = "3.38.0.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-x0XdHebhog8ZorB6Q4uO98yiNaaqc0ENt/E3sCHpsqI="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + hash = "sha256-fscFezhousbqBB/aghQKOfXsnlsYi0UJFNRTvC1V0Cw="; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index a1be29b0183..ceffe2f012b 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "3.38.0"; + version = "40.1.1"; src = fetchurl { - url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15xgz9wzk07442x3s3052as95g0223z4pp9qlsgcs323yama30v6"; + url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "C2xDbtatmIeoitofcqAZex63OwINjTRKurTH+nJQ+PY="; }; # For convenience, we can specify adwaita-icon-theme only in packages diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index 81faf79cbb6..386502a854b 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -1,20 +1,50 @@ -{ lib, stdenv, gettext, fetchurl, vala, desktop-file-utils -, meson, ninja, pkg-config, python3, gtk3, glib, libxml2 -, wrapGAppsHook, itstool, gnome3 }: +{ stdenv +, lib +, gettext +, fetchurl +, vala +, desktop-file-utils +, meson +, ninja +, pkg-config +, python3 +, gtk3 +, libhandy +, glib +, libxml2 +, wrapGAppsHook +, itstool +, gnome3 +}: -let +stdenv.mkDerivation rec { pname = "baobab"; - version = "3.38.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ac3fbl15l836yvgw724q4whbkws9v4b6l2xy6bnp0b0g0a6i104"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "19yii3bdgivxrcka1c4g6dpbmql5nyawwhzlsph7z6bs68nambm6"; }; - nativeBuildInputs = [ meson ninja pkg-config vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook python3 ]; - buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + gettext + itstool + libxml2 + desktop-file-utils + wrapGAppsHook + python3 + ]; + + buildInputs = [ + gtk3 + libhandy + glib + gnome3.adwaita-icon-theme + ]; doCheck = true; @@ -27,7 +57,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Graphical application to analyse disk usage in any GNOME environment"; homepage = "https://wiki.gnome.org/Apps/DiskUsageAnalyzer"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 1374cfc9358..aab9a0db42b 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -1,21 +1,51 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, libxslt, pkg-config, glib, gtk3, gnome3, python3, dconf -, libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }: +{ lib +, stdenv +, fetchurl +, meson +, ninja +, vala +, libxslt +, pkg-config +, glib +, gtk3 +, gnome3 +, python3 +, dconf +, libxml2 +, gettext +, docbook-xsl-nons +, wrapGAppsHook +, gobject-introspection +}: stdenv.mkDerivation rec { pname = "dconf-editor"; - version = "3.38.2"; + version = "3.38.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ElPa2H5iE/vzE/+eydxDWKobECYfKAcsHcDgmXuS+DU="; + sha256 = "sha256-Vxr0x9rU8Em1PmzXKLea3fCMJ92ra8V7OW0hGGbueeM="; }; nativeBuildInputs = [ - meson ninja vala libxslt pkg-config wrapGAppsHook - gettext docbook_xsl libxml2 gobject-introspection python3 + meson + ninja + vala + libxslt + pkg-config + wrapGAppsHook + gettext + docbook-xsl-nons + libxml2 + gobject-introspection + python3 ]; - buildInputs = [ glib gtk3 dconf ]; + buildInputs = [ + glib + gtk3 + dconf + ]; postPatch = '' chmod +x meson_post_install.py @@ -30,7 +60,10 @@ stdenv.mkDerivation rec { }; meta = with lib; { - platforms = platforms.linux; + description = "GSettings editor for GNOME"; + homepage = "https://wiki.gnome.org/Apps/DconfEditor"; + license = licenses.gpl3Plus; maintainers = teams.gnome.members; + platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index cec0ac7a681..671a6645674 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "3.38.2"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ilT9+T4wag9khToYgxrIwEg4IEdxBqrgvcAKrDc4bw4="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-e+CGA3/tm2v4S6yXqD48kYMBt+nJavEwsnJS0KURFok="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 9f949b60738..349a1c024e4 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -19,6 +19,7 @@ , libsecret , gnome-desktop , libnotify +, libarchive , p11-kit , sqlite , gcr @@ -36,18 +37,13 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "3.38.2"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0v8iymg72m83ikxxyhapvz5v8zh8hlr1pw7n215cy3p8q6yg41cb"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1l0sb1xg16g4wg3z99xb0w2kbyczbn7q4mphs3w4lxq22xml4sk9"; }; - # Tests need an X display - mesonFlags = [ - "-Dunit_tests=disabled" - ]; - nativeBuildInputs = [ desktop-file-utils gettext @@ -83,6 +79,7 @@ stdenv.mkDerivation rec { libhandy libportal libnotify + libarchive libsecret libsoup libxml2 @@ -92,6 +89,11 @@ stdenv.mkDerivation rec { webkitgtk ]; + # Tests need an X display + mesonFlags = [ + "-Dunit_tests=disabled" + ]; + postPatch = '' chmod +x post_install.py # patchShebangs requires executable file patchShebangs post_install.py @@ -107,7 +109,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Epiphany"; description = "WebKit based web browser for GNOME"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 31828bad0af..59eb31e1918 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -19,6 +19,7 @@ , djvulibre , libspectre , libarchive +, libhandy , libsecret , wrapGAppsHook , librsvg @@ -43,13 +44,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "3.38.2"; + version = "40.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/evince/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "J9QZ1f7WMF4HRijtz94MtzT//aIF1jysMjORwEkDvZQ="; + url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0bfg7prmjk3z8irx1nfkkqph3igg3cy4pwd7pcxjxbshqdin6rks"; }; postPatch = '' @@ -86,6 +87,7 @@ stdenv.mkDerivation rec { gspell gtk3 libarchive + libhandy librsvg libsecret libspectre diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index dc43bdfd493..dc3f4b493b0 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.38.4"; + version = "3.40.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "rFPxay1R8+f/gCX5yhn0otTOOEHXKun+K7iX3ICZ1wU="; + sha256 = "08iykha7zhk21b3axsp3v1jfwda612v0m8rz8zlzppm5i8s5ziza"; }; patches = [ @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = "evolution-data-server"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 324ab865b11..6c1db6cebd9 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -42,13 +42,13 @@ in stdenv.mkDerivation rec { pname = "gdm"; - version = "3.38.2.1"; + version = "40.0"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/gdm/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "yliiBdXr/L2rVqEXFriY4Wrl3/Ia7nnQdgRkRGKOxNo="; + url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "XtdLc506Iy/7HkoTK8+WW9/pVdmVtSh3NYh3WwLylQ4="; }; mesonFlags = [ @@ -90,10 +90,13 @@ stdenv.mkDerivation rec { ]; patches = [ - # https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/112 + # GDM fails to find g-s with the following error in the journal. + # gdm-x-session[976]: dbus-run-session: failed to exec 'gnome-session': No such file or directory + # https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/92 (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gdm/-/commit/1d28d4b3568381b8590d2235737b924aefd1746c.patch"; - sha256 = "ZUXKZS4T0o0hzrApxaqcR0txCRv5zBgqeQ9K9fLNX1o="; + url = "https://gitlab.gnome.org/GNOME/gdm/-/commit/ccecd9c975d04da80db4cd547b67a1a94fa83292.patch"; + sha256 = "5hKS9wjjhuSAYwXct5vS0dPbmPRIINJoLC0Zm1naz6Q="; + revert = true; }) # Change hardcoded paths to nix store paths. diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix index 36bf7b3e92c..2ce52911595 100644 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "3.38.0"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1qqygm15rcdgm36vz2iy7b9axndjzvpi29lmygyakjc07a3jlwgp"; + url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "YN+KDaMBzkJbcEPUKuMuxAEf8I8Y4Pxi8pQBMF2jpw4="; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index 2397b9d7be9..e057cc61da8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -1,28 +1,62 @@ -{ lib, stdenv, fetchurl, gnome3, meson, ninja, pkg-config, gtk3, intltool, glib -, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobject-introspection -, gtk-doc, docbook_xsl, docbook_xml_dtd_43, python3, gsettings-desktop-schemas }: +{ lib +, stdenv +, fetchurl +, gnome3 +, meson +, ninja +, pkg-config +, gtk3 +, gettext +, glib +, udev +, itstool +, libxml2 +, wrapGAppsHook +, libnotify +, libcanberra-gtk3 +, gobject-introspection +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, python3 +, gsettings-desktop-schemas +}: -let +stdenv.mkDerivation rec { pname = "gnome-bluetooth"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "3.34.3"; + version = "3.34.5"; # TODO: split out "lib" outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "08k4jak4r72pvn5kjhm21planyc514j6c7jjj5lv9nmvvlxqw1ha"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1a9ynlwwkb3wpg293ym517vmrkk63y809mmcv9a21k5yr199x53c"; }; nativeBuildInputs = [ - meson ninja intltool itstool pkg-config libxml2 wrapGAppsHook gobject-introspection - gtk-doc docbook_xsl docbook_xml_dtd_43 python3 + meson + ninja + gettext + itstool + pkg-config + libxml2 + wrapGAppsHook + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + python3 ]; + buildInputs = [ - glib gtk3 udev libnotify libcanberra-gtk3 - gnome3.adwaita-icon-theme gsettings-desktop-schemas + glib + gtk3 + udev + libnotify + libcanberra-gtk3 + gnome3.adwaita-icon-theme + gsettings-desktop-schemas ]; mesonFlags = [ @@ -46,7 +80,7 @@ in stdenv.mkDerivation rec { homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en"; description = "Application that let you manage Bluetooth in the GNOME destkop"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index e033197b347..4bf317a4a26 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -1,25 +1,63 @@ -{ lib, stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkg-config, libxml2 -, gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3 -, gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas, libgee }: +{ stdenv +, lib +, meson +, ninja +, vala +, gettext +, itstool +, fetchurl +, pkg-config +, libxml2 +, gtk3 +, glib +, gtksourceview4 +, wrapGAppsHook +, gobject-introspection +, python3 +, gnome3 +, mpfr +, gmp +, libsoup +, libmpc +, libhandy +, gsettings-desktop-schemas +, libgee +}: stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "3.38.2"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-calculator/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0sri58cp6v07cqpdsf8dhf9dnykz305kvkx0l9dd25g06djcr0wc"; + url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1xkazxbkpn1z5pfphhps7fc5q4yc8lp7f6b222n8bx5iyxhwbrkz"; }; nativeBuildInputs = [ - meson ninja pkg-config vala gettext itstool wrapGAppsHook python3 + meson + ninja + pkg-config + vala + gettext + itstool + wrapGAppsHook + python3 gobject-introspection # for finding vapi files ]; buildInputs = [ - gtk3 glib libxml2 gtksourceview4 mpfr gmp - gnome3.adwaita-icon-theme libgee - gsettings-desktop-schemas libsoup libmpc + gtk3 + glib + libxml2 + gtksourceview4 + mpfr + gmp + gnome3.adwaita-icon-theme + libgee + gsettings-desktop-schemas + libsoup + libmpc + libhandy ]; doCheck = true; @@ -29,6 +67,11 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; + preCheck = '' + # Currency conversion test tries to store currency data in $HOME/.cache. + export HOME=$TMPDIR + ''; + passthru = { updateScript = gnome3.updateScript { packageName = "gnome-calculator"; @@ -40,7 +83,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Calculator"; description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; maintainers = teams.gnome.members; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index ef5e564beb9..3146ca717d3 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -17,6 +17,7 @@ , gnome-online-accounts , wrapGAppsHook , folks +, libgdata , libxml2 , gnome3 , vala @@ -28,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "3.38.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-contacts/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hsq0dwxjahcaxnm1m4r1lync9k2fkwzybfmkchrmn95vqcwwvf9"; + url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0w2g5xhw65adzvwzakrj5kaim4sw1w7s8qqwm3nm6inq50znzpn9"; }; propagatedUserEnvPkgs = [ @@ -58,6 +59,7 @@ stdenv.mkDerivation rec { evolution-data-server gsettings-desktop-schemas folks + libgdata # required by some dependency transitively gnome-desktop libhandy libxml2 diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index f8c458a3df1..371f2d794a0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -1,6 +1,7 @@ { fetchurl -, fetchFromGitLab -, lib, stdenv +, fetchpatch +, lib +, stdenv , substituteAll , accountsservice , adwaita-icon-theme @@ -10,7 +11,7 @@ , colord , colord-gtk , cups -, docbook_xsl +, docbook-xsl-nons , fontconfig , gdk-pixbuf , gettext @@ -69,20 +70,32 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "3.38.4"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-SdxjeNTTXBxu1ZIk9WNpFsK2+km7+4tW6xmoTW6QzRk="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-zMmlc2UXOFEJrlpZkGwlgkTdh5t1A61ZhM9BZVyzAvE="; }; - # See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html - prePatch = (import ../gvc-with-ucm-prePatch.nix { - inherit fetchFromGitLab; - }); + patches = [ + (substituteAll { + src = ./paths.patch; + gcm = gnome-color-manager; + gnome_desktop = gnome-desktop; + inherit glibc libgnomekbd tzdata; + inherit cups networkmanagerapplet; + }) + + # Fix startup assertion in power panel. + # https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/974 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/9acaa10567c94048657c69538e5d7813f82c4224.patch"; + sha256 = "59GeTPcG2UiVTL4VTS/TP0p0QkAQpm3VgvuAiw64wUU="; + }) + ]; nativeBuildInputs = [ - docbook_xsl + docbook-xsl-nons gettext libxslt meson @@ -142,16 +155,6 @@ stdenv.mkDerivation rec { upower ]; - patches = [ - (substituteAll { - src = ./paths.patch; - gcm = gnome-color-manager; - gnome_desktop = gnome-desktop; - inherit glibc libgnomekbd tzdata; - inherit cups networkmanagerapplet; - }) - ]; - postPatch = '' chmod +x build-aux/meson/meson_post_install.py # patchShebangs requires executable file patchShebangs build-aux/meson/meson_post_install.py diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch index 361972f2635..a6787477b81 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch @@ -1,26 +1,26 @@ diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c -index 49ca35220..adefb87b9 100644 +index 603178efc..c363a6a5c 100644 --- a/panels/color/cc-color-panel.c +++ b/panels/color/cc-color-panel.c -@@ -599,7 +599,7 @@ gcm_prefs_calibrate_cb (GtkWidget *widget, CcColorPanel *prefs) +@@ -591,7 +591,7 @@ gcm_prefs_calibrate_cb (CcColorPanel *prefs) /* run with modal set */ argv = g_ptr_array_new_with_free_func (g_free); -- g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-calibrate", NULL)); +- g_ptr_array_add (argv, g_strdup ("gcm-calibrate")); + g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL)); g_ptr_array_add (argv, g_strdup ("--device")); g_ptr_array_add (argv, g_strdup (cd_device_get_id (prefs->current_device))); g_ptr_array_add (argv, g_strdup ("--parent-window")); -@@ -1038,7 +1038,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile) +@@ -1029,7 +1029,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile) /* open up gcm-viewer as a info pane */ argv = g_ptr_array_new_with_free_func (g_free); -- g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-viewer", NULL)); +- g_ptr_array_add (argv, g_strdup ("gcm-viewer")); + g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-viewer", NULL)); g_ptr_array_add (argv, g_strdup ("--profile")); g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile))); g_ptr_array_add (argv, g_strdup ("--parent-window")); -@@ -1288,15 +1288,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device) +@@ -1275,15 +1275,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device) static void gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device) { @@ -38,12 +38,12 @@ index 49ca35220..adefb87b9 100644 else gtk_widget_set_sensitive (prefs->toolbutton_profile_view, FALSE); diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h -index 96b25140c..1ad704d4a 100644 +index a2376f8a4..98769e08f 100644 --- a/panels/datetime/tz.h +++ b/panels/datetime/tz.h @@ -27,11 +27,7 @@ - #include + G_BEGIN_DECLS -#ifndef __sun -# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" @@ -55,25 +55,42 @@ index 96b25140c..1ad704d4a 100644 typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c -index 4541986db..da7826bfe 100644 +index bd0e07762..0e71351f8 100644 --- a/panels/info-overview/cc-info-overview-panel.c +++ b/panels/info-overview/cc-info-overview-panel.c -@@ -169,7 +169,7 @@ load_gnome_version (char **version, +@@ -172,7 +172,7 @@ load_gnome_version (char **version, gsize length; g_autoptr(VersionData) data = NULL; - + - if (!g_file_get_contents (DATADIR "/gnome/gnome-version.xml", + if (!g_file_get_contents ("@gnome_desktop@/share/gnome/gnome-version.xml", &contents, &length, &error)) +diff --git a/panels/keyboard/cc-input-list-box.c b/panels/keyboard/cc-input-list-box.c +index 6c2cb5614..8f57159cc 100644 +--- a/panels/keyboard/cc-input-list-box.c ++++ b/panels/keyboard/cc-input-list-box.c +@@ -223,10 +223,10 @@ row_layout_cb (CcInputListBox *self, + layout_variant = cc_input_source_get_layout_variant (source); + + if (layout_variant && layout_variant[0]) +- commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"", ++ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"", + layout, layout_variant); + else +- commandline = g_strdup_printf ("gkbd-keyboard-display -l %s", ++ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s", + layout); + + g_spawn_command_line_async (commandline, NULL); diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c -index 9390a3308..d30b4a68e 100644 +index 505b8ee25..62e94009f 100644 --- a/panels/network/connection-editor/net-connection-editor.c +++ b/panels/network/connection-editor/net-connection-editor.c -@@ -278,9 +278,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) +@@ -267,9 +267,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) g_autoptr(GError) error = NULL; - + if (self->is_new_connection) { - cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type); + cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --type='%s' --create", type); @@ -84,19 +101,20 @@ index 9390a3308..d30b4a68e 100644 } diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-bluetooth.c +index 74dfb0e9a..5f53d1a20 100644 --- a/panels/network/net-device-bluetooth.c +++ b/panels/network/net-device-bluetooth.c @@ -90,7 +90,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self) update_off_switch_from_device_state (self->device_off_switch, state, self); - + /* set up the Options button */ - path = g_find_program_in_path ("nm-connection-editor"); + path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); gtk_widget_set_visible (GTK_WIDGET (self->options_button), state != NM_DEVICE_STATE_UNMANAGED && path != NULL); } - + @@ -141,7 +141,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self) - + connection = net_device_get_find_connection (self->client, self->device); uuid = nm_connection_get_uuid (connection); - cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid); @@ -105,19 +123,20 @@ diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-b if (!g_spawn_command_line_async (cmdline, &error)) g_warning ("Failed to launch nm-connection-editor: %s", error->message); @@ -185,7 +185,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self) - + gtk_widget_init_template (GTK_WIDGET (self)); - + - path = g_find_program_in_path ("nm-connection-editor"); + path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL); } - + diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c +index 34eb86241..50d0a2bed 100644 --- a/panels/network/net-device-mobile.c +++ b/panels/network/net-device-mobile.c -@@ -484,7 +484,7 @@ options_button_clicked_cb (NetDeviceMobile *self) - +@@ -508,7 +508,7 @@ options_button_clicked_cb (NetDeviceMobile *self) + connection = net_device_get_find_connection (self->client, self->device); uuid = nm_connection_get_uuid (connection); - cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid); @@ -125,21 +144,21 @@ diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobi g_debug ("Launching '%s'\n", cmdline); if (!g_spawn_command_line_async (cmdline, &error)) g_warning ("Failed to launch nm-connection-editor: %s", error->message); -@@ -776,7 +776,7 @@ net_device_mobile_init (NetDeviceMobile *self) - +@@ -797,7 +797,7 @@ net_device_mobile_init (NetDeviceMobile *self) + self->cancellable = g_cancellable_new (); - + - path = g_find_program_in_path ("nm-connection-editor"); + path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL); } - + diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c -index f53ba217e..d24bcaeb9 100644 +index a31a606e3..ed5133d29 100644 --- a/panels/printers/pp-host.c +++ b/panels/printers/pp-host.c @@ -256,7 +256,7 @@ _pp_host_get_snmp_devices_thread (GTask *task, - devices = g_new0 (PpDevicesList, 1); + devices = g_ptr_array_new_with_free_func (g_object_unref); argv = g_new0 (gchar *, 3); - argv[0] = g_strdup ("/usr/lib/cups/backend/snmp"); @@ -147,25 +166,8 @@ index f53ba217e..d24bcaeb9 100644 argv[1] = g_strdup (priv->hostname); /* Use SNMP to get printer's informations */ -diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c -index 35859526d..21486c917 100644 ---- a/panels/region/cc-region-panel.c -+++ b/panels/region/cc-region-panel.c -@@ -755,10 +755,10 @@ row_layout_cb (CcRegionPanel *self, - layout_variant = cc_input_source_get_layout_variant (source); - - if (layout_variant && layout_variant[0]) -- commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"", -+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"", - layout, layout_variant); - else -- commandline = g_strdup_printf ("gkbd-keyboard-display -l %s", -+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s", - layout); - - g_spawn_command_line_async (commandline, NULL); diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c -index 00239ce0f..617c98870 100644 +index 86f53d4fc..0b052856f 100644 --- a/panels/user-accounts/run-passwd.c +++ b/panels/user-accounts/run-passwd.c @@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index c6d8b319308..4294e2db240 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,29 +1,40 @@ -{ lib, stdenv, fetchurl, substituteAll, pkg-config, libxslt, ninja, gnome3, gtk3, glib -, gettext, libxml2, xkeyboard_config, isocodes, meson, wayland -, libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }: +{ lib +, stdenv +, fetchurl +, substituteAll +, pkg-config +, libxslt +, ninja +, gnome3 +, gtk3 +, glib +, gettext +, libxml2 +, xkeyboard_config +, libxkbcommon +, isocodes +, meson +, wayland +, libseccomp +, systemd +, bubblewrap +, gobject-introspection +, gtk-doc +, docbook-xsl-nons +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "3.38.4"; + version = "40.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-desktop/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-P2A+pb/UdyLJLPybiFRGtGJg6gnIz7Y/a92f7+NC5Iw="; + url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-igeJcwUhnFaZVJriBI9xVVFe+Xx85NZYXd2hXVhZ4c8="; }; - nativeBuildInputs = [ - pkg-config meson ninja gettext libxslt libxml2 gobject-introspection - gtk-doc docbook_xsl glib - ]; - buildInputs = [ - bubblewrap xkeyboard_config isocodes wayland - gtk3 glib libseccomp systemd - ]; - - propagatedBuildInputs = [ gsettings-desktop-schemas ]; - patches = [ (substituteAll { src = ./bubblewrap-paths.patch; @@ -32,11 +43,42 @@ stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + gettext + libxslt + libxml2 + gobject-introspection + gtk-doc + docbook-xsl-nons + glib + ]; + + buildInputs = [ + bubblewrap + xkeyboard_config + libxkbcommon # for xkbregistry + isocodes + wayland + gtk3 + glib + libseccomp + systemd + ]; + + propagatedBuildInputs = [ + gsettings-desktop-schemas + ]; + mesonFlags = [ "-Dgtk_doc=true" "-Ddesktop_docs=false" ]; + separateDebugInfo = stdenv.isLinux; + passthru = { updateScript = gnome3.updateScript { packageName = "gnome-desktop"; @@ -46,7 +88,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library with common API for various GNOME modules"; - license = with licenses; [ gpl2 lgpl2 ]; + homepage = "https://gitlab.gnome.org/GNOME/gnome-desktop"; + license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.linux; maintainers = teams.gnome.members; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index bb602c8b3fa..8ff4145a271 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -1,24 +1,16 @@ -{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, desktop-file-utils, appstream-glib, libxslt +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, desktop-file-utils, appstream-glib, libxslt , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 , gnome3, gtk3, glib, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gnome-dictionary"; - version = "3.26.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300"; + url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1d8dhcfys788vv27v34i3s3x3jdvdi2kqn2a5p8c937a9hm0qr9f"; }; - patches = [ - # fix AppStream validation - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-dictionary/commit/1c94d612030ef87c6e26a01a490470b71c39e341.patch"; - sha256 = "0cbswmhs9mks3gsc0iy4wnidsa8sfzzf4s1kgvb80qwffgxz5m8b"; - }) - ]; - doCheck = true; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 5c573d2502c..87b89c3a05b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -1,26 +1,66 @@ -{ lib, stdenv, gettext, fetchurl, pkg-config, udisks2, libsecret, libdvdread -, meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify -, itstool, gnome3, libxml2, gsettings-desktop-schemas -, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality, systemd }: +{ lib +, stdenv +, gettext +, fetchurl +, pkg-config +, udisks2 +, libhandy +, libsecret +, libdvdread +, meson +, ninja +, gtk3 +, glib +, wrapGAppsHook +, python3 +, libnotify +, itstool +, gnome3 +, libxml2 +, gsettings-desktop-schemas +, libcanberra-gtk3 +, libxslt +, docbook-xsl-nons +, libpwquality +, systemd +}: stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "3.38.2"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-EL7d5UlL6zTjoiDW8w2TIMiCUv7rhCa9mM760YNteOk="; + url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-KkuZrBHKIzlLKMVYS56WKE6MWk2mXPBiB95U9Csf8UE="; }; nativeBuildInputs = [ - meson ninja pkg-config gettext itstool libxslt docbook_xsl - wrapGAppsHook python3 libxml2 + meson + ninja + pkg-config + gettext + itstool + libxslt + docbook-xsl-nons + wrapGAppsHook + python3 + libxml2 ]; buildInputs = [ - gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 - udisks2 gnome3.adwaita-icon-theme systemd - gnome3.gnome-settings-daemon gsettings-desktop-schemas + gtk3 + glib + libhandy + libsecret + libpwquality + libnotify + libdvdread + libcanberra-gtk3 + udisks2 + gnome3.adwaita-icon-theme + systemd + gnome3.gnome-settings-daemon + gsettings-desktop-schemas ]; postPatch = '' @@ -36,10 +76,10 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://en.wikipedia.org/wiki/GNOME_Disks"; + homepage = "https://wiki.gnome.org/Apps/Disks"; description = "A udisks graphical front-end"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 83563c7d212..6e9b6d22f57 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, meson, ninja, gettext, fetchurl -, pkg-config, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme +, pkg-config, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme, libhandy , wrapGAppsHook, gnome3, harfbuzz }: stdenv.mkDerivation rec { pname = "gnome-font-viewer"; - version = "3.34.0"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12xrsqwmvid7hksiw4zhj4jd1qwxn8w0czskbq4yqfprwn1havxa"; + url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0hpyi0sz3gcqqs9lkwyk8b6hr39m3n27432x98kxr436jj37dk6j"; }; doCheck = true; nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook libxml2 ]; - buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme harfbuzz ]; + buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme harfbuzz libhandy ]; # Do not run meson-postinstall.sh preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch index d4065c14499..23237595225 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch @@ -5,29 +5,10 @@ Date: Sun, 20 Sep 2020 14:46:59 -0400 Subject: [PATCH] fix paths --- - data/gnome-welcome-tour | 4 ++-- gnome-initial-setup/pages/keyboard/cc-input-chooser.c | 6 +++--- gnome-initial-setup/pages/timezone/tz.h | 4 ++-- - 3 files changed, 7 insertions(+), 7 deletions(-) + 3 files changed, 5 insertions(+), 5 deletions(-) -diff --git a/data/gnome-welcome-tour b/data/gnome-welcome-tour -index 51c9b59..68ab0c4 100755 ---- a/data/gnome-welcome-tour -+++ b/data/gnome-welcome-tour -@@ -3,11 +3,11 @@ - cfgdir=${XDG_CONFIG_DIR:-$HOME/.config} - - # Don't do anything if gnome-tour isn't installed --gnome_tour_path=$(which gnome-tour 2>/dev/null) -+gnome_tour_path="@gnome_tour@" - if test -z "${gnome_tour_path}"; then - rm -f $cfgdir/run-welcome-tour - exit - fi - --gnome-tour -+@gnome_tour@ - rm -f $cfgdir/run-welcome-tour diff --git a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c index 196abf6..613d0e5 100644 --- a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index 435da4e3720..6cf549dc5ca 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -14,7 +14,6 @@ , geocode-glib , glib , gnome-desktop -, gnome-getting-started-docs , gnome-online-accounts , gtk3 , libgweather @@ -32,18 +31,24 @@ , tzdata , libgnomekbd , gsettings-desktop-schemas -, gnome-tour }: stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "3.38.4"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "001jdzsvc541qracn68r609pr5qwymrh85xrqmvzzc1dbg5w3mlg"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "10zf87n6c947k9rkk2rqc9cbfwcvq23axq3rf7x1an7npv3414gi"; }; + patches = [ + (substituteAll { + src = ./0001-fix-paths.patch; + inherit tzdata libgnomekbd; + }) + ]; + nativeBuildInputs = [ gettext meson @@ -61,7 +66,6 @@ stdenv.mkDerivation rec { geocode-glib glib gnome-desktop - gnome-getting-started-docs gnome-online-accounts gsettings-desktop-schemas gtk3 @@ -78,14 +82,6 @@ stdenv.mkDerivation rec { webkitgtk ]; - patches = [ - (substituteAll { - src = ./0001-fix-paths.patch; - inherit tzdata libgnomekbd; - gnome_tour = "${gnome-tour}/bin/gnome-tour"; - }) - ]; - mesonFlags = [ "-Dcheese=disabled" "-Dibus=disabled" diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 93453cc72e9..833f58f74a4 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -1,51 +1,72 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, dbus, libgcrypt, pam, python2, glib, libxslt -, gettext, gcr, libcap_ng, libselinux, p11-kit, openssh, wrapGAppsHook -, docbook_xsl, docbook_xml_dtd_43, gnome3 }: +{ lib +, stdenv +, fetchurl +, pkg-config +, dbus +, libgcrypt +, pam +, python2 +, glib +, libxslt +, gettext +, gcr +, libcap_ng +, libselinux +, p11-kit +, openssh +, wrapGAppsHook +, docbook-xsl-nons +, docbook_xml_dtd_43 +, gnome3 +}: stdenv.mkDerivation rec { pname = "gnome-keyring"; - version = "3.36.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-keyring/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11sgffrrpss5cmv3b717pqlbhgq17l1xd33fsvqgsw8simxbar52"; - }; - - patches = [ - # version 3.36.0 is incompatible with libncap_ng >= 0.8.1. remove patch after update. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-keyring/-/commit/ebc7bc9efacc17049e54da8d96a4a29943621113.diff"; - sha256 = "07bx7zmdswqsa3dj37m729g35n1prhylkw7ya8a7h64i10la12cs"; - }) - ]; + version = "40.0"; outputs = [ "out" "dev" ]; - buildInputs = [ - glib libgcrypt pam openssh libcap_ng libselinux - gcr p11-kit - ]; + src = fetchurl { + url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0cdrlcw814zayhvlaxqs1sm9bqlfijlp22dzzd0g5zg2isq4vlm3"; + }; nativeBuildInputs = [ - pkg-config gettext libxslt docbook_xsl docbook_xml_dtd_43 wrapGAppsHook + pkg-config + gettext + libxslt + docbook-xsl-nons + docbook_xml_dtd_43 + wrapGAppsHook ]; + buildInputs = [ + glib + libgcrypt + pam + openssh + libcap_ng + libselinux + gcr + p11-kit + ]; + + # In 3.20.1, tests do not support Python 3 + checkInputs = [ dbus python2 ]; + configureFlags = [ "--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories "--with-pkcs11-modules=${placeholder "out"}/lib/pkcs11/" ]; - postPatch = '' - patchShebangs build - ''; - # Tends to fail non-deterministically. # - https://github.com/NixOS/nixpkgs/issues/55293 # - https://github.com/NixOS/nixpkgs/issues/51121 doCheck = false; - # In 3.20.1, tests do not support Python 3 - checkInputs = [ dbus python2 ]; + postPatch = '' + patchShebangs build + ''; checkPhase = '' export HOME=$(mktemp -d) diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 432f7d9e2ad..35e7b1a0b02 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-screenshot"; - version = "3.38.0"; + version = "40.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1h4zsaybjrlkfcrvriyybg4gfr7v9d1ndh2p516k94ad2gfx6mp5"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${name}.tar.xz"; + sha256 = "1qm544ymwibk31s30k47vnn79xg30m18r7l4di0c57g375dak31n"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix b/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix index 05d28de768a..6a274e35bf5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , meson , ninja @@ -10,13 +11,13 @@ stdenv.mkDerivation rec { pname = "gnome-session-ctl"; - version = "3.38.0"; + version = "40.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; - rev = "c20907fea27fa96568b8375a6756c40d0bfb9e40"; # main - hash = "sha256-y9/yOH6N8wf93+gPqnqzRzV/lPXYD0M6v7dsLFF8lWo="; + rev = version; + hash = "sha256-gvBmLx8Qoj1vPsOwaZsd9+pTDvU5D7uUts7ZT1pXwNo="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 1fa0a0b0fc6..49363568eab 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -1,17 +1,16 @@ { fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome3, glib, gtk3, gsettings-desktop-schemas , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3 -, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl -, fetchpatch }: +, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }: stdenv.mkDerivation rec { pname = "gnome-session"; - version = "3.38.0"; + version = "40.1.1"; outputs = ["out" "sessions"]; src = fetchurl { - url = "mirror://gnome/sources/gnome-session/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0rrxjk3vbqy3cdgnl7rw71dvcyrvhwq3m6s53dnkyjxsrnr0xk3v"; + url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "10nzyhmgkrzk6i70kj7690na0hmsv6qy5bmr10akxq9jxqlphy4w"; }; patches = [ @@ -22,12 +21,6 @@ stdenv.mkDerivation rec { grep = "${gnugrep}/bin/grep"; bash = "${bash}/bin/bash"; }) - # Fixes 2 minute delay at poweroff. - # https://gitlab.gnome.org/GNOME/gnome-session/issues/74 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-session/-/commit/9de6e40f12e8878f524f8d429d85724c156a0517.diff"; - sha256 = "19vrjdf7d6dfl7sqxvbc5h5lcgk1krgzg5rkssrdzd1h4ma6y8fz"; - }) ]; mesonFlags = [ "-Dsystemd=true" "-Dsystemd_session=default" ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index e5923e6b56a..d7e549e2893 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "3.38.1"; + version = "40.0.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0r010wzw3dj87mapzvq15zv93i86wg0x0rpii3x2wapq3bcj30g2"; + url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "08bv32hvsmd8izw0llvldg0c2d71srch4hi8j94jwgm5d4dsrprp"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index 8b882df3b00..035633d676a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, spidermonkey_68, glib +{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, gettext, pkg-config, spidermonkey_68, glib , gnome3, gnome-menus, substituteAll }: stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "3.38.2"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hzn975v49rv3nsqp8m0mzv8gcm7nyvn54gj3zsml8ahlxwl592p"; + url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "15hak4prx2nx1svfii39clxy1lll8crdf7p91if85jcsh6r8ab8p"; }; passthru = { @@ -22,6 +22,14 @@ stdenv.mkDerivation rec { src = ./fix_gmenu.patch; gmenu_path = "${gnome-menus}/lib/girepository-1.0"; }) + + # Do not show welcome dialog in gnome-classic. + # Needed for gnome-shell 40.1. + # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/169 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-shell-extensions/commit/3e8bbb07ea7109c44d5ac7998f473779e742d041.patch"; + sha256 = "jSmPwSBgRBfPPP9mGVjw1mSWumIXQqtA6tSqHr3U+3w="; + }) ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 97a72e379a5..078582f439f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -1,5 +1,6 @@ { fetchurl , fetchpatch +, fetchgit , substituteAll , lib, stdenv , meson @@ -22,8 +23,7 @@ , librsvg , geoclue2 , perl -, docbook_xml_dtd_42 -, docbook_xml_dtd_43 +, docbook_xml_dtd_45 , desktop-file-utils , libpulseaudio , libical @@ -46,6 +46,7 @@ , mutter , evolution-data-server , gtk3 +, gtk4 , sassc , systemd , pipewire @@ -66,14 +67,20 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "3.38.3"; + version = "40.0-unstable-2021-05-01"; outputs = [ "out" "devdoc" ]; - src = fetchurl { - url = "mirror://gnome/sources/gnome-shell/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-U0W0GMsSqXKVXOXM6u1mYkgAJzNrXFHa6lcwV1tiHO0="; + src = fetchgit { + url = "https://gitlab.gnome.org/GNOME/gnome-shell.git"; + rev = "a8a79c03330427808e776c344f7ebc42782a1b5a"; + sha256 = "ivHV0SRpnBqsdC7fu1Xhtd/BA55O0UdbUyDLy5KHNYs="; + fetchSubmodules = true; }; + # src = fetchurl { + # url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; + # sha256 = "sha256-vOcfQC36qcXiab9lv0iiI0PYlubPmiw0ZpOS1/v2hHg="; + # }; patches = [ # Hardcode paths to various dependencies so that they can be found at runtime. @@ -97,6 +104,12 @@ stdenv.mkDerivation rec { revert = true; sha256 = "14h7ahlxgly0n3sskzq9dhxzbyb04fn80pv74vz1526396676dzl"; }) + + # Work around failing fingerprint auth + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/9a647c460b651aaec0b8a21f046cc289c1999416/f/0001-gdm-Work-around-failing-fingerprint-auth.patch"; + sha256 = "pFvZli3TilUt6YwdZztpB8Xq7O60XfuWUuPMMVSpqLw="; + }) ]; nativeBuildInputs = [ @@ -105,9 +118,7 @@ stdenv.mkDerivation rec { pkg-config gettext docbook-xsl-nons - # Switch to 4.5 in the 40. - docbook_xml_dtd_42 - docbook_xml_dtd_43 + docbook_xml_dtd_45 gtk-doc perl wrapGAppsHook @@ -137,6 +148,7 @@ stdenv.mkDerivation rec { evolution-data-server libical gtk3 + gtk4 gdm geoclue2 adwaita-icon-theme @@ -189,7 +201,7 @@ stdenv.mkDerivation rec { postFixup = '' # The services need typelibs. - for svc in org.gnome.Shell.Extensions org.gnome.Shell.Notifications org.gnome.Shell.Screencast; do + for svc in org.gnome.ScreenSaver org.gnome.Shell.Extensions org.gnome.Shell.Notifications org.gnome.Shell.Screencast; do wrapGApp $out/share/gnome-shell/$svc done ''; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch b/pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch index 2d7bdf30315..6d888725b5d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch +++ b/pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch @@ -3,7 +3,7 @@ @@ -13,7 +13,7 @@ shew_sources = [ libshew = library(full_name, sources: shew_sources, - dependencies: [gtk_dep], + dependencies: [gtk_dep, x11_dep], - install_dir: pkglibdir, + install_dir: get_option('prefix') / pkglibdir, install: true, diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index ff80efaa4de..d26dc801d69 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -11,8 +11,9 @@ , packagekit , ostree , glib -, appstream-glib +, appstream , libsoup +, libhandy , polkit , isocodes , gspell @@ -42,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "3.38.0"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-software/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0rjm486vgn6gi9mv1rqdcvr9cilmw6in4r6djqkxbxqll89cp2l7"; + url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "16q2902swxsjdxb1nj335sv1bb76rvq4w6dn4yszkwf3s0fd86in"; }; patches = [ @@ -76,8 +77,9 @@ stdenv.mkDerivation rec { gtk3 glib packagekit - appstream-glib + appstream libsoup + libhandy gsettings-desktop-schemas gnome-desktop gspell @@ -94,7 +96,6 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dubuntu_reviews=false" "-Dgudev=false" # FIXME: package malcontent parental controls "-Dmalcontent=false" diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index db978f953b7..44e24e7cdf6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -1,26 +1,63 @@ -{ lib, stdenv, gettext, fetchurl, pkg-config, gtkmm3, libxml2 -, bash, gtk3, glib, wrapGAppsHook, meson, ninja, python3 -, gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk-pixbuf, libgtop, systemd }: +{ lib +, stdenv +, gettext +, fetchurl +, pkg-config +, gtkmm3 +, libxml2 +, bash +, gtk3 +, libhandy +, glib +, wrapGAppsHook +, meson +, ninja +, python3 +, gsettings-desktop-schemas +, itstool +, gnome3 +, librsvg +, gdk-pixbuf +, libgtop +, systemd +}: stdenv.mkDerivation rec { pname = "gnome-system-monitor"; - version = "3.38.0"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1x5gd30g87im7fnqj63njlac69zywfd1r0vgsxkjag2hsns7mgvk"; + url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "06hxd4igxas2kyind5jwfq5qbfkknykpdfy2sy3anylhcx1hzczx"; }; - doCheck = true; - nativeBuildInputs = [ - pkg-config gettext itstool wrapGAppsHook meson ninja python3 + pkg-config + gettext + itstool + wrapGAppsHook + meson + ninja + python3 ]; + buildInputs = [ - bash gtk3 glib libxml2 gtkmm3 libgtop gdk-pixbuf gnome3.adwaita-icon-theme librsvg - gsettings-desktop-schemas systemd + bash + gtk3 + libhandy + glib + libxml2 + gtkmm3 + libgtop + gdk-pixbuf + gnome3.adwaita-icon-theme + librsvg + gsettings-desktop-schemas + systemd ]; + doCheck = true; + postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 52aee2a004a..de5cb767d54 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.38.3"; + version = "3.40.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "EaWw1jXxX9znUINRpRD79OkqpTMVKlD/DHhF4xAuR2Q="; + sha256 = "1r6qd6w18gk83w32y6bvn4hg2hd7qvngak4ymwpgndyp41rwqw07"; }; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix index 61f8761ce81..4e6c58a14e8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-tour"; - version = "3.38.0"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-hV/C/Lyz6e9zhe3FRw4Sox5gMqThDP57wVCTgcekjng="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + hash = "sha256-cGMiOGmgdHJ0FL7H23ONhQYhbuhMz8O8p9rFLkmMG/k="; }; cargoVendorDir = "vendor"; diff --git a/pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix b/pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix deleted file mode 100644 index b2db2baf025..00000000000 --- a/pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ fetchFromGitLab }: - -let - # We need a gvc different then that which is shipped in the source tarball of - # whatever package that imports this file - gvc-src-with-ucm = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "libgnome-volume-control"; - rev = "7a621180b46421e356b33972e3446775a504139c"; - sha256 = "07rkgh9f7qcmlpy6jqh944axzh3z38f47g48ii842f2i3a1mrbw9"; - }; -in -'' - rm -r ./subprojects/gvc - cp -r ${gvc-src-with-ucm} ./subprojects/gvc -'' diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix index 65d2bbc2157..f4b76996ac4 100644 --- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix @@ -17,13 +17,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ]; nativeBuildInputs = [ pkg-config intltool ]; - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - meta = { description = "Framework for managing passwords and other secrets"; homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 03c20e1ef6a..2dda38bb4e7 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -45,24 +45,31 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "3.38.3"; + version = "40.0"; outputs = [ "out" "dev" "man" ]; src = fetchurl { - url = "mirror://gnome/sources/mutter/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-sjIec9Hj/i6Q5jAfQrugf02UvGR1aivxPXWunW+qIB8="; + url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-enGzEuWmZ8U3SJUYilBqP2tnF2i8s2K2jv3FYnc9GY4="; }; patches = [ # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 - ./drop-inheritable.patch + # ./drop-inheritable.patch (substituteAll { src = ./fix-paths.patch; inherit zenity; }) + + # Fix non-deterministic build failure: + # https://gitlab.gnome.org/GNOME/mutter/-/issues/1682 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/commit/91117bb052ed0d69c8ea4159c1df15c814d90627.patch"; + sha256 = "ek8hEoPP4S2TGOm6SGGOhUVIp4OT68nz0SQzZrceFUU="; + }) ]; mesonFlags = [ @@ -155,7 +162,7 @@ let self = stdenv.mkDerivation rec { meta = with lib; { description = "A window manager for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/mutter"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 5ca1efe1ca3..29c44ecd6e9 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -9,6 +9,8 @@ , python3 , wrapGAppsHook , gtk3 +, libhandy +, libportal , gnome3 , gnome-autoar , glib-networking @@ -32,11 +34,11 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "3.38.2"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19ln84d6s05h6cvx3c500bg5pvkz4k6p6ykmr2201rblq9afp76h"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0cwxr7bfa19dvzra81s9wfshzv0zv7ycpfffn4amigd0fh0vkkwf"; }; patches = [ @@ -71,6 +73,8 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gst_all_1.gst-plugins-base gtk3 + libhandy + libportal libexif libnotify libseccomp diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix index 75b2bd29270..da82d30214e 100644 --- a/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -96,6 +96,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "gnome3.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 64009cd75eb..59d61febc06 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -14,6 +14,7 @@ , gtk3 , gusb , packagekit +, libhandy , libwebp , libxml2 , sane-backends @@ -24,11 +25,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "3.38.2"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-qI2AcpaCiIZJzfzfqGkrCjSs3ladwICIjyea/DqcTQs="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-E4EbsqhhnmOkP8Lva3E1ny1cQITG1cizqtYXJLIHUa8="; }; nativeBuildInputs = [ @@ -51,6 +52,7 @@ stdenv.mkDerivation rec { gnome3.adwaita-icon-theme gusb gtk3 + libhandy libwebp packagekit sane-backends diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index f5e85a1f16c..73097f99e51 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -5,8 +5,6 @@ , gettext , gobject-introspection , glib -, clutter-gtk -, clutter-gst , gnome3 , gtksourceview4 , gjs @@ -40,14 +38,13 @@ stdenv.mkDerivation rec { gobject-introspection wrapGAppsHook ]; + buildInputs = [ glib gtk3 gnome3.evince icu harfbuzz - clutter-gtk - clutter-gst gjs gtksourceview4 gdk-pixbuf diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index 22ce6c72011..c5e859954ff 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "yelp-xsl"; - version = "3.38.3"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/yelp-xsl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-GTtqvUaXt7Qh6Yw21NMTXaCw/bUapT5gLtNo3YTR/QM="; + url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-Nh7NTTP8zbO7CKaH9g5cPpCdLp47Ai2ETgSYINDPYrA="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 754a7748668..1e1d679f852 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "yelp"; - version = "3.38.3"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/yelp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-r9RqTQrrRrtCXFIAcdgY+LKzLmnnVqv9mXlodpphVJ0="; + url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-B3dfoGzSg2Xs2Cm7FqhaaCiXqyHYzONFlrvvXNRVquA="; }; nativeBuildInputs = [ pkg-config gettext itstool wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index c4e203913be..7d72e16c326 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -176,8 +176,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-documents = callPackage ./apps/gnome-documents { }; - gnome-getting-started-docs = callPackage ./apps/gnome-getting-started-docs { }; - gnome-logs = callPackage ./apps/gnome-logs { }; gnome-maps = callPackage ./apps/gnome-maps { }; @@ -361,4 +359,6 @@ lib.makeScope pkgs.newScope (self: with self; { maintainers = lib.teams.gnome.members; mutter328 = throw "Removed as Pantheon is upgraded to mutter334."; + + gnome-getting-started-docs = throw "Removed in favour of gnome-tour."; }) diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 173e4a9e5b8..9a68f151b4a 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "devhelp"; - version = "3.38.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/devhelp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13sa25mmlc49kn520hdfbskma65y7smvwmyhfggj0n9s3fazba2d"; + url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0zr64qp5c6jcc3x5hmfp7jhzpi96qwr6xplyfkmz4kjzvr9xidjd"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix index bdbe73d2f88..6349a318456 100644 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-devel-docs"; - version = "3.38.2"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-devel-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1h6481hbz1c5p69r6h96hbgf560lhp1jibszscgw0s2yikdh6q8n"; + url = "mirror://gnome/sources/gnome-devel-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0zqp01ks8m3s6jn5xqd05rw4fwbvxy5qvcfg9g50b2ar2j7v1ar8"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index cb8ece571e7..d432043d380 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "gnome-shell-gsconnect"; - version = "44"; + version = "46"; outputs = [ "out" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "andyholmes"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "C+8mhK4UOs2iZplDyY45bCX0mMGgwVV/ZfaPpYUlWxA="; + sha256 = "161379kipr6z6gbhchb5b17djrkg5fbvblyyabzkc2gv05r3h6fw"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/extensions/hot-edge/default.nix b/pkgs/desktops/gnome-3/extensions/hot-edge/default.nix new file mode 100644 index 00000000000..aaa5870996a --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/hot-edge/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-hot-edge"; + version = "jdoda"; + + src = fetchFromGitHub { + owner = "jdoda"; + repo = "hotedge"; + rev = "bb7f651becea5287241caf7cda246a68ab07dac8"; + sha256 = "oeTs0kRan6b5relxzhK1IKbV0Yv2d5YdvvUPJ3fM9ik="; + }; + + dontBuild = true; + + uuid = "hotedge@jonathan.jdoda.ca"; + + installPhase = '' + runHook preInstall + install -Dt $out/share/gnome-shell/extensions/${uuid} extension.js metadata.json stylesheet.css + runHook postInstall + ''; + + meta = with lib; { + description = "Replace the top-left hot corner with a bottom hot edge"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jtojnar ]; + homepage = "https://github.com/jdoda/hotedge"; + }; +} diff --git a/pkgs/desktops/gnome-3/find-latest-version.py b/pkgs/desktops/gnome-3/find-latest-version.py index ad80af24bcb..3078999e3e5 100644 --- a/pkgs/desktops/gnome-3/find-latest-version.py +++ b/pkgs/desktops/gnome-3/find-latest-version.py @@ -3,14 +3,21 @@ import math import json import requests import sys +from libversion import Version +from typing import Optional def version_to_list(version): return list(map(int, version.split("."))) -def odd_unstable(version_str, selected): - version = version_to_list(version_str) +def odd_unstable(version: Version, selected): + try: + version = version_to_list(version.value) + except: + # Failing to parse as a list of numbers likely means the version contains a string tag like “beta”, therefore it is not a stable release. + return selected != "stable" + if len(version) < 2: return True @@ -23,28 +30,34 @@ def odd_unstable(version_str, selected): return True -def no_policy(version, selected): +def tagged(version: Version, selected): + if selected == "stable": + return not ("alpha" in version.value or "beta" in version.value or "rc" in version.value) + else: + return True + + +def no_policy(version: Version, selected): return True version_policies = { "odd-unstable": odd_unstable, + "tagged": tagged, "none": no_policy, } -def make_version_policy(version_predicate, selected, upper_bound): +def make_version_policy(version_predicate, selected, upper_bound: Optional[Version]): if not upper_bound: - upper_bound = [math.inf, math.inf] + return lambda version: version_predicate(version, selected) else: - upper_bound = version_to_list(upper_bound) - - return lambda version: version_predicate(version, selected) and version_to_list(version) < upper_bound + return lambda version: version_predicate(version, selected) and version < upper_bound parser = argparse.ArgumentParser(description="Find latest version for a GNOME package by crawling their release server.") parser.add_argument("package-name", help="Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.") -parser.add_argument("version-policy", help="Policy determining which versions are considered stable. For most GNOME packages, odd minor versions are unstable but there are exceptions.", choices=version_policies.keys(), nargs="?", default="odd-unstable") +parser.add_argument("version-policy", help="Policy determining which versions are considered stable. GNOME packages usually denote stability by alpha/beta/rc tag in the version. For older packages, odd minor versions are unstable but there are exceptions.", choices=version_policies.keys(), nargs="?", default="tagged") parser.add_argument("requested-release", help="Most of the time, we will want to update to stable version but sometimes it is useful to test.", choices=["stable", "unstable"], nargs="?", default="stable") parser.add_argument("--upper-bound", dest="upper-bound", help="Only look for versions older than this one (useful for pinning dependencies).") @@ -55,6 +68,8 @@ if __name__ == "__main__": package_name = getattr(args, "package-name") requested_release = getattr(args, "requested-release") upper_bound = getattr(args, "upper-bound") + if upper_bound: + upper_bound = Version(upper_bound) version_predicate = version_policies[getattr(args, "version-policy")] version_policy = make_version_policy(version_predicate, requested_release, upper_bound) @@ -64,11 +79,11 @@ if __name__ == "__main__": print("Unknown format of cache.json file.", file=sys.stderr) sys.exit(1) - versions = cache[2][package_name] - versions = sorted(filter(version_policy, versions), key=version_to_list) + versions = map(Version, cache[2][package_name]) + versions = sorted(filter(version_policy, versions)) if len(versions) == 0: print("No versions matched.", file=sys.stderr) sys.exit(1) - print(versions[-1]) + print(versions[-1].value) diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index 918adc0eccf..c8bea5a98d2 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -1,17 +1,50 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, wrapGAppsHook, gobject-introspection -, gettext, itstool, libxml2, python3, gnome3, glib, gtk3, librsvg }: +{ lib +, stdenv +, fetchurl +, meson +, ninja +, vala +, pkg-config +, wrapGAppsHook4 +, gobject-introspection +, gettext +, itstool +, libxml2 +, python3 +, gnome3 +, glib +, gtk4 +, librsvg +}: stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "3.38.1"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-chess/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1bpmi5p5vvjdq2rlm5x9k4gpci8jbrjvdxr1q62h5znzq0vz0w0l"; + url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "132nc96z0bryyi9d5gljsbwsa71rl8wm5w57jbhpwiv4fyjhgybk"; }; - nativeBuildInputs = [ meson ninja vala pkg-config gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ]; - buildInputs = [ glib gtk3 librsvg gnome3.adwaita-icon-theme ]; + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + gettext + itstool + libxml2 + python3 + wrapGAppsHook4 + gobject-introspection + ]; + + buildInputs = [ + glib + gtk4 + librsvg + gnome3.adwaita-icon-theme + ]; postPatch = '' chmod +x meson_post_install.py @@ -29,7 +62,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Chess"; description = "Play the classic two-player boardgame of chess"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index fe1f092fbf0..4bafc3b4a8d 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-klotski"; - version = "3.38.1"; + version = "3.38.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "00rwi6z0068pbq01sq2d389ffcqsh3ylq3i8zkrqvblqid1hvnlv"; + sha256 = "1qm01hdd5yp8chig62bj10912vclbdvywwczs84sfg4zci2phqwi"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index 600b0d98468..f074fb08daa 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-mines"; - version = "3.36.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0m2680r94nk61imym4x73j03jwfjd8cxm592m5ybiqdfdw6i723i"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0sf6kdvhr4pr3hddnj6ql9larz2wy108sri31id6x9g459nbly8z"; }; # gobject-introspection for finding vapi files diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 501b894a1df..c3d9fb19725 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -1,7 +1,26 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook -, librsvg, gsound, clutter-gtk, gettext, itstool, vala, python3 -, libxml2, libgee, libgnome-games-support, meson, ninja -, desktop-file-utils, hicolor-icon-theme}: +{ lib +, stdenv +, fetchurl +, fetchpatch +, pkg-config +, gnome3 +, gtk3 +, wrapGAppsHook +, librsvg +, gsound +, clutter-gtk +, gettext +, itstool +, vala +, python3 +, libxml2 +, libgee +, libgnome-games-support +, meson +, ninja +, desktop-file-utils +, hicolor-icon-theme +}: stdenv.mkDerivation rec { pname = "gnome-nibbles"; @@ -12,14 +31,40 @@ stdenv.mkDerivation rec { sha256 = "1naknfbciydbym79a0jq039xf0033z8gyln48c0qsbcfr2qn8yj5"; }; - nativeBuildInputs = [ - meson ninja vala python3 - pkg-config wrapGAppsHook gettext itstool libxml2 - desktop-file-utils hicolor-icon-theme + patches = [ + # Fix build with recent Vala. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-nibbles/-/commit/62964e9256fcac616109af874dbb2bd8342a9853.patch"; + sha256 = "4VijELRxycS8rwi1HU9U3h9K/VtdQjJntfdtMN9Uz34="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-nibbles/-/commit/1b48446068608aff9b5edf1fdbd4b8c0d9f0be94.patch"; + sha256 = "X0+Go5ae4F06WTPDYc2HIIax8X4RDgUGO6A6Qp8UifQ="; + }) ]; + + nativeBuildInputs = [ + meson + ninja + vala + python3 + pkg-config + wrapGAppsHook + gettext + itstool + libxml2 + desktop-file-utils + hicolor-icon-theme + ]; + buildInputs = [ - gtk3 librsvg gsound clutter-gtk gnome3.adwaita-icon-theme - libgee libgnome-games-support + gtk3 + librsvg + gsound + clutter-gtk + gnome3.adwaita-icon-theme + libgee + libgnome-games-support ]; passthru = { diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index e9a079216b7..1a49ee38760 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -1,26 +1,54 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook -, librsvg, gsound, gettext, itstool, libxml2, libgnome-games-support -, libgee, meson, ninja, python3, desktop-file-utils, adwaita-icon-theme }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gnome3 +, gtk3 +, wrapGAppsHook +, librsvg +, gsound +, gettext +, itstool +, libxml2 +, libgnome-games-support +, libgee +, meson +, ninja +, vala +, python3 +, desktop-file-utils +, adwaita-icon-theme +}: stdenv.mkDerivation rec { pname = "gnome-robots"; - version = "3.38.0"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-robots/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1qpzpsyj9i5dsfy7anfb2dcm602bjkcgqj86fxvnxy6llx56ks0z"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-robots"; attrPath = "gnome3.gnome-robots"; }; + url = "mirror://gnome/sources/gnome-robots/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "04fbykj576dq1h6cycgfhh8wd6yxmlsqykvj188sbwahay42zgvg"; }; nativeBuildInputs = [ - pkg-config meson ninja python3 - libxml2 wrapGAppsHook gettext itstool desktop-file-utils + pkg-config + meson + ninja + vala + python3 + libxml2 + wrapGAppsHook + gettext + itstool + desktop-file-utils ]; + buildInputs = [ - gtk3 librsvg gsound libgnome-games-support libgee adwaita-icon-theme + gtk3 + librsvg + gsound + libgnome-games-support + libgee + adwaita-icon-theme ]; postPatch = '' @@ -28,11 +56,18 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson_post_install.py ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-robots"; + attrPath = "gnome3.gnome-robots"; + }; + }; + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Robots"; description = "Avoid the robots and make them crash into each other"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index 7c5fd8f1ac9..101f3c4f2bd 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "3.38.0"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0cpxx63liczmax6ry06r5k0f221xpg2rqh49vkdj2snmqq61swrq"; + url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1nr1g4q1gxqbzmaz15y3zgssnj7w01cq9l422ja4rglyg0fwjhbm"; }; nativeBuildInputs = [ meson ninja vala pkg-config gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index 9b8c78d6e4a..91bd9637344 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -1,6 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook -, librsvg, gsound, gettext, itstool, libxml2 -, meson, ninja, vala, python3, desktop-file-utils +{ lib +, stdenv +, fetchurl +, fetchpatch +, pkg-config +, gnome3 +, gtk3 +, wrapGAppsHook +, librsvg +, gsound +, gettext +, itstool +, libxml2 +, meson +, ninja +, vala +, python3 +, desktop-file-utils }: stdenv.mkDerivation rec { @@ -12,24 +27,49 @@ stdenv.mkDerivation rec { sha256 = "0kw131q0ad0rbsp6qifjc8fjlhvjxyihil8a76kj8ya9mn7kvnwn"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-taquin"; attrPath = "gnome3.gnome-taquin"; }; - }; + patches = [ + # Fix build with recent Vala. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-taquin/-/commit/99dea5e7863e112f33f16e59898c56a4f1a547b3.patch"; + sha256 = "U7djuMhb1XJaKAPyogQjaunOkbBK24r25YD7BgH05P4="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-taquin/-/commit/66be44dc20d114e449fc33156e3939fd05dfbb16.patch"; + sha256 = "RN41RCLHlJyXTARSH9qjsmpYi1UFeMRssoYxRsbngDQ="; + }) + ]; nativeBuildInputs = [ - pkg-config wrapGAppsHook meson ninja python3 - gettext itstool libxml2 vala desktop-file-utils + pkg-config + wrapGAppsHook + meson + ninja + python3 + gettext + itstool + libxml2 + vala + desktop-file-utils ]; buildInputs = [ - gtk3 librsvg gsound + gtk3 + librsvg + gsound gnome3.adwaita-icon-theme ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-taquin"; + attrPath = "gnome3.gnome-taquin"; + }; + }; + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Taquin"; description = "Move tiles so that they reach their places"; maintainers = teams.gnome.members; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index db3b0d21151..443a417da50 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -26,6 +26,20 @@ stdenv.mkDerivation rec { sha256 = "097dw1l92l73xah9l56ka5mi3dvx48ffpiv33ni5i5rqw0ng7fc4"; }; + patches = [ + # Fix build with recent Vala. + # https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/15 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/iagno/-/commit/e8a0aeec350ea80349582142c0e8e3cd3f1bce38.patch"; + sha256 = "OO1x0Yx56UFzHTBsPAMYAjnJHlnTjdO1Vk7q6XU8wKQ="; + }) + # https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/13 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/iagno/-/commit/508c0f94e5f182e50ff61be6e04f72574dee97cb.patch"; + sha256 = "U7djuMhb1XJaKAPyogQjaunOkbBK24r25YD7BgH05P4="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index 6783147840c..7e43583d529 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "lightsoff"; - version = "3.38.0"; + version = "40.0.1"; src = fetchurl { - url = "mirror://gnome/sources/lightsoff/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0dpnnw8v1yk1p0y08f9c9xkgswqlm8x83dfn96798nif2zbypdnh"; + url = "mirror://gnome/sources/lightsoff/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1aziy64g15bm83zfn3ifs20z9yvscdvsxbx132xnq77i0r3qvlxc"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index 33dd9de1b42..d29ac55ce28 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -1,17 +1,60 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, glib, gtk3, gnome3, desktop-file-utils -, clutter, clutter-gtk, gettext, itstool, libxml2, wrapGAppsHook, python3 }: +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, vala +, glib +, gtk3 +, libgnome-games-support +, gnome3 +, desktop-file-utils +, clutter +, clutter-gtk +, gettext +, itstool +, libxml2 +, wrapGAppsHook +, python3 +}: -let +stdenv.mkDerivation rec { pname = "swell-foop"; - version = "3.34.1"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1032psxm59nissi268bh3j964m4a0n0ah4dy1pf0ph27j3zvdik1"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "17r4b0g8s7z872wdd7ngk248z7fqx43vm2sym1bdqhzsi250s1y1"; }; + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + wrapGAppsHook + python3 + itstool + gettext + libxml2 + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk3 + libgnome-games-support + gnome3.adwaita-icon-theme + clutter + clutter-gtk + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + passthru = { updateScript = gnome3.updateScript { packageName = pname; @@ -19,14 +62,6 @@ in stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ meson ninja vala pkg-config wrapGAppsHook python3 itstool gettext libxml2 desktop-file-utils ]; - buildInputs = [ glib gtk3 gnome3.adwaita-icon-theme clutter clutter-gtk ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; description = "Puzzle game, previously known as Same GNOME"; diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index b9409605f24..e5aad262aa9 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "tali"; - version = "3.38.3"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/tali/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "AhVCi1DEoIJ/sN4uTmum5WZ4+bp22NJbfuyoUhXyWjk="; + url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "19gic6yjg3bg6jf87zvhm7ihsz1y58dz86p4x3a16xdhjyrk40q2"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patch b/pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patch deleted file mode 100644 index abd8772cf31..00000000000 --- a/pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/test/meson.build b/test/meson.build -index 6ea5e27a..450c03e3 100644 ---- a/test/meson.build -+++ b/test/meson.build -@@ -167,4 +167,4 @@ test_integration_bin = executable('test-integration', - ) - - test('engine-tests', test_engine_bin) --test('client-tests', test_client_bin) -+test('client-tests', test_client_bin, timeout: 300) diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index ff97d34f7ce..3abddaedaec 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , pkg-config , gtk3 @@ -15,6 +16,7 @@ , libsecret , gmime3 , isocodes +, icu , libxml2 , gettext , sqlite @@ -37,6 +39,7 @@ , gobject-introspection , gspell , appstream-glib +, libstemmer , libytnef , libhandy , gsound @@ -44,18 +47,13 @@ stdenv.mkDerivation rec { pname = "geary"; - version = "3.38.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "04p8fjkz4xp5afp0ld1m09pnv0zkcx51l7hf23amfrjkk0kj2bp7"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1c2nd35500ng28223y5pszc7fh8g16njj34f6p5xc9594lvj0mik"; }; - patches = [ - # Longer timeout for client test. - ./Bump-client-test-timeout-to-300s.patch - ]; - nativeBuildInputs = [ appstream-glib desktop-file-utils @@ -84,12 +82,14 @@ stdenv.mkDerivation rec { gspell gtk3 isocodes + icu json-glib libgee libhandy libpeas libsecret libunwind + libstemmer libytnef sqlite webkitgtk @@ -104,7 +104,8 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dcontractor=true" # install the contractor file (Pantheon specific) + "-Dprofile=release" + "-Dcontractor=enabled" # install the contractor file (Pantheon specific) ]; # NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see: @@ -118,21 +119,23 @@ stdenv.mkDerivation rec { patchShebangs build-aux/yaml_to_json.py chmod +x desktop/geary-attach - - # Drop test that breaks after webkitgtk 2.32.0 update - # https://gitlab.gnome.org/GNOME/geary/-/issues/1180 - sed -i '/add_test("edit_context_font", edit_context_font);/d' test/js/composer-page-state-test.vala ''; - doCheck = true; + # Some tests time out. + doCheck = false; checkPhase = '' + runHook preCheck + NO_AT_BRIDGE=1 \ GIO_EXTRA_MODULES=$GIO_EXTRA_MODULES:${glib-networking}/lib/gio/modules \ + HOME=$TMPDIR \ XDG_DATA_DIRS=$XDG_DATA_DIRS:${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${shared-mime-info}/share:${folks}/share/gsettings-schemas/${folks.name} \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ meson test -v --no-stdsplit + + runHook postCheck ''; preFixup = '' diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index 0f4f8e67737..49205751591 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, fetchpatch , vala , gettext , pkg-config @@ -36,16 +36,16 @@ stdenv.mkDerivation rec { sha256 = "0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914"; }; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - - substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash" - ''; - - doCheck = true; - - enableParallelBuilding = true; + nativeBuildInputs = [ + gobject-introspection + gettext + meson + ninja + pkg-config + python3 + vala + wrapGAppsHook + ]; buildInputs = [ adwaita-icon-theme @@ -63,16 +63,14 @@ stdenv.mkDerivation rec { libsoup ]; - nativeBuildInputs = [ - gobject-introspection - gettext - meson - ninja - pkg-config - python3 - vala - wrapGAppsHook - ]; + doCheck = false; # FAIL: tests-gitg gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + + substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash" + ''; preFixup = '' gappsWrapperArgs+=( @@ -91,7 +89,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Gitg"; description = "GNOME GUI client to view git repositories"; maintainers = with maintainers; [ domenkozar ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix index 1947179028b..21dedba16ad 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -16,17 +16,18 @@ , adwaita-icon-theme , libgweather , gucharmap +, tracker , polkit , gnome3 }: stdenv.mkDerivation rec { pname = "gnome-applets"; - version = "3.38.0"; + version = "3.40.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "04qrzycwm7pz556agl08xw3d0r1mmr4ja9n9jfijjxs9inrhp5yc"; + sha256 = "1k6mdkg16ia29fyg8ikf4dfs51gnrmg0f8xwpvd3192lhfsbsh19"; }; nativeBuildInputs = [ @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { adwaita-icon-theme libgweather gucharmap - # tracker # Tracker 3 not supported. + tracker polkit wirelesstools linuxPackages.cpupower @@ -65,6 +66,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "gnome3.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix index 2d66dabb5a0..8d5f07579c6 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "gnome-autoar"; - version = "0.3.1"; + version = "0.3.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1y6hh5dldhdq7mpbmd571zl0yadfackvifhnxvykkqqddwz72y0f"; + sha256 = "0wkwix44yg126xn1v4f2j60bv9yiyadfpzf8ifx0bvd9x5f4v354"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index 935778aa649..501000f204f 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -30,7 +30,7 @@ }: let pname = "gnome-flashback"; - version = "3.38.0"; + version = "3.40.0"; # From data/sessions/Makefile.am requiredComponentsCommon = [ @@ -61,7 +61,7 @@ let src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1r51yqdqichp4jv54kiaqrh0xhykngr4ymlvrkjhzdhivwadsg4m"; + sha256 = "0fxv13m2q9z1q3i9jbggl35cb7jlckbdrfsr5sf030hr1w836gz0"; }; # make .desktop Execs absolute @@ -123,6 +123,7 @@ let updateScript = gnome3.updateScript { packageName = pname; attrPath = "gnome3.${pname}"; + versionPolicy = "odd-unstable"; }; mkSessionForWm = { wmName, wmLabel, wmCommand }: diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix index b820f7750dc..113849b935a 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gnome-panel"; - version = "3.38.0"; + version = "3.40.0"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-GosVrvCgKmyqm5IJyNP7Q+e5h6OAB2aRwj8DFOwwLxU="; + hash = "sha256-nxNQde3GZs8rnKkd41xnA+KxdxwQp3B0FPtlbCilmzs="; }; # make .desktop Exec absolute @@ -85,6 +85,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "gnome3.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index b6a12fca133..5d57d7616f0 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -10,7 +10,7 @@ , gsettings-desktop-schemas , gtk3 , itstool -, libhandy_0 +, libhandy , libnotify , libsoup , libxml2 @@ -20,13 +20,13 @@ python3Packages.buildPythonApplication rec { pname = "gnome-tweaks"; - version = "3.34.1"; + version = "40.0"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19y62dj4n5i6v4zpjllxl51dch6ndy8xs45v5aqmmq9xyfrqk5yq"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "+V8/4DGwsBwC95oWWfiJFS03cq4+RN+EA9FGC6Xuw2o="; }; nativeBuildInputs = [ @@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec { gnome3.mutter gsettings-desktop-schemas gtk3 - libhandy_0 + libhandy libnotify libsoup ]; @@ -72,10 +72,10 @@ python3Packages.buildPythonApplication rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/action/show/Apps/GnomeTweakTool"; + homepage = "https://wiki.gnome.org/Apps/Tweaks"; description = "A tool to customize advanced GNOME 3 options"; maintainers = teams.gnome.members; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index 7dbf6daffa7..15fcfbfe390 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -17,14 +17,14 @@ }: stdenv.mkDerivation rec { - version = "3.38.6"; + version = "3.40.2"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "sha256-6CIzOBq/Y9XKiv/lQAtDYK6bxhT1WxjbXhu4+noO5nI="; + sha256 = "sha256-DUikcnkDBRkCwPLrl8lkNr+SeNpc3bPwPTWRn91nOo4="; }; patches = [ diff --git a/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch b/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch index c8a3fad2272..46e30ce2e2c 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch +++ b/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch @@ -17,7 +17,7 @@ +imports.gi.GIRepository.Repository.prepend_search_path('@typelibPath@'); + - const { GPaste } = imports.gi; + //const { GPaste } = imports.gi; const ExtensionUtils = imports.misc.extensionUtils; --- a/src/libgpaste/settings/gpaste-settings.c diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix index 01899d20b57..f594c1b0a4d 100644 --- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "libgnome-games-support"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1pdk9hc30xdlv0ba24f7pvcr2d5370zykrmpws7hgmjgl4wfbpdb"; + sha256 = "0gs1k88wwafn5cdyb5yq1cxpi9azachb0ysxgwh15sx77g6plyy3"; }; nativeBuildInputs = [ @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "gnome3.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix index c74d57d9f4d..36c6b66d5ca 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "metacity"; - version = "3.38.0"; + version = "3.40.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1b0i9sq6qa540f2006cv1p8i6lxg1h6w00apxwzwjpfqn0hk26c1"; + sha256 = "1d8mj2nshijshfiaica8dirfws1p6i9631frq7q23b3y91jiyk12"; }; patches = [ @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "gnome3.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix index 4db81228a07..0008f66e9ad 100644 --- a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix +++ b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "gnome3.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/update.nix b/pkgs/desktops/gnome-3/update.nix index 1bceddf77eb..928eac45160 100644 --- a/pkgs/desktops/gnome-3/update.nix +++ b/pkgs/desktops/gnome-3/update.nix @@ -1,8 +1,8 @@ { stdenv, pkgs, lib, writeScript, python3, common-updater-scripts }: -{ packageName, attrPath ? packageName, versionPolicy ? "odd-unstable", freeze ? false }: +{ packageName, attrPath ? packageName, versionPolicy ? "tagged", freeze ? false }: let - python = python3.withPackages (p: [ p.requests ]); + python = python3.withPackages (p: [ p.requests p.libversion ]); upperBoundFlag = let package = lib.attrByPath (lib.splitString "." attrPath) (throw "Cannot find attribute ‘${attrPath}’.") pkgs; diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 1c86de61607..a3e75d231f1 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -37,9 +37,18 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-8r0DlmG8xlCQ1uFHZQjXG2ls4VBrsRzrVY8Ey3/OYAU="; + sha256 = "MsaXdmL+M+NYAJrrwluleeNxqQg0soFbO/G/FqibBFI="; }; + patches = [ + # Allow build with appstream 0.14.x + # https://github.com/elementary/appcenter/pull/1493 + (fetchpatch { + url = "https://github.com/elementary/appcenter/commit/5807dd13fe3c715f26225aed8d7a0abdea0c2a64.patch"; + sha256 = "BvEahG9lU9ZdgooFDFhm5evRvnKVcmcHLdmZPb85gbo="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index f9ab49a72b9..cf0d0d812fe 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -18,6 +18,7 @@ , python3 , libnotify , libical +, libgdata , evolution-data-server , appstream-glib , elementary-icon-theme @@ -67,6 +68,7 @@ stdenv.mkDerivation rec { libgee libical libnotify + libgdata # required by some dependency transitively ]; postPatch = '' diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 7339038b080..e8b10227eaa 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , pkg-config @@ -39,6 +40,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-4AEayj+K/lOW6jEYmvmdan1kTqqqLL1YzwcU7/3PH5U="; }; + patches = [ + # Fix build with latest Vala. + (fetchpatch { + url = "https://github.com/elementary/code/commit/c50580d3336296823da9a2c50b824f21fde50286.patch"; + sha256 = "F+ZYlnZWYCU68G4oayLfbTnvSnTb4YA0zHVGD/Uf3KA="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index 24eafcabdea..5a5c314b3e9 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , pkg-config @@ -41,6 +42,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-3GZoBCu9rF+BnNk9APBzKWO1JYg1XYWwrEvwcjWvYDE="; }; + patches = [ + # Fix build with latest Vala. + (fetchpatch { + url = "https://github.com/elementary/music/commit/9ed3bbb3a0d68e289a772b4603f58e52a4973316.patch"; + sha256 = "fFO97SQzTc2fYFJFGfFPSUCdkCgZxfX1fjDQ7GH4BUs="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index ca0b3951351..7280051361a 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , meson @@ -45,6 +46,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-bTk4shryAWWMrKX3mza6xQ05qpBPf80Ey7fmYgKLUiY="; }; + patches = [ + # Fix build with latest Vala. + (fetchpatch { + url = "https://github.com/elementary/photos/commit/27e529fc96da828982563e2e19a6f0cef883a29e.patch"; + sha256 = "w39wh45VHggCs62TN6wpUEyz/hJ1y7qL1Ox+sp0Pt2s="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 06d8041339d..7387ea34e4d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -25,6 +25,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-tnAJyyPN/Xy1pmlgBpgO2Eb5CeHrRltjQTHmuTPBt8s="; }; + patches = [ + # Fix build with latest Vala. + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-printers/commit/5eced5ddda6f229d7265ea0a713f6c1cd181a526.patch"; + sha256 = "lPTNqka6jjvv1JnAqVzVIQBIdDXlCOQ5ASvgZNuEUC8="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index 6a18f6b6e23..26e26de33b1 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , meson @@ -28,6 +29,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-Sws6FqUL7QAROInDrcqYAp6j1TCC4aGV0/hi5Kmm5wQ="; }; + patches = [ + # Fix build with latest Vala. + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-security-privacy/commit/c8e422e630bbee0badcf4df26364c9e83e06bad0.patch"; + sha256 = "5Gm+muZiCraJC5JaGVVo0HDJ7KxjOpclHRW1RKsk3bc="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index c4e070aeacb..03954fac644 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -15,6 +15,7 @@ , libgee , libxml2 , libsoup +, libgdata , elementary-calendar }: @@ -52,6 +53,7 @@ stdenv.mkDerivation rec { libical libsoup wingpanel + libgdata # required by some dependency transitively ]; postPatch = '' diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index a37e43cd355..a9a310ade82 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -2,6 +2,7 @@ , substituteAll , fetchurl , fetchgit +, fetchpatch , meson , ninja , pkg-config @@ -73,6 +74,20 @@ stdenv.mkDerivation rec { #"${patchPath}/ubuntu_ibus_configs.patch" # https://github.com/elementary/os-patches/blob/6975d1c254cb6ab913b8e2396877203aea8eaa65/debian/patches/elementary-dpms.patch ./elementary-dpms.patch + + # Query GWeather DB on the fly instead of caching. + # Needed for the next patch to apply. + # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/merge_requests/175 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/df6c69f028d27b53ac86829e11df103b25ed5a74.patch"; + sha256 = "bKZkPzN64DXMgitjn0vUzUvKl7ldhN/mNVtPKVmHd0Q="; + }) + # Adjust to libgweather changes. + # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/217 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/82d88014dfca2df7e081712870e1fb017c16b808.patch"; + sha256 = "H5k/v+M2bRaswt5nrDJFNn4gS4BdB0UfzdjUCT4yLKg="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index 0a08d388238..d0b1862c3f7 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -1,7 +1,6 @@ { mkXfceDerivation , exo , garcon -, gettext , glib , gobject-introspection , gtk3 @@ -17,9 +16,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.16.2"; + version = "4.16.3"; - sha256 = "0wy66viwjnp1c0lgf90fp3vyqy0f1m1kbfdym8a0yrv2b6sn3958"; + sha256 = "085hxllsf792sgi8nn0qjfj5vclbrw2dgrgzl6gy55lxcbhkml9x"; nativeBuildInputs = [ gobject-introspection @@ -45,9 +44,6 @@ mkXfceDerivation { patches = [ ./xfce4-panel-datadir.patch ]; postPatch = '' - for f in $(find . -name \*.sh); do - substituteInPlace $f --replace gettext ${gettext}/bin/gettext - done substituteInPlace plugins/clock/clock.c \ --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" ''; @@ -56,6 +52,6 @@ mkXfceDerivation { NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; meta = { - description = "Xfce's panel"; + description = "Panel for the Xfce desktop environment"; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix index 1f79e0ffb29..d4492948ac6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix @@ -3,16 +3,11 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-clipman-plugin"; - version = "1.6.1"; - sha256 = "03akijvry1n1fkziyvxwcksl4vy4lmnpgd5izjs8jai5sndhsszl"; + version = "1.6.2"; + sha256 = "0pm4pzq3imc0m09mg0zk6kwcn5yzdgiqgdbpws01q3xz58jmb4a6"; buildInputs = [ libXtst libxfce4ui xfce4-panel xfconf ]; - postPatch = '' - # exo-csource has been dropped from exo - substituteInPlace panel-plugin/Makefile.am --replace exo-csource xdt-csource - ''; - meta = { description = "Clipboard manager for Xfce panel"; }; diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 611efb11f44..4679e01e900 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -27,6 +27,33 @@ let param = { }; "3.8" = { sha256 = "1gzlyxvw64ca12qql3wnq3bidcx9ygsklv9grjma3ib4hvg7vnr7"; + patches = [ + # Support for Coq 8.12.2 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/06956421b4307054af221c118c5f59593c0e67b9.patch"; + sha256 = "1f90q6j3xfvnf3z830bkd4d8526issvmdlrjlc95bfsqs78i1yrl"; + }) + # Support for Coq 8.13.0 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/0895388e7ebf9c9f3176d225107e21968919fb97.patch"; + sha256 = "0qhkzgb2xl5kxys81pldp3mr39gd30lvr2l2wmplij319vp3xavd"; + }) + # Support for Coq 8.13.1 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/6bf310dd678285dc193798e89fc2c441d8430892.patch"; + sha256 = "026ahhvpj5pksy90f8pnxgmhgwfqk4kwyvcf8x3dsanvz98d4pj5"; + }) + # Drop support for Coq < 8.9 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/7563a5df926a4c6fb1489a7a4c847641c8a35095.patch"; + sha256 = "05vkslzy399r3dm6dmjs722rrajnyfa30xsyy3djl52isvn4gyfb"; + }) + # Support for Coq 8.13.2 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/48bc183167c4ce01a5c9ea86e49d60530adf7290.patch"; + sha256 = "0j62lppfk26d1brdp3qwll2wi4gvpx1k70qivpvby5f7dpkrkax1"; + }) + ]; useExternalFlocq = true; }; }."${version}"; in diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 6981bcbd8fd..837855d2bdd 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -2,7 +2,7 @@ , haskell, haskellPackages, nodejs , fetchurl, fetchpatch, makeWrapper, writeScriptBin # Rust dependecies -, rustPlatform, openssl, pkg-config, Security +, curl, rustPlatform, openssl, pkg-config, Security }: let fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; }; @@ -102,7 +102,7 @@ let elmRustPackages = { elm-json = import ./packages/elm-json.nix { - inherit lib rustPlatform fetchurl openssl stdenv pkg-config Security; + inherit curl lib rustPlatform fetchurl openssl stdenv pkg-config Security; } // { meta = with lib; { description = "Install, upgrade and uninstall Elm dependencies"; diff --git a/pkgs/development/compilers/elm/packages/elm-json.nix b/pkgs/development/compilers/elm/packages/elm-json.nix index 810c1a91a00..a480b9e0e1e 100644 --- a/pkgs/development/compilers/elm/packages/elm-json.nix +++ b/pkgs/development/compilers/elm/packages/elm-json.nix @@ -1,20 +1,20 @@ -{ lib, rustPlatform, fetchurl, openssl, stdenv, pkg-config, Security }: +{ lib, curl, rustPlatform, fetchurl, openssl, stdenv, pkg-config, Security }: rustPlatform.buildRustPackage rec { pname = "elm-json"; - version = "0.2.7"; + version = "0.2.10"; src = fetchurl { url = "https://github.com/zwilias/elm-json/archive/v${version}.tar.gz"; - sha256 = "sha256:1b9bhl7rb01ylqjbfd1ccm26lhk4hzwd383rbg89aj2jwjv0w4hs"; + sha256 = "sha256:03azh7wvl60h6w7ffpvl49s7jr7bxpladcm4fzcasakg26i5a71x"; }; cargoPatches = [ ./elm-json.patch ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ curl openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0ylniriq073kpiykamkn9mxdaa6kyiza4pvf7gnfq2h1dvbqa6z7"; + cargoSha256 = "sha256:01zasrqf1va58i52s3kwdkj1rnwy80gv00xi6npfshjirj3ix07f"; # Tests perform networking and therefore can't work in sandbox doCheck = false; diff --git a/pkgs/development/compilers/elm/packages/elm-json.patch b/pkgs/development/compilers/elm/packages/elm-json.patch index 70064d0a424..d7f434c8eb3 100644 --- a/pkgs/development/compilers/elm/packages/elm-json.patch +++ b/pkgs/development/compilers/elm/packages/elm-json.patch @@ -1,48 +1,43 @@ diff --git a/Cargo.lock b/Cargo.lock -index f4d95f5..6830b3d 100644 +index 5440d72..6e173fa 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -625,14 +625,6 @@ name = "openssl-probe" - version = "0.1.2" +@@ -774,15 +774,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -[[package]] -name = "openssl-src" --version = "111.9.0+1.1.1g" +-version = "111.11.0+1.1.1h" -source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "380fe324132bea01f45239fadfec9343adb044615f29930d039bec1ae7b9fa5b" -dependencies = [ -- "cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)", +- "cc", -] - [[package]] name = "openssl-sys" - version = "0.9.56" -@@ -641,7 +633,6 @@ dependencies = [ - "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.70 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl-src 111.9.0+1.1.1g (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", - "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + version = "0.9.58" +@@ -792,7 +783,6 @@ dependencies = [ + "autocfg", + "cc", + "libc", +- "openssl-src", + "pkg-config", + "vcpkg", ] -@@ -1162,7 +1153,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - "checksum object 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9cbca9424c482ee628fa549d9c812e2cd22f1180b9222c9200fdfa6eb31aecb2" - "checksum once_cell 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" - "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" --"checksum openssl-src 111.9.0+1.1.1g (registry+https://github.com/rust-lang/crates.io-index)" = "a2dbe10ddd1eb335aba3780eb2eaa13e1b7b441d2562fd962398740927f39ec4" - "checksum openssl-sys 0.9.56 (registry+https://github.com/rust-lang/crates.io-index)" = "f02309a7f127000ed50594f0b50ecc69e7c654e16d41b4e8156d1b3df8e0b52e" - "checksum petgraph 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "29c127eea4a29ec6c85d153c59dc1213f33ec74cead30fe4730aecc88cc1fd92" - "checksum pin-project 0.4.17 (registry+https://github.com/rust-lang/crates.io-index)" = "edc93aeee735e60ecb40cf740eb319ff23eab1c5748abfdb5c180e4ce49f7791" diff --git a/Cargo.toml b/Cargo.toml -index adfab25..37ae0c2 100644 +index 4d319f2..6f4d0e5 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -21,7 +21,7 @@ colored = "1.9" +@@ -21,8 +21,8 @@ colored = "2.0" dialoguer = "0.6" - dirs = "2.0" + dirs = "3.0" fs2 = "0.4" -isahc = { version = "0.9", features = ["static-ssl"] } +-curl = {version = "0.4", features = ["static-curl", "static-ssl", "force-system-lib-on-osx", "http2"]} +isahc = "0.9" ++curl = {version = "0.4", features = ["force-system-lib-on-osx", "http2"]} + ctrlc = "3.1" + console = "0.12" - [dev-dependencies] - assert_cmd = "0.11" diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix index 02373d00b10..42103e48605 100644 --- a/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -31,6 +31,8 @@ let else "${lib.getLib glibc}/lib/ld-linux*"; + downloadsUrl = "https://downloads.haskell.org/ghc"; + in stdenv.mkDerivation rec { @@ -41,23 +43,23 @@ stdenv.mkDerivation rec { # https://downloads.haskell.org/~ghc/8.10.2/ src = fetchurl ({ i686-linux = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; sha256 = "0bvwisl4w0z5z8z0da10m9sv0mhm9na2qm43qxr8zl23mn32mblx"; }; x86_64-linux = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz"; sha256 = "0chnzy9j23b2wa8clx5arwz8wnjfxyjmz9qkj548z14cqf13slcl"; }; armv7l-linux = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb10-linux.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-armv7-deb10-linux.tar.xz"; sha256 = "1j41cq5d3rmlgz7hzw8f908fs79gc5mn3q5wz277lk8zdf19g75v"; }; aarch64-linux = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz"; sha256 = "14smwl3741ixnbgi0l51a7kh7xjkiannfqx15b72svky0y4l3wjw"; }; x86_64-darwin = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; sha256 = "1hngyq14l4f950hzhh2d204ca2gfc98pc9xdasxihzqd1jq75dzd"; }; }.${stdenv.hostPlatform.system} diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index ca984c36957..7330e3bac2a 100644 --- a/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -28,6 +28,8 @@ let else "${lib.getLib glibc}/lib/ld-linux*"; + downloadsUrl = "https://downloads.haskell.org/ghc"; + in stdenv.mkDerivation rec { @@ -39,22 +41,22 @@ stdenv.mkDerivation rec { src = fetchurl ({ i686-linux = { # Don't use the Fedora27 build (as below) because there isn't one! - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; sha256 = "1p2h29qghql19ajk755xa0yxkn85slbds8m9n5196ris743vkp8w"; }; x86_64-linux = { # This is the Fedora build because it links against ncurses6 where the # deb9 one links against ncurses5, see here # https://github.com/NixOS/nixpkgs/issues/85924 for a discussion - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-fedora27-linux.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-fedora27-linux.tar.xz"; sha256 = "18dlqm5d028fqh6ghzn7pgjspr5smw030jjzl3kq6q1kmwzbay6g"; }; aarch64-linux = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-ubuntu18.04-linux.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-ubuntu18.04-linux.tar.xz"; sha256 = "11n7l2a36i5vxzzp85la2555q4m34l747g0pnmd81cp46y85hlhq"; }; x86_64-darwin = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; sha256 = "0s9188vhhgf23q3rjarwhbr524z6h2qga5xaaa2pma03sfqvvhfz"; }; }.${stdenv.hostPlatform.system} diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 474a960d35f..8ceac64a622 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.14.4"; + version = "0.15.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iW4mH9zLJzD+E+H/b0NAbPWzfSbDmRpirDwrLlyZppI="; + sha256 = "sha256-sB+QTokH/ngcED40+vw+okFLFt+JSJQ/CbOgzlt/YmE="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoSha256 = "sha256-ErLwrve2Fpyg9JaH3y7VIYuFcOPVP++XAIrRvv5dGm0="; + cargoSha256 = "sha256-C/OAzg24kulIvIZwV9L5hwvf/BkF05spJPskr2maqrM="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix index 655b29f6535..e5da2bc3fe0 100644 --- a/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -95,8 +95,9 @@ in makePackage { postFixup = '' # Remove references to bootstrap. + export openjdkOutPath='${openjdk11_headless.outPath}' find "$out" -name \*.so | while read lib; do - new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${lib.escape ["+"] openjdk11_headless.outPath}[^:]*,,')" + new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done ''; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index b56f509b31a..55936fd3db2 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -40,6 +40,8 @@ let "0.50" = ./disable-graphviz-0.46.1.patch; + "0.52" = ./disable-graphviz-0.46.1.patch; + }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala"); disableGraphviz = lib.versionAtLeast version "0.38" && !withGraphviz; @@ -125,8 +127,8 @@ in rec { }; vala_0_48 = generic { - version = "0.48.14"; - sha256 = "0iz3zzimmk5wxvy5bi75v8ckv153gjrz3r5iqvl8xqackzi7v9fw"; + version = "0.48.17"; + sha256 = "1wlb4vd7k6hg10s09npglbhfcgjzxkywd4v0l96qhn19m9b8cszj"; }; vala_0_50 = generic { @@ -134,5 +136,10 @@ in rec { sha256 = "1353j852h04d1x6b4n6lbg3ay40ph0adb9yi25dh74pligx33z2q"; }; - vala = vala_0_48; + vala_0_52 = generic { + version = "0.52.2"; + sha256 = "sha256-OjxGCAO6Zh5RO+PQmEtYPgVHP2AsdfqY6RdVUDcUqXs="; + }; + + vala = vala_0_52; } diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index 4c5b6a4f6a9..46738343431 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -5,11 +5,13 @@ with lib; mkCoqDerivation { owner = "fblanqui"; inherit version; defaultVersion = with versions; switch coq.coq-version [ + {case = range "8.12" "8.13"; out = "1.8.1"; } {case = range "8.10" "8.11"; out = "1.7.0"; } {case = range "8.8" "8.9"; out = "1.6.0"; } {case = range "8.6" "8.7"; out = "1.4.0"; } ] null; + release."1.8.1".sha256 = "0knhca9fffmyldn4q16h9265i7ih0h4jhcarq4rkn0wnn7x8w8yw"; release."1.7.0".rev = "08b5481ed6ea1a5d2c4c068b62156f5be6d82b40"; release."1.7.0".sha256 = "1w7fmcpf0691gcwq00lm788k4ijlwz3667zj40j5jjc8j8hj7cq3"; release."1.6.0".rev = "328aa06270584b578edc0d2925e773cced4f14c8"; diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index af560ec49a0..ad5caec9492 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -7,7 +7,11 @@ with lib; mkCoqDerivation { owner = "PrincetonUniversity"; repo = "VST"; inherit version; - defaultVersion = if coq.coq-version == "8.11" then "2.6" else null; + defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.12" "8.13"; out = "2.7.1"; } + { case = "8.11"; out = "2.6"; } + ] null; + release."2.7.1".sha256 = "1674j7bkvihiv19vizm99dp6gj3lryb00zx6a87jz214f3ydcvnj"; release."2.6".sha256 = "00bf9hl4pvmsqa08lzjs1mrxyfgfxq4k6778pnldmc8ichm90jgk"; releaseRev = v: "v${v}"; propagatedBuildInputs = [ compcert ]; diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 7f248c8d430..53a83607c86 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "sha256-5YbvPDyGaoKPelLep2tVica08SI7Cyo9SLMnE6dmWe4="; + sha256 = "sha256-89+RZrG/QUo3JY9N5eTiMigUnlUP+wZWRW8PSnCcsrY="; }; - cargoSha256 = "sha256-hqVmNBrvagqhGPWTaBXuY8lULolWIoR5ovEhH5k1tz4="; + cargoSha256 = "sha256-gZLSTWS5cLfJvk4/tv8FG2I2vH3PKljWbJDOflNDmTQ="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; diff --git a/pkgs/development/interpreters/php/7.3.nix b/pkgs/development/interpreters/php/7.3.nix index d611cb7693c..569fb1b5405 100644 --- a/pkgs/development/interpreters/php/7.3.nix +++ b/pkgs/development/interpreters/php/7.3.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "7.3.27"; - sha256 = "00z0vadxazm2flks9g8qmchj2pwkli880kg313jgbb1mx3shc84x"; + version = "7.3.28"; + sha256 = "0r4r8famg3a8x6ch24y1370nsphkxg4k9zq5x8v88f4l8mj6wqwg"; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index 812a59ec8a3..dd5c6452a5e 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "7.4.16"; - sha256 = "0gnfb4vaj71fiap0q9lk6vs1xs7l6sha60isw6aaw3zxgh00ywc5"; + version = "7.4.18"; + sha256 = "0bw4q7svijsqi5vinaspzzqyli2pvmpz6yf83ndqixf6x4r5ji9f"; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 233b0da4380..5e392549e02 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "8.0.3"; - sha256 = "04mh5sznbgwv67x9p0qz4i377zwdb5cc6r1mb3925y1lkqfn5y4m"; + version = "8.0.5"; + sha256 = "1q08xx9pbn7plsnfh6j16jj294vm968ng1n5kaqw7apgxd7r6p8r"; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index d74e017d830..5f13418aa58 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -69,6 +69,7 @@ with pkgs; recursivePthLoader ; }; + extra = _: {}; optionalExtensions = cond: as: if cond then as else []; python2Extension = import ../../../top-level/python2-packages.nix; extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ [ overrides ]); @@ -77,6 +78,7 @@ with pkgs; pkgs.newScope otherSplices keep + extra (lib.extends extensions pythonPackagesFun)) { overrides = packageOverrides; diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index f144f847bcf..7d51dbd48e7 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -1,6 +1,8 @@ { lib, stdenv , fetchurl , gtk3 +, meson +, ninja , pkg-config , gobject-introspection , gnome3 @@ -10,14 +12,16 @@ stdenv.mkDerivation rec { pname = "amtk"; - version = "5.2.0"; + version = "5.3.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0y3hmmflw4i0y0yb9a8rlihbv3cbwnvdcf1n5jycwzpq9jxla1c2"; + sha256 = "12v3nj1bb7507ndprjggq0hpz8k719b4bwvl8sm43p3ibmn27anm"; }; nativeBuildInputs = [ + meson + ninja pkg-config dbus gobject-introspection @@ -32,10 +36,13 @@ stdenv.mkDerivation rec { export NO_AT_BRIDGE=1 ${xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - make check + meson test --print-errorlogs ''; - passthru.updateScript = gnome3.updateScript { packageName = pname; }; + passthru.updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Amtk"; diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 6fa4a6e0a4a..96c6b362398 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,20 +1,40 @@ -{ lib, stdenv, substituteAll, fetchFromGitHub, meson, ninja, pkg-config, gettext -, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt -, libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection -, pcre, itstool, gperf, vala, lmdb, libsoup +{ lib +, stdenv +, substituteAll +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gettext +, xmlto +, docbook-xsl-nons +, docbook_xml_dtd_45 +, libxslt +, libstemmer +, glib +, xapian +, libxml2 +, libyaml +, gobject-introspection +, pcre +, itstool +, gperf +, vala +, lmdb +, curl }: stdenv.mkDerivation rec { pname = "appstream"; - version = "0.14.0"; + version = "0.14.3"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { - owner = "ximion"; - repo = "appstream"; - rev = "v${version}"; - sha256 = "sha256-iYqmQ1/58t3ZdJTxYLDc5jkTG1lMBtQWMFFsYsszH9Q="; + owner = "ximion"; + repo = "appstream"; + rev = "v${version}"; + sha256 = "sha256-wCQR+4/F5lVqWHHcH/WS4irBGRivz3c1imasyLDIZIs="; }; patches = [ @@ -26,12 +46,30 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - meson ninja pkg-config gettext - libxslt xmlto docbook_xsl docbook_xml_dtd_45 - gobject-introspection itstool vala + meson + ninja + pkg-config + gettext + libxslt + xmlto + docbook-xsl-nons + docbook_xml_dtd_45 + gobject-introspection + itstool + vala ]; - buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf lmdb libsoup ]; + buildInputs = [ + libstemmer + pcre + glib + xapian + libxml2 + libyaml + gperf + lmdb + curl + ]; mesonFlags = [ "-Dapidocs=false" @@ -41,14 +79,14 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Software metadata handling library"; - homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/"; + homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/"; longDescription = '' AppStream is a cross-distro effort for building Software-Center applications and enhancing metadata provided by software components. It provides specifications for meta-information which is shipped by upstream projects and can be consumed by other software. ''; - license = licenses.lgpl21Plus; - platforms = platforms.unix; + license = licenses.lgpl21Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 1e5a1d3fd64..881c411db39 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 7e1181cf3bd..38131b0f357 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -14,23 +14,25 @@ , libX11 , libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case , libXi +, libXext , gnome3 # To pass updateScript }: stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.38.0"; + version = "2.40.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "hONsP+ZoYhM/X+Ipdyt2qiUm4Q3lAUo3ePL6Rs5VDaU="; + sha256 = "0miqn8531czy9ffpxnsxsnk12w3d6sqjda3qyix8kns2xsjf6rlz"; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ meson ninja pkg-config gobject-introspection makeWrapper ]; - buildInputs = [ libX11 libXtst libXi ]; + # libXext is a transitive dependency of libXi + buildInputs = [ libX11 libXtst libXi libXext ]; # In atspi-2.pc dbus-1 glib-2.0 propagatedBuildInputs = [ dbus glib ]; @@ -45,6 +47,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 53eb4459770..e0cdb3a9b4c 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index e9c63eb650f..123e7c984fc 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index 057aad447d5..3246c572962 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ aws-c-common openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ aws-c-common openssl ]; + + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 337149e6f8e..39230cc088d 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -13,15 +13,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ aws-c-cal aws-c-common s2n-tls] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ aws-c-cal aws-c-common s2n-tls]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error"; - meta = with lib; { description = "AWS SDK for C module for IO and TLS"; homepage = "https://github.com/awslabs/aws-c-io"; diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 7fd7b2fbbdd..dd215dc01c5 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -26,12 +26,15 @@ stdenv.mkDerivation rec { buildInputs = [ curl openssl s2n-tls zlib - aws-c-cal aws-c-common aws-c-event-stream aws-c-io aws-checksums + aws-c-common aws-c-event-stream aws-checksums ] ++ lib.optionals (stdenv.isDarwin && ((builtins.elem "text-to-speech" apis) || (builtins.elem "*" apis))) [ CoreAudio AudioToolbox ]; + # propagation is needed for Security.framework to be available when linking + propagatedBuildInputs = [ aws-c-cal aws-c-io ]; + cmakeFlags = [ "-DBUILD_DEPS=OFF" "-DCMAKE_SKIP_BUILD_RPATH=OFF" diff --git a/pkgs/development/libraries/cairomm/1.16.nix b/pkgs/development/libraries/cairomm/1.16.nix new file mode 100644 index 00000000000..2beeb71e5e3 --- /dev/null +++ b/pkgs/development/libraries/cairomm/1.16.nix @@ -0,0 +1,70 @@ +{ stdenv +, lib +, fetchurl +, boost +, meson +, ninja +, pkg-config +, cairo +, fontconfig +, libsigcxx30 +}: + +stdenv.mkDerivation rec { + pname = "cairomm"; + version = "1.16.0"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "https://www.cairographics.org/releases/${pname}-${version}.tar.xz"; + sha256 = "1ya4y7qa000cjawqwswbqv26y5icfkmhs5iiiil4dxgrqn91923y"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + boost # for tests + fontconfig + ]; + + propagatedBuildInputs = [ + cairo + libsigcxx30 + ]; + + mesonFlags = [ + "-Dbuild-tests=true" + "-Dboost-shared=true" + ]; + + # Meson is no longer able to pick up Boost automatically. + # https://github.com/NixOS/nixpkgs/issues/86131 + BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; + BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; + + doCheck = true; + + meta = with lib; { + description = "A 2D graphics library with support for multiple output devices"; + longDescription = '' + Cairo is a 2D graphics library with support for multiple output + devices. Currently supported output targets include the X + Window System, Quartz, Win32, image buffers, PostScript, PDF, + and SVG file output. Experimental backends include OpenGL + (through glitz), XCB, BeOS, OS/2, and DirectFB. + + Cairo is designed to produce consistent output on all output + media while taking advantage of display hardware acceleration + when available (e.g., through the X Render Extension). + ''; + homepage = "https://www.cairographics.org/"; + license = with licenses; [ lgpl2Plus mpl10 ]; + maintainers = teams.gnome.members; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 166d4e12c25..f2caa0bd3d5 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 0dfb8c7b9df..8dfe6781740 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 002db004dc1..2d0f57f279a 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 8fd15207287..9962ebf09e8 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -61,6 +61,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index 6834a605f1a..26862ee99f0 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -19,14 +19,14 @@ let in stdenv.mkDerivation rec { pname = "dconf"; - version = "0.38.0"; + version = "0.40.0"; outputs = [ "out" "lib" "dev" ] ++ lib.optional (!isCross) "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0n2gqkp6d61h7gnnp2xnxp6w5wcl7w9ay58krrf729qd6d0hzxj5"; + sha256 = "0cs5nayg080y8pb9b7qccm1ni8wkicdmqp1jsgc22110r6j24zyg"; }; nativeBuildInputs = [ @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix index 309cd2b3b35..6d94c2e9974 100644 --- a/pkgs/development/libraries/ffmpeg/2.8.nix +++ b/pkgs/development/libraries/ffmpeg/2.8.nix @@ -4,4 +4,7 @@ callPackage ./generic.nix (rec { version = "${branch}.17"; branch = "2.8"; sha256 = "05bnhvs2f82aq95z1wd3wr42sljdfq4kiyzqwhpji983mndx14vl"; + knownVulnerabilities = [ + "CVE-2021-30123" + ]; } // args) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 82f1a8bf564..ca77e425904 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -17,7 +17,7 @@ # Darwin frameworks , Cocoa, darwinFrameworks ? [ Cocoa ] # Inherit generics -, branch, sha256, version, patches ? [], ... +, branch, sha256, version, patches ? [], knownVulnerabilities ? [], ... }: /* Maintainer notes: @@ -224,6 +224,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ codyopel ]; - inherit branch; + inherit branch knownVulnerabilities; }; } diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index c930adbe9b2..c21c1496254 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -1,7 +1,6 @@ { fetchurl , lib, stdenv , pkg-config -, fetchpatch , meson , ninja , glib @@ -18,6 +17,7 @@ , dbus , libgee , evolution-data-server +, libgdata , libsecret , db , python3 @@ -34,29 +34,15 @@ stdenv.mkDerivation rec { pname = "folks"; - version = "0.14.0"; + version = "0.15.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1f9b52vmwnq7s51vj26w2618dn2ph5g12ibbkbyk6fvxcgd7iryn"; + sha256 = "08nirjax4m4g4ljr8ksq16wzmrvzq6myqh5rm0dw6pnijqk7nxzg"; }; - patches = [ - # Fix tests with e-d-s linked with libphonenumber support - # https://gitlab.gnome.org/GNOME/folks/merge_requests/40 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/folks/commit/6d443480a137f6a6ff345b21bf3cb31066eefbcd.patch"; - sha256 = "D/Y2g12TT0qrcH+iJ2umu4Hmp0EJ3Hoedh0H3aWI+HY="; - }) - ]; - - mesonFlags = [ - "-Ddocs=true" - "-Dtelepathy_backend=${lib.boolToString telepathySupport}" - ]; - nativeBuildInputs = [ gettext gobject-introspection @@ -75,6 +61,7 @@ stdenv.mkDerivation rec { db dbus-glib evolution-data-server + libgdata # required for some backends transitively libsecret libsoup libxml2 @@ -100,7 +87,17 @@ stdenv.mkDerivation rec { ])) ]; - doCheck = true; + mesonFlags = [ + "-Ddocs=true" + "-Dtelepathy_backend=${lib.boolToString telepathySupport}" + # For some reason, the tests are getting stuck on 31/32, + # even though the one missing test finishes just fine on next run, + # when tests are permuted differently. And another test that + # previously passed will be stuck instead. + "-Dtests=false" + ]; + + doCheck = false; # Prevents e-d-s add-contacts-stress-test from timing out checkPhase = '' diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index b50783e2719..236305a572b 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchsvn, darwin, libtiff , libpng, zlib, libwebp, libraw, openexr, openjpeg -, libjpeg, jxrlib, pkg-config }: +, libjpeg, jxrlib, pkg-config +, fixDarwinDylibNames }: stdenv.mkDerivation { pname = "freeimage"; @@ -17,7 +18,12 @@ stdenv.mkDerivation { prePatch = "rm -rf Source/Lib* Source/OpenEXR Source/ZLib"; patches = [ ./unbundle.diff ]; - nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin darwin.cctools; + nativeBuildInputs = [ + pkg-config + ] ++ lib.optionals stdenv.isDarwin [ + darwin.cctools + fixDarwinDylibNames + ]; buildInputs = [ libtiff libtiff.dev_private libpng zlib libwebp libraw openexr openjpeg libjpeg libjpeg.dev_private jxrlib ]; postBuild = lib.optionalString (!stdenv.isDarwin) '' diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 92c0ec293cb..57323bbc70d 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gcr"; - version = "3.38.1"; + version = "3.40.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "F/yvnEqTpl+xxyuCZDuxAsEzRAhGh9WIbqZjE4aNnsk="; + sha256 = "udNkWl/ZU6VChcxk1PwEZzZGPb1NzCXK9ce1m+0wJ/U="; }; postPatch = '' @@ -84,6 +84,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 2d8e60d06a7..d7a2604876f 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -7,11 +7,10 @@ , pkg-config , gettext , python3 -, libxml2 , libxslt , docbook-xsl-nons , docbook_xml_dtd_43 -, gtk-doc +, gi-docgen , glib , libtiff , libjpeg @@ -25,13 +24,13 @@ stdenv.mkDerivation rec { pname = "gdk-pixbuf"; - version = "2.42.2"; + version = "2.42.6"; outputs = [ "out" "dev" "man" "devdoc" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3"; + sha256 = "0zz7pmw2z46g7mr1yjxbsdldd5pd03xbjc58inj8rxfqgrdvg9n4"; }; patches = [ @@ -45,14 +44,15 @@ stdenv.mkDerivation rec { pkg-config gettext python3 - libxml2 - libxslt - docbook-xsl-nons - docbook_xml_dtd_43 - gtk-doc gobject-introspection makeWrapper glib + gi-docgen + + # for man pages + libxslt + docbook-xsl-nons + docbook_xml_dtd_43 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ @@ -75,19 +75,26 @@ stdenv.mkDerivation rec { substituteInPlace tests/meson.build --subst-var-by installedtestsprefix "$installedTests" ''; + preInstall = '' + PATH=$PATH:$out/bin # for install script + ''; + postInstall = - # meson erroneously installs loaders with .dylib extension on Darwin. - # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them. - lib.optionalString stdenv.isDarwin '' + '' + # All except one utility seem to be only useful during building. + moveToOutput "bin" "$dev" + moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" + + # So that devhelp can find this. + mkdir -p "$devdoc/share/devhelp" + mv "$out/share/doc" "$devdoc/share/devhelp/books" + '' + lib.optionalString stdenv.isDarwin '' + # meson erroneously installs loaders with .dylib extension on Darwin. + # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them. for f in $out/${passthru.moduleDir}/*.dylib; do install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f mv $f ''${f%.dylib}.so done - '' - # All except one utility seem to be only useful during building. - + '' - moveToOutput "bin" "$dev" - moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/ $dev/bin/gdk-pixbuf-query-loaders --update-cache @@ -100,10 +107,6 @@ stdenv.mkDerivation rec { done ''; - preInstall = '' - PATH=$PATH:$out/bin # for install script - ''; - # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). inherit doCheck; @@ -114,6 +117,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; tests = { diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 2093328f579..11f4f070c08 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , pkg-config , vala @@ -35,14 +36,14 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.28"; + version = "0.4.30"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-HRENhXfVTMo7NCOTFb03xXzLJ91DVWVQdKLSs/2JeQA="; + sha256 = "sha256-wRJ4LPQJaWniMhfM36vkIoTjXVQ1/wxD1A5McPrsqN0="; }; nativeBuildInputs = [ @@ -103,8 +104,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-lm"; postPatch = '' - chmod +x tests/opencl/opencl_test.sh tests/buffer/buffer-tests-run.sh - patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tests/buffer/buffer-tests-run.sh tools/xml_insert.sh + chmod +x tests/opencl/opencl_test.sh + patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tools/xml_insert.sh ''; # tests fail to connect to the com.apple.fonts daemon in sandboxed mode diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index 071e749b400..958e524aa09 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix index e3550b82a96..4cbc6f341dc 100644 --- a/pkgs/development/libraries/gfbgraph/default.nix +++ b/pkgs/development/libraries/gfbgraph/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 52b53a15b41..ff61c95a985 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -1,6 +1,6 @@ { fetchurl -, fetchpatch -, lib, stdenv +, lib +, stdenv , meson , ninja , pkg-config @@ -16,6 +16,7 @@ , libxml2 , dbus , gdk-pixbuf +, harfbuzz , makeWrapper , which , xvfb_run @@ -25,18 +26,26 @@ let testDeps = [ gobject-introspection # for Gio and cairo typelibs - gtk3 atk pango.out gdk-pixbuf + gtk3 atk pango.out gdk-pixbuf harfbuzz ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.66.2"; + version = "1.68.1"; + + outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "vX9fixcSd8wLue4XVLAkC2Lwana4sYyWjPRxs0qzTlk="; + sha256 = "0w2cbfpmc6alz7z8ycchhlkn586av5y8zk2xmgwzq10i0k13xyig"; }; - outputs = [ "out" "dev" "installedTests" ]; + patches = [ + # Hard-code various paths + ./fix-paths.patch + + # Allow installing installed tests to a separate output. + ./installed-tests-path.patch + ]; nativeBuildInputs = [ meson @@ -68,14 +77,6 @@ in stdenv.mkDerivation rec { "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; - patches = [ - # Hard-code various paths - ./fix-paths.patch - - # Allow installing installed tests to a separate output. - ./installed-tests-path.patch - ]; - doCheck = true; postPatch = '' @@ -91,6 +92,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/lib $installedTests/libexec/installed-tests/gjs ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0 ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/installed-tests/gjs/libgimarshallingtests.so + ln -s $PWD/installed-tests/js/libgjstesttools/libgjstesttools.so $installedTests/libexec/installed-tests/gjs/libgjstesttools.so ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/installed-tests/gjs/libregress.so ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/installed-tests/gjs/libwarnlib.so ''; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 58589734166..21321ce9f0c 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.66.0"; + version = "2.68.1"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16807qwflbghp0c66jdx2gnaffvdp4bla35ppzp9dlgx6wjbxmy5"; + sha256 = "0c1vylxly8k7g454g02spi44ybjidlwg461vp713zxd94k8qnpfh"; }; patches = [ @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; tests = { diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ce64bef95ad..15325809eb7 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.66.8"; + version = "2.68.1"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-l7yH3ZE2VYmvXLv+oldIM66nobcYQP02Xs0oUsdrnIs="; + sha256 = "sha256-JBZUuWvTa4iqoSgU78SEO1eOVdR0QBA3J5Waw0aUQzM="; }; patches = optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix new file mode 100644 index 00000000000..18a862e7d76 --- /dev/null +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, gnum4 +, glib +, libsigcxx30 +, gnome3 +, Cocoa +, meson +, ninja +}: + +stdenv.mkDerivation rec { + pname = "glibmm"; + version = "2.68.0"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-wfOFcxkdzu2FoFYAiIz0z0aVlB8zlxW9Z9UcJBb083U="; + }; + + nativeBuildInputs = [ + meson + pkg-config + ninja + gnum4 + glib # for glib-compile-schemas + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + Cocoa + ]; + + propagatedBuildInputs = [ + glib + libsigcxx30 + ]; + + doCheck = false; # fails. one test needs the net, another /etc/fstab + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "glibmm_2_68"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "C++ interface to the GLib library"; + homepage = "https://gtkmm.org/"; + license = licenses.lgpl2Plus; + maintainers = teams.gnome.members ++ (with maintainers; [ raskin ]); + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index a9abfbd1776..e952ab04cc0 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index ab71b2ccf9a..ecb4390df26 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "gnome-online-accounts"; - version = "3.38.1"; + version = "3.40.0"; # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87 src = fetchFromGitLab { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "gnome-online-accounts"; rev = version; - sha256 = "sha256-th7P++MC3GXX+349PJFEwHGGeMhxsGgoEDGnSYpY7E4="; + sha256 = "sha256-GuUWypfmfbovpDKnj6wSBuNeKJIfIyipY+01u/p4znU="; }; outputs = [ "out" "man" "dev" "devdoc" ]; @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dfedora=false" # not useful in NixOS or for NixOS users. "-Dgtk_doc=true" - "-Dlastfm=true" "-Dman=true" "-Dmedia_server=true" ]; diff --git a/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch index d4160b51d68..f74a7af1cff 100644 --- a/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch +++ b/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch @@ -1,8 +1,10 @@ +diff --git a/gir/cairo-1.0.gir.in b/gir/cairo-1.0.gir.in +index e4c9fb3d..3351b184 100644 --- a/gir/cairo-1.0.gir.in +++ b/gir/cairo-1.0.gir.in -@@ -5,7 +5,7 @@ - xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> +@@ -6,7 +6,7 @@ + ::type *' (aka 'volatile unsigned long *')” on Darwin. + (fetchpatch { + url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/640a65bf966df065d41a511e2d76d1f26a2e770c.patch"; + sha256 = "E5pig+qEfR58Jticr6ydFxZOhM3ZJ8zgrf5K4BdiB/Y="; + includes = [ + "ext/opencv/gstcvdilateerode.cpp" + ]; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index 2c683a84da4..ae361366ac1 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { - packageName = pname; - versionPolicy = "none"; # Unpredictable version stability + packageName = "gst_all_1.gstreamermm"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 8f50c922f51..ea112b3d33c 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -1,15 +1,12 @@ { config, lib, substituteAll, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg , gdk-pixbuf, xlibsWrapper, gobject-introspection , xineramaSupport ? stdenv.isLinux -, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null +, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups , gdktarget ? if stdenv.isDarwin then "quartz" else "x11" , AppKit, Cocoa , fetchpatch }: -assert xineramaSupport -> xorg.libXinerama != null; -assert cupsSupport -> cups != null; - with lib; let diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 0d4bec5f344..9f7d3050524 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -42,14 +42,12 @@ , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux , withGtkDoc ? stdenv.isLinux -, cups ? null +, cups , AppKit , Cocoa , broadwaySupport ? true }: -assert cupsSupport -> cups != null; - let gtkCleanImmodulesCache = substituteAll { diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index b64b8bc36fd..455e54ded21 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -5,9 +5,7 @@ , pkg-config , gettext , graphene -, docbook-xsl-nons -, docbook_xml_dtd_43 -, gtk-doc +, gi-docgen , meson , ninja , python3 @@ -45,15 +43,12 @@ , wayland-protocols , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux -, withGtkDoc ? stdenv.isLinux -, cups ? null +, cups , AppKit , Cocoa , broadwaySupport ? true }: -assert cupsSupport -> cups != null; - let gtkCleanImmodulesCache = substituteAll { @@ -66,9 +61,9 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.0.3"; + version = "4.2.1"; - outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; + outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; setupHooks = [ @@ -78,7 +73,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "18mJNyV5C1C9mjuyeIVtnVQ7RLa5uVHXtg573swTGJA="; + sha256 = "AjFpd13kPwof3gZvvBnXhUXqanViwZFavem4rkpzCeY="; }; nativeBuildInputs = [ @@ -90,21 +85,17 @@ stdenv.mkDerivation rec { pkg-config python3 sassc - ] ++ setupHooks ++ lib.optionals withGtkDoc [ - pandoc - docbook_xml_dtd_43 - docbook-xsl-nons - gtk-doc - # For xmllint - libxml2 - ]; + gi-docgen + ] ++ setupHooks; buildInputs = [ libxkbcommon epoxy json-glib isocodes + ] ++ lib.optionals (!stdenv.isDarwin) [ vulkan-headers + ] ++ [ librest libsoup ffmpeg @@ -143,18 +134,27 @@ stdenv.mkDerivation rec { glib graphene pango - vulkan-loader # TODO: Possibly not used on Darwin - + ] ++ lib.optionals (!stdenv.isDarwin) [ + vulkan-loader + ] ++ [ # Required for GSettings schemas at runtime. # Will be picked up by wrapGAppsHook. gsettings-desktop-schemas ]; mesonFlags = [ - "-Dgtk_doc=${lib.boolToString withGtkDoc}" - "-Dtests=false" - "-Dtracker3=${lib.boolToString trackerSupport}" - "-Dbroadway_backend=${lib.boolToString broadwaySupport}" + # ../docs/tools/shooter.c:4:10: fatal error: 'cairo-xlib.h' file not found + "-Dgtk_doc=${lib.boolToString x11Support}" + "-Dbuild-tests=false" + "-Dtracker=${if trackerSupport then "enabled" else "disabled"}" + "-Dbroadway-backend=${lib.boolToString broadwaySupport}" + ] ++ lib.optionals (!cupsSupport) [ + "-Dprint-cups=disabled" + ] ++ lib.optionals stdenv.isDarwin [ + "-Dvulkan=disabled" + "-Dmedia-gstreamer=disabled" # requires gstreamer-gl + ] ++ lib.optionals (!x11Support) [ + "-Dx11-backend=false" ]; doCheck = false; # needs X11 @@ -173,20 +173,12 @@ stdenv.mkDerivation rec { gdk/gen-gdk-gresources-xml.py gtk/gen-gtk-gresources-xml.py gtk/gentypefuncs.py - docs/reference/gtk/gtk-markdown-to-docbook ) chmod +x ''${files[@]} patchShebangs ''${files[@]} ''; - postBuild = lib.optionalString withGtkDoc '' - # Meson not building `custom_target`s passed to `custom_files` argument of `gnome.gtkdoc` function - # as part of the `install` target. We have to build the docs manually first. - # https://github.com/mesonbuild/meson/issues/2831 - ninja g{t,d,s}k4-doc - ''; - preInstall = '' OLD_PATH="$PATH" PATH="$PATH:$dev/bin" # so the install script finds gtk4-update-icon-cache @@ -204,6 +196,13 @@ stdenv.mkDerivation rec { for f in $dev/bin/gtk4-encode-symbolic-svg; do wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" done + + '' + lib.optionalString x11Support '' + # So that DevHelp can find this. + # TODO: Remove this with DevHelp 41. + mkdir -p "$devdoc/share/devhelp/books" + mv "$out/share/doc/"* "$devdoc/share/devhelp/books" + rmdir -p --ignore-fail-on-non-empty "$out/share/doc" ''; # Wrap demos diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 950e1a976a6..20456ffd6d1 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "3.24.3"; + version = "3.24.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-YEl8T381TDvSVXSF8CVPi3tM9L68n+4L4mp3dE6s1DU="; + sha256 = "sha256-m+txw+kM/Pt5A5a1Hj9ecWmWZ1Hv1PPvlpcRS+O+Z0M="; }; outputs = [ "out" "dev" ]; @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "${pname}3"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix new file mode 100644 index 00000000000..f7fca93d870 --- /dev/null +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -0,0 +1,91 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, meson +, ninja +, python3 +, gtk4 +, glibmm_2_68 +, cairomm_1_16 +, pangomm_2_48 +, epoxy +, gnome3 +, makeFontsConf +, xvfb_run +}: + +stdenv.mkDerivation rec { + pname = "gtkmm"; + version = "4.0.1"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-iXPZvHhI4CyyBR4F8+46S6/+L+tK9KVIfw4xMu7AOIQ="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + python3 + ]; + + buildInputs = [ + epoxy + ]; + + propagatedBuildInputs = [ + glibmm_2_68 + gtk4 + cairomm_1_16 + pangomm_2_48 + ]; + + checkInputs = [ + xvfb_run + ]; + + # Tests require fontconfig. + FONTCONFIG_FILE = makeFontsConf { + fontDirectories = [ ]; + }; + + doCheck = true; + + checkPhase = '' + runHook preCheck + + xvfb-run -s '-screen 0 800x600x24' \ + meson test --print-errorlogs + + runHook postCheck + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "${pname}4"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "C++ interface to the GTK graphical user interface library"; + longDescription = '' + gtkmm is the official C++ interface for the popular GUI library + GTK. Highlights include typesafe callbacks, and a + comprehensive set of widgets that are easily extensible via + inheritance. You can create user interfaces either in code or + with the Glade User Interface designer, using libglademm. + There's extensive documentation, including API reference and a + tutorial. + ''; + homepage = "https://gtkmm.org/"; + license = licenses.lgpl2Plus; + maintainers = teams.gnome.members ++ (with maintainers; [ raskin vcunat ]); + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 9ead894e0d2..4f144219ce0 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -1,32 +1,42 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala -, libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info -, meson, ninja }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkg-config +, atk +, cairo +, glib +, gtk3 +, pango +, fribidi +, vala +, libxml2 +, perl +, gettext +, gnome3 +, gobject-introspection +, dbus +, xvfb_run +, shared-mime-info +}: stdenv.mkDerivation rec { pname = "gtksourceview"; version = "4.8.1"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0WPXG1/K+8Wx7sbdhB7b283dOnURzV/c/9hri7/mmsE="; }; - propagatedBuildInputs = [ - # Required by gtksourceview-4.0.pc - gtk3 - # Used by gtk_source_language_manager_guess_language - shared-mime-info - ]; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ meson ninja pkg-config gettext perl gobject-introspection vala ]; - - checkInputs = [ xvfb_run dbus ]; - - buildInputs = [ atk cairo glib pango fribidi libxml2 ]; - patches = [ + # By default, the library loads syntaxes from XDG_DATA_DIRS and user directory + # but not from its own datadr (it assumes it will be in XDG_DATA_DIRS). + # Since this is not generally true with Nix, let’s add $out/share unconditionally. ./4.x-nix_share_path.patch # fixes intermittent "gtksourceview-gresources.h: no such file" errors @@ -37,27 +47,63 @@ stdenv.mkDerivation rec { }) ]; - enableParallelBuilding = true; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + perl + gobject-introspection + vala + ]; + + buildInputs = [ + atk + cairo + glib + pango + fribidi + libxml2 + ]; + + propagatedBuildInputs = [ + # Required by gtksourceview-4.0.pc + gtk3 + # Used by gtk_source_language_manager_guess_language + shared-mime-info + ]; + + checkInputs = [ + xvfb_run + dbus + ]; doCheck = stdenv.isLinux; + checkPhase = '' + runHook preCheck + XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ meson test --no-rebuild --print-errorlogs + + runHook postCheck ''; passthru = { updateScript = gnome3.updateScript { packageName = "gtksourceview"; attrPath = "gtksourceview4"; + versionPolicy = "odd-unstable"; }; }; meta = with lib; { + description = "Source code editing widget for GTK"; homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; - platforms = with platforms; linux ++ darwin; - license = licenses.lgpl21; + platforms = platforms.unix; + license = licenses.lgpl21Plus; maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix new file mode 100644 index 00000000000..a1bc60ebc30 --- /dev/null +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -0,0 +1,99 @@ +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, glib +, pcre2 +, gtk4 +, pango +, fribidi +, vala +, libxml2 +, perl +, gettext +, gnome3 +, gobject-introspection +, dbus +, xvfb_run +, shared-mime-info +}: + +stdenv.mkDerivation rec { + pname = "gtksourceview"; + version = "5.0.0"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1hyrmh9r1zd5kjh5ch9d7bhk2kphbqhm7ijfxfkcdln8q0rnd0k4"; + }; + + patches = [ + # By default, the library loads syntaxes from XDG_DATA_DIRS and user directory + # but not from its own datadr (it assumes it will be in XDG_DATA_DIRS). + # Since this is not generally true with Nix, let’s add $out/share unconditionally. + ./4.x-nix_share_path.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + perl + gobject-introspection + vala + ]; + + buildInputs = [ + glib + pcre2 + pango + fribidi + libxml2 + ]; + + propagatedBuildInputs = [ + # Required by gtksourceview-5.0.pc + gtk4 + # Used by gtk_source_language_manager_guess_language + shared-mime-info + ]; + + checkInputs = [ + xvfb_run + dbus + ]; + + doCheck = stdenv.isLinux; + + checkPhase = '' + runHook preCheck + + XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + meson test --no-rebuild --print-errorlogs + + runHook postCheck + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gtksourceview"; + attrPath = "gtksourceview5"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "Source code editing widget for GTK"; + homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; + platforms = platforms.unix; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index 9bf39d94aed..74a5e6c6d45 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix index e11d86f82e1..be249e0fdca 100644 --- a/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/pkgs/development/libraries/gupnp-dlna/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index 233eb7e3c85..93240fc8b33 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 2c9bac002fd..b589775a4df 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.46.2"; + version = "1.48.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "2D+hYChmcMA+uJAkBgbYr6fqajqBjorRfu7Y2XZIe9c="; + sha256 = "1hlxl6368h6nyqp1888szxs9hnpcw98k3h23dgqi29xd38klzsmj"; }; postPatch = '' @@ -119,6 +119,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 86b8b7130ff..8dab59e9947 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "igraph"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - sha256 = "sha256-Ylw02Mz9H4wIWfq59za/X7xfhgW9o0DNU55nLFqeUeo="; + sha256 = "sha256-StRXtP2PelPcS+l5O1AOVFkza3hiKFwCdp8XLal4grE="; }; # Normally, igraph wants us to call bootstrap.sh, which will call diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 651a42da0b1..a56422c87e1 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "21.1.2"; + version = "21.1.3"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "0zs8l0q1q7xps3kxlch6jddxjiny8n8avdg1ghiwbkvgf76gb3as"; + sha256 = "05vcr2rv6l38j7rv34mvcvzpgc2gjmvsb73wyprgdj71mcwrksyq"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 715e5621458..78e2ebae96a 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "20.5.1"; + version = "21.2.0"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "0l5m7r8585ycifbbi5i0bs63c9sb8rsmk43ik97mhfl1ivswf1mv"; + sha256 = "sha256-LusgmvlWOMEQjy47IpA9IYcl/cUTSMmvxSwvV/ihs2g="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index ed086dac90f..110dcad16e0 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index 1ec9c3da41e..170ae424dcc 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix index b2cc4ab08b4..3dcec13a18a 100644 --- a/pkgs/development/libraries/jxrlib/default.nix +++ b/pkgs/development/libraries/jxrlib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3 }: +{ lib, stdenv, fetchFromGitHub, python3, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "jxrlib"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace '.so' '.dylib' ''; - nativeBuildInputs = [ python3 ]; + nativeBuildInputs = [ python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; strictDeps = true; diff --git a/pkgs/development/libraries/lasem/default.nix b/pkgs/development/libraries/lasem/default.nix index 22f0436edca..953cf20afdb 100644 --- a/pkgs/development/libraries/lasem/default.nix +++ b/pkgs/development/libraries/lasem/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 584ea93293e..9b1654420e7 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkg-config, gtk-doc +{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, autoreconfHook, pkg-config, gtk-doc , docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted , cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key , libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive @@ -22,6 +22,13 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; sgdisk = "${gptfdisk}/bin/sgdisk"; }) + + # fix build with glib 2.68 (g_memdup is deprecated) + # https://github.com/storaged-project/libblockdev/pull/623 + (fetchpatch { + url = "https://github.com/storaged-project/libblockdev/commit/5528baef6ccc835a06c45f9db34a2c9c3f2dd940.patch"; + sha256 = "jxq4BLeyTMeNvBvY8k8QXIvYSJ2Gah0J75pq6FpG7PM="; + }) ]; postPatch = '' diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 22a062acd6e..3ad01ba871e 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix index b864c279d37..a6f2e05d736 100644 --- a/pkgs/development/libraries/libcint/default.nix +++ b/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - hash = "sha256-vJ4OyU9HYQvF1SWmniNGAuHQ7K/TfiK8C4celK5hjiA="; + hash = "sha256-nsIyosn8dBf217UmjXSKLTM2RhIQHCSvPlrvlqo5KLc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix index 5fdd60abe11..4b60e27a99f 100644 --- a/pkgs/development/libraries/libcryptui/default.nix +++ b/pkgs/development/libraries/libcryptui/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index d6ecb6e9747..d929af5d47f 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "libdazzle"; - version = "3.38.0"; + version = "3.40.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/libdazzle/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13v7s46cgw135ycx0byn7am4inn33slrhljq0v0wwfwl2y1g52p1"; + sha256 = "19abrrjsyjhhl1xflnb0likb9wwzz78fa1mk2b064rpscmz9mafv"; }; nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ]; diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix new file mode 100644 index 00000000000..842d08473c1 --- /dev/null +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, openssl +, perl +, pkg-config +, rustPlatform +, sqlite +}: + +stdenv.mkDerivation rec { + pname = "libdeltachat"; + version = "1.54.0"; + + src = fetchFromGitHub { + owner = "deltachat"; + repo = "deltachat-core-rust"; + rev = version; + sha256 = "02hvsfv1yar8bdpkfrfiiicq9qqnfhp46v6qqph9ar6khz3f1kim"; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "1p5yrhczp9nfijbvkmkmx1rabk5k3c1ni4k1vc0mw4jgl26lslcm"; + }; + + nativeBuildInputs = [ + cmake + perl + pkg-config + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + ]); + + buildInputs = [ + openssl + sqlite + ]; + + checkInputs = with rustPlatform; [ + cargoCheckHook + ]; + + meta = with lib; { + description = "Delta Chat Rust Core library"; + homepage = "https://github.com/deltachat/deltachat-core-rust/"; + changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${version}/CHANGELOG.md"; + license = licenses.mpl20; + platforms = platforms.linux; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix index ee8dfb6e94f..0656f3a2ee9 100644 --- a/pkgs/development/libraries/libepc/default.nix +++ b/pkgs/development/libraries/libepc/default.nix @@ -34,6 +34,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix index fc24fe41c4d..6474aceb417 100644 --- a/pkgs/development/libraries/libgda/6.x.nix +++ b/pkgs/development/libraries/libgda/6.x.nix @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "libgda6"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index 307cc14a6ef..1599a786871 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -86,6 +86,7 @@ assert postgresSupport -> postgresql != null; passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix index 44a0e8bc212..15ff99f3a55 100644 --- a/pkgs/development/libraries/libgdamm/default.nix +++ b/pkgs/development/libraries/libgdamm/default.nix @@ -26,6 +26,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index 407b99b5a57..aefb0be84af 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgee"; - version = "0.20.3"; + version = "0.20.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1pm525wm11dhwz24m8bpcln9547lmrigl6cxf3qsbg4cr3pyvdfh"; + sha256 = "03nyf8n7i7f67fsh220g52slmihdk1lv4iwspm7xmkgrj3rink2j"; }; doCheck = true; @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index 62228b8837a..23261020cc1 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -11,10 +11,6 @@ stdenv.mkDerivation rec { sha256 = "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = pname; }; - }; - nativeBuildInputs = [ file intltool @@ -29,6 +25,13 @@ stdenv.mkDerivation rec { glib ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + meta = with lib; { description = "Keyboard management library"; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 77fa161b773..bfa0b861dd8 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index af4fe04a0b4..c919e667766 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index feeae05bf52..d3482456f2e 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -1,28 +1,43 @@ { lib, stdenv , fetchurl , pkg-config +, meson +, ninja , udev , glib , gobject-introspection , gnome3 +, vala }: stdenv.mkDerivation rec { pname = "libgudev"; - version = "234"; + version = "236"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0drf39qhsdz35kwb18hnfj2ig4yfxhfks66m783zlhnvy2narbhv"; + sha256 = "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5"; }; - nativeBuildInputs = [ pkg-config gobject-introspection ]; - buildInputs = [ udev glib ]; + nativeBuildInputs = [ + pkg-config + gobject-introspection + meson + ninja + vala + ]; - # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway. - configureFlags = [ "--disable-umockdev" ]; + buildInputs = [ + udev + glib + ]; + + mesonFlags = [ + # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway + "-Dtests=disabled" + ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index 9351d3f707f..fd742d5b58b 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -1,24 +1,57 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, libxml2, glib, gtk3, gettext, libsoup -, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gobject-introspection, python3, tzdata, geocode-glib, vala, gnome3 }: +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, libxml2 +, glib +, gtk3 +, gettext +, libsoup +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, gobject-introspection +, python3 +, tzdata +, geocode-glib +, vala +, gnome3 +}: stdenv.mkDerivation rec { pname = "libgweather"; - version = "3.36.1"; + version = "40.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0l74hc02rvzm4p530y539a67jwb080fqdaazdl8j0fr3xvq0j9yy"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1rkf4yv43qcahyx7bismdv6z2vh5azdnm1fqfmnzrada9cm8ykna"; }; - nativeBuildInputs = [ meson ninja pkg-config gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; - buildInputs = [ glib gtk3 libsoup libxml2 geocode-glib ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + vala + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + gobject-introspection + python3 + python3.pkgs.pygobject3 + ]; - postPatch = '' - chmod +x meson/meson_post_install.py - patchShebangs meson/meson_post_install.py - ''; + buildInputs = [ + glib + gtk3 + libsoup + libxml2 + geocode-glib + ]; mesonFlags = [ "-Dzoneinfo_dir=${tzdata}/share/zoneinfo" @@ -26,9 +59,16 @@ stdenv.mkDerivation rec { "-Dgtk_doc=true" ]; + postPatch = '' + chmod +x meson/meson_post_install.py + patchShebangs meson/meson_post_install.py + patchShebangs data/gen_locations_variant.py + ''; + passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 4532edfd884..56853b0c3b8 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , meson , ninja @@ -6,9 +7,10 @@ , gobject-introspection , vala , gtk-doc -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_43 , gtk3 +, enableGlade ? false , glade , dbus , xvfb_run @@ -18,23 +20,32 @@ , hicolor-icon-theme , at-spi2-atk , at-spi2-core +, gnome3 +, libhandy +, runCommand }: stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.2.0"; + version = "1.2.2"; - outputs = [ "out" "dev" "devdoc" "glade" ]; + outputs = [ + "out" + "dev" + "devdoc" + ] ++ lib.optionals enableGlade [ + "glade" + ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-OfWQriCRDnb+HAYHsuvliXUPRWENau7Fww4u5gKiCyU="; + sha256 = "sha256-R//Shl0CvRyleVIt6t1+L5U2Lx8gJGL9XuriuBZosEg="; }; nativeBuildInputs = [ docbook_xml_dtd_43 - docbook_xsl + docbook-xsl-nons gobject-introspection gtk-doc libxml2 @@ -46,9 +57,10 @@ stdenv.mkDerivation rec { buildInputs = [ gdk-pixbuf - glade gtk3 libxml2 + ] ++ lib.optionals enableGlade [ + glade ]; checkInputs = [ @@ -62,6 +74,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" + "-Dglade_catalog=${if enableGlade then "enabled" else "disabled"}" ]; # Uses define_variable in pkg-config, but we still need it to use the glade output @@ -79,6 +92,23 @@ stdenv.mkDerivation rec { meson test --print-errorlogs ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + } // lib.optionalAttrs (!enableGlade) { + glade = + let + libhandyWithGlade = libhandy.override { + enableGlade = true; + }; + in runCommand "${libhandy.name}-glade" {} '' + cp -r "${libhandyWithGlade.glade}" "$out" + chmod -R +w "$out" + sed -e "s#${libhandyWithGlade.out}#${libhandy.out}#g" -e "s#${libhandyWithGlade.glade}#$out#g" -i $(find "$out" -type f) + ''; + }; + meta = with lib; { changelog = "https://gitlab.gnome.org/GNOME/libhandy/-/tags/${version}"; description = "Building blocks for modern adaptive GNOME apps"; diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index 648eb89a514..871aafeafd6 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -36,6 +36,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index 76dd4eb20c1..4e5f44dd153 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index a8ef9e2f9bb..5d3bad6d620 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libpeas"; - version = "1.28.0"; + version = "1.30.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "05cb7drn6arc4gi02wgsvzibigi2riz5gnfnmlb0zmbfnj9ikna2"; + sha256 = "18xrk1c1ixlhkmykcfiafrl2am470ws687xqvjlq40zwkcp5dx8b"; }; nativeBuildInputs = [ pkg-config meson ninja gettext gobject-introspection ]; @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index f27b58a02bb..f51db1d6c6d 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -12,11 +12,12 @@ }: stdenv.mkDerivation rec { - name = "libpst-0.6.75"; + pname = "libpst"; + version = "0.6.76"; src = fetchurl { - url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz"; - sha256 = "11wrf47i3brlxg25wsfz17373q7m5fpjxn2lr41dj252ignqzaac"; + url = "http://www.five-ten-sg.com/libpst/packages/${pname}-${version}.tar.gz"; + sha256 = "0hhbbb8ddsgjhv9y1xd8s9ixlhdnjmhw12v06jwx4j6vpgp1na9x"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix index 7b1ff8235aa..a8bcebb533d 100644 --- a/pkgs/development/libraries/librest/default.nix +++ b/pkgs/development/libraries/librest/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, libsoup, gobject-introspection, gnome3 }: +{ lib +, stdenv +, fetchurl +, pkg-config +, glib +, libsoup +, gobject-introspection +, gnome3 +}: stdenv.mkDerivation rec { pname = "rest"; @@ -9,23 +17,34 @@ stdenv.mkDerivation rec { sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9"; }; - nativeBuildInputs = [ pkg-config gobject-introspection ]; - buildInputs = [ glib libsoup ]; + nativeBuildInputs = [ + pkg-config + gobject-introspection + ]; - configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; + buildInputs = [ + glib + libsoup + ]; + + configureFlags = [ + # Remove when https://gitlab.gnome.org/GNOME/librest/merge_requests/2 is merged. + "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" + ]; passthru = { updateScript = gnome3.updateScript { packageName = pname; attrPath = "librest"; + versionPolicy = "odd-unstable"; }; }; meta = with lib; { description = "Helper library for RESTful services"; homepage = "https://wiki.gnome.org/Projects/Librest"; - license = licenses.lgpl21; - platforms = platforms.linux; + license = licenses.lgpl21Only; + platforms = platforms.unix; maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index efdbf593463..7047d15c0f0 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,47 +1,79 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, gdk-pixbuf, pango, cairo, libxml2 -, bzip2, libintl, darwin, rustc, cargo, gnome3 -, vala, gobject-introspection }: +{ lib +, stdenv +, fetchurl +, pkg-config +, glib +, gdk-pixbuf +, pango +, cairo +, libxml2 +, bzip2 +, libintl +, ApplicationServices +, Foundation +, libobjc +, rustc +, cargo +, gnome3 +, vala +, gobject-introspection +, nixosTests +}: -let - pname = "librsvg"; - version = "2.50.1"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "02csvx2nzygh8kyal2qiy3y6xb7d52vszxxr37dzav704a9pkncv"; - }; + pname = "librsvg"; + version = "2.50.5"; outputs = [ "out" "dev" "installedTests" ]; - buildInputs = [ libxml2 bzip2 pango libintl ] - ++ lib.optionals stdenv.isDarwin [ darwin.libobjc ]; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0wlj5g1jgp93sj3rr6qspj282whz13ahnv8ca99d7zilq9s1aw1j"; + }; - NIX_LDFLAGS = if stdenv.isDarwin then "-lobjc" else null; + nativeBuildInputs = [ + pkg-config + rustc + cargo + vala + gobject-introspection + ] ++ lib.optionals stdenv.isDarwin [ + ApplicationServices + Foundation + ]; - propagatedBuildInputs = [ glib gdk-pixbuf cairo ]; + buildInputs = [ + libxml2 + bzip2 + pango + libintl + ] ++ lib.optionals stdenv.isDarwin [ + libobjc + ]; - nativeBuildInputs = [ pkg-config rustc cargo vala gobject-introspection ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - ApplicationServices - ]); + propagatedBuildInputs = [ + glib + gdk-pixbuf + cairo + ]; configureFlags = [ "--enable-introspection" + ] ++ lib.optionals (!stdenv.isDarwin) [ + # Vapi does not build on MacOS. + # https://github.com/NixOS/nixpkgs/pull/117081#issuecomment-827782004 "--enable-vala" + ] ++ [ "--enable-installed-tests" "--enable-always-build-tests" ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic"; makeFlags = [ - "installed_test_metadir=$(installedTests)/share/installed-tests/RSVG" - "installed_testdir=$(installedTests)/libexec/installed-tests/RSVG" + "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/RSVG" + "installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/RSVG" ]; - NIX_CFLAGS_COMPILE - = lib.optionalString stdenv.isDarwin "-I${cairo.dev}/include/cairo"; + doCheck = false; # all tests fail on libtool-generated rsvg-convert not being able to find coreutils # It wants to add loaders and update the loaders.cache in gdk-pixbuf # Patching the Makefiles to it creates rsvg specific loaders and the @@ -63,8 +95,6 @@ stdenv.mkDerivation rec { -i gdk-pixbuf-loader/librsvg.thumbnailer.in ''; - doCheck = false; # fails 20 of 145 tests, very likely to be buggy - # Merge gdkpixbuf and librsvg loaders postInstall = '' mv $GDK_PIXBUF/loaders.cache $GDK_PIXBUF/loaders.cache.tmp @@ -75,6 +105,11 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; + }; + + tests = { + installedTests = nixosTests.installed-tests.librsvg; }; }; diff --git a/pkgs/development/libraries/libsigcxx/3.0.nix b/pkgs/development/libraries/libsigcxx/3.0.nix new file mode 100644 index 00000000000..3c92d8e1306 --- /dev/null +++ b/pkgs/development/libraries/libsigcxx/3.0.nix @@ -0,0 +1,42 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, meson +, ninja +, gnome3 +}: + +stdenv.mkDerivation rec { + pname = "libsigc++"; + version = "3.0.6"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "tw7c9GEWUcVKQm4QmxcZbh+hfaCQWSpQAOLRNMA6xc4="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; + + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "libsigcxx30"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + homepage = "https://libsigcplusplus.github.io/libsigcplusplus/"; + description = "A typesafe callback system for standard C++"; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index c933d92f325..cfd161cc961 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, gnum4, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gnome3 }: stdenv.mkDerivation rec { pname = "libsigc++"; - version = "2.10.1"; + version = "2.10.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "00v08km4wwzbh6vjxb21388wb9dm6g2xh14rgwabnv4c2wk5z8n9"; + sha256 = "sha256-3aF23EaBvanVoqwbxVJzvdOBZit6bUnpGCZ9E+h3Ths="; }; - nativeBuildInputs = [ pkg-config gnum4 ]; + nativeBuildInputs = [ pkg-config meson ninja ]; doCheck = true; @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "libsigcxx"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 47fcdd41f8a..64519dc355d 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPackages = [ glib-networking.out ]; updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix index 6f4741ed4d0..fbc9bc4d331 100644 --- a/pkgs/development/libraries/libsvm/default.nix +++ b/pkgs/development/libraries/libsvm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libsvm"; - version = "3.24"; + version = "3.25"; src = fetchurl { url = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz"; - sha256 = "15l69y23fxslrap415dvqb383x5fxvbffp9giszjfqjf38h1m26m"; + sha256 = "sha256-UjUOiqdAsXbh13Pp3AjxNAIYw34BvsN6uQ2wEn5LteU="; }; buildPhase = '' diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix index c67be246928..953800cdd57 100644 --- a/pkgs/development/libraries/libthreadar/default.nix +++ b/pkgs/development/libraries/libthreadar/default.nix @@ -3,12 +3,12 @@ with lib; stdenv.mkDerivation rec { - version = "1.3.1"; + version = "1.3.2"; pname = "libthreadar"; src = fetchurl { url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz"; - sha256 = "0x1kkccy81rcqbhlw88sw7lykp7398vmrvp6f9yy42k9bl4yxn2q"; + sha256 = "sha256-q5FiBlncbhdXDgRm7wgxcd4rkxqje/1ls9kPGqmomP0="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index f6fb9a13e4c..81b7226e313 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchgit , pkg-config , glib @@ -14,16 +15,24 @@ stdenv.mkDerivation { pname = "libunity"; - version = "unstable-2019-03-19"; + version = "unstable-2021-02-01"; outputs = [ "out" "dev" "py" ]; + # Obtained from https://git.launchpad.net/ubuntu/+source/libunity/log/ src = fetchgit { url = "https://git.launchpad.net/ubuntu/+source/libunity"; - rev = "import/7.1.4+19.04.20190319-0ubuntu1"; - sha256 = "15b49v88v74q20a5c0lq867qnlz7fx20xifl6j8ha359r0zkfwzj"; + rev = "import/7.1.4+19.04.20190319-5"; + sha256 = "LHUs6kl1srS6Xektx+jmm4SXLR47VuQ9IhYbBxf2Wc8="; }; + patches = [ + # Fix builf with latest Vala + # https://code.launchpad.net/~jtojnar/libunity/libunity + # Did not send upstream because Ubuntu is stuck on Vala 0.48. + ./fix-vala.patch + ]; + nativeBuildInputs = [ autoreconfHook gobject-introspection @@ -43,11 +52,6 @@ stdenv.mkDerivation { libdbusmenu ]; - patches = [ - # See: https://gitlab.gnome.org/GNOME/vala/issues/766 - ./fix-vala.patch - ]; - preConfigure = '' intltoolize ''; diff --git a/pkgs/development/libraries/libunity/fix-vala.patch b/pkgs/development/libraries/libunity/fix-vala.patch index ec34229b444..555c2ad7bcb 100644 --- a/pkgs/development/libraries/libunity/fix-vala.patch +++ b/pkgs/development/libraries/libunity/fix-vala.patch @@ -1,36 +1,12 @@ -diff -ru old/libunity/src/unity-aggregator-scope.vala libunity/src/unity-aggregator-scope.vala ---- old/libunity/src/unity-aggregator-scope.vala 1969-12-31 19:00:01.000000000 -0500 -+++ libunity/src/unity-aggregator-scope.vala 2019-09-21 17:06:12.663864891 -0400 -@@ -51,7 +51,7 @@ - */ - public abstract int category_index_for_scope_id (string scope_id); - -- public AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false) -+ protected AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false) - { - Object (dbus_path: dbus_path_, id: id_, is_master: true, - merge_mode: merge_mode, proxy_filter_hints: proxy_filter_hints); -diff -ru old/libunity/src/unity-deprecated-scope.vala libunity/src/unity-deprecated-scope.vala ---- old/libunity/src/unity-deprecated-scope.vala 1969-12-31 19:00:01.000000000 -0500 -+++ libunity/src/unity-deprecated-scope.vala 2019-09-21 17:06:39.721627805 -0400 -@@ -61,7 +61,7 @@ - internal CategorySet _categories; - internal FilterSet _filters; - -- public DeprecatedScopeBase (string dbus_path_, string id_) -+ protected DeprecatedScopeBase (string dbus_path_, string id_) - { - Object (dbus_path: dbus_path_, id: id_); +--- a/protocol/protocol-icon.vala 2013-08-27 12:53:57 +0000 ++++ b/protocol/protocol-icon.vala 2021-04-13 22:34:41 +0000 +@@ -185,7 +185,7 @@ } -diff -ru old/libunity/tools/preview-renderer.vala libunity/tools/preview-renderer.vala ---- old/libunity/tools/preview-renderer.vala 1969-12-31 19:00:01.000000000 -0500 -+++ libunity/tools/preview-renderer.vala 2019-09-21 17:09:16.201522110 -0400 -@@ -63,7 +63,7 @@ - */ - public abstract class GridRenderer: PreviewRenderer - { -- public GridRenderer() -+ protected GridRenderer() - { - Object(); - } + + /* Added to GIcon interface in 2.37 */ +- private Variant serialize () ++ private Variant? serialize () + { + Variant? ret = null; + return ret; + diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index a61094d17fe..5e1c0c671d9 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,21 +1,47 @@ -{ lib, stdenv, fetchurl, pkg-config, gobject-introspection, intltool, vala -, libcap_ng, libvirt, libxml2 +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, gobject-introspection +, gettext +, gtk-doc +, docbook-xsl-nons +, vala +, libcap_ng +, libvirt +, libxml2 }: stdenv.mkDerivation rec { - name = "libvirt-glib-3.0.0"; + name = "libvirt-glib-4.0.0"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "https://libvirt.org/sources/glib/${name}.tar.gz"; - sha256 = "1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz"; + url = "https://libvirt.org/sources/glib/${name}.tar.xz"; + sha256 = "hCP3Bp2qR2MHMh0cEeLswoU0DNMsqfwFIHdihD7erL0="; }; - nativeBuildInputs = [ pkg-config intltool vala gobject-introspection ]; - buildInputs = [ libcap_ng libvirt libxml2 gobject-introspection ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + gtk-doc + docbook-xsl-nons + vala + gobject-introspection + ]; + + buildInputs = [ + libcap_ng + libvirt + libxml2 + gobject-introspection + ]; - enableParallelBuilding = true; strictDeps = true; meta = with lib; { diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index ea4b40c3c89..28b67a80198 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -9,6 +9,7 @@ , enableXen ? false, xen ? null , enableIscsi ? false, openiscsi , enableCeph ? false, ceph +, enableGlusterfs ? false, glusterfs }: with lib; @@ -72,6 +73,8 @@ in stdenv.mkDerivation rec { openiscsi ] ++ optionals enableCeph [ ceph + ] ++ optionals enableGlusterfs [ + glusterfs ] ++ optionals stdenv.isDarwin [ libiconv gmp ]; @@ -119,6 +122,7 @@ in stdenv.mkDerivation rec { "-Dsecdriver_apparmor=enabled" "-Dnumad=enabled" "-Dstorage_disk=enabled" + (opt "glusterfs" enableGlusterfs) (opt "storage_rbd" enableCeph) ] ++ optionals stdenv.isDarwin [ "-Dinit_script=none" diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 3792b826f59..5fb405f880e 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "${pname}${lib.versions.major version}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 19282ddc822..6db7e1f421b 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/development/libraries/libzapojit/default.nix index d16f34039f1..805aaba9773 100644 --- a/pkgs/development/libraries/libzapojit/default.nix +++ b/pkgs/development/libraries/libzapojit/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index 49af2593e51..d2cbee14c3a 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -1,15 +1,13 @@ { stdenv, lib, fetchurl, perl, gfortran , openssh, hwloc, autoconf, automake, libtool -# device options are ch3 or ch4 -, device ? "ch4" -# backend option are libfabric or ucx -, ch4backend ? "libfabric" -, ucx, libfabric +# either libfabric or ucx work for ch4backend on linux. On darwin, neither of +# these libraries currently build so this argument is ignored on Darwin. +, ch4backend # Process manager to build , withPm ? "hydra:gforker" } : -assert (ch4backend == "ucx" || ch4backend == "libfabric"); +assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); stdenv.mkDerivation rec { pname = "mpich"; @@ -45,8 +43,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ perl gfortran openssh hwloc ] - ++ lib.optional (ch4backend == "ucx") ucx - ++ lib.optional (ch4backend == "libfabric") libfabric; + ++ lib.optional (!stdenv.isDarwin) ch4backend; doCheck = true; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index e6e2190a1a6..962204268d7 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -18,7 +18,7 @@ let # It will rebuild itself using the version of this package (NSS) and if # an update is required do the required changes to the expression. # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert - version = "3.63"; + version = "3.64"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "0892xbjcaw6g4rd2rs4qa37nbda248cjrgxa4faaw0licbpjyb8q"; + sha256 = "09hivz4qf3dw7m21lshw34l0yncinwn4ax5w3rpkm71f2wkm85yk"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 4e04de30d65..dc8004d8f48 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, buildPackages , fetchFromGitHub , zlib , ilmbase diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 0369cedebf4..e181ca45a79 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , pkg-config , cairo , harfbuzz @@ -22,23 +21,15 @@ stdenv.mkDerivation rec { pname = "pango"; - version = "1.48.3"; + version = "1.48.4"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ijbkcs6217ygzphlpi0vajxkccifdbsl0jdjpy8wz11h9f19sin"; + sha256 = "0ym3cvajy2asapj8xbhfpy05rak79afrhi32hiss0w900vxi72a1"; }; - patches = [ - # Install developer documentation. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/pango/commit/a2f35860115e8cd44f07d5158e2df059e8163a08.patch"; - sha256 = "hN7O4DBk4A+TmBl6DGx6RHni5qRBg6akdjv9o3iWKDQ="; - }) - ]; - nativeBuildInputs = [ meson ninja glib # for glib-mkenum @@ -90,6 +81,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/pangomm/2.48.nix b/pkgs/development/libraries/pangomm/2.48.nix new file mode 100644 index 00000000000..a5d452ac16f --- /dev/null +++ b/pkgs/development/libraries/pangomm/2.48.nix @@ -0,0 +1,65 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, meson +, ninja +, python3 +, pango +, glibmm_2_68 +, cairomm_1_16 +, gnome3 +, ApplicationServices +}: + +stdenv.mkDerivation rec { + pname = "pangomm"; + version= "2.48.0"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-ng7UdMM/jCACyp4rYcoNHz2OQJ4J6Z9NjBnur8z1W3g="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + python3 + ] ++ lib.optional stdenv.isDarwin [ + ApplicationServices + ]; + + propagatedBuildInputs = [ + pango + glibmm_2_68 + cairomm_1_16 + ]; + + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "${pname}_2_48"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "C++ interface to the Pango text rendering library"; + longDescription = '' + Pango is a library for laying out and rendering of text, with an + emphasis on internationalization. Pango can be used anywhere + that text layout is needed, though most of the work on Pango so + far has been done in the context of the GTK widget toolkit. + Pango forms the core of text and font handling for GTK. + ''; + homepage = "https://www.pango.org/"; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 raskin ]); + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 3eb5f39c382..d858288af84 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 48fc95e788a..8a58cd638b9 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -2,14 +2,15 @@ stdenv.mkDerivation rec { pname = "pythia"; - version = "8.304"; + version = "8.305"; src = fetchurl { url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "18frx7xyvxnz57fxjncjyjzsk169h0jz6hxzjfpmwm3dzcc712fk"; + sha256 = "03rpy2bmx67217fh1spfn36x9xrk0igcj56byki77lgj0y5mz21a"; }; - buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ]; + nativeBuildInputs = [ rsync ]; + buildInputs = [ boost fastjet hepmc zlib lhapdf ]; preConfigure = '' patchShebangs ./configure @@ -26,11 +27,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { description = "A program for the generation of high-energy physics events"; - license = lib.licenses.gpl2; - homepage = "http://home.thep.lu.se/~torbjorn/Pythia.html"; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ veprbl ]; + license = licenses.gpl2Only; + homepage = "http://home.thep.lu.se/~torbjorn/Pythia.html"; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index fd2a8ab92cf..5a41fb0c341 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -10,7 +10,7 @@ let mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "poppler-${suffix}-${version}"; version = "21.02.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! @@ -63,4 +63,17 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ ttuegel ] ++ teams.freedesktop.members; }; -} +} // lib.optionalAttrs stdenv.isDarwin { + patches = [ + # Fix build due to improperly used volatile in poppler-glib. + # https://gitlab.freedesktop.org/poppler/poppler/merge_requests/836 + (fetchpatch { + url = "https://gitlab.freedesktop.org/poppler/poppler/commit/47de887d7658cfd68df44b3acf710971054f957b.patch"; + sha256 = "uvYibBn2fOEqdotxK0Wpf8KhGYZXrpHdmS4jjlRNCj8="; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/poppler/poppler/commit/bdd110b45a38e8a4f80f522892e4c4a9e432abd5.patch"; + sha256 = "WDUYXX6v5zk7tusz7DGBP58yFzgEvoBlNSLbfk7+QTc="; + }) + ]; +}) diff --git a/pkgs/development/libraries/presage/default.nix b/pkgs/development/libraries/presage/default.nix new file mode 100644 index 00000000000..df15e73f73c --- /dev/null +++ b/pkgs/development/libraries/presage/default.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, dbus +, doxygen +, fontconfig +, gettext +, graphviz +, help2man +, pkg-config +, sqlite +, tinyxml +, cppunit +}: + +stdenv.mkDerivation rec { + pname = "presage"; + version = "0.9.1"; + + src = fetchurl { + url = "mirror://sourceforge/presage/presage/${version}/presage-${version}.tar.gz"; + sha256 = "0rm3b3zaf6bd7hia0lr1wyvi1rrvxkn7hg05r5r1saj0a3ingmay"; + }; + + patches = [ + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/community/presage/gcc6.patch"; + sha256 = "0243nx1ygggmsly7057vndb4pkjxg9rpay5gyqqrq9jjzjzh63dj"; + }) + ./fixed-cppunit-detection.patch + ]; + + nativeBuildInputs = [ + autoreconfHook + doxygen + fontconfig + gettext + graphviz + help2man + pkg-config + ]; + + preBuild = '' + export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf + ''; + + buildInputs = [ + dbus + sqlite + tinyxml + ]; + + checkInputs = [ + cppunit + ]; + + doCheck = true; + + checkTarget = "check"; + + meta = with lib; { + description = "An intelligent predictive text entry system"; + homepage = "https://presage.sourceforge.io/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/libraries/presage/fixed-cppunit-detection.patch b/pkgs/development/libraries/presage/fixed-cppunit-detection.patch new file mode 100644 index 00000000000..27238d2956d --- /dev/null +++ b/pkgs/development/libraries/presage/fixed-cppunit-detection.patch @@ -0,0 +1,46 @@ +From 5624aa156c551ab2b81bb86279844397ed690653 Mon Sep 17 00:00:00 2001 +From: Matteo Vescovi +Date: Sun, 21 Jan 2018 17:17:12 +0000 +Subject: [PATCH] Fixed cppunit detection. + +--- + configure.ac | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a02e9f1..1538a51 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -204,10 +204,16 @@ AM_CONDITIONAL([USE_SQLITE], [test "x$use_sqlite" = "xyes"]) + dnl ================== + dnl Checks for CppUnit + dnl ================== +-AM_PATH_CPPUNIT([1.9.6], +- [], +- [AC_MSG_WARN([CppUnit not found. Unit tests will not be built. CppUnit can be obtained from http://cppunit.sourceforge.net.])]) +-AM_CONDITIONAL([HAVE_CPPUNIT], [test "$CPPUNIT_LIBS"]) ++PKG_CHECK_MODULES([CPPUNIT], ++ [cppunit >= 1.9], ++ [have_cppunit=yes], ++ [AM_PATH_CPPUNIT([1.9], ++ [have_cppunit=yes], ++ [AC_MSG_WARN([CppUnit not found. Unit tests will not be built. CppUnit can be obtained from http://cppunit.sourceforge.net.])]) ++ ]) ++AC_SUBST([CPPUNIT_CFLAGS]) ++AC_SUBST([CPPUNIT_LIBS]) ++AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$have_cppunit" = "xyes"]) + + + dnl ============================ +@@ -592,7 +598,7 @@ then + else + build_demo_application="no" + fi +-if test "$CPPUNIT_LIBS" ++if test "x$have_cppunit" = "xyes" + then + build_unit_tests="yes" + else +-- +2.31.1 + diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 314bdabdb55..28c16e32535 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -6,14 +6,14 @@ let pname = "qscintilla-qt${if withQt5 then "5" else "4"}"; - version = "2.11.5"; + version = "2.11.6"; in stdenv.mkDerivation rec { inherit pname version; src = fetchurl { url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz"; - sha256 = "k2Hib9f7e1gZp+uSxcGIChjem9PtndLrAI5XOIaWcWs="; + sha256 = "5zRgV9tH0vs4RGf6/M/LE6oHQTc8XVk7xytVsvDdIKc="; }; sourceRoot = "QScintilla-${version}/Qt4Qt5"; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index e2ca47f45f2..571c17dc4cf 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -15,7 +15,7 @@ , enableProprietaryCodecs ? true , gn , cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin -, ffmpeg_3 ? null +, ffmpeg ? null , lib, stdenv, fetchpatch , version ? null , qtCompatVersion @@ -140,9 +140,8 @@ qtModule { fi ''; - qmakeFlags = if stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64 - then [ "--" "-system-ffmpeg" ] ++ optional enableProprietaryCodecs "-proprietary-codecs" - else optional enableProprietaryCodecs "-- -proprietary-codecs"; + qmakeFlags = [ "--" "-system-ffmpeg" ] + ++ optional enableProprietaryCodecs "-proprietary-codecs"; propagatedBuildInputs = [ # Image formats @@ -158,8 +157,7 @@ qtModule { harfbuzz icu libevent - ] ++ optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ - ffmpeg_3 + ffmpeg ] ++ optionals (!stdenv.isDarwin) [ dbus zlib minizip snappy nss protobuf jsoncpp diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix index 522456cfa40..aa575f7e72a 100644 --- a/pkgs/development/libraries/rarian/default.nix +++ b/pkgs/development/libraries/rarian/default.nix @@ -15,12 +15,6 @@ in stdenv.mkDerivation rec { ++ (with perlPackages; [ perl XMLParser ]); configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat" ]; - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - meta = with lib; { description = "Documentation metadata library based on the proposed Freedesktop.org spec"; homepage = "https://rarian.freedesktop.org/"; diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index b6ec4842e07..0f16a519169 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -2,6 +2,7 @@ , substituteAll , pkg-config , fetchurl +, fetchpatch , python3Packages , gettext , itstool @@ -51,6 +52,13 @@ in stdenv.mkDerivation rec { src = ./fix-paths.patch; utillinux = util-linux; }) + + # Fix build with Glib 2.68 + # https://github.com/brailcom/speechd/pull/462 + (fetchpatch { + url = "https://github.com/brailcom/speechd/commit/a2faab416e42cbdf3d73f98578a89eb7a235e25a.patch"; + sha256 = "8Q7tUdKKBBtgXZZnj59OcJOkrCNeBR9gkBjhKlpW0hQ="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix index 2c89e3f433a..e2bf9bbd49a 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index 84d50faf54e..b6ce86ddff4 100644 --- a/pkgs/development/libraries/tepl/default.nix +++ b/pkgs/development/libraries/tepl/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "tepl"; - version = "5.0.1"; + version = "6.00.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sSdJZ2CfUkSEs4d1+p7LKWxtZhaqvQUvKGM5oomRKAQ="; + sha256 = "0qvs7s86gqyyrzi0r5fbrj8zczlgv8xhdjswgbgc1afwjnl9fqx8"; }; nativeBuildInputs = [ @@ -46,7 +46,10 @@ stdenv.mkDerivation rec { # correctly installed or GVfs metadata are not supported on this platform. In # the latter case, you should configure Tepl with --disable-gvfs-metadata. - passthru.updateScript = gnome3.updateScript { packageName = pname; }; + passthru.updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Tepl"; diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/development/libraries/totem-pl-parser/default.nix index c93ec8dccf9..b559d4f59cf 100644 --- a/pkgs/development/libraries/totem-pl-parser/default.nix +++ b/pkgs/development/libraries/totem-pl-parser/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 5b4c1d195ec..fddf9becb2d 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.0.4"; + version = "3.1.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-E877xx1S93RvPTfQQdjFvBM2pA/13ZK1Nw6GUMJqiY4="; + sha256 = "sha256-5NNhNRsVbyhipSRBX76/BTnHgc2HxmKWYvAmW0gDuLg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index ab769312c36..0af1476e7e2 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl +, fetchpatch , gettext , meson , ninja @@ -27,15 +28,15 @@ , substituteAll }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { pname = "tracker"; - version = "3.0.3"; + version = "3.1.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-b1yEqzvh7aUgUBsq7XIhYWoM8VKRDFN3V7U4vAXv/KM="; + sha256 = "sha256-Q3bi6YRUBm9E96JC5FuZs7/kwDtn+rGauw7Vhsp0iuc="; }; patches = [ @@ -43,6 +44,17 @@ stdenv.mkDerivation (rec { src = ./fix-paths.patch; inherit asciidoc; }) + + # Add missing build target dependencies to fix parallel building of docs. + # TODO: Upstream this. + ./fix-docs.patch + + # Fix 32bit datetime issue, use this upstream patch until 3.1.2 lands + # https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/401 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/tracker/merge_requests/401.patch"; + sha256 = "QEf+ciGkkCzanmtGO0aig6nAxd+NxjvuNi4RbNOwZEA="; + }) ]; nativeBuildInputs = [ @@ -74,22 +86,23 @@ stdenv.mkDerivation (rec { libstemmer ]; - checkInputs = [ - python3.pkgs.pygobject3 + checkInputs = with python3.pkgs; [ + pygobject3 + tappy ]; mesonFlags = [ "-Ddocs=true" ]; - # https://gitlab.gnome.org/GNOME/tracker/-/issues/292#note_1075369 - doCheck = !stdenv.isi686; + doCheck = true; postPatch = '' patchShebangs utils/g-ir-merge/g-ir-merge patchShebangs utils/data-generators/cc/generate patchShebangs tests/functional-tests/test-runner.sh.in patchShebangs tests/functional-tests/*.py + patchShebangs examples/python/endpoint.py ''; preCheck = '' @@ -134,8 +147,3 @@ stdenv.mkDerivation (rec { platforms = platforms.linux; }; } - // { - # TMP: fatal error: libtracker-sparql/tracker-sparql-enum-types.h: No such file or directory - enableParallelBuilding = false; - } -) diff --git a/pkgs/development/libraries/tracker/fix-docs.patch b/pkgs/development/libraries/tracker/fix-docs.patch new file mode 100644 index 00000000000..a6ff84cda3e --- /dev/null +++ b/pkgs/development/libraries/tracker/fix-docs.patch @@ -0,0 +1,28 @@ +diff --git a/docs/reference/libtracker-sparql/examples/meson.build b/docs/reference/libtracker-sparql/examples/meson.build +index 1cb1d9f3f..313c72345 100644 +--- a/docs/reference/libtracker-sparql/examples/meson.build ++++ b/docs/reference/libtracker-sparql/examples/meson.build +@@ -1,20 +1,20 @@ + executable( + 'readonly-example', + 'readonly-example.c', +- dependencies: tracker_sparql_dep, ++ dependencies: [tracker_common_dep, tracker_sparql_dep], + build_by_default: true + ) + + executable( + 'writeonly-example', + 'writeonly-example.c', +- dependencies: tracker_sparql_dep, ++ dependencies: [tracker_common_dep, tracker_sparql_dep], + build_by_default: true + ) + + executable( + 'writeonly-with-blank-nodes-example', + 'writeonly-with-blank-nodes-example.c', +- dependencies: tracker_sparql_dep, ++ dependencies: [tracker_common_dep, tracker_sparql_dep], + build_by_default: true + ) diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index fae81276878..6f46486e549 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -2,17 +2,15 @@ , numactl, rdma-core, libbfd, libiberty, perl, zlib }: -let - version = "1.9.0"; - -in stdenv.mkDerivation { - name = "ucx-${version}"; +stdenv.mkDerivation rec { + pname = "ucx"; + version = "1.10.0"; src = fetchFromGitHub { owner = "openucx"; repo = "ucx"; rev = "v${version}"; - sha256 = "0i0ji5ivzxjqh3ys1m517ghw3am7cw1hvf40ma7hsq3wznsyx5s1"; + sha256 = "1j2gfw4anixb5ajgiyn7bcca8pgjvsaf0y0b2xz88s9hdx0h6gs9"; }; nativeBuildInputs = [ autoreconfHook doxygen ]; diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index d27adb2a061..2dac161bb4a 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -1,6 +1,8 @@ -{ lib, stdenv -, docbook_xsl +{ stdenv +, lib +, docbook-xsl-nons , fetchurl +, fetchpatch , glib , gobject-introspection , gtk-doc @@ -19,21 +21,23 @@ stdenv.mkDerivation rec { pname = "umockdev"; version = "0.15.4"; - outputs = [ "bin" "out" "dev" "doc" ]; + outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; sha256 = "09k8jwvsphd97hcagf0zaf0hwzlzq2r8jfgbmvj55k7ylrg8hjxg"; }; - mesonFlags = [ - "-Dgtk_doc=true" + patches = [ + # Fix build with Vala 0.52 + (fetchpatch { + url = "https://github.com/martinpitt/umockdev/commit/a236f0b55fbb6ff50a6429da9d404703d6637d94.patch"; + sha256 = "sZs9Ove1r7te/a9vmWUmFetLVhyzhHmx7ijhkK/2S5o="; + }) ]; - buildInputs = [ glib systemd libgudev ]; - nativeBuildInputs = [ - docbook_xsl + docbook-xsl-nons gobject-introspection gtk-doc meson @@ -42,20 +46,27 @@ stdenv.mkDerivation rec { vala ]; - checkInputs = [ python3 which usbutils ]; + buildInputs = [ + glib + systemd + libgudev + ]; - enableParallelBuilding = true; + checkInputs = [ + python3 + which + usbutils + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + ]; doCheck = true; - postInstall = '' - mkdir -p $doc/share/doc/umockdev/ - mv docs/reference $doc/share/doc/umockdev/ - ''; - meta = with lib; { description = "Mock hardware devices for creating unit tests"; - license = licenses.lgpl2; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ flokli ]; platforms = with platforms; linux; }; diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index a17b164445f..13d4169cf14 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -11,6 +11,7 @@ , gtk3 , gobject-introspection , vala +, python3 , libxml2 , gnutls , gperf @@ -24,18 +25,25 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.62.2"; + version = "0.64.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-sDALvPDALfWBKhCjy45P/3I7q5LAjJegqQwWfPVDr/A="; + sha256 = "sha256-EvtBqf+OA8XxcRtGVgkQpLmzECrsPp52Cc7vTfqYqio="; }; - passthru = { - updateScript = gnome3.updateScript { packageName = pname; }; - }; + patches = [ + # VTE needs a small patch to work with musl: + # https://gitlab.gnome.org/GNOME/vte/issues/72 + # Taken from https://git.alpinelinux.org/aports/tree/community/vte3 + (fetchpatch { + name = "0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"; + url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd"; + sha256 = "FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU="; + }) + ]; nativeBuildInputs = [ gettext @@ -46,6 +54,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala + python3 ]; buildInputs = [ @@ -64,22 +73,20 @@ stdenv.mkDerivation rec { pango ]; - patches = - # VTE needs a small patch to work with musl: - # https://gitlab.gnome.org/GNOME/vte/issues/72 - lib.optional - stdenv.hostPlatform.isMusl - (fetchpatch { - name = "0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"; - url = "https://gitlab.gnome.org/GNOME/vte/uploads/c334f767f5d605e0f30ecaa2a0e4d226/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"; - sha256 = "1ii9db9i5l3fy2alxz7bjfsgjs3lappnlx339dvxbi2141zknf5r"; - }); - postPatch = '' patchShebangs perf/* patchShebangs src/box_drawing_generate.sh + patchShebangs src/parser-seq.py + patchShebangs src/modes.py ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + meta = with lib; { homepage = "https://www.gnome.org/"; description = "A library implementing a terminal emulator widget for GTK"; @@ -91,7 +98,7 @@ stdenv.mkDerivation rec { character set conversion, as well as emulating any terminal known to the system's terminfo database. ''; - license = licenses.lgpl2; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ astsmtl antono lethalman ] ++ teams.gnome.members; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 84a9e2a1db7..f4b716ee6d4 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -57,8 +57,6 @@ assert enableGeoLocation -> geoclue2 != null; -with lib; - stdenv.mkDerivation rec { pname = "webkitgtk"; version = "2.32.0"; @@ -72,7 +70,7 @@ stdenv.mkDerivation rec { sha256 = "1w3b0w8izp0i070grhv19j631sdcd0mcqnjnax13k8mdx7dg8zcx"; }; - patches = optionals stdenv.isLinux [ + patches = lib.optionals stdenv.isLinux [ (substituteAll { src = ./fix-bubblewrap-paths.patch; inherit (builtins) storeDir; @@ -85,7 +83,7 @@ stdenv.mkDerivation rec { # pick up the wrong gettext. TODO: Find a better solution for # this, maybe make cmake not look up executables in # CMAKE_PREFIX_PATH. - cmakeFlags+=" -DCMAKE_IGNORE_PATH=${getBin gettext}/bin" + cmakeFlags+=" -DCMAKE_IGNORE_PATH=${lib.getBin gettext}/bin" ''; nativeBuildInputs = [ @@ -118,7 +116,9 @@ stdenv.mkDerivation rec { libgcrypt libidn libintl + ] ++ lib.optionals stdenv.isLinux [ libmanette + ] ++ [ libnotify libpthreadstubs libsecret @@ -138,16 +138,16 @@ stdenv.mkDerivation rec { libXdmcp libXt libXtst - ]) ++ optionals stdenv.isDarwin [ + ]) ++ lib.optionals stdenv.isDarwin [ libedit readline - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ bubblewrap libseccomp systemd wayland xdg-dbus-proxy - ] ++ optional enableGeoLocation geoclue2; + ] ++ lib.optional enableGeoLocation geoclue2; propagatedBuildInputs = [ gtk3 @@ -159,27 +159,34 @@ stdenv.mkDerivation rec { "-DPORT=GTK" "-DUSE_LIBHYPHEN=OFF" "-DUSE_WPE_RENDERER=OFF" - ] ++ optionals stdenv.isDarwin [ - "-DENABLE_GRAPHICS_CONTEXT_3D=OFF" + ] ++ lib.optionals stdenv.isDarwin [ + "-DENABLE_GAMEPAD=OFF" "-DENABLE_GTKDOC=OFF" "-DENABLE_MINIBROWSER=OFF" - "-DENABLE_OPENGL=OFF" "-DENABLE_QUARTZ_TARGET=ON" "-DENABLE_VIDEO=ON" "-DENABLE_WEBGL=OFF" "-DENABLE_WEB_AUDIO=OFF" "-DENABLE_X11_TARGET=OFF" - "-DUSE_ACCELERATE=0" + "-DUSE_APPLE_ICU=OFF" + "-DUSE_OPENGL_OR_ES=OFF" "-DUSE_SYSTEM_MALLOC=ON" - ] ++ optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON"; + ] ++ lib.optionals (!stdenv.isLinux) [ + "-DUSE_SYSTEMD=OFF" + ] ++ lib.optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON"; postPatch = '' patchShebangs . + '' + lib.optionalString stdenv.isDarwin '' + # It needs malloc_good_size. + sed 22i'#include ' -i Source/WTF/wtf/FastMalloc.h + # needs CCCryptorStatus. + sed 43i'#include ' -i Source/WTF/wtf/RandomDevice.cpp ''; requiredSystemFeatures = [ "big-parallel" ]; - meta = { + meta = with lib; { description = "Web content rendering engine, GTK port"; homepage = "https://webkitgtk.org/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index be96001c46f..f94d35fd131 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gsettings-desktop-schemas + gsettings-desktop-schemas # settings exposed by settings portal gtk3 gnome3.gnome-desktop - gnome3.gnome-settings-daemon # schemas needed for settings api (fonts, etc) + gnome3.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s) ]; meta = with lib; { diff --git a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix index b51d179f95c..59816a4ef6f 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, makeWrapper , meson, ninja, pkg-config, wayland-protocols -, pipewire, wayland, systemd, libdrm, iniparser, scdoc }: +, pipewire, wayland, systemd, libdrm, iniparser, scdoc, grim }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-wlr"; @@ -13,13 +13,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-6ArUQfWx5rNdpsd8Q22MqlpxLT8GTSsymAf21zGe1KI="; }; - nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-protocols makeWrapper ]; buildInputs = [ pipewire wayland systemd libdrm iniparser scdoc ]; mesonFlags = [ "-Dsd-bus-provider=libsystemd" ]; + postInstall = '' + wrapProgram $out/libexec/xdg-desktop-portal-wlr --prefix PATH ":" ${lib.makeBinPath [ grim ]} + ''; + meta = with lib; { homepage = "https://github.com/emersion/xdg-desktop-portal-wlr"; description = "xdg-desktop-portal backend for wlroots"; diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 039ecc610f4..339f21c138b 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "zeitgeist"; - version = "1.0.2"; + version = "1.0.3"; outputs = [ "out" "lib" "dev" "man" ] ++ lib.optional pythonSupport "py"; @@ -29,14 +29,14 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0ig3d3j1n0ghaxsgfww6g2hhcdwx8cljwwfmp9jk1nrvkxd6rnmv"; + sha256 = "0y6fyzxl5np4yskcxibd0p03h619w9ir907nhf40h02y0pk1kgkp"; }; patches = [ - # Fix build with gettext 0.20 + # Fix build with Vala 0.52 (fetchpatch { - url = "https://gitlab.freedesktop.org/zeitgeist/zeitgeist/commit/b5c00e80189fd59a059a95c4e276728a2492cb89.patch"; - sha256 = "1r7f7j3l2p6xlzxajihgx8bzbc2sxcb9spc9pi26rz9bwmngdyq7"; + url = "https://gitlab.freedesktop.org/zeitgeist/zeitgeist/commit/64ac3a6f94cd299e5e14945dc31b48f009dec152.patch"; + sha256 = "Dw1kNE3JoFdmgcQ0eFoFLYvmxlPjXNj56Jkn2meINz4="; }) ]; diff --git a/pkgs/development/misc/msp430/mspds/binary.nix b/pkgs/development/misc/msp430/mspds/binary.nix new file mode 100644 index 00000000000..690ed3e45e7 --- /dev/null +++ b/pkgs/development/misc/msp430/mspds/binary.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchurl, unzip, autoPatchelfHook }: + +with lib; + +let + archPostfix = optionalString (stdenv.is64bit && !stdenv.isDarwin) "_64"; +in stdenv.mkDerivation rec { + pname = "msp-debug-stack-bin"; + version = "3.15.1.1"; + src = fetchurl { + url = "http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPDS/3_15_1_001/export/MSP430_DLL_Developer_Package_Rev_3_15_1_1.zip"; + sha256 = "1m1ssrwbhqvqwbp3m4hnjyxnz3f9d4acz9vl1av3fbnhvxr0d2hb"; + }; + sourceRoot = "."; + + libname = + if stdenv.hostPlatform.isWindows then "MSP430${archPostfix}.dll" + else "libmsp430${archPostfix}${stdenv.hostPlatform.extensions.sharedLibrary}"; + + nativeBuildInputs = [ unzip autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc ]; + + installPhase = '' + install -Dm0755 $libname $out/lib/''${libname//_64/} + install -Dm0644 -t $out/include Inc/*.h + ''; + + meta = { + description = "Unfree binary release of the TI MSP430 FET debug driver"; + homepage = https://www.ti.com/tool/MSPDS; + license = licenses.unfree; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ aerialx ]; + }; +} diff --git a/pkgs/development/misc/msp430/mspds/bsl430.patch b/pkgs/development/misc/msp430/mspds/bsl430.patch new file mode 100644 index 00000000000..6c57fb040e2 --- /dev/null +++ b/pkgs/development/misc/msp430/mspds/bsl430.patch @@ -0,0 +1,51 @@ +diff -ruN a/Makefile b/Makefile +--- a/Makefile 2020-06-03 16:10:18.000000000 -0700 ++++ b/Makefile 2020-07-21 18:03:12.464121056 -0700 +@@ -42,7 +42,7 @@ + + PLATFORM := $(shell uname -s) + ifeq ($(PLATFORM),Linux) +- CXX:= g++ ++ CXX?= g++ + + STATICOUTPUT := linux64 + +@@ -68,7 +68,7 @@ + + HIDOBJ := $(LIBTHIRD)/hid-libusb.o + else +- CXX:= clang++ ++ CXX?= clang++ + + OUTPUT := libmsp430.dylib + STATICOUTPUT := mac64 +@@ -134,7 +134,7 @@ + $(CXX) -c -o $@ $< $(USE_PCH) $(CXXFLAGS) $(INCLUDES) $(DEFINES) + + $(BSLLIB): +- $(MAKE) -C ./ThirdParty/BSL430_DLL ++ $(MAKE) -C ./ThirdParty/BSL430_DLL OUTPUT=../../$(BSLLIB) + + install: + cp $(OUTPUT) /usr/local/lib/ +diff -ruN a/ThirdParty/BSL430_DLL/Makefile b/ThirdParty/BSL430_DLL/Makefile +--- a/ThirdParty/BSL430_DLL/Makefile 2019-11-18 13:16:00.000000000 -0800 ++++ b/ThirdParty/BSL430_DLL/Makefile 2020-07-21 18:02:55.987782494 -0700 +@@ -36,7 +36,7 @@ + + PLATFORM := $(shell uname -s) + ifeq ($(PLATFORM),Linux) +- CXX:= g++ ++ CXX?= g++ + + ifdef BIT32 + CXXFLAGS += -m32 +@@ -47,7 +47,7 @@ + INCLUDES += -I$(BOOST_DIR) + endif + else +- CXX:= clang++ ++ CXX?= clang++ + + ifdef BOOST_DIR + INCLUDES += -I$(BOOST_DIR)/include diff --git a/pkgs/development/misc/msp430/mspds/default.nix b/pkgs/development/misc/msp430/mspds/default.nix new file mode 100644 index 00000000000..2481b50bfbe --- /dev/null +++ b/pkgs/development/misc/msp430/mspds/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchurl, unzip +, boost, pugixml +, hidapi +, libusb1 ? null +}: + +with lib; +assert stdenv.isLinux -> libusb1 != null; + +let + hidapiDriver = optionalString stdenv.isLinux "-libusb"; + +in stdenv.mkDerivation { + pname = "msp-debug-stack"; + version = "3.15.1.1"; + + src = fetchurl { + url = "http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPDS/3_15_1_001/export/MSPDebugStack_OS_Package_3_15_1_1.zip"; + sha256 = "1j5sljqwc20zrb50mrji4mnmw5i680qc7n0lb0pakrrxqjc9m9g3"; + }; + sourceRoot = "."; + + enableParallelBuilding = true; + libName = "libmsp430${stdenv.hostPlatform.extensions.sharedLibrary}"; + makeFlags = [ "OUTPUT=$(libName)" "HIDOBJ=" ]; + NIX_LDFLAGS = [ "-lpugixml" "-lhidapi${hidapiDriver}" ]; + NIX_CFLAGS_COMPILE = [ "-I${hidapi}/include/hidapi" ]; + + patches = [ ./bsl430.patch ]; + + preBuild = '' + rm ThirdParty/src/pugixml.cpp + rm ThirdParty/include/pugi{config,xml}.hpp + '' + optionalString stdenv.isDarwin '' + makeFlagsArray+=(OUTNAME="-install_name ") + ''; + + installPhase = '' + install -Dm0755 -t $out/lib $libName + install -Dm0644 -t $out/include DLL430_v3/include/*.h + ''; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ boost hidapi pugixml ] + ++ optional stdenv.isLinux libusb1; + + meta = { + description = "TI MSP430 FET debug driver"; + homepage = https://www.ti.com/tool/MSPDS; + license = licenses.bsd3; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ aerialx ]; + }; +} diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index bf348d68041..ca7050c0678 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -6,28 +6,44 @@ , itstool , gnome3 , pkg-config +, meson +, ninja +, python3 }: -stdenv.mkDerivation rec { +python3.pkgs.buildPythonApplication rec { pname = "yelp-tools"; - version = "3.38.0"; + version = "40.0"; + + format = "other"; src = fetchurl { - url = "mirror://gnome/sources/yelp-tools/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1c045c794sm83rrjan67jmsk20qacrw1m814p4nw85w5xsry8z30"; + url = "mirror://gnome/sources/yelp-tools/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1bkanqp3qwmirv06mi99qv2acr5ba5rlhy9zlh0fyrfxygraqjv6"; }; nativeBuildInputs = [ pkg-config + meson + ninja + ]; + + propagatedBuildInputs = [ + libxml2 # xmllint required by yelp-check. + libxslt # xsltproc required by yelp-build and yelp-check. ]; buildInputs = [ - libxml2 - libxslt - itstool + itstool # build script checks for its presence but I am not sure if anything uses it gnome3.yelp-xsl ]; + pythonPath = [ + python3.pkgs.lxml + ]; + + strictDeps = false; # TODO: Meson cannot find xmllint oherwise. Maybe add it to machine file? + doCheck = true; passthru = { diff --git a/pkgs/development/php-packages/deployer/default.nix b/pkgs/development/php-packages/deployer/default.nix new file mode 100644 index 00000000000..2e24a98b0bf --- /dev/null +++ b/pkgs/development/php-packages/deployer/default.nix @@ -0,0 +1,28 @@ +{ mkDerivation, fetchurl, makeWrapper, lib, php }: + +mkDerivation rec { + pname = "deployer"; + version = "6.8.0"; + + src = fetchurl { + url = "https://deployer.org/releases/v${version}/${pname}.phar"; + sha256 = "09mxwfa7yszsiljbkxpsd4sghqngl08cn18v4g1fbsxp3ib3kxi5"; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/deployer/deployer.phar + makeWrapper ${php}/bin/php $out/bin/dep --add-flags "$out/libexec/deployer/deployer.phar" + ''; + + meta = with lib; { + description = "A deployment tool for PHP"; + license = licenses.mit; + homepage = "https://deployer.org/"; + maintainers = with maintainers; teams.php.members; + }; +} diff --git a/pkgs/development/python-modules/PyRMVtransport/default.nix b/pkgs/development/python-modules/PyRMVtransport/default.nix index cfbf3be1c40..aee4789f93b 100644 --- a/pkgs/development/python-modules/PyRMVtransport/default.nix +++ b/pkgs/development/python-modules/PyRMVtransport/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "PyRMVtransport"; - version = "0.3.1"; + version = "0.3.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "cgtobi"; repo = pname; rev = "v${version}"; - sha256 = "1savzndg8l7rrc5dgzgsrdz9hnnjfv6qs5drznqmdw4f2rq84ypa"; + sha256 = "0m74m3dhxmbv10hsvs7cpshzs3pg66va5lyq94i5j1nxrl9i7spb"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index f75a0d6bb60..1ebf66a2597 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,18 +10,18 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "1.2.2"; + version = "1.3.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "37c23166603a3bd134e5f6fc22dbbf8c274d4d24c71418fba292ed2cd7a0bf43"; + sha256 = "17pcdi69bwdfw2wv3a0fhira5gimw88sp2wf47yqz50z1ckhv2c1"; }; # relax version constraints: aiobotocore works with newer botocore versions # the pinning used to match some `extras_require` we're not using. - preConfigure = '' - substituteInPlace setup.py --replace 'botocore>=1.17.44,<1.17.45' 'botocore' + postPatch = '' + substituteInPlace setup.py --replace 'botocore>=1.20.49,<1.20.50' 'botocore' ''; propagatedBuildInputs = [ wrapt aiohttp aioitertools botocore ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiobotocore" ]; meta = with lib; { - description = "Async client for amazon services using botocore and aiohttp/asyncio."; + description = "Python client for amazon services"; license = licenses.asl20; homepage = "https://github.com/aio-libs/aiobotocore"; maintainers = with maintainers; [ teh ]; diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index 8a7f72f8b86..942482ba5eb 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -1,6 +1,6 @@ { lib -, async-dns , buildPythonPackage +, dnspython , fetchFromGitHub , ifaddr , pyroute2 @@ -11,18 +11,18 @@ buildPythonPackage rec { pname = "aiodiscover"; - version = "1.3.4"; + version = "1.4.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TmWl5d5HwyqWPUjwtEvc5FzVfxV/K1pekljcMkGN0Ag="; + sha256 = "sha256-t0bs3n0eLUR22i1lZkepCffjiUFzvXBdP7Xq49KXeS4="; }; propagatedBuildInputs = [ - async-dns + dnspython pyroute2 ifaddr ]; @@ -36,10 +36,6 @@ buildPythonPackage rec { pytestCheckHook ]; - preBuild = '' - export HOME=$TMPDIR - ''; - disabledTests = [ # Tests require access to /etc/resolv.conf "test_async_discover_hosts" diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index f28668a8912..9cc3fb82775 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -1,22 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi -, dateutil, mock, isPy3k }: +{ lib +, buildPythonPackage +, dateutil +, fetchPypi +, isPy3k +, mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "aniso8601"; version = "9.0.1"; - meta = with lib; { - description = "Parses ISO 8601 strings."; - homepage = "https://bitbucket.org/nielsenb/aniso8601"; - license = licenses.bsd3; - }; - - propagatedBuildInputs = [ dateutil ]; - - checkInputs = lib.optional (!isPy3k) mock; - src = fetchPypi { inherit pname version; - sha256 = "72e3117667eedf66951bb2d93f4296a56b94b078a8a95905a052611fb3f1b973"; + sha256 = "sha256-cuMRdmfu32aVG7LZP0KWpWuUsHioqVkFoFJhH7PxuXM="; + }; + + propagatedBuildInputs = [ + dateutil + ]; + + checkInputs = [ + pytestCheckHook + ] ++ lib.optional (!isPy3k) mock; + + pythonImportsCheck = [ "aniso8601" ]; + + meta = with lib; { + description = "Python Parser for ISO 8601 strings"; + homepage = "https://bitbucket.org/nielsenb/aniso8601"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix index e82faba9758..80ef403b2cc 100644 --- a/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/pkgs/development/python-modules/astropy-healpix/default.nix @@ -3,25 +3,42 @@ , fetchPypi , numpy , astropy -, astropy-helpers +, astropy-extension-helpers +, setuptools-scm +, pytestCheckHook +, pytest-doctestplus +, hypothesis }: buildPythonPackage rec { pname = "astropy-healpix"; version = "0.6"; - doCheck = false; # tests require pytest-astropy - src = fetchPypi { - inherit pname version; + inherit version; + pname = lib.replaceStrings ["-"] ["_"] pname; sha256 = "409a6621c383641456c074f0f0350a24a4a58e910eaeef14e9bbce3e00ad6690"; }; - propagatedBuildInputs = [ numpy astropy astropy-helpers ]; + nativeBuildInputs = [ + astropy-extension-helpers + setuptools-scm + ]; - # Disable automatic update of the astropy-helper module - postPatch = '' - substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" + propagatedBuildInputs = [ + numpy + astropy + ]; + + checkInputs = [ + pytestCheckHook + pytest-doctestplus + hypothesis + ]; + + # tests must be run in the build directory + preCheck = '' + cd build/lib* ''; meta = with lib; { diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix index f77c938b1d7..2312df1cafa 100644 --- a/pkgs/development/python-modules/azure-common/default.nix +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "1.1.26"; + version = "1.1.27"; pname = "azure-common"; disabled = isPyPy; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b2866238aea5d7492cfb0282fc8b8d5f6d06fb433872345864d45753c10b6e4f"; + sha256 = "9f3f5d991023acbd93050cf53c4e863c6973ded7e236c69e99c8ff5c7bad41ef"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 2bcb4d42646..a63f33d7421 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { - version = "1.12.0"; + version = "1.13.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "adf2b1c6ef150a92295b4b405f982a9d2c55c4846728cb14760ca592acbb09ec"; + sha256 = "624b46db407dbed9e03134ab65214efab5b5315949a1fbd6cd592c46fb272588"; }; propagatedBuildInputs = [ @@ -45,6 +45,8 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/" ]; # disable tests which touch network disabledTests = [ "aiohttp" "multipart_send" "response" "request" "timeout" ]; + # requires testing modules which aren't published, and likely to create cyclic dependencies + disabledTestPaths = [ "tests/test_connection_string_parsing.py" ]; meta = with lib; { description = "Microsoft Azure Core Library for Python"; diff --git a/pkgs/development/python-modules/azure-datalake-store/default.nix b/pkgs/development/python-modules/azure-datalake-store/default.nix index f2c57d76623..b201b39d52d 100644 --- a/pkgs/development/python-modules/azure-datalake-store/default.nix +++ b/pkgs/development/python-modules/azure-datalake-store/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "azure-datalake-store"; - version = "0.0.51"; + version = "0.0.52"; src = fetchPypi { inherit pname version; - sha256 = "b871ebb3bcfd292e8a062dbbaacbc132793d98f1b60f549a8c3b672619603fc1"; + sha256 = "4198ddb32614d16d4502b43d5c9739f81432b7e0e4d75d30e05149fe6007fea2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix index 3d8e4df5654..e33f89c5a64 100644 --- a/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-eventgrid"; - version = "4.1.0"; + version = "4.1.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c4f29b2d9b717dad7919048f0a458dd84f83637c3d5c8f5a7e64634b22086719"; + sha256 = "c3bd28ccf6c837b58b58fc61275dace5348a823660c3ca21166a88aa2a8377a4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix index 4432595a12e..8ca4df197bb 100644 --- a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "2.0.0"; pname = "azure-mgmt-apimanagement"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "3ad7e2c3d20dd0141f9e2c0ae923121f7cbe7333bb314850e6f8b606636e3589"; + sha256 = "54fade87af54904c8ac9785efccebc537c58a3c1f8726e929e473698f06ebbfc"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix index dfadfbbc10e..ca662f6b145 100644 --- a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cdn"; - version = "10.0.0"; + version = "11.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f1216f505126483c568be511a3e0e654f886f13730dae5368609ff0573528cf2"; + sha256 = "28e7070001e7208cdb6c2ad253ec78851abdd73be482230d2c0874eed5bc0907"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 2bfa56dc81c..c03855f816f 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "19.0.0"; + version = "20.0.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "65afe759c6ee87dd89d65d59c8da4b2c04d197c07c1fbfdc56ef1aea468e4525"; + sha256 = "7920bea2e11d78fa616992813aea470a8fb50eab2e646e032e138f93d53b70e8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 8433025bbc0..76d5c11cb6f 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "15.0.0"; + version = "15.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e205aada94bb630e1ba5ee57751849456e1535aec3f2173edf2cbf596b99c0d9"; + sha256 = "51c64e01e614c9b88723b86b36b48f8417171610a098bf4690e39e71cefc32d9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 22823bfdd58..46890f7ab5b 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "6.1.0"; + version = "6.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7eb28eae4354e0a68e098de314b380d92f6482f53b2947dc8a36913195bdfde0"; + sha256 = "116b5bf9433ad89078c743b617c5b1c51f9ce1a1f128fb2e4bbafb5efb2d2c74"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix b/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix index 317019844cb..7c76daf619d 100644 --- a/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix @@ -1,21 +1,23 @@ { lib, buildPythonPackage, fetchPypi , msrestazure , azure-common +, azure-mgmt-core }: buildPythonPackage rec { pname = "azure-mgmt-databoxedge"; - version = "0.2.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "g8BtUpIGOse8Jrws48gQ/o7sgymlgX0XIxl1ThHS3XA="; + sha256 = "04090062bc1e8f00c2f45315a3bceb0fb3b3479ec1474d71b88342e13499b087"; }; propagatedBuildInputs = [ msrestazure azure-common + azure-mgmt-core ]; # no tests in pypi tarball diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix index f8f0818598d..f7d2b7b9db0 100644 --- a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix @@ -7,22 +7,24 @@ , msrestazure , azure-common , azure-mgmt-nspkg +, azure-mgmt-core }: buildPythonPackage rec { pname = "azure-mgmt-datamigration"; - version = "4.1.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c33d1deb0ee173a15c8ec21a1e714ba544fe5f4895d3b1d8b0581f3c1b2e8ce4"; + sha256 = "70373dbeb35a7768a47341bb3b570c559197bc1ba36fc8f8bf15139e4c8bad70"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/pkgs/development/python-modules/azure-mgmt-dns/default.nix index 37511456fe6..7daca780853 100644 --- a/pkgs/development/python-modules/azure-mgmt-dns/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-dns/default.nix @@ -6,24 +6,24 @@ , msrest , msrestazure , azure-common -, azure-mgmt-nspkg +, azure-mgmt-core }: buildPythonPackage rec { pname = "azure-mgmt-dns"; - version = "3.0.0"; + version = "8.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0zxkcczf01b64qfwj98jqdvnwqahygcyccf37rcxpdcfgpkg9kbf"; + sha256 = "407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8"; }; propagatedBuildInputs = [ msrest msrestazure azure-common - azure-mgmt-nspkg + azure-mgmt-core ]; # this is still needed for when the version is overrided diff --git a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix index c4453e8c0c1..9b9a84bbe21 100644 --- a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-hanaonazure"; - version = "0.15.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f5699cd2f6ad09555c3f1a75c8703e12db76bbbb7ec8b621dcb948d4fc9829a5"; + sha256 = "f2f8342fbfded8be4165fb0d6f010b68df074886811db3e2c9a50b360ee2dd3a"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index 10c4604ec18..c7aa05d25bd 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "azure-mgmt-keyvault"; - version = "8.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "2c974c6114d8d27152642c82a975812790a5e86ccf609bf370a476d9ea0d2e7d"; + sha256 = "2890c489289b8a0bf833852014f2f494eb96873834896910ddfa58cfa97b90da"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index c5adc61ea20..fb82c33ba9b 100644 --- a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "2.0.0"; pname = "azure-mgmt-kusto"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "fa3ede0ebd6489bbf993f420bcb5fc63d9fad2a1e945c3c49b26fa012bb3534e"; + sha256 = "81601479e2b6da3e69654462674ef1474218c4415ef25c1d9892939721732153"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index 9eb1d2afc14..f14aa34c323 100644 --- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "azure-mgmt-loganalytics"; - version = "8.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3e7a93186594c328a6f34f0e0d9209a05021228baa85aa4c1c4ffdbf8005a45f"; + sha256 = "c0b702753c0774a25bcb49b967573b0ec2bef5262c24bc371c219a750ba3c4fd"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix b/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix index 4d059480c44..140f08e13f4 100644 --- a/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix @@ -1,21 +1,27 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-mgmt-core , msrest , msrestazure }: buildPythonPackage rec { - version = "1.0.0"; + version = "6.0.0"; pname = "azure-mgmt-managedservices"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "06ddfqriqlvwjsjhqka9r5vhshardyj9c10xgjissfkpqsgkkn7y"; + sha256 = "ec0cb3858bcf8edf5eee0eddee81560424eb84352e0df082ddc94eb99badfd5e"; extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-mgmt-core + msrest + msrestazure + ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-maps/default.nix b/pkgs/development/python-modules/azure-mgmt-maps/default.nix index c0f418ed725..69ed75dda30 100644 --- a/pkgs/development/python-modules/azure-mgmt-maps/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-maps/default.nix @@ -6,24 +6,24 @@ , msrest , msrestazure , azure-common -, azure-mgmt-nspkg +, azure-mgmt-core }: buildPythonPackage rec { pname = "azure-mgmt-maps"; - version = "0.1.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c120e210bb61768da29de24d28b82f8d42ae24e52396eb6569b499709e22f006"; + sha256 = "dafbe23bdbe9c01f88ce91c5b8587eefc73ac2d637ebcdc59ded6d332932e3ab"; }; propagatedBuildInputs = [ msrest msrestazure azure-common - azure-mgmt-nspkg + azure-mgmt-core ]; pythonNamespaces = [ "azure.mgmt" ]; diff --git a/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix b/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix index 98855730ba3..c6ed92e0428 100644 --- a/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix @@ -1,21 +1,27 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-mgmt-core , msrest , msrestazure }: buildPythonPackage rec { - version = "0.1.0"; + version = "1.0.0"; pname = "azure-mgmt-privatedns"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "08wdvfkk8jh90m3l4nz7knd5vikgfvsx70lk7mkhcvl0xj6gv76j"; + sha256 = "b60f16e43f7b291582c5f57bae1b083096d8303e9d9958e2c29227a55cc27c45"; extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-mgmt-core + msrest + msrestazure + ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 5cbbee77ae8..447b377715d 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { - version = "16.0.0"; + version = "16.1.0"; pname = "azure-mgmt-resource"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0bdbdc9c1ed2ef975d8dff45f358d1e06dc6761eace5b6817f13993447e48a68"; + sha256 = "b814ee27b37f030fe69461ef6f514661340dc8b1f28736362541e1c0d31d90ae"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix new file mode 100644 index 00000000000..b79c73ab026 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, isPy3k +, msrest +, msrestazure +, azure-common +, azure-mgmt-core +}: + +buildPythonPackage rec { + pname = "azure-mgmt-servicefabricmanagedclusters"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "sha256-EJyjolHrt92zWg+IKWFKTapwZaFrwTtSyEIu5/mZXOg="; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + azure-mgmt-core + ]; + + pythonNamespaces = [ "azure.mgmt" ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "This is the Microsoft Azure Service Fabric Cluster Management Client Library"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 6f14ce174cd..6789a7512a6 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { - version = "17.0.0"; + version = "17.1.0"; pname = "azure-mgmt-storage"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c0e3fd99028d98c80dddabe1c22dfeb3d694e5c1393c6de80766eb240739e4bc"; + sha256 = "01acb8e988c8082174fa952e1638d700146185644fbe4b126e65843e63d44600"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix index 1b26495e9b7..a09677ab8e7 100644 --- a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-mgmt-synapse"; - version = "1.0.0"; + version = "2.0.0"; disabled = pythonOlder "3"; src = fetchPypi { inherit pname version; - sha256 = "d5514dfef93294a2d9b8ff6fdb353b3102abd5750f147d904e6012f24113ff9c"; + sha256 = "bec6bdfaeb55b4fdd159f2055e8875bf50a720bb0fce80a816e92a2359b898c8"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index d885166daa9..899c952b357 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.1.0"; + version = "7.1.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c5b3681ce4d7a44c223ddddfdec4c8d2eadede3b11b598ac09c4dbf4b729e89b"; + sha256 = "58797defe666dd17ae11a8895395e7e844f11d2076ba4a9ce63682ac02f665d9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-servicefabric/default.nix b/pkgs/development/python-modules/azure-servicefabric/default.nix index 743f0abd925..283a3146662 100644 --- a/pkgs/development/python-modules/azure-servicefabric/default.nix +++ b/pkgs/development/python-modules/azure-servicefabric/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-servicefabric"; - version = "7.2.0.46"; + version = "8.0.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c15fd5e8fe33a12295435f16e007edcfd8f660547795742f9b74ef8fb3a431ba"; + sha256 = "f414cc114e28a358a7f39772205f3f15d7fc1aa30a08d106b0b80623f4303f1d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index bbcf84ef6ac..fe36536dfe2 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.8.0"; + version = "12.8.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "36b85a3423379d4a93f663022487cf53aa3043a355f8414321dde878c00cb577"; + sha256 = "eb37b50ddfb6e558b29f6c8c03b0666514e55d6170bf4624e7261a3af93c6401"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index fc98e4207e8..a1322c03c9f 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.4.1"; + version = "12.4.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7503d05882970abc977529ff5a4b81e79f62fd51b238fe306f72e13f57a522ca"; + sha256 = "6c458d1e3db38fdd502d8f77107c81e6859654f02c0e7f2a98214289d9e0dde2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage/default.nix b/pkgs/development/python-modules/azure-storage/default.nix index 258a5ebabb2..8afb9b751ee 100644 --- a/pkgs/development/python-modules/azure-storage/default.nix +++ b/pkgs/development/python-modules/azure-storage/default.nix @@ -3,6 +3,7 @@ , fetchPypi , python , azure-common +, cryptography , futures ? null , dateutil , requests @@ -18,7 +19,7 @@ buildPythonPackage rec { sha256 = "0pyasfxkin6j8j00qmky7d9cvpxgis4fi9bscgclj6yrpvf14qpv"; }; - propagatedBuildInputs = [ azure-common dateutil requests ] + propagatedBuildInputs = [ azure-common cryptography dateutil requests ] ++ pkgs.lib.optionals (!isPy3k) [ futures ]; postPatch = '' diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index 76ad6163606..f17c3e5f6bc 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-synapse-artifacts"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "a13124dc9405277f697f6452728d7dcf4c50601ee76055fd42f12b51494d6579"; + sha256 = "ec113d37386b8787862baaf9da0318364a008004a377d20fdfca31cfe8d16210"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix index 21d0b6d9f30..dcd6caaffa2 100644 --- a/pkgs/development/python-modules/breezy/default.nix +++ b/pkgs/development/python-modules/breezy/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "breezy"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1eff207403f48898fa3b3ffa7a4275197c6c58fec105ef267caf1f5fd5a6c7be"; + sha256 = "sha256-lwKPk+UxKAhfIgUb1xPLJ/za53VdHenmBrr85RTpEps="; }; propagatedBuildInputs = [ configobj patiencediff six fastimport dulwich launchpadlib ]; diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index 87eafc26550..d3953137167 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -1,29 +1,21 @@ -{ buildPythonPackage, lib, fetchPypi, fetchpatch +{ buildPythonPackage, lib, fetchPypi , pytestCheckHook, filelock, mock, pep8 , cython , six, pyshp, shapely, geos, numpy , gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona -, proj +, proj, flufl_lock }: buildPythonPackage rec { pname = "cartopy"; - version = "0.18.0"; + version = "0.19.0.post1"; src = fetchPypi { inherit version; pname = "Cartopy"; - sha256 = "0d24fk0cbp29gmkysrwq05vry13swmwi3vx3cpcy04c0ixz33ykz"; + sha256 = "0xnm8z3as3hriivdfd26s6vn5b63gb46x6vxw6gh1mwfm5rlg2sb"; }; - patches = [ - # Fix numpy-1.20 compatibility. Will be part of 0.19. - (fetchpatch { - url = "https://github.com/SciTools/cartopy/commit/e663bbbef07989a5f8484a8f36ea9c07e61d14ce.patch"; - sha256 = "061kbjgzkc3apaz6sxy00pkgy3n9dxcgps5wzj4rglb5iy86n2kq"; - }) - ]; - buildInputs = [ geos proj ]; @@ -36,7 +28,7 @@ buildPythonPackage rec { gdal pillow matplotlib pyepsg pykdtree scipy fiona owslib ]; - checkInputs = [ pytestCheckHook filelock mock pep8 ]; + checkInputs = [ pytestCheckHook filelock mock pep8 flufl_lock ]; pytestFlagsArray = [ "--pyargs" "cartopy" @@ -46,6 +38,7 @@ buildPythonPackage rec { disabledTests = [ "test_nightshade_image" "background_img" + "test_gridliner_labels_bbox_style" ]; nativeBuildInputs = [ @@ -56,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Process geospatial data to create maps and perform analyses"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; homepage = "https://scitools.org.uk/cartopy/docs/latest/"; maintainers = with maintainers; [ mredaelli ]; }; diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index ca25e05bb1e..d091785db11 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -8,7 +8,7 @@ , setuptools-scm , scipy , scikitlearn -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -21,13 +21,9 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikitlearn ]; - checkPhase = '' - py.test dask_glm - ''; - meta = with lib; { homepage = "https://github.com/dask/dask-glm/"; description = "Generalized Linear Models with Dask"; diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 517056866bb..b02c9a71a6b 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -26,6 +26,10 @@ buildPythonPackage rec { sha256 = "8fc4ac3ec1915e382fb8cae9ff1ec9b5ac1bee0b6f4c6975d6e6cb7191a4a815"; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ dask dask-glm @@ -39,7 +43,6 @@ buildPythonPackage rec { scipy six toolz - setuptools-scm ]; # has non-standard build from source, and pypi doesn't include tests diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 1c6d37681a6..55ba3ad6ba7 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , bokeh , buildPythonPackage , fetchpatch @@ -77,9 +78,7 @@ buildPythonPackage rec { "-m 'not network'" ]; - disabledTests = [ - "test_annotation_pack_unpack" - "test_annotations_blockwise_unpack" + disabledTests = lib.optionals stdenv.isDarwin [ # this test requires features of python3Packages.psutil that are # blocked in sandboxed-builds "test_auto_blocksize_csv" diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index beb5ba9c46b..37717f76f33 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Microsoft"; repo = pname; rev = "v${version}"; - sha256 = "1dgjbbhy228w2zbfq5pf0hkai7742zw8mmybnzjdc9l6pw7360rq"; + hash = "sha256-YGzc9mMIzPTmUgIXuZROLdYKjUm69x9SR+JtYRVpn24="; }; patches = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { inherit gdb; }) + # Use nixpkgs version instead of versioneer (substituteAll { src = ./hardcode-version.patch; inherit version; @@ -87,6 +88,8 @@ buildPythonPackage rec { "gevent" ]; + pythonImportsCheck = [ "debugpy" ]; + meta = with lib; { description = "An implementation of the Debug Adapter Protocol for Python"; homepage = "https://github.com/microsoft/debugpy"; diff --git a/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch index 751351e03cd..f74b53a831b 100644 --- a/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch +++ b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch @@ -1,8 +1,8 @@ diff --git a/tests/debug/session.py b/tests/debug/session.py -index 2b39106..6d45a10 100644 +index 101492f..4ee7cfb 100644 --- a/tests/debug/session.py +++ b/tests/debug/session.py -@@ -625,6 +625,7 @@ class Session(object): +@@ -630,6 +630,7 @@ class Session(object): if "PYTHONPATH" in self.config.env: # If specified, launcher will use it in lieu of PYTHONPATH it inherited # from the adapter when spawning debuggee, so we need to adjust again. diff --git a/pkgs/development/python-modules/decopatch/default.nix b/pkgs/development/python-modules/decopatch/default.nix new file mode 100644 index 00000000000..7fa3c6465db --- /dev/null +++ b/pkgs/development/python-modules/decopatch/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, makefun +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "decopatch"; + version = "1.4.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "0i6i811s2j1z0cl6y177dwsbfxib8dvb5c2jpgklvc2xy4ahhsy6"; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ makefun ]; + + postPatch = '' + substituteInPlace setup.py --replace "'pytest-runner', " "" + ''; + + # Tests would introduce multiple cirucular dependencies + # Affected: makefun, pytest-cases + doCheck = false; + + pythonImportsCheck = [ "decopatch" ]; + + meta = with lib; { + description = "Python helper for decorators"; + homepage = "https://github.com/smarie/python-decopatch"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/deltachat/default.nix b/pkgs/development/python-modules/deltachat/default.nix new file mode 100644 index 00000000000..ffa9b8d7d63 --- /dev/null +++ b/pkgs/development/python-modules/deltachat/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchpatch +, setuptools-scm +, libdeltachat +, cffi +, IMAPClient +, pluggy +, requests +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "deltachat"; + inherit (libdeltachat) version src; + sourceRoot = "${src.name}/python"; + + disabled = isPy27; + + nativeBuildInputs = [ + setuptools-scm + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + buildInputs = [ + libdeltachat + ]; + + propagatedBuildInputs = [ + cffi + IMAPClient + pluggy + requests + setuptools + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "deltachat" + "deltachat.account" + "deltachat.contact" + "deltachat.chat" + "deltachat.message" + ]; + + meta = with lib; { + description = "Python bindings for the Delta Chat Core library"; + homepage = "https://github.com/deltachat/deltachat-core-rust/tree/master/python"; + changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${version}/python/CHANGELOG"; + license = licenses.mpl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index d4f742d97f5..3fb5e7ae55e 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -5,25 +5,23 @@ , libopus , pynacl , pythonOlder -, websockets , withVoice ? true }: buildPythonPackage rec { pname = "discord.py"; - version = "1.7.1"; + version = "1.7.2"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Rapptz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dpASIqe6rJEyiWJyPbQhq9M54lX1ilfp4UuGnbJcFLo="; + sha256 = "sha256-NY1/RKp8w9gAqGYXnCNhNZqR/inGMvUvxjJ1MMs62B8="; }; propagatedBuildInputs = [ aiohttp - websockets ] ++ lib.optionalString withVoice [ libopus pynacl diff --git a/pkgs/development/python-modules/elmax/default.nix b/pkgs/development/python-modules/elmax/default.nix index 7ec3b8d1c11..775050acb0c 100644 --- a/pkgs/development/python-modules/elmax/default.nix +++ b/pkgs/development/python-modules/elmax/default.nix @@ -4,12 +4,15 @@ , httpx , poetry-core , pythonOlder +, pytest-asyncio +, pytest-httpx +, pytestCheckHook , yarl }: buildPythonPackage rec { pname = "elmax"; - version = "0.1.1"; + version = "0.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-elmax"; rev = version; - sha256 = "sha256-vDISJ/CVOjpM+GPF2TCm3/AMFTWTM0b/+ZPCpAEvNvY="; + sha256 = "sha256-Aq/OHxOmtUUmBNlFPu892C8AkTX+Ee0oca7D79InPXQ="; }; nativeBuildInputs = [ poetry-core ]; @@ -27,8 +30,12 @@ buildPythonPackage rec { yarl ]; - # Project has no tests - doCheck = false; + checkInputs = [ + pytest-asyncio + pytest-httpx + pytestCheckHook + ]; + pythonImportsCheck = [ "elmax" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix index 9a0b1b09db6..f14245865f5 100644 --- a/pkgs/development/python-modules/glymur/default.nix +++ b/pkgs/development/python-modules/glymur/default.nix @@ -2,10 +2,10 @@ , buildPythonPackage , fetchFromGitHub , numpy -, python , scikitimage , openjpeg , procps +, pytestCheckHook , contextlib2 , mock , importlib-resources @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "glymur"; - version = "0.8.18"; + version = "0.9.3"; src = fetchFromGitHub { owner = "quintusdias"; repo = pname; rev = "v${version}"; - sha256 = "1zbghzw1q4fljb019lsrhka9xrnn4425qnxrjbmbv7dssgkkywd7"; + sha256 = "1xlpax56qg5qqh0s19xidgvv2483sc684zj7rh6zw1m1z9m37drr"; }; propagatedBuildInputs = [ @@ -30,16 +30,21 @@ buildPythonPackage rec { checkInputs = [ scikitimage procps + pytestCheckHook ]; postConfigure = '' substituteInPlace glymur/config.py \ - --replace "path = read_config_file(libname)" "path = '${openjpeg}/lib' + libname + ${if stdenv.isDarwin then "'.dylib'" else "'.so'"}" + --replace "path = read_config_file(libname)" "path = '${openjpeg}/lib/lib' + libname + ${if stdenv.isDarwin then "'.dylib'" else "'.so'"}" ''; - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; + disabledTestPaths = [ + # this test involves glymur's different ways of finding the openjpeg path on + # fsh systems by reading an .rc file and such, and is obviated by the patch + # in postConfigure + "tests/test_config.py" + ]; + meta = with lib; { description = "Tools for accessing JPEG2000 files"; diff --git a/pkgs/development/python-modules/hdate/default.nix b/pkgs/development/python-modules/hdate/default.nix new file mode 100644 index 00000000000..a034eddd565 --- /dev/null +++ b/pkgs/development/python-modules/hdate/default.nix @@ -0,0 +1,63 @@ +{ lib +, astral +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pytestCheckHook +, pythonOlder +, pytz +}: + +buildPythonPackage rec { + pname = "hdate"; + version = "0.10.2"; + disabled = pythonOlder "3.6"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "py-libhdate"; + repo = "py-libhdate"; + rev = "v${version}"; + sha256 = "07b0c7q8w6flj4q72v58d3wymsxfp5qz8z97qhhc2977mjx5fsxd"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + astral + pytz + ]; + + checkInputs = [ + pytestCheckHook + ]; + + patches = [ + # Version was not updated for the release + (fetchpatch { + name = "update-version.patch"; + url = "https://github.com/py-libhdate/py-libhdate/commit/b8186a891b29fed99def5ce0985ee0ae1e0dd77e.patch"; + sha256 = "1pmhgh57x9390ff5gyisng0l6b79sd6dxmf172hpk1gr03c3hv98"; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml --replace "^2020.5" ">=2020.5" + ''; + + pytestFlagsArray = [ + "tests" + ]; + + pythonImportsCheck = [ "hdate" ]; + + meta = with lib; { + description = "Python module for Jewish/Hebrew date and Zmanim"; + homepage = "https://github.com/py-libhdate/py-libhdate"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index dbbdf0bb38c..079b5e71a10 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -5,24 +5,25 @@ , h11 , h2 , pproxy +, pytest-asyncio +, pytest-trio , pytestCheckHook , pytestcov , sniffio -, uvicorn , trustme -, trio +, uvicorn }: buildPythonPackage rec { pname = "httpcore"; - version = "0.12.3"; + version = "0.13.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "09hbjc5wzhrnri5y3idxcq329d7jiaxljc7y6npwv9gh9saln109"; + sha256 = "sha256-KvqBVQUaF3p2oJz0tt3Bkn2JiKEHqrZ3b6I9f0JK5h8="; }; propagatedBuildInputs = [ @@ -33,18 +34,19 @@ buildPythonPackage rec { checkInputs = [ pproxy + pytest-asyncio + pytest-trio pytestCheckHook pytestcov - uvicorn trustme - trio + uvicorn ]; - pytestFlagsArray = [ + disabledTestPaths = [ # these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known - "--ignore=tests/test_threadsafety.py" - "--ignore=tests/sync_tests/test_interfaces.py" - "--ignore=tests/sync_tests/test_retries.py" + "tests/test_threadsafety.py" + "tests/sync_tests/test_interfaces.py" + "tests/sync_tests/test_retries.py" ]; pythonImportsCheck = [ "httpcore" ]; diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 2aba203ea01..b45c3e85f50 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.17.1"; + version = "0.18.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-P4Uki+vlAgVECBUz9UGvv1ip49jmf0kYbyU2/mkWE3U="; + sha256 = "sha256-6EYBTRXaVHBgW/JzZvWLz55AqgocOyym2FVtu2Nkp/U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index ce7cff4d79b..957b8ad5fd1 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -1,38 +1,67 @@ { lib -, buildPythonPackage -, fetchPypi -, requests -, jinja2 -, pillow -, rasterio -, shapely -, ndjson , backoff -, google-api-core , backports-datetime-fromisoformat +, buildPythonPackage +, dataclasses +, fetchFromGitHub +, google-api-core +, jinja2 +, ndjson +, pillow +, pydantic +, pytest-cases +, pytestCheckHook +, pythonOlder +, rasterio +, requests +, shapely }: buildPythonPackage rec { pname = "labelbox"; - version = "2.5.1"; + version = "2.5.4"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "7f2cbc5d4869d8acde865ad519fc1cc85338247cd7cf534334f988a040679219"; + src = fetchFromGitHub { + owner = "Labelbox"; + repo = "labelbox-python"; + rev = "v${version}"; + sha256 = "0182klvm8bjcm8fkl9w8ypj12s026czgid8ldl6jjvmzhxpmss68"; }; propagatedBuildInputs = [ - jinja2 requests pillow rasterio shapely ndjson backoff - google-api-core backports-datetime-fromisoformat + backoff + backports-datetime-fromisoformat + dataclasses + google-api-core + jinja2 + ndjson + pillow + pydantic + rasterio + requests + shapely + ]; + + postPatch = '' + substituteInPlace setup.py --replace "pydantic==1.8" "pydantic>=1.8" + ''; + + checkInputs = [ + pytest-cases + pytestCheckHook + ]; + + disabledTestPaths = [ + # Requires network access + "tests/integration" ]; - # Test cases are not running on pypi or GitHub - doCheck = false; pythonImportsCheck = [ "labelbox" ]; meta = with lib; { - homepage = "https://github.com/Labelbox/Labelbox"; description = "Platform API for LabelBox"; + homepage = "https://github.com/Labelbox/labelbox-python"; license = licenses.asl20; maintainers = with maintainers; [ rakesh4g ]; }; diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 531232bf8e6..c145b9d888f 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -1,26 +1,31 @@ -{ lib, buildPythonPackage, fetchzip, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl }: +{ lib, buildPythonPackage, pythonOlder, fetchFromGitLab +, gobject-introspection, idna, libsoup, precis-i18n, pygobject3, pyopenssl +}: -let +buildPythonPackage rec { pname = "nbxmpp"; - version = "1.0.2"; - name = "${pname}-${version}"; -in buildPythonPackage { - inherit pname version; + version = "2.0.2"; + + disabled = pythonOlder "3.7"; + # Tests aren't included in PyPI tarball. - src = fetchzip { - name = "${name}.tar.bz2"; - url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?" - + "ref=${name}"; - sha256 = "1rhzsakqrybzq5j5b9400wjd14pncph47c1ggn5a6f3di03lk4az"; + src = fetchFromGitLab { + domain = "dev.gajim.org"; + owner = "gajim"; + repo = "python-nbxmpp"; + rev = "nbxmpp-${version}"; + sha256 = "0z27mxgfk7hvpx0xdrd8g9441rywv74yk7s83zjnc2mc7xvpwhf4"; }; buildInputs = [ precis-i18n ]; propagatedBuildInputs = [ gobject-introspection idna libsoup pygobject3 pyopenssl ]; + pythonImportsCheck = [ "nbxmpp" ]; + meta = with lib; { homepage = "https://dev.gajim.org/gajim/python-nbxmpp"; description = "Non-blocking Jabber/XMPP module"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/python-modules/ondilo/default.nix b/pkgs/development/python-modules/ondilo/default.nix index 7010bd473ab..271243ab791 100644 --- a/pkgs/development/python-modules/ondilo/default.nix +++ b/pkgs/development/python-modules/ondilo/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ondilo"; - version = "0.2.0"; + version = "0.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "JeromeHXP"; repo = pname; rev = version; - sha256 = "0k7c9nacf7pxvfik3hkv9vvvda2sx5jrf6zwq7r077x7fw5l8d2b"; + sha256 = "sha256-MI6K+41I/IVi+GRBdmRIHbljULDFLAwpo3W8tdxCOBM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index a03452d7862..958d3b76559 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.19.2"; + version = "1.19.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RMu008kS8toWfKAr+YoAQPfpMmDk7xFMKNXWFSAS6gc="; + sha256 = "sha256-fJxtV1QbDyFT4jqNdZzrPXy5MIkY+6atnpL44OWpC8g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pgpy/default.nix b/pkgs/development/python-modules/pgpy/default.nix index b3fde72baec..a79c65f4059 100644 --- a/pkgs/development/python-modules/pgpy/default.nix +++ b/pkgs/development/python-modules/pgpy/default.nix @@ -1,31 +1,31 @@ -{ lib, isPy3k, fetchFromGitHub, buildPythonPackage +{ lib, pythonOlder, fetchFromGitHub, buildPythonPackage , six, enum34, pyasn1, cryptography, singledispatch ? null -, fetchPypi, pytestCheckHook }: +, pytestCheckHook }: buildPythonPackage rec { pname = "pgpy"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "SecurityInnovation"; repo = "PGPy"; - rev = version; - sha256 = "1v2b1dyq1sl48d2gw7vn4hv6sasd9ihpzzcq8yvxj9dgfak2y663"; + rev = "v${version}"; + sha256 = "03pch39y3hi4ici6y6lvz0j0zram8dw2wvnmq1zyjy3vyvm1ms4a"; }; propagatedBuildInputs = [ six pyasn1 cryptography + ] ++ lib.optionals (pythonOlder "3.4") [ singledispatch - ] ++ lib.optional (!isPy3k) enum34; + enum34 + ]; checkInputs = [ pytestCheckHook ]; - disabledTests = [ "test_sign_string" "test_verify_string" ]; - meta = with lib; { homepage = "https://github.com/SecurityInnovation/PGPy"; description = "Pretty Good Privacy for Python 2 and 3"; @@ -35,6 +35,6 @@ buildPythonPackage rec { 4880. ''; license = licenses.bsd3; - maintainers = with maintainers; [ eadwu ]; + maintainers = with maintainers; [ eadwu dotlambda ]; }; } diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index a24e1d5db13..308f308dbb7 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -2,9 +2,7 @@ , buildPythonPackage , debugger , fetchPypi -, isPy3k , Mako -, makeWrapper , packaging , pysocks , pygments @@ -20,7 +18,7 @@ , tox , unicorn , intervaltree -, fetchpatch +, installShellFiles }: buildPythonPackage rec { @@ -39,6 +37,10 @@ buildPythonPackage rec { sed -i 's/unicorn>=1.0.2rc1,<1.0.2rc4/unicorn>=1.0.2rc1/' setup.py ''; + nativeBuildInputs = [ + installShellFiles + ]; + propagatedBuildInputs = [ Mako packaging @@ -60,6 +62,10 @@ buildPythonPackage rec { doCheck = false; # no setuptools tests for the package + postInstall = '' + installShellCompletion --bash extra/bash_completion.d/shellcraft + ''; + postFixup = '' mkdir -p "$out/bin" makeWrapper "${debugger}/bin/${lib.strings.getName debugger}" "$out/bin/pwntools-gdb" diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 5ae00417b6c..bd4de522943 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyatspi"; - version = "2.38.0"; + version = "2.38.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "/4CTEv0ML2HhkcGBoaY4owtXm5G2gs+1oFU1pVJltD0="; + sha256 = "0lc1p6p296c9q3lffi03v902jlsj34i7yyl3rcyaq94wwbljg7z4"; }; nativeBuildInputs = [ pkg-config ]; @@ -23,6 +23,7 @@ buildPythonPackage rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "python3.pkgs.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/python-modules/pygobject/3.36.nix b/pkgs/development/python-modules/pygobject/3.36.nix index ccad57eba1e..27bf8762d59 100644 --- a/pkgs/development/python-modules/pygobject/3.36.nix +++ b/pkgs/development/python-modules/pygobject/3.36.nix @@ -23,13 +23,6 @@ buildPythonPackage rec { ++ lib.optionals stdenv.isDarwin [ which ncurses ]; propagatedBuildInputs = [ pycairo cairo ]; - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "python3.pkgs.${pname}3"; - }; - }; - meta = with lib; { homepage = "https://pygobject.readthedocs.io/"; description = "Python bindings for Glib"; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 8c26ec6174b..641a30b1627 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -1,37 +1,66 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection, -pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: +{ lib +, stdenv +, fetchurl +, buildPythonPackage +, pkg-config +, glib +, gobject-introspection +, pycairo +, cairo +, which +, ncurses +, meson +, ninja +, isPy3k +, gnome3 +}: buildPythonPackage rec { pname = "pygobject"; - version = "3.38.0"; + version = "3.40.1"; - disabled = ! isPy3k; + outputs = [ "out" "dev" ]; + + disabled = !isPy3k; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "A3LRu5Ei/Bn1AKJJsfOMK7Z0hQAPWIdJe0sgWz5whNU="; + sha256 = "0d80g5kgf2i9cginyhalvb7ibfk9g30yilqzmcsw6h6byj8xbih0"; }; - outputs = [ "out" "dev" ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + gobject-introspection + ]; - nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ]; - buildInputs = [ glib gobject-introspection ] - ++ lib.optionals stdenv.isDarwin [ which ncurses ]; - propagatedBuildInputs = [ pycairo cairo ]; + buildInputs = [ + glib + gobject-introspection + ] ++ lib.optionals stdenv.isDarwin [ + ncurses + ]; + + propagatedBuildInputs = [ + pycairo + cairo + ]; passthru = { updateScript = gnome3.updateScript { packageName = pname; attrPath = "python3.pkgs.${pname}3"; + versionPolicy = "odd-unstable"; }; }; meta = with lib; { homepage = "https://pygobject.readthedocs.io/"; description = "Python bindings for Glib"; - license = licenses.gpl2; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/pykmtronic/default.nix b/pkgs/development/python-modules/pykmtronic/default.nix index 7a055c1ed3f..29a3f04e32c 100644 --- a/pkgs/development/python-modules/pykmtronic/default.nix +++ b/pkgs/development/python-modules/pykmtronic/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pykmtronic"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "9d0301882f06a0c4865c89bb6c2a381c4a1ba6fe2a7a07d56351bdf5f96c9fa5"; + sha256 = "sha256-8qLyBJp7C93x0PWbgDAtNEDJ5VLNfwZ3DRZfudRCBgo="; }; propagatedBuildInputs = [ aiohttp lxml ]; diff --git a/pkgs/development/python-modules/pytest-cases/default.nix b/pkgs/development/python-modules/pytest-cases/default.nix new file mode 100644 index 00000000000..2914b3cf9aa --- /dev/null +++ b/pkgs/development/python-modules/pytest-cases/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchPypi +, makefun +, decopatch +, pythonOlder +, pytest +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "pytest-cases"; + version = "3.4.6"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "17w4s6622i97q81g15zamqm536ib00grgdfk2f4kk9bw2k7sdlq6"; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + decopatch + makefun + ]; + + postPatch = '' + substituteInPlace setup.cfg --replace "pytest-runner" "" + ''; + + # Tests have dependencies (pytest-harvest, pytest-steps) which + # are not available in Nixpkgs. Most of the packages (decopatch, + # makefun, pytest-*) have circular dependecies. + doCheck = false; + + pythonImportsCheck = [ "pytest_cases" ]; + + meta = with lib; { + description = "Separate test code from test cases in pytest"; + homepage = "https://github.com/smarie/python-pytest-cases"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 335846fc342..2b1ab664a13 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -4,7 +4,9 @@ , isPy27 , six , pytest +, pytestCheckHook , numpy +, setuptools_scm }: buildPythonPackage rec { @@ -17,7 +19,12 @@ buildPythonPackage rec { sha256 = "6fe747418461d7b202824a3486ba8f4fa17a9bd0b1eddc743ba1d6d87f03391a"; }; - buildInputs = [ pytest ]; + nativeBuildInputs = [ + setuptools_scm + ]; + buildInputs = [ + pytest + ]; propagatedBuildInputs = [ six @@ -25,14 +32,9 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook ]; - # check_distribution incorrectly pulls pytest version - checkPhase = '' - pytest -k 'not check_distribution' - ''; - meta = with lib; { description = "Pytest plugin with advanced doctest features"; homepage = "https://astropy.org"; diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index d6f30486f9b..1773a4b5792 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Colin-b"; repo = "pytest_httpx"; rev = "v${version}"; - sha256 = "08idd3y6khxjqkn46diqvkjvsl4w4pxhl6z1hspbkrj0pqwf9isi"; + sha256 = "sha256-Awhsm8jmoCZTBnfrrauLxAEKtpxTzjPMXmx7HR0f/g4="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/radio_beam/default.nix b/pkgs/development/python-modules/radio_beam/default.nix index f1f3200bb7b..58137e3adbd 100644 --- a/pkgs/development/python-modules/radio_beam/default.nix +++ b/pkgs/development/python-modules/radio_beam/default.nix @@ -2,9 +2,8 @@ , fetchPypi , buildPythonPackage , astropy -, pytest -, pytest-astropy -, astropy-helpers +, pytestCheckHook +, pytest-doctestplus , scipy }: @@ -13,25 +12,18 @@ buildPythonPackage rec { version = "0.3.3"; src = fetchPypi { - inherit pname version; + inherit version; + pname = "radio-beam"; sha256 = "e34902d91713ccab9f450b9d3e82317e292cf46a30bd42f9ad3c9a0519fcddcd"; }; propagatedBuildInputs = [ astropy ]; - nativeBuildInputs = [ astropy-helpers ]; - - # Disable automatic update of the astropy-helper module - postPatch = '' - substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" - ''; - - checkInputs = [ pytest pytest-astropy scipy ]; + checkInputs = [ pytestCheckHook pytest-doctestplus scipy ]; # Tests must be run in the build directory - checkPhase = '' + preCheck = '' cd build/lib - pytest ''; meta = { diff --git a/pkgs/development/python-modules/respx/default.nix b/pkgs/development/python-modules/respx/default.nix index 68da058194b..0a3fa27a808 100644 --- a/pkgs/development/python-modules/respx/default.nix +++ b/pkgs/development/python-modules/respx/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "respx"; - version = "0.16.3"; + version = "0.17.0"; src = fetchFromGitHub { owner = "lundberg"; repo = pname; rev = version; - sha256 = "0if9sg83rznl37hsjw6pfk78jpxi421g9p21wd92jcd6073g4nbd"; + sha256 = "sha256-unGAIsslGXOUHXr0FKzC9bX6+Q3mNGZ9Z/dtjz0gkj4="; }; # Coverage is under 100 % due to the excluded tests diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index fa1dfc6870b..e5194e36bd2 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -20,6 +20,12 @@ buildPythonPackage rec { hash = "sha256-hBAq+/BKs0a01M89Nb8HaClqxB+W5PTfjVzef/m9SWs="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'httpx>=0.16, <0.18' 'httpx' \ + --replace 'httpcore==0.12.*' 'httpcore' + ''; + propagatedBuildInputs = [ httpx sanic websockets httpcore ]; # `sanic` is explicitly set to null when building `sanic` itself diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index d2f79c18348..329b225b576 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -1,11 +1,12 @@ { lib , fetchPypi +, fetchpatch , buildPythonPackage , aplpy , joblib , astropy , radio_beam -, pytest +, pytestCheckHook , pytest-astropy , astropy-helpers }: @@ -20,13 +21,18 @@ buildPythonPackage rec { sha256 = "17zisr26syfb8kn89xj17lrdycm0hsmy5yp5zrn236wgd8rjriki"; }; + patches = [ + # Fix compatibility with radio_beam >= 0.3.3. Will be included + # in the next release of spectral cube > 0.5.0 + (fetchpatch { + url = "https://github.com/radio-astro-tools/spectral-cube/commit/bbe4295ebef7dfa6fe4474275a29acd6cb0cb544.patch"; + sha256 = "1qddfm3364kc34yf6wd9nd6rxh4qc2v5pqilvz9adwb4a50z28bf"; + }) + ]; + nativeBuildInputs = [ astropy-helpers ]; propagatedBuildInputs = [ astropy radio_beam joblib ]; - checkInputs = [ aplpy pytest pytest-astropy ]; - - checkPhase = '' - pytest spectral_cube - ''; + checkInputs = [ pytestCheckHook aplpy pytest-astropy ]; meta = { description = "Library for reading and analyzing astrophysical spectral data cubes"; diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 65eb6abb046..2de1e3fd5ff 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -11,6 +11,7 @@ , beautifulsoup4 , drms , glymur +, h5netcdf , hypothesis , matplotlib , numpy @@ -50,6 +51,7 @@ buildPythonPackage rec { pandas astropy astropy-helpers + h5netcdf parfive sqlalchemy scikitimage diff --git a/pkgs/development/python-modules/tappy/default.nix b/pkgs/development/python-modules/tappy/default.nix new file mode 100644 index 00000000000..9e0b83bc925 --- /dev/null +++ b/pkgs/development/python-modules/tappy/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "tap.py"; + version = "3.0"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-9e7u6/1k5T0yZhdSu0wohYmjuru5bbPzkaTsKfE1nHA="; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "tap" ]; + + meta = with lib; { + homepage = "https://github.com/python-tap/tappy"; + description = "A set of tools for working with the Test Anything Protocol (TAP) in Python"; + license = licenses.bsd2; + maintainers = with maintainers; [ sfrijters ]; + }; +} diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 05bc653b059..8e4abc5bd0e 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.2.13"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zDUFe/yMCThn+qJqDekMrUHEf1glGxBw4pioExLLoqg="; + sha256 = "sha256-XzfiLzRK1/DCmnxPW/H+KqnBuCbpYPawS2JnTQq+Vbw="; }; patches = [ diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 2543d067585..894539a3e2e 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -3,32 +3,34 @@ , asynctest , buildPythonPackage , coloredlogs -, coveralls , fetchFromGitHub +, jsonschema , pyserial , pyserial-asyncio , pytest-asyncio , pytest-mock , pytest-timeout -, pytestcov , pytestCheckHook +, pythonOlder , voluptuous -, zigpy }: +, zigpy +}: buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { - owner = "zha-ng"; - repo = "zigpy-znp"; + owner = "zigpy"; + repo = pname; rev = "v${version}"; - sha256 = "1g5jssdnibhb4i4k1js9iy9w40cipf1gdnyp847x0bv6wblzx8rl"; + sha256 = "152d803jfrvkj4namni41fnbbnq85wd7zsqjhmkwrrmn2gvqjiln"; }; propagatedBuildInputs = [ async-timeout coloredlogs + jsonschema pyserial pyserial-asyncio voluptuous @@ -36,18 +38,19 @@ buildPythonPackage rec { ]; checkInputs = [ - asynctest - coveralls pytest-asyncio pytest-mock pytest-timeout - pytestcov pytestCheckHook + ] ++ lib.optionals (pythonOlder "3.8") [ + asynctest ]; + pythonImportsCheck = [ "zigpy_znp" ]; + meta = with lib; { - description = "A library for zigpy which communicates with TI ZNP radios"; - homepage = "https://github.com/zha-ng/zigpy-znp"; + description = "Python library for zigpy which communicates with TI ZNP radios"; + homepage = "https://github.com/zigpy/zigpy-znp"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mvnetbiz ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 61dba04a79e..11d1231b48d 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.23.1"; + version = "0.24.0"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "0kmmhn357k22ana0ysd8jlz1fyfaqlc8k74ryaik0rrw7nmn1n11"; + sha256 = "sha256-LHAlGWoASDiFwvy59uXl5GH5pPmMuthoo4ZrFegkCIU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix new file mode 100644 index 00000000000..46ef678b5ba --- /dev/null +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -0,0 +1,38 @@ +{ lib, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }: + +let + pname = "altair"; + version = "4.0.2"; + name = "${pname}-v${version}"; + + src = fetchurl { + url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; + sha256 = "sha256-HCoK+ljcTmyBZSCDe6u2x2urqrQfi3DIlXfCqGWvl3E="; + }; + + appimageContents = appimageTools.extract { inherit name src; }; +in +appimageTools.wrapType2 { + inherit src name; + + profile = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "A feature-rich GraphQL Client IDE"; + homepage = "https://github.com/imolorhe/altair"; + license = licenses.mit; + maintainers = with maintainers; [ evalexpr ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 9f4efe396c6..7a9206af093 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1d746016iyswb9kw7gprg32vj5rcfa2y9j11r2hsp61hsjfvmg8c"; + sha256 = "0bx6y1y6cfqz77m23w4ab1j2i7s83kv301razv9rkkyxpnpb16hi"; }; - vendorSha256 = "0whd0b9rll0s42hrr2fqp412d5frzmrnqnynpq75wda5rqzmaf8r"; + vendorSha256 = "0rfbjhi78qcaghn9xw658xcxl2x4ln4gnnyi9hsf3wz4cbybird7"; doCheck = false; diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 0ec9d3ea93e..bf780985bc4 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -28,6 +28,14 @@ let newPython = python3.override { sha256 = "18hpzh1am1dqx81fypn57r2wk565fi4g14292qrc5jm1h9dalzld"; }; }); + # https://github.com/conan-io/conan/issues/8876 + pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec { + version = "1.7.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"; + }; + }); }; }; diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 4538c212da5..4fbd0365af9 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "142vr40p60mapvvb5amn8hz6a8930kxsz510baql40hai4yhga7z"; + sha256 = "sha256-cAhcTmSPkV5z5ryuCNrpxy9/1iWvvminiVYul9c/DwM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 6254ec0a2c2..b947fc1ebfe 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.1.29"; + version = "0.1.30"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RPlEFajIjEBKdL97xjQP6r3AAcCQlxw2Il8nkSjxa+k="; + sha256 = "sha256-uQj14arxDPc8/k1Cvp3T6hqjln30NFk9MzvYy8tAiJ8="; }; vendorSha256 = "sha256-pl3dLisu4Oc77kgfuteKbsZaDzrHo1wUigZEkM4081Q="; diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index e76b62d45cb..c8339fe6d85 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.3"; + version = "3.14.4"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zns2XcydY4xxgF8FB6eje0pAt0DZnFOIAqXaSX0xoMg="; + sha256 = "sha256-RFVn5aL5MqsB7heDPVUci3Eyq6F/qo3RmdEaZbsC+Ng="; }; subPackages = [ "." ]; diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index e5883501f81..833f87e4a02 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ginkgo"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-nlNft9jOp8V8ks32LOb4wUTkRrXJ5K49gbHuRmCKz/0="; + sha256 = "sha256-u2roJsZZ5oG2dHo4kmSsoySjm1HRQJ659+D2M+LezCc="; }; vendorSha256 = "sha256-tS8YCGVOsfQp02vY6brmE3pxi70GG9DYcp1JDkcVG9Y="; doCheck = false; diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 38ddc1ff431..6de12a84522 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python3, gtk2, runCommand +{ lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python3, gtk3, runCommand , gcc, autoconf, automake, which, procps, libiberty_static , runtimeShell , sysconfDir ? "" # set this parameter to override the default value $out/etc @@ -7,18 +7,18 @@ let name = "distcc"; - version = "2016-02-24"; + version = "2021-03-11"; distcc = stdenv.mkDerivation { name = "${name}-${version}"; src = fetchFromGitHub { owner = "distcc"; repo = "distcc"; - rev = "b2fa4e21b4029e13e2c33f7b03ca43346f2cecb8"; - sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6"; + rev = "de21b1a43737fbcf47967a706dab4c60521dbbb1"; + sha256 = "0zjba1090awxkmgifr9jnjkxf41zhzc4f6mrnbayn3v6s77ca9x4"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [popt avahi pkg-config python3 gtk2 autoconf automake which procps libiberty_static]; + buildInputs = [popt avahi pkg-config python3 gtk3 autoconf automake which procps libiberty_static]; preConfigure = '' export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include) @@ -30,7 +30,7 @@ let ${if static then "LDFLAGS=-static" else ""} --with${if static == true || popt == null then "" else "out"}-included-popt --with${if avahi != null then "" else "out"}-avahi - --with${if gtk2 != null then "" else "out"}-gtk + --with${if gtk3 != null then "" else "out"}-gtk --without-gnome --enable-rfc2553 --disable-Werror # a must on gcc 4.6 diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index 0cc7769d3c5..9ad8295c9b9 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -37,6 +37,8 @@ let CatalystViewTT CatalystXScriptServerStarman CatalystXRoleApplicator + CryptPassphrase + CryptPassphraseArgon2 CryptRandPasswd DBDPg DBDSQLite @@ -61,6 +63,7 @@ let SQLSplitStatement SetScalar Starman + StringCompareConstantTime SysHostnameLong TermSizeAny TextDiff diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 7bed3b5d202..142322eb59d 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -2,12 +2,12 @@ { hydra-unstable = callPackage ./common.nix { - version = "2021-04-29"; + version = "2021-05-03"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "6047b1dd04d44acff9343b6b971ab609b73099d5"; - sha256 = "sha256-E7JOHhSd4gIzE6FvSZVMxZE9WagbBkrfZVoibkanaYE="; + rev = "886e6f85e45a1f757e9b77d2a9e4539fbde29468"; + sha256 = "t7Qb57Xjc0Ou+VDGC1N5u9AmeODW6MVOwKSrYRJq5f0="; }; nix = nixFlakes; diff --git a/pkgs/development/tools/profiling/sysprof/capture.nix b/pkgs/development/tools/profiling/sysprof/capture.nix index a9443eeadf6..2d33dedbdd2 100644 --- a/pkgs/development/tools/profiling/sysprof/capture.nix +++ b/pkgs/development/tools/profiling/sysprof/capture.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = sysprof.meta // { description = "Static library for Sysprof capture data generation"; + license = lib.licenses.bsd2Patent; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 9e749adea20..725d8d10e11 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -5,6 +5,7 @@ , gettext , glib , gtk3 +, json-glib , itstool , libdazzle , libxml2 @@ -20,13 +21,13 @@ stdenv.mkDerivation rec { pname = "sysprof"; - version = "3.38.1"; + version = "3.40.1"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1z2i9187f2jx456l7h07wy8m9a0p7pj3xiv1aji3snq7rjb1lkj0"; + sha256 = "0dvlzjwi3a4g37cpyhqpf41f5hypf0gim1jw9wqlv30flbb00l62"; }; nativeBuildInputs = [ @@ -41,7 +42,16 @@ stdenv.mkDerivation rec { wrapGAppsHook gnome3.adwaita-icon-theme ]; - buildInputs = [ glib gtk3 pango polkit systemd.dev (lib.getLib systemd) libdazzle ]; + + buildInputs = [ + glib + gtk3 + json-glib + pango + polkit + systemd + libdazzle + ]; mesonFlags = [ "-Dsystemdunitdir=lib/systemd/system" @@ -50,6 +60,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; @@ -65,6 +76,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index 43f13b2e995..b59e5a4d33d 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -1,19 +1,19 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, rust }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, rust, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "7.6.1"; + version = "7.7.2"; src = fetchFromGitHub { owner = "passcod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vjX8xfwv/DOogji+OQCB9l5ebGBNoLW722TGpZ5Wg80="; + sha256 = "sha256-ocibNgH2xw0BrJRmHCAahO6hPLmlDmwjjzo7mMWp9FU="; }; - cargoSha256 = "sha256-ku+tI0DIofV0EZ413sPjbJDUSqwTxiT8NWBeURrJW1k="; + cargoSha256 = "sha256-6ztMEfVOlsyUtIeH+Qd/l7khC7XOHKc4bWsDd27RNu8="; - buildInputs = lib.optional stdenv.isDarwin CoreServices; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; # `test with_cargo` tries to call cargo-watch as a cargo subcommand # (calling cargo-watch with command `cargo watch`) diff --git a/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix b/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix index 41175ad8538..a5713d944a8 100644 --- a/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix +++ b/pkgs/development/tools/rust/maturin/pyo3-test/generic.nix @@ -27,7 +27,7 @@ python.pkgs.buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src patches; name = "${pname}-${version}"; - hash = "sha256-//TmozgWy9zrSpMKX92XdHj4fw/T1Elfgn4YhhR7ot0="; + hash = "sha256-u3L9nXHKILznyZTgxdvZyOCQZFZhuADrtI7zXYQzrbE="; }; patches = [ ./Cargo.lock.patch ]; diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix index 5c4f40bbd09..d13481804c4 100644 --- a/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -1,24 +1,24 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; - version = "0.4.2"; + version = "0.5.2"; src = fetchFromGitHub { owner = "launchbadge"; repo = "sqlx"; rev = "v${version}"; - sha256 = "1q6p4qly9qjn333nj72sar6nbyclfdw9i9l6rnimswylj0rr9n27"; + sha256 = "0jz0gddw1xp51rnap0dsyq4886x2glmr087r1lf3fxlnv6anaqn9"; }; - cargoSha256 = "1393mwx6iccnqrry4ia4prcnnjxhp4zjq1s3gzwzfyzsrqyad54g"; + cargoSha256 = "046blw366d6zjpq944g9n4cdhhv2w97qfi1ynljc9bnz03d8v39c"; doCheck = false; cargoBuildFlags = [ "-p sqlx-cli" ]; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ SystemConfiguration CoreFoundation Security ]; + ++ lib.optionals stdenv.isDarwin [ SystemConfiguration CoreFoundation Security libiconv ]; meta = with lib; { description = diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix index a45ced8a492..3c91880e16e 100644 --- a/pkgs/development/tools/vala-lint/default.nix +++ b/pkgs/development/tools/vala-lint/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , glib , meson @@ -12,13 +13,13 @@ stdenv.mkDerivation rec { pname = "vala-lint-unstable"; - version = "2020-08-18"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "vala-lang"; repo = "vala-lint"; - rev = "fc5dd9e95bc61540b404d5bc070c0629903baad9"; - sha256 = "n6pp6vYGaRF8B3phWp/e9KnpKGf0Op+xGVdT6HHe0rM="; + rev = "5b06cc2341ae7e9f7f8c35c542ef78c36e864c30"; + sha256 = "KwJ5sCp9ZrrxIqc6qi2+ZdHBt1esNOO1+uDkS+d9mW8="; }; nativeBuildInputs = [ @@ -34,8 +35,7 @@ stdenv.mkDerivation rec { glib ]; - # See https://github.com/vala-lang/vala-lint/issues/133 - doCheck = false; + doCheck = true; meta = with lib; { homepage = "https://github.com/vala-lang/vala-lint"; diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index b114c65cd16..2d7fd5df921 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "16.0.0"; - sha256 = "00mada0vvybizygwhzsq6gcz0m2k864lfiiqqlnw8gcc3q8r1js7"; + version = "16.1.0"; + sha256 = "0z0808mw674mshgbmhgngqfkrdix3b61f77xcdz7bwf1j87j7ad0"; } diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 151836096ff..3496fd324c0 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,12 +2,12 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.32.tar.xz", + "name": "factorio_alpha_x64-1.1.33.tar.xz", "needsAuth": true, - "sha256": "0ciz7y8xqlk9vg3akvflq1aabzgbqpazfnihyk4gsadk12b6a490", + "sha256": "0qgr609w8pgjpmh8ycf0b846v0i019b393x71i790lb7vcygl2aa", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.32/alpha/linux64", - "version": "1.1.32" + "url": "https://factorio.com/get-download/1.1.33/alpha/linux64", + "version": "1.1.33" }, "stable": { "name": "factorio_alpha_x64-1.1.32.tar.xz", @@ -38,12 +38,12 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.32.tar.xz", + "name": "factorio_headless_x64-1.1.33.tar.xz", "needsAuth": false, - "sha256": "0dg98ycs7m8rm996pk0p1iajalpmiy30p0pwr9dw2chf1d887kvz", + "sha256": "0iv667l25aaij3g9v3mqxhkpphfbc6dhdghsg5qdw4l59vh6fpd4", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.32/headless/linux64", - "version": "1.1.32" + "url": "https://factorio.com/get-download/1.1.33/headless/linux64", + "version": "1.1.33" }, "stable": { "name": "factorio_headless_x64-1.1.32.tar.xz", diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 8682668d396..9062af5be38 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg_3, freeglut +{ mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut , lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGL, libGLU, physfs , qtbase, qttools @@ -29,7 +29,7 @@ mkDerivation rec { SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image fpc lua5_1 llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64 - ffmpeg_3 freeglut physfs + ffmpeg freeglut physfs qtbase ] ++ lib.optional withServer ghc; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index ddb415a6ad2..7ffa361da55 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -76,9 +76,9 @@ let }; v5 = { - version = "5.3.0"; - sha256 = "03ga3j3cg38w4lg4d4qxasmnjdl8n3lbizidrinanvyfdyvznyh6"; - dataSha256 = "1liciwlh013z5h08ib0psjbwn5wkvlr937ir7kslfk4vly984cjx"; + version = "5.4.1"; + sha256 = "062ilb7s377q3hwfhl8q06vvcw2raydz5ljzlzwy2dmyzmdcndb8"; + dataSha256 = "0i45lbnikvgj9kxdp0yphpjjwjcgp4ibn49xkj78j5ic1s9n8jd4"; }; in { diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index 63866d4bca9..a486b899bb4 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -14,7 +14,7 @@ , SDL2_gfx , SDL2_mixer , SDL2_net, SDL2_ttf -, ffmpeg +, ffmpeg_3 , sqlite , zlib , libX11 @@ -26,7 +26,7 @@ let sharedLibs = [ pcre portaudio freetype SDL2 SDL2_image SDL2_gfx SDL2_mixer SDL2_net SDL2_ttf - sqlite lua zlib libX11 libGLU libGL ffmpeg + sqlite lua zlib libX11 libGLU libGL ffmpeg_3 ]; in stdenv.mkDerivation rec { diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 15d280c0750..ab8e19ca8fc 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -444,8 +444,8 @@ let mktplcRef = { name = "github-vscode-theme"; publisher = "github"; - version = "4.0.2"; - sha256 = "06mysdwjh7km874rrk0xc0xxaqx15b4a7x1i8dly440h8w3ng5bs"; + version = "4.1.1"; + sha256 = "14wz2b0bn1rnmpj28c0mivz2gacla2dgg8ncv7qfx9bsxhf95g68"; }; meta = with lib; { description = "GitHub theme for VS Code"; diff --git a/pkgs/misc/vscode-extensions/terraform/default.nix b/pkgs/misc/vscode-extensions/terraform/default.nix index ce0e1e7c3f4..c5774aeb21a 100644 --- a/pkgs/misc/vscode-extensions/terraform/default.nix +++ b/pkgs/misc/vscode-extensions/terraform/default.nix @@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "terraform"; publisher = "hashicorp"; - version = "2.10.1"; + version = "2.10.2"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/${mktplcRef.name}-${mktplcRef.version}.vsix"; - sha256 = "1galibrk4fx4qwa6q17mmwlikx78nmhgv1h98haiyak666cinzcq"; + sha256 = "0fkkjkybjshgzbkc933jscxyxqwmqnhq3718pnw9hsac8qv0grrz"; }; patches = [ ./fix-terraform-ls.patch ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 23434931542..3e431810f20 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -1,9 +1,6 @@ -{ lib, stdenv, fetchurl, fetchzip, pkgs }: +{ lib, stdenv, stdenvNoCC, fetchurl, fetchzip, pkgs }: let - macosPackages_11_0_1 = import ./macos-11.0.1.nix { inherit applePackage'; }; - developerToolsPackages_11_3_1 = import ./developer-tools-11.3.1.nix { inherit applePackage'; }; - # This attrset can in theory be computed automatically, but for that to work nicely we need # import-from-derivation to work properly. Currently it's rather ugly when we try to bootstrap # a stdenv out of something like this. With some care we can probably get rid of this, but for @@ -190,17 +187,6 @@ let }) // (attrs.meta or {}); }); - applePackage' = namePath: version: sdkName: sha256: let - pname = builtins.head (lib.splitString "/" namePath); - appleDerivation = appleDerivation' pname version sdkName sha256; - callPackage = pkgs.newScope (packages // pkgs.darwin // { inherit appleDerivation; }); - in callPackage (./. + "/${namePath}"); - - applePackage = namePath: sdkName: sha256: let - pname = builtins.head (lib.splitString "/" namePath); - version = versions.${sdkName}.${pname}; - in applePackage' namePath version sdkName sha256; - IOKitSpecs = { IOAudioFamily = fetchApple "osx-10.10.5" "0ggq7za3iq8g02j16rj67prqhrw828jsw3ah3bxq8a1cvr55aqnq"; IOFireWireFamily = fetchApple "osx-10.10.5" "059qa1m668kwvchl90cqcx35b31zaqdg61zi11y1imn5s389y2g1"; @@ -225,11 +211,35 @@ let IOKitSrcs = lib.mapAttrs (name: value: if lib.isFunction value then value name else value) IOKitSpecs; +in + +# darwin package set +self: + +let + macosPackages_11_0_1 = import ./macos-11.0.1.nix { inherit applePackage'; }; + developerToolsPackages_11_3_1 = import ./developer-tools-11.3.1.nix { inherit applePackage'; }; + + applePackage' = namePath: version: sdkName: sha256: + let + pname = builtins.head (lib.splitString "/" namePath); + appleDerivation = appleDerivation' pname version sdkName sha256; + callPackage = self.newScope { inherit appleDerivation; }; + in callPackage (./. + "/${namePath}"); + + applePackage = namePath: sdkName: sha256: let + pname = builtins.head (lib.splitString "/" namePath); + version = versions.${sdkName}.${pname}; + in applePackage' namePath version sdkName sha256; + # Only used for bootstrapping. It’s convenient because it was the last version to come with a real makefile. adv_cmds-boot = applePackage "adv_cmds/boot.nix" "osx-10.5.8" "102ssayxbg9wb35mdmhswbnw0bg7js3pfd8fcbic83c5q3bqa6c6" {}; - # TODO: shorten this list, we should cut down to a minimum set of bootstrap or necessary packages here. - stubPackages = { +in + +developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { + # TODO: shorten this list, we should cut down to a minimum set of bootstrap or necessary packages here. + inherit (adv_cmds-boot) ps locale; architecture = applePackage "architecture" "osx-10.11.6" "1pbpjcd7is69hn8y29i98ci0byik826if8gnp824ha92h90w0fq3" {}; bsdmake = applePackage "bsdmake" "dev-tools-3.2.6" "11a9kkhz5bfgi1i8kpdkis78lhc6b5vxmhd598fcdgra1jw4iac2" {}; @@ -290,7 +300,4 @@ let # TODO(matthewbauer): # To be removed, once I figure out how to build a newer Security version. Security = applePackage "Security/boot.nix" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; - }; - - packages = developerToolsPackages_11_3_1 // macosPackages_11_0_1 // stubPackages; -in packages +} diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index 8d0333e8fd6..c279edee2f1 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.11.16"; + version = "5.11.18"; suffix = "lqx1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "1j25r45arikjwyhbr72r1935pr7a8g2j6vshggywdiixvizvrx9b"; + sha256 = "0fz0s6bdcvbzy1149acqkq3aqg481dwiq85wh7ii1hx6p1gbsx71"; }; extraMeta = { diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 1f5cf028a28..bad7622771a 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with lib; stdenv.mkDerivation rec { pname = "lxc"; - version = "4.0.8"; + version = "4.0.9"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "16qbmysiyrvb1inbbdr8qwqa0c6h9mwyrbx4ry18x0kvrhmqamdc"; + sha256 = "0az56xpvhqiwmf9wfxzaz89s5idrgd9ynd13psscw3hlx480dkqz"; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix index 3187ba6d4db..fabfebfcba1 100644 --- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -1,16 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, kernel, kmod }: +{ lib, stdenv, fetchFromGitHub, kernel, linuxHeaders}: stdenv.mkDerivation rec { pname = "tuxedo-keyboard-${kernel.version}"; - version = "2019-08-26"; + version = "3.0.5"; src = fetchFromGitHub { owner = "tuxedocomputers"; repo = "tuxedo-keyboard"; - rev = "d65e76e84cfd8169591fc2a0a7c9219fa19da1b5"; - sha256 = "1s48qpwybwh5pwqas2d1v2a7x4r97sm4hr9i4902r1d7h384bv17"; + rev = "v${version}"; + sha256 = "123ady2bi2dwbajy3pgv10l3g2pyhi5k31c1ii0zcrvl2qqhndck"; }; + buildInputs = [ linuxHeaders ]; + makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; installPhase = '' @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Full color keyboard driver for tuxedo computers laptops"; homepage = "https://github.com/tuxedocomputers/tuxedo-keyboard/"; - license = licenses.gpl2; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.blanky0230 ]; }; diff --git a/pkgs/os-specific/linux/wpa_supplicant/0001-Implement-read-only-mode-for-ssids.patch b/pkgs/os-specific/linux/wpa_supplicant/0001-Implement-read-only-mode-for-ssids.patch new file mode 100644 index 00000000000..d459de8a7f3 --- /dev/null +++ b/pkgs/os-specific/linux/wpa_supplicant/0001-Implement-read-only-mode-for-ssids.patch @@ -0,0 +1,130 @@ +From 99ae610f0ae3608a12c864caedf396f14e68327d Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Fri, 19 Feb 2021 19:44:21 +0100 +Subject: [PATCH] Implement read-only mode for ssids + +With this change it's possible to define `network=`-sections in a second +config file specified via `-I` without having changes written to +`/etc/wpa_supplicant.conf`. + +This is helpful on e.g. NixOS to allow both declarative (i.e. read-only) +and imperative (i.e. mutable) networks. +--- + wpa_supplicant/config.h | 2 +- + wpa_supplicant/config_file.c | 5 +++-- + wpa_supplicant/config_none.c | 2 +- + wpa_supplicant/config_ssid.h | 2 ++ + wpa_supplicant/wpa_supplicant.c | 8 ++++---- + 5 files changed, 11 insertions(+), 8 deletions(-) + +diff --git a/wpa_supplicant/config.h b/wpa_supplicant/config.h +index 6a297ecfe..adaf4d398 100644 +--- a/wpa_supplicant/config.h ++++ b/wpa_supplicant/config.h +@@ -1614,7 +1614,7 @@ const char * wpa_config_get_global_field_name(unsigned int i, int *no_var); + * + * Each configuration backend needs to implement this function. + */ +-struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp); ++struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp, int ro); + + /** + * wpa_config_write - Write or update configuration data +diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c +index 77c326df5..d5ed051b9 100644 +--- a/wpa_supplicant/config_file.c ++++ b/wpa_supplicant/config_file.c +@@ -373,7 +373,7 @@ static int wpa_config_process_blob(struct wpa_config *config, FILE *f, + #endif /* CONFIG_NO_CONFIG_BLOBS */ + + +-struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp) ++struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp, int ro) + { + FILE *f; + char buf[512], *pos; +@@ -415,6 +415,7 @@ struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp) + while (wpa_config_get_line(buf, sizeof(buf), f, &line, &pos)) { + if (os_strcmp(pos, "network={") == 0) { + ssid = wpa_config_read_network(f, &line, id++); ++ ssid->ro = ro; + if (ssid == NULL) { + wpa_printf(MSG_ERROR, "Line %d: failed to " + "parse network block.", line); +@@ -1591,7 +1592,7 @@ int wpa_config_write(const char *name, struct wpa_config *config) + } + + for (ssid = config->ssid; ssid; ssid = ssid->next) { +- if (ssid->key_mgmt == WPA_KEY_MGMT_WPS || ssid->temporary) ++ if (ssid->key_mgmt == WPA_KEY_MGMT_WPS || ssid->temporary || ssid->ro) + continue; /* do not save temporary networks */ + if (wpa_key_mgmt_wpa_psk(ssid->key_mgmt) && !ssid->psk_set && + !ssid->passphrase) +diff --git a/wpa_supplicant/config_none.c b/wpa_supplicant/config_none.c +index 2aac28fa3..02191b425 100644 +--- a/wpa_supplicant/config_none.c ++++ b/wpa_supplicant/config_none.c +@@ -17,7 +17,7 @@ + #include "base64.h" + + +-struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp) ++struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp, int ro) + { + struct wpa_config *config; + +diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h +index d5c5c00a9..fd80c079c 100644 +--- a/wpa_supplicant/config_ssid.h ++++ b/wpa_supplicant/config_ssid.h +@@ -93,6 +93,8 @@ struct wpa_ssid { + */ + int id; + ++ int ro; ++ + /** + * priority - Priority group + * +diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c +index 911d79d17..cb0cb99b1 100644 +--- a/wpa_supplicant/wpa_supplicant.c ++++ b/wpa_supplicant/wpa_supplicant.c +@@ -1052,14 +1052,14 @@ int wpa_supplicant_reload_configuration(struct wpa_supplicant *wpa_s) + + if (wpa_s->confname == NULL) + return -1; +- conf = wpa_config_read(wpa_s->confname, NULL); ++ conf = wpa_config_read(wpa_s->confname, NULL, 0); + if (conf == NULL) { + wpa_msg(wpa_s, MSG_ERROR, "Failed to parse the configuration " + "file '%s' - exiting", wpa_s->confname); + return -1; + } + if (wpa_s->confanother && +- !wpa_config_read(wpa_s->confanother, conf)) { ++ !wpa_config_read(wpa_s->confanother, conf, 1)) { + wpa_msg(wpa_s, MSG_ERROR, + "Failed to parse the configuration file '%s' - exiting", + wpa_s->confanother); +@@ -5638,7 +5638,7 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s, + #else /* CONFIG_BACKEND_FILE */ + wpa_s->confname = os_strdup(iface->confname); + #endif /* CONFIG_BACKEND_FILE */ +- wpa_s->conf = wpa_config_read(wpa_s->confname, NULL); ++ wpa_s->conf = wpa_config_read(wpa_s->confname, NULL, 0); + if (wpa_s->conf == NULL) { + wpa_printf(MSG_ERROR, "Failed to read or parse " + "configuration '%s'.", wpa_s->confname); +@@ -5646,7 +5646,7 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s, + } + wpa_s->confanother = os_rel2abs_path(iface->confanother); + if (wpa_s->confanother && +- !wpa_config_read(wpa_s->confanother, wpa_s->conf)) { ++ !wpa_config_read(wpa_s->confanother, wpa_s->conf, 1)) { + wpa_printf(MSG_ERROR, + "Failed to read or parse configuration '%s'.", + wpa_s->confanother); +-- +2.29.2 + diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 80eaf04a114..51af6abde8c 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,5 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, openssl, pkg-config, libnl , dbus, readline ? null, pcsclite ? null + +, readOnlyModeSSIDs ? false }: with lib; @@ -43,6 +45,9 @@ stdenv.mkDerivation rec { url = "https://w1.fi/cgit/hostap/patch/?id=a0541334a6394f8237a4393b7372693cd7e96f15"; sha256 = "1gbhlz41x1ar1hppnb76pqxj6vimiypy7c4kq6h658637s4am3xg"; }) + ] ++ lib.optionals readOnlyModeSSIDs [ + # Allow read-only networks + ./0001-Implement-read-only-mode-for-ssids.patch ]; # TODO: Patch epoll so that the dbus actually responds @@ -134,7 +139,7 @@ stdenv.mkDerivation rec { homepage = "https://w1.fi/wpa_supplicant/"; description = "A tool for connecting to WPA and WPA2-protected wireless networks"; license = licenses.bsd3; - maintainers = with maintainers; [ marcweber ]; + maintainers = with maintainers; [ marcweber ma27 ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix index 53db5f7ed0b..32868886af2 100644 --- a/pkgs/servers/calibre-web/default.nix +++ b/pkgs/servers/calibre-web/default.nix @@ -18,7 +18,9 @@ python3.pkgs.buildPythonApplication rec { prePatch = '' substituteInPlace setup.cfg \ + --replace "singledispatch>=3.4.0.0,<3.5.0.0" "" \ --replace "requests>=2.11.1,<2.25.0" "requests>=2.11.1,<2.26.0" \ + --replace "unidecode>=0.04.19,<1.2.0" "unidecode>=0.04.19" \ --replace "cps = calibreweb:main" "calibre-web = calibreweb:main" ''; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 8d89352b90e..791de67e52d 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl # native deps. , runCommand, pkg-config, meson, ninja, makeWrapper # build+runtime deps. @@ -17,11 +17,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "9d4d6b7bcdf114acc948e5ee68c83fcbb3944f48a13b9751dbbbc190cdd729c9"; + sha256 = "8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b6e8dedf2ec..cdd00d07d86 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.4.6"; + version = "2021.5.0"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -40,7 +40,7 @@ "apcupsd" = ps: with ps; [ ]; # missing inputs: apcaccess "api" = ps: with ps; [ aiohttp-cors ]; "apns" = ps: with ps; [ ]; # missing inputs: apns2 - "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf ]; + "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv pyroute2 zeroconf ]; "apprise" = ps: with ps; [ apprise ]; "aprs" = ps: with ps; [ geopy ]; # missing inputs: aprslib "aqualogic" = ps: with ps; [ aqualogic ]; @@ -110,7 +110,7 @@ "calendar" = ps: with ps; [ aiohttp-cors ]; "camera" = ps: with ps; [ aiohttp-cors ]; "canary" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: py-canary - "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen plexapi plexauth plexwebsocket PyChromecast zeroconf ]; + "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen plexapi plexauth plexwebsocket PyChromecast pyroute2 zeroconf ]; "cert_expiry" = ps: with ps; [ ]; "channels" = ps: with ps; [ pychannels ]; "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook @@ -133,6 +133,7 @@ "comed_hourly_pricing" = ps: with ps; [ ]; "comfoconnect" = ps: with ps; [ pycomfoconnect ]; "command_line" = ps: with ps; [ ]; + "compensation" = ps: with ps; [ numpy ]; "concord232" = ps: with ps; [ ]; # missing inputs: concord232 "config" = ps: with ps; [ aiohttp-cors ]; "configurator" = ps: with ps; [ ]; @@ -155,28 +156,28 @@ "deconz" = ps: with ps; [ pydeconz ]; "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi - "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa netdisco pillow scapy sqlalchemy zeroconf ]; + "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa netdisco pillow pyroute2 scapy sqlalchemy zeroconf ]; "delijn" = ps: with ps; [ ]; # missing inputs: pydelijn "deluge" = ps: with ps; [ deluge-client ]; "demo" = ps: with ps; [ aiohttp-cors ]; "denon" = ps: with ps; [ ]; - "denonavr" = ps: with ps; [ denonavr getmac ]; + "denonavr" = ps: with ps; [ denonavr ]; "derivative" = ps: with ps; [ ]; "deutsche_bahn" = ps: with ps; [ schiene ]; "device_automation" = ps: with ps; [ ]; "device_sun_light_trigger" = ps: with ps; [ aiohttp-cors pillow ]; "device_tracker" = ps: with ps; [ ]; - "devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api zeroconf ]; + "devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api pyroute2 zeroconf ]; "dexcom" = ps: with ps; [ pydexcom ]; "dhcp" = ps: with ps; [ aiodiscover scapy ]; - "dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT + "dht" = ps: with ps; [ ]; # missing inputs: adafruit-circuitpython-dht "dialogflow" = ps: with ps; [ aiohttp-cors ]; "digital_ocean" = ps: with ps; [ digital-ocean ]; "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower "directv" = ps: with ps; [ ]; # missing inputs: directv "discogs" = ps: with ps; [ discogs_client ]; "discord" = ps: with ps; [ discordpy ]; - "discovery" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; + "discovery" = ps: with ps; [ aiohttp-cors netdisco pyroute2 zeroconf ]; "dlib_face_detect" = ps: with ps; [ face_recognition ]; "dlib_face_identify" = ps: with ps; [ face_recognition ]; "dlink" = ps: with ps; [ ]; # missing inputs: pyW215 @@ -196,7 +197,7 @@ "dwd_weather_warnings" = ps: with ps; [ dwdwfsapi ]; "dweet" = ps: with ps; [ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices - "dyson" = ps: with ps; [ aiohttp-cors libpurecool zeroconf ]; + "dyson" = ps: with ps; [ aiohttp-cors libpurecool pyroute2 zeroconf ]; "eafm" = ps: with ps; [ aioeafm ]; "ebox" = ps: with ps; [ ]; # missing inputs: pyebox "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy @@ -218,6 +219,7 @@ "emby" = ps: with ps; [ pyemby ]; "emoncms" = ps: with ps; [ ]; "emoncms_history" = ps: with ps; [ ]; + "emonitor" = ps: with ps; [ aioemonitor ]; "emulated_hue" = ps: with ps; [ aiohttp-cors ]; "emulated_kasa" = ps: with ps; [ ]; # missing inputs: sense_energy "emulated_roku" = ps: with ps; [ ]; # missing inputs: emulated_roku @@ -232,13 +234,13 @@ "epson" = ps: with ps; [ ]; # missing inputs: epson-projector "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter "eq3btsmart" = ps: with ps; [ construct ]; # missing inputs: python-eq3bt - "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors zeroconf ]; + "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors pyroute2 zeroconf ]; "essent" = ps: with ps; [ ]; # missing inputs: PyEssent "etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api "eufy" = ps: with ps; [ ]; # missing inputs: lakeside "everlights" = ps: with ps; [ pyeverlights ]; "evohome" = ps: with ps; [ evohome-async ]; - "ezviz" = ps: with ps; [ pyezviz ]; + "ezviz" = ps: with ps; [ ha-ffmpeg pyezviz ]; "faa_delays" = ps: with ps; [ faadelays ]; "facebook" = ps: with ps; [ ]; "facebox" = ps: with ps; [ ]; @@ -280,7 +282,7 @@ "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms "freebox" = ps: with ps; [ freebox-api ]; "freedns" = ps: with ps; [ ]; - "fritz" = ps: with ps; [ fritzconnection ]; + "fritz" = ps: with ps; [ fritzconnection xmltodict ]; "fritzbox" = ps: with ps; [ pyfritzhome ]; "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; @@ -292,7 +294,6 @@ "garmin_connect" = ps: with ps; [ ]; # missing inputs: garminconnect "gc100" = ps: with ps; [ ]; # missing inputs: python-gc100 "gdacs" = ps: with ps; [ ]; # missing inputs: aio_georss_gdacs - "geizhals" = ps: with ps; [ ]; # missing inputs: geizhals "generic" = ps: with ps; [ ]; "generic_thermostat" = ps: with ps; [ ]; "geniushub" = ps: with ps; [ ]; # missing inputs: geniushub-client @@ -354,8 +355,8 @@ "home_connect" = ps: with ps; [ aiohttp-cors homeconnect ]; "home_plus_control" = ps: with ps; [ aiohttp-cors homepluscontrol ]; "homeassistant" = ps: with ps; [ ]; - "homekit" = ps: with ps; [ HAP-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash ha-ffmpeg zeroconf ]; - "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors zeroconf ]; + "homekit" = ps: with ps; [ HAP-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash ha-ffmpeg pyroute2 zeroconf ]; + "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors pyroute2 zeroconf ]; "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ homematicip ]; "homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks @@ -374,6 +375,7 @@ "hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti "hydrawise" = ps: with ps; [ hydrawiser ]; "hyperion" = ps: with ps; [ hyperion-py ]; + "ialarm" = ps: with ps; [ ]; # missing inputs: pyialarm "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter "iaqualink" = ps: with ps; [ iaqualink ]; "icloud" = ps: with ps; [ pyicloud ]; @@ -398,7 +400,7 @@ "intent" = ps: with ps; [ aiohttp-cors ]; "intent_script" = ps: with ps; [ ]; "intesishome" = ps: with ps; [ pyintesishome ]; - "ios" = ps: with ps; [ aiohttp-cors zeroconf ]; + "ios" = ps: with ps; [ aiohttp-cors pyroute2 zeroconf ]; "iota" = ps: with ps; [ ]; # missing inputs: pyota "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3 "ipma" = ps: with ps; [ ]; # missing inputs: pyipma @@ -411,7 +413,7 @@ "itach" = ps: with ps; [ ]; # missing inputs: pyitachip2ir "itunes" = ps: with ps; [ ]; "izone" = ps: with ps; [ ]; # missing inputs: python-izone - "jewish_calendar" = ps: with ps; [ ]; # missing inputs: hdate + "jewish_calendar" = ps: with ps; [ hdate ]; "joaoapps_join" = ps: with ps; [ ]; # missing inputs: python-join-api "juicenet" = ps: with ps; [ ]; # missing inputs: python-juicenet "kaiterra" = ps: with ps; [ ]; # missing inputs: kaiterra-async-client @@ -427,6 +429,7 @@ "knx" = ps: with ps; [ xknx ]; "kodi" = ps: with ps; [ pykodi ]; "konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected + "kostal_plenticore" = ps: with ps; [ ]; # missing inputs: kostal_plenticore "kulersky" = ps: with ps; [ ]; # missing inputs: pykulersky "kwb" = ps: with ps; [ ]; # missing inputs: pykwb "lacrosse" = ps: with ps; [ pylacrosse ]; @@ -492,6 +495,7 @@ "meraki" = ps: with ps; [ aiohttp-cors ]; "message_bird" = ps: with ps; [ ]; # missing inputs: messagebird "met" = ps: with ps; [ pymetno ]; + "met_eireann" = ps: with ps; [ ]; # missing inputs: pyMetEireann "meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance-api "meteoalarm" = ps: with ps; [ ]; # missing inputs: meteoalertapi "metoffice" = ps: with ps; [ ]; # missing inputs: datapoint @@ -517,6 +521,7 @@ "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice "moon" = ps: with ps; [ ]; "motion_blinds" = ps: with ps; [ ]; # missing inputs: motionblinds + "motioneye" = ps: with ps; [ ]; # missing inputs: motioneye-client "mpchc" = ps: with ps; [ ]; "mpd" = ps: with ps; [ mpd2 ]; "mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; @@ -526,6 +531,7 @@ "mqtt_statestream" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "msteams" = ps: with ps; [ pymsteams ]; "mullvad" = ps: with ps; [ mullvad-api ]; + "mutesync" = ps: with ps; [ ]; # missing inputs: mutesync "mvglive" = ps: with ps; [ PyMVGLive ]; "my" = ps: with ps; [ aiohttp-cors pillow ]; "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy @@ -577,7 +583,7 @@ "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics "obihai" = ps: with ps; [ ]; # missing inputs: pyobihai - "octoprint" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; + "octoprint" = ps: with ps; [ aiohttp-cors netdisco pyroute2 zeroconf ]; "oem" = ps: with ps; [ ]; # missing inputs: oemthermostat "ohmconnect" = ps: with ps; [ defusedxml ]; "ombi" = ps: with ps; [ ]; # missing inputs: pyombi @@ -623,6 +629,7 @@ "philips_js" = ps: with ps; [ ]; # missing inputs: ha-philipsjs "pi4ioe5v9xxxx" = ps: with ps; [ ]; # missing inputs: pi4ioe5v9xxxx "pi_hole" = ps: with ps; [ hole ]; + "picnic" = ps: with ps; [ python-picnic-api ]; "picotts" = ps: with ps; [ ]; "piglow" = ps: with ps; [ ]; # missing inputs: piglow "pilight" = ps: with ps; [ ]; # missing inputs: pilight @@ -708,7 +715,7 @@ "ruckus_unleashed" = ps: with ps; [ pyruckus ]; "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound - "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: pysabnzbd + "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco pyroute2 zeroconf ]; # missing inputs: pysabnzbd "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa pillow ]; "saj" = ps: with ps; [ ]; # missing inputs: pysaj "samsungtv" = ps: with ps; [ samsungctl samsungtvws ]; @@ -767,7 +774,6 @@ "snips" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "snmp" = ps: with ps; [ pysnmp ]; "sochain" = ps: with ps; [ ]; # missing inputs: python-sochain-api - "socialblade" = ps: with ps; [ ]; # missing inputs: socialbladeclient "solaredge" = ps: with ps; [ solaredge stringcase ]; "solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local "solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher @@ -779,7 +785,7 @@ "songpal" = ps: with ps; [ ]; # missing inputs: python-songpal "sonos" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ]; "sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp - "soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch zeroconf ]; + "soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch pyroute2 zeroconf ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; "spc" = ps: with ps; [ ]; # missing inputs: pyspcwebgw "speedtestdotnet" = ps: with ps; [ speedtest-cli ]; @@ -790,7 +796,7 @@ "sql" = ps: with ps; [ sqlalchemy ]; "squeezebox" = ps: with ps; [ pysqueezebox ]; "srp_energy" = ps: with ps; [ ]; # missing inputs: srpenergy - "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml netdisco zeroconf ]; + "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml netdisco pyroute2 zeroconf ]; "starline" = ps: with ps; [ ]; # missing inputs: starline "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank "startca" = ps: with ps; [ xmltodict ]; @@ -840,7 +846,7 @@ "telnet" = ps: with ps; [ ]; "temper" = ps: with ps; [ ]; # missing inputs: temperusb "template" = ps: with ps; [ ]; - "tensorflow" = ps: with ps; [ numpy pillow tensorflow ]; # missing inputs: pycocotools tf-models-official + "tensorflow" = ps: with ps; [ numpy pillow pycocotools tensorflow ]; # missing inputs: tf-models-official "tesla" = ps: with ps; [ teslajsonpy ]; "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac "thermoworks_smoke" = ps: with ps; [ stringcase ]; # missing inputs: thermoworks_smoke @@ -958,7 +964,7 @@ "xbox_live" = ps: with ps; [ xboxapi ]; "xeoma" = ps: with ps; [ pyxeoma ]; "xiaomi" = ps: with ps; [ ha-ffmpeg ]; - "xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors netdisco zeroconf ]; + "xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors netdisco pyroute2 zeroconf ]; "xiaomi_miio" = ps: with ps; [ construct python-miio ]; "xiaomi_tv" = ps: with ps; [ pymitv ]; "xmpp" = ps: with ps; [ slixmpp ]; @@ -974,10 +980,10 @@ "zabbix" = ps: with ps; [ ]; # missing inputs: py-zabbix "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge - "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; + "zeroconf" = ps: with ps; [ aiohttp-cors pyroute2 zeroconf ]; "zerproc" = ps: with ps; [ pyzerproc ]; "zestimate" = ps: with ps; [ xmltodict ]; - "zha" = ps: with ps; [ aiohttp-cors bellows pyserial-asyncio pyserial zeroconf zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ]; + "zha" = ps: with ps; [ aiohttp-cors bellows pyroute2 pyserial-asyncio pyserial zeroconf zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ]; "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl "zodiac" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c836d85ac9b..4ca42120e58 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -22,24 +22,6 @@ let defaultOverrides = [ # Override the version of some packages pinned in Home Assistant's setup.py - # Pinned due to API changes in astral>=2.0, required by the sun/moon plugins - # https://github.com/home-assistant/core/pull/48573; Remove >= 2021.5 - (mkOverride "astral" "1.10.1" - "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1") - - # Pinned due to API changes in brother>=1.0, remove >= 2021.5 - (self: super: { - brother = super.brother.overridePythonAttrs (oldAttrs: rec { - version = "0.2.2"; - src = fetchFromGitHub { - owner = "bieniu"; - repo = "brother"; - rev = version; - sha256 = "sha256-vIefcL3K3ZbAUxMFM7gbbTFdrnmufWZHcq4OA19SYXE="; - }; - }); - }) - # Pinned due to API changes in iaqualink>=2.0, remove after # https://github.com/home-assistant/core/pull/48137 was merged (self: super: { @@ -59,26 +41,6 @@ let (mkOverride "pyjwt" "1.7.1" "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd") - # Pinned due to API changes in pykmtronic>=0.2.0 - (mkOverride "pykmtronic" "0.0.3" - "sha256-8bxn27DU1XUQUxQFJklEge29DHx1DMu7pJG4hVE1jDU=") - - # Pinned due to API changes in pylilterbot>=2021.3.0 - # https://github.com/home-assistant/core/pull/48300; Remove >= 2021.5 - (self: super: { - pylitterbot = super.pylitterbot.overridePythonAttrs (oldAttrs: rec { - version = "2021.2.8"; - src = fetchFromGitHub { - owner = "natekspencer"; - repo = "pylitterbot"; - rev = version; - sha256 = "142lhijm51v11cd0lhcfdnjdd143jxi2hjsrqdq0rrbbnmj6mymp"; - }; - # had no tests before 2021.3.0 - doCheck = false; - }); - }) - # Pinned due to bug in ring-doorbell 0.7.0 # https://github.com/tchellomello/python-ring-doorbell/issues/240 (mkOverride "ring-doorbell" "0.6.2" @@ -97,6 +59,19 @@ let }); }) + # Remove after https://github.com/NixOS/nixpkgs/pull/121854 has passed staging-next + (self: super: { + sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "1.4.13"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0npsg38d11skv04zvsi90j93f6jdgm8666ds2ri7shr1pz1732hx"; + }; + patches = []; + propagatedBuildInputs = [ python3.pkgs.greenlet ]; + }); + }) + # hass-frontend does not exist in python3.pkgs (self: super: { hass-frontend = self.callPackage ./frontend.nix { }; @@ -130,7 +105,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.4.6"; + hassVersion = "2021.5.0"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -149,7 +124,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1s1slwcqls2prz9kgyhggs8xi3x7ghwdi33j983kvpg0gva7d2f0"; + sha256 = "1kwx0bq2i76p9gbx5kkzkjxd88vzf2daccm0wf123693isk1nwzs"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -162,8 +137,6 @@ in with py.pkgs; buildPythonApplication rec { --replace "bcrypt==3.1.7" "bcrypt" \ --replace "cryptography==3.3.2" "cryptography" \ --replace "pip>=8.0.3,<20.3" "pip" \ - --replace "pytz>=2021.1" "pytz" \ - --replace "pyyaml==5.4.1" "pyyaml" \ --replace "ruamel.yaml==0.15.100" "ruamel.yaml" substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' ''; @@ -299,6 +272,7 @@ in with py.pkgs; buildPythonApplication rec { "intent" "intent_script" "ipp" + "jewish_calendar" "kmtronic" "knx" "kodi" @@ -453,6 +427,8 @@ in with py.pkgs; buildPythonApplication rec { "test_fetching_url_with_verify_ssl" # util/test_package.py: AssertionError on package.is_installed('homeassistant>=999.999.999') "test_check_package_version_does_not_match" + # homeassistant/util/thread.py:51: SystemError + "test_executor_shutdown_can_interrupt_threads" ]; preCheck = '' diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 83af5b85c87..bd490654420 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20210407.3"; + version = "20210504.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ucewS193kbvlk4Q+5IEYT6sfJ/H006uy0iIi8UHOzPo="; + sha256 = "sha256-rNdqflWT8bmGHtAGGfq4xVxDcnK+EZU9qejRWQPJmUI="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index c3680d76b96..5258a0224be 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "youtrack"; - version = "2018.2.44329"; + version = "2021.1.13597"; jar = fetchurl { url = "https://download.jetbrains.com/charisma/${pname}-${version}.jar"; - sha256 = "1fnnpyikr1x443vxy6f7vlv550sbahpps8awyn13jpg7kpgfm7lk"; + sha256 = "0lc0ra95ix5bs1spfjnx5akh8jm754v8lc3yja8dc438zi221qhh"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 3726facd583..3138a68a9bc 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "12.0.4"; + version = "13.0.0"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - sha256 = "sha256-7DKKpuKPoSKIpfvhCvLzuyepbmixgq0+o+83FKi6Dwc="; + sha256 = "sha256-jpjAPldmJkyXGsokw9MO1u0VysYBXeQ8MamEPWvBGvs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index 71f370a1a97..c747e5266a0 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gobgpd"; - version = "2.26.0"; + version = "2.27.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "10fq74hv3vmcq58i3w67ic370925vl9wl6khcmy3f2vg60i962di"; + sha256 = "sha256-Ofg+z8wUttqM1THatPFi0cuyLSEryhTmg3JC1o+16eA="; }; - vendorSha256 = "0dmd4r6x76jn8pyvp47x4llzc2wij5m9lchgyaagcb5sfdgbns9x"; + vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 0cbfc89bd5d..c143c44704b 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wireguard-exporter"; - version = "3.4.2"; + version = "3.5.0"; src = fetchFromGitHub { owner = "MindFlavor"; repo = "prometheus_wireguard_exporter"; rev = version; - sha256 = "sha256-nzY+pCkj0/m7cWPq5+xvQ1b1/PqdI6QuxNdTRT030tY="; + sha256 = "sha256-LHhqQ0p2qt6ZAdkpY1SEAcGXH47TPhHvlDv+eL8GC58="; }; - cargoSha256 = "sha256-L2ohowt5+F3XJSzoihtJ2prW2bzZiNMUL9vqHIZBy1M="; + cargoSha256 = "sha256-lNFsO7FSmH1+DLM7ID0vn6234qTdtUoaLSnqKcbHoXE="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 3d0cbcf5ace..ccaf103adef 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.2.0"; + version = "2.2.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "0gl2jjk9k0s5h7s4yq1qb60lvcqvhp88rh1fhlpyx1vm1hifhhik"; + sha256 = "1hk3yyiddhz9lxls981101malzs9b5vnw9wiiw2cxzcslkmg2gv9"; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ] diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index d051395027b..a645977f8a3 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "tailscale"; - version = "1.6.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "07dzcqd98nsrdv72wp93q6f23mn3pfmpyyi61dx6c26w0j5n4r0p"; + sha256 = "urgXbfXEVu5ES140pIAZnQTjU3xWkkk9MPDmlRXa544="; }; nativeBuildInputs = [ makeWrapper ]; CGO_ENABLED = 0; - vendorSha256 = "0wbw9pc0cv05bw2gsps3099zipwjj3r23vyf87qy6g21r08xrrm8"; + vendorSha256 = "NBdPGCmUyGKNr76CKwkXmqSVo502ZVrsbboNc+xnB04="; doCheck = false; diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index c9ace581c7e..348681799a6 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -11,14 +11,14 @@ in buildGoModule rec { pname = "teleport"; - version = "6.1.2"; + version = "6.1.3"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "sha256-4ZaebTTgGrGRQbMfDw1PL/qtDKmHbSY6kPmWyFeIcAU="; + sha256 = "sha256-kb7qRPZKXDY0Qy3/72epAGaN2FCOO/XAN8lOoUYkoM0="; }; vendorSha256 = null; @@ -27,6 +27,9 @@ buildGoModule rec { nativeBuildInputs = [ zip makeWrapper ]; + # https://github.com/NixOS/nixpkgs/issues/120738 + patches = [ ./tsh.patch ]; + postBuild = '' pushd . mkdir -p build @@ -54,8 +57,8 @@ buildGoModule rec { postInstall = '' install -Dm755 -t $client/bin $out/bin/tsh - wrapProgram $client/bin/tsh --prefix PATH : ${xdg-utils}/bin - wrapProgram $out/bin/tsh --prefix PATH : ${xdg-utils}/bin + wrapProgram $client/bin/tsh --prefix PATH : ${lib.makeBinPath [ xdg-utils ]} + wrapProgram $out/bin/tsh --prefix PATH : ${lib.makeBinPath [ xdg-utils ]} ''; doInstallCheck = true; diff --git a/pkgs/servers/teleport/tsh.patch b/pkgs/servers/teleport/tsh.patch new file mode 100644 index 00000000000..0d614f063d4 --- /dev/null +++ b/pkgs/servers/teleport/tsh.patch @@ -0,0 +1,17 @@ +diff --git a/tool/tsh/tsh.go b/tool/tsh/tsh.go +index 57379c40f..cb4d7b84c 100644 +--- a/tool/tsh/tsh.go ++++ b/tool/tsh/tsh.go +@@ -514,10 +514,11 @@ func Run(args []string, opts ...cliOption) error { + } + } + +- cf.executablePath, err = os.Executable() ++ tempBinaryPath, err := os.Executable() + if err != nil { + return trace.Wrap(err) + } ++ cf.executablePath = path.Dir(tempBinaryPath) + "/tsh" + + if err := client.ValidateAgentKeyOption(cf.AddKeysToAgent); err != nil { + return trace.Wrap(err) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 6ab9f8ed8dd..1e6b9888ba2 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -833,6 +833,12 @@ self: super: ''; }); + xorgdocs = super.xorgdocs.overrideAttrs (attrs: { + # This makes the man pages discoverable by the default man, + # since it looks for packages in $PATH + postInstall = "mkdir $out/bin"; + }); + xwd = super.xwd.overrideAttrs (attrs: { buildInputs = with self; attrs.buildInputs ++ [libXt]; }); diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 9df88affb9f..0f21b55b85b 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.8.8"; + version = "0.8.10"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "sha256-J9aNuw72qufoVY6VnbdpCtpcI6GAI7ON10XGEJuqieI="; + sha256 = "sha256-ETB8BirlEqro8CUdRM+AsZ/ugFa/fj52wCV9pInvMB0="; }; postPatch = '' diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 227f53b02cc..fcfab9bff5d 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -176,13 +176,13 @@ in rec { ''; }; - darwin = super.darwin // { + darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { Libsystem = stdenv.mkDerivation { name = "bootstrap-stage0-Libsystem"; buildCommand = '' mkdir -p $out - cp -r ${self.darwin.darwin-stubs}/usr/lib $out/lib + cp -r ${selfDarwin.darwin-stubs}/usr/lib $out/lib chmod -R +w $out/lib substituteInPlace $out/lib/libSystem.B.tbd --replace /usr/lib/system $out/lib/system @@ -201,7 +201,7 @@ in rec { ''; }; - darwin-stubs = super.darwin.darwin-stubs.override { inherit (self) stdenv fetchurl; }; + darwin-stubs = superDarwin.darwin-stubs.override { inherit (self) stdenv fetchurl; }; dyld = { name = "bootstrap-stage0-dyld"; @@ -220,10 +220,10 @@ in rec { nativeTools = false; nativeLibc = false; inherit (self) buildPackages coreutils gnugrep; - libc = self.pkgs.darwin.Libsystem; + libc = selfDarwin.Libsystem; bintools = { name = "bootstrap-stage0-binutils"; outPath = bootstrapTools; }; }; - }; + }); llvmPackages_7 = { clang-unwrapped = stdenv.mkDerivation { @@ -291,12 +291,12 @@ in rec { }); in { inherit tools libraries; } // tools // libraries); - darwin = super.darwin // { + darwin = super.darwin.overrideScope (selfDarwin: _: { binutils = darwin.binutils.override { coreutils = self.coreutils; - libc = self.darwin.Libsystem; + libc = selfDarwin.Libsystem; }; - }; + }); }; in with prevStage; stageFun 1 prevStage { extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\""; @@ -337,11 +337,11 @@ in rec { }); in { inherit tools libraries; } // tools // libraries); - darwin = super.darwin // { + darwin = super.darwin.overrideScope (_: _: { inherit (darwin) binutils dyld Libsystem xnu configd ICU libdispatch libclosure launchd CF darwin-stubs; - }; + }); }; in with prevStage; stageFun 2 prevStage { extraPreHook = '' @@ -382,11 +382,11 @@ in rec { }); in { inherit libraries; } // libraries); - darwin = super.darwin // { + darwin = super.darwin.overrideScope (_: _: { inherit (darwin) dyld Libsystem xnu configd libdispatch libclosure launchd libiconv locale darwin-stubs; - }; + }); }; in with prevStage; stageFun 3 prevStage { shell = "${pkgs.bash}/bin/bash"; @@ -442,14 +442,14 @@ in rec { }); in { inherit tools libraries; } // tools // libraries); - darwin = super.darwin // rec { + darwin = super.darwin.overrideScope (_: superDarwin: { inherit (darwin) dyld Libsystem libiconv locale darwin-stubs; - CF = super.darwin.CF.override { + CF = superDarwin.CF.override { inherit libxml2; python3 = prevStage.python3; }; - }; + }); }; in with prevStage; stageFun 4 prevStage { shell = "${pkgs.bash}/bin/bash"; @@ -480,11 +480,11 @@ in rec { }); in { inherit tools libraries; } // tools // libraries); - darwin = super.darwin // { + darwin = super.darwin.overrideScope (_: _: { inherit (darwin) dyld ICU Libsystem libiconv; } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { inherit (darwin) binutils binutils-unwrapped cctools; - }; + }); } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { # Need to get rid of these when cross-compiling. inherit binutils binutils-unwrapped; @@ -537,14 +537,14 @@ in rec { ]); overrides = lib.composeExtensions persistent (self: super: { + darwin = super.darwin.overrideScope (_: superDarwin: { + inherit (prevStage.darwin) CF darwin-stubs; + xnu = superDarwin.xnu.override { inherit (prevStage) python3; }; + }); + } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { clang = cc; llvmPackages = super.llvmPackages // { clang = cc; }; inherit cc; - - darwin = super.darwin // { - inherit (prevStage.darwin) CF darwin-stubs; - xnu = super.darwin.xnu.override { inherit (prevStage) python3; }; - }; }); }; diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index 7a6affd6cbe..d8420d99136 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -1,4 +1,4 @@ -{ runCommandNoCC, fetchurl, file, texlive, writeShellScript }: +{ lib, runCommandNoCC, fetchurl, file, texlive, writeShellScript }: { chktex = runCommandNoCC "texlive-test-chktex" { @@ -16,68 +16,69 @@ grep "One warning printed" "$out" ''; - # https://github.com/NixOS/nixpkgs/issues/75605 - dvipng.basic = runCommandNoCC "texlive-test-dvipng-basic" { - nativeBuildInputs = [ file texlive.combined.scheme-medium ]; - input = fetchurl { - name = "test_dvipng.tex"; - url = "http://git.savannah.nongnu.org/cgit/dvipng.git/plain/test_dvipng.tex?id=b872753590a18605260078f56cbd6f28d39dc035"; - sha256 = "1pjpf1jvwj2pv5crzdgcrzvbmn7kfmgxa39pcvskl4pa0c9hl88n"; - }; - } '' - cp "$input" ./document.tex + dvipng = lib.recurseIntoAttrs { + # https://github.com/NixOS/nixpkgs/issues/75605 + basic = runCommandNoCC "texlive-test-dvipng-basic" { + nativeBuildInputs = [ file texlive.combined.scheme-medium ]; + input = fetchurl { + name = "test_dvipng.tex"; + url = "http://git.savannah.nongnu.org/cgit/dvipng.git/plain/test_dvipng.tex?id=b872753590a18605260078f56cbd6f28d39dc035"; + sha256 = "1pjpf1jvwj2pv5crzdgcrzvbmn7kfmgxa39pcvskl4pa0c9hl88n"; + }; + } '' + cp "$input" ./document.tex - latex document.tex - dvipng -T tight -strict -picky document.dvi - for f in document*.png; do - file "$f" | tee output - grep PNG output - done + latex document.tex + dvipng -T tight -strict -picky document.dvi + for f in document*.png; do + file "$f" | tee output + grep PNG output + done - mkdir "$out" - mv document*.png "$out"/ - ''; - - # test dvipng's limited capability to render postscript specials via GS - dvipng.ghostscript = runCommandNoCC "texlive-test-ghostscript" { - nativeBuildInputs = [ file (with texlive; combine { inherit scheme-small dvipng; }) ]; - input = builtins.toFile "postscript-sample.tex" '' - \documentclass{minimal} - \begin{document} - Ni - \special{ps: - newpath - 0 0 moveto - 7 7 rlineto - 0 7 moveto - 7 -7 rlineto - stroke - showpage - } - \end{document} + mkdir "$out" + mv document*.png "$out"/ ''; - gs_trap = writeShellScript "gs_trap.sh" '' - exit 1 + + # test dvipng's limited capability to render postscript specials via GS + ghostscript = runCommandNoCC "texlive-test-ghostscript" { + nativeBuildInputs = [ file (with texlive; combine { inherit scheme-small dvipng; }) ]; + input = builtins.toFile "postscript-sample.tex" '' + \documentclass{minimal} + \begin{document} + Ni + \special{ps: + newpath + 0 0 moveto + 7 7 rlineto + 0 7 moveto + 7 -7 rlineto + stroke + showpage + } + \end{document} + ''; + gs_trap = writeShellScript "gs_trap.sh" '' + exit 1 + ''; + } '' + cp "$gs_trap" ./gs + export PATH=$PWD:$PATH + # check that the trap works + gs && exit 1 + + cp "$input" ./document.tex + + latex document.tex + dvipng -T 1in,1in -strict -picky document.dvi + for f in document*.png; do + file "$f" | tee output + grep PNG output + done + + mkdir "$out" + mv document*.png "$out"/ ''; - } '' - cp "$gs_trap" ./gs - export PATH=$PWD:$PATH - # check that the trap works - gs && exit 1 - - cp "$input" ./document.tex - - latex document.tex - dvipng -T 1in,1in -strict -picky document.dvi - for f in document*.png; do - file "$f" | tee output - grep PNG output - done - - mkdir "$out" - mv document*.png "$out"/ - ''; - + }; # https://github.com/NixOS/nixpkgs/issues/75070 dvisvgm = runCommandNoCC "texlive-test-dvisvgm" { diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 925ed7699ae..c037f661e61 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.20.0"; + version = "2.23.0"; srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ let owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-unG17oiqZZJNGg8QCg7xY0GzuMu2gaAIIgGF8TlMBQQ="; + sha256 = "sha256-uIM1U9hub1A1YT6CzwQHmefNBuU4tDapu7VC6EP5kuM="; }; # put packages that needs to be overriden in the py package scope @@ -50,6 +50,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-datalake-store azure-functions-devops-build azure-graphrbac + azure-identity azure-keyvault azure-keyvault-administration azure-loganalytics @@ -110,6 +111,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-mgmt-security azure-mgmt-servicebus azure-mgmt-servicefabric + azure-mgmt-servicefabricmanagedclusters azure-mgmt-signalr azure-mgmt-sql azure-mgmt-sqlvirtualmachine diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 5c338239292..87580a6e3b9 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -144,8 +144,8 @@ let azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.5.0" "zip" "1wxh7mgrknnhqyafdd7sbwx8plx0zga2af21vs6yhxy48lw9w8pd"; - azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "3.1.0rc1" "zip" - "0jg242pjbxvcqskgrmw0q17mhafkip1d8p40hls0w0wn77cnic65"; + azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "8.1.0b4" "zip" + "sha256-39msNYlZeZdn8cJ4LjZw9oxzy0YrNSPVEIN21wnkMKs="; azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "0.4.0" "zip" "0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rz1"; @@ -153,8 +153,8 @@ let azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.11.0" "zip" "f2b85d1d7d7db2af106000910ea5f8b95639874176a5de2f7ab37a2caa67af6b"; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "12.0.0" "zip" - "sha256-h3nif64OgekSh4mjOSTbom8qDXVrIVNksbQ3LwILnx8="; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "12.1.0" "zip" + "sha256-XPnO6OiwjTbfxz9Q3JkuCPnfTtmdU2cqP14w9ZVIcBE="; azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "1.0.1" "zip" "b58bbe82a7429ba589292024896b58d96fe9fa732c578569cac349928dc2ca5f"; @@ -162,8 +162,8 @@ let azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.3.0" "zip" "059lhbxqx1r1717s8xz5ahpxwphq5fgy0h7k6b63cahm818rs0hx"; - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "19.0.0" "zip" - "34815c91193640ad8ff0c4dad7f2d997548c853d2e8b10250329ed516e55879a"; + azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "20.0.0" "zip" + "7920bea2e11d78fa616992813aea470a8fb50eab2e646e032e138f93d53b70e8"; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; @@ -171,20 +171,23 @@ let azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "1.4.0" "zip" "1qw6228bia5pimcijr755npli2l33jyfka1s2bzgl1w4h3prsji7"; - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "9.4.0" "zip" - "1jfs2v0bblpn8lg98zgll6f7k7247r6vwrr0p1898xvhdh8881nr"; + azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "11.1.0" "zip" + "sha256-7d9UlMudNd4hMcaNxJ+slL/tFyaI6BmBR6DlI3Blzq4="; azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.2.0" "zip" "8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998"; - azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "3.0.0" "zip" - "sha256-/WV5vxXOg9CUT+NAnhpOG7f+QBGfUlTNVO26LTtuIoM="; + azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "6.2.0" "zip" + "116b5bf9433ad89078c743b617c5b1c51f9ce1a1f128fb2e4bbafb5efb2d2c74"; + + azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "0.2.0" "zip" + "sha256-g8BtUpIGOse8Jrws48gQ/o7sgymlgX0XIxl1ThHS3XA="; azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip" "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6"; - azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "3.0.0rc7" "zip" - "1m5905mn362pn03sf89zsnylkrbgs4p1lkafrw3nxa2gnwcfpyb8"; + azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "3.0.0rc9" "zip" + "sha256-txWYthg9QI5OSW6yE5lY+Gpb+/E6x3jb/obfSQuaAcg="; azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.4.0" "zip" "0cqpjnkpid6a34ifd4vk4fn1h57pa1bg3r756wv082xl2szr34jc"; @@ -201,20 +204,26 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.15.0" "zip" - "sha256-XpjDYGCad7RDsv5DHgM35ctwW08C0CBHkfmYX3zmiDY="; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "2.0.0" "zip" + "ff3b663e36c961e86fc0cdbd6f9fb9fb863d3e7db9035fe713af7299e809ee5e"; - azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip" - "1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p"; + azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip" + "407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8"; azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "8.0.0" "zip" "3e7a93186594c328a6f34f0e0d9209a05021228baa85aa4c1c4ffdbf8005a45f"; - azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "17.1.0" "zip" - "f47852836a5960447ab534784a9285696969f007744ba030828da2eab92621ab"; + azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "18.0.0" "zip" + "85fdeb7a1a8d89be9b585396796b218b31b681590d57d82d3ea14cf1f2d20b4a"; - azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "0.1.0" "zip" - "sha256-baEkJcurDMYvJG5yZrTWev9r3QMey+UMdULC8rJECtQ="; + azure-mgmt-maps = overrideAzureMgmtPackage super.azure-mgmt-maps "0.1.0" "zip" + "sha256-wSDiELthdo2ineJNKLgvjUKuJOUjlutlabSZcJ4i8AY="; + + azure-mgmt-managedservices = overrideAzureMgmtPackage super.azure-mgmt-managedservices "1.0.0" "zip" + "sha256-/tg5n8Z3Oq2jfB0ElqRvWUENd8lJTQyllnxTHDN2rRk="; + + azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "1.1.0" "zip" + "68b381f52a4df4435dacad5a97e1c59ac4c981f667dcca8f9d04453417d60ad8"; azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "3.0.0" "zip" "sha256-iUR3VyXFJTYU0ldXbYQe5or6NPVwsFwJJKf3Px2yiiQ="; @@ -222,8 +231,11 @@ let azure-mgmt-msi = overrideAzureMgmtPackage super.azure-mgmt-msi "0.2.0" "zip" "0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6"; - azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.48.0" "zip" - "1v41k9rsflbm9g06mhi6jsygv9542da53qwjpjkp532jawxrw3ys"; + azure-mgmt-privatedns = overrideAzureMgmtPackage super.azure-mgmt-privatedns "0.1.0" "zip" + "sha256-0pz9jOyAbgZnPZOC0/V2b8Zdmp3nW0JHBQlKNKfbjSM="; + + azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "2.0.0" "zip" + "0040e1c9c795f7bebe43647ff30b62cb0db7175175df5cbfa1e554a6a277b81e"; azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "0.1.0" "zip" "1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn"; @@ -261,14 +273,14 @@ let azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "4.1.0" "zip" "186g70slb259ybrr69zr2ibbmqgplnpncwxzg0nxp6rd7pml7d85"; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "8.0.0" "zip" - "2c974c6114d8d27152642c82a975812790a5e86ccf609bf370a476d9ea0d2e7d"; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "9.0.0" "zip" + "2890c489289b8a0bf833852014f2f494eb96873834896910ddfa58cfa97b90da"; - azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "7.0.0" "zip" - "sha256-6abJoZs5cbodve75bApaLDWUYzp1R6YOa/y4Azhk7jg="; + azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "11.0.0" "zip" + "28e7070001e7208cdb6c2ad253ec78851abdd73be482230d2c0874eed5bc0907"; - azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc16" "zip" - "eT5gH0K4q2Qr1lEpuqjxQhOUrA6bEsAktj+PKsfMXTo="; + azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc17" "zip" + "sha256-M6lenj1rVEJZ+EJyBXkqokFfr1e5sqRgcAbUc0W0svo="; azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "2.0.0" "zip" "e7f7943fe8f0efe98b3b1996cdec47c709765257a6e09e7940f7838a0f829e82"; @@ -282,8 +294,8 @@ let azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip" "0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m"; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "17.0.0" "zip" - "c0e3fd99028d98c80dddabe1c22dfeb3d694e5c1393c6de80766eb240739e4bc"; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "17.1.0" "zip" + "01acb8e988c8082174fa952e1638d700146185644fbe4b126e65843e63d44600"; azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "0.6.0" "zip" "1c88pj8diijciizw4c6g1g6liz54cp3xmlm4xnmz97hizfw202gj"; @@ -294,8 +306,8 @@ let azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "2.2.0" "zip" "sha256-Myxg3G0+OAk/bh4k5TOEGGJuyEBtYA2edNlbIXnWE4M="; - azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.6.0" "tar.gz" - "sha256-2AWpGyle31IFf/qya3FBYJBUBr3V16Gj+T9s3D7ehBI="; + azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.6.2" "tar.gz" + "74061f99730fa82c54d9b8ab3c7d6e219da3f30912740ecf0456b20cb3555ebc"; azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec { version = "0.60.0"; @@ -327,21 +339,21 @@ let }); azure-synapse-artifacts = super.azure-synapse-artifacts.overrideAttrs(oldAttrs: rec { - version = "0.3.0"; + version = "0.6.0"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "0p43zmw96fh3wp75phf3fcqdfb36adqvxfc945yfda6fi555nw1a"; + sha256 = "ec113d37386b8787862baaf9da0318364a008004a377d20fdfca31cfe8d16210"; extension = "zip"; }; }); azure-synapse-accesscontrol = super.azure-synapse-accesscontrol.overrideAttrs(oldAttrs: rec { - version = "0.2.0"; + version = "0.5.0"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "1rsdqrhrgy09kbw6c7krb4hlaxs1ldb6lilwrbxgp3zqybxxnh5b"; + sha256 = "sha256-g14ySiByqPgkJGRH8EnIRJO9Q6H2usS5FOeMCQiUuwQ="; extension = "zip"; }; }); @@ -417,6 +429,16 @@ let ''; }); + adal = super.adal.overridePythonAttrs(oldAttrs: rec { + version = "1.2.7"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-109FuBMXRU2W6YL9HFDm+1yZrCIjcorqh2RDOjn1ZvE="; + }; + }); + semver = super.semver.overridePythonAttrs(oldAttrs: rec { version = "2.13.0"; @@ -438,12 +460,12 @@ let }); knack = super.knack.overridePythonAttrs(oldAttrs: rec { - version = "0.8.0rc2"; + version = "0.8.1"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "sha256-4pzgVwOVcT5UsjbyGkE30xashMASUzoQe2OGHSnK5do="; + sha256 = "sha256-5h2a5OJxmaLXTCYfgen4L1NTpdHC4a0lYAp9UQkXTuA="; }; }); diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 83f62a2f1c1..ecfa1675a4e 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.46.0"; + version = "0.47.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-fPs9xB27fxUnsXndqpcifmMPGA8hEyeYC7tq+W9eBKI="; + sha256 = "sha256-fJL6Fs2rt3Q26cUww0Ca/FZnRN7/KHtp9mHUrpwTLuY="; }; - vendorSha256 = "sha256-ZC5Rk5HcnxU9X5o/t+oz8qx36WjOVYVEXxxa875UrZk="; + vendorSha256 = "sha256-SeO5RNpGrA28xOKr7EoRtMtyOlAPFYEAFtodhIbe1Zk="; doCheck = false; diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 3d662a456aa..9f4d4effeee 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, fetchpatch , meson , ninja , gobject-introspection @@ -22,23 +22,15 @@ stdenv.mkDerivation rec { pname = "gtk-vnc"; - version = "1.0.0"; + version = "1.2.0"; outputs = [ "out" "bin" "man" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1060ws037v556rx1qhfrcg02859rscksrzr8fq11himdg4d1y6m8"; + sha256 = "0jmr6igyzcj2wmx5v5ywaazvdz3hx6a6rys26yb4l4s71l281bvs"; }; - patches = [ - # Fix undeclared gio-unix-2.0 in example program. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk-vnc/commit/8588bc1c8321152ddc5086ca9b2c03a7f511e0d0.patch"; - sha256 = "0i1iapsbngl1mhnz22dd73mnzk68qc4n51pqdhnm18zqc8pawvh4"; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index e1c2844813d..f0c1e35885b 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2021.03.30"; + version = "2021.04.26"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "sha256-eOQbvs/mtFn7AmvSezO/jRm8+cO5tF7ggcF9DwwfqVc="; + sha256 = "sha256-L6SfPRVIclAVloYfZ+kKfZaGHYnYNAgToRN2e5ZfJZ4="; }; meta = with lib; { diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index 5703ca77bd0..4fc3d957e13 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -17,10 +17,15 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { + name = "fix-build-with-libav-10.patch"; + url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/commits/2c778334a9fc2f0ccf9b1d7635c116bce6509748/raw"; + sha256 = "1smyp3x5n6jwxpgw60xsijq2fn6g1gl759h1lm5agaxhcyyqn0i0"; + }) + (fetchpatch { + name = "fix-build-failure-on-gcc-6.patch"; url = "https://bitbucket.org/acoustid/acoustid-fingerprinter/commits/632e87969c3a5562a5d4842b03613267ba6236b2/raw"; sha256 = "15hm9knrpqn3yqrwyjz4zh2aypwbcycd0c5svrsy1fb2h2rh05jk"; }) - ./ffmpeg.patch ]; meta = with lib; { diff --git a/pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch b/pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch deleted file mode 100644 index f3eacae26f7..00000000000 --- a/pkgs/tools/audio/acoustid-fingerprinter/ffmpeg.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/decoder.h b/decoder.h -index 028f58f..4428ac1 100644 ---- a/decoder.h -+++ b/decoder.h -@@ -39,6 +39,8 @@ extern "C" { - #define AV_SAMPLE_FMT_S16 SAMPLE_FMT_S16 - #endif - -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 -+ - class Decoder - { - public: -diff --git a/ffmpeg/audioconvert.h b/ffmpeg/audioconvert.h -index 2b28e2e..a699986 100644 ---- a/ffmpeg/audioconvert.h -+++ b/ffmpeg/audioconvert.h -@@ -79,7 +79,7 @@ int avcodec_channel_layout_num_channels(int64_t channel_layout); - * @param fmt_name Format name, or NULL if unknown - * @return Channel layout mask - */ --uint64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name); -+uint64_t avcodec_guess_channel_layout(int nb_channels, enum AVCodecID codec_id, const char *fmt_name); - - struct AVAudioConvert; - typedef struct AVAudioConvert AVAudioConvert; diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index 4cab99d69fa..071538d1703 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "1.1.0-dev-20210430"; + version = "1.1.0-dev-20210504"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-Sb2N3GPS+A55O39/kqua7M18O1F76zz6sNFghSFRBmk="; + sha256 = "sha256-q9xWe1gGX7SV/tAUHu/uBB709aqegIsNLTPM5zljgYY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/perceptualdiff/default.nix b/pkgs/tools/graphics/perceptualdiff/default.nix index 2227ff40299..454352986ed 100644 --- a/pkgs/tools/graphics/perceptualdiff/default.nix +++ b/pkgs/tools/graphics/perceptualdiff/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A program that compares two images using a perceptually based image metric"; homepage = "https://github.com/myint/perceptualdiff"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ uri-canva ]; platforms = platforms.x86; }; diff --git a/pkgs/tools/graphics/snapdragon-profiler/default.nix b/pkgs/tools/graphics/snapdragon-profiler/default.nix new file mode 100644 index 00000000000..96fada91093 --- /dev/null +++ b/pkgs/tools/graphics/snapdragon-profiler/default.nix @@ -0,0 +1,91 @@ +{ lib +, stdenv +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, icoutils +, mono6 +, jre +, androidenv +, gtk-sharp-2_0 +, gtk2 +, libcxx +, libcxxabi +, coreutils +, requireFile +, archive ? requireFile { + name = "snapdragonprofiler_external_linux.tar.gz"; + message = '' + This nix expression requires that "snapdragonprofiler_external_linux.tar.gz" is + already part of the store. To get this archive, you need to download it from: + https://developer.qualcomm.com/software/snapdragon-profiler + and add it to the nix store with nix-store --add-fixed sha256 . + ''; + sha256 = "c6731c417ca39fa9b0f190bd80c99b1603cf97d23becab9e47db6beafd6206b7"; + } +}: + +stdenv.mkDerivation rec { + pname = "snapdragon-profiler"; + version = "v2021.2"; + + src = archive; + + nativeBuildInputs = [ + makeWrapper + icoutils + copyDesktopItems + ]; + + buildInputs = [ + mono6 + gtk-sharp-2_0 + gtk2 + libcxx + libcxxabi + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,lib/snapdragon-profiler} + mkdir -p $out/share/icons/hicolor/{16x16,32x32,48x48}/apps + + mv *.so $out/lib + cp -r * $out/lib/snapdragon-profiler + makeWrapper "${mono6}/bin/mono" $out/bin/snapdragon-profiler \ + --add-flags "$out/lib/snapdragon-profiler/SnapdragonProfiler.exe" \ + --suffix PATH : ${lib.makeBinPath [ jre androidenv.androidPkgs_9_0.platform-tools coreutils ]} \ + --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ + --suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //') \ + --run "cd $out/lib/snapdragon-profiler" # Fixes themes not loading correctly + + wrestool -x -t 14 SnapdragonProfiler.exe > snapdragon-profiler.ico + icotool -x -i 1 -o $out/share/icons/hicolor/16x16/apps/snapdragon-profiler.png snapdragon-profiler.ico + icotool -x -i 2 -o $out/share/icons/hicolor/32x32/apps/snapdragon-profiler.png snapdragon-profiler.ico + icotool -x -i 3 -o $out/share/icons/hicolor/48x48/apps/snapdragon-profiler.png snapdragon-profiler.ico + + runHook postInstall + ''; + + desktopItems = [(makeDesktopItem { + name = pname; + desktopName = "Snapdragon Profiler"; + exec = "$out/bin/snapdragon-profiler"; + icon = "snapdragon-profiler"; + type = "Application"; + comment = meta.description; + categories = "Development;Debugger;Graphics;3DGraphics"; + terminal = "false"; + })]; + + dontStrip = true; # Always needed on Mono + dontPatchELF = true; # Certain libraries are to be deployed to the remote device, they should not be patched + + meta = with lib; { + homepage = "https://developer.qualcomm.com/software/snapdragon-profiler"; + description = "An profiler for Android devices running Snapdragon chips"; + license = licenses.unfree; + maintainers = [ maintainers.ivar ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix index 9e367d70799..9a90ab3ca7d 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-m17n"; - version = "5.0.4"; + version = "5.0.5"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-yI6Svr1KEdHqAX3qd7t7GvD0EcWg0A2vZpuJw1U9oKQ="; + sha256 = "sha256-duL9FgXPCr4/rMuguw8cf3EIdK6MW/alUNeh1yduY68="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index f0bb6905b43..5bff1f66d56 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -1,14 +1,16 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv }: rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.11.1"; + version = "2.11.2"; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-pjFApZQJqw0fJmJteO7VZWRLogV3rO5XDagZd1MliZg="; + sha256 = "sha256-sT4hg5MC6xuhSKeNxaVY9vOlMEx23uwxgK6UMLO4kVs="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-xsTScRAu0SF1xtjUwBtNJUNIItoR0jjEd2CuSmmeh9c="; + cargoSha256 = "sha256-DOotIN8XScgHR9L6aFgky2B18piGIKfLWx1GTdYnCB0="; doCheck = false; diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 12953e27956..d2b84b28533 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -1,36 +1,60 @@ -{ lib, python3, platformio, esptool, git, protobuf3_12, fetchpatch }: +{ lib +, python3 +, fetchFromGitHub +, platformio +, esptool +, git +}: -let - python = python3.override { - packageOverrides = self: super: { - protobuf = super.protobuf.override { - protobuf = protobuf3_12; - }; - }; - }; - -in python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "1.16.0"; + version = "1.17.1"; - src = python.pkgs.fetchPypi { - inherit pname version; - sha256 = "0pvwzkdcpjqdf7lh1k3xv1la5v60lhjixzykapl7f2xh71fbm144"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "0483glwi155ca1wnffwhmwn17d7kwk4hjwmckb8zs197rfqmb55v"; }; + postPatch = '' + # remove all version pinning (E.g tornado==5.1.1 -> tornado) + sed -i -e "s/==[0-9.]*//" requirements.txt + + # drop coverage testing + sed -i '/--cov/d' pytest.ini + + # migrate use of hypothesis internals to be compatible with hypothesis>=5.32.1 + # https://github.com/esphome/issues/issues/2021 + substituteInPlace tests/unit_tests/strategies.py --replace \ + "@st.defines_strategy_with_reusable_values" \ + "@st.defines_strategy(force_reusable_values=True)" + ''; + + # Remove esptool and platformio from requirements ESPHOME_USE_SUBPROCESS = ""; - propagatedBuildInputs = with python.pkgs; [ - voluptuous pyyaml paho-mqtt colorlog colorama - tornado protobuf tzlocal pyserial ifaddr - protobuf click + # esphome has optional dependencies it does not declare, they are + # loaded when certain config blocks are used, like `font`, `image` + # or `animation`. + # They have validation functions like: + # - validate_cryptography_installed + # - validate_pillow_installed + propagatedBuildInputs = with python3.pkgs; [ + click + colorama + cryptography + ifaddr + paho-mqtt + pillow + protobuf + pyserial + pyyaml + tornado + tzlocal + voluptuous ]; - # remove all version pinning (E.g tornado==5.1.1 -> tornado) - postPatch = '' - sed -i -e "s/==[0-9.]*//" requirements.txt - ''; - makeWrapperArgs = [ # platformio is used in esphomeyaml/platformio_api.py # esptool is used in esphomeyaml/__main__.py @@ -39,16 +63,24 @@ in python.pkgs.buildPythonApplication rec { "--set ESPHOME_USE_SUBPROCESS ''" ]; - # Platformio will try to access the network - # Instead, run the executable - checkPhase = '' + checkInputs = with python3.pkgs; [ + hypothesis + mock + pytest-mock + pytestCheckHook + ]; + + postCheck = '' $out/bin/esphome --help > /dev/null ''; meta = with lib; { description = "Make creating custom firmwares for ESP32/ESP8266 super easy"; homepage = "https://esphome.io/"; - license = licenses.mit; + license = with licenses; [ + mit # The C++/runtime codebase of the ESPHome project (file extensions .c, .cpp, .h, .hpp, .tcc, .ino) + gpl3Only # The python codebase and all other parts of this codebase + ]; maintainers = with maintainers; [ globin elseym hexa ]; }; } diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 20f25187285..f36e64f57b2 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,6 +1,8 @@ { lib, stdenv, fetchgit, flex, bison, python3, autoconf, automake, gnulib, libtool , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config , buildPackages +, fetchpatch +, pkgsBuildBuild , nixosTests , fuse # only needed for grub-mount , runtimeShell @@ -55,6 +57,12 @@ stdenv.mkDerivation rec { patches = [ ./fix-bash-completion.patch + (fetchpatch { + name = "Add-hidden-menu-entries.patch"; + # https://lists.gnu.org/archive/html/grub-devel/2016-04/msg00089.html + url = "https://marc.info/?l=grub-devel&m=146193404929072&q=mbox"; + sha256 = "00wa1q5adiass6i0x7p98vynj9vsz1w0gn1g4dgz89v35mpyw2bi"; + }) ]; postPatch = if kbdcompSupport then '' diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix index 0205209d491..5f2a8852e31 100644 --- a/pkgs/tools/misc/routino/default.nix +++ b/pkgs/tools/misc/routino/default.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation rec { }) ]; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile.conf \ + --subst-var-by PREFIX $out + ''; + nativeBuildInputs = [ perl ]; buildInputs = [ zlib bzip2 ]; @@ -34,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.routino.org/"; description = "OpenStreetMap Routing Software"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ dotlambda ]; platforms = with platforms; linux ++ darwin; }; diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index 55bd5910054..41007207299 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -2,12 +2,15 @@ stdenv.mkDerivation rec { pname = "burpsuite"; - version = "2020.12.1"; + version = "2021.4.2"; src = fetchurl { name = "burpsuite.jar"; - url = "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"; - sha256 = "AcoPyVXUf2YGfX2/GbtGZeQ4P7zSsYFb9L57trXive0="; + urls = [ + "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" + "https://web.archive.org/web/https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" + ]; + sha256 = "034c9d0a7e0b5e7b1b286949c6b31b475ff2a15e75f1230ccc07e236fc61d2aa"; }; dontUnpack = true; diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index a6e767c6bf6..9b715f4bb14 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.37.2"; + version = "0.37.3"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pzE0nhL6Dqa9AfB2EGxETOo+BnTzzPnu8ANfbu1vfyI="; + sha256 = "sha256-8lZDWvd5Lq8uHBt47gRhg0MLeJ5iRheMBUjkfaJueDI="; }; vendorSha256 = null; diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index d48234f8dc7..942df983fcd 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgp"; - version = "2.26.0"; + version = "2.27.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-sQmTIjBvCzd8ZXAayhPdRSRwBovH8BFRwazusSE52IE="; + sha256 = "sha256-Ofg+z8wUttqM1THatPFi0cuyLSEryhTmg3JC1o+16eA="; }; vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY="; diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index 655cf118302..41828d322e8 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/tools/networking/networkmanager/applet/default.nix b/pkgs/tools/networking/networkmanager/applet/default.nix index f6c45fc074d..cffacddf8bd 100644 --- a/pkgs/tools/networking/networkmanager/applet/default.nix +++ b/pkgs/tools/networking/networkmanager/applet/default.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "networkmanagerapplet"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix index 20388f242ea..25554b27963 100644 --- a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix @@ -72,6 +72,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = pname; attrPath = "networkmanager-fortisslvpn"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/tools/networking/networkmanager/libnma/default.nix b/pkgs/tools/networking/networkmanager/libnma/default.nix index 3d974933225..35f79a773c3 100644 --- a/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -77,6 +77,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/tools/networking/networkmanager/openconnect/default.nix b/pkgs/tools/networking/networkmanager/openconnect/default.nix index 462eb3793d8..6dbb718a6b6 100644 --- a/pkgs/tools/networking/networkmanager/openconnect/default.nix +++ b/pkgs/tools/networking/networkmanager/openconnect/default.nix @@ -69,6 +69,7 @@ in stdenv.mkDerivation { updateScript = gnome3.updateScript { packageName = pname; attrPath = "networkmanager-openconnect"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/tools/networking/networkmanager/openvpn/default.nix b/pkgs/tools/networking/networkmanager/openvpn/default.nix index 4a9e508fcdc..ab87bc8371d 100644 --- a/pkgs/tools/networking/networkmanager/openvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/openvpn/default.nix @@ -34,6 +34,7 @@ in stdenv.mkDerivation { updateScript = gnome3.updateScript { packageName = pname; attrPath = "networkmanager-openvpn"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/tools/networking/networkmanager/vpnc/default.nix b/pkgs/tools/networking/networkmanager/vpnc/default.nix index 6ac71efc260..5181e3160e2 100644 --- a/pkgs/tools/networking/networkmanager/vpnc/default.nix +++ b/pkgs/tools/networking/networkmanager/vpnc/default.nix @@ -38,6 +38,7 @@ in stdenv.mkDerivation { updateScript = gnome3.updateScript { packageName = pname; attrPath = "networkmanager-vpnc"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 787067881a2..b195c655c93 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper }: +{ callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: -stdenv.mkDerivation rec { - version = "5.0.0"; +let this = stdenv.mkDerivation rec { + version = "5.1.0"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,16 +12,20 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "13kgc84kyrypr0xy4xifrzqcy4qlvcxc7f0jy3n1xkjl3vhav7w3"; + sha256 = "06dvy4pwgpyf209n0b27qwkjj7zlgadg2czwxapy94fd1wpq9yb2"; }; phases = [ "installPhase" ]; installPhase = '' + runHook preInstall + install -D "$src" "$out/share/java/${jarfilename}" makeWrapper ${jre}/bin/java $out/bin/${pname} \ --add-flags "-jar $out/share/java/${jarfilename}" + + runHook postInstall ''; meta = with lib; { @@ -30,4 +34,9 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = [ maintainers.shou ]; }; -} + + passthru.tests.example = callPackage ./example.nix { + openapi-generator-cli = this; + }; +}; +in this diff --git a/pkgs/tools/networking/openapi-generator-cli/example.nix b/pkgs/tools/networking/openapi-generator-cli/example.nix new file mode 100644 index 00000000000..f59173b9744 --- /dev/null +++ b/pkgs/tools/networking/openapi-generator-cli/example.nix @@ -0,0 +1,31 @@ +{ openapi-generator-cli, fetchurl, runCommand }: + +runCommand "openapi-generator-cli-test" { + nativeBuildInputs = [ openapi-generator-cli ]; + petstore = fetchurl { + url = "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/14c0908becbccd78252be49bd92be8c53cd2b9e3/examples/v3.0/petstore.yaml"; + sha256 = "sha256:1mgdbzv42alv0b1a18dqbabqyvyhrg3brynr5hqsrm3qljfzaq5b"; + }; + config = builtins.toJSON { + elmVersion = "0.19"; + elmPrefixCustomTypeVariants = false; + }; + passAsFile = [ "config" ]; +} '' + openapi-generator-cli generate \ + --input-spec $petstore \ + --enable-post-process-file \ + --generator-name elm \ + --config "$config" \ + --additional-properties elmEnableCustomBasePaths=true \ + --output "$out" \ + ; + find $out + echo >&2 'Looking for some keywords' + set -x + grep 'module Api.Request.Pets' $out/src/Api/Request/Pets.elm + grep 'createPets' $out/src/Api/Request/Pets.elm + grep '"limit"' $out/src/Api/Request/Pets.elm + set +x + echo "Looks OK!" +'' diff --git a/pkgs/tools/networking/openapi-generator-cli/unstable.nix b/pkgs/tools/networking/openapi-generator-cli/unstable.nix index 1384f35a3f2..306654f05d9 100644 --- a/pkgs/tools/networking/openapi-generator-cli/unstable.nix +++ b/pkgs/tools/networking/openapi-generator-cli/unstable.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper }: +{ callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: -stdenv.mkDerivation rec { +let this = stdenv.mkDerivation rec { version = "6.0.0-2021-01-18"; # Also update the fetchurl link pname = "openapi-generator-cli"; @@ -18,10 +18,14 @@ stdenv.mkDerivation rec { phases = [ "installPhase" ]; installPhase = '' + runHook preInstall + install -D "$src" "$out/share/java/${jarfilename}" makeWrapper ${jre}/bin/java $out/bin/${pname} \ --add-flags "-jar $out/share/java/${jarfilename}" + + runHook postInstall ''; meta = with lib; { @@ -30,5 +34,9 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = [ maintainers.shou ]; }; -} + passthru.tests.example = callPackage ./example.nix { + openapi-generator-cli = this; + }; +}; +in this diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index beddd11e903..3a7e64623af 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "siege"; - version = "4.0.8"; + version = "4.0.9"; src = fetchurl { url = "http://download.joedog.org/siege/${pname}-${version}.tar.gz"; - sha256 = "01qhw52kyqwidp5bckw4xmz4ldqdwkjci7k421qm68kk0mx9l48g"; + sha256 = "0xzjfljhv9wcf58qw2c1sbpa5nqz1pb6rjpgvz7bxrv90n31bghx"; }; NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; @@ -32,8 +32,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "HTTP load tester"; + homepage = "https://www.joedog.org/siege-home/"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; - license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix index a33bb486568..ed83e4d4554 100644 --- a/pkgs/tools/networking/tcpreplay/default.nix +++ b/pkgs/tools/networking/tcpreplay/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tcpreplay"; - version = "4.3.3"; + version = "4.3.4"; src = fetchurl { url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz"; - sha256 = "1plgjm3dr9rr5q71s7paqk2wgrvkihbk2yrf9g3zaks3m750497d"; + sha256 = "sha256-7gZTEIBsIuL9NvAU4euzMbmKfsTblY6Rw9nL2gZA2Sw="; }; buildInputs = [ libpcap ] @@ -27,13 +27,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A suite of utilities for editing and replaying network traffic"; - homepage = "http://tcpreplay.appneta.com/"; - license = with licenses; [ bsd3 gpl3 ]; + homepage = "https://tcpreplay.appneta.com/"; + license = with licenses; [ bsdOriginalUC gpl3Only ]; maintainers = with maintainers; [ eleanor ]; platforms = platforms.unix; - knownVulnerabilities = [ - "CVE-2020-24265" # https://github.com/appneta/tcpreplay/issues/616 - "CVE-2020-24266" # https://github.com/appneta/tcpreplay/issues/617 - ]; }; } diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index ba3c51822e9..8a4d5d44b8d 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,10 +1,10 @@ {lib, stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }: stdenv.mkDerivation { - name = "DisnixWebService-0.10"; + name = "DisnixWebService-0.10.1"; src = fetchurl { - url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10/DisnixWebService-0.10.tar.gz"; - sha256 = "0m451msd127ay09yb8rbflg68szm8s4hh65j99f7s3mz375vc114"; + url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10.1/DisnixWebService-0.10.1.tar.gz"; + sha256 = "02jxbgn9a0c9cr6knzp78bp9wiywzczy89wav7yxhg79vff8a1gr"; }; buildInputs = [ apacheAnt jdk ]; PREFIX = "\${env.out}"; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 14be0924f27..c7b3b72e2ea 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }: +{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, dysnomia, libintl, libiconv }: stdenv.mkDerivation { - name = "disnix-0.10"; + name = "disnix-0.10.1"; src = fetchurl { - url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10/disnix-0.10.tar.gz"; - sha256 = "0mciqbc2h60nc0i6pd36w0m2yr96v97ybrzrqzh5f67ac1f0gqwg"; + url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10.1/disnix-0.10.1.tar.gz"; + sha256 = "13rjw1va7l8w7ir73xqxq4zb3ig2iwhiwxhp5dbfv0z3gnqizghq"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintl libiconv dysnomia ]; + buildInputs = [ glib libxml2 libxslt getopt libintl libiconv dysnomia ]; meta = { description = "A Nix-based distributed service deployment tool"; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 1b9d2eaefcd..f9a8221e5f0 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, dysnomia, disnix, socat, pkg-config, getopt }: stdenv.mkDerivation { - name = "disnixos-0.9"; + name = "disnixos-0.9.1"; src = fetchurl { - url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9/disnixos-0.9.tar.gz"; - sha256 = "0vllm5a8d9dvz5cjiq1mmkc4r4vnljabq42ng0ml85sjn0w7xvm7"; + url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9.1/disnixos-0.9.1.tar.gz"; + sha256 = "1n2psq1b8bg340i2i0yf5xy2rf78fwqd3wj342wcmq09cv2v8d1b"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/disnix/dydisnix/default.nix b/pkgs/tools/package-management/disnix/dydisnix/default.nix index b4c3851a50f..924ed825281 100644 --- a/pkgs/tools/package-management/disnix/dydisnix/default.nix +++ b/pkgs/tools/package-management/disnix/dydisnix/default.nix @@ -1,25 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool , pkg-config, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix, libnixxml }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib +, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix +}: stdenv.mkDerivation rec { - version="2020-07-04"; + version = "unstable-2020-11-02"; name = "dydisnix-${version}"; src = fetchFromGitHub { owner = "svanderburg"; repo = "dydisnix"; - rev = "e99091f1c2329d562097e35faedee80622d387f0"; - sha256 = "sha256-XKab2hNGtWDkIEMxE1vMvqQBTP9BvHTabBVfzpH57h0="; + rev = "12ca1516bc1e5d161ac68f5d8252a0a2f353c8cf"; + sha256 = "00f341274hwwil8mlgcgq331vfca9sscvpdbgkxsjvbhcqd8qa52"; }; nativeBuildInputs = [ pkg-config autoconf automake libtool ]; - buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext libnixxml ]; + buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext ]; + preConfigure = '' ./bootstrap ''; meta = { description = "A toolset enabling self-adaptive redeployment on top of Disnix"; - longDescription = "Dynamic Disnix is a (very experimental!) prototype extension framework for Disnix supporting dynamic (re)deployment of service-oriented systems."; + longDescription = '' + Dynamic Disnix is a (very experimental!) prototype extension framework for Disnix supporting dynamic (re)deployment of service-oriented systems. + ''; license = lib.licenses.lgpl21Plus; maintainers = [ lib.maintainers.tomberek ]; platforms = lib.platforms.unix; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 56ba16afb47..d75683a8744 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -1,5 +1,11 @@ { lib, stdenv, fetchurl, netcat -, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null + +# Optional packages +, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null +, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null +, nginx ? null, s6-rc ? null, xinetd ? null + +# Configuration flags , enableApacheWebApplication ? false , enableAxis2WebService ? false , enableEjabberdDump ? false @@ -10,7 +16,10 @@ , enableMongoDatabase ? false , enableInfluxDatabase ? false , enableSupervisordProgram ? false -, enableDockerContainer ? true +, enableDockerContainer ? false +, enableNginxWebApplication ? false +, enableXinetdService ? false +, enableS6RCService ? false , enableLegacy ? false , catalinaBaseDir ? "/var/tomcat" , jobTemplate ? "systemd" @@ -25,16 +34,17 @@ assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); assert enableInfluxDatabase -> influxdb != null; assert enableSupervisordProgram -> supervisor != null; assert enableDockerContainer -> docker != null; +assert enableNginxWebApplication -> nginx != null; +assert enableS6RCService -> s6-rc != null; +assert enableXinetdService -> xinetd != null; stdenv.mkDerivation { - name = "dysnomia-0.10"; + name = "dysnomia-0.10.1"; src = fetchurl { - url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10/dysnomia-0.10.tar.gz"; - sha256 = "19zg4nhn0f9v4i7c9hhan1i4xv3ljfpl2d0s84ph8byiscvhyrna"; + url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10.1/dysnomia-0.10.1.tar.gz"; + sha256 = "0w9601g8zpaxrmynx6mh8zz85ldpb8psp7cc6ls8v3srjpj1l5n3"; }; - preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; - configureFlags = [ (if enableApacheWebApplication then "--with-apache" else "--without-apache") (if enableAxis2WebService then "--with-axis2" else "--without-axis2") @@ -47,6 +57,10 @@ stdenv.mkDerivation { (if enableInfluxDatabase then "--with-influxdb" else "--without-influxdb") (if enableSupervisordProgram then "--with-supervisord" else "--without-supervisord") (if enableDockerContainer then "--with-docker" else "--without-docker") + (if enableNginxWebApplication then "--with-nginx" else "--without-nginx") + (if enableXinetdService then "--with-xinetd" else "--without-xinetd") + (if enableS6RCService then "--with-s6-rc" else "--without-s6-rc") + (if stdenv.isDarwin then "--with-launchd" else "--without-launchd") "--with-job-template=${jobTemplate}" ] ++ lib.optional enableLegacy "--enable-legacy"; @@ -56,11 +70,13 @@ stdenv.mkDerivation { ++ lib.optional enableMySQLDatabase mysql.out ++ lib.optional enablePostgreSQLDatabase postgresql ++ lib.optional enableSubversionRepository subversion - ++ lib.optional enableMongoDatabase mongodb - ++ lib.optional enableMongoDatabase mongodb-tools + ++ lib.optionals enableMongoDatabase [ mongodb mongodb-tools ] ++ lib.optional enableInfluxDatabase influxdb ++ lib.optional enableSupervisordProgram supervisor - ++ lib.optional enableDockerContainer docker; + ++ lib.optional enableDockerContainer docker + ++ lib.optional enableNginxWebApplication nginx + ++ lib.optional enableS6RCService s6-rc + ++ lib.optional enableXinetdService xinetd; meta = { description = "Automated deployment of mutable components and services for Disnix"; diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index 446761cca1d..ae9a8714b85 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -3,13 +3,13 @@ gcc9Stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.61.1"; + version = "0.62.0"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "sha256-ad0Q/8FEaSqsuA6tVC5SB4bTrGJY/8Xb8S8zrsDIyVc="; + sha256 = "sha256-Se15VmBbzt/NASjrA25RdpHDVIG/GOSqn6ibpBe752g="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index c47afcd8e0f..3cd4ae69b9f 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "7.4.1"; + version = "7.5.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GoHntsyxrMzLHlyKC3JxCkLoquIjOtidcG7hTNTYGuI="; + sha256 = "sha256-s7EOCoGciGT5+Fose9BffsHHE/SsSMmNoWGmeAv6Agk="; }; vendorSha256 = "sha256-Cc4DJPpOMHxDcH22S7znYo7QHNRXv8jOJhznu09kaE4="; diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index e8ddf6bb0bc..def3a953a04 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "v${version}"; - sha256 = "sha256-E7HGE+ZVUF6AK+4qVsO2t+/B8hRMd14/bZW2WXA6p6E="; + sha256 = "sha256-zwQDPOpctnAj6J6mQ4N7O1KJiAIu6osB/IlnM0D/hZA="; }; - vendorSha256 = "sha256-VBxGapvC2QE/0slsAiCBzmwOSMeGepZU0pYVDepSrwg="; + vendorSha256 = "sha256-Cb7RomQ/+O9xgUlCudoj7zLd2vrs58d00/vk/EboJ6Q="; meta = with lib; { description = "Fast and multi-purpose HTTP toolkit"; diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix index 4e9b24818b4..54c9bfa1f4b 100644 --- a/pkgs/tools/security/kbs2/default.nix +++ b/pkgs/tools/security/kbs2/default.nix @@ -1,24 +1,24 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles, python3, libxcb, AppKit }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles, python3, libxcb, AppKit, libiconv }: rustPlatform.buildRustPackage rec { pname = "kbs2"; - version = "0.2.6"; + version = "0.3.0"; src = fetchFromGitHub { owner = "woodruffw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PtXTC0VufUR5kle9C5KhCHHEQtQZvTTU1Q/cRMCB1g0="; + sha256 = "sha256-Mh56VjFHwjiZ0fvOF3fFw+1IU5HwkRdMlFrt3tZjcZY="; }; - cargoSha256 = "sha256-S2czYglyHRkRN3Dq5reXFOaB1i/oIHXTY8Ile+Twvzo="; + cargoSha256 = "sha256-hjUDLA5vNCCIEFQsAhv3hDur1LIGQKYO2rR6AoEb+wA="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ python3 ]; buildInputs = [ ] ++ lib.optionals stdenv.isLinux [ libxcb ] - ++ lib.optionals stdenv.isDarwin [ AppKit ]; + ++ lib.optionals stdenv.isDarwin [ AppKit libiconv ]; preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index da654e74f9b..42dc9db651e 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.3.4"; + version = "2.3.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qjbr3kTgIFdxyzRwSvWyh5krrlzD8i1nMeoLZYSbr6g="; + sha256 = "sha256-9C/r1B+lEveRHRLgD0ay9xhi6100c/SGfUaiP7qwstc="; }; - vendorSha256 = "sha256-qmuua7HXnwuy24CSqHKALqNDmXBvSIXYTVu3kaGVoeU="; + vendorSha256 = "sha256-GAJxEBLZmbSmCeuAEYIHQ4xEzbTJYlJU+JCAL5hlVzY="; modRoot = "./v2"; subPackages = [ diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index bd360a24261..c96f92bedfe 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -8,6 +8,7 @@ , withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct , withSsl ? true, openssl , withDebug ? false +, fetchpatch }: with lib; @@ -15,14 +16,14 @@ with lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.29.3"; + version = "1.30.1"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "sha256-GWIQZEC5agJ+Zw7l58IIAJhXP6dxirCmWVBJulzBO5Q="; + sha256 = "0cp6gbn38f1cr0jkr64vvwz005cvnwj3hgfxs147wap9w228k46r"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -39,6 +40,11 @@ in stdenv.mkDerivation rec { # required to prevent plugins from relying on /etc # and /var ./no-files-in-etc-and-var.patch + # cgroups: fix network interfaces detection when using virsh + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/netdata/netdata/pull/11096.patch"; + sha256 = "0f2rd7kgbwbyq9wyn085d213ifvivnpl3qlx1gjrg42rkbi4n8jj"; + }) ]; NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index 3b97747f879..9efb3475a48 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "netdata-go.d.plugin"; - version = "0.26.2"; + version = "0.28.1"; src = fetchFromGitHub { owner = "netdata"; repo = "go.d.plugin"; rev = "v${version}"; - sha256 = "1jy5pc1ihyrg6sqyw0d48bsqa7kr7kqz10k3845g958vgfmfig59"; + sha256 = "0i77nvqi3dcby0gr3b06bai170q2ibp5390qfjijrk1yqz6x6sd5"; }; - vendorSha256 = "16b6i9cpk8j7292qgjvida70rg7nixi6g94wayzikx01vmdbis5r"; + vendorSha256 = "1q8z4smaxzqd5iwvbnkkr33c3b94rjwa3xjirwlr595g0wn93wc7"; doCheck = false; diff --git a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch index 594805fdf18..1d0c5cfba58 100644 --- a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch +++ b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch @@ -1,28 +1,8 @@ -From 4ecc1475be94a384c122594b5f7d455beb64a2f0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -Date: Sat, 22 Feb 2020 06:42:14 +0000 -Subject: [PATCH] no files in etc and var -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - collectors/Makefile.am | 2 +- - collectors/charts.d.plugin/Makefile.am | 2 +- - collectors/node.d.plugin/Makefile.am | 2 +- - collectors/python.d.plugin/Makefile.am | 2 +- - collectors/statsd.plugin/Makefile.am | 2 +- - health/Makefile.am | 2 +- - system/Makefile.am | 3 +-- - web/Makefile.am | 2 +- - 8 files changed, 8 insertions(+), 9 deletions(-) - diff --git a/collectors/Makefile.am b/collectors/Makefile.am -index 9bb52958..c9799165 100644 +index 021e2ff23..115b88277 100644 --- a/collectors/Makefile.am +++ b/collectors/Makefile.am -@@ -32,7 +32,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d +@@ -33,7 +33,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d usergoconfigdir=$(configdir)/go.d # Explicitly install directories to avoid permission issues due to umask @@ -32,7 +12,7 @@ index 9bb52958..c9799165 100644 $(INSTALL) -d $(DESTDIR)$(usergoconfigdir) diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am -index 03c7f0a9..01985db0 100644 +index 03c7f0a94..01985db01 100644 --- a/collectors/charts.d.plugin/Makefile.am +++ b/collectors/charts.d.plugin/Makefile.am @@ -34,7 +34,7 @@ dist_userchartsconfig_DATA = \ @@ -44,8 +24,21 @@ index 03c7f0a9..01985db0 100644 $(INSTALL) -d $(DESTDIR)$(userchartsconfigdir) chartsconfigdir=$(libconfigdir)/charts.d +diff --git a/collectors/ebpf.plugin/Makefile.am b/collectors/ebpf.plugin/Makefile.am +index 18b1fc6c8..b4b0c7852 100644 +--- a/collectors/ebpf.plugin/Makefile.am ++++ b/collectors/ebpf.plugin/Makefile.am +@@ -13,7 +13,7 @@ SUFFIXES = .in + userebpfconfigdir=$(configdir)/ebpf.d + + # Explicitly install directories to avoid permission issues due to umask +-install-exec-local: ++no-install-exec-local: + $(INSTALL) -d $(DESTDIR)$(userebpfconfigdir) + + dist_plugins_SCRIPTS = \ diff --git a/collectors/node.d.plugin/Makefile.am b/collectors/node.d.plugin/Makefile.am -index c3142d43..95e32445 100644 +index c3142d433..95e324455 100644 --- a/collectors/node.d.plugin/Makefile.am +++ b/collectors/node.d.plugin/Makefile.am @@ -26,7 +26,7 @@ dist_usernodeconfig_DATA = \ @@ -58,7 +51,7 @@ index c3142d43..95e32445 100644 nodeconfigdir=$(libconfigdir)/node.d diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am -index e678f86a..29a319da 100644 +index 38eb90f79..ce7079441 100644 --- a/collectors/python.d.plugin/Makefile.am +++ b/collectors/python.d.plugin/Makefile.am @@ -32,7 +32,7 @@ dist_userpythonconfig_DATA = \ @@ -71,10 +64,10 @@ index e678f86a..29a319da 100644 pythonconfigdir=$(libconfigdir)/python.d diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am -index b01302d1..f5b77da4 100644 +index 71f2d468d..2c9ced2bf 100644 --- a/collectors/statsd.plugin/Makefile.am +++ b/collectors/statsd.plugin/Makefile.am -@@ -17,5 +17,5 @@ dist_userstatsdconfig_DATA = \ +@@ -18,5 +18,5 @@ dist_userstatsdconfig_DATA = \ $(NULL) # Explicitly install directories to avoid permission issues due to umask @@ -82,7 +75,7 @@ index b01302d1..f5b77da4 100644 +no-install-exec-local: $(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir) diff --git a/health/Makefile.am b/health/Makefile.am -index 853ed0d7..210330a6 100644 +index b963ea0cd..6979e69bf 100644 --- a/health/Makefile.am +++ b/health/Makefile.am @@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \ @@ -95,10 +88,10 @@ index 853ed0d7..210330a6 100644 healthconfigdir=$(libconfigdir)/health.d diff --git a/system/Makefile.am b/system/Makefile.am -index ad68c655..74f032f9 100644 +index 5323738c9..06e1b6a73 100644 --- a/system/Makefile.am +++ b/system/Makefile.am -@@ -17,11 +17,10 @@ include $(top_srcdir)/build/subst.inc +@@ -20,11 +20,10 @@ include $(top_srcdir)/build/subst.inc SUFFIXES = .in dist_config_SCRIPTS = \ @@ -112,7 +105,7 @@ index ad68c655..74f032f9 100644 nodist_noinst_DATA = \ diff --git a/web/Makefile.am b/web/Makefile.am -index ccaccd76..16a2977e 100644 +index ccaccd764..16a2977e5 100644 --- a/web/Makefile.am +++ b/web/Makefile.am @@ -12,7 +12,7 @@ SUBDIRS = \ @@ -124,6 +117,3 @@ index ccaccd76..16a2977e 100644 $(INSTALL) -d $(DESTDIR)$(usersslconfigdir) dist_noinst_DATA = \ --- -2.25.0 - diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/tools/text/gtranslator/default.nix index bf825a55059..8408d42da1b 100644 --- a/pkgs/tools/text/gtranslator/default.nix +++ b/pkgs/tools/text/gtranslator/default.nix @@ -9,6 +9,7 @@ , wrapGAppsHook , libxml2 , libgda +, libhandy , libsoup , json-glib , gspell @@ -22,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gtranslator"; - version = "3.38.0"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "282puBoi2SM74Y6Z/VxEj2qwV1nR6UwQWAu4McotdjU="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0d48nc11z0m91scy21ah56ysxns82zvswx8lglvlkig1vqvblgpc"; }; nativeBuildInputs = [ @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { libdazzle gtksourceview4 libgda + libhandy libsoup json-glib gettext diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 887b1a0caaf..56f6be15e49 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -352,6 +352,7 @@ mapAliases ({ kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # 2020-04-28 kicad-with-packages3d = kicad; # added 2019-11-25 kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download."; # 2021-03-09 + kino = throw "kino has been removed because it was broken and abandoned"; # added 2021-04-25 krename-qt5 = krename; # added 2017-02-18 kerberos = libkrb5; # moved from top-level 2021-03-14 keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10 @@ -796,7 +797,6 @@ mapAliases ({ torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # added 2020-03-28 torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # added 2020-03-28 trang = jing-trang; # added 2018-04-25 - transcribe = throw "transcribe has been removed after being marked a broken for over a year"; # added 2020-09-16 transmission_gtk = transmission-gtk; # added 2018-01-06 transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 transmission-remote-cli = "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # added 2020-10-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50b6c680320..b4deabfc4cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -637,6 +637,8 @@ in wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { }; + wrapGAppsHook4 = wrapGAppsHook.override { gtk3 = gtk4; }; + wrapGAppsNoGuiHook = wrapGAppsHook.override { isGraphical = false; }; separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; @@ -693,9 +695,7 @@ in acousticbrainz-client = callPackage ../tools/audio/acousticbrainz-client { }; - acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { - ffmpeg = ffmpeg_2; - }; + acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { }; alsaequal = callPackage ../tools/audio/alsaequal { }; @@ -5955,6 +5955,8 @@ in kpcli = callPackage ../tools/security/kpcli { }; + kratos = callPackage ../applications/misc/kratos { }; + krename = libsForQt5.callPackage ../applications/misc/krename { }; krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { }; @@ -7204,8 +7206,8 @@ in onlykey-cli = callPackage ../tools/security/onlykey-cli { }; - openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { }; - openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { }; + openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; }; + openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { jre = pkgs.jre_headless; }; openbazaar = callPackage ../applications/networking/openbazaar { }; openbazaar-client = callPackage ../applications/networking/openbazaar/client.nix { }; @@ -8458,6 +8460,8 @@ in snapcast = callPackage ../applications/audio/snapcast { }; + snapdragon-profiler = callPackage ../tools/graphics/snapdragon-profiler { }; + sng = callPackage ../tools/graphics/sng { libpng = libpng12; }; @@ -10395,15 +10399,7 @@ in # The GCC used to build libc for the target platform. Normal gccs will be # built with, and use, that cross-compiled libc. gccCrossStageStatic = assert stdenv.targetPlatform != stdenv.hostPlatform; let - libcCross1 = - if stdenv.targetPlatform.libc == "msvcrt" then targetPackages.windows.mingw_w64_headers - else if stdenv.targetPlatform.libc == "libSystem" then darwin.xcode - else if stdenv.targetPlatform.libc == "nblibc" then netbsd.headers - else null; - binutils1 = wrapBintoolsWith { - bintools = binutils-unwrapped; - libc = libcCross1; - }; + libcCross1 = binutilsNoLibc.libc; in wrapCCWith { cc = gccFun { # copy-pasted @@ -10416,10 +10412,10 @@ in crossStageStatic = true; langCC = false; libcCross = libcCross1; - targetPackages.stdenv.cc.bintools = binutils1; + targetPackages.stdenv.cc.bintools = binutilsNoLibc; enableShared = false; }; - bintools = binutils1; + bintools = binutilsNoLibc; libc = libcCross1; extraPackages = []; }; @@ -11674,6 +11670,7 @@ in vala_0_46 vala_0_48 vala_0_50 + vala_0_52 vala; vyper = with python3Packages; toPythonApplication vyper; @@ -12308,6 +12305,9 @@ in newlib = newlibCross; }; + mspds = callPackage ../development/misc/msp430/mspds { }; + mspds-bin = callPackage ../development/misc/msp430/mspds/binary.nix { }; + mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { }; vc4-newlib = callPackage ../development/misc/vc4/newlib.nix {}; @@ -12352,6 +12352,8 @@ in alloy5 alloy; + altair = callPackage ../development/tools/altair-graphql-client { }; + ameba = callPackage ../development/tools/ameba { }; augeas = callPackage ../tools/system/augeas { }; @@ -12532,6 +12534,14 @@ in gold = false; }; }); + binutilsNoLibc = wrapBintoolsWith { + bintools = binutils-unwrapped; + libc = + /**/ if stdenv.targetPlatform.libc == "msvcrt" then targetPackages.windows.mingw_w64_headers + else if stdenv.targetPlatform.libc == "libSystem" then darwin.xcode + else if stdenv.targetPlatform.libc == "nblibc" then targetPackages.netbsdCross.headers + else null; + }; bison = callPackage ../development/tools/parsing/bison { }; @@ -13486,7 +13496,9 @@ in sconsPackages = dontRecurseIntoAttrs (callPackage ../development/tools/build-managers/scons { }); scons = sconsPackages.scons_latest; - mill = callPackage ../development/tools/build-managers/mill { }; + mill = callPackage ../development/tools/build-managers/mill { + jre = jre8; + }; sbt = callPackage ../development/tools/build-managers/sbt { }; sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { }; @@ -14850,6 +14862,10 @@ in glibmm = callPackage ../development/libraries/glibmm { }; + glibmm_2_68 = callPackage ../development/libraries/glibmm/2.68.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + glib-networking = callPackage ../development/libraries/glib-networking {}; glib-testing = callPackage ../development/libraries/glib-testing { }; @@ -14870,6 +14886,8 @@ in cairomm = callPackage ../development/libraries/cairomm { }; + cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix { }; + pango = callPackage ../development/libraries/pango { harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; }; @@ -14882,6 +14900,10 @@ in inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; + pangomm_2_48 = callPackage ../development/libraries/pangomm/2.48.nix { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; + gdata-sharp = callPackage ../development/libraries/gdata-sharp { }; gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; @@ -14922,6 +14944,7 @@ in gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; + gtkmm4 = callPackage ../development/libraries/gtkmm/4.x.nix { }; gtk_engines = callPackage ../development/libraries/gtk-engines { }; @@ -14961,6 +14984,8 @@ in gtksourceview4 = callPackage ../development/libraries/gtksourceview/4.x.nix { }; + gtksourceview5 = callPackage ../development/libraries/gtksourceview/5.x.nix { }; + gtksourceviewmm = callPackage ../development/libraries/gtksourceviewmm { }; gtksourceviewmm4 = callPackage ../development/libraries/gtksourceviewmm/4.x.nix { }; @@ -15535,6 +15560,8 @@ in libdeflate = callPackage ../development/libraries/libdeflate { }; + libdeltachat = callPackage ../development/libraries/libdeltachat { }; + libdevil = callPackage ../development/libraries/libdevil { inherit (darwin.apple_sdk.frameworks) OpenGL; }; @@ -16228,7 +16255,10 @@ in libroxml = callPackage ../development/libraries/libroxml { }; - librsvg = callPackage ../development/libraries/librsvg { }; + librsvg = callPackage ../development/libraries/librsvg { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; + }; librsync = callPackage ../development/libraries/librsync { }; @@ -16246,6 +16276,8 @@ in libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { }; + libsigcxx30 = callPackage ../development/libraries/libsigcxx/3.0.nix { }; + libsigsegv = callPackage ../development/libraries/libsigsegv { }; libslirp = callPackage ../development/libraries/libslirp { }; @@ -16705,7 +16737,9 @@ in libmpc = callPackage ../development/libraries/libmpc { }; - mpich = callPackage ../development/libraries/mpich { }; + mpich = callPackage ../development/libraries/mpich { + ch4backend = libfabric; + }; mstpd = callPackage ../os-specific/linux/mstpd { }; @@ -17098,6 +17132,8 @@ in portmidi = callPackage ../development/libraries/portmidi {}; + presage = callPackage ../development/libraries/presage { }; + prime-server = callPackage ../development/libraries/prime-server { }; primesieve = callPackage ../development/libraries/science/math/primesieve { }; @@ -20258,7 +20294,7 @@ in facetimehd = callPackage ../os-specific/linux/facetimehd { }; - tuxedo-keyboard = callPackage ../os-specific/linux/tuxedo-keyboard { }; + tuxedo-keyboard = if lib.versionAtLeast kernel.version "4.14" then callPackage ../os-specific/linux/tuxedo-keyboard { } else null; jool = callPackage ../os-specific/linux/jool { }; @@ -20787,7 +20823,7 @@ in prototool = callPackage ../development/tools/prototool { }; qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; }); - qemu_full = lowPrio (qemu.override { smbdSupport = true; cephSupport = true; }); + qemu_full = lowPrio (qemu.override { smbdSupport = true; cephSupport = true; glusterfsSupport = true; }); # See `xenPackages` source for explanations. # Building with `xen` instead of `xen-slim` is possible, but makes no sense. @@ -21076,6 +21112,10 @@ in wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { }; + wpa_supplicant_ro_ssids = wpa_supplicant.override { + readOnlyModeSSIDs = true; + }; + wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { }; xf86_input_cmt = callPackage ../os-specific/linux/xf86-input-cmt { }; @@ -22156,9 +22196,7 @@ in audacious = libsForQt5.callPackage ../applications/audio/audacious { }; audaciousQt5 = audacious; - audacity-gtk2 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; }; - audacity-gtk3 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk3; }; - audacity = audacity-gtk2; + audacity = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; }; audio-recorder = callPackage ../applications/audio/audio-recorder { }; @@ -22496,7 +22534,6 @@ in cmus = callPackage ../applications/audio/cmus { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio; libjack = libjack2; - ffmpeg = ffmpeg_2; }; cmusfm = callPackage ../applications/audio/cmusfm { }; @@ -24013,7 +24050,7 @@ in }); imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; + inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; }); inherit (nodePackages) imapnotify; @@ -24160,6 +24197,8 @@ in kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { }; + kdeltachat = libsForQt5.callPackage ../applications/networking/instant-messengers/kdeltachat { }; + kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { @@ -24203,11 +24242,6 @@ in kile = libsForQt5.callPackage ../applications/editors/kile { }; - kino = callPackage ../applications/video/kino { - inherit (gnome2) libglade; - ffmpeg = ffmpeg_2; - }; - kitsas = libsForQt5.callPackage ../applications/office/kitsas { }; kiwix = libsForQt5.callPackage ../applications/misc/kiwix { }; @@ -25285,7 +25319,7 @@ in owamp = callPackage ../applications/networking/owamp { }; vieb = callPackage ../applications/networking/browsers/vieb { - electron = electron_11; + electron = electron_12; }; vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; @@ -25793,6 +25827,8 @@ in reaper = callPackage ../applications/audio/reaper { }; + recapp = callPackage ../applications/video/recapp { }; + recode = callPackage ../tools/text/recode { }; reddsaver = callPackage ../applications/misc/reddsaver { @@ -26447,6 +26483,8 @@ in transcode = callPackage ../applications/audio/transcode { }; + transcribe = callPackage ../applications/audio/transcribe { }; + transmission = callPackage ../applications/networking/p2p/transmission { }; libtransmission = transmission.override { installLib = true; @@ -27543,7 +27581,7 @@ in zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; }; - openethereum = callPackage ../applications/blockchains/openethereum { }; + openethereum = callPackage ../applications/blockchains/openethereum { stdenv = llvmPackages_12.stdenv; }; parity-ui = callPackage ../applications/blockchains/parity-ui { }; @@ -27573,7 +27611,7 @@ in airstrike = callPackage ../games/airstrike { }; - alephone = callPackage ../games/alephone { ffmpeg = ffmpeg_2; }; + alephone = callPackage ../games/alephone { }; alephone-durandal = callPackage ../games/alephone/durandal { }; alephone-eternal = callPackage ../games/alephone/eternal { }; alephone-evil = callPackage ../games/alephone/evil { }; @@ -28439,9 +28477,7 @@ in ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { }; - ultrastardx = callPackage ../games/ultrastardx { - ffmpeg = ffmpeg_2; - }; + ultrastardx = callPackage ../games/ultrastardx { }; unciv = callPackage ../games/unciv { }; @@ -28630,6 +28666,7 @@ in freon = callPackage ../desktops/gnome-3/extensions/freon { }; fuzzy-app-search = callPackage ../desktops/gnome-3/extensions/fuzzy-app-search { }; gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { }; + hot-edge = callPackage ../desktops/gnome-3/extensions/hot-edge { }; icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { }; impatience = callPackage ../desktops/gnome-3/extensions/impatience { }; material-shell = callPackage ../desktops/gnome-3/extensions/material-shell { }; @@ -31266,9 +31303,7 @@ in bottom = callPackage ../tools/system/bottom {}; - cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix { - wlroots = wlroots_0_12; - }; + cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix { }; psftools = callPackage ../os-specific/linux/psftools {}; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 2cd2965fc61..6da0598c6ac 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -70,9 +70,11 @@ let tlc = callPackage ../development/coq-modules/tlc {}; Velisarios = callPackage ../development/coq-modules/Velisarios {}; Verdi = callPackage ../development/coq-modules/Verdi {}; - VST = callPackage ../development/coq-modules/VST { - compcert = compcert.override { version = "3.7"; }; - }; + VST = callPackage ../development/coq-modules/VST (with lib.versions; + lib.switch coq.coq-version [ + { case = "8.11"; out = { compcert = compcert.override { coqPackages = self; version = "3.7"; }; }; } + { case = range "8.12" "8.13"; out = { compcert = compcert.override { coqPackages = self; }; }; } + ] {}); filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self; }; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 3ece95c5845..5275a6f3123 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -1,27 +1,44 @@ -{ buildPackages, pkgs, targetPackages -, darwin, stdenv, callPackage, callPackages, newScope +{ lib +, buildPackages, pkgs, targetPackages +, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget +, stdenv, splicePackages, newScope }: let - apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { }; + otherSplices = { + selfBuildBuild = pkgsBuildBuild.darwin; + selfBuildHost = pkgsBuildHost.darwin; + selfBuildTarget = pkgsBuildTarget.darwin; + selfHostHost = pkgsHostHost.darwin; + selfTargetTarget = pkgsTargetTarget.darwin or {}; # might be missing + }; - impure-cmds = callPackage ../os-specific/darwin/impure-cmds { }; in -(impure-cmds // apple-source-releases // { +lib.makeScopeWithSplicing splicePackages newScope otherSplices (_: {}) (spliced: spliced.apple_sdk.frameworks) (self: let + inherit (self) mkDerivation callPackage; - callPackage = newScope (darwin.apple_sdk.frameworks // darwin); + # Must use pkgs.callPackage to avoid infinite recursion. + + apple-source-releases = pkgs.callPackage ../os-specific/darwin/apple-source-releases { } self; + + impure-cmds = pkgs.callPackage ../os-specific/darwin/impure-cmds { }; + + apple_sdk = pkgs.callPackage ../os-specific/darwin/apple-sdk { + inherit (buildPackages.darwin) print-reexports; + inherit (self) darwin-stubs; + }; +in + +impure-cmds // apple-source-releases // { + + inherit apple_sdk; stdenvNoCF = stdenv.override { extraBuildInputs = []; }; - apple_sdk = callPackage ../os-specific/darwin/apple-sdk { - inherit (darwin) darwin-stubs print-reexports; - }; - binutils-unwrapped = callPackage ../os-specific/darwin/binutils { - inherit (darwin) cctools; inherit (pkgs) binutils-unwrapped; inherit (pkgs.llvmPackages_7) llvm clang-unwrapped; }; @@ -31,17 +48,21 @@ in if stdenv.targetPlatform != stdenv.hostPlatform then pkgs.libcCross else pkgs.stdenv.cc.libc; - bintools = darwin.binutils-unwrapped; + bintools = self.binutils-unwrapped; + }; + + binutilsNoLibc = pkgs.wrapBintoolsWith { + libc = null; + bintools = self.binutils-unwrapped; }; cctools = callPackage ../os-specific/darwin/cctools/port.nix { - inherit (darwin) libobjc maloader libtapi; stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv; libcxxabi = pkgs.libcxxabi; }; # TODO: remove alias. - cf-private = darwin.apple_sdk.frameworks.CoreFoundation; + cf-private = self.apple_sdk.frameworks.CoreFoundation; DarwinTools = callPackage ../os-specific/darwin/DarwinTools { }; @@ -50,15 +71,13 @@ in print-reexports = callPackage ../os-specific/darwin/apple-sdk/print-reexports { }; maloader = callPackage ../os-specific/darwin/maloader { - inherit (darwin) opencflite; }; insert_dylib = callPackage ../os-specific/darwin/insert_dylib { }; - iosSdkPkgs = darwin.callPackage ../os-specific/darwin/xcode/sdk-pkgs.nix { + iosSdkPkgs = callPackage ../os-specific/darwin/xcode/sdk-pkgs.nix { buildIosSdk = buildPackages.darwin.iosSdkPkgs.sdk; targetIosSdkPkgs = targetPackages.darwin.iosSdkPkgs; - xcode = darwin.xcode; inherit (pkgs.llvmPackages) clang-unwrapped; }; @@ -70,13 +89,13 @@ in opencflite = callPackage ../os-specific/darwin/opencflite { }; - stubs = callPackages ../os-specific/darwin/stubs { }; + stubs = pkgs.callPackages ../os-specific/darwin/stubs { }; - trash = darwin.callPackage ../os-specific/darwin/trash { }; + trash = callPackage ../os-specific/darwin/trash { }; usr-include = callPackage ../os-specific/darwin/usr-include { }; - inherit (callPackages ../os-specific/darwin/xcode { }) + inherit (pkgs.callPackages ../os-specific/darwin/xcode { }) xcode_8_1 xcode_8_2 xcode_9_1 xcode_9_2 xcode_9_4 xcode_9_4_1 xcode_10_2 xcode_10_2_1 xcode_10_3 @@ -85,10 +104,10 @@ in CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { }; - CF = callPackage ../os-specific/darwin/swift-corelibs/corefoundation.nix { inherit (darwin) objc4 ICU; }; + CF = callPackage ../os-specific/darwin/swift-corelibs/corefoundation.nix { }; # As the name says, this is broken, but I don't want to lose it since it's a direction we want to go in - # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { inherit (darwin) apple_sdk_sierra xnu; }; + # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { }; darling = callPackage ../os-specific/darwin/darling/default.nix { }; @@ -96,8 +115,6 @@ in ios-deploy = callPackage ../os-specific/darwin/ios-deploy {}; - discrete-scroll = callPackage ../os-specific/darwin/discrete-scroll { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; + discrete-scroll = callPackage ../os-specific/darwin/discrete-scroll { }; }) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9dc9444e096..e7c83018327 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3907,6 +3907,20 @@ let }; }; + CryptArgon2 = perlPackages.buildPerlModule { + pname = "Crypt-Argon2"; + version = "0.010"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Argon2-0.010.tar.gz"; + sha256 = "3ea1c006f10ef66fd417e502a569df15c4cc1c776b084e35639751c41ce6671a"; + }; + nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; + meta = { + description = "Perl interface to the Argon2 key derivation functions"; + license = lib.licenses.cc0; + }; + }; + CryptBlowfish = buildPerlPackage { pname = "Crypt-Blowfish"; version = "2.14"; @@ -4081,6 +4095,33 @@ let }; }; + CryptPassphrase = buildPerlPackage { + pname = "Crypt-Passphrase"; + version = "0.003"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Passphrase-0.003.tar.gz"; + sha256 = "685aa090f8179a86d6896212ccf8ccfde7a79cce857199bb14e2277a10d240ad"; + }; + meta = { + description = "A module for managing passwords in a cryptographically agile manner"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + CryptPassphraseArgon2 = buildPerlPackage { + pname = "Crypt-Passphrase-Argon2"; + version = "0.002"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Passphrase-Argon2-0.002.tar.gz"; + sha256 = "3906ff81697d13804ee21bd5ab78ffb1c4408b4822ce020e92ecf4737ba1f3a8"; + }; + propagatedBuildInputs = with perlPackages; [ CryptArgon2 CryptPassphrase ]; + meta = { + description = "An Argon2 encoder for Crypt::Passphrase"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CryptPasswdMD5 = buildPerlModule { pname = "Crypt-PasswdMD5"; version = "1.40"; @@ -18819,6 +18860,19 @@ let }; }; + StringCompareConstantTime = buildPerlPackage { + pname = "String-Compare-ConstantTime"; + version = "0.321"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FR/FRACTAL/String-Compare-ConstantTime-0.321.tar.gz"; + sha256 = "0b26ba2b121d8004425d4485d1d46f59001c83763aa26624dff6220d7735d7f7"; + }; + meta = { + description = "Timing side-channel protected string compare"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + StringCRC32 = buildPerlPackage { pname = "String-CRC32"; version = "2"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 3bbcb453a3c..6aa23a22713 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -31,6 +31,8 @@ lib.makeScope pkgs.newScope (self: with self; { composer1 = callPackage ../development/php-packages/composer/1.x.nix { }; + deployer = callPackage ../development/php-packages/deployer { }; + php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { }; php-parallel-lint = callPackage ../development/php-packages/php-parallel-lint { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 19d2a40dce6..ad9350093a2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -845,6 +845,8 @@ in { azure-mgmt-servicefabric = callPackage ../development/python-modules/azure-mgmt-servicefabric { }; + azure-mgmt-servicefabricmanagedclusters = callPackage ../development/python-modules/azure-mgmt-servicefabricmanagedclusters { }; + azure-mgmt-signalr = callPackage ../development/python-modules/azure-mgmt-signalr { }; azure-mgmt-sql = callPackage ../development/python-modules/azure-mgmt-sql { }; @@ -1733,6 +1735,8 @@ in { decorator = callPackage ../development/python-modules/decorator { }; + decopatch = callPackage ../development/python-modules/decopatch { }; + deep_merge = callPackage ../development/python-modules/deep_merge { }; deepdiff = callPackage ../development/python-modules/deepdiff { }; @@ -1751,6 +1755,8 @@ in { delegator-py = callPackage ../development/python-modules/delegator-py { }; + deltachat = callPackage ../development/python-modules/deltachat { }; + deluge-client = callPackage ../development/python-modules/deluge-client { }; demjson = callPackage ../development/python-modules/demjson { }; @@ -2979,6 +2985,8 @@ in { hachoir = callPackage ../development/python-modules/hachoir { }; + hdate = callPackage ../development/python-modules/hdate { }; + ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; halo = callPackage ../development/python-modules/halo { }; @@ -6265,6 +6273,8 @@ in { pytest-cache = self.pytestcache; # added 2021-01-04 pytestcache = callPackage ../development/python-modules/pytestcache { }; + pytest-cases = callPackage ../development/python-modules/pytest-cases{ }; + pytest-catchlog = callPackage ../development/python-modules/pytest-catchlog { }; pytest-celery = callPackage ../development/python-modules/pytest-celery { }; @@ -7886,6 +7896,8 @@ in { tailer = callPackage ../development/python-modules/tailer { }; + tappy = callPackage ../development/python-modules/tappy { }; + tasklib = callPackage ../development/python-modules/tasklib { }; taskw = callPackage ../development/python-modules/taskw { }; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index e73eba8e142..32559c0e799 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -25,7 +25,7 @@ self: super: let }; in stdenv // { mkDerivation = args: stdenv.mkDerivation (args // { NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") - + optionalString stdenv.cc.isGNU " -static-libgcc"; + + optionalString (stdenv_.cc.isGNU or false) " -static-libgcc"; nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ (makeSetupHook { substitutions = { libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib";