diff --git a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md index 1bcb6e4521..738d7bad27 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md @@ -70,6 +70,40 @@ The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given ## Packaging a Dotnet Application {#packaging-a-dotnet-application} -Ideally, we would like to build against the sdk, then only have the dotnet runtime available in the runtime closure. +To package Dotnet applications, you can use `buildDotnetModule`. This has similar arguments to `stdenv.mkDerivation`, with the following additions: -TODO: Create closure-friendly way to package dotnet applications +* `projectFile` has to be used for specifying the dotnet project file relative to the source root. These usually have `.sln` or `.csproj` file extensions. +* `nugetDeps` has to be used to specify the NuGet dependency file. Unfortunately, these cannot be deterministically fetched without a lockfile. This file should be generated using `nuget-to-nix` tool, which is available in nixpkgs. +* `executables` is used to specify which executables get wrapped to `$out/bin`, relative to `$out/lib/$pname`. If this is unset, all executables generated will get installed. If you do not want to install any, set this to `[]`. +* `runtimeDeps` is used to wrap libraries into `LD_LIBRARY_PATH`. This is how dotnet usually handles runtime dependencies. +* `buildType` is used to change the type of build. Possible values are `Release`, `Debug`, etc. By default, this is set to `Release`. +* `dotnet-sdk` is useful in cases where you need to change what dotnet SDK is being used. +* `dotnet-runtime` is useful in cases where you need to change what dotnet runtime is being used. +* `dotnetRestoreFlags` can be used to pass flags to `dotnet restore`. +* `dotnetBuildFlags` can be used to pass flags to `dotnet build`. +* `dotnetInstallFlags` can be used to pass flags to `dotnet install`. +* `dotnetFlags` can be used to pass flags to all of the above phases. + +Here is an example `default.nix`, using some of the previously discussed arguments: +```nix +{ lib, buildDotnetModule, dotnetCorePackages, ffmpeg }: + +buildDotnetModule rec { + pname = "someDotnetApplication"; + version = "0.1"; + + src = ./.; + + projectFile = "src/project.sln"; + nugetDeps = ./deps.nix; # File generated with `nuget-to-nix path/to/src > deps.nix`. + + dotnet-sdk = dotnetCorePackages.sdk_3_1; + dotnet-runtime = dotnetCorePackages.net_5_0; + dotnetFlags = [ "--runtime linux-x64" ]; + + executables = [ "foo" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`. + executables = []; # Don't install any executables. + + runtimeDeps = [ ffmpeg ]; # This will wrap ffmpeg's library path into `LD_LIBRARY_PATH`. +} +``` diff --git a/third_party/nixpkgs/doc/languages-frameworks/index.xml b/third_party/nixpkgs/doc/languages-frameworks/index.xml index b010f27cac..f221693e76 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/index.xml +++ b/third_party/nixpkgs/doc/languages-frameworks/index.xml @@ -12,6 +12,7 @@ + diff --git a/third_party/nixpkgs/lib/trivial.nix b/third_party/nixpkgs/lib/trivial.nix index 7956ba4bde..a389c7cdfa 100644 --- a/third_party/nixpkgs/lib/trivial.nix +++ b/third_party/nixpkgs/lib/trivial.nix @@ -303,7 +303,26 @@ rec { # TODO: figure out a clever way to integrate location information from # something like __unsafeGetAttrPos. - warn = msg: builtins.trace "warning: ${msg}"; + /* + Print a warning before returning the second argument. This function behaves + like `builtins.trace`, but requires a string message and formats it as a + warning, including the `warning: ` prefix. + + To get a call stack trace and abort evaluation, set the environment variable + `NIX_ABORT_ON_WARN=true` and set the Nix options `--option pure-eval false --show-trace` + + Type: string -> a -> a + */ + warn = + if lib.elem (builtins.getEnv "NIX_ABORT_ON_WARN") ["1" "true" "yes"] + then msg: builtins.trace "warning: ${msg}" (abort "NIX_ABORT_ON_WARN=true; warnings are treated as unrecoverable errors.") + else msg: builtins.trace "warning: ${msg}"; + + /* + Like warn, but only warn when the first argument is `true`. + + Type: bool -> string -> a -> a + */ warnIf = cond: msg: if cond then warn msg else id; info = msg: builtins.trace "INFO: ${msg}"; diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index db28cc6056..8174b36839 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -440,6 +440,12 @@ githubId = 173595; name = "Caleb Maclennan"; }; + ALEX11BR = { + email = "alexioanpopa11@gmail.com"; + github = "ALEX11BR"; + githubId = 49609151; + name = "Popa Ioan Alexandru"; + }; alexarice = { email = "alexrice999@hotmail.co.uk"; github = "alexarice"; @@ -896,6 +902,12 @@ githubId = 1296771; name = "Anders Riutta"; }; + arkivm = { + email = "vikram186@gmail.com"; + github = "arkivm"; + githubId = 1118815; + name = "Vikram Narayanan"; + }; armijnhemel = { email = "armijn@tjaldur.nl"; github = "armijnhemel"; @@ -1909,6 +1921,12 @@ email = "me@philscotted.com"; name = "Phil Scott"; }; + chekoopa = { + email = "chekoopa@mail.ru"; + github = "chekoopa"; + githubId = 1689801; + name = "Mikhail Chekan"; + }; ChengCat = { email = "yu@cheng.cat"; github = "ChengCat"; @@ -5449,6 +5467,12 @@ githubId = 8735102; name = "John Ramsden"; }; + johnrichardrinehart = { + email = "johnrichardrinehart@gmail.com"; + github = "johnrichardrinehart"; + githubId = 6321578; + name = "John Rinehart"; + }; johntitor = { email = "huyuumi.dev@gmail.com"; github = "JohnTitor"; @@ -10140,6 +10164,12 @@ githubId = 307899; name = "Gurkan Gur"; }; + sersorrel = { + email = "ash@sorrel.sh"; + github = "sersorrel"; + githubId = 9433472; + name = "ash"; + }; servalcatty = { email = "servalcat@pm.me"; github = "servalcatty"; diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix index 9171c10da4..75a7940aa8 100644 --- a/third_party/nixpkgs/maintainers/team-list.nix +++ b/third_party/nixpkgs/maintainers/team-list.nix @@ -137,7 +137,7 @@ with lib.maintainers; { cleverca22 disassembler jonringer - maveru + manveru nrdxp ]; scope = "Input-Output Global employees, which maintain critical software"; diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index a7d381ee11..700ad741c0 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -81,6 +81,13 @@ 6 for more details. + + + GNOME has been upgraded to 41. Please take a look at their + Release + Notes for details. + +
@@ -337,6 +344,13 @@ controller support. + + + multipath, + the device mapper multipath (DM-MP) daemon. Available as + services.multipath. + +
@@ -1492,6 +1506,13 @@ Superuser created successfully. /etc/xdg/mimeapps.list. + + + Kopia was upgraded from 0.8.x to 0.9.x. Please read the + upstream + release notes for changes and upgrade instructions. + +
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md index 4c6c339014..ab1e94d59f 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md @@ -28,6 +28,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `kubernetes-helm` now defaults to 3.7.0, which introduced some breaking changes to the experimental OCI manifest format. See [HIP 6](https://github.com/helm/community/blob/main/hips/hip-0006.md) for more details. +- GNOME has been upgraded to 41. Please take a look at their [Release Notes](https://help.gnome.org/misc/release-notes/41.0/) for details. + ## New Services {#sec-release-21.11-new-services} - [btrbk](https://digint.ch/btrbk/index.html), a backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations. Available as [services.btrbk](options.html#opt-services.brtbk.instances). @@ -103,6 +105,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [joycond](https://github.com/DanielOgorchock/joycond), a service that uses `hid-nintendo` to provide nintendo joycond pairing and better nintendo switch pro controller support. +- [multipath](https://github.com/opensvc/multipath-tools), the device mapper multipath (DM-MP) daemon. Available as [services.multipath](#opt-services.multipath.enable). + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} - The `services.wakeonlan` option was removed, and replaced with `networking.interfaces..wakeOnLan`. @@ -432,3 +436,5 @@ In addition to numerous new and upgraded packages, this release has the followin directories, thus increasing the purity of the build. - Three new options, [xdg.mime.addedAssociations](#opt-xdg.mime.addedAssociations), [xdg.mime.defaultApplications](#opt-xdg.mime.defaultApplications), and [xdg.mime.removedAssociations](#opt-xdg.mime.removedAssociations) have been added to the [xdg.mime](#opt-xdg.mime.enable) module to allow the configuration of `/etc/xdg/mimeapps.list`. + +- Kopia was upgraded from 0.8.x to 0.9.x. Please read the [upstream release notes](https://github.com/kopia/kopia/releases/tag/v0.9.0) for changes and upgrade instructions. diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix b/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix index c4bd3a077d..db4b6c638a 100644 --- a/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix +++ b/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix @@ -50,9 +50,8 @@ in config = mkIf cfg.enable { - # This is enough to make a symlink because the xserver - # module already links all /share/X11 paths. environment.systemPackages = [ x11Fonts ]; + environment.pathsToLink = [ "/share/X11/fonts" ]; services.xserver.filesSection = '' FontPath "${x11Fonts}/share/X11/fonts" diff --git a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix index b9eb7f69ef..8f6b5c22ea 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix @@ -213,7 +213,7 @@ in } { - assertion = cfg.powerManagement.enable -> offloadCfg.enable; + assertion = cfg.powerManagement.finegrained -> offloadCfg.enable; message = "Fine-grained power management requires offload to be enabled."; } diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index c45309bd6b..df35a57d04 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -779,6 +779,7 @@ ./services/networking/mstpd.nix ./services/networking/mtprotoproxy.nix ./services/networking/mullvad-vpn.nix + ./services/networking/multipath.nix ./services/networking/murmur.nix ./services/networking/mxisd.nix ./services/networking/namecoind.nix diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/teamviewer.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/teamviewer.nix index ce9e57a187..e2271e571c 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/teamviewer.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/teamviewer.nix @@ -24,18 +24,21 @@ in environment.systemPackages = [ pkgs.teamviewer ]; + services.dbus.packages = [ pkgs.teamviewer ]; + systemd.services.teamviewerd = { description = "TeamViewer remote control daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "NetworkManager-wait-online.service" "network.target" ]; + after = [ "NetworkManager-wait-online.service" "network.target" "dbus.service" ]; + requires = [ "dbus.service" ]; preStart = "mkdir -pv /var/lib/teamviewer /var/log/teamviewer"; startLimitIntervalSec = 60; startLimitBurst = 10; serviceConfig = { - Type = "forking"; - ExecStart = "${pkgs.teamviewer}/bin/teamviewerd -d"; + Type = "simple"; + ExecStart = "${pkgs.teamviewer}/bin/teamviewerd -f"; PIDFile = "/run/teamviewerd.pid"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "on-abort"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/iscsi/root-initiator.nix b/third_party/nixpkgs/nixos/modules/services/networking/iscsi/root-initiator.nix index 3274878c4f..c12aca1bc2 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/iscsi/root-initiator.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/iscsi/root-initiator.nix @@ -64,6 +64,12 @@ in default = false; }; + extraIscsiCommands = mkOption { + description = "Extra iscsi commands to run in the initrd."; + default = ""; + type = lines; + }; + extraConfig = mkOption { description = "Extra lines to append to /etc/iscsid.conf"; default = null; @@ -162,6 +168,9 @@ in '' else '' iscsiadm --mode node --targetname ${escapeShellArg cfg.target} --login ''} + + ${cfg.extraIscsiCommands} + pkill -9 iscsid ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/multipath.nix b/third_party/nixpkgs/nixos/modules/services/networking/multipath.nix new file mode 100644 index 0000000000..1cc2ad1fc8 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/multipath.nix @@ -0,0 +1,572 @@ +{ config, lib, pkgs, ... }: with lib; + +# See http://christophe.varoqui.free.fr/usage.html and +# https://github.com/opensvc/multipath-tools/blob/master/multipath/multipath.conf.5 + +let + cfg = config.services.multipath; + + indentLines = n: str: concatStringsSep "\n" ( + map (line: "${fixedWidthString n " " " "}${line}") ( + filter ( x: x != "" ) ( splitString "\n" str ) + ) + ); + + addCheckDesc = desc: elemType: check: types.addCheck elemType check + // { description = "${elemType.description} (with check: ${desc})"; }; + hexChars = stringToCharacters "0123456789abcdef"; + isHexString = s: all (c: elem c hexChars) (stringToCharacters (toLower s)); + hexStr = addCheckDesc "hexadecimal string" types.str isHexString; + +in { + + options.services.multipath = with types; { + + enable = mkEnableOption "the device mapper multipath (DM-MP) daemon"; + + package = mkOption { + type = package; + description = "multipath-tools package to use"; + default = pkgs.multipath-tools; + defaultText = "pkgs.multipath-tools"; + }; + + devices = mkOption { + default = [ ]; + example = literalExpression '' + [ + { + vendor = "\"COMPELNT\""; + product = "\"Compellent Vol\""; + path_checker = "tur"; + no_path_retry = "queue"; + max_sectors_kb = 256; + }, ... + ] + ''; + description = '' + This option allows you to define arrays for use in multipath + groups. + ''; + type = listOf (submodule { + options = { + + vendor = mkOption { + type = str; + example = "COMPELNT"; + description = "Regular expression to match the vendor name"; + }; + + product = mkOption { + type = str; + example = "Compellent Vol"; + description = "Regular expression to match the product name"; + }; + + revision = mkOption { + type = nullOr str; + default = null; + description = "Regular expression to match the product revision"; + }; + + product_blacklist = mkOption { + type = nullOr str; + default = null; + description = "Products with the given vendor matching this string are blacklisted"; + }; + + alias_prefix = mkOption { + type = nullOr str; + default = null; + description = "The user_friendly_names prefix to use for this device type, instead of the default mpath"; + }; + + vpd_vendor = mkOption { + type = nullOr str; + default = null; + description = "The vendor specific vpd page information, using the vpd page abbreviation"; + }; + + hardware_handler = mkOption { + type = nullOr (enum [ "emc" "rdac" "hp_sw" "alua" "ana" ]); + default = null; + description = "The hardware handler to use for this device type"; + }; + + # Optional arguments + path_grouping_policy = mkOption { + type = nullOr (enum [ "failover" "multibus" "group_by_serial" "group_by_prio" "group_by_node_name" ]); + default = null; # real default: "failover" + description = "The default path grouping policy to apply to unspecified multipaths"; + }; + + uid_attribute = mkOption { + type = nullOr str; + default = null; + description = "The udev attribute providing a unique path identifier (WWID)"; + }; + + getuid_callout = mkOption { + type = nullOr str; + default = null; + description = '' + (Superseded by uid_attribute) The default program and args to callout + to obtain a unique path identifier. Should be specified with an absolute path. + ''; + }; + + path_selector = mkOption { + type = nullOr (enum [ + ''"round-robin 0"'' + ''"queue-length 0"'' + ''"service-time 0"'' + ''"historical-service-time 0"'' + ]); + default = null; # real default: "service-time 0" + description = "The default path selector algorithm to use; they are offered by the kernel multipath target"; + }; + + path_checker = mkOption { + type = enum [ "readsector0" "tur" "emc_clariion" "hp_sw" "rdac" "directio" "cciss_tur" "none" ]; + default = "tur"; + description = "The default method used to determine the paths state"; + }; + + prio = mkOption { + type = nullOr (enum [ + "none" "const" "sysfs" "emc" "alua" "ontap" "rdac" "hp_sw" "hds" + "random" "weightedpath" "path_latency" "ana" "datacore" "iet" + ]); + default = null; # real default: "const" + description = "The name of the path priority routine"; + }; + + prio_args = mkOption { + type = nullOr str; + default = null; + description = "Arguments to pass to to the prio function"; + }; + + features = mkOption { + type = nullOr str; + default = null; + description = "Specify any device-mapper features to be used"; + }; + + failback = mkOption { + type = nullOr str; + default = null; # real default: "manual" + description = "Tell multipathd how to manage path group failback. Quote integers as strings"; + }; + + rr_weight = mkOption { + type = nullOr (enum [ "priorities" "uniform" ]); + default = null; # real default: "uniform" + description = '' + If set to priorities the multipath configurator will assign path weights + as "path prio * rr_min_io". + ''; + }; + + no_path_retry = mkOption { + type = nullOr str; + default = null; # real default: "fail" + description = "Specify what to do when all paths are down. Quote integers as strings"; + }; + + rr_min_io = mkOption { + type = nullOr int; + default = null; # real default: 1000 + description = '' + Number of I/O requests to route to a path before switching to the next in the + same path group. This is only for Block I/O (BIO) based multipath and + only apply to round-robin path_selector. + ''; + }; + + rr_min_io_rq = mkOption { + type = nullOr int; + default = null; # real default: 1 + description = '' + Number of I/O requests to route to a path before switching to the next in the + same path group. This is only for Request based multipath and + only apply to round-robin path_selector. + ''; + }; + + fast_io_fail_tmo = mkOption { + type = nullOr str; + default = null; # real default: 5 + description = '' + Specify the number of seconds the SCSI layer will wait after a problem has been + detected on a FC remote port before failing I/O to devices on that remote port. + This should be smaller than dev_loss_tmo. Setting this to "off" will disable + the timeout. Quote integers as strings. + ''; + }; + + dev_loss_tmo = mkOption { + type = nullOr str; + default = null; # real default: 600 + description = '' + Specify the number of seconds the SCSI layer will wait after a problem has + been detected on a FC remote port before removing it from the system. This + can be set to "infinity" which sets it to the max value of 2147483647 + seconds, or 68 years. It will be automatically adjusted to the overall + retry interval no_path_retry * polling_interval + if a number of retries is given with no_path_retry and the + overall retry interval is longer than the specified dev_loss_tmo value. + The Linux kernel will cap this value to 600 if fast_io_fail_tmo + is not set. + ''; + }; + + flush_on_last_del = mkOption { + type = nullOr (enum [ "yes" "no" ]); + default = null; # real default: "no" + description = '' + If set to "yes" multipathd will disable queueing when the last path to a + device has been deleted. + ''; + }; + + user_friendly_names = mkOption { + type = nullOr (enum [ "yes" "no" ]); + default = null; # real default: "no" + description = '' + If set to "yes", using the bindings file /etc/multipath/bindings + to assign a persistent and unique alias to the multipath, in the + form of mpath. If set to "no" use the WWID as the alias. In either + case this be will be overridden by any specific aliases in the + multipaths section. + ''; + }; + + retain_attached_hw_handler = mkOption { + type = nullOr (enum [ "yes" "no" ]); + default = null; # real default: "yes" + description = '' + (Obsolete for kernels >= 4.3) If set to "yes" and the SCSI layer has + already attached a hardware_handler to the device, multipath will not + force the device to use the hardware_handler specified by mutipath.conf. + If the SCSI layer has not attached a hardware handler, multipath will + continue to use its configured hardware handler. + + Important Note: Linux kernel 4.3 or newer always behaves as if + "retain_attached_hw_handler yes" was set. + ''; + }; + + detect_prio = mkOption { + type = nullOr (enum [ "yes" "no" ]); + default = null; # real default: "yes" + description = '' + If set to "yes", multipath will try to detect if the device supports + SCSI-3 ALUA. If so, the device will automatically use the sysfs + prioritizer if the required sysf attributes access_state and + preferred_path are supported, or the alua prioritizer if not. If set + to "no", the prioritizer will be selected as usual. + ''; + }; + + detect_checker = mkOption { + type = nullOr (enum [ "yes" "no" ]); + default = null; # real default: "yes" + description = '' + If set to "yes", multipath will try to detect if the device supports + SCSI-3 ALUA. If so, the device will automatically use the tur checker. + If set to "no", the checker will be selected as usual. + ''; + }; + + deferred_remove = mkOption { + type = nullOr (enum [ "yes" "no" ]); + default = null; # real default: "no" + description = '' + If set to "yes", multipathd will do a deferred remove instead of a + regular remove when the last path device has been deleted. This means + that if the multipath device is still in use, it will be freed when + the last user closes it. If path is added to the multipath device + before the last user closes it, the deferred remove will be canceled. + ''; + }; + + san_path_err_threshold = mkOption { + type = nullOr str; + default = null; + description = '' + If set to a value greater than 0, multipathd will watch paths and check + how many times a path has been failed due to errors.If the number of + failures on a particular path is greater then the san_path_err_threshold, + then the path will not reinstate till san_path_err_recovery_time. These + path failures should occur within a san_path_err_forget_rate checks, if + not we will consider the path is good enough to reinstantate. + ''; + }; + + san_path_err_forget_rate = mkOption { + type = nullOr str; + default = null; + description = '' + If set to a value greater than 0, multipathd will check whether the path + failures has exceeded the san_path_err_threshold within this many checks + i.e san_path_err_forget_rate. If so we will not reinstante the path till + san_path_err_recovery_time. + ''; + }; + + san_path_err_recovery_time = mkOption { + type = nullOr str; + default = null; + description = '' + If set to a value greater than 0, multipathd will make sure that when + path failures has exceeded the san_path_err_threshold within + san_path_err_forget_rate then the path will be placed in failed state + for san_path_err_recovery_time duration. Once san_path_err_recovery_time + has timeout we will reinstante the failed path. san_path_err_recovery_time + value should be in secs. + ''; + }; + + marginal_path_err_sample_time = mkOption { + type = nullOr int; + default = null; + description = "One of the four parameters of supporting path check based on accounting IO error such as intermittent error"; + }; + + marginal_path_err_rate_threshold = mkOption { + type = nullOr int; + default = null; + description = "The error rate threshold as a permillage (1/1000)"; + }; + + marginal_path_err_recheck_gap_time = mkOption { + type = nullOr str; + default = null; + description = "One of the four parameters of supporting path check based on accounting IO error such as intermittent error"; + }; + + marginal_path_double_failed_time = mkOption { + type = nullOr str; + default = null; + description = "One of the four parameters of supporting path check based on accounting IO error such as intermittent error"; + }; + + delay_watch_checks = mkOption { + type = nullOr str; + default = null; + description = "This option is deprecated, and mapped to san_path_err_forget_rate"; + }; + + delay_wait_checks = mkOption { + type = nullOr str; + default = null; + description = "This option is deprecated, and mapped to san_path_err_recovery_time"; + }; + + skip_kpartx = mkOption { + type = nullOr (enum [ "yes" "no" ]); + default = null; # real default: "no" + description = "If set to yes, kpartx will not automatically create partitions on the device"; + }; + + max_sectors_kb = mkOption { + type = nullOr int; + default = null; + description = "Sets the max_sectors_kb device parameter on all path devices and the multipath device to the specified value"; + }; + + ghost_delay = mkOption { + type = nullOr int; + default = null; + description = "Sets the number of seconds that multipath will wait after creating a device with only ghost paths before marking it ready for use in systemd"; + }; + + all_tg_pt = mkOption { + type = nullOr str; + default = null; + description = "Set the 'all targets ports' flag when registering keys with mpathpersist"; + }; + + }; + }); + }; + + defaults = mkOption { + type = nullOr str; + default = null; + description = '' + This section defines default values for attributes which are used + whenever no values are given in the appropriate device or multipath + sections. + ''; + }; + + blacklist = mkOption { + type = nullOr str; + default = null; + description = '' + This section defines which devices should be excluded from the + multipath topology discovery. + ''; + }; + + blacklist_exceptions = mkOption { + type = nullOr str; + default = null; + description = '' + This section defines which devices should be included in the + multipath topology discovery, despite being listed in the + blacklist section. + ''; + }; + + overrides = mkOption { + type = nullOr str; + default = null; + description = '' + This section defines values for attributes that should override the + device-specific settings for all devices. + ''; + }; + + extraConfig = mkOption { + type = nullOr str; + default = null; + description = "Lines to append to default multipath.conf"; + }; + + extraConfigFile = mkOption { + type = nullOr str; + default = null; + description = "Append an additional file's contents to /etc/multipath.conf"; + }; + + pathGroups = mkOption { + example = literalExpression '' + [ + { + wwid = "360080e500043b35c0123456789abcdef"; + alias = 10001234; + array = "bigarray.example.com"; + fsType = "zfs"; # optional + options = "ro"; # optional + }, ... + ] + ''; + description = '' + This option allows you to define multipath groups as described + in http://christophe.varoqui.free.fr/usage.html. + ''; + type = listOf (submodule { + options = { + + alias = mkOption { + type = int; + example = 1001234; + description = "The name of the multipath device"; + }; + + wwid = mkOption { + type = hexStr; + example = "360080e500043b35c0123456789abcdef"; + description = "The identifier for the multipath device"; + }; + + array = mkOption { + type = str; + default = null; + example = "bigarray.example.com"; + description = "The DNS name of the storage array"; + }; + + fsType = mkOption { + type = nullOr str; + default = null; + example = "zfs"; + description = "Type of the filesystem"; + }; + + options = mkOption { + type = nullOr str; + default = null; + example = "ro"; + description = "Options used to mount the file system"; + }; + + }; + }); + }; + + }; + + config = mkIf cfg.enable { + environment.etc."multipath.conf".text = + let + inherit (cfg) defaults blacklist blacklist_exceptions overrides; + + mkDeviceBlock = cfg: let + nonNullCfg = lib.filterAttrs (k: v: v != null) cfg; + attrs = lib.mapAttrsToList (name: value: " ${name} ${toString value}") nonNullCfg; + in '' + device { + ${lib.concatStringsSep "\n" attrs} + } + ''; + devices = lib.concatMapStringsSep "\n" mkDeviceBlock cfg.devices; + + mkMultipathBlock = m: '' + multipath { + wwid ${m.wwid} + alias ${toString m.alias} + } + ''; + multipaths = lib.concatMapStringsSep "\n" mkMultipathBlock cfg.pathGroups; + + in '' + devices { + ${indentLines 2 devices} + } + + ${optionalString (!isNull defaults) '' + defaults { + ${indentLines 2 defaults} + multipath_dir ${cfg.package}/lib/multipath + } + ''} + ${optionalString (!isNull blacklist) '' + blacklist { + ${indentLines 2 blacklist} + } + ''} + ${optionalString (!isNull blacklist_exceptions) '' + blacklist_exceptions { + ${indentLines 2 blacklist_exceptions} + } + ''} + ${optionalString (!isNull overrides) '' + overrides { + ${indentLines 2 overrides} + } + ''} + multipaths { + ${indentLines 2 multipaths} + } + ''; + + systemd.packages = [ cfg.package ]; + + environment.systemPackages = [ cfg.package ]; + boot.kernelModules = [ "dm-multipath" "dm-service-time" ]; + + # We do not have systemd in stage-1 boot so must invoke `multipathd` + # with the `-1` argument which disables systemd calls. Invoke `multipath` + # to display the multipath mappings in the output of `journalctl -b`. + boot.initrd.kernelModules = [ "dm-multipath" "dm-service-time" ]; + boot.initrd.postDeviceCommands = '' + modprobe -a dm-multipath dm-service-time + multipathd -s + (set -x && sleep 1 && multipath -ll) + ''; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix index 192533e52d..004b4f9967 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix @@ -439,7 +439,7 @@ in mkdir -m 0755 -p /etc/ssh ${flip concatMapStrings cfg.hostKeys (k: '' - if ! [ -f "${k.path}" ]; then + if ! [ -s "${k.path}" ]; then ssh-keygen \ -t "${k.type}" \ ${if k ? bits then "-b ${toString k.bits}" else ""} \ diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix index 4d7f16b1e1..62ae763b69 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix @@ -6,6 +6,8 @@ let cfg = config.services.nextcloud; fpm = config.services.phpfpm.pools.nextcloud; + inherit (cfg) datadir; + phpPackage = cfg.phpPackage.buildEnv { extensions = { enabled, all }: (with all; @@ -40,7 +42,7 @@ let if [[ "$USER" != nextcloud ]]; then sudo='exec /run/wrappers/bin/sudo -u nextcloud --preserve-env=NEXTCLOUD_CONFIG_DIR --preserve-env=OC_PASS' fi - export NEXTCLOUD_CONFIG_DIR="${cfg.home}/config" + export NEXTCLOUD_CONFIG_DIR="${datadir}/config" $sudo \ ${phpPackage}/bin/php \ occ "$@" @@ -85,6 +87,59 @@ in { default = "/var/lib/nextcloud"; description = "Storage path of nextcloud."; }; + datadir = mkOption { + type = types.str; + defaultText = "config.services.nextcloud.home"; + description = '' + Data storage path of nextcloud. Will be by default. + This folder will be populated with a config.php and data folder which contains the state of the instance (excl the database)."; + ''; + example = "/mnt/nextcloud-file"; + }; + extraApps = mkOption { + type = types.attrsOf types.package; + default = { }; + description = '' + Extra apps to install. Should be an attrSet of appid to packages generated by fetchNextcloudApp. + The appid must be identical to the "id" value in the apps appinfo/info.xml. + Using this will disable the appstore to prevent Nextcloud from updating these apps (see ). + ''; + example = literalExpression '' + { + maps = pkgs.fetchNextcloudApp { + name = "maps"; + sha256 = "007y80idqg6b6zk6kjxg4vgw0z8fsxs9lajnv49vv1zjy6jx2i1i"; + url = "https://github.com/nextcloud/maps/releases/download/v0.1.9/maps-0.1.9.tar.gz"; + version = "0.1.9"; + }; + phonetrack = pkgs.fetchNextcloudApp { + name = "phonetrack"; + sha256 = "0qf366vbahyl27p9mshfma1as4nvql6w75zy2zk5xwwbp343vsbc"; + url = "https://gitlab.com/eneiluj/phonetrack-oc/-/wikis/uploads/931aaaf8dca24bf31a7e169a83c17235/phonetrack-0.6.9.tar.gz"; + version = "0.6.9"; + }; + } + ''; + }; + extraAppsEnable = mkOption { + type = types.bool; + default = true; + description = '' + Automatically enable the apps in every time nextcloud starts. + If set to false, apps need to be enabled in the Nextcloud user interface or with nextcloud-occ app:enable. + ''; + }; + appstoreEnable = mkOption { + type = types.nullOr types.bool; + default = null; + example = true; + description = '' + Allow the installation of apps and app updates from the store. + Enabled by default unless there are packages in . + Set to true to force enable the store even if is used. + Set to false to disable the installation of apps from the global appstore. App management is always enabled regardless of this setting. + ''; + }; logLevel = mkOption { type = types.ints.between 0 4; default = 2; @@ -524,6 +579,8 @@ in { else nextcloud22 ); + services.nextcloud.datadir = mkOptionDefault config.services.nextcloud.home; + services.nextcloud.phpPackage = if versionOlder cfg.package.version "21" then pkgs.php74 else pkgs.php80; @@ -563,6 +620,14 @@ in { ] ''; + showAppStoreSetting = cfg.appstoreEnable != null || cfg.extraApps != {}; + renderedAppStoreSetting = + let + x = cfg.appstoreEnable; + in + if x == null then "false" + else boolToString x; + overrideConfig = pkgs.writeText "nextcloud-config.php" '' [ + ${optionalString (cfg.extraApps != { }) "[ 'path' => '${cfg.home}/nix-apps', 'url' => '/nix-apps', 'writable' => false ],"} [ 'path' => '${cfg.home}/apps', 'url' => '/apps', 'writable' => false ], [ 'path' => '${cfg.home}/store-apps', 'url' => '/store-apps', 'writable' => true ], ], - 'datadirectory' => '${cfg.home}/data', + ${optionalString (showAppStoreSetting) "'appstoreenabled' => ${renderedAppStoreSetting},"} + 'datadirectory' => '${datadir}/data', 'skeletondirectory' => '${cfg.skeletonDirectory}', ${optionalString cfg.caching.apcu "'memcache.local' => '\\OC\\Memcache\\APCu',"} 'log_type' => 'syslog', @@ -628,7 +695,7 @@ in { "--database-pass" = "\$${dbpass.arg}"; "--admin-user" = ''"${c.adminuser}"''; "--admin-pass" = "\$${adminpass.arg}"; - "--data-dir" = ''"${cfg.home}/data"''; + "--data-dir" = ''"${datadir}/data"''; }); in '' ${mkExport dbpass} @@ -670,9 +737,15 @@ in { ln -sf ${cfg.package}/apps ${cfg.home}/ + # Install extra apps + ln -sfT \ + ${pkgs.linkFarm "nix-apps" + (mapAttrsToList (name: path: { inherit name path; }) cfg.extraApps)} \ + ${cfg.home}/nix-apps + # create nextcloud directories. # if the directories exist already with wrong permissions, we fix that - for dir in ${cfg.home}/config ${cfg.home}/data ${cfg.home}/store-apps; do + for dir in ${datadir}/config ${datadir}/data ${cfg.home}/store-apps ${cfg.home}/nix-apps; do if [ ! -e $dir ]; then install -o nextcloud -g nextcloud -d $dir elif [ $(stat -c "%G" $dir) != "nextcloud" ]; then @@ -680,23 +753,29 @@ in { fi done - ln -sf ${overrideConfig} ${cfg.home}/config/override.config.php + ln -sf ${overrideConfig} ${datadir}/config/override.config.php # Do not install if already installed - if [[ ! -e ${cfg.home}/config/config.php ]]; then + if [[ ! -e ${datadir}/config/config.php ]]; then ${occInstallCmd} fi ${occ}/bin/nextcloud-occ upgrade ${occ}/bin/nextcloud-occ config:system:delete trusted_domains + + ${optionalString (cfg.extraAppsEnable && cfg.extraApps != { }) '' + # Try to enable apps (don't fail when one of them cannot be enabled , eg. due to incompatible version) + ${occ}/bin/nextcloud-occ app:enable ${concatStringsSep " " (attrNames cfg.extraApps)} + ''} + ${occSetTrustedDomainsCmd} ''; serviceConfig.Type = "oneshot"; serviceConfig.User = "nextcloud"; }; nextcloud-cron = { - environment.NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config"; + environment.NEXTCLOUD_CONFIG_DIR = "${datadir}/config"; serviceConfig.Type = "oneshot"; serviceConfig.User = "nextcloud"; serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${cfg.package}/cron.php"; @@ -715,7 +794,7 @@ in { group = "nextcloud"; phpPackage = phpPackage; phpEnv = { - NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config"; + NEXTCLOUD_CONFIG_DIR = "${datadir}/config"; PATH = "/run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin"; }; settings = mapAttrs (name: mkDefault) { @@ -765,6 +844,10 @@ in { priority = 201; extraConfig = "root ${cfg.home};"; }; + "~ ^/nix-apps" = { + priority = 201; + extraConfig = "root ${cfg.home};"; + }; "^~ /.well-known" = { priority = 210; extraConfig = '' diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml index ed84487d23..9d9cb8dfb3 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml @@ -237,6 +237,12 @@ Some apps may require extra PHP extensions to be installed. This can be configured with the setting. + + + Alternatively, extra apps can also be declared with the setting. + When using this setting, apps can no longer be managed statefully because this can lead to Nextcloud updating apps + that are managed by Nix. If you want automatic updates it is recommended that you use web interface to install apps. +
diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix index e65e016466..1e316c379f 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -372,7 +372,13 @@ in services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center xdg.portal.enable = true; - xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; + xdg.portal.extraPortals = [ + pkgs.xdg-desktop-portal-gnome + (pkgs.xdg-desktop-portal-gtk.override { + # Do not build portals that we already have. + buildPortalsInGnome = false; + }) + ]; # Harmonize Qt5 application style and also make them use the portal for file chooser dialog. qt5 = { diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 7134b43216..6c26b4e0f8 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -208,10 +208,15 @@ def main() -> None: if os.path.exists("@efiSysMountPoint@/loader/loader.conf"): os.unlink("@efiSysMountPoint@/loader/loader.conf") - if "@canTouchEfiVariables@" == "1": - subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "install"]) - else: - subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "--no-variables", "install"]) + flags = [] + + if "@canTouchEfiVariables@" != "1": + flags.append("--no-variables") + + if "@graceful@" == "1": + flags.append("--graceful") + + subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@"] + flags + ["install"]) else: # Update bootloader to latest if needed systemd_version = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[1] diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index ff304f570d..0f76d7d6b2 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -24,7 +24,7 @@ let configurationLimit = if cfg.configurationLimit == null then 0 else cfg.configurationLimit; - inherit (cfg) consoleMode; + inherit (cfg) consoleMode graceful; inherit (efi) efiSysMountPoint canTouchEfiVariables; @@ -126,6 +126,22 @@ in { ''; }; }; + + graceful = mkOption { + default = false; + + type = types.bool; + + description = '' + Invoke bootctl install with the --graceful option, + which ignores errors when EFI variables cannot be written or when the EFI System Partition + cannot be found. Currently only applies to random seed operations. + + Only enable this option if systemd-boot otherwise fails to install, as the + scope or implication of the --graceful option may change in the future. + ''; + }; + }; config = mkIf cfg.enable { diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix index bd7e955a6f..adbed9d8d5 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix @@ -137,6 +137,14 @@ let copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/resize2fs ''} + # Copy multipath. + ${optionalString config.services.multipath.enable '' + copy_bin_and_libs ${config.services.multipath.package}/bin/multipath + copy_bin_and_libs ${config.services.multipath.package}/bin/multipathd + # Copy lib/multipath manually. + cp -rpv ${config.services.multipath.package}/lib/multipath $out/lib + ''} + # Copy secrets if needed. # # TODO: move out to a separate script; see #85000. @@ -199,6 +207,10 @@ let $out/bin/dmsetup --version 2>&1 | tee -a log | grep -q "version:" LVM_SYSTEM_DIR=$out $out/bin/lvm version 2>&1 | tee -a log | grep -q "LVM" $out/bin/mdadm --version + ${optionalString config.services.multipath.enable '' + ($out/bin/multipath || true) 2>&1 | grep -q 'need to be root' + ($out/bin/multipathd || true) 2>&1 | grep -q 'need to be root' + ''} ${config.boot.initrd.extraUtilsCommandsTest} fi @@ -338,7 +350,26 @@ let { object = pkgs.kmod-debian-aliases; symlink = "/etc/modprobe.d/debian.conf"; } - ]; + ] ++ lib.optionals config.services.multipath.enable [ + { object = pkgs.runCommand "multipath.conf" { + src = config.environment.etc."multipath.conf".text; + preferLocalBuild = true; + } '' + target=$out + printf "$src" > $out + substituteInPlace $out \ + --replace ${config.services.multipath.package}/lib ${extraUtils}/lib + ''; + symlink = "/etc/multipath.conf"; + } + ] ++ (lib.mapAttrsToList + (symlink: options: + { + inherit symlink; + object = options.source; + } + ) + config.boot.initrd.extraFiles); }; # Script to add secret files to the initrd at bootloader update time @@ -419,6 +450,22 @@ in ''; }; + boot.initrd.extraFiles = mkOption { + default = { }; + type = types.attrsOf + (types.submodule { + options = { + source = mkOption { + type = types.package; + description = "The object to make available inside the initrd."; + }; + }; + }); + description = '' + Extra files to link and copy in to the initrd. + ''; + }; + boot.initrd.prepend = mkOption { default = [ ]; type = types.listOf types.str; diff --git a/third_party/nixpkgs/nixos/tests/gnome-xorg.nix b/third_party/nixpkgs/nixos/tests/gnome-xorg.nix index 55f9c90c20..b9ff5e6828 100644 --- a/third_party/nixpkgs/nixos/tests/gnome-xorg.nix +++ b/third_party/nixpkgs/nixos/tests/gnome-xorg.nix @@ -25,6 +25,21 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { services.xserver.desktopManager.gnome.debug = true; services.xserver.displayManager.defaultSession = "gnome-xorg"; + systemd.user.services = { + "org.gnome.Shell@x11" = { + serviceConfig = { + ExecStart = [ + # Clear the list before overriding it. + "" + # Eval API is now internal so Shell needs to run in unsafe mode. + # TODO: improve test driver so that it supports openqa-like manipulation + # that would allow us to drop this mess. + "${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode" + ]; + }; + }; + }; + virtualisation.memorySize = 1024; }; diff --git a/third_party/nixpkgs/nixos/tests/gnome.nix b/third_party/nixpkgs/nixos/tests/gnome.nix index e8d18a41bd..1da97f733c 100644 --- a/third_party/nixpkgs/nixos/tests/gnome.nix +++ b/third_party/nixpkgs/nixos/tests/gnome.nix @@ -30,6 +30,21 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { }) ]; + systemd.user.services = { + "org.gnome.Shell@wayland" = { + serviceConfig = { + ExecStart = [ + # Clear the list before overriding it. + "" + # Eval API is now internal so Shell needs to run in unsafe mode. + # TODO: improve test driver so that it supports openqa-like manipulation + # that would allow us to drop this mess. + "${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode" + ]; + }; + }; + }; + virtualisation.memorySize = 1024; }; diff --git a/third_party/nixpkgs/nixos/tests/iscsi-multipath-root.nix b/third_party/nixpkgs/nixos/tests/iscsi-multipath-root.nix new file mode 100644 index 0000000000..a26fea503b --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/iscsi-multipath-root.nix @@ -0,0 +1,267 @@ +import ./make-test-python.nix ( + { pkgs, lib, ... }: + let + initiatorName = "iqn.2020-08.org.linux-iscsi.initiatorhost:example"; + targetName = "iqn.2003-01.org.linux-iscsi.target.x8664:sn.acf8fd9c23af"; + in + { + name = "iscsi"; + meta = { + maintainers = pkgs.lib.teams.deshaw.members; + }; + + nodes = { + target = { config, pkgs, lib, ... }: { + virtualisation.vlans = [ 1 2 ]; + services.target = { + enable = true; + config = { + fabric_modules = [ ]; + storage_objects = [ + { + dev = "/dev/vdb"; + name = "test"; + plugin = "block"; + write_back = true; + wwn = "92b17c3f-6b40-4168-b082-ceeb7b495522"; + } + ]; + targets = [ + { + fabric = "iscsi"; + tpgs = [ + { + enable = true; + attributes = { + authentication = 0; + generate_node_acls = 1; + }; + luns = [ + { + alias = "94dfe06967"; + alua_tg_pt_gp_name = "default_tg_pt_gp"; + index = 0; + storage_object = "/backstores/block/test"; + } + ]; + node_acls = [ + { + mapped_luns = [ + { + alias = "d42f5bdf8a"; + index = 0; + tpg_lun = 0; + write_protect = false; + } + ]; + node_wwn = initiatorName; + } + ]; + portals = [ + { + ip_address = "0.0.0.0"; + iser = false; + offload = false; + port = 3260; + } + ]; + tag = 1; + } + ]; + wwn = targetName; + } + ]; + }; + }; + + networking.firewall.allowedTCPPorts = [ 3260 ]; + networking.firewall.allowedUDPPorts = [ 3260 ]; + + virtualisation.memorySize = 2048; + virtualisation.emptyDiskImages = [ 2048 ]; + }; + + initiatorAuto = { nodes, config, pkgs, ... }: { + virtualisation.vlans = [ 1 2 ]; + + services.multipath = { + enable = true; + defaults = '' + find_multipaths yes + user_friendly_names yes + ''; + pathGroups = [ + { + alias = 123456; + wwid = "3600140592b17c3f6b404168b082ceeb7"; + } + ]; + }; + + services.openiscsi = { + enable = true; + enableAutoLoginOut = true; + discoverPortal = "target"; + name = initiatorName; + }; + + environment.systemPackages = with pkgs; [ + xfsprogs + ]; + + environment.etc."initiator-root-disk-closure".source = nodes.initiatorRootDisk.config.system.build.toplevel; + + nix.binaryCaches = lib.mkForce [ ]; + nix.extraOptions = '' + hashed-mirrors = + connect-timeout = 1 + ''; + }; + + initiatorRootDisk = { config, pkgs, modulesPath, lib, ... }: { + boot.initrd.network.enable = true; + boot.loader.grub.enable = false; + + boot.kernelParams = lib.mkOverride 5 ( + [ + "boot.shell_on_fail" + "console=tty1" + "ip=192.168.1.1:::255.255.255.0::ens9:none" + "ip=192.168.2.1:::255.255.255.0::ens10:none" + ] + ); + + # defaults to true, puts some code in the initrd that tries to mount an overlayfs on /nix/store + virtualisation.writableStore = false; + virtualisation.vlans = [ 1 2 ]; + + services.multipath = { + enable = true; + defaults = '' + find_multipaths yes + user_friendly_names yes + ''; + pathGroups = [ + { + alias = 123456; + wwid = "3600140592b17c3f6b404168b082ceeb7"; + } + ]; + }; + + fileSystems = lib.mkOverride 5 { + "/" = { + fsType = "xfs"; + device = "/dev/mapper/123456"; + options = [ "_netdev" ]; + }; + }; + + boot.initrd.extraFiles."etc/multipath/wwids".source = pkgs.writeText "wwids" "/3600140592b17c3f6b404168b082ceeb7/"; + + boot.iscsi-initiator = { + discoverPortal = "target"; + name = initiatorName; + target = targetName; + extraIscsiCommands = '' + iscsiadm -m discovery -o update -t sendtargets -p 192.168.2.3 --login + ''; + }; + }; + + }; + + testScript = { nodes, ... }: '' + target.start() + target.wait_for_unit("iscsi-target.service") + + initiatorAuto.start() + + initiatorAuto.wait_for_unit("iscsid.service") + initiatorAuto.wait_for_unit("iscsi.service") + initiatorAuto.get_unit_info("iscsi") + + # Expecting this to fail since we should already know about 192.168.1.3 + initiatorAuto.fail("iscsiadm -m discovery -o update -t sendtargets -p 192.168.1.3 --login") + # Expecting this to succeed since we don't yet know about 192.168.2.3 + initiatorAuto.succeed("iscsiadm -m discovery -o update -t sendtargets -p 192.168.2.3 --login") + + # /dev/sda is provided by iscsi on target + initiatorAuto.succeed("set -x; while ! test -e /dev/sda; do sleep 1; done") + + initiatorAuto.succeed("mkfs.xfs /dev/sda") + initiatorAuto.succeed("mkdir /mnt") + + # Start by verifying /dev/sda and /dev/sdb are both the same disk + initiatorAuto.succeed("mount /dev/sda /mnt") + initiatorAuto.succeed("touch /mnt/hi") + initiatorAuto.succeed("umount /mnt") + + initiatorAuto.succeed("mount /dev/sdb /mnt") + initiatorAuto.succeed("test -e /mnt/hi") + initiatorAuto.succeed("umount /mnt") + + initiatorAuto.succeed("systemctl restart multipathd") + initiatorAuto.succeed("multipath -ll | systemd-cat") + + # Install our RootDisk machine to 123456, the alias to the device that multipath is now managing + initiatorAuto.succeed("mount /dev/mapper/123456 /mnt") + initiatorAuto.succeed("mkdir -p /mnt/etc/{multipath,iscsi}") + initiatorAuto.succeed("cp -r /etc/multipath/wwids /mnt/etc/multipath/wwids") + initiatorAuto.succeed("cp -r /etc/iscsi/{nodes,send_targets} /mnt/etc/iscsi") + initiatorAuto.succeed( + "nixos-install --no-bootloader --no-root-passwd --system /etc/initiator-root-disk-closure" + ) + initiatorAuto.succeed("umount /mnt") + initiatorAuto.shutdown() + + initiatorRootDisk.start() + initiatorRootDisk.wait_for_unit("multi-user.target") + initiatorRootDisk.wait_for_unit("iscsid") + + # Log in over both nodes + initiatorRootDisk.fail("iscsiadm -m discovery -o update -t sendtargets -p 192.168.1.3 --login") + initiatorRootDisk.fail("iscsiadm -m discovery -o update -t sendtargets -p 192.168.2.3 --login") + initiatorRootDisk.succeed("systemctl restart multipathd") + initiatorRootDisk.succeed("multipath -ll | systemd-cat") + + # Verify we can write and sync the root disk + initiatorRootDisk.succeed("mkdir /scratch") + initiatorRootDisk.succeed("touch /scratch/both-up") + initiatorRootDisk.succeed("sync /scratch") + + # Verify we can write to the root with ens9 (sda, 192.168.1.3) down + initiatorRootDisk.succeed("ip link set ens9 down") + initiatorRootDisk.succeed("touch /scratch/ens9-down") + initiatorRootDisk.succeed("sync /scratch") + initiatorRootDisk.succeed("ip link set ens9 up") + + # todo: better way to wait until multipath notices the link is back + initiatorRootDisk.succeed("sleep 5") + initiatorRootDisk.succeed("touch /scratch/both-down") + initiatorRootDisk.succeed("sync /scratch") + + # Verify we can write to the root with ens10 (sdb, 192.168.2.3) down + initiatorRootDisk.succeed("ip link set ens10 down") + initiatorRootDisk.succeed("touch /scratch/ens10-down") + initiatorRootDisk.succeed("sync /scratch") + initiatorRootDisk.succeed("ip link set ens10 up") + initiatorRootDisk.succeed("touch /scratch/ens10-down") + initiatorRootDisk.succeed("sync /scratch") + + initiatorRootDisk.succeed("ip link set ens9 up") + initiatorRootDisk.succeed("ip link set ens10 up") + initiatorRootDisk.shutdown() + + # Verify we can boot with the target's eth1 down, forcing + # it to multipath via the second link + target.succeed("ip link set eth1 down") + initiatorRootDisk.start() + initiatorRootDisk.wait_for_unit("multi-user.target") + initiatorRootDisk.wait_for_unit("iscsid") + initiatorRootDisk.succeed("test -e /scratch/both-up") + ''; + } +) + + diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix b/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix index 1a7b25d5a4..eb37470a4c 100644 --- a/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix +++ b/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix @@ -33,8 +33,13 @@ in { in { networking.firewall.allowedTCPPorts = [ 80 ]; + systemd.tmpfiles.rules = [ + "d /var/lib/nextcloud-data 0750 nextcloud nginx - -" + ]; + services.nextcloud = { enable = true; + datadir = "/var/lib/nextcloud-data"; hostName = "nextcloud"; config = { # Don't inherit adminuser since "root" is supposed to be the default @@ -98,6 +103,7 @@ in { "${withRcloneEnv} ${copySharedFile}" ) client.wait_for_unit("multi-user.target") + nextcloud.succeed("test -f /var/lib/nextcloud-data/data/root/files/test-shared-file") client.succeed( "${withRcloneEnv} ${diffSharedFile}" ) diff --git a/third_party/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix b/third_party/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix index 6f827cea95..8dd43ead59 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.30.5"; + version = "2.33.1"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-hfpMeUhv6FC9lnPCfdWnAFCaKiteplyrS/o3Lf7cQY4="; + sha256 = "sha256-gzkfLfNhJHg/jEhf/RQDhHnXxn3UI15eDZfutKt3yGk="; }; buildInputs = [ faust2jaqt faust2lv2 ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/hushboard/default.nix b/third_party/nixpkgs/pkgs/applications/audio/hushboard/default.nix new file mode 100644 index 0000000000..e9d88d1f23 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/hushboard/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, gobject-introspection +, gtk3 +, libappindicator +, libpulseaudio +, librsvg +, pycairo +, pygobject3 +, six +, wrapGAppsHook +, xlib +}: + +buildPythonApplication { + pname = "hushboard"; + version = "unstable-2021-03-17"; + + src = fetchFromGitHub { + owner = "stuartlangridge"; + repo = "hushboard"; + rev = "c16611c539be111891116a737b02c5fb359ad1fc"; + sha256 = "06jav6j0bsxhawrq31cnls8zpf80fpwk0cak5s82js6wl4vw2582"; + }; + + nativeBuildInputs = [ + wrapGAppsHook + ]; + + buildInputs = [ + gobject-introspection + gtk3 + libappindicator + libpulseaudio + ]; + + propagatedBuildInputs = [ + pycairo + pygobject3 + six + xlib + ]; + + postPatch = '' + substituteInPlace hushboard/_pulsectl.py \ + --replace "ctypes.util.find_library('libpulse') or 'libpulse.so.0'" "'${libpulseaudio}/lib/libpulse.so.0'" + substituteInPlace snap/gui/hushboard.desktop \ + --replace "\''${SNAP}/hushboard/icons/hushboard.svg" "hushboard" + ''; + + postInstall = '' + # Fix tray icon, see e.g. https://github.com/NixOS/nixpkgs/pull/43421 + wrapProgram $out/bin/hushboard \ + --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" + + mkdir -p $out/share/applications $out/share/icons/hicolor/{scalable,512x512}/apps + cp snap/gui/hushboard.desktop $out/share/applications + cp hushboard/icons/hushboard.svg $out/share/icons/hicolor/scalable/apps + cp hushboard-512.png $out/share/icons/hicolor/512x512/apps/hushboard.png + ''; + + # There are no tests + doCheck = false; + + meta = with lib; { + homepage = "https://kryogenix.org/code/hushboard/"; + license = licenses.mit; + description = "Mute your microphone while typing"; + platforms = platforms.linux; + maintainers = with maintainers; [ sersorrel ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lightning-pool/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lightning-pool/default.nix index 978509cc23..f33ede4939 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lightning-pool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lightning-pool/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "lightning-pool"; - version = "0.5.0-alpha"; + version = "0.5.1-alpha"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "pool"; rev = "v${version}"; - sha256 = "0i8qkxnrx3a89aw3v0mx7przlldl8kc0ng6g1m435366y6nzdarb"; + sha256 = "147s0p4arfxl2akzm267p8zfy6hgssym5rwxv78kp8i39mfinpkn"; }; - vendorSha256 = "04v2788w8l734n5xz6fwjbwkqlbk8q77nwncjpn7890mw75yd3rn"; + vendorSha256 = "0zd3bwqi0hnk0562x9hd62cwjw1xj386m83jagg41kzz0cpcr7zl"; subPackages = [ "cmd/pool" "cmd/poold" ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 3f5dd795cc..2ee92e251b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -198,6 +198,8 @@ railgun = callPackage ./railgun { }; + rec-mode = callPackage ./rec-mode { }; + structured-haskell-mode = self.shm; sv-kalender = callPackage ./sv-kalender { }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/rec-mode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/rec-mode/default.nix new file mode 100644 index 0000000000..8cb560fde5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/rec-mode/default.nix @@ -0,0 +1,18 @@ +{ lib +, trivialBuild +, recutils +}: + +trivialBuild { + pname = "rec-mode"; + + inherit (recutils) version src; + + postUnpack = '' + sourceRoot="$sourceRoot/etc" + ''; + + meta = recutils.meta // { + description = "A major mode for editing rec files"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix b/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix index bd61933b38..f7fb1b5bfc 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "5.8"; + version = "5.9"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "133nhxg4xfxisjzi85rn2l575hdbvcax1s13l4m6wcvq5zdn6fz4"; + sha256 = "dX24zaS7KHNZnkd4OvRj47VHpiewyrsw6nv3H7TCSTc="; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix index d06abfea44..64fdf50a0d 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre -, lcms2, openexr, libjxl, libpng, liblqr1, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif +, lcms2, openexr, libjxl, libpng, liblqr1, libraw, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices , Foundation , testVersion, imagemagick @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib fontconfig freetype ghostscript - liblqr1 libpng libtiff libxml2 libheif djvulibre + liblqr1 libpng libraw libtiff libxml2 libheif djvulibre ] # libjxl is broken on aarch64 (see meta.broken in libjxl) for now, # let's disable it for now to unbreak the imagemagick build. diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawing/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawing/default.nix index a2b4e94949..9c25b2784b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawing/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { pname = "drawing"; - version = "0.8.0"; + version = "0.8.3"; format = "other"; @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { owner = "maoschanz"; repo = pname; rev = version; - sha256 = "03cx6acb0ph7b3difshjfddi8ld79wp8d12bdp7dp1q1820j5mz0"; + sha256 = "sha256-qDLJ+Mw4z66ro9/zoEIzDJpA+jJLYw0WgsP7mA+56XM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/krita/beta.nix b/third_party/nixpkgs/pkgs/applications/graphics/krita/beta.nix new file mode 100644 index 0000000000..167a96050f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/krita/beta.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + version = "5.0.0-beta1"; + kde-channel = "unstable"; + sha256 = "1p5l2vpsgcp4wajgn5rgjcyb8l5ickm1nkmfx8zzr4rnwjnyxdbm"; +}) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix index 3a86d1d4cc..7e0a8915c4 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix @@ -1,53 +1,7 @@ -{ mkDerivation, lib, stdenv, makeWrapper, fetchurl, cmake, extra-cmake-modules -, karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons -, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem -, kio, kcrash, breeze-icons -, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib -, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase -, qtmultimedia, qtx11extras, quazip -, python3Packages -}: +{ callPackage, ... } @ args: -mkDerivation rec { - pname = "krita"; - version = "4.4.7"; - - src = fetchurl { - url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-I6fFxPRCcRU5dyFXZPvGvTb9MuGikrvTaGCXpp4LRRk="; - }; - - nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ]; - - buildInputs = [ - karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons - ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons - boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib - openjpeg opencolorio_1 poppler curl ilmbase - qtmultimedia qtx11extras quazip - python3Packages.pyqt5 - ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc; - - NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ] - ++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy"; - - cmakeFlags = [ - "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" - "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" - "-DCMAKE_BUILD_TYPE=RelWithDebInfo" - ]; - - postInstall = '' - for i in $out/bin/*; do - wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" - done - ''; - - meta = with lib; { - description = "A free and open source painting application"; - homepage = "https://krita.org/"; - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.linux; - license = licenses.gpl3Only; - }; -} +callPackage ./generic.nix (args // { + version = "4.4.8"; + kde-channel = "stable"; + sha256 = "1y0d8gnxfdg5nfwk8dgx8fc2bwskvnys049napb1a9fr25bqmimw"; +}) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/krita/generic.nix b/third_party/nixpkgs/pkgs/applications/graphics/krita/generic.nix new file mode 100644 index 0000000000..efaf341b1f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/krita/generic.nix @@ -0,0 +1,59 @@ +{ mkDerivation, lib, stdenv, makeWrapper, fetchurl, cmake, extra-cmake-modules +, karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons +, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem +, kio, kcrash, breeze-icons +, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib +, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase +, qtmultimedia, qtx11extras, quazip +, python3Packages + +, version +, kde-channel +, sha256 + +, callPackage +}: + +mkDerivation rec { + pname = "krita"; + inherit version; + + src = fetchurl { + url = "https://download.kde.org/${kde-channel}/${pname}/${version}/${pname}-${version}.tar.gz"; + inherit sha256; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ]; + + buildInputs = [ + karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons + ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons + boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib + openjpeg opencolorio_1 poppler curl ilmbase + qtmultimedia qtx11extras quazip + python3Packages.pyqt5 + ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc; + + NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ] + ++ lib.optional stdenv.cc.isGNU "-Wno-deprecated-copy"; + + cmakeFlags = [ + "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" + "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" + "-DCMAKE_BUILD_TYPE=RelWithDebInfo" + ]; + + postInstall = '' + for i in $out/bin/*; do + wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" + done + ''; + + meta = with lib; { + description = "A free and open source painting application"; + homepage = "https://krita.org/"; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.linux; + license = licenses.gpl3Only; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix b/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix index dcd0aa498c..c7428387d2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.19.0"; + version = "0.20.9"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-sqCq9/QFygFcOUNCCBReD+eEk/8gvhMsuVD3g/ZPAFg="; + sha256 = "sha256-dm3bdKbUHI0FFcyYeYd2XSuZuoPsUhk4KcEwzPHiHM8="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/third_party/nixpkgs/pkgs/applications/misc/avizo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/avizo/default.nix new file mode 100644 index 0000000000..407dd70406 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/avizo/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub +, meson, ninja, pkg-config, vala +, gtk3, glib, gtk-layer-shell +, dbus, dbus-glib, librsvg +, gobject-introspection, gdk-pixbuf, wrapGAppsHook +}: + +stdenv.mkDerivation { + pname = "avizo"; + version = "unstable-2021-07-21"; + + src = fetchFromGitHub { + owner = "misterdanb"; + repo = "avizo"; + rev = "7b3874e5ee25c80800b3c61c8ea30612aaa6e8d1"; + sha256 = "sha256-ixAdiAH22Nh19uK5GoAXtAZJeAfCGSWTcGbrvCczWYc="; + }; + + nativeBuildInputs = [ meson ninja pkg-config vala gobject-introspection wrapGAppsHook ]; + + buildInputs = [ dbus dbus-glib gdk-pixbuf glib gtk-layer-shell gtk3 librsvg ]; + + postInstall = '' + substituteInPlace "$out"/bin/volumectl \ + --replace 'avizo-client' "$out/bin/avizo-client" + substituteInPlace "$out"/bin/lightctl \ + --replace 'avizo-client' "$out/bin/avizo-client" + ''; + + meta = with lib; { + description = "A neat notification daemon for Wayland"; + homepage = "https://github.com/misterdanb/avizo"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.berbiche ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/font-manager/default.nix b/third_party/nixpkgs/pkgs/applications/misc/font-manager/default.nix index 29399ab2f5..bd6ae3d747 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/font-manager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/font-manager/default.nix @@ -26,33 +26,21 @@ stdenv.mkDerivation rec { pname = "font-manager"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "FontManager"; repo = "master"; rev = version; - sha256 = "0a18rbdy9d0fj0vnsc2rm7xlh17vjqn4kdyrq0ldzlzkb6zbdk2k"; + sha256 = "lqXjGSsiWaMJGyr1c2Wt/bs4F8q51mQ1+f6vbZRQzVs="; }; patches = [ - # Fix some Desktop Settings with GNOME 40. - # https://github.com/FontManager/font-manager/issues/215 + # Fix compilation with latest Vala. + # https://github.com/FontManager/font-manager/issues/240 (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="; + url = "https://github.com/FontManager/font-manager/commit/f9c4621389dae5999ca9d2f3c8402c2512a9ea60.patch"; + sha256 = "ZEJZSUYFLKmiHpVusO3ZUXMLUzJbbbCSqMjCtwlzPRY="; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix index 3eb41f5ebe..3ff33a14f2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hubstaff/default.nix @@ -4,9 +4,9 @@ , curl, writeShellScript, common-updater-scripts }: let - url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.1-20f4dbb0/Hubstaff-1.6.1-20f4dbb0.sh"; - version = "1.6.1-20f4dbb0"; - sha256 = "097hpr4sjh14pidflvs8n1mkjpmij9l2vaan4m82vjrr0qdqi8qy"; + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.2-b5029032/Hubstaff-1.6.2-b5029032.sh"; + version = "1.6.2-b5029032"; + sha256 = "1q3gimg6bcpdnm1fkn1vq3b6shwgi6y84bixisyfcva5px7dmi4s"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft diff --git a/third_party/nixpkgs/pkgs/applications/misc/markets/default.nix b/third_party/nixpkgs/pkgs/applications/misc/markets/default.nix index bd9dd7ac95..d1d16a7c8c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/markets/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/markets/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "markets"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "bitstower"; repo = "markets"; rev = version; - sha256 = "0nk1bs7i6b7r90g5qwd3s2m462vk3kvza0drq7rzb5sdaiz9ccnz"; + sha256 = "0sfdmz7cp8i2bymippp8jyxsidxjn69v9cqm40q77j81kfm84bfv"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix index e6282d0acb..cc5ff18a2f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4807"; + version = "4808"; src = fetchurl { url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; - sha256 = "3DEcXopoCIcBANYrGclZH6K0JLgeYADXtPjQtobyfps="; + sha256 = "ooiXotpxdy99ViUQ0kFp0NoTowGEZjEoD31x+3XrW28="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix index 745d03bb18..fba1c0b0f5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix @@ -15,6 +15,7 @@ , hunspellWithDicts , intltool , isocodes +, libappindicator-gtk3 , libcanberra-gtk3 , mousetweaks , udev @@ -70,6 +71,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 hunspell isocodes + libappindicator-gtk3 libcanberra-gtk3 libxkbcommon mousetweaks @@ -78,7 +80,7 @@ python3.pkgs.buildPythonApplication rec { xorg.libxkbfile ] ++ lib.optional atspiSupport at-spi2-core; - propagatedBuildInputs = with python3.pkgs; [ + pythonPath = with python3.pkgs; [ dbus-python distutils_extra pyatspi diff --git a/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix b/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix index f8facbe01f..fe739cb581 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix @@ -65,7 +65,7 @@ buildPythonApplication rec { gobject-introspection ]; - propagatedBuildInputs = [ + pythonPath = [ pygobject3 pyatspi dbus-python diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix index b360733d50..93a8d6e088 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.13.33"; + version = "0.13.34"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "sha256-vKmVScXQLDjhNJEzlhqiyhRZjR26xjrT1LijxzZK8Cg="; + sha256 = "0p0nkqvkir6lriq75ingpfywn2yvyn3l35yxzk4aiq6vr2n7h3mw"; }; # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "sha256-0E4nk8WLprumHKQjpdn+U36z7mdgFb7g/i7egLk4Jcs="; + cargoSha256 = "1mzc6rnqcv97dlkl4j4p180f46wlyq45lc6nq7gqw396wc6m04km"; meta = with lib; { description = "A terminal user interface for taskwarrior "; diff --git a/third_party/nixpkgs/pkgs/applications/misc/themechanger/default.nix b/third_party/nixpkgs/pkgs/applications/misc/themechanger/default.nix new file mode 100644 index 0000000000..7dd52c8cce --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/themechanger/default.nix @@ -0,0 +1,65 @@ +{ lib +, gobject-introspection +, meson +, ninja +, pkg-config +, wrapGAppsHook +, desktop-file-utils +, glib +, gtk3 +, python3 +, gsettings-desktop-schemas +, python3Packages +, fetchFromGitHub +}: + +python3Packages.buildPythonApplication rec { + pname = "themechanger"; + version = "0.10.1"; + format = "other"; + + src = fetchFromGitHub { + owner = "ALEX11BR"; + repo = "ThemeChanger"; + rev = "v${version}"; + sha256 = "1bxxn5bmdwaxfvyh6z2rxklwnxgvv6kh5y9m8r1k7d0n4msx1x2h"; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkg-config + wrapGAppsHook + desktop-file-utils + gtk3 + ]; + + buildInputs = [ + glib + gtk3 + python3 + gsettings-desktop-schemas + ]; + + propagatedBuildInputs = with python3Packages; [ + pygobject3 + ]; + + postPatch = '' + patchShebangs postinstall.py + ''; + + meta = with lib; { + homepage = "https://github.com/ALEX11BR/ThemeChanger"; + description = "A theme changing utility for Linux"; + longDescription = '' + This app is a theme changing utility for Linux, BSDs, and whatnots. + It lets the user change GTK 2/3/4, Kvantum, icon and cursor themes, edit GTK CSS with live preview, and set some related options. + It also lets the user install icon and widget theme archives. + ''; + maintainers = with maintainers; [ ALEX11BR ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix index 2a322b2088..933464b626 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix @@ -1,14 +1,14 @@ { lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.27.0"; - name = "toot-${version}"; + pname = "toot"; + version = "0.28.0"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = version; - sha256 = "197g9lvwg8qnsf18kifcqdj3cpfdnxz9vay766rn9bi4nfz0s6j2"; + sha256 = "076r6l89gxjwxjpiklidcs8yajn5c2bnqjvbj4wc559iqdqj88lz"; }; checkInputs = with python3Packages; [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix b/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix index 576d66659a..c125c2f751 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix @@ -1,24 +1,31 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib +, python3Packages +, fetchFromGitHub +}: python3Packages.buildPythonApplication rec { pname = "urlscan"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = version; - sha256 = "D+WJ1HG1gXIFtIpaqazFqC9Y4GBCUsz88U8q8W9tHFA="; + sha256 = "sha256-Wg1QecSMyifID9uIvVWrmkHax4FbbwEcoXIZ8V8P3FU="; }; - propagatedBuildInputs = [ python3Packages.urwid ]; + propagatedBuildInputs = [ + python3Packages.urwid + ]; doCheck = false; # No tests available + pythonImportsCheck = [ "urlscan" ]; + meta = with lib; { description = "Mutt and terminal url selector (similar to urlview)"; homepage = "https://github.com/firecat53/urlscan"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ dpaetzel jfrankenau ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index e5e56137b8..53c4145cee 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -92,11 +92,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.30.87"; + version = "1.30.89"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "0mx1vnrip1y87g6zj9sdcf5siihwn0b6v1q106d9kz89znpzd64s"; + sha256 = "2fu6Nk/eMLQ9nYy1aZDpjnRg16YosQPqdKtJ2VAYBrw="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index 4b7fbc38bb..e269d6313a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -53,9 +53,6 @@ buildFun: with lib; let - python2WithPackages = python2.withPackages(ps: with ps; [ - ply jinja2 setuptools - ]); python3WithPackages = python3.withPackages(ps: with ps; [ ply jinja2 setuptools ]); @@ -125,7 +122,7 @@ let nativeBuildInputs = [ ninja pkg-config - python2WithPackages python3WithPackages perl + python2 python3WithPackages perl gnutar which llvmPackages.bintools ]; @@ -308,7 +305,7 @@ let # This is to ensure expansion of $out. libExecPath="${libExecPath}" - ${python2}/bin/python2 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} + ${python3}/bin/python3 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt # Fail if `gn gen` contains a WARNING. diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix index 6928496ae6..c0542014b7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-I3U2Jh+PSF+j8Kuv5RejYwiMC1JYBpkYQGsgIFi7LL0="; + sha256 = "sha256-iJ6+tc5nls8E/9/Jp5OS9gfJo8SJ5bN+Im/JzEYEAfI="; fetchSubmodules = true; }; @@ -61,8 +61,5 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; - # macOS SDK 10.13 or later required - # See https://github.com/NixOS/nixpkgs/issues/101229 - broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index 6477f4fbe0..4e44e58418 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "4.1.2369.21-1"; + version = "4.3.2439.44-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "03062mik6paqp219jz420jsg762jjrfxmj1daq129z2zgzq0qr8l"; + sha256 = "1bsx8axs438f4p019mdq66pmpimf575r31rv6cibpgv85366xhh9"; }; unpackPhase = '' @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { buildPhase = '' runHook preBuild echo "Patching Vivaldi binaries" - for f in crashpad_handler vivaldi-bin vivaldi-sandbox ; do + for f in chrome_crashpad_handler vivaldi-bin vivaldi-sandbox ; do patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index e27cae50a8..15ce26b6db 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -563,10 +563,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.4.1", - "sha256": "0mk0f12yy58gjkki7xpf9bjfw9h9zdgby2b4bddqp5csq11payhd", + "rev": "v2.5.0", + "sha256": "1hp3bwhlfiwf1a4l6xfldwdxmyjs4nq3n8g343grjya7ibbhh4sg", "vendorSha256": null, - "version": "2.4.1" + "version": "2.5.0" }, "launchdarkly": { "owner": "terraform-providers", diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index f1bce0b8fc..9cca8b95b8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.9.0", + "version": "1.9.2", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -57,7 +57,7 @@ "allchange": "^1.0.2", "asar": "^2.0.1", "chokidar": "^3.5.2", - "electron": "13", + "electron": "13.5", "electron-builder": "22.11.4", "electron-builder-squirrel-windows": "22.11.4", "electron-devtools-installer": "^3.1.1", @@ -83,7 +83,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "13.4.0", + "electronVersion": "13.5.1", "files": [ "package.json", { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index 3aeaf58dbc..f17cfd900a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -729,6 +729,14 @@ sha1 = "2b9252bd4fdf0393696190cd9550901dd967c777"; }; } + { + name = "_types_node___node_14.17.21.tgz"; + path = fetchurl { + name = "_types_node___node_14.17.21.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.21.tgz"; + sha1 = "6359d8cf73481e312a43886fa50afc70ce5592c6"; + }; + } { name = "_types_plist___plist_3.0.2.tgz"; path = fetchurl { @@ -1626,11 +1634,11 @@ }; } { - name = "core_js___core_js_3.17.3.tgz"; + name = "core_js___core_js_3.18.2.tgz"; path = fetchurl { - name = "core_js___core_js_3.17.3.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.17.3.tgz"; - sha1 = "8e8bd20e91df9951e903cabe91f9af4a0895bc1e"; + name = "core_js___core_js_3.18.2.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.18.2.tgz"; + sha1 = "63a551e8a29f305cd4123754846e65896619ba5b"; }; } { @@ -2002,11 +2010,11 @@ }; } { - name = "electron___electron_13.4.0.tgz"; + name = "electron___electron_13.5.1.tgz"; path = fetchurl { - name = "electron___electron_13.4.0.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-13.4.0.tgz"; - sha1 = "f9f9e518d8c6bf23bfa8b69580447eea3ca0f880"; + name = "electron___electron_13.5.1.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-13.5.1.tgz"; + sha1 = "76c02c39be228532f886a170b472cbd3d93f0d0f"; }; } { @@ -2154,13 +2162,21 @@ }; } { - name = "2306b3d4da4eba908b256014b979f1d3d43d2945"; - path = fetchurl { - name = "2306b3d4da4eba908b256014b979f1d3d43d2945"; - url = "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/2306b3d4da4eba908b256014b979f1d3d43d2945"; - sha1 = "e82e07e6163d15ee5243d8df073947540bf0efc9"; - }; - } + name = "2306b3d4da4eba908b256014b979f1d3d43d2945"; + path = + let + repo = fetchgit { + url = "https://github.com/matrix-org/eslint-plugin-matrix-org.git"; + rev = "2306b3d4da4eba908b256014b979f1d3d43d2945"; + sha256 = "0ywgrls2phviz47kzsjrxijkdbs1ky77471fbq9cnpj0fs3si81c"; + }; + in + runCommand "2306b3d4da4eba908b256014b979f1d3d43d2945" { buildInputs = [gnutar]; } '' + # Set u+w because tar-fs can't unpack archives with read-only dirs + # https://github.com/mafintosh/tar-fs/issues/79 + tar cf $out --mode u+w -C ${repo} . + ''; + } { name = "eslint_scope___eslint_scope_5.1.1.tgz"; path = fetchurl { @@ -3506,13 +3522,21 @@ }; } { - name = "e5c7071e0cdf715de87ef39dc8260e11d7add2f8"; - path = fetchurl { - name = "e5c7071e0cdf715de87ef39dc8260e11d7add2f8"; - url = "https://codeload.github.com/matrix-org/matrix-web-i18n/tar.gz/e5c7071e0cdf715de87ef39dc8260e11d7add2f8"; - sha1 = "efbc392e3523669d20b812a6dae2f6efb49b888d"; - }; - } + name = "e5c7071e0cdf715de87ef39dc8260e11d7add2f8"; + path = + let + repo = fetchgit { + url = "https://github.com/matrix-org/matrix-web-i18n.git"; + rev = "e5c7071e0cdf715de87ef39dc8260e11d7add2f8"; + sha256 = "0whjmf23m3204ifgx3spfnlg9pwm956fc16gjxgp9ia0d93xrpn6"; + }; + in + runCommand "e5c7071e0cdf715de87ef39dc8260e11d7add2f8" { buildInputs = [gnutar]; } '' + # Set u+w because tar-fs can't unpack archives with read-only dirs + # https://github.com/mafintosh/tar-fs/issues/79 + tar cf $out --mode u+w -C ${repo} . + ''; + } { name = "memoizee___memoizee_0.4.15.tgz"; path = fetchurl { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index c14f408441..bcd6dac47e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -19,12 +19,12 @@ let executableName = "element-desktop"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-vsLu41n3oCSyyPLgASs7jZViu6DPkWmMfSO7414VPO4="; + sha256 = "sha256-F1uyyBbs+U7tQzRtn+p923Z/BY8Nwxr/JTMYwsak8W8="; }; electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; in diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix index d1f128dda1..ca10fb2131 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.9.0"; + version = "1.9.2"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-QMLa1Bgz9feAAR9PKVXAzlRDztJBZnGIG+SsPgwvYRw="; + sha256 = "sha256-Qkn0vyZGvBAeOfTzxydWzjFQJwY39INAhwZNX4xsM7U="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh index 69d0d3d707..3bbc2f3fb4 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../../ -i bash -p wget yarn2nix +#!nix-shell -I nixpkgs=../../../../../ -i bash -p wget yarn2nix nix-prefetch-git set -euo pipefail @@ -13,5 +13,5 @@ RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/element-desktop/$1" wget "$RIOT_WEB_SRC/package.json" -O element-desktop-package.json wget "$RIOT_WEB_SRC/yarn.lock" -O element-desktop-yarndeps.lock -yarn2nix --lockfile=element-desktop-yarndeps.lock > element-desktop-yarndeps.nix +yarn2nix --no-patch --lockfile=element-desktop-yarndeps.lock > element-desktop-yarndeps.nix rm element-desktop-yarndeps.lock diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix index db30ede8a1..a4693dc667 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -1,43 +1,74 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub -, qmake, pkg-config, olm, wrapQtAppsHook -, qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qtgraphicaleffects -, python3Packages, pyotherside, libXScrnSaver +{ lib +, stdenv +, mkDerivation +, fetchFromGitHub +, libXScrnSaver +, olm +, pkg-config +, pyotherside +, python3Packages +, qmake +, qtbase +, qtgraphicaleffects +, qtkeychain +, qtmultimedia +, qtquickcontrols2 +, wrapQtAppsHook }: -let - pypkgs = with python3Packages; [ - aiofiles filetype matrix-nio appdirs cairosvg - pymediainfo setuptools html-sanitizer mistune blist - pyotherside - ]; -in mkDerivation rec { pname = "mirage"; - version = "0.6.4"; + version = "0.7.2"; src = fetchFromGitHub { owner = "mirukana"; repo = pname; rev = "v${version}"; - sha256 = "15x0x2rf4fzsd0zr84fq3j3ddzkgc5il8s54jpxk8wl4ah03g4nv"; + sha256 = "sha256-dJS4lAXHHNUEAG75gQaS9+aQTTTj8KHqHjISioynFdY="; fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook python3Packages.wrapPython ]; - - buildInputs = [ - qtbase qtmultimedia - qtquickcontrols2 - qtkeychain qtgraphicaleffects - olm pyotherside - libXScrnSaver + nativeBuildInputs = [ + pkg-config + python3Packages.wrapPython + qmake + wrapQtAppsHook ]; - propagatedBuildInputs = pypkgs; + buildInputs = [ + libXScrnSaver + olm + pyotherside + qtbase + qtgraphicaleffects + qtkeychain + qtmultimedia + qtquickcontrols2 + ] ++ pythonPath; - pythonPath = pypkgs; + pythonPath = with python3Packages; [ + aiofiles + appdirs + blist + cairosvg + filetype + html-sanitizer + hsluv + matrix-nio + mistune + plyer + pymediainfo + pyotherside + redbaron + simpleaudio + setuptools + watchgod + ]; - qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=qtquickcompiler" ]; + qmakeFlags = [ + "PREFIX=${placeholder "out"}" + "CONFIG+=qtquickcompiler" + ]; dontWrapQtApps = true; postInstall = '' @@ -45,14 +76,14 @@ mkDerivation rec { wrapProgram $out/bin/mirage \ --prefix PYTHONPATH : "$PYTHONPATH" \ "''${qtWrapperArgs[@]}" - ''; + ''; meta = with lib; { - description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication"; homepage = "https://github.com/mirukana/mirage"; - license = licenses.lgpl3; - maintainers = with maintainers; [ colemickens ]; - broken = stdenv.isDarwin; + description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ colemickens AndersonTorres ]; inherit (qtbase.meta) platforms; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 7db77fbc31..7550e72277 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.75.0.140"; + version = "8.77.0.97"; rpath = lib.makeLibraryPath [ alsa-lib @@ -69,7 +69,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "sha256-z3xsl53CSJthSd/BMbMD7RdYQ4z9oI/Rb9jUvd82H4E="; + sha256 = "sha256-0u1fpKJrsEgbvTwdkqJZ/SwCRDmJwEi9IXHbMmY8MJI="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix index 2a91e3ebdd..504481479e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,25 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, gtk2, lua, perl, python3 +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, gtk2, lua, perl, python3Packages , pciutils, dbus-glib, libcanberra-gtk2, libproxy , enchant2, libnotify, openssl, isocodes , desktop-file-utils -, meson, ninja +, meson, ninja, makeWrapper }: stdenv.mkDerivation rec { pname = "hexchat"; - version = "2.14.3"; + version = "2.16.0"; src = fetchFromGitHub { owner = "hexchat"; repo = "hexchat"; rev = "v${version}"; - sha256 = "08kvp0dcn3bvmlqcfp9312075bwkqkpa8m7zybr88pfp210gfl85"; + sha256 = "08zhlf9d3xdis62byxzgizhfg8kbppxl7cgxkzhwdc1srpj7vpx6"; }; - nativeBuildInputs = [ meson ninja pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config makeWrapper ]; buildInputs = [ - gtk2 lua perl python3 pciutils dbus-glib libcanberra-gtk2 libproxy + gtk2 lua perl python3Packages.python python3Packages.cffi pciutils dbus-glib libcanberra-gtk2 libproxy libnotify openssl desktop-file-utils isocodes ]; @@ -30,9 +30,10 @@ stdenv.mkDerivation rec { sed -i "/flag.startswith('-I')/i if flag.contains('no-such-path')\ncontinue\nendif" plugins/perl/meson.build chmod +x meson_post_install.py for f in meson_post_install.py \ - src/common/make-te.py \ plugins/perl/generate_header.py \ - po/validate-textevent-translations + plugins/python/generate_plugin.py \ + po/validate-textevent-translations \ + src/common/make-te.py do patchShebangs $f done @@ -40,6 +41,10 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dwith-lua=lua" "-Dwith-text=true" ]; + postInstall = '' + wrapProgram $out/bin/hexchat --prefix PYTHONPATH : "$PYTHONPATH" + ''; + meta = with lib; { description = "A popular and easy to use graphical IRC (chat) client"; homepage = "https://hexchat.github.io/"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 2a6b0892bf..baad7602cf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.40.4"; + version = "3.42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0eAjb8gWhiyjqaOT5ur9gPoQv6W2u37u28qAJVMuUBU="; + sha256 = "1byi1ksimbycd0daxp5j240r3n5qlaa4b3c5l9jzkjr9g3gkclsq"; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 638d607777..564a4c5499 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.40.4"; + version = "3.42.0"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "BYXp36VQQOySNTWgRIdiRl2J4zE1Cawya76Eal1mA3Q="; + sha256 = "0yj2hifis5m2cy59skn07d8n69444vlsw62ildr1fv67zxbblib8"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix index a7b90c284a..a94555e795 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0s9wkygjd7xhvd1zdaidbvszq4abb0iv5830ir65glcfzbdbfak9"; + sha256 = "0z74slnq3y9wr1xr07jigz4n8dgxhk9qb0787sd0j6wj9g4rqxgg"; }; patches = optional smimeSupport (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix index 75f620ead9..a14e55e51f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix @@ -1,26 +1,42 @@ -{ lib, stdenv, fetchurl, pkg-config, gnutls, gsasl, libidn, Security }: - -with lib; +{ lib +, stdenv +, fetchurl +, gnutls +, gsasl +, libidn +, pkg-config +, Security +}: stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.14"; + version = "1.4.15"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "046wbglvry54id9wik6c020fs09piv3gig3z0nh5nmyhsxjw4i18"; + sha256 = "sha256-P1KytdS8WO2TzwsRRs7k903oHCwHol7gMu+mWUZaAnA="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gnutls gsasl libidn ] - ++ optional stdenv.isDarwin Security; + nativeBuildInputs = [ + pkg-config + ]; - configureFlags = optional stdenv.isDarwin [ "--with-macosx-keyring" ]; + buildInputs = [ + gnutls + gsasl + libidn + ] ++ lib.optional stdenv.isDarwin [ + Security + ]; - meta = { - description = "POP3 mail retrieval agent"; - homepage = "https://marlam.de/mpop"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - }; + configureFlags = lib.optional stdenv.isDarwin [ + "--with-macosx-keyring" + ]; + + meta = with lib;{ + description = "POP3 mail retrieval agent"; + homepage = "https://marlam.de/mpop"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix index cfb228514c..ad791f46d7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/freenet/default.nix @@ -15,7 +15,7 @@ let url = "https://downloads.freenetproject.org/alpha/opennet/seednodes.fref"; sha256 = "08awwr8n80b4cdzzb3y8hf2fzkr1f2ly4nlq779d6pvi5jymqdvv"; }; - version = "build01475"; + version = "build01480"; freenet-jars = stdenv.mkDerivation { pname = "freenet-jars"; @@ -25,7 +25,7 @@ let owner = "freenet"; repo = "fred"; rev = version; - sha256 = "0k02fna9x219j7dhginbnf27i36bibb0rmm4qdwr5xm28hy1nd08"; + sha256 = "0wddkfyhsgs7bcq9svicz6l0a35yv82yqzmji3c345hg4hbch3kb"; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix index 1b564e8daf..158f2aa327 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix @@ -1,16 +1,16 @@ { mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg-utils, dbus -, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc -, libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes +, qtbase, qtwebkit, qtwebengine, qtx11extras, qtquickcontrols, getconf, glibc +, libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes, coreutils , wrapQtAppsHook }: mkDerivation rec { pname = "teamviewer"; - version = "15.15.5"; + version = "15.22.3"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "sha256-H/CSc2RcjI+Fm8awYcXm3ioAJpbSNEMwGVrTozMux3A="; + sha256 = "15fvzhdq7mnx2l2w4byvij8ww16qwdlkbadal60rm66yzv79mv9w"; }; unpackPhase = '' @@ -19,7 +19,7 @@ mkDerivation rec { ''; nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapQtAppsHook ]; - buildInputs = [ dbus qtbase qtwebkit qtx11extras libX11 ]; + buildInputs = [ dbus getconf qtbase qtwebkit qtwebengine qtx11extras libX11 ]; propagatedBuildInputs = [ qtquickcontrols ]; installPhase = '' @@ -28,6 +28,7 @@ mkDerivation rec { rm -R \ $out/share/teamviewer/logfiles \ $out/share/teamviewer/config \ + $out/share/teamviewer/tv_bin/RTlib \ $out/share/teamviewer/tv_bin/xdg-utils \ $out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,libdepend,tv-delayed-start.sh} @@ -38,6 +39,27 @@ mkDerivation rec { ln -s /var/log/teamviewer $out/share/teamviewer/logfiles ln -s ${xdg-utils}/bin $out/share/teamviewer/tv_bin/xdg-utils + declare in_script_dir="./opt/teamviewer/tv_bin/script" + + install -d "$out/share/dbus-1/services" + install -m 644 "$in_script_dir/com.teamviewer.TeamViewer.service" "$out/share/dbus-1/services" + substituteInPlace "$out/share/dbus-1/services/com.teamviewer.TeamViewer.service" \ + --replace '/opt/teamviewer/tv_bin/TeamViewer' \ + "$out/share/teamviewer/tv_bin/TeamViewer" + install -m 644 "$in_script_dir/com.teamviewer.TeamViewer.Desktop.service" "$out/share/dbus-1/services" + substituteInPlace "$out/share/dbus-1/services/com.teamviewer.TeamViewer.Desktop.service" \ + --replace '/opt/teamviewer/tv_bin/TeamViewer_Desktop' \ + "$out/share/teamviewer/tv_bin/TeamViewer_Desktop" + + install -d "$out/share/dbus-1/system.d" + install -m 644 "$in_script_dir/com.teamviewer.TeamViewer.Daemon.conf" "$out/share/dbus-1/system.d" + + install -d "$out/share/polkit-1/actions" + install -m 644 "$in_script_dir/com.teamviewer.TeamViewer.policy" "$out/share/polkit-1/actions" + substituteInPlace "$out/share/polkit-1/actions/com.teamviewer.TeamViewer.policy" \ + --replace '/opt/teamviewer/tv_bin/script/execscript' \ + "$out/share/teamviewer/tv_bin/script/execscript" + for i in 16 20 24 32 48 256; do size=$i"x"$i @@ -51,17 +73,23 @@ mkDerivation rec { --replace '/lib64/ld-linux-x86-64.so.2' '${glibc.out}/lib/ld-linux-x86-64.so.2' substituteInPlace $out/share/teamviewer/tv_bin/script/tvw_config \ --replace '/var/run/' '/run/' + ''; - wrapProgram $out/share/teamviewer/tv_bin/script/teamviewer --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 ]}" - wrapProgram $out/share/teamviewer/tv_bin/teamviewerd --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 ]}" - wrapProgram $out/share/teamviewer/tv_bin/TeamViewer --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 ]}" - wrapProgram $out/share/teamviewer/tv_bin/TeamViewer_Desktop --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [libXrandr libX11 libXext libXdamage libXtst libSM libXfixes ]}" + makeWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ getconf coreutils ]}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libXrandr libX11 libXext libXdamage libXtst libSM libXfixes dbus ]}" + ]; - wrapQtApp $out/share/teamviewer/tv_bin/script/teamviewer - wrapQtApp $out/bin/teamviewer + postFixup = '' + wrapProgram $out/share/teamviewer/tv_bin/teamviewerd ''${makeWrapperArgs[@]} + # tv_bin/script/teamviewer runs tvw_main which runs tv_bin/TeamViewer + wrapProgram $out/share/teamviewer/tv_bin/script/teamviewer ''${makeWrapperArgs[@]} ''${qtWrapperArgs[@]} + wrapProgram $out/share/teamviewer/tv_bin/teamviewer-config ''${makeWrapperArgs[@]} ''${qtWrapperArgs[@]} + wrapProgram $out/share/teamviewer/tv_bin/TeamViewer_Desktop ''${makeWrapperArgs[@]} ''${qtWrapperArgs[@]} ''; dontStrip = true; + dontWrapQtApps = true; preferLocalBuild = true; meta = with lib; { @@ -69,6 +97,6 @@ mkDerivation rec { license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jagajaga dasuxullebt ]; + maintainers = with maintainers; [ jagajaga dasuxullebt jraygauthier ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/calligra/default.nix b/third_party/nixpkgs/pkgs/applications/office/calligra/default.nix index 2ecc334c3d..0343774261 100644 --- a/third_party/nixpkgs/pkgs/applications/office/calligra/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/calligra/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools +{ mkDerivation, lib, fetchpatch, fetchurl, extra-cmake-modules, kdoctools , boost, qtwebkit, qtx11extras, shared-mime-info , breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets , kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n @@ -21,6 +21,17 @@ mkDerivation rec { sha256 = "0iqi6z6gkck2afgy200dacgcspq7i7887alcj0pklm08hbmsdy5i"; }; + patches = [ + # Fix fontconfig underlinking: https://github.com/NixOS/nixpkgs/issues/137794 + # Can be dropped on next release. + (fetchpatch { + name = "fix-fontconfig-linking.patch"; + url = "https://github.com/KDE/calligra/commit/62f510702ef9c34ac50f8d8601a4290ab558464c.patch"; + sha256 = "11dzrp9q05dmvnwp4vk4ihcibqcf4xyr0ijscpi716cyy730flma"; + excludes = [ "CMakeLists.txt" ]; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/samtools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/samtools/default.nix index 20d9565bce..99210092a1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/samtools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/samtools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "samtools"; - version = "1.11"; + version = "1.13"; src = fetchurl { url = "https://github.com/samtools/samtools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1dp5wknak4arnw5ghhif9mmljlfnw5bgm91wib7z0j8wdjywx0z2"; + sha256 = "sha256-YWyi4FHMgAmh6cAc/Yx8r4twkW3f9m87dpFAeUZfjGA="; }; nativeBuildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix index b539df7592..bb6af8a20f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,16 +1,29 @@ -{ lib, stdenv, fetchurl, glib, gtk3, gperf, pkg-config, bzip2, tcl, tk, wrapGAppsHook, judy, xz }: +{ bzip2 +, fetchurl +, glib +, gperf +, gtk3 +, judy +, lib +, pkg-config +, stdenv +, tcl +, tk +, wrapGAppsHook +, xz +}: stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.110"; + version = "3.3.111"; src = fetchurl { - url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "sha256-Ku25IVa8ot3SWxODeMrOaxBY5X022TnvD3l2kAa3Wao="; + url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; + sha256 = "0cv222qhgldfniz6zys52zhrynfsp5v0h8ia857lng7v33vw5qdl"; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - buildInputs = [ glib gtk3 gperf bzip2 tcl tk judy xz ]; + buildInputs = [ bzip2 glib gperf gtk3 judy tcl tk xz ]; configureFlags = [ "--with-tcl=${tcl}/lib" @@ -21,9 +34,9 @@ stdenv.mkDerivation rec { meta = { description = "VCD/Waveform viewer for Unix and Win32"; - homepage = "http://gtkwave.sourceforge.net"; - license = lib.licenses.gpl2Plus; + homepage = "http://gtkwave.sourceforge.net"; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ thoughtpolice ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix index 963015b11d..837f25e320 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix @@ -2,13 +2,13 @@ let pname = "alt-ergo"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "OCamlPro"; repo = pname; rev = version; - sha256 = "1jm1yrvsg8iyfp9bb728zdx2i7yb6z7minjrfs27k5ncjqkjm65g"; + sha256 = "0hglj1p0753w2isds01h90knraxa42d2jghr35dpwf9g8a1sm9d3"; }; useDune2 = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix index e595bf47c6..723b67872c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix @@ -44,6 +44,7 @@ let "8.13.0".sha256 = "0sjbqmz6qcvnz0hv87xha80qbhvmmyd675wyc5z4rgr34j2l1ymd"; "8.13.1".sha256 = "0xx2ns84mlip9bg2mkahy3pmc5zfcgrjxsviq9yijbzy1r95wf0n"; "8.13.2".sha256 = "1884vbmwmqwn9ngibax6dhnqh4cc02l0s2ajc6jb1xgr0i60whjk"; + "8.14+rc1".sha256 = "0jrkgj7c2959dsinw4x7q4ril1x24qq08snl25hgx33ls4sym5zb"; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix @@ -163,7 +164,7 @@ self = stdenv.mkDerivation { prefixKey = "-prefix "; - buildFlags = [ "revision" "coq" "coqide" "bin/votour" ]; + buildFlags = [ "revision" "coq" "coqide" ] ++ optional (!versionAtLeast "8.14") "bin/votour"; enableParallelBuilding = true; createFindlibDestdir = true; @@ -177,9 +178,11 @@ self = stdenv.mkDerivation { categories = "Development;Science;Math;IDE;GTK"; }); - postInstall = '' + postInstall = let suffix = if versionAtLeast "8.14" then "-core" else ""; in '' cp bin/votour $out/bin/ - ln -s $out/lib/coq $OCAMLFIND_DESTDIR/coq + ln -s $out/lib/coq${suffix} $OCAMLFIND_DESTDIR/coq${suffix} + '' + optionalString (versionAtLeast "8.14") '' + ln -s $out/lib/coqide-server $OCAMLFIND_DESTDIR/coqide-server '' + optionalString buildIde '' mkdir -p "$out/share/pixmaps" ln -s "$out/share/coq/coq.png" "$out/share/pixmaps/" diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/yices/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/yices/default.nix index c26504bf7b..55b773b976 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/yices/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/yices/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, gmp-static, gperf, autoreconfHook, libpoly }: +{ lib, stdenv, fetchFromGitHub, cudd, gmp-static, gperf, autoreconfHook, libpoly }: stdenv.mkDerivation rec { pname = "yices"; - version = "2.6.1"; + version = "2.6.3"; src = fetchFromGitHub { owner = "SRI-CSL"; repo = "yices2"; rev = "Yices-${version}"; - sha256 = "04vf468spsh00jh7gj94cjnq8kjyfwy9l6r4z7l2pm0zgwkqgyhm"; + sha256 = "01fi818lbkwilfcf1dz2dpxkcc1kh8ls0sl5aynyx9pwfn2v03zl"; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ gmp-static gperf libpoly ]; + buildInputs = [ cudd gmp-static gperf libpoly ]; configureFlags = [ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a" "--with-static-gmp-include-dir=${gmp-static.dev}/include" diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/z3/4.4.0.nix b/third_party/nixpkgs/pkgs/applications/science/logic/z3/4.4.0.nix index 9b7dabeb72..2fbaa0a28c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/z3/4.4.0.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/z3/4.4.0.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # z3's install phase is stupid because it tries to calculate the # python package store location itself, meaning it'll attempt to # write files into the nix store, and fail. - soext = if stdenv.system == "x86_64-darwin" then ".dylib" else ".so"; + soext = stdenv.hostPlatform.extensions.sharedLibrary; installPhase = '' mkdir -p $out/bin $out/lib/${python.libPrefix}/site-packages $out/include cp ../src/api/z3*.h $out/include diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/emuflight-configurator/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/emuflight-configurator/default.nix index ab94df9ef1..ca486006fe 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/emuflight-configurator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/emuflight-configurator/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "emuflight-configurator"; - version = "0.3.6"; + version = "0.4.0"; src = fetchurl { url = "https://github.com/emuflight/EmuConfigurator/releases/download/${version}/emuflight-configurator_${version}_linux64.zip"; - sha256 = "sha256-egSUd/+RNo0vr2EJibgk9nNnql5sHC11gctUMK+DzW0="; + sha256 = "sha256-s5AE+r9Fw6S7IG2cDW2T7vctcYIAY8al7eCFIDjD5oI="; }; nativeBuildInputs = [ wrapGAppsHook unzip copyDesktopItems ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix index 4d231aa6e4..12d8ef7c0b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.44"; + version = "1.8.45"; src = fetchPypi { inherit pname version; - sha256 = "104000a0e57ef4591bdf28addf8057339b22cbff9501ba92b9b1720d0b2b7325"; + sha256 = "f1010cefb5b97a5d392d32aa1425bdb7df995161125f8686f2c7383c2a86e9e5"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/ctx/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/ctx/default.nix new file mode 100644 index 0000000000..78c673d035 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/ctx/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchgit +, SDL2 +, alsa-lib +, babl +, curl +, libdrm # Not documented +, pkg-config +, enableFb ? false +}: + +stdenv.mkDerivation rec { + pname = "ctx"; + version = "0.pre+date=2021-10-09"; + + src = fetchgit { + name = "ctx-source"; # because of a dash starting the directory + url = "https://ctx.graphics/.git/"; + rev = "d11d0d1a719a3c77712528e2feed8c0878e0ea64"; + sha256 = "sha256-Az3POgdvDOVaaRtzLlISDODhAKbefpGx5KgwO3dttqs="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + SDL2 + alsa-lib + babl + curl + libdrm + ]; + + configureScript = "./configure.sh"; + configureFlags = lib.optional enableFb "--enable-fb"; + dontAddPrefix = true; + + hardeningDisable = [ "format" ]; + + installFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = with lib; { + homepage = "https://ctx.graphics/"; + description = "Vector graphics terminal"; + longDescription= '' + ctx is an interactive 2D vector graphics, audio, text- canvas and + terminal, with escape sequences that enable a 2D vector drawing API using + a vector graphics protocol. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix index 65411c77ec..4126eabed2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.17"; + version = "2.17.1"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-/6BAGZo8GwsmXXGLJ2oTxIbgOCwP5p6Vh4wABSvAGZM="; + sha256 = "sha256-ZVwMfjlKga47oXf6g/P2IAMu6Fcuj8BbRahniTZXmTg="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix index 1fbb099e01..748e34c33a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.7.2"; + version = "8.0.1"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "sha256-jL0XLw0V0ED+lDBn3sGaJmm96zQwXue333UuYGHjB64="; + sha256 = "1n88m41424qwsfp2hy58piqpv2dk6i74hcj184aq6njllvnsznnq"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/verco/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/verco/default.nix index 538544c5b2..814ffacefc 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/verco/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/verco/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "verco"; - version = "6.5.5"; + version = "6.6.0"; src = fetchFromGitHub { owner = "vamolessa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-n+GGiu/xGGGC6FQPoASok87bCG0MFVIf6l6nt1lvw8A="; + sha256 = "sha256-ZfiGDEx6gjYziatbQSpqghmpXMXSPPBtTVYjll922t8="; }; - cargoSha256 = "sha256-lNtR4N+bFFCr3Ct99DJCbtDeKxTzT7ZjvAWixbQm3jg="; + cargoSha256 = "sha256-jrA6vGw+lyfix8L3INBamrJ4pab5denPzWwjF0dRXB0="; meta = with lib; { description = "A simple Git/Mercurial/PlasticSCM tui client based on keyboard shortcuts"; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix index 02281514bf..1ad0dee49c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix @@ -46,7 +46,7 @@ let owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "0qc3rf6fv6k35iq5p0j86kpyghzl9djqxl6526fxknvrlw0xnh9j"; + sha256 = "sha256-w5m7xlnjQDJ4l75b3ctF0wMZ4kqi+H0X6WFLs0gV6lM="; }; ffmpeg = stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix index 400232d224..c9ec18593d 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/wrapper.nix @@ -2,7 +2,6 @@ , runCommand , makeWrapper , lib -, stdenv , extraPackages ? [] , podman # Docker compat , runc # Default container runtime @@ -14,15 +13,12 @@ , cni-plugins # not added to path , iptables , iproute2 -, gvproxy -, qemu -, xz }: let podman = podman-unwrapped; - binPath = lib.makeBinPath ([ ] ++ lib.optionals stdenv.isLinux [ + binPath = lib.makeBinPath ([ runc crun conmon @@ -31,10 +27,6 @@ let util-linux iptables iproute2 - ] ++ lib.optionals stdenv.isDarwin [ - gvproxy - qemu - xz ] ++ extraPackages); in runCommand podman.name { diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix index d3da358b63..fe4b2be479 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix @@ -1,9 +1,10 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cairo , fontconfig +, libevdev +, libinput , libxkbcommon , makeWrapper , mesa @@ -23,24 +24,15 @@ stdenv.mkDerivation rec { pname = "cagebreak"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "project-repo"; repo = pname; rev = version; - hash = "sha256-1IztedN5/I/4TDKHLJ26fSrDsvJ5QAr+cbzS2PQITDE="; + hash = "sha256-tWfHJajAOYZJ73GckZWWTdVz75YmHA7t/qDhM7+tJgk="; }; - patches = [ - # To fix the build with wlroots 0.14.0: - (fetchpatch { - # Add fixes for wlroots 0.14.0 - url = "https://github.com/project-repo/cagebreak/commit/d57869d43add58331386fc8e89c14bb2b74afe17.patch"; - sha256 = "0g6sl8y4kk0bm5x6pxqbxw2j0gyg3ybr2v9m70q2pxp70kms4lqg"; - }) - ]; - nativeBuildInputs = [ makeWrapper meson @@ -53,6 +45,8 @@ stdenv.mkDerivation rec { buildInputs = [ cairo fontconfig + libevdev + libinput libxkbcommon mesa # for libEGL headers pango diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/default.nix index a51c80bf08..7aa62e69df 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/default.nix @@ -1,7 +1,9 @@ { fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev , yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon -, xorgserver, xvfb-run }: +, xorgserver, xvfb-run +, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs +}: stdenv.mkDerivation rec { pname = "i3"; @@ -12,7 +14,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-im7hd2idzyKWTSC2CTAU7k+gQZNF0/1RXVUS2ZgLsnk="; }; - nativeBuildInputs = [ pkg-config makeWrapper meson ninja installShellFiles ]; + nativeBuildInputs = [ + pkg-config makeWrapper meson ninja installShellFiles + asciidoc xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs + ]; + + mesonFlags = [ + "-Ddocs=true" + "-Dmans=true" + ]; buildInputs = [ libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon diff --git a/third_party/nixpkgs/pkgs/build-support/build-dotnet-module/default.nix b/third_party/nixpkgs/pkgs/build-support/build-dotnet-module/default.nix new file mode 100644 index 0000000000..0c1a1f686e --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/build-dotnet-module/default.nix @@ -0,0 +1,144 @@ +{ lib, stdenv, makeWrapper, dotnetCorePackages, dotnetPackages, cacert, linkFarmFromDrvs, fetchurl }: + +{ name ? "${args.pname}-${args.version}" +, enableParallelBuilding ? true +# Flags to pass to `makeWrapper`. This is done to avoid double wrapping. +, makeWrapperArgs ? [] + +# Flags to pass to `dotnet restore`. +, dotnetRestoreFlags ? [] +# Flags to pass to `dotnet build`. +, dotnetBuildFlags ? [] +# Flags to pass to `dotnet install`. +, dotnetInstallFlags ? [] +# Flags to pass to dotnet in all phases. +, dotnetFlags ? [] + +# The binaries that should get installed to `$out/bin`, relative to `$out/lib/$pname/`. These get wrapped accordingly. +# Unfortunately, dotnet has no method for doing this automatically. +# If unset, all executables in the projects root will get installed. This may cause bloat! +, executables ? null +# The packages project file, which contains instructions on how to compile it. +, projectFile ? null +# The NuGet dependency file. This locks all NuGet dependency versions, as otherwise they cannot be deterministically fetched. +# This can be generated using the `nuget-to-nix` tool. +, nugetDeps ? null +# Libraries that need to be available at runtime should be passed through this. +# These get wrapped into `LD_LIBRARY_PATH`. +, runtimeDeps ? [] + +# The type of build to perform. This is passed to `dotnet` with the `--configuration` flag. Possible values are `Release`, `Debug`, etc. +, buildType ? "Release" +# The dotnet SDK to use. +, dotnet-sdk ? dotnetCorePackages.sdk_5_0 +# The dotnet runtime to use. +, dotnet-runtime ? dotnetCorePackages.net_5_0 +, ... } @ args: + +assert projectFile == null -> throw "Defining the `projectFile` attribute is required. This is usually an `.csproj`, or `.sln` file."; + +# TODO: Automatically generate a dependency file when a lockfile is present. +# This file is unfortunately almost never present, as Microsoft recommands not to push this in upstream repositories. +assert nugetDeps == null -> throw "Defining the `nugetDeps` attribute is required, as to lock the NuGet dependencies. This file can be generated using the `nuget-to-nix` tool."; + +let + _nugetDeps = linkFarmFromDrvs "${name}-nuget-deps" (import nugetDeps { + fetchNuGet = { name, version, sha256 }: fetchurl { + name = "nuget-${name}-${version}.nupkg"; + url = "https://www.nuget.org/api/v2/package/${name}/${version}"; + inherit sha256; + }; + }); + + package = stdenv.mkDerivation (args // { + nativeBuildInputs = args.nativeBuildInputs or [] ++ [ dotnet-sdk dotnetPackages.Nuget cacert makeWrapper ]; + + # Stripping breaks the executable + dontStrip = true; + + DOTNET_NOLOGO = true; # This disables the welcome message. + DOTNET_CLI_TELEMETRY_OPTOUT = true; + + configurePhase = args.configurePhase or '' + runHook preConfigure + + export HOME=$(mktemp -d) + + nuget sources Add -Name nixos -Source "$PWD/nixos" + nuget init "${_nugetDeps}" "$PWD/nixos" + + # This is required due to https://github.com/NuGet/Home/issues/4413. + mkdir -p $HOME/.nuget/NuGet + cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet + + dotnet restore ${lib.escapeShellArg projectFile} \ + ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --source "$PWD/nixos" \ + "''${dotnetRestoreFlags[@]}" \ + "''${dotnetFlags[@]}" + + runHook postConfigure + ''; + + buildPhase = args.buildPhase or '' + runHook preBuild + + dotnet build ${lib.escapeShellArg projectFile} \ + -maxcpucount:${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"} \ + -p:BuildInParallel=${if enableParallelBuilding then "true" else "false"} \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + -p:Version=${args.version} \ + --configuration ${buildType} \ + --no-restore \ + "''${dotnetBuildFlags[@]}" \ + "''${dotnetFlags[@]}" + + runHook postBuild + ''; + + installPhase = args.installPhase or '' + runHook preInstall + + dotnet publish ${lib.escapeShellArg projectFile} \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --output $out/lib/${args.pname} \ + --configuration ${buildType} \ + --no-build \ + --no-self-contained \ + "''${dotnetInstallFlags[@]}" \ + "''${dotnetFlags[@]}" + '' + (if executables != null then '' + for executable in ''${executables}; do + execPath="$out/lib/${args.pname}/$executable" + + if [[ -f "$execPath" && -x "$execPath" ]]; then + makeWrapper "$execPath" "$out/bin/$(basename "$executable")" \ + --set DOTNET_ROOT "${dotnet-runtime}" \ + --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \ + "''${gappsWrapperArgs[@]}" \ + ''${makeWrapperArgs} + else + echo "Specified binary \"$executable\" is either not an executable, or does not exist!" + exit 1 + fi + done + '' else '' + for executable in $out/lib/${args.pname}/*; do + if [[ -f "$executable" && -x "$executable" && "$executable" != *"dll"* ]]; then + makeWrapper "$executable" "$out/bin/$(basename "$executable")" \ + --set DOTNET_ROOT "${dotnet-runtime}" \ + --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \ + "''${gappsWrapperArgs[@]}" \ + ''${makeWrapperArgs} + fi + done + '') + '' + runHook postInstall + ''; + }); +in + package diff --git a/third_party/nixpkgs/pkgs/build-support/fetchnextcloudapp/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchnextcloudapp/default.nix new file mode 100644 index 0000000000..7fe5b35e25 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/fetchnextcloudapp/default.nix @@ -0,0 +1,37 @@ +{ stdenv, gnutar, findutils, fetchurl, ... }: +{ name +, url +, version +, sha256 +, patches ? [ ] +}: +stdenv.mkDerivation { + name = "nc-app-${name}"; + inherit version patches; + + src = fetchurl { + inherit url sha256; + }; + + nativeBuildInputs = [ + gnutar + findutils + ]; + + unpackPhase = '' + tar -xzpf $src + ''; + + installPhase = '' + approot="$(dirname $(dirname $(find -path '*/appinfo/info.xml' | head -n 1)))" + + if [ -d "$approot" ]; + then + mv "$approot/" $out + chmod -R a-w $out + else + echo "Could not find appinfo/info.xml" + exit 1; + fi + ''; +} diff --git a/third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix b/third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix index ded70a91c9..cdc104f3a5 100644 --- a/third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "40.3"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PeBXr6KsDebKcH9KdsKTLcvFVsHQ0cwCBWXcGHYpLM0="; + sha256 = "0lfxj8irwm88n3ba351ak85r97pqlds6y2hqbsic714yj4k8df1a"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix b/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix index efdea602c3..3a40ef978e 100644 --- a/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/luna-icons/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "1.4"; + version = "1.6"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "sha256-qYFyZT1mLNHBRrX/NX2pmt9P5n8urEK/msQMctSckzE="; + sha256 = "1iw9wqfs8s3l5k5ngyjmvvxbsxcsya3a6h1xwl6d603swv7h1s02"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json index a936679d34..a1af75ba6a 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "c3251a7b66241fd25a603ea957ec88b9fa6fffa9", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c3251a7b66241fd25a603ea957ec88b9fa6fffa9.tar.gz", - "sha256": "0rpwykkvd6m5v0ay3ra9fyjgax1y67pr857s32z7l5bjgv1aap5p", - "msg": "Update from Hackage at 2021-10-05T05:41:58Z" + "commit": "ba457d86df5e8781485cf1b109f249ecf00ee4c6", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/ba457d86df5e8781485cf1b109f249ecf00ee4c6.tar.gz", + "sha256": "1h1qnllhdfp6n71b36jw8kaw7kani76z3mmbigrvy8cmkbvj2mdc", + "msg": "Update from Hackage at 2021-10-08T09:46:02Z" } diff --git a/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix b/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix index 3e72d8a74b..f1424b15ad 100644 --- a/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix @@ -14,6 +14,8 @@ mkDerivation rec { pname = "adwaita-qt"; version = "1.4.0"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "FedoraQt"; repo = pname; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix index 71a582993a..38754a5569 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/cheese/default.nix @@ -2,7 +2,6 @@ , stdenv , gettext , fetchurl -, fetchpatch , wrapGAppsHook , gnome-video-effects , libcanberra-gtk3 @@ -35,23 +34,15 @@ stdenv.mkDerivation rec { pname = "cheese"; - version = "3.38.0"; + version = "41.0"; outputs = [ "out" "man" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/cheese/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0vyim2avlgq3a48rgdfz5g21kqk11mfb53b2l883340v88mp7ll8"; + url = "mirror://gnome/sources/cheese/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "EG8d9n4c9Bwqp5yZveZ2rskA2wNstSX6EIObBhh9Ivk="; }; - 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 diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix index 500e60feb7..6275bcd3fc 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl -, fetchpatch , pkg-config , meson , ninja @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "ghex"; - version = "3.18.4"; + version = "3.41.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1h1pjrr9wynclfykizqd78dbi785wjz6b63p31k87kjvzy8w3nf2"; + sha256 = "KcdG8ihzteQVvDly29PdYNalH3CA5qPpVsNNZHrjRKI="; }; nativeBuildInputs = [ @@ -50,18 +50,6 @@ stdenv.mkDerivation rec { desktop-file-utils ]; - patches = [ - # Fixes for darwin. Drop in next release. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/ghex/commit/b0af26666cd990d99076c242b2abb3efc6e98671.patch"; - sha256 = "1zwdkgr2nqrn9q3ydyvrrpn5x55cdi747fhbq6mh6blp9cbrk9b5"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/ghex/commit/cc8ef9e67b23604c402460010dc0b5dccb85391b.patch"; - sha256 = "0j2165rfhlbrlzhmcnirqd5m89ljpz0n3nz20sxbwlc8h42zv36s"; - }) - ]; - postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 510da6c83d..fa0f590b5f 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "40.3"; + version = "41.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "//COj0Wkvm0zsKGpY6yzc5ujld6yFZDUOLsepvv3QFg="; + sha256 = "1wzhm8n485cqhbai4qshgrwl05ix881g8gjshilrj6vg8p1li79h"; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index da2e37e51f..c8c2853203 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "40.2"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "njcB/UoOWJgA0iUgN3BkTzHVI0ZV9UqDqF/wVW3X6jM="; + sha256 = "0gqrxcn7fcvlh5c9691lx5zgdgs71ah15h5psrbhkg8qcqy95b3k"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-characters/default.nix index 5cbd58d602..960a332047 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0z2xa4w921bzpzj6gv88pvbrijcnnwni6jxynwz0ybaravyzaqha"; + sha256 = "0yw6mimfwn0fij8zncjb4rg8bnazd1z47rmzq85lk6807nlyqag1"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 5784fb8d48..7ddf227a8f 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -9,13 +9,13 @@ , gtk3 , gobject-introspection , gdk-pixbuf +, librest , librsvg , libgweather , geoclue2 , wrapGAppsHook , folks , libchamplain -, gfbgraph , libsoup , gsettings-desktop-schemas , webkitgtk @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "40.4"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-LFt+HmX39OVP6G7d2hE46qbAaRoUlAPZXL4i7cgiUJw="; + sha256 = "sha256-G0CC22wHDp3LCFJZ6+PIpCG44eiyezKEq2BXULudjJI="; }; doCheck = true; @@ -53,7 +53,6 @@ stdenv.mkDerivation rec { gdk-pixbuf geoclue2 geocode-glib - gfbgraph gjs gnome-online-accounts gnome.adwaita-icon-theme @@ -64,6 +63,7 @@ stdenv.mkDerivation rec { libgee libgweather libhandy + librest librsvg libsoup webkitgtk diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-music/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-music/default.nix index 803235e958..96ec321fa4 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -25,18 +25,19 @@ , gst_all_1 , libdazzle , libsoup +, libhandy , gsettings-desktop-schemas }: python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "40.1.1"; + version = "41.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "IMtnPhHC8xQ9NYjPyrmhInkQgOun3GASypTBhglVjVE="; + sha256 = "1llz2aqa3n3ivwl7i09pgylsbgrfzb872vcj1k7pvivxm1kkbcb9"; }; nativeBuildInputs = [ @@ -67,6 +68,7 @@ python3.pkgs.buildPythonApplication rec { libnotify libdazzle libsoup + libhandy gsettings-desktop-schemas tracker ] ++ (with gst_all_1; [ @@ -77,13 +79,12 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-ugly ]); - propagatedBuildInputs = with python3.pkgs; [ + pythonPath = with python3.pkgs; [ pycairo dbus-python pygobject3 ]; - postPatch = '' for f in meson_post_conf.py meson_post_install.py; do chmod +x $f @@ -91,6 +92,13 @@ python3.pkgs.buildPythonApplication rec { done ''; + # Prevent double wrapping, let the Python wrapper use the args in preFixup. + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + doCheck = false; # handle setup hooks better diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-todo/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-todo/default.nix index ae1334cd56..cfa77fadb7 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-todo/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-todo/default.nix @@ -21,15 +21,16 @@ , libical , librest , json-glib +, itstool }: stdenv.mkDerivation rec { pname = "gnome-todo"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "aAl8lvBnXHFCZn0QQ0ToNHLdf8xTj+wKzb9gJrucobE="; + sha256 = "1r94880d4khbjhhfnhaba3y3d4hv2bri82rzfzxn27s5iybpqras"; }; nativeBuildInputs = [ @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { gettext python3 wrapGAppsHook + itstool ]; buildInputs = [ @@ -62,10 +64,6 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x build-aux/meson/meson_post_install.py patchShebangs build-aux/meson/meson_post_install.py - - # https://gitlab.gnome.org/GNOME/gnome-todo/merge_requests/103 - substituteInPlace src/meson.build \ - --replace 'Gtk-3.0' 'Gtk-4.0' ''; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix index 17e98bb2a5..aa192a6a3b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "40.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PREUTEeXxG0gaMPd9c4rwDD8oPJyzwPyGMT0baO3PE0="; + sha256 = "1vidwq768xnrnr24jcfbpwjczz7vm5zmaiv41nb75q4p8avlwqg5"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/polari/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/polari/default.nix index 0675ccb2f8..f207307588 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/polari/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/polari/default.nix @@ -1,17 +1,15 @@ { lib, stdenv, itstool, fetchurl, gdk-pixbuf, adwaita-icon-theme , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils -, pkg-config, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib -, gnome, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }: +, pkg-config, gtk4, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib +, gnome, wrapGAppsHook4, telepathy-logger, gspell, gsettings-desktop-schemas }: -let +stdenv.mkDerivation rec { pname = "polari"; - version = "3.38.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "41.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1l82nmb5qk4h69rsdhzlcmjjdhwh9jzfs4cnw8hy39sg5v9ady1s"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "o7BfgWYDcMZ8lCtvRLKYx7eIFv6zjJJuwiEr3iLqQOs="; }; patches = [ @@ -24,12 +22,12 @@ in stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; nativeBuildInputs = [ - meson ninja pkg-config itstool gettext wrapGAppsHook libxml2 + meson ninja pkg-config itstool gettext wrapGAppsHook4 libxml2 desktop-file-utils gobject-introspection appstream-glib ]; buildInputs = [ - gtk3 glib adwaita-icon-theme gsettings-desktop-schemas + gtk4 gtk3 glib adwaita-icon-theme gsettings-desktop-schemas telepathy-glib telepathy-logger gjs gspell gdk-pixbuf libsecret libsoup webkitgtk ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch b/third_party/nixpkgs/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch index 0fb09eb154..269b455f97 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch @@ -1,24 +1,24 @@ diff --git a/src/thumbnailer.js b/src/thumbnailer.js old mode 100644 new mode 100755 -index e2ad0a5..7ebf08a +index ed6350ea..83d832cb --- a/src/thumbnailer.js +++ b/src/thumbnailer.js @@ -1,3 +1,4 @@ -+#!/usr/bin/env gjs - imports.gi.versions.Gdk = '3.0'; - imports.gi.versions.Gtk = '3.0'; - ++#!/usr/bin/env gjs --module + import Cairo from 'cairo'; + import Gdk from 'gi://Gdk?version=3.0'; + import Gio from 'gi://Gio'; diff --git a/src/urlPreview.js b/src/urlPreview.js -index f17e0be..ccffc32 100644 +index 5f7931e4..d2282900 100644 --- a/src/urlPreview.js +++ b/src/urlPreview.js -@@ -44,7 +44,7 @@ class Thumbnailer { - _generateThumbnail(data) { +@@ -69,7 +69,7 @@ class Thumbnailer { + async _generateThumbnail(data) { let { filename, uri } = data; this._subProc = Gio.Subprocess.new( -- ['gjs', `${pkg.pkgdatadir}/thumbnailer.js`, uri, filename], +- ['gjs', '--module', `${pkg.pkgdatadir}/thumbnailer.js`, uri, filename], + [`${pkg.pkgdatadir}/thumbnailer.js`, uri, filename], Gio.SubprocessFlags.NONE); - this._subProc.wait_async(null, (o, res) => { - try { + try { + await this._subProc.wait_async(null); diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/seahorse/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/seahorse/default.nix index d09a4c9ff3..67036df2d5 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/seahorse/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/seahorse/default.nix @@ -27,15 +27,13 @@ stdenv.mkDerivation rec { pname = "seahorse"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-fscFezhousbqBB/aghQKOfXsnlsYi0UJFNRTvC1V0Cw="; + hash = "sha256-5u7AnoEESClfVH8YwdV3K2XD7cHZ5aJZXxC13eaJKfU="; }; - doCheck = true; - nativeBuildInputs = [ meson ninja @@ -65,10 +63,21 @@ stdenv.mkDerivation rec { libhandy ]; + doCheck = true; + postPatch = '' patchShebangs build-aux/ ''; + preCheck = '' + # Add “org.gnome.crypto.pgp” GSettings schema to path + # to make it available for “gpgme-backend” test. + # It is used by Seahorse’s internal “common” library. + addToSearchPath XDG_DATA_DIRS "${glib.getSchemaPath gcr}/../.." + # The same test also requires home directory so that it can store settings. + export HOME=$TMPDIR + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix index 04f8a7a3c3..c7c85779d3 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "40.1.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "C2xDbtatmIeoitofcqAZex63OwINjTRKurTH+nJQ+PY="; + sha256 = "71M52MNfytXRBIG3BICAPw+iCz08vDOSOPys7q7gHro="; }; # For convenience, we can specify adwaita-icon-theme only in packages diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/baobab/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/baobab/default.nix index 40ff8e2015..40ea18b1af 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/baobab/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/baobab/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "baobab"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "19yii3bdgivxrcka1c4g6dpbmql5nyawwhzlsph7z6bs68nambm6"; + sha256 = "ytYnjS3MgMhLVxBapbtY2KMM6Y1vq9dnUZ3bhshX6FU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/eog/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/eog/default.nix index bffcb8b74c..67ecf9f5c1 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/eog/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/eog/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "40.3"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KKo7BwgdlWV1RvcIlJR/qIZjGix/lV5Wz4DbcxrjsjU="; + sha256 = "sha256-kX3ghv2X/T7JMPoHyIut0r4fXQrmueVpyYYATgNZqaw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix index 6f673d6322..1a3a67f0d7 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "40.3"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "2tE4ufLVXeJxEo/KOLYfU/2YDFh9KeG6a1CP/zsZ9WQ="; + sha256 = "s50YJUkllbC3TF1qZoaoV/lBnfpMAvgBPCl7yHDibdA="; }; patches = lib.optionals withPantheon [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 156ffbb1c7..aabe9af148 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.40.4"; + version = "3.42.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "h8GF8Yw3Jw42EZgfGb2SIayXTIB0Ysjc6QvqCHEsWAA="; + sha256 = "6P3TvEegfW+KMFK7yuiA8g9tvE9pc6jpDQAWm7mbFjU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix index e3c6938363..392ea61688 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/default.nix @@ -26,6 +26,7 @@ , plymouth , librsvg , coreutils +, xorgserver , xwayland , dbus , nixos-icons @@ -42,13 +43,13 @@ in stdenv.mkDerivation rec { pname = "gdm"; - version = "40.1"; + version = "41.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "q7ih6mZISPLJD4SsqkLpTSVgVwNYgamPvUH7xdfRc/0="; + sha256 = "VzjEKTqfWoDUpungb00N8+nzE8p7Yb+02K+rqYPiANw="; }; mesonFlags = [ @@ -102,7 +103,7 @@ stdenv.mkDerivation rec { # Change hardcoded paths to nix store paths. (substituteAll { src = ./fix-paths.patch; - inherit coreutils plymouth xwayland dbus; + inherit coreutils plymouth xorgserver xwayland dbus; }) # The following patches implement certain environment variables in GDM which are set by diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/fix-paths.patch index d649556fe9..980627c78d 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/fix-paths.patch +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gdm/fix-paths.patch @@ -1,66 +1,64 @@ +diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c +index 5fbbad68..739718ec 100644 --- a/daemon/gdm-local-display-factory.c +++ b/daemon/gdm-local-display-factory.c -@@ -201,7 +201,7 @@ +@@ -233,9 +233,9 @@ struct GdmDisplayServerConfiguration { + const char *session_type; + } display_server_configuration[] = { #ifdef ENABLE_WAYLAND_SUPPORT - gboolean wayland_enabled = FALSE; - if (gdm_settings_direct_get_boolean (GDM_KEY_WAYLAND_ENABLE, &wayland_enabled)) { -- if (wayland_enabled && g_file_test ("/usr/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) -+ if (wayland_enabled && g_file_test ("@xwayland@/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) - return TRUE; - } +- { "wayland", GDM_KEY_WAYLAND_ENABLE, "/usr/bin/Xwayland", "wayland" }, ++ { "wayland", GDM_KEY_WAYLAND_ENABLE, "@xwayland@/bin/Xwayland", "wayland" }, #endif +- { "xorg", GDM_KEY_XORG_ENABLE, "/usr/bin/Xorg", "x11" }, ++ { "xorg", GDM_KEY_XORG_ENABLE, "@xorgserver@/bin/Xorg", "x11" }, + { NULL, NULL, NULL }, + }; + +diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c +index cc61efc9..4c9d15af 100644 --- a/daemon/gdm-manager.c +++ b/daemon/gdm-manager.c -@@ -145,7 +145,7 @@ +@@ -148,7 +148,7 @@ plymouth_is_running (void) GError *error; - + error = NULL; - res = g_spawn_command_line_sync ("plymouth --ping", + res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth --ping", NULL, NULL, &status, &error); if (! res) { g_debug ("Could not ping plymouth: %s", error->message); -@@ -163,7 +163,7 @@ +@@ -166,7 +166,7 @@ plymouth_prepare_for_transition (void) GError *error; - + error = NULL; - res = g_spawn_command_line_sync ("plymouth deactivate", + res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth deactivate", NULL, NULL, NULL, &error); if (! res) { g_warning ("Could not deactivate plymouth: %s", error->message); -@@ -178,7 +178,7 @@ +@@ -181,7 +181,7 @@ plymouth_quit_with_transition (void) GError *error; - + error = NULL; - res = g_spawn_command_line_async ("plymouth quit --retain-splash", &error); + res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit --retain-splash", &error); if (! res) { g_warning ("Could not quit plymouth: %s", error->message); g_error_free (error); -@@ -194,7 +194,7 @@ +@@ -197,7 +197,7 @@ plymouth_quit_without_transition (void) GError *error; - + error = NULL; - res = g_spawn_command_line_async ("plymouth quit", &error); + res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit", &error); if (! res) { g_warning ("Could not quit plymouth: %s", error->message); g_error_free (error); ---- a/data/gdm.service.in -+++ b/data/gdm.service.in -@@ -26,7 +26,7 @@ Restart=always - IgnoreSIGPIPE=no - BusName=org.gnome.DisplayManager - EnvironmentFile=-${LANG_CONFIG_FILE} --ExecReload=/bin/kill -SIGHUP $MAINPID -+ExecReload=@coreutils@/bin/kill -SIGHUP $MAINPID - KeyringMode=shared - - [Install] +diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c +index 4b709731..245ac0cf 100644 --- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c -@@ -2916,16 +2916,16 @@ gdm_session_start_session (GdmSession *self, +@@ -2972,16 +2972,16 @@ gdm_session_start_session (GdmSession *self, */ if (run_launcher) { if (is_x11) { @@ -80,3 +78,16 @@ self->selected_program); } } +diff --git a/data/gdm.service.in b/data/gdm.service.in +index 17e8a8de..afc70977 100644 +--- a/data/gdm.service.in ++++ b/data/gdm.service.in +@@ -26,7 +26,7 @@ Restart=always + IgnoreSIGPIPE=no + BusName=org.gnome.DisplayManager + EnvironmentFile=-${LANG_CONFIG_FILE} +-ExecReload=/bin/kill -SIGHUP $MAINPID ++ExecReload=@coreutils@/bin/kill -SIGHUP $MAINPID + KeyringMode=shared + + [Install] diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix index 370cd14e46..814878d571 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "40.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "YN+KDaMBzkJbcEPUKuMuxAEf8I8Y4Pxi8pQBMF2jpw4="; + sha256 = "HaGsDSYb7fD80shbSAvGVQXiPPUfEUMSbA03cX5pMUU="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-calculator/default.nix index 7e19e9523c..58c079078d 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "40.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1xkazxbkpn1z5pfphhps7fc5q4yc8lp7f6b222n8bx5iyxhwbrkz"; + sha256 = "pm3AS9hYfnbWc3Wmrvp5VTtWnJvfeOvcKBfxwK3j3Jk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-contacts/default.nix index 62a43d20d5..919bb5206c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0w2g5xhw65adzvwzakrj5kaim4sw1w7s8qqwm3nm6inq50znzpn9"; + sha256 = "Y+MUm10UdbeiaYAFu191DzyApzVxcWDjnfjP3+v8zfA="; }; propagatedUserEnvPkgs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 6170f53c71..d7a898c1c4 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -1,5 +1,4 @@ { fetchurl -, fetchpatch , lib , stdenv , substituteAll @@ -17,6 +16,7 @@ , gettext , glib , glib-networking +, gcr , glibc , gnome-bluetooth , gnome-color-manager @@ -24,8 +24,6 @@ , gnome-online-accounts , gnome-settings-daemon , gnome -, grilo -, grilo-plugins , gsettings-desktop-schemas , gsound , gtk3 @@ -70,11 +68,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-zMmlc2UXOFEJrlpZkGwlgkTdh5t1A61ZhM9BZVyzAvE="; + sha256 = "sha256-pWliIq01P8+aB8QG4ofsyROOJQZFyypZQaiP8GhWWME="; }; patches = [ @@ -85,13 +83,6 @@ stdenv.mkDerivation rec { 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 = [ @@ -119,14 +110,13 @@ stdenv.mkDerivation rec { gdk-pixbuf glib glib-networking + gcr gnome-bluetooth gnome-desktop gnome-online-accounts gnome-remote-desktop # optional, sharing panel gnome-settings-daemon gnome-user-share # optional, sharing panel - grilo - grilo-plugins # for setting wallpaper from Flickr gsettings-desktop-schemas gsound gtk3 diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch index 57eb4b3d44..c31e093f4b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch @@ -1,15 +1,17 @@ +diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c +index ddcc1511..546c2a36 100644 --- a/libgnome-desktop/gnome-desktop-thumbnail-script.c +++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c -@@ -536,9 +536,9 @@ add_bwrap (GPtrArray *array, +@@ -555,9 +555,9 @@ add_bwrap (GPtrArray *array, g_return_val_if_fail (script->s_infile != NULL, FALSE); add_args (array, - "bwrap", - "--ro-bind", "/usr", "/usr", -- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", +- "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache", + "@bubblewrap_bin@", + "--ro-bind", "@storeDir@", "@storeDir@", -+ "--ro-bind", "/run/current-system", "/run/current-system", ++ "--ro-bind-try", "/run/current-system", "/run/current-system", NULL); /* These directories might be symlinks into /usr/... */ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/default.nix index df8096b90e..6ab45283c8 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-desktop/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "40.4"; + version = "41.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-iK6W9YXg0IcJQbuj113fPsQDSOHFrnQTIcpIL6ydRe8="; + sha256 = "sha256-acsdPZoQcA62Y0jvHA5mqFX8WpeuYpAt+XpJnaEVYtI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix index ead50f1c9d..195a0c4f01 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "40.2"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ztES6qh9j/ohOv1NC62TnPp662cbeySIWaHchNb1Iec="; + sha256 = "sha256-h0PJj9ZWBi74YpM+/jDFvkxrMi7ALu4VTscNCO0Ild8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix index 622a7de1bf..4ba915df2d 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gnome-font-viewer"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0hpyi0sz3gcqqs9lkwyk8b6hr39m3n27432x98kxr436jj37dk6j"; + sha256 = "XdQQMxvgcOTgNDl/J1SYDgc4UdUKIRny+/lq3G/i6HY="; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index b6aedeeb64..ff1d95861e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "40.4"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "QSplhO5upN+WN8QimT9Or4FYTSkZD16JOvmnhxy5Axs="; + sha256 = "R/ZHW2bIQ+fVPZC6Dns5SHYt8VFjSkNvaMK5u6BQVgo="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index fda0f6e2ff..fac50cd2b3 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -7,6 +7,7 @@ , python3 , wrapGAppsHook , glib +, nv-codec-headers-11 , pipewire , systemd , libvncserver @@ -21,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "40.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-mvpuUlVwo3IJP5cwM4JwkDiU87H5+KnfX1eDbqHSnek="; + hash = "sha256-apvIscaHRvSjqsH+dMRKcuJqi7S+HxynMCdwWstlK14="; }; nativeBuildInputs = [ @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { fuse3 gdk-pixbuf # For libnotify glib + nv-codec-headers-11 libnotify libsecret libvncserver diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index 4a1b7f4c20..307de72cc4 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "40.0.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "08bv32hvsmd8izw0llvldg0c2d71srch4hi8j94jwgm5d4dsrprp"; + sha256 = "5spjYfvR3qst4aHjkNTxQWfPR7HFR9u4tlpdielmOIQ="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 94b29e8b4d..25f7fb93ab 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "40.4"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "9R1MQsIru9AxLKcY9Hz0Vp/FikbvQAdDrk0cx9kKzXk="; + sha256 = "2E+qwUSLOPl12cGUkMWSivxcWixJ3X5/ga9pD5Rm/Gg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix index 6a7cb1742b..04a4b0984e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -66,13 +66,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "40.4"; + version = "41.0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "160z8bz2kqmrs6a4cs2gakv0rl9ba69p3ij2xjakqav50n9r3i9b"; + sha256 = "Uvlx6FFA5d50uTae9mVuSc6Vrx8jL8Hg3x8EYSmrT2U="; }; patches = [ @@ -103,6 +103,13 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/9a647c460b651aaec0b8a21f046cc289c1999416/f/0001-gdm-Work-around-failing-fingerprint-auth.patch"; sha256 = "pFvZli3TilUt6YwdZztpB8Xq7O60XfuWUuPMMVSpqLw="; }) + + # Make color picker in GTK work again + # https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1990 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/a3dcdaae30bdcbadec7ba3fa31c9eb0bb2a4c8c2.patch"; + sha256 = "1UTWGZ5CiVJVCYcepaf+A6/8X/s6jUMsYB4BJ7VTjxk="; + }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch index e17a608a2d..8b35736ecf 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch @@ -1,30 +1,36 @@ ---- a/js/ui/extensionDownloader.js -+++ b/js/ui/extensionDownloader.js -@@ -86,7 +86,7 @@ - stream.output_stream.write_bytes(contents, null); - stream.close(null); - let [success, pid] = GLib.spawn_async(null, -- ['unzip', '-uod', dir.get_path(), '--', file.get_path()], -+ ['@unzip@/bin/unzip', '-uod', dir.get_path(), '--', file.get_path()], - null, - GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD, - null); ---- a/js/ui/status/keyboard.js -+++ b/js/ui/status/keyboard.js -@@ -1062,6 +1062,6 @@ class InputSourceIndicator extends PanelMenu.Button { - if (xkbVariant.length > 0) - description = `${description}\t${xkbVariant}`; - -- Util.spawn(['gkbd-keyboard-display', '-l', description]); -+ Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]); - } - }); +diff --git a/data/org.gnome.Shell-disable-extensions.service b/data/org.gnome.Shell-disable-extensions.service +index de91167c5..1c9965678 100644 --- a/data/org.gnome.Shell-disable-extensions.service +++ b/data/org.gnome.Shell-disable-extensions.service -@@ -10,5 +10,5 @@ Requisite=gnome-session-stable.timer +@@ -11,5 +11,5 @@ ConditionPathExists=%t/gnome-shell-disable-extensions [Service] Type=simple # Disable extensions -ExecStart=gsettings set org.gnome.shell disable-user-extensions true +ExecStart=@gsettings@ set org.gnome.shell disable-user-extensions true Restart=no +diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js +index 8bf4646a6..59e88bb4c 100644 +--- a/js/ui/extensionDownloader.js ++++ b/js/ui/extensionDownloader.js +@@ -114,7 +114,7 @@ async function extractExtensionArchive(bytes, dir) { + stream.close_async(GLib.PRIORITY_DEFAULT, null); + + const unzip = Gio.Subprocess.new( +- ['unzip', '-uod', dir.get_path(), '--', file.get_path()], ++ ['@unzip@/bin/unzip', '-uod', dir.get_path(), '--', file.get_path()], + Gio.SubprocessFlags.NONE); + await unzip.wait_check_async(null); + } +diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js +index bc50f3d37..868eb5abf 100644 +--- a/js/ui/status/keyboard.js ++++ b/js/ui/status/keyboard.js +@@ -1080,6 +1080,6 @@ class InputSourceIndicator extends PanelMenu.Button { + if (xkbVariant.length > 0) + description = '%s\t%s'.format(description, xkbVariant); + +- Util.spawn(['gkbd-keyboard-display', '-l', description]); ++ Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]); + } + }); diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix index 6d71c579d7..4d9a5c4076 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -25,7 +25,6 @@ , gsettings-desktop-schemas , gnome-desktop , libxmlb -, gnome-online-accounts , json-glib , libsecret , valgrind-light @@ -43,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "40.4"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "voxhGoAvcXGNzLvUVE7ZaIcxGYRv03t7dqeq1yx5mL8="; + sha256 = "AkC3bsnfYi2b7A6zjkrFY8rt5oCLrZO4gmPYCXD/OcE="; }; patches = [ @@ -89,7 +88,6 @@ stdenv.mkDerivation rec { polkit flatpak libxmlb - gnome-online-accounts libsysprof-capture ] ++ lib.optionals withFwupd [ fwupd diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix index 77579be627..d373d6f358 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-system-monitor"; - version = "40.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "06hxd4igxas2kyind5jwfq5qbfkknykpdfy2sy3anylhcx1hzczx"; + sha256 = "x/xExhlJt5SwKJlo67vMDBX4z8PZ5Fv6qB7UXBITnl8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-terminal/default.nix index ab3e3aecc0..48e65009ad 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -1,36 +1,79 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome, dconf, nautilus -, gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala -, desktop-file-utils, itstool, wrapGAppsHook, pcre2 -, libxslt, docbook-xsl-nons }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, python3 +, libxml2 +, gnome +, dconf +, nautilus +, glib +, gtk3 +, gsettings-desktop-schemas +, vte +, gettext +, which +, libuuid +, vala +, desktop-file-utils +, itstool +, wrapGAppsHook +, pcre2 +, libxslt +, docbook-xsl-nons +}: stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.40.1"; + version = "3.42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1r6qd6w18gk83w32y6bvn4hg2hd7qvngak4ymwpgndyp41rwqw07"; + sha256 = "tQ6eVmQjDmyikLzziBKltl4LqsZqSG7iEIlM9nX3Lgs="; }; - buildInputs = [ - gtk3 gsettings-desktop-schemas vte libuuid dconf - # For extension - nautilus - ]; - nativeBuildInputs = [ - pkg-config gettext itstool which libxml2 libxslt docbook-xsl-nons - vala desktop-file-utils wrapGAppsHook pcre2 + meson + ninja + pkg-config + gettext + itstool + which + libxml2 + libxslt + glib # for glib-compile-schemas + docbook-xsl-nons + vala + desktop-file-utils + wrapGAppsHook + pcre2 + python3 ]; - # Silly ./configure, it looks for dbus file from gnome-shell in the + buildInputs = [ + glib + gtk3 + gsettings-desktop-schemas + vte + libuuid + dconf + nautilus # For extension + ]; + + # Silly build system, it looks for dbus file from gnome-shell in the # installation tree of the package it is configuring. postPatch = '' - substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" - substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" - ''; + substituteInPlace src/meson.build \ + --replace "gt_prefix / gt_dbusinterfacedir / 'org.gnome.ShellSearchProvider2.xml'" \ + "'${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml'" - configureFlags = [ "--disable-migration" ]; # TODO: remove this with 3.30 + patchShebangs \ + data/icons/meson_updateiconcache.py \ + data/meson_desktopfile.py \ + src/meson_compileschemas.py + ''; passthru = { updateScript = gnome.updateScript { @@ -39,8 +82,6 @@ stdenv.mkDerivation rec { }; }; - enableParallelBuilding = true; - meta = with lib; { description = "The GNOME Terminal Emulator"; homepage = "https://wiki.gnome.org/Apps/Terminal"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-user-share/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-user-share/default.nix index 211326cfcd..bab13a6ccd 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-user-share/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-user-share/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dhttpd=${apacheHttpd.out}/bin/httpd" - "-Dmodules_path=${apacheHttpd.dev}/modules" + "-Dmodules_path=${apacheHttpd}/modules" "-Dsystemduserunitdir=${placeholder "out"}/etc/systemd/user" # In 3.34.0 it defaults to false but it is silently ignored and always installed. # Let’s add it anyway in case they decide to make build respect the option in the future. diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gucharmap/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gucharmap/default.nix index 336a4d260c..3d2f19b02e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gucharmap/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gucharmap/default.nix @@ -44,7 +44,7 @@ let }; in stdenv.mkDerivation rec { pname = "gucharmap"; - version = "13.0.2"; + version = "14.0.0"; outputs = [ "out" "lib" "dev" "devdoc" ]; @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { owner = "GNOME"; repo = pname; rev = version; - sha256 = "099za9mc6qdq9pwcbjp3d7hxjbaa43vk2w9qw4yiyswl1xq3jw62"; + sha256 = "sha256-d283zVRH42NZNq+vGmItN3ZBrRrl9gpYDco7osm3RoY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix index 3336cfab73..78b90a379c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix @@ -14,6 +14,7 @@ , zenity , libcanberra , ninja +, xvfb-run , xkeyboard_config , libxkbfile , libXdamage @@ -45,13 +46,13 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "40.4"; + version = "41.0"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-pxwVnNKshKZ32l+nrMSUg7Jifa13L4gPiJ645FMKHiM="; + sha256 = "sha256-+oChp0QETYjr/Wd/8DID1ncF7SzWJOoGy7i1iUjN+J4="; }; patches = [ @@ -90,6 +91,7 @@ let self = stdenv.mkDerivation rec { mesa # needed for gbm meson ninja + xvfb-run pkg-config python3 wrapGAppsHook diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/nautilus/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/nautilus/default.nix index 1f92e49c4f..2a964964a0 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/nautilus/default.nix @@ -34,11 +34,13 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "40.2"; + version = "41.0"; + + outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "tx7y/gfl7qiaK7HlvTCUe9GIc7+zD3nL8X7fvU0g9g0="; + sha256 = "+blBrcEEcAxn6kB2YiMV8fa3fc7BVMN/PUwLKDlQoeU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch index 6fe651b9cb..d2319ec13e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 4aa683d6..a930d533 100644 +index 8af2fcf9..0e318307 100644 --- a/meson.build +++ b/meson.build -@@ -20,7 +20,11 @@ if not get_option('uninstalled') +@@ -22,7 +22,11 @@ if not get_option('uninstalled') rygel_datadir = join_paths(get_option('prefix'), get_option('datadir'), 'rygel') rygel_libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), 'rygel') @@ -15,7 +15,7 @@ index 4aa683d6..a930d533 100644 rygel_plugindir = join_paths(rygel_libdir, 'rygel-2.6', 'plugins') rygel_enginedir = join_paths(rygel_libdir, 'rygel-2.6', 'engines') rygel_presetdir = join_paths(rygel_datadir, 'presets') -@@ -55,7 +59,7 @@ conf.set_quoted('DATA_DIR', rygel_datadir) +@@ -57,7 +61,7 @@ conf.set_quoted('DATA_DIR', rygel_datadir) conf.set_quoted('PLUGIN_DIR', rygel_plugindir) conf.set_quoted('BIG_ICON_DIR', rygel_bigicondir) conf.set_quoted('SMALL_ICON_DIR', rygel_smallicondir) @@ -25,14 +25,11 @@ index 4aa683d6..a930d533 100644 conf.set_quoted('MX_EXTRACT_PATH', join_paths(rygel_libexecdir, 'mx-extract')) conf.set_quoted('DESKTOP_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'applications')) diff --git a/meson_options.txt b/meson_options.txt -index cb604c4e..1b049b77 100644 +index fd04776a..3dee43ba 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -1,6 +1,7 @@ +@@ -1,3 +1,4 @@ ++option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation') option('uninstalled', type: 'boolean', value: 'false', description: 'Run Rygel from build directory only') option('api-docs', type: 'boolean', value: 'false', description: 'Build the API documentation') - option('systemd-user-units-dir', type : 'string', value : 'auto', description : 'Where to install the systemd user unit (use special values "auto" or "none", or pass a path') -+option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation') - option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih', 'tracker', 'tracker3']) - option('engines', type : 'array', choices : ['simple', 'gstreamer']) - option('examples', type : 'boolean', value : 'true') + option('man_pages', type: 'boolean', value: 'true', description: 'Build the man pages') diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/rygel/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/rygel/default.nix index f43df23f44..c3cfeec8ff 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/rygel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/rygel/default.nix @@ -28,16 +28,20 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.40.1"; + version = "0.40.2"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "QkDXd1mcjNCeZ9pEzLOV0KbceEedgJzWIZgixbVooy0="; + sha256 = "yejHNiltIsTe/pWXJ6KdMUN7vSt6oMZHDWviQBEFBpc="; }; + patches = [ + ./add-option-for-installation-sysconfdir.patch + ]; + nativeBuildInputs = [ meson ninja @@ -78,16 +82,10 @@ stdenv.mkDerivation rec { "-Dapi-docs=false" "--sysconfdir=/etc" "-Dsysconfdir_install=${placeholder "out"}/etc" - # Build all plug-ins except for tracker 2 - "-Dplugins=external,gst-launch,lms,media-export,mpris,playbin,ruih,tracker3" ]; doCheck = true; - patches = [ - ./add-option-for-installation-sysconfdir.patch - ]; - postPatch = '' patchShebangs data/xml/process-xml.py ''; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/simple-scan/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/simple-scan/default.nix index be501c0aef..9514caa1e9 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/simple-scan/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/simple-scan/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "40.1"; + version = "40.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-6+45qx/kygU8TtK9OjynZ0L/EJQ23QZF00FWIhMroLQ="; + sha256 = "sha256-61N55MtspgUJLJQiEMGEJdA2dz2nZUHkO4nYIj+CuaQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/sushi/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/sushi/default.nix index cd93094120..f08f51512c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/sushi/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/sushi/default.nix @@ -8,8 +8,7 @@ , gnome , gtksourceview4 , gjs -, webkitgtk -, libmusicbrainz5 +, webkitgtk_4_1 , icu , wrapGAppsHook , gst_all_1 @@ -23,11 +22,11 @@ stdenv.mkDerivation rec { pname = "sushi"; - version = "3.38.1"; + version = "41.0"; src = fetchurl { - url = "mirror://gnome/sources/sushi/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "8+bRDIFVKNA6Zl+v0VwHGeAXqBOXWzrzIHYZnjeIiOk="; + url = "mirror://gnome/sources/sushi/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "m3UlaQzkNmJO+gpgV3NJNDLNDva49GSYLouETtqYmO4="; }; nativeBuildInputs = [ @@ -49,8 +48,7 @@ stdenv.mkDerivation rec { gtksourceview4 gdk-pixbuf librsvg - libmusicbrainz5 - webkitgtk + webkitgtk_4_1 epoxy gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp-xsl/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp-xsl/default.nix index 32f3fbd615..8b091e000b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp-xsl/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp-xsl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "yelp-xsl"; - version = "40.2"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-kZxVL4RqrsdB/lHVr0FrRpvNslx37/w7WhWktLf/gU4="; + sha256 = "sha256-yM1kwJO72MXV5H/TiGTpCDG1+c90A1MIcCBvqWY2pKU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp/default.nix index 746866fc9c..b1e094292b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/yelp/default.nix @@ -1,23 +1,47 @@ -{ lib, stdenv, gettext, fetchurl, webkitgtk, pkg-config, gtk3, glib -, gnome, sqlite -, itstool, libxml2, libxslt, gst_all_1 -, wrapGAppsHook }: +{ lib +, stdenv +, gettext +, fetchurl +, webkitgtk_4_1 +, pkg-config +, gtk3 +, glib +, gnome +, sqlite +, itstool +, libxml2 +, libxslt +, gst_all_1 +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "yelp"; - version = "40.3"; + version = "41.1"; src = fetchurl { url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-oXOEeFHyYYm+eOy7EAFdU52Mzv/Hwj6GNUkrw62l7iM="; + sha256 = "sha256-RWpkFWR7zusBWbkLNVP/MocozymmCPzggCQjJQTMuHQ="; }; - nativeBuildInputs = [ pkg-config gettext itstool wrapGAppsHook ]; + nativeBuildInputs = [ + pkg-config + gettext + itstool + wrapGAppsHook + ]; + buildInputs = [ - gtk3 glib webkitgtk sqlite - libxml2 libxslt gnome.yelp-xsl + gtk3 + glib + webkitgtk_4_1 + sqlite + libxml2 + libxslt + gnome.yelp-xsl gnome.adwaita-icon-theme - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good ]; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/default.nix index 51ad81a77a..ef8259e9e8 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/zenity/default.nix @@ -1,10 +1,12 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, meson +, ninja , pkg-config , libxml2 , gnome , gtk3 -, yelp-tools , gettext , libX11 , itstool @@ -13,17 +15,18 @@ stdenv.mkDerivation rec { pname = "zenity"; - version = "3.32.0"; + version = "3.41.0"; src = fetchurl { url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15fdh8xfdhnwcynyh4byx3mrjxbyprqnwxzi7qn3g5wwaqryg1p7"; + sha256 = "GbZ2w1EOIrrfzDIEBi1DK6U3QC9eCuJhKMDZDJVAN+E="; }; nativeBuildInputs = [ + meson + ninja pkg-config gettext - yelp-tools itstool libxml2 wrapGAppsHook diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/devtools/devhelp/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/devtools/devhelp/default.nix index 6be6c77f7c..2ad3c3ff39 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/devtools/devhelp/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/devtools/devhelp/default.nix @@ -7,10 +7,10 @@ , gtk3 , wrapGAppsHook , glib -, amtk , appstream-glib , gobject-introspection , python3 +, gi-docgen , webkitgtk , gettext , itstool @@ -20,11 +20,13 @@ stdenv.mkDerivation rec { pname = "devhelp"; - version = "40.1"; + version = "41.2"; + + outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PorZPoSEtEgjyuR0ov2dziLtbs0lZVWSzq17G2gya7s="; + sha256 = "7KqQsPTaqPsgMPbcaQv1M/+Zp3NDf+Dhis/oLZl/YNI="; }; nativeBuildInputs = [ @@ -37,22 +39,27 @@ stdenv.mkDerivation rec { appstream-glib gobject-introspection python3 + gi-docgen ]; buildInputs = [ glib gtk3 webkitgtk - amtk gnome.adwaita-icon-theme gsettings-desktop-schemas ]; + mesonFlags = [ + "-Dgtk_doc=true" + ]; + doCheck = true; postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py + # patchShebangs requires executable file + chmod +x build-aux/meson/meson_post_install.py + patchShebangs build-aux/meson/meson_post_install.py ''; preFixup = '' @@ -63,6 +70,11 @@ stdenv.mkDerivation rec { ) ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput share/doc/devhelp-3 "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = "devhelp"; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/default.nix index 37824495a1..2d3d2415db 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-gsconnect"; - version = "47"; + version = "48"; outputs = [ "out" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "andyholmes"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "sha256-cpyB7ufjKTj7YVbPlQFJ4qaL6Rb/aBReKxCYzErT4+Q="; + sha256 = "sha256-cKEFTF8DnQIQAXVW9NvE34mUqueQP/OtxTzMUy1dT5U="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-chess/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-chess/default.nix index c632bce407..a2dbd9257a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-chess/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "40.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "132nc96z0bryyi9d5gljsbwsa71rl8wm5w57jbhpwiv4fyjhgybk"; + sha256 = "8MKVFSLw5YX6aDdipBk9q2ujLtjOiSB/gIJ7VgRVaO8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/hitori/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/hitori/default.nix index 9c08aa5cad..15759c6819 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/hitori/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/hitori/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "hitori"; - version = "3.38.2"; + version = "3.38.3"; src = fetchurl { url = "mirror://gnome/sources/hitori/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "wmQ1cwN/ansW6SCK7e6GkQJvCBq6qhYJQu21LwkCnKw="; + sha256 = "99cQPLBjP7ATcwExqYw646IWK5+5SZ/H8ZUS1YG/ZWk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/swell-foop/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/swell-foop/default.nix index 50fab59815..b36f273f6d 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/swell-foop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/swell-foop/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "swell-foop"; - version = "40.1"; + version = "41.0.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "17r4b0g8s7z872wdd7ngk248z7fqx43vm2sym1bdqhzsi250s1y1"; + sha256 = "YEL/MTxsh9VkgnxwNpazsgkTbD/Dn+Jkpu+k4wWTg9g="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-autoar/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-autoar/default.nix index 2afb401bef..e8bfaffb45 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-autoar/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-autoar/default.nix @@ -1,5 +1,9 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch +, meson +, ninja , pkg-config , gnome , gtk3 @@ -11,21 +15,32 @@ stdenv.mkDerivation rec { pname = "gnome-autoar"; - version = "0.3.3"; + version = "0.4.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "JyQA9zo3Wn6I/fHhJZG/uPPwPt8BeAytzXT3C2E+XAQ="; + sha256 = "6oxtUkurxxKsWeHQ46yL8BN0gtrfM8lP6RE3lKG8RHQ="; }; - passthru = { - updateScript = gnome.updateScript { packageName = "gnome-autoar"; attrPath = "gnome.gnome-autoar"; }; - }; + patches = [ + # Make compatible with older Meson. + # https://gitlab.gnome.org/GNOME/gnome-autoar/-/merge_requests/26 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-autoar/-/commit/2d90da6174c03aad546802234a3d77fa0b714e6b.patch"; + sha256 = "CysDpBJmVPm4gOSV2h041MY2yApfAy8+4QC7Jlka1xE="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-autoar/-/commit/ac21bd0c50584a1905a0da65d4bf9a6926ecd483.patch"; + sha256 = "aTu6eKFSKjljk0TYkhFjPcD8eJCIk8TR0YhZYO9JE1k="; + }) + ]; nativeBuildInputs = [ gobject-introspection + meson + ninja pkg-config vala ]; @@ -39,6 +54,17 @@ stdenv.mkDerivation rec { glib ]; + mesonFlags = [ + "-Dvapi=true" + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-autoar"; + attrPath = "gnome.gnome-autoar"; + }; + }; + meta = with lib; { platforms = platforms.linux; maintainers = teams.gnome.members; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix index c220e7eecc..6a9f4f1938 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix @@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec { libsoup ]; - propagatedBuildInputs = with python3Packages; [ + pythonPath = with python3Packages; [ pygobject3 ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix index 15fcfbfe39..12abe49b91 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix @@ -17,14 +17,14 @@ }: stdenv.mkDerivation rec { - version = "3.40.2"; + version = "3.42.0"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "sha256-DUikcnkDBRkCwPLrl8lkNr+SeNpc3bPwPTWRn91nOo4="; + sha256 = "sha256-YsAA487Q2BwDh4V2TPN/YwAFCw+F11OKMjatcNR98/c="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix index 3e0062c7a7..264389a688 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-httpd=${apacheHttpd.out}/bin/httpd" - "--with-modules-path=${apacheHttpd.dev}/modules" + "--with-modules-path=${apacheHttpd}/modules" "--with-cajadir=$(out)/lib/caja/extensions-2.0" ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix index df072f8620..5a4a5dc2a1 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix @@ -5,11 +5,11 @@ python3Packages.buildPythonApplication rec { pname = "catfish"; - version = "4.16.2"; + version = "4.16.3"; src = fetchurl { url = "https://archive.xfce.org/src/apps/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-shouFRlD8LGU04sX/qrzghh5R+0SoCw9ZJKvt0gBKms="; + sha256 = "sha256-6amaYtEJgTkVCN1D88v6LVCmm9a30e7vfTC6TGc9z9o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix index c3e7805b11..1fdbe267c0 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "mousepad"; - version = "0.5.6"; + version = "0.5.7"; odd-unstable = false; - sha256 = "sha256-cdM2NHUnN2FITITb4077Je5Z8xwZAJfjmwXfV+WE6jk="; + sha256 = "sha256-VLPzzM9dl+HAPI+Qn2QTjrKfRgngsExlPFRsdmsNcSM="; nativeBuildInputs = [ gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/libxfce4ui/default.nix index 99cb0e7cc6..0a937f68fd 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/libxfce4ui/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/libxfce4ui/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "xfce"; pname = "libxfce4ui"; - version = "4.16.0"; + version = "4.16.1"; - sha256 = "sha256-YmawNgkCM2xwoMKZrY9SxRhm2t0tsmk2j2+grW9zPCk="; + sha256 = "sha256-5mwyC3YA1LvdVSvaHN7CXDJh+IXjmdHGLKzhpjtUZkw="; nativeBuildInputs = [ gobject-introspection vala ]; buildInputs = [ gtk3 libstartup_notification libgtop epoxy xfconf ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index b9d6f5b23e..62e454a628 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.5.3"; + version = "2.6.0"; rev-prefix = "v"; odd-unstable = false; - sha256 = "sha256-Hw4vdFChKOqllsxMS2Bi7UL48a3Z6oB8oCPKWwa8bJY="; + sha256 = "sha256-VTv4nOL1ltHrewf3q4Uz4e2QjV+Jf7YZTNqILjuAEpM="; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix index f8cdf7198e..acd04c24a3 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix @@ -51,11 +51,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.16.8"; + version = "1.16.9"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-jyqMJLeTN1syQ9+C/bDIOHSG3MioksocmRqpms4Ia5g="; + sha256 = "sha256-ChzH/XvSBEj3Hr7WTYRhOIUNUJmxjPXMEKT8RRYNjD0="; }; # perl is used for testing go vet diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.17.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.17.nix index 84bb70a4cf..2f62c450c2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.17.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.17.nix @@ -50,11 +50,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.17.1"; + version = "1.17.2"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-SdwIM5dwrNVhMxLbjBQer2F3mZVXe4nZO1Qe+DBn5bE="; + sha256 = "sha256-IlXrPk6CTdfV/Nwuf4RTQ3HBhjEuVG+xCGo0wXdS9DE="; }; # perl is used for testing go vet diff --git a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix index 013b024f3b..fb134962b7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -42,6 +42,8 @@ let "0.52" = ./disable-graphviz-0.46.1.patch; + "0.54" = ./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; @@ -130,5 +132,10 @@ in rec { sha256 = "sha256-hKG7MSs+Xcrkt7JcRVmNN14stpIzzvtZoV0jUMdr3ZE="; }; - vala = vala_0_52; + vala_0_54 = generic { + version = "0.54.1"; + sha256 = "0jlhd6hr9mai7hhc2c78w6zmnzf7xncp7fhyiavkqqzhhsn7gpjx"; + }; + + vala = vala_0_54; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/zz/default.nix b/third_party/nixpkgs/pkgs/development/compilers/zz/default.nix index a0bf9a9ad8..156a4c17bc 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/zz/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/zz/default.nix @@ -1,20 +1,27 @@ -{ lib, rustPlatform, fetchFromGitHub, makeWrapper, z3 }: +{ lib, rustPlatform, fetchFromGitHub, makeWrapper, z3, pkgsHostTarget }: + +let + runtimeDeps = [ + z3 + pkgsHostTarget.targetPackages.stdenv.cc + ]; +in rustPlatform.buildRustPackage rec { pname = "zz"; - version = "unstable-2021-03-07"; + version = "unstable-2021-05-04"; # when updating, choose commit of the latest build on http://bin.zetz.it/ src = fetchFromGitHub { owner = "zetzit"; repo = "zz"; - rev = "d3fc968ba2ae6668f930e39077f9a90aecb9fdc4"; - sha256 = "18p17lgwq6rq1n76sj0dwb32bpxflfd7knky1v0sgmaxfpaq04y3"; + rev = "18020b10b933cfe2fc7f2256b71e646889f9b1d2"; + sha256 = "01nlyyk1qxk76dq2hw3wpbjwkh27zzp6mpczjnxdpv6rxs7mc825"; }; nativeBuildInputs = [ makeWrapper ]; - cargoSha256 = "03xdmm4993hqdb3cihjjv4n4mdk8lnlccva08fh6m1d56p807rni"; + cargoSha256 = "080rd8x4jsssnx4il80xcb81iw8pjcm70zckpa1hcijkw9104dgs"; postPatch = '' # remove search path entry which would reference /build @@ -26,7 +33,7 @@ rustPlatform.buildRustPackage rec { cp -r modules "$out/share/zz/" wrapProgram $out/bin/zz \ - --prefix PATH ":" "${lib.getBin z3}/bin" \ + --prefix PATH ":" "${lib.makeBinPath runtimeDeps}" \ --suffix ZZ_MODULE_PATHS ":" "$out/share/zz/modules" ''; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/aac-tactics/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/aac-tactics/default.nix index 445a042244..c67b47f187 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/aac-tactics/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/aac-tactics/default.nix @@ -6,6 +6,7 @@ mkCoqDerivation { releaseRev = v: "v${v}"; + release."8.14.0".sha256 = "04x47ngb95m1h4jw2gl0v79s5im7qimcw7pafc34gkkf51pyhakp"; release."8.13.0".sha256 = "sha256-MAnMc4KzC551JInrRcfKED4nz04FO0GyyyuDVRmnYTY="; release."8.12.0".sha256 = "sha256-dPNA19kZo/2t3rbyX/R5yfGcaEfMhbm9bo71Uo4ZwoM="; release."8.11.0".sha256 = "sha256-CKKMiJLltIb38u+ZKwfQh/NlxYawkafp+okY34cGCYU="; @@ -17,6 +18,7 @@ mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ + { case = "8.14"; out = "8.14.0"; } { case = "8.13"; out = "8.13.0"; } { case = "8.12"; out = "8.12.0"; } { case = "8.11"; out = "8.11.0"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/bignums/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/bignums/default.nix index 84dc92a3cd..cb83a9fdc3 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/bignums/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/bignums/default.nix @@ -8,6 +8,7 @@ with lib; mkCoqDerivation { defaultVersion = if versions.isGe "8.5" coq.coq-version then "${coq.coq-version}.0" else null; + release."8.14.0".sha256 = "0jsgdvj0ddhkls32krprp34r64y1rb5mwxl34fgaxk2k4664yq06"; release."8.13.0".sha256 = "1n66i7hd9222b2ks606mak7m4f0dgy02xgygjskmmav6h7g2sx7y"; release."8.12.0".sha256 = "14ijb3qy2hin3g4djx437jmnswxxq7lkfh3dwh9qvrds9a015yg8"; release."8.11.0".sha256 = "1xcd7c7qlvs0narfba6px34zq0mz8rffnhxw0kzhhg6i4iw115dp"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/equations/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/equations/default.nix index d19d3826c7..e6d5e11fcc 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/equations/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/equations/default.nix @@ -6,6 +6,7 @@ with lib; mkCoqDerivation { repo = "Coq-Equations"; inherit version; defaultVersion = switch coq.coq-version [ + { case = "8.14"; out = "1.3-8.14"; } { case = "8.13"; out = "1.2.4+coq8.13"; } { case = "8.12"; out = "1.2.4+coq8.12"; } { case = "8.11"; out = "1.2.4+coq8.11"; } @@ -43,6 +44,8 @@ with lib; mkCoqDerivation { release."1.2.4+coq8.12".sha256 = "1n0w8is464qcq8mk2mv7amaf0khbjz5mpc9phf0rhpjm0lb22cb3"; release."1.2.4+coq8.13".rev = "v1.2.4-8.13"; release."1.2.4+coq8.13".sha256 = "0i014lshsdflzw6h0qxra9d2f0q82vffxv2f29awbb9ad0p4rq4q"; + release."1.3-8.14".rev = "v1.3-8.14"; + release."1.3-8.14".sha256 = "19bj9nncd1r9g4273h5qx35gs3i4bw5z9bhjni24b413hyj55hkv"; mlPlugin = true; preBuild = "coq_makefile -f _CoqProject -o Makefile"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix index 4de6e2da8b..84cd739ed6 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix @@ -9,8 +9,8 @@ mkCoqDerivation { release."1.2.3".sha256 = "sha256-gwKfUa74fIP7j+2eQgnLD7AswjCtOFGHGaIWb4qI0n4="; inherit version; - defaultVersion = with versions; switch mathcomp.version [ - { case = pred.inter (isGe "1.11.0") (isLt "1.13"); out = "1.2.3"; } + defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (isLe "8.13") (pred.inter (isGe "1.11.0") (isLt "1.13")) ]; out = "1.2.3"; } ] null; propagatedBuildInputs = [ mathcomp.algebra ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/goedel/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/goedel/default.nix index f6ed9491e9..965ae1b6ec 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/goedel/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/goedel/default.nix @@ -10,7 +10,7 @@ mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.11"; out = "8.12.0"; } + { case = range "8.11" "8.13"; out = "8.12.0"; } ] null; propagatedBuildInputs = [ hydra-battles pocklington ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix index 5607d342a2..1ecda185cd 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix @@ -12,7 +12,7 @@ mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.13"; out = "0.9"; } + { case = isEq "8.13"; out = "0.9"; } ] null; propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap hierarchy-builder ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix index 491ff959ec..aff3bc30b5 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -5,8 +5,8 @@ with lib; mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.12"; out = "1.1.0"; } - { case = range "8.11" "8.12"; out = "0.10.0"; } + { case = range "8.12" "8.13"; out = "1.1.0"; } + { case = isEq "8.11"; out = "0.10.0"; } ] null; release."1.1.0".sha256 = "sha256-spno5ty4kU4WWiOfzoqbXF8lWlNSlySWcRReR3zE/4Q="; release."1.0.0".sha256 = "0yykygs0z6fby6vkiaiv3azy1i9yx4rqg8xdlgkwnf2284hffzpp"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/iris/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/iris/default.nix index d2d9870f32..c0a9e94844 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/iris/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/iris/default.nix @@ -6,8 +6,8 @@ with lib; mkCoqDerivation rec { owner = "iris"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.11"; out = "3.4.0"; } - { case = range "8.9" "8.11"; out = "3.3.0"; } + { case = range "8.11" "8.13"; out = "3.4.0"; } + { case = range "8.9" "8.10"; out = "3.3.0"; } ] null; release."3.4.0".sha256 = "0vdc2mdqn5jjd6yz028c0c6blzrvpl0c7apx6xas7ll60136slrb"; release."3.3.0".sha256 = "0az4gkp5m8sq0p73dlh0r7ckkzhk7zkg5bndw01bdsy5ywj0vilp"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/itauto/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/itauto/default.nix index 66791b1306..843a99de4b 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/itauto/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/itauto/default.nix @@ -9,7 +9,7 @@ mkCoqDerivation rec { release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A="; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.13"; out = "8.13+no"; } + { case = isEq "8.13"; out = "8.13+no"; } ] null; mlPlugin = true; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix index c7fed9ced5..306e68ac0f 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix @@ -9,7 +9,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.10" "8.13") "1.12.0" ]; out = "1.5.4"; } + { cases = [ (range "8.10" "8.14") "1.12.0" ]; out = "1.5.4"; } { cases = [ (range "8.10" "8.12") "1.12.0" ]; out = "1.5.3"; } { cases = [ (range "8.7" "8.12") "1.11.0" ]; out = "1.5.2"; } { cases = [ (range "8.7" "8.11") (range "1.8" "1.10") ]; out = "1.5.0"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix index 900e52f168..0a8bb78eeb 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix @@ -5,8 +5,8 @@ with lib; mkCoqDerivation { owner = "snu-sf"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.6"; out = "4.0.2"; } - { case = range "8.5" "8.8"; out = "1.2.8"; } + { case = range "8.6" "8.13"; out = "4.0.2"; } + { case = isEq "8.5"; out = "1.2.8"; } ] null; release."4.0.2".sha256 = "1q96bsxclqx84xn5vkid501jkwlc1p6fhb8szrlrp82zglj58b0b"; release."1.2.8".sha256 = "05fskx5x1qgaf9qv626m38y5izichzzqc7g2rglzrkygbskrrwsb"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/parsec/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/parsec/default.nix index ad48809a9f..fa1aa3c839 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/parsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/parsec/default.nix @@ -11,7 +11,7 @@ mkCoqDerivation { releaseRev = (v: "v${v}"); inherit version; - defaultVersion = if versions.isGe "8.12" coq.version then "0.1.0" else null; + defaultVersion = if versions.range "8.12" "8.13" coq.version then "0.1.0" else null; release."0.1.0".sha256 = "sha256:01avfcqirz2b9wjzi9iywbhz9szybpnnj3672dgkfsimyg9jgnsr"; meta = { diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/reglang/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/reglang/default.nix index bc18108264..1908c755cd 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/reglang/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/reglang/default.nix @@ -10,7 +10,7 @@ mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.10" "8.13"; out = "1.1.2"; } + { case = range "8.10" "8.14"; out = "1.1.2"; } ] null; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/relation-algebra/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/relation-algebra/default.nix index da74215d53..01cb7f63b7 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/relation-algebra/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/relation-algebra/default.nix @@ -15,11 +15,11 @@ mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.13"; out = "1.7.5"; } - { case = isGe "8.12"; out = "1.7.4"; } - { case = isGe "8.11"; out = "1.7.3"; } - { case = isGe "8.10"; out = "1.7.2"; } - { case = isGe "8.9"; out = "1.7.1"; } + { case = isEq "8.13"; out = "1.7.5"; } + { case = isEq "8.12"; out = "1.7.4"; } + { case = isEq "8.11"; out = "1.7.3"; } + { case = isEq "8.10"; out = "1.7.2"; } + { case = isEq "8.9"; out = "1.7.1"; } ] null; mlPlugin = true; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/semantics/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/semantics/default.nix index 1fb01312e6..796c9dee0a 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/semantics/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/semantics/default.nix @@ -15,8 +15,7 @@ mkCoqDerivation rec { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.13"; out = "8.13.0"; } - { case = "8.11"; out = "8.11.1"; } + { case = range "8.10" "8.13"; out = "8.13.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } { case = "8.7"; out = "8.7.0"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/serapi/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/serapi/default.nix index 5505713eb4..1f6e995703 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/serapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/serapi/default.nix @@ -15,10 +15,11 @@ let }); release = { - "8.13.0+0.13.0".sha256 = "sha256:0k69907xn4k61w4mkhwf8kh8drw9pijk9ynijsppihw98j8w38fy"; - "8.12.0+0.12.1".sha256 = "sha256:048x3sgcq4h845hi6hm4j4dsfca8zfj70dm42w68n63qcm6xf9hn"; - "8.11.0+0.11.1".sha256 = "sha256:1phmh99yqv71vlwklqgfxiq2vj99zrzxmryj2j4qvg5vav3y3y6c"; - "8.10.0+0.7.2".sha256 = "sha256:1ljzm63hpd0ksvkyxcbh8rdf7p90vg91gb4h0zz0941v1zh40k8c"; + "8.14+rc1+0.14.0".sha256 = "1w7d7anvcfx8vz51mnrf1jkw6rlpzjkjlr06avf58wlhymww7pja"; + "8.13.0+0.13.0".sha256 = "0k69907xn4k61w4mkhwf8kh8drw9pijk9ynijsppihw98j8w38fy"; + "8.12.0+0.12.1".sha256 = "048x3sgcq4h845hi6hm4j4dsfca8zfj70dm42w68n63qcm6xf9hn"; + "8.11.0+0.11.1".sha256 = "1phmh99yqv71vlwklqgfxiq2vj99zrzxmryj2j4qvg5vav3y3y6c"; + "8.10.0+0.7.2".sha256 = "1ljzm63hpd0ksvkyxcbh8rdf7p90vg91gb4h0zz0941v1zh40k8c"; }; in @@ -27,6 +28,7 @@ in inherit version release; defaultVersion = with versions; switch coq.version [ + { case = isEq "8.14"; out = "8.14+rc1+0.14.0"; } { case = isEq "8.13"; out = "8.13.0+0.13.0"; } { case = isEq "8.12"; out = "8.12.0+0.12.1"; } { case = isEq "8.11"; out = "8.11.0+0.11.1"; } @@ -63,10 +65,14 @@ in }).overrideAttrs(o: let inherit (o) version; in { src = fetchzip { - url = "https://github.com/ejgallego/coq-serapi/releases/download/${version}/coq-serapi-${ - if version == "8.11.0+0.11.1" then version - else builtins.replaceStrings [ "+" ] [ "." ] version - }.tbz"; + url = + if version == "8.14+rc1+0.14.0" + then "https://github.com/ejgallego/coq-serapi/archive/refs/tags/8.14+rc1+0.14.0.tar.gz" + else + "https://github.com/ejgallego/coq-serapi/releases/download/${version}/coq-serapi-${ + if version == "8.11.0+0.11.1" then version + else builtins.replaceStrings [ "+" ] [ "." ] version + }.tbz"; sha256 = release."${version}".sha256; }; }) diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix index 604a3f48f8..d49892e339 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix @@ -6,8 +6,8 @@ with lib; mkCoqDerivation rec { domain = "gitlab.mpi-sws.org"; owner = "iris"; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.11"; out = "1.5.0"; } - { case = range "8.8" "8.11"; out = "1.4.0"; } + { case = range "8.11" "8.13"; out = "1.5.0"; } + { case = range "8.8" "8.10"; out = "1.4.0"; } ] null; release."1.5.0".sha256 = "1ym0fy620imah89p8b6rii8clx2vmnwcrbwxl3630h24k42092nf"; release."1.4.0".sha256 = "1m6c7ibwc99jd4cv14v3r327spnfvdf3x2mnq51f9rz99rffk68r"; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 209391aaf5..de595427da 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -1996,9 +1996,16 @@ EOT # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too. streamly-posix = doJailbreak super.streamly-posix; + # https://github.com/hadolint/language-docker/issues/72 + language-docker_10_2_0 = overrideCabal super.language-docker_10_2_0 (drv: { + testFlags = (drv.testFlags or []) ++ [ + "--skip=/Language.Docker.Integration/parse" + ]; + }); + # 2021-09-06: hadolint depends on language-docker >= 10.1 hadolint = super.hadolint.override { - language-docker = self.language-docker_10_1_2; + language-docker = self.language-docker_10_2_0; }; # 2021-09-13: hls 1.3 needs a newer lsp than stackage-lts. (lsp >= 1.2.0.1) @@ -2025,11 +2032,11 @@ EOT # Needs network >= 3.1.2 quic = super.quic.overrideScope (self: super: { - network = self.network_3_1_2_2; + network = self.network_3_1_2_5; }); http3 = super.http3.overrideScope (self: super: { - network = self.network_3_1_2_2; + network = self.network_3_1_2_5; }); } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 6826e6174a..e31771a3e2 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -43,54 +43,129 @@ self: super: { unix = null; xhtml = null; + aeson = appendPatch (doJailbreak super.aeson) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/aeson-1.5.6.0.patch"; + sha256 = "07rk7f0lhgilxvbg2grpl1p5x25wjf9m7a0wqmi2jr0q61p9a0nl"; + # The revision information is newer than that included in the patch + excludes = ["*.cabal"]; + }); + + attoparsec = appendPatch (doJailbreak super.attoparsec_0_14_1) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/attoparsec-0.14.1.patch"; + sha256 = "0nprywmi3i9ih8mcc8afyimrfjr8pbcjxr2ywz9gwdlwdplk21da"; + }); + # 0.12.0 introduces support for 9.2 base-compat = self.base-compat_0_12_0; + base-compat-batteries = self.base-compat-batteries_0_12_0; + + basement = overrideCabal (appendPatch super.basement (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/basement-0.0.12.patch"; + sha256 = "0c8n2krz827cv87p3vb1vpl3v0k255aysjx9lq44gz3z1dhxd64z"; + })) (drv: { + # This is inside a conditional block so `doJailbreak` doesn't work + postPatch = "sed -i -e 's,<4.16,<4.17,' basement.cabal"; + }); + + # Duplicate Show instances in tests and library cause compiling tests to fail + blaze-builder = appendPatch (dontCheck super.blaze-builder) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/blaze-builder-0.4.2.1.patch"; + sha256 = "1h5ny3mlng69vwaabl3af8hlv4qi24wfw8s14lw2ksw1yjbgi0j8"; + }); + + cereal = appendPatch super.cereal (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cereal-0.5.8.1.patch"; + sha256 = "03v4nxwz9y6viaa8anxcmp4zdf2clczv4pf9fqq6lnpplpz5i128"; + }); + + # Tests fail because of typechecking changes + conduit = dontCheck super.conduit; + + constraints = appendPatch super.constraints (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/constraints-0.13.patch"; + sha256 = "0cr4qzw0fbwy97f3wx0v3mv8yc642ahpfa80kaqrq191232fzzf3"; + }); + + cryptonite = appendPatch super.cryptonite (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cryptonite-0.29.patch"; + sha256 = "1g48lrmqgd88hqvfq3klz7lsrpwrir2v1931myrhh6dy0d9pqj09"; + }); # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { Cabal = null; }); + doctest = appendPatch (dontCheck (doJailbreak super.doctest_0_18_1)) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/doctest-0.18.1.patch"; + sha256 = "030kdsk0fg08cgdcjpyv6z8ym1vkkrbd34aacs91y5hqzc9g79y1"; + }); + + entropy = appendPatch super.entropy (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/entropy-0.4.1.6.patch"; + sha256 = "0pbbl6m8b3snf9cz6rs0ljmacpsavayfn0s3p67hdcmndy3ndawi"; + }); + + # Tests fail in GHC 9.2 + extra = dontCheck super.extra; + # Jailbreaks & Version Updates + assoc = doJailbreak super.assoc; async = doJailbreak super.async; base64-bytestring = doJailbreak super.base64-bytestring; ChasingBottoms = doJailbreak super.ChasingBottoms; + cpphs = overrideCabal super.cpphs (drv: { postPatch = "sed -i -e 's,time >=1.5 && <1.11,time >=1.5 \\&\\& <1.12,' cpphs.cabal";}); + cryptohash-md5 = doJailbreak super.cryptohash-md5; + cryptohash-sha1 = doJailbreak super.cryptohash-sha1; data-fix = doJailbreak super.data-fix; dec = doJailbreak super.dec; ed25519 = doJailbreak super.ed25519; + ghc-byteorder = doJailbreak super.ghc-byteorder; hackage-security = doJailbreak super.hackage-security; hashable-time = doJailbreak super.hashable-time; HTTP = overrideCabal (doJailbreak super.HTTP) (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }); - integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; }); + integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's, <1.1, <1.3,' integer-logarithms.cabal"; }); + indexed-traversable = doJailbreak super.indexed-traversable; + lifted-async = doJailbreak super.lifted-async; lukko = doJailbreak super.lukko; - network = super.network_3_1_2_2; + network = super.network_3_1_2_5; parallel = doJailbreak super.parallel; + polyparse = overrideCabal (doJailbreak super.polyparse) (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }); primitive = doJailbreak super.primitive; regex-posix = doJailbreak super.regex-posix; resolv = doJailbreak super.resolv; singleton-bool = doJailbreak super.singleton-bool; + scientific = doJailbreak super.scientific; + shelly = doJailbreak super.shelly; split = doJailbreak super.split; splitmix = doJailbreak super.splitmix; tar = doJailbreak super.tar; + these = doJailbreak super.these; time-compat = doJailbreak super.time-compat; + type-equality = doJailbreak super.type-equality; vector = doJailbreak (dontCheck super.vector); vector-binary-instances = doJailbreak super.vector-binary-instances; vector-th-unbox = doJailbreak super.vector-th-unbox; zlib = doJailbreak super.zlib; + # Syntax error in tests fixed in https://github.com/simonmar/alex/commit/84b29475e057ef744f32a94bc0d3954b84160760 + alex = dontCheck super.alex; + # Apply patches from head.hackage. - alex = appendPatch (dontCheck super.alex) (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/fe192e12b88b09499d4aff0e562713e820544bd6/patches/alex-3.2.6.patch"; - sha256 = "1rzs764a0nhx002v4fadbys98s6qblw4kx4g46galzjf5f7n2dn4"; - }); - doctest = dontCheck (doJailbreak super.doctest_0_18_1); language-haskell-extract = appendPatch (doJailbreak super.language-haskell-extract) (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch"; - sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/language-haskell-extract-0.2.4.patch"; + sha256 = "0w4y3v69nd3yafpml4gr23l94bdhbmx8xky48a59lckmz5x9fgxv"; }); - # 1.3.0 (on stackage) defines instances for the Option-type, which has been removed from base in GHC 9.2.x - hashable = super.hashable_1_3_3_0; + hashable = super.hashable_1_3_4_1; + + haskell-src-meta = appendPatch (doJailbreak super.haskell-src-meta) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/haskell-src-meta-0.8.7.patch"; + sha256 = "013k8hpxac226j47cdzgdf9a1j91kmm0cvv7n8zwlajbj3y9bzjp"; + }); + + # Tests depend on `parseTime` which is no longer available + hourglass = dontCheck super.hourglass; # 1.2.1 introduced support for GHC 9.2.1, stackage has 1.2.0 # The test suite indirectly depends on random, which leads to infinite recursion @@ -100,16 +175,31 @@ self: super: { lens = super.lens_5_0_1; # 0.16.0 introduced support for GHC 9.0.x, stackage has 0.15.0 - memory = super.memory_0_16_0; + memory = appendPatch super.memory_0_16_0 (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/memory-0.16.0.patch"; + sha256 = "1kjganx729a6xfgfnrb3z7q6mvnidl042zrsd9n5n5a3i76nl5nl"; + }); # GHC 9.0.x doesn't like `import Spec (main)` in Main.hs # https://github.com/snoyberg/mono-traversable/issues/192 mono-traversable = dontCheck super.mono-traversable; + quickcheck-instances = appendPatch (doJailbreak super.quickcheck-instances) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/quickcheck-instances-0.3.25.2.patch"; + sha256 = "0ndnb6wbnhxxwy69jjdpmd7gmmv6asmx1jczwz1hsn921mn1ilnp"; + # `.cabal` revision information has been included in the patch + excludes = ["*.cabal"]; + }); + # Disable tests pending resolution of # https://github.com/Soostone/retry/issues/71 retry = dontCheck super.retry; + streaming-commons = appendPatch super.streaming-commons (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/streaming-commons-0.2.2.1.patch"; + sha256 = "04wi1jskr3j8ayh88kkx4irvhhgz0i7aj6fblzijy0fygikvidpy"; + }); + # hlint 3.3 needs a ghc-lib-parser newer than the one from stackage hlint = super.hlint_3_3_4.overrideScope (self: super: { ghc-lib-parser = overrideCabal self.ghc-lib-parser_9_0_1_20210324 { diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 54521699a0..5e40f12bcc 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 18.12 +# Stackage LTS 18.13 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -163,22 +163,22 @@ default-package-overrides: - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - arrows ==0.4.4.2 - - ascii ==1.0.1.4 - - ascii-case ==1.0.0.4 - - ascii-char ==1.0.0.8 + - ascii ==1.0.1.6 + - ascii-case ==1.0.0.6 + - ascii-char ==1.0.0.10 - asciidiagram ==1.3.3.3 - - ascii-group ==1.0.0.4 - - ascii-predicates ==1.0.0.4 + - ascii-group ==1.0.0.6 + - ascii-predicates ==1.0.0.6 - ascii-progress ==0.3.3.0 - - ascii-superset ==1.0.1.4 - - ascii-th ==1.0.0.4 + - ascii-superset ==1.0.1.6 + - ascii-th ==1.0.0.6 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 - asn1-types ==0.3.4 - assert-failure ==0.1.2.5 - assoc ==1.0.2 - astro ==0.4.3.0 - - async ==2.2.3 + - async ==2.2.4 - async-extra ==0.2.0.0 - async-pool ==0.9.1 - async-refresh ==0.3.0.0 @@ -277,7 +277,7 @@ default-package-overrides: - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.2.1 - bmp ==1.2.6.3 - - BNFC ==2.9.2 + - BNFC ==2.9.3 - BNFC-meta ==0.6.1 - board-games ==0.3 - boltzmann-samplers ==0.1.1.0 @@ -614,7 +614,7 @@ default-package-overrides: - distributed-closure ==0.4.2.0 - distribution-opensuse ==1.1.1 - distributive ==0.6.2.1 - - dl-fedora ==0.9.1 + - dl-fedora ==0.9.2 - dlist ==1.0 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 @@ -683,7 +683,7 @@ default-package-overrides: - elynx-tree ==0.5.1.1 - email-validate ==2.3.2.15 - emd ==0.2.0.0 - - emojis ==0.1 + - emojis ==0.1.1 - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 - entropy ==0.4.1.6 @@ -704,7 +704,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.9 - - esqueleto ==3.5.2.2 + - esqueleto ==3.5.3.0 - essence-of-live-coding ==0.2.5 - essence-of-live-coding-gloss ==0.2.5 - essence-of-live-coding-pulse ==0.2.5 @@ -838,7 +838,7 @@ default-package-overrides: - generic-aeson ==0.2.0.12 - generic-arbitrary ==0.1.0 - generic-constraints ==1.1.1.1 - - generic-data ==0.9.2.0 + - generic-data ==0.9.2.1 - generic-data-surgery ==0.3.0.0 - generic-deriving ==1.14.1 - generic-functor ==0.2.0.0 @@ -1011,7 +1011,7 @@ default-package-overrides: - hasql-transaction ==1.0.1 - hasty-hamiltonian ==1.3.4 - HaTeX ==3.22.3.0 - - HaXml ==1.25.5 + - HaXml ==1.25.6 - haxr ==3000.11.4.1 - HCodecs ==0.5.2 - hdaemonize ==0.5.6 @@ -1107,7 +1107,7 @@ default-package-overrides: - hslua-module-path ==0.1.0.1 - hslua-module-system ==0.2.2.1 - hslua-module-text ==0.3.0.1 - - HsOpenSSL ==0.11.7.1 + - HsOpenSSL ==0.11.7.2 - HsOpenSSL-x509-system ==0.1.0.4 - hsp ==0.10.0 - hspec ==2.7.10 @@ -1259,7 +1259,7 @@ default-package-overrides: - intset-imperative ==0.1.0.0 - invariant ==0.5.4 - invertible ==0.2.0.7 - - invertible-grammar ==0.1.3 + - invertible-grammar ==0.1.3.1 - io-machine ==0.2.0.0 - io-manager ==0.1.0.3 - io-memoize ==1.1.1.0 @@ -1395,6 +1395,7 @@ default-package-overrides: - linear ==1.21.6 - linear-circuit ==0.1.0.2 - linenoise ==0.3.2 + - linux-capabilities ==0.1.0.0 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - liquid-fixpoint ==0.8.10.2 @@ -1446,7 +1447,7 @@ default-package-overrides: - makefile ==1.1.0.0 - managed ==1.0.8 - MapWith ==0.2.0.0 - - markdown ==0.1.17.4 + - markdown ==0.1.17.5 - markdown-unlit ==0.5.1 - markov-chain ==0.0.3.4 - massiv ==0.6.1.0 @@ -1578,7 +1579,7 @@ default-package-overrides: - multipart ==0.2.1 - multiset ==0.3.4.3 - multistate ==0.8.0.3 - - murmur3 ==1.0.4 + - murmur3 ==1.0.5 - murmur-hash ==0.1.0.9 - MusicBrainz ==0.4.1 - mustache ==2.3.1 @@ -1634,7 +1635,7 @@ default-package-overrides: - nonce ==1.0.7 - nondeterminism ==1.4 - non-empty ==0.3.3 - - nonempty-containers ==0.3.4.3 + - nonempty-containers ==0.3.4.4 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.4 - nonempty-vector ==0.2.1.0 @@ -1686,7 +1687,7 @@ default-package-overrides: - opentelemetry-extra ==0.7.0 - opentelemetry-lightstep ==0.7.0 - opentelemetry-wai ==0.7.0 - - operational ==0.2.3.5 + - operational ==0.2.4.0 - operational-class ==0.3.0.0 - optics ==0.3 - optics-core ==0.3.0.1 @@ -2011,7 +2012,7 @@ default-package-overrides: - rocksdb-haskell ==1.0.1 - rocksdb-haskell-jprupp ==2.1.3 - rocksdb-query ==0.4.2 - - roles ==0.2.0.0 + - roles ==0.2.1.0 - rope-utf16-splay ==0.3.2.0 - rosezipper ==0.2 - rot13 ==0.2.0.1 @@ -2120,7 +2121,7 @@ default-package-overrides: - set-cover ==0.1.1 - setenv ==0.1.1.3 - setlocale ==1.0.0.10 - - sexp-grammar ==2.3.2 + - sexp-grammar ==2.3.3 - SHA ==1.6.4.4 - shake ==0.19.6 - shake-language-c ==0.12.0 @@ -2464,7 +2465,7 @@ default-package-overrides: - turtle ==1.5.22 - typecheck-plugin-nat-simple ==0.1.0.2 - TypeCompose ==0.9.14 - - typed-process ==0.2.6.1 + - typed-process ==0.2.6.3 - typed-uuid ==0.1.0.0 - type-equality ==1 - type-errors ==0.2.0.0 @@ -2608,7 +2609,7 @@ default-package-overrides: - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - warp ==3.3.17 - - warp-tls ==3.3.1 + - warp-tls ==3.3.2 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 - wcwidth ==0.0.2 @@ -2660,7 +2661,7 @@ default-package-overrides: - Xauth ==0.1 - xdg-basedir ==0.2.2 - xdg-userdirs ==0.1.0.2 - - xeno ==0.4.2 + - xeno ==0.4.3 - xlsx ==0.8.4 - xlsx-tabular ==0.2.2.1 - xml ==1.3.14 @@ -2693,7 +2694,7 @@ default-package-overrides: - yesod-fb ==0.6.1 - yesod-form ==1.7.0 - yesod-gitrev ==0.2.2 - - yesod-markdown ==0.12.6.11 + - yesod-markdown ==0.12.6.12 - yesod-newsfeed ==1.7.0.0 - yesod-page-cursor ==2.0.0.9 - yesod-paginator ==1.1.1.0 @@ -2724,6 +2725,6 @@ default-package-overrides: - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 - zot ==0.0.3 - - zstd ==0.1.2.0 + - zstd ==0.1.3.0 - ztail ==1.2.0.2 - zydiskell ==0.2.0.0 diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 313c95eca8..7d8e69f2b7 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -1277,34 +1277,6 @@ self: { }) {}; "BNFC" = callPackage - ({ mkDerivation, alex, array, base, Cabal, cabal-doctest - , containers, deepseq, directory, doctest, filepath, happy, hspec - , hspec-discover, HUnit, mtl, pretty, process, QuickCheck - , string-qq, temporary, time - }: - mkDerivation { - pname = "BNFC"; - version = "2.9.2"; - sha256 = "1wn46a6rw6fwxmqp3b8nz81ag2nphyalm6l2frzg63xbdxnlwgmi"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - array base containers deepseq directory filepath mtl pretty process - string-qq time - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - array base containers deepseq directory doctest filepath hspec - HUnit mtl pretty process QuickCheck string-qq temporary time - ]; - testToolDepends = [ alex happy hspec-discover ]; - description = "A compiler front-end generator"; - license = lib.licenses.bsd3; - }) {}; - - "BNFC_2_9_3" = callPackage ({ mkDerivation, alex, array, base, Cabal, cabal-doctest , containers, deepseq, directory, doctest, filepath, happy, hspec , hspec-discover, HUnit, mtl, pretty, process, QuickCheck @@ -1330,7 +1302,6 @@ self: { testToolDepends = [ alex happy hspec-discover ]; description = "A compiler front-end generator"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "BNFC-meta" = callPackage @@ -9785,26 +9756,6 @@ self: { }) {}; "HaXml" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , polyparse, pretty, random - }: - mkDerivation { - pname = "HaXml"; - version = "1.25.5"; - sha256 = "0d8jbiv53r3ndg76r3937idqdg34nhmb99vj087i73hjnv21mifb"; - revision = "4"; - editedCabalFile = "029jnlmab1llr55dmlamrn2hxkbqw7ryz1dfg19h1aip6byf4ljh"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers filepath polyparse pretty random - ]; - executableHaskellDepends = [ base directory polyparse pretty ]; - description = "Utilities for manipulating XML documents"; - license = "LGPL"; - }) {}; - - "HaXml_1_25_6" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , polyparse, pretty, random }: @@ -9820,7 +9771,6 @@ self: { executableHaskellDepends = [ base directory polyparse pretty ]; description = "Utilities for manipulating XML documents"; license = "LGPL"; - hydraPlatforms = lib.platforms.none; }) {}; "Hach" = callPackage @@ -10834,20 +10784,6 @@ self: { }) {Judy = null;}; "HsOpenSSL" = callPackage - ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: - mkDerivation { - pname = "HsOpenSSL"; - version = "0.11.7.1"; - sha256 = "1vkcs0crifjpgr1rxkbzkwyhl4zg84m5bfxkp095mgry557gqzm8"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring network time ]; - librarySystemDepends = [ openssl ]; - testHaskellDepends = [ base bytestring ]; - description = "Partial OpenSSL binding for Haskell"; - license = lib.licenses.publicDomain; - }) {inherit (pkgs) openssl;}; - - "HsOpenSSL_0_11_7_2" = callPackage ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; @@ -10859,7 +10795,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "Partial OpenSSL binding for Haskell"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) openssl;}; "HsOpenSSL-x509-system" = callPackage @@ -19078,16 +19013,18 @@ self: { }) {}; "SpaceInvaders" = callPackage - ({ mkDerivation, array, base, HGL, random, Yampa }: + ({ mkDerivation, array, base, deepseq, HGL, random + , simple-affine-space, Yampa + }: mkDerivation { pname = "SpaceInvaders"; - version = "0.4.5"; - sha256 = "1nf50gdjdm7bwxzg5ligly9v1hkkdmqd8b1f8637a9bg8sz1rzbd"; - revision = "1"; - editedCabalFile = "0s21i9snp7734amqd6q7ckbj77vsnl0mi2k939ha0phfvdisb5gy"; + version = "0.13.3"; + sha256 = "0gl1cs2msc7c8vs4zknl77wqmlmp2k4brv0asni6mlc6nigriq4f"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ array base HGL random Yampa ]; + executableHaskellDepends = [ + array base deepseq HGL random simple-affine-space Yampa + ]; description = "Video game"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -21951,8 +21888,8 @@ self: { ({ mkDerivation, base, deepseq, random, simple-affine-space }: mkDerivation { pname = "Yampa"; - version = "0.13.2"; - sha256 = "0y0jmk9cbcnhwdrjcacx5j8gb64aj61a04nxizwbds0zvibcdzgb"; + version = "0.13.3"; + sha256 = "06w2glnn5w97bjmwl88j46xkr2mkvgy5a2wwwzqq168awn436kk3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33557,12 +33494,13 @@ self: { }: mkDerivation { pname = "ascii"; - version = "1.0.1.4"; - sha256 = "0j0cx91q4kmljv2fnfa1cllmyyk2wr6vg373bdfq0cx79d6542hw"; + version = "1.0.1.6"; + sha256 = "1bxii5r24p7i68h37m6q7bjqy9fgp6s33ia9s62hwh70xkkcm8yw"; libraryHaskellDepends = [ ascii-case ascii-char ascii-group ascii-predicates ascii-superset ascii-th base bytestring data-ascii text ]; + testHaskellDepends = [ base text ]; description = "The ASCII character set and encoding"; license = lib.licenses.asl20; }) {}; @@ -33602,17 +33540,6 @@ self: { }) {}; "ascii-case" = callPackage - ({ mkDerivation, ascii-char, base, hashable }: - mkDerivation { - pname = "ascii-case"; - version = "1.0.0.4"; - sha256 = "1485y33as83f1iprdq7hl6ar7gha85678ajq80jld06wsmi9k0xa"; - libraryHaskellDepends = [ ascii-char base hashable ]; - description = "ASCII letter case"; - license = lib.licenses.asl20; - }) {}; - - "ascii-case_1_0_0_6" = callPackage ({ mkDerivation, ascii-char, base, hashable }: mkDerivation { pname = "ascii-case"; @@ -33622,21 +33549,9 @@ self: { testHaskellDepends = [ ascii-char base ]; description = "ASCII letter case"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-char" = callPackage - ({ mkDerivation, base, hashable }: - mkDerivation { - pname = "ascii-char"; - version = "1.0.0.8"; - sha256 = "1ajpkzq1d04ww5yif7dl4np5zhhm5ks8wxhmfdl8ygy8r7akg50d"; - libraryHaskellDepends = [ base hashable ]; - description = "A Char type representing an ASCII character"; - license = lib.licenses.asl20; - }) {}; - - "ascii-char_1_0_0_10" = callPackage ({ mkDerivation, base, hashable }: mkDerivation { pname = "ascii-char"; @@ -33646,7 +33561,6 @@ self: { testHaskellDepends = [ base ]; description = "A Char type representing an ASCII character"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-cows" = callPackage @@ -33677,17 +33591,6 @@ self: { }) {}; "ascii-group" = callPackage - ({ mkDerivation, ascii-char, base, hashable }: - mkDerivation { - pname = "ascii-group"; - version = "1.0.0.4"; - sha256 = "0h1y0dmly3yammmqwa197nf3g83x03r5jlnsv9z9zxm9bin38ac5"; - libraryHaskellDepends = [ ascii-char base hashable ]; - description = "ASCII character groups"; - license = lib.licenses.asl20; - }) {}; - - "ascii-group_1_0_0_6" = callPackage ({ mkDerivation, ascii-char, base, hashable }: mkDerivation { pname = "ascii-group"; @@ -33697,7 +33600,6 @@ self: { testHaskellDepends = [ ascii-char base ]; description = "ASCII character groups"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-holidays" = callPackage @@ -33716,17 +33618,6 @@ self: { }) {}; "ascii-predicates" = callPackage - ({ mkDerivation, ascii-char, base }: - mkDerivation { - pname = "ascii-predicates"; - version = "1.0.0.4"; - sha256 = "0c2331y1izxw7n33pfxfb7krz4lgdf87244xlnf03x8npckb7kgq"; - libraryHaskellDepends = [ ascii-char base ]; - description = "Various categorizations of ASCII characters"; - license = lib.licenses.asl20; - }) {}; - - "ascii-predicates_1_0_0_6" = callPackage ({ mkDerivation, ascii-char, base }: mkDerivation { pname = "ascii-predicates"; @@ -33736,7 +33627,6 @@ self: { testHaskellDepends = [ ascii-char base ]; description = "Various categorizations of ASCII characters"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-progress" = callPackage @@ -33784,19 +33674,6 @@ self: { }) {}; "ascii-superset" = callPackage - ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: - mkDerivation { - pname = "ascii-superset"; - version = "1.0.1.4"; - sha256 = "1bjkinz2p8lq4grnj5d9q1z9jsn4b8cgkqsnxjhzb3plz94i5mxk"; - libraryHaskellDepends = [ - ascii-char base bytestring hashable text - ]; - description = "Representing ASCII with refined supersets"; - license = lib.licenses.asl20; - }) {}; - - "ascii-superset_1_0_1_6" = callPackage ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: mkDerivation { pname = "ascii-superset"; @@ -33808,7 +33685,6 @@ self: { testHaskellDepends = [ ascii-char base text ]; description = "Representing ASCII with refined supersets"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-table" = callPackage @@ -33829,20 +33705,6 @@ self: { }) {}; "ascii-th" = callPackage - ({ mkDerivation, ascii-char, ascii-superset, base, template-haskell - }: - mkDerivation { - pname = "ascii-th"; - version = "1.0.0.4"; - sha256 = "08vfy2gp0ppa3l95gjqrbqca3gn2aln7zvw7qpp6x7jnzjkl8dn1"; - libraryHaskellDepends = [ - ascii-char ascii-superset base template-haskell - ]; - description = "Template Haskell support for ASCII"; - license = lib.licenses.asl20; - }) {}; - - "ascii-th_1_0_0_6" = callPackage ({ mkDerivation, ascii-char, ascii-superset, base, bytestring , template-haskell, text }: @@ -33858,7 +33720,6 @@ self: { ]; description = "Template Haskell support for ASCII"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-vector-avc" = callPackage @@ -34528,24 +34389,6 @@ self: { }) {}; "async" = callPackage - ({ mkDerivation, base, hashable, HUnit, stm, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "async"; - version = "2.2.3"; - sha256 = "0p4k6872pj0aykbnc19ilam1h8fgskxlwpyg5qisaivr0fhg6yj6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base hashable stm ]; - testHaskellDepends = [ - base HUnit stm test-framework test-framework-hunit - ]; - description = "Run IO operations asynchronously and wait for their results"; - license = lib.licenses.bsd3; - }) {}; - - "async_2_2_4" = callPackage ({ mkDerivation, base, hashable, HUnit, stm, test-framework , test-framework-hunit }: @@ -34561,7 +34404,6 @@ self: { ]; description = "Run IO operations asynchronously and wait for their results"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "async-ajax" = callPackage @@ -55507,10 +55349,8 @@ self: { }: mkDerivation { pname = "cipher-aes128"; - version = "0.7.0.5"; - sha256 = "1bafr5aa9mjfzdgc6gwapvb9g04pyh4lwhv2x2m1v3ljjglg9d1w"; - revision = "1"; - editedCabalFile = "0miqp8jvgsqkgj5rxb2vjwa24ac5kdyy3b2cwxb9z0wk1ixk5ilm"; + version = "0.7.0.6"; + sha256 = "1pcxmgj9i8g3yl502lpywc75dilmaszlzixpd7wqjqr7lvasa117"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal process ]; @@ -58504,23 +58344,24 @@ self: { "cobot" = callPackage ({ mkDerivation, array, base, bytestring, clock, containers , criterion, deepseq, hspec, lens, linear, megaparsec, mtl - , parallel, random, split, template-haskell, text + , parallel, random, split, template-haskell, text, vector }: mkDerivation { pname = "cobot"; - version = "0.1.1.4"; - sha256 = "0sskb87cjq6b6splwyl4dc11vwyx4jqp4xwdsgk78awfl1zcqhxd"; + version = "0.1.1.7"; + sha256 = "12g2vfb224lax59pv6jd4061v0bdzk91w0dc034p6mzm02dpxhqr"; libraryHaskellDepends = [ array base bytestring containers deepseq lens linear megaparsec mtl - split template-haskell text + split template-haskell text vector ]; testHaskellDepends = [ array base bytestring containers deepseq hspec lens linear - megaparsec mtl split template-haskell text + megaparsec mtl split template-haskell text vector ]; benchmarkHaskellDepends = [ array base bytestring clock containers criterion deepseq lens linear megaparsec mtl parallel random split template-haskell text + vector ]; description = "Computational biology toolkit to collaborate with researchers in constructive protein engineering"; license = lib.licenses.bsd3; @@ -65050,6 +64891,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "core-data_0_2_1_10" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, core-text + , hashable, prettyprinter, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "core-data"; + version = "0.2.1.10"; + sha256 = "151b8kym71dklgynyjsbzpggbyw7wysa8bv1pkpy94jdbflmlpaf"; + libraryHaskellDepends = [ + aeson base bytestring containers core-text hashable prettyprinter + scientific text unordered-containers vector + ]; + description = "Convenience wrappers around common data structures and encodings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-haskell" = callPackage ({ mkDerivation, base, haskeline, haskell-src-exts, hint }: mkDerivation { @@ -65088,6 +64947,28 @@ self: { license = lib.licenses.mit; }) {}; + "core-program_0_2_12_0" = callPackage + ({ mkDerivation, async, base, bytestring, chronologique, core-data + , core-text, directory, exceptions, filepath, fsnotify, hashable + , hourglass, mtl, prettyprinter, safe-exceptions, stm + , template-haskell, terminal-size, text, text-short, transformers + , unix + }: + mkDerivation { + pname = "core-program"; + version = "0.2.12.0"; + sha256 = "0gl1cv82h2ax8gf1jjqphkj2481plz64jqq497rvyy2cpqv72kvr"; + libraryHaskellDepends = [ + async base bytestring chronologique core-data core-text directory + exceptions filepath fsnotify hashable hourglass mtl prettyprinter + safe-exceptions stm template-haskell terminal-size text text-short + transformers unix + ]; + description = "Opinionated Haskell Interoperability"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-text" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq , fingertree, hashable, prettyprinter, template-haskell, text @@ -65105,6 +64986,24 @@ self: { license = lib.licenses.mit; }) {}; + "core-text_0_3_4_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq + , fingertree, hashable, prettyprinter, template-haskell, text + , text-short + }: + mkDerivation { + pname = "core-text"; + version = "0.3.4.0"; + sha256 = "1013s28p90fifkkqldh35wrdrs86fhan0r8q54imb7b8c7lasj3r"; + libraryHaskellDepends = [ + ansi-terminal base bytestring colour deepseq fingertree hashable + prettyprinter template-haskell text text-short + ]; + description = "A rope type based on a finger tree over UTF-8 fragments"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "corebot-bliki" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , directory, filepath, filestore, http-types, monads-tf, pandoc @@ -67542,14 +67441,14 @@ self: { , criterion, cryptohash-sha1, deepseq, directory, exceptions, extra , filepath, ghc-prim, gitrev, GraphSCC, happy, haskeline, heredoc , integer-gmp, libBF, MemoTrie, monad-control, monadLib, mtl - , optparse-applicative, panic, parameterized-utils, pretty, process - , random, sbv, simple-smt, stm, strict, temporary, text, tf-random + , optparse-applicative, panic, parameterized-utils, prettyprinter + , process, sbv, simple-smt, stm, strict, temporary, text, tf-random , time, transformers, transformers-base, what4 }: mkDerivation { pname = "cryptol"; - version = "2.11.0"; - sha256 = "05h751lxyym27b5kfrcss5vjg4ifpl4lqgxvvp6fz4mpbigm7ds3"; + version = "2.12.0"; + sha256 = "13h5bd6xqh3x6jqdv8a25ffyj10wdyam0flzpdxi4zd23z5b2ihp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -67557,14 +67456,14 @@ self: { array async base base-compat bv-sized bytestring containers cryptohash-sha1 deepseq directory exceptions filepath ghc-prim gitrev GraphSCC heredoc integer-gmp libBF MemoTrie monad-control - monadLib mtl panic parameterized-utils pretty process random sbv + monadLib mtl panic parameterized-utils prettyprinter process sbv simple-smt stm strict text tf-random time transformers-base what4 ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ ansi-terminal base base-compat blaze-html containers directory - extra filepath haskeline monad-control mtl optparse-applicative - process temporary text transformers + exceptions extra filepath haskeline monad-control mtl + optparse-applicative process temporary text transformers ]; benchmarkHaskellDepends = [ base criterion deepseq directory filepath sbv text @@ -78986,29 +78885,6 @@ self: { }) {}; "dl-fedora" = callPackage - ({ mkDerivation, base, bytestring, directory, extra, filepath - , http-client, http-client-tls, http-directory, http-types - , optparse-applicative, regex-posix, simple-cmd, simple-cmd-args - , text, time, unix, xdg-userdirs - }: - mkDerivation { - pname = "dl-fedora"; - version = "0.9.1"; - sha256 = "1ryvgccwfs8yzhywcvgd5s9imr4w3sxdif79npfw3zk1rcnl23v4"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring directory extra filepath http-client - http-client-tls http-directory http-types optparse-applicative - regex-posix simple-cmd simple-cmd-args text time unix xdg-userdirs - ]; - testHaskellDepends = [ base simple-cmd ]; - description = "Fedora image download tool"; - license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - }) {}; - - "dl-fedora_0_9_2" = callPackage ({ mkDerivation, base, bytestring, directory, extra, filepath , http-client, http-client-tls, http-directory, http-types , optparse-applicative, regex-posix, simple-cmd, simple-cmd-args @@ -84257,6 +84133,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "elf_0_31" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, hspec }: + mkDerivation { + pname = "elf"; + version = "0.31"; + sha256 = "180h5kz8wmrm6hy4myp83b2sjss7dq8wxvlqryi79qscsrz9n0ln"; + libraryHaskellDepends = [ base binary bytestring ]; + testHaskellDepends = [ base bytestring containers hspec ]; + description = "An Elf parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "eliminators" = callPackage ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats , singletons, template-haskell, th-abstraction, th-desugar @@ -85445,18 +85334,6 @@ self: { }) {}; "emojis" = callPackage - ({ mkDerivation, base, containers, HUnit, text }: - mkDerivation { - pname = "emojis"; - version = "0.1"; - sha256 = "1c6zkj9gmk1y90gbdrn50hyp7mw1mggzhnr2khqd728ryipw60ss"; - libraryHaskellDepends = [ base containers text ]; - testHaskellDepends = [ base HUnit text ]; - description = "Conversion between emoji characters and their names"; - license = lib.licenses.bsd3; - }) {}; - - "emojis_0_1_1" = callPackage ({ mkDerivation, base, containers, HUnit, text }: mkDerivation { pname = "emojis"; @@ -85466,7 +85343,6 @@ self: { testHaskellDepends = [ base HUnit text ]; description = "Conversion between emoji characters and their names"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "empty" = callPackage @@ -87200,34 +87076,6 @@ self: { }) {}; "esqueleto" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring - , conduit, containers, exceptions, hspec, hspec-core, monad-logger - , mtl, mysql, mysql-simple, persistent, persistent-mysql - , persistent-postgresql, persistent-sqlite, postgresql-simple - , QuickCheck, resourcet, tagged, text, time, transformers, unliftio - , unordered-containers - }: - mkDerivation { - pname = "esqueleto"; - version = "3.5.2.2"; - sha256 = "19m4lzxhjakf1zbsvwa0xmhcln1wb8ydbsnfyhiwhgvryrhvw9ga"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - monad-logger persistent resourcet tagged text time transformers - unliftio unordered-containers - ]; - testHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - exceptions hspec hspec-core monad-logger mtl mysql mysql-simple - persistent persistent-mysql persistent-postgresql persistent-sqlite - postgresql-simple QuickCheck resourcet tagged text time - transformers unliftio unordered-containers - ]; - description = "Type-safe EDSL for SQL queries on persistent backends"; - license = lib.licenses.bsd3; - }) {}; - - "esqueleto_3_5_3_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, hspec-core, monad-logger , mtl, mysql, mysql-simple, persistent, persistent-mysql @@ -87253,7 +87101,23 @@ self: { ]; description = "Type-safe EDSL for SQL queries on persistent backends"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; + }) {}; + + "esqueleto-pgcrypto" = callPackage + ({ mkDerivation, base, esqueleto, hspec, monad-logger, persistent + , persistent-postgresql, QuickCheck, text, transformers, unliftio + }: + mkDerivation { + pname = "esqueleto-pgcrypto"; + version = "0.1.0.0"; + sha256 = "0xxs9nk6k3v7jjcrbgm0b85bncd6rzgrgflvw2w65i6dam0yr4ix"; + libraryHaskellDepends = [ base esqueleto text ]; + testHaskellDepends = [ + base esqueleto hspec monad-logger persistent persistent-postgresql + QuickCheck text transformers unliftio + ]; + description = "Esqueleto support for the pgcrypto PostgreSQL module"; + license = lib.licenses.bsd3; }) {}; "ess" = callPackage @@ -99505,8 +99369,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.20.3"; - sha256 = "1qz8grvf8zyn549zch6d3dkhzq8dmgqigf3q62141l1q7qa3b75q"; + version = "0.20.4"; + sha256 = "0yjm0s9risrc0aj1si8i403k6b1znr8szff1f8ksb5cr9j7nn7gn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101147,32 +101011,6 @@ self: { }) {}; "generic-data" = callPackage - ({ mkDerivation, ap-normalize, base, base-orphans, Cabal - , cabal-doctest, contravariant, criterion, deepseq, doctest - , generic-lens, ghc-boot-th, inspection-testing, one-liner - , QuickCheck, show-combinators, tasty, tasty-hunit - , template-haskell, unordered-containers - }: - mkDerivation { - pname = "generic-data"; - version = "0.9.2.0"; - sha256 = "00zwfr21kmgcdjfjvacn4pvs5i8bl6xbbzw95746g67ap5nz624d"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - ap-normalize base base-orphans contravariant ghc-boot-th - show-combinators - ]; - testHaskellDepends = [ - base doctest generic-lens inspection-testing one-liner QuickCheck - show-combinators tasty tasty-hunit template-haskell - unordered-containers - ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; - description = "Deriving instances with GHC.Generics and related utilities"; - license = lib.licenses.mit; - }) {}; - - "generic-data_0_9_2_1" = callPackage ({ mkDerivation, ap-normalize, base, base-orphans, contravariant , criterion, deepseq, generic-lens, ghc-boot-th, inspection-testing , one-liner, show-combinators, tasty, tasty-hunit, template-haskell @@ -101193,7 +101031,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Deriving instances with GHC.Generics and related utilities"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "generic-data-surgery" = callPackage @@ -121263,6 +121100,8 @@ self: { pname = "haskell-gi-base"; version = "0.25.0"; sha256 = "140f6amq69r39vj54i1p4c9q0ysxkvb3yjcrlbrrayf66bhw8mqy"; + revision = "1"; + editedCabalFile = "1pl2mzjdsnvvkfmr622jvw2vk9gxdql5flck4vb60nr9d970zg9r"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; @@ -134961,6 +134800,32 @@ self: { license = lib.licenses.mit; }) {}; + "honeycomb" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, bytestring + , chronos, http-client, http-client-tls, http-conduit, http-types + , microlens, mmorph, monad-control, mtl, mwc-random, profunctors + , random, resource-pool, stm, text, unliftio, unordered-containers + , uuid, vector, zlib + }: + mkDerivation { + pname = "honeycomb"; + version = "0.0.0.3"; + sha256 = "0y1z9lcf7b1dzvp20flcq75jmh2jxx2dmynfw00dwsy6s2jabhx0"; + libraryHaskellDepends = [ + aeson async auto-update base bytestring chronos http-client + http-client-tls http-conduit http-types microlens mmorph + monad-control mtl mwc-random profunctors random resource-pool stm + text unliftio unordered-containers uuid vector zlib + ]; + testHaskellDepends = [ + aeson async auto-update base bytestring chronos http-client + http-client-tls http-conduit http-types microlens mmorph + monad-control mtl mwc-random profunctors random resource-pool stm + text unliftio unordered-containers uuid vector zlib + ]; + license = lib.licenses.bsd3; + }) {}; + "honi" = callPackage ({ mkDerivation, base, bytestring, freenect, hspec, HUnit, OpenNI2 , text @@ -151779,8 +151644,8 @@ self: { }: mkDerivation { pname = "interval-algebra"; - version = "1.0.0"; - sha256 = "1wd2z7ngw53krg3y5klrhlndm9dilmqpvmlipjda168gqisxsscp"; + version = "1.0.1"; + sha256 = "1pw4z3h1ihb82105v1i3809icp024a6cmlic2zfgdhdqf8wvfzv4"; libraryHaskellDepends = [ base containers foldl QuickCheck safe time witherable ]; @@ -152069,25 +151934,6 @@ self: { }) {}; "invertible-grammar" = callPackage - ({ mkDerivation, base, bifunctors, containers, mtl, prettyprinter - , profunctors, semigroups, tagged, template-haskell, text - , transformers - }: - mkDerivation { - pname = "invertible-grammar"; - version = "0.1.3"; - sha256 = "160hw7p5mpajwmv8fps2gicqj3x3yr9w239pfnv9i5gsf4irnn9n"; - revision = "2"; - editedCabalFile = "1fmw3v2g22n812ppba4yibgq1wlpfwkypsxa768calxafynb3i33"; - libraryHaskellDepends = [ - base bifunctors containers mtl prettyprinter profunctors semigroups - tagged template-haskell text transformers - ]; - description = "Invertible parsing combinators framework"; - license = lib.licenses.bsd3; - }) {}; - - "invertible-grammar_0_1_3_1" = callPackage ({ mkDerivation, base, bifunctors, containers, mtl, prettyprinter , profunctors, semigroups, tagged, template-haskell, text , transformers @@ -152102,7 +151948,6 @@ self: { ]; description = "Invertible parsing combinators framework"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "invertible-hlist" = callPackage @@ -152509,12 +152354,17 @@ self: { }) {}; "ip2proxy" = callPackage - ({ mkDerivation, base, binary, bytestring, iproute }: + ({ mkDerivation, aeson, base, binary, bytestring, http-client + , http-client-tls, http-types, iproute, uri-encode + }: mkDerivation { pname = "ip2proxy"; - version = "3.1.0"; - sha256 = "03naiwlxzfmym6ms03z0a9ap2x9f40aqlssyjbb37krhlmmnf0l8"; - libraryHaskellDepends = [ base binary bytestring iproute ]; + version = "3.2.0"; + sha256 = "0m50z5a32m28lfq6g8chkakvcgd6iplmx2ik0nbi2zsgfc0l209y"; + libraryHaskellDepends = [ + aeson base binary bytestring http-client http-client-tls http-types + iproute uri-encode + ]; description = "IP2Proxy Haskell package for proxy detection"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -158751,8 +158601,8 @@ self: { }: mkDerivation { pname = "kempe"; - version = "0.2.0.6"; - sha256 = "1qv867aks1vgcri7gsgim3852g7mnznarnsr97x1j3lx4qfkppnv"; + version = "0.2.0.7"; + sha256 = "0x0915nnrm03fryvwp0rcwvvqsbs1n639yjv509iz2v7wdw5kas8"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -161525,15 +161375,15 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "language-docker_10_1_2" = callPackage + "language-docker_10_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , hspec, hspec-megaparsec, HUnit, megaparsec, prettyprinter , QuickCheck, split, text, time }: mkDerivation { pname = "language-docker"; - version = "10.1.2"; - sha256 = "07h2qarbscgppn9drpl72pi2w9arigqpczrxb51q9m6xhfdx12n1"; + version = "10.2.0"; + sha256 = "193hi4ls55pzybal7q4dlzdz1a8da2155a501h02j1w4nb25glrq"; libraryHaskellDepends = [ base bytestring containers data-default-class megaparsec prettyprinter split text time @@ -162213,6 +162063,8 @@ self: { pname = "language-python"; version = "0.5.8"; sha256 = "1mf3czvnh9582klv0c9g7pcn1wx4qjwpvhv8la6afaifv6y5lki2"; + revision = "1"; + editedCabalFile = "13lc4d2b7id49yczxlqgs3zlms1g6gv0i8amk56g1jvswli6nsn9"; libraryHaskellDepends = [ array base containers monads-tf pretty transformers utf8-string ]; @@ -163504,8 +163356,8 @@ self: { }: mkDerivation { pname = "ldap-client"; - version = "0.4.1"; - sha256 = "0m253jicjn8rqdrkcqd75bcrdg7bdq313crx2b54yv5s3mz6cxi2"; + version = "0.4.2"; + sha256 = "025k631wlg6g6fcsxq403k7wn7cnqbk77w7vpmm87sngvk0i4q0v"; libraryHaskellDepends = [ asn1-encoding asn1-types async base bytestring connection containers fail network semigroups stm text @@ -167194,12 +167046,13 @@ self: { }) {}; "linebreak" = callPackage - ({ mkDerivation, base, hyphenation }: + ({ mkDerivation, base, hspec, hyphenation }: mkDerivation { pname = "linebreak"; - version = "1.0.0.3"; - sha256 = "1fds2mgsijfsc96dq95skn562iv2r341zr7v0qsz48y9fh97s3p7"; + version = "1.1.0.0"; + sha256 = "1a1yzpdr1h9a1gnf1iwsqxzpv3w13vd7yb6c0djdc1yq25q0jg7d"; libraryHaskellDepends = [ base hyphenation ]; + testHaskellDepends = [ base hspec hyphenation ]; description = "breaks strings to fit width"; license = lib.licenses.bsd3; }) {}; @@ -174011,29 +173864,6 @@ self: { }) {}; "markdown" = callPackage - ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup - , bytestring, call-stack, conduit, conduit-extra, containers - , data-default, directory, filepath, hspec, text, transformers - , xml-conduit, xml-types, xss-sanitize - }: - mkDerivation { - pname = "markdown"; - version = "0.1.17.4"; - sha256 = "1m7xf3r7wvpzdj2zic90w5b6adnjb6mjq9mycbnzcjibpr1fgqy2"; - libraryHaskellDepends = [ - attoparsec base blaze-html blaze-markup conduit conduit-extra - containers data-default text transformers xml-conduit xml-types - xss-sanitize - ]; - testHaskellDepends = [ - base blaze-html bytestring call-stack conduit conduit-extra - containers directory filepath hspec text transformers - ]; - description = "Convert Markdown to HTML, with XSS protection"; - license = lib.licenses.bsd3; - }) {}; - - "markdown_0_1_17_5" = callPackage ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup , bytestring, call-stack, conduit, conduit-extra, containers , data-default, directory, filepath, hspec, text, transformers @@ -174054,7 +173884,6 @@ self: { ]; description = "Convert Markdown to HTML, with XSS protection"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "markdown-kate" = callPackage @@ -179364,27 +179193,28 @@ self: { }) {}; "mit-3qvpPyAi6mH" = callPackage - ({ mkDerivation, base, base64, clock, directory, free, process - , record-dot-preprocessor, record-hasfield, temporary, text - , text-ansi, unix + ({ mkDerivation, base, base64, clock, containers, directory, free + , ki, process, record-dot-preprocessor, record-hasfield, temporary + , text, text-ansi, unix }: mkDerivation { pname = "mit-3qvpPyAi6mH"; - version = "3"; - sha256 = "0yy7j1ddnny5wq8ywkkmdas9qlfsi26pk0adklmh2c0kqfss4s3f"; + version = "4"; + sha256 = "14sfzb7ii0ldwkfx05r4jk4rc0nqxzi7nw81v8kgsyi0saa1ig0i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base64 clock directory process record-dot-preprocessor - record-hasfield text text-ansi unix + base base64 clock containers directory ki process + record-dot-preprocessor record-hasfield text text-ansi unix ]; executableHaskellDepends = [ - base base64 clock directory process record-dot-preprocessor - record-hasfield text text-ansi unix + base base64 clock containers directory ki process + record-dot-preprocessor record-hasfield text text-ansi unix ]; testHaskellDepends = [ - base base64 clock directory free process record-dot-preprocessor - record-hasfield temporary text text-ansi unix + base base64 clock containers directory free ki process + record-dot-preprocessor record-hasfield temporary text text-ansi + unix ]; description = "A git wrapper with a streamlined UX"; license = lib.licenses.mit; @@ -182570,8 +182400,8 @@ self: { }: mkDerivation { pname = "monomer"; - version = "1.1.0.0"; - sha256 = "1a2cszh84sgyml9yxw2yln7g1ll249aq37lqd6aqjjb7mzb9fjxm"; + version = "1.1.1.0"; + sha256 = "0jv7yc3jclqkh6z5hq47ws6pia0bhqsig06r392k95y96kal07xr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185604,28 +185434,6 @@ self: { }) {}; "murmur3" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, cereal, HUnit - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "murmur3"; - version = "1.0.4"; - sha256 = "022sadxhnywbzx8crwkgky7kndxwpaddc89nq3ya4a4ikq3qvbhm"; - revision = "1"; - editedCabalFile = "130ign0n566nsrzfp4ipb2sy5hq1ymxdlmqb80zbpdc0rdkqh0x0"; - libraryHaskellDepends = [ base bytestring cereal ]; - testHaskellDepends = [ - base base16-bytestring bytestring HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 - ]; - description = "Pure Haskell implementation of the MurmurHash3 x86_32 algorithm"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "murmur3_1_0_5" = callPackage ({ mkDerivation, base, base16, bytestring, cereal, HUnit , QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2 @@ -188985,14 +188793,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "network_3_1_2_2" = callPackage + "network_3_1_2_5" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, hspec , hspec-discover, HUnit, QuickCheck, temporary }: mkDerivation { pname = "network"; - version = "3.1.2.2"; - sha256 = "1dhflq7im3sjc6ascf12z73mhw7cqv1aqfvv3y5m9izr485jq0am"; + version = "3.1.2.5"; + sha256 = "0l8qn0m1pza4iv0x14izgpggisbk91yfipwmwpjbmcb73j7c08zj"; libraryHaskellDepends = [ base bytestring deepseq directory ]; testHaskellDepends = [ base bytestring directory hspec HUnit QuickCheck temporary @@ -191899,27 +191707,6 @@ self: { }) {}; "nonempty-containers" = callPackage - ({ mkDerivation, aeson, base, comonad, containers, deepseq - , hedgehog, hedgehog-fn, nonempty-vector, semigroupoids, tasty - , tasty-hedgehog, text, these, vector - }: - mkDerivation { - pname = "nonempty-containers"; - version = "0.3.4.3"; - sha256 = "1k58xj3cvi4s79ga5xi3ci16lh6wcxsb9qsn9ipa1kvzj0p4i5g0"; - libraryHaskellDepends = [ - aeson base comonad containers deepseq nonempty-vector semigroupoids - these vector - ]; - testHaskellDepends = [ - base comonad containers hedgehog hedgehog-fn nonempty-vector - semigroupoids tasty tasty-hedgehog text these vector - ]; - description = "Non-empty variants of containers data types, with full API"; - license = lib.licenses.bsd3; - }) {}; - - "nonempty-containers_0_3_4_4" = callPackage ({ mkDerivation, aeson, base, comonad, containers, deepseq , hedgehog, hedgehog-fn, invariant, nonempty-vector, semigroupoids , tasty, tasty-hedgehog, text, these, vector @@ -191939,7 +191726,6 @@ self: { ]; description = "Non-empty variants of containers data types, with full API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "nonempty-lift" = callPackage @@ -195033,6 +194819,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "opaleye_0_7_5_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, scientific + , semigroups, text, time, time-compat, time-locale-compat + , transformers, uuid, void + }: + mkDerivation { + pname = "opaleye"; + version = "0.7.5.0"; + sha256 = "19y6a4qkzr8bm8fxwrlvlcjqvc12kagp0wrfqrr4gxvzi200plvr"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors scientific semigroups text time-compat + time-locale-compat transformers uuid void + ]; + testHaskellDepends = [ + aeson base bytestring containers contravariant dotenv hspec + hspec-discover multiset postgresql-simple product-profunctors + profunctors QuickCheck semigroups text time time-compat + transformers uuid + ]; + testToolDepends = [ hspec-discover ]; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -196421,20 +196237,6 @@ self: { }) {}; "operational" = callPackage - ({ mkDerivation, base, mtl, random }: - mkDerivation { - pname = "operational"; - version = "0.2.3.5"; - sha256 = "1x2abg2q9d26h1vzj40r6k7k3gqgappbs4g9d853vvg77837km4i"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base mtl ]; - executableHaskellDepends = [ base mtl random ]; - description = "Implementation of difficult monads made easy with operational semantics"; - license = lib.licenses.bsd3; - }) {}; - - "operational_0_2_4_0" = callPackage ({ mkDerivation, base, mtl, random }: mkDerivation { pname = "operational"; @@ -196446,7 +196248,6 @@ self: { executableHaskellDepends = [ base mtl random ]; description = "Implementation of difficult monads made easy with operational semantics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "operational-alacarte" = callPackage @@ -199340,6 +199141,8 @@ self: { pname = "pandoc-types"; version = "1.22"; sha256 = "0kr5n9yw59513pw2rjc65qs55iq0prn16prk4781arqdh7g7a09q"; + revision = "1"; + editedCabalFile = "11gfc2syn2c0x3hyyw3c6z9hxmhs8jgv2xnzr43ql00r76ka9s95"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb text transformers @@ -199602,6 +199405,48 @@ self: { license = lib.licenses.bsd3; }) {}; + "pantry_0_5_3" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal + , casa-client, casa-types, conduit, conduit-extra, containers + , cryptonite, cryptonite-conduit, digest, exceptions, filelock + , generic-deriving, hackage-security, hedgehog, hpack, hspec + , http-client, http-client-tls, http-conduit, http-download + , http-types, memory, mtl, network-uri, path, path-io, persistent + , persistent-sqlite, persistent-template, primitive, QuickCheck + , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint + , tar-conduit, text, text-metrics, time, transformers, unix-compat + , unliftio, unordered-containers, vector, yaml, zip-archive + }: + mkDerivation { + pname = "pantry"; + version = "0.5.3"; + sha256 = "1pb9vr615rhh0lyi392ghxdnxq5pr15y0w8f372xh046i9dinj39"; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest filelock generic-deriving hackage-security hpack http-client + http-client-tls http-conduit http-download http-types memory mtl + network-uri path path-io persistent persistent-sqlite + persistent-template primitive resourcet rio rio-orphans + rio-prettyprint tar-conduit text text-metrics time transformers + unix-compat unliftio unordered-containers vector yaml zip-archive + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest exceptions filelock generic-deriving hackage-security + hedgehog hpack hspec http-client http-client-tls http-conduit + http-download http-types memory mtl network-uri path path-io + persistent persistent-sqlite persistent-template primitive + QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint + tar-conduit text text-metrics time transformers unix-compat + unliftio unordered-containers vector yaml zip-archive + ]; + description = "Content addressable Haskell package management"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pantry-tmp" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans , base64-bytestring, bytestring, Cabal, conduit, conduit-extra @@ -216753,10 +216598,8 @@ self: { }: mkDerivation { pname = "publish"; - version = "2.2.2"; - sha256 = "19bvdldggklzq6wqgcbvnf4jjlbdbh1l80dm92aj0405a9rhsa28"; - revision = "2"; - editedCabalFile = "19ajwrsd1l9p4cm9ckii5i6nb5w28sxl7kr129xz8kwkpj4z6lfq"; + version = "2.2.3"; + sha256 = "150zvz40r7lwmrqv7hvn07wb0gs9rcyn37ivcdv0m0h96bzy84w3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -218845,8 +218688,8 @@ self: { }: mkDerivation { pname = "quickbench"; - version = "1.0"; - sha256 = "09mrhwvz0jnjrxgj3as7d4jl739gakli5crxfmp390x6a0p2bzlb"; + version = "1.0.1"; + sha256 = "16bkhk5fskhhjqzklqwv51s1k7cxgcyr4p1vifmrd6smxvidb5rn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220034,8 +219877,8 @@ self: { }: mkDerivation { pname = "raaz"; - version = "0.3.0"; - sha256 = "0a322ji29s537kz1mazbl7grbg0s1wkz2cxg74zlvqa47xbk20k1"; + version = "0.3.4"; + sha256 = "1kqinh0vwbl5qh55ai41nmkbcfbhmjdwp5pp0xap03cd0nmn84xq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -224204,8 +224047,8 @@ self: { }: mkDerivation { pname = "reflex-ghci"; - version = "0.1.5.1"; - sha256 = "1m4sphj2qhj9ckjxjy6m4yzb2d6lq68a0fynv5q9ibc6550bm1sx"; + version = "0.1.5.2"; + sha256 = "18w9n6sm9b0ykjxqa800228b7s3y6gg8ckl6jnms3860p0cskpqq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224407,10 +224250,8 @@ self: { }: mkDerivation { pname = "reflex-process"; - version = "0.3.1.0"; - sha256 = "1z86h7wkzg69d6kw0y37pzr4ldpg9qkl8wx5mw7r1h82isb9wgbl"; - revision = "1"; - editedCabalFile = "16vwrz7amccy8j2wn9146j8lif35f7ycpssd0p649ha746s7hrf4"; + version = "0.3.1.1"; + sha256 = "15f9qn5rx6dwjnkhg5szhagxsj7vnh3bh4ad7j4jsi87m627mlj2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229838,17 +229679,6 @@ self: { }) {}; "roles" = callPackage - ({ mkDerivation, base, containers }: - mkDerivation { - pname = "roles"; - version = "0.2.0.0"; - sha256 = "181lmjmvv6285q5zh6cf991jw7d6f0g225vya3iqqb8vn8qjz7g2"; - libraryHaskellDepends = [ base containers ]; - description = "Composable class-based roles"; - license = lib.licenses.bsd3; - }) {}; - - "roles_0_2_1_0" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "roles"; @@ -229857,7 +229687,6 @@ self: { libraryHaskellDepends = [ base containers ]; description = "Composable class-based roles"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "rollbar" = callPackage @@ -236348,6 +236177,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "semigroupoids_5_3_6" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, comonad + , containers, contravariant, distributive, hashable, tagged + , template-haskell, transformers, transformers-compat + , unordered-containers + }: + mkDerivation { + pname = "semigroupoids"; + version = "5.3.6"; + sha256 = "0glhqc9x8i5z3bdg23xvl2lfns95msid3h3x0jksna7i6c8j869n"; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad containers contravariant + distributive hashable tagged template-haskell transformers + transformers-compat unordered-containers + ]; + description = "Semigroupoids: Category sans id"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "semigroupoids-do" = callPackage ({ mkDerivation, base, semigroupoids }: mkDerivation { @@ -237653,8 +237502,8 @@ self: { pname = "servant-benchmark"; version = "0.1.2.0"; sha256 = "0lqqk410nx48g895pfxkbbk85b1ijs4bfl9zr2li2p7wwwc4gyi9"; - revision = "2"; - editedCabalFile = "1xg1w1cy44a06sb1x2j5crid9splfgay8cj20bpjdnv5sj510gd2"; + revision = "3"; + editedCabalFile = "17pj6n143lpk5nsr6j8j1a6fj45y1bv61jcm16m0fwsdmhv01866"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive http-media http-types QuickCheck servant text yaml @@ -240665,35 +240514,6 @@ self: { }) {}; "sexp-grammar" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , criterion, data-fix, deepseq, happy, invertible-grammar - , prettyprinter, QuickCheck, recursion-schemes, scientific - , semigroups, tasty, tasty-hunit, tasty-quickcheck, text - , utf8-string - }: - mkDerivation { - pname = "sexp-grammar"; - version = "2.3.2"; - sha256 = "1rsa953pykrrfsf7lcnk4ds7vydb9p7s8irvaxvi1v4m2q2zg7a5"; - libraryHaskellDepends = [ - array base bytestring containers data-fix deepseq - invertible-grammar prettyprinter recursion-schemes scientific - semigroups text utf8-string - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ - base containers invertible-grammar prettyprinter QuickCheck - scientific semigroups tasty tasty-hunit tasty-quickcheck text - utf8-string - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq text - ]; - description = "Invertible grammar combinators for S-expressions"; - license = lib.licenses.bsd3; - }) {}; - - "sexp-grammar_2_3_3" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , criterion, data-fix, deepseq, happy, invertible-grammar , prettyprinter, QuickCheck, recursion-schemes, scientific @@ -240720,7 +240540,6 @@ self: { ]; description = "Invertible grammar combinators for S-expressions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sexp-show" = callPackage @@ -248660,6 +248479,8 @@ self: { pname = "solana-staking-csvs"; version = "0.1.1.0"; sha256 = "0ya63vgh0nf4p7hz6fj38m44wr77jj76bf2qxdgra3lpiziqsjd5"; + revision = "1"; + editedCabalFile = "14l72fkvvmiy1hmn2v3nxgx4s5z0zzyi3qf4l1i1cn54a0ln35q6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -260101,8 +259922,8 @@ self: { }: mkDerivation { pname = "system-linux-proc"; - version = "0.1.1"; - sha256 = "12iq9vw5y0pvag9gj6pzm76lh9vfvziawzqzvi35mhdn1hjwhg4b"; + version = "0.1.1.1"; + sha256 = "12nvsvmchhsqs5f3x2075v8v68inb1xz8dbv1q5x48big1bf4vv5"; libraryHaskellDepends = [ attoparsec base bytestring containers directory errors text ]; @@ -262226,6 +262047,8 @@ self: { pname = "tasty-lua"; version = "0.2.3.2"; sha256 = "0wa73ihkjcxi50lgpdzwwdx7s903lqi79hw7hxlvhbcvdly1cq53"; + revision = "1"; + editedCabalFile = "1m5mdn3riwwmvri430iq9m3yl09xsacvkp8w7vyqdmd70w3f9pcw"; libraryHaskellDepends = [ base bytestring file-embed hslua tasty text ]; @@ -267929,8 +267752,8 @@ self: { pname = "tidal-midi"; version = "0.9.10"; sha256 = "0d59s9vq2jmlb8b1bbay6n5911fjm9j04c9545p4i5visniv61b4"; - revision = "1"; - editedCabalFile = "11wkj909j2jlq19ls7q5293av648vc2k6f2064hyrqwcd68mksnj"; + revision = "2"; + editedCabalFile = "1vc5ck25wdqz8ywk2zmn2nmg1mihwkihwp2wirxmmd0qxi1v2vpf"; libraryHaskellDepends = [ base containers PortMidi tidal time transformers ]; @@ -275300,25 +275123,6 @@ self: { }) {}; "typed-process" = callPackage - ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec - , process, stm, temporary, transformers, unliftio-core - }: - mkDerivation { - pname = "typed-process"; - version = "0.2.6.1"; - sha256 = "0w4c76qln49967nnhf7f1zj3gbdfqp2qgf5ym8svhqyhp5gh61ws"; - libraryHaskellDepends = [ - async base bytestring process stm transformers unliftio-core - ]; - testHaskellDepends = [ - async base base64-bytestring bytestring hspec process stm temporary - transformers unliftio-core - ]; - description = "Run external processes, with strong typing of streams"; - license = lib.licenses.mit; - }) {}; - - "typed-process_0_2_6_3" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec , process, stm, temporary, transformers, unliftio-core }: @@ -275335,7 +275139,6 @@ self: { ]; description = "Run external processes, with strong typing of streams"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "typed-spreadsheet" = callPackage @@ -285919,23 +285722,6 @@ self: { }) {}; "warp-tls" = callPackage - ({ mkDerivation, base, bytestring, cryptonite, data-default-class - , network, streaming-commons, tls, tls-session-manager, unliftio - , wai, warp - }: - mkDerivation { - pname = "warp-tls"; - version = "3.3.1"; - sha256 = "1k8f3r0l36mgwm69fikprv6pyjzj15702kq25dr9nc3sv5lcs162"; - libraryHaskellDepends = [ - base bytestring cryptonite data-default-class network - streaming-commons tls tls-session-manager unliftio wai warp - ]; - description = "HTTP over TLS support for Warp via the TLS package"; - license = lib.licenses.mit; - }) {}; - - "warp-tls_3_3_2" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, streaming-commons, tls, tls-session-manager, unliftio , wai, warp @@ -285950,7 +285736,6 @@ self: { ]; description = "HTTP over TLS support for Warp via the TLS package"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "warp-tls-uid" = callPackage @@ -290647,28 +290432,6 @@ self: { }) {}; "xeno" = callPackage - ({ mkDerivation, array, base, bytestring, bytestring-mmap, bzlib - , criterion, deepseq, filepath, ghc-prim, hexml, hexpat, hspec, mtl - , mutable-containers, time, vector, weigh, xml - }: - mkDerivation { - pname = "xeno"; - version = "0.4.2"; - sha256 = "0dvjzh7yyijwy2d6215wlxlln9h0ng6bnqasfh38prp6sllxk25j"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base bytestring deepseq mtl mutable-containers vector - ]; - testHaskellDepends = [ base bytestring hexml hspec ]; - benchmarkHaskellDepends = [ - base bytestring bytestring-mmap bzlib criterion deepseq filepath - ghc-prim hexml hexpat time weigh xml - ]; - description = "A fast event-based XML parser in pure Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "xeno_0_4_3" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-mmap, bzlib , criterion, deepseq, filepath, ghc-prim, hexml, hexpat, hspec, mtl , mutable-containers, time, vector, weigh, xml @@ -290688,7 +290451,6 @@ self: { ]; description = "A fast event-based XML parser in pure Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "xenstore" = callPackage @@ -293549,8 +293311,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.13.2"; - sha256 = "004qly1sags94p7ks1j93xziixbpi3wsblbh2d2ws78gyywqdj9f"; + version = "0.13.3"; + sha256 = "08xs3m14rqpgkjghgp2b8ddalzzs50bzf11nd9kgi72xbg451yzi"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -295316,24 +295078,6 @@ self: { }) {}; "yesod-markdown" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring - , directory, hspec, pandoc, persistent, shakespeare, text - , xss-sanitize, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-markdown"; - version = "0.12.6.11"; - sha256 = "044m6a949yifvyxbbc15ms11sdxvljvb68187h5v6xk0qw0p33i9"; - libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring directory pandoc persistent - shakespeare text xss-sanitize yesod-core yesod-form - ]; - testHaskellDepends = [ base blaze-html hspec text ]; - description = "Tools for using markdown in a yesod application"; - license = lib.licenses.gpl2Only; - }) {}; - - "yesod-markdown_0_12_6_12" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring , directory, hspec, pandoc, persistent, shakespeare, text , xss-sanitize, yesod-core, yesod-form @@ -295349,7 +295093,6 @@ self: { testHaskellDepends = [ base blaze-html hspec text ]; description = "Tools for using markdown in a yesod application"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-media-simple" = callPackage @@ -296309,6 +296052,8 @@ self: { pname = "yi-core"; version = "0.19.2"; sha256 = "1ipmycwf2fqk701x0d32bv03aviv7z57m0knpc3np5cvss9mjzvr"; + revision = "1"; + editedCabalFile = "1j3in75pnf72000hfia13z21d6z8vml3wg2sk35nsmr1x8r96xzf"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-default directory dlist dynamic-state exceptions filepath hashable ListLike @@ -296457,6 +296202,8 @@ self: { pname = "yi-keymap-emacs"; version = "0.19.0"; sha256 = "1pkdlkhs6am60whclfasd4axda8hlxzh7q38crmylcb89q90am1l"; + revision = "1"; + editedCabalFile = "1p9m3m25g31ysk4qkabr3vnd4nlycm4zgi56lmkzrlibbxvn6lja"; libraryHaskellDepends = [ base containers filepath Hclip microlens-platform mtl oo-prototypes text transformers-base yi-core yi-language yi-misc-modes yi-rope @@ -296476,6 +296223,8 @@ self: { pname = "yi-keymap-vim"; version = "0.19.0"; sha256 = "046552bqfd3wycx73zksffcnbakfl7xnfz1s2q9z5affpzi5iyrv"; + revision = "1"; + editedCabalFile = "0rm2nm6lki2248vx45rglslcmq9fc6cnqxrb7x8hyb56fxjyq1gz"; libraryHaskellDepends = [ attoparsec base binary containers data-default directory filepath Hclip microlens-platform mtl oo-prototypes pointedlist safe text @@ -296561,6 +296310,8 @@ self: { pname = "yi-mode-javascript"; version = "0.19.0"; sha256 = "1zgx36kagalna8lk60i0djn6mvl6ki55x4kc7mzq2mgzcs292zq1"; + revision = "1"; + editedCabalFile = "09hdiy51i9piyh6889hzjhna8g9hlblrzgzkl8x6rc6pl12dg3wc"; libraryHaskellDepends = [ array base binary data-default dlist filepath microlens-platform mtl text yi-core yi-language yi-rope @@ -297295,6 +297046,40 @@ self: { license = lib.licenses.mit; }) {}; + "zenacy-html_2_0_4" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion + , data-default, dlist, extra, HUnit, mtl, pretty-show + , raw-strings-qq, safe, safe-exceptions, test-framework + , test-framework-hunit, text, transformers, vector, word8 + }: + mkDerivation { + pname = "zenacy-html"; + version = "2.0.4"; + sha256 = "05jy3w7a94ns52w4a1p6xhcph09p2zzqmvncf47db9wwq6xl5ad2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers data-default dlist extra mtl pretty-show + safe safe-exceptions text transformers vector word8 + ]; + executableHaskellDepends = [ + base bytestring containers data-default dlist extra pretty-show + text vector + ]; + testHaskellDepends = [ + base bytestring containers data-default dlist extra HUnit mtl + pretty-show raw-strings-qq test-framework test-framework-hunit text + transformers + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion data-default dlist pretty-show + raw-strings-qq text + ]; + description = "A standard compliant HTML parsing library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "zenacy-unicode" = callPackage ({ mkDerivation, base, bytestring, HUnit, test-framework , test-framework-hunit, text, vector, word8 @@ -298505,26 +298290,6 @@ self: { }) {}; "zstd" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim - , QuickCheck, test-framework, test-framework-quickcheck2, zlib - }: - mkDerivation { - pname = "zstd"; - version = "0.1.2.0"; - sha256 = "0vjw8r11k9kj6c63sfkwz8akq0g32g1bv6n6clvs4g2j12zq1xk8"; - libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; - testHaskellDepends = [ - base bytestring QuickCheck test-framework - test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ - base bytestring criterion ghc-prim zlib - ]; - description = "Haskell bindings to the Zstandard compression algorithm"; - license = lib.licenses.bsd3; - }) {}; - - "zstd_0_1_3_0" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim , QuickCheck, test-framework, test-framework-quickcheck2, zlib }: @@ -298542,7 +298307,6 @@ self: { ]; description = "Haskell bindings to the Zstandard compression algorithm"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "zsyntax" = callPackage diff --git a/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix index 8413ae597f..66b0c13646 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.40.3"; + version = "2.42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "5Jg3wq0w1x4fKcqOCWilS5UDAnL3/0C4m0iWhlPzelw="; + sha256 = "11p3lvmbm0hfck3p5xwxxycln8x0cf7l68jjz6an2g7sjh7a2pab"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/atkmm/2.36.nix b/third_party/nixpkgs/pkgs/development/libraries/atkmm/2.36.nix new file mode 100644 index 0000000000..03dd009d26 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/atkmm/2.36.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchurl, atk, glibmm_2_68, pkg-config, gnome, meson, ninja, python3 }: + +stdenv.mkDerivation rec { + pname = "atkmm"; + version = "2.36.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-4RMkv+0bbjMKAtslzswUXcoD+w3/R/BxDIXjF2h9pFg="; + }; + + outputs = [ "out" "dev" ]; + + propagatedBuildInputs = [ atk glibmm_2_68 ]; + + nativeBuildInputs = [ pkg-config meson ninja python3 ]; + + doCheck = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + + meta = { + description = "C++ wrappers for ATK accessibility toolkit"; + license = lib.licenses.lgpl21Plus; + homepage = "https://gtkmm.org"; + platforms = lib.platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/atkmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/atkmm/default.nix index b357ed0472..7e3cecf12a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/atkmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/atkmm/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchurl, atk, glibmm, pkg-config, gnome }: +{ lib, stdenv, fetchurl, atk, glibmm, pkg-config, gnome, meson, ninja, python3 }: stdenv.mkDerivation rec { pname = "atkmm"; - version = "2.28.0"; + version = "2.28.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c"; + sha256 = "sha256-oLtJdlzszCk6ssZzW6EAQxgH04T/oUwuvTDgeZP9L6Q="; }; outputs = [ "out" "dev" ]; propagatedBuildInputs = [ atk glibmm ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config meson python3 ninja ]; doCheck = true; @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cairomm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cairomm/default.nix index 87b391d2ad..384b1b0e7c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cairomm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cairomm/default.nix @@ -1,18 +1,19 @@ -{ fetchurl, lib, stdenv, pkg-config, darwin, cairo, fontconfig, freetype, libsigcxx }: +{ fetchurl, lib, stdenv, pkg-config, darwin, cairo, fontconfig, freetype, libsigcxx, meson, ninja }: + stdenv.mkDerivation rec { pname = "cairomm"; - version = "1.12.2"; + version = "1.14.3"; src = fetchurl { - url = "https://www.cairographics.org/releases/${pname}-${version}.tar.gz"; + url = "https://www.cairographics.org/releases/${pname}-${version}.tar.xz"; # gnome doesn't have the latest version ATM; beware: same name but different hash #url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25"; + sha256 = "sha256-DTfgZ8XEyngIt87dq/4ZMsW9KnUK1k+zIeEhNTYpfng="; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config meson ninja ]; propagatedBuildInputs = [ cairo libsigcxx ]; buildInputs = [ fontconfig freetype ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/dee/0001-Fix-build-with-Vala-0.54.patch b/third_party/nixpkgs/pkgs/development/libraries/dee/0001-Fix-build-with-Vala-0.54.patch new file mode 100644 index 0000000000..4ad8ec8ffc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/dee/0001-Fix-build-with-Vala-0.54.patch @@ -0,0 +1,29 @@ +From 7bc49f8edd9a49d675ee5b163ab61b405e2d0258 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +Date: Thu, 7 Oct 2021 21:42:26 +0200 +Subject: [PATCH] Fix build with Vala 0.54 + +Vala codegen now emits constructor methods so we need to skip @new +so that we can use a custom one from our VAPI overrides. + +https://gitlab.gnome.org/GNOME/vala/-/commit/472765b90cd98c1a628975d20005c46352d665f8 +--- + vapi/Dee-1.0.metadata | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/vapi/Dee-1.0.metadata b/vapi/Dee-1.0.metadata +index 7e80de0..793ffd8 100644 +--- a/vapi/Dee-1.0.metadata ++++ b/vapi/Dee-1.0.metadata +@@ -1,6 +1,8 @@ + GListResultSet skip + GListResultSetClass skip + ++Filter ++ .new skip + FilterModel + .filter unowned + Model +-- +2.33.0 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/dee/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dee/default.nix index a023d164d8..25cf88253e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dee/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dee/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { "${src}/debian/patches/gtkdocize.patch" "${src}/debian/patches/strict-prototype.patch" "${src}/debian/patches/vapi-skip-properties.patch" + ./0001-Fix-build-with-Vala-0.54.patch # Fixes glib 2.62 deprecations (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/development/libraries/dleyna-core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dleyna-core/default.nix index 4a4eecfdc0..e8e384ac2a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dleyna-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dleyna-core/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { pname = "dleyna-core"; version = "0.6.0"; + outputs = [ "out" "dev" ]; + setupHook = ./setup-hook.sh; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix b/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix index 720c274ad5..45d3f128c0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix @@ -1,5 +1,7 @@ -{ fetchurl -, lib, stdenv +{ stdenv +, lib +, fetchurl +, fetchpatch , pkg-config , meson , ninja @@ -43,6 +45,15 @@ stdenv.mkDerivation rec { sha256 = "Idc3+vCT9L4GVHPucMogiFuaLDaFlB26JMIjn9PFRKU="; }; + patches = [ + # Fix build with evolution-data-server ≥ 3.41 + # https://gitlab.gnome.org/GNOME/folks/-/merge_requests/52 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/folks/-/commit/62d588b0c609de17df5b4d1ebfbc67c456267efc.patch"; + sha256 = "TDL/5kvVwHnvDMuKDdPLQmpmE1FTZhY+7HG8NxKqt5w="; + }) + ]; + nativeBuildInputs = [ gettext gobject-introspection diff --git a/third_party/nixpkgs/pkgs/development/libraries/gcr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gcr/default.nix index 37238a5f59..9c97faaa45 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gcr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gcr/default.nix @@ -11,6 +11,9 @@ , libtasn1 , gtk3 , pango +, libsecret +, openssh +, systemd , gobject-introspection , makeWrapper , libxslt @@ -22,22 +25,15 @@ stdenv.mkDerivation rec { pname = "gcr"; - version = "3.40.0"; + version = "3.41.0"; + + outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "udNkWl/ZU6VChcxk1PwEZzZGPb1NzCXK9ce1m+0wJ/U="; + sha256 = "CQn8SeqK1IMtJ1ZP8v0dxmZpbioHxzlBxIgp5gVy2gE="; }; - postPatch = '' - patchShebangs build/ gcr/fixtures/ - - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config meson @@ -56,6 +52,9 @@ stdenv.mkDerivation rec { libgcrypt libtasn1 pango + libsecret + openssh + systemd ]; propagatedBuildInputs = [ @@ -70,10 +69,22 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=false" + # We are still using ssh-agent from gnome-keyring. + # https://github.com/NixOS/nixpkgs/issues/140824 + "-Dssh_agent=false" ]; doCheck = false; # fails 21 out of 603 tests, needs dbus daemon + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + + postPatch = '' + patchShebangs build/ gcr/fixtures/ + + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + preFixup = '' wrapProgram "$out/bin/gcr-viewer" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" @@ -82,7 +93,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "odd-unstable"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix index 54f19d1756..29eb1b9482 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix @@ -30,13 +30,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.68.3"; + version = "1.70.0"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ghx/T3jxUA2mpWxUY3I72P+A3mM8y6Q6WrA9jMyiHT8="; + sha256 = "sha256-SwYpNBoxigI3ThE6uX+anzMlQjJp/B4LBDpf+wGGHF8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib-networking/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glib-networking/default.nix index 6842470be4..d5bc952597 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glib-networking/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.68.2"; + version = "2.70.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "U168BU72l9tWpP/+2RvA4RyO4cmstIqtKMjh1cPVmU8="; + sha256 = "0dbg1na239mbavn4hknkax5sns9q2dbdnqw9wcpmhv58mzkhid36"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix index 679a91d1bc..4825dd9897 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.68.4"; + version = "2.70.0"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Yv0GHQinVJJhfmJac+LAXiWfgxrLuOH4ucgfI/eZOjs="; + sha256 = "0hh7hk02fkm1bn48k4z8f3kgv9qbni5z22gizd567fn527w7s390"; }; patches = optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix index 344fcb43eb..dfa454b925 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.64.5"; + version = "2.66.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-UI/IbiyRQRmKoWwiWxb9a5EZF8DTgXYCZShE0Jc+o4Y="; + sha256 = "sha256-ab1rUydxbKL1EatYCpaf178M0sJM4V4dDlMFktP/IJw="; }; outputs = [ "out" "dev" ]; @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix index e6a1ad979b..25b7770101 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "gobject-introspection"; - version = "1.68.0"; + version = "1.70.0"; # outputs TODO: share/gobject-introspection-1.0/tests is needed during build # by pygobject3 (and maybe others), but it's only searched in $out @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "09sawnv3xj9pzgy2qrrk87dl3jibfphnswb61i5bh0d2h4j28afj"; + sha256 = "0jpwraip7pwl9bf9s59am3r7074p34fasvfb5ym1fb8hwc34jawh"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index b4dc200f98..483ee0b084 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "11an29br55dp0b26kfqlrfxj19glfrmhcdpds2n1w9n04gq3pf7i"; + sha256 = "dyiZcuWW0ERYPwwFYwbY8dvYrc+RKRClDaCmY+ZTMu0="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsound/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsound/default.nix index bcd39ce227..13a8aaa2f1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsound/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsound/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome }: +{ lib, stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome, meson, ninja }: stdenv.mkDerivation rec { pname = "gsound"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53"; + sha256 = "06l80xgykj7x1kqkjvcq06pwj2rmca458zvs053qc55x3sg06bfa"; }; - nativeBuildInputs = [ pkg-config gobject-introspection libtool vala ]; + nativeBuildInputs = [ pkg-config meson ninja gobject-introspection libtool vala ]; buildInputs = [ glib libcanberra ]; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix index aa89d947a0..de6ccd1537 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -233,6 +233,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing + "-Dglib-asserts=disabled" # asserts should be disabled on stable releases "-Davtp=disabled" "-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development" diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix index 86684893ef..bc1656c191 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -120,6 +120,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing + "-Dglib-asserts=disabled" # asserts should be disabled on stable releases ] ++ lib.optionals (!qt5Support) [ "-Dqt5=disabled" ] ++ lib.optionals (!gtkSupport) [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix index f244a97edf..f9d41916ec 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "gtk-mac-integration"; - version = "2.1.3"; + version = "3.0.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; rev = "${pname}-${version}"; - sha256 = "1w0agv4r0daklv5d2f3l0c10krravjq8bj9hsdsrpka48dbnqmap"; + sha256 = "0sc0m3p8r5xfh5i4d7dg72kfixx9yi4f800y43bszyr88y52jkga"; }; nativeBuildInputs = [ autoreconfHook pkg-config gtk-doc gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix index 8791d24ad3..78d9174d09 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix @@ -19,15 +19,11 @@ , gdk-pixbuf , gobject-introspection , fribidi +, harfbuzz , xorg , epoxy -, json-glib , libxkbcommon , libxml2 -, librest -, libsoup -, ffmpeg -, gmp , gnome , gsettings-desktop-schemas , gst_all_1 @@ -37,6 +33,8 @@ , x11Support ? stdenv.isLinux , waylandSupport ? stdenv.isLinux , libGL +# experimental and can cause crashes in inspector +, vulkanSupport ? false , vulkan-loader , vulkan-headers , wayland @@ -61,7 +59,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.2.1"; + version = "4.4.0"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -73,7 +71,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "AjFpd13kPwof3gZvvBnXhUXqanViwZFavem4rkpzCeY="; + sha256 = "4KFQj0QWhsOiDf7EivUzsZpLLgF8GOruMdzNt9KSUFs="; }; nativeBuildInputs = [ @@ -86,27 +84,25 @@ stdenv.mkDerivation rec { python3 sassc gi-docgen + libxml2 # for xmllint ] ++ setupHooks; buildInputs = [ libxkbcommon epoxy - json-glib isocodes - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals vulkanSupport [ vulkan-headers ] ++ [ - librest - libsoup - ffmpeg gst_all_1.gst-plugins-base gst_all_1.gst-plugins-bad fribidi + harfbuzz ] ++ (with xorg; [ libICE libSM - libXcomposite libXcursor + libXdamage libXi libXrandr libXrender @@ -134,7 +130,7 @@ stdenv.mkDerivation rec { glib graphene pango - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals vulkanSupport [ vulkan-loader ] ++ [ # Required for GSettings schemas at runtime. @@ -148,10 +144,11 @@ stdenv.mkDerivation rec { "-Dbuild-tests=false" "-Dtracker=${if trackerSupport then "enabled" else "disabled"}" "-Dbroadway-backend=${lib.boolToString broadwaySupport}" + ] ++ lib.optionals vulkanSupport [ + "-Dvulkan=enabled" ] ++ lib.optionals (!cupsSupport) [ "-Dprint-cups=disabled" ] ++ lib.optionals stdenv.isDarwin [ - "-Dvulkan=disabled" "-Dmedia-gstreamer=disabled" # requires gstreamer-gl ] ++ lib.optionals (!x11Support) [ "-Dx11-backend=false" @@ -168,6 +165,7 @@ stdenv.mkDerivation rec { postPatch = '' files=( build-aux/meson/post-install.py + build-aux/meson/gen-demo-header.py demos/gtk-demo/geninclude.py gdk/broadway/gen-c-array.py gdk/gen-gdk-gresources-xml.py diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix index eb92586ce8..e5563d37f1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -24,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "4.8.1"; + version = "4.8.2"; 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="; + sha256 = "1k1pava84ywgq62xl5bz8y3zm7z2kz6kkgp423c0y02jrgjyfbc4"; }; patches = [ @@ -38,13 +37,6 @@ stdenv.mkDerivation rec { # 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 - (fetchpatch { - name = "ensure-access-to-resources-in-corelib-build.patch"; - url = "https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/9bea9d1c4a56310701717bb106c52a5324ee392a.patch"; - sha256 = "sha256-rSB6lOFEyz58HfOSj7ZM48/tHxhqbtWWbh60JuySAZ0="; - }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/hamlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hamlib/default.nix index cd56b04c03..31b620ae5d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hamlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hamlib/default.nix @@ -15,7 +15,8 @@ , perlPackages , pythonBindings ? true , tclBindings ? true -, perlBindings ? true +, perlBindings ? stdenv.buildPlatform == stdenv.hostPlatform +, buildPackages }: stdenv.mkDerivation rec { @@ -27,11 +28,15 @@ stdenv.mkDerivation rec { sha256 = "10788mgrhbc57zpzakcxv5aqnr2819pcshml6fbh8zvnkja562y9"; }; + strictDeps = true; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ swig pkg-config libtool - ]; + ] ++ lib.optionals pythonBindings [ python3 ] + ++ lib.optionals tclBindings [ tcl ] + ++ lib.optionals perlBindings [ perl ]; buildInputs = [ gd @@ -39,10 +44,12 @@ stdenv.mkDerivation rec { libusb-compat-0_1 boost ] ++ lib.optionals pythonBindings [ python3 ncurses ] - ++ lib.optionals tclBindings [ tcl ] - ++ lib.optionals perlBindings [ perl perlPackages.ExtUtilsMakeMaker ]; + ++ lib.optionals tclBindings [ tcl ]; - configureFlags = lib.optionals perlBindings [ "--with-perl-binding" ] + + configureFlags = [ + "CC_FOR_BUILD=${stdenv.cc.targetPrefix}cc" + ] ++ lib.optionals perlBindings [ "--with-perl-binding" ] ++ lib.optionals tclBindings [ "--with-tcl-binding" "--with-tcl=${tcl}/lib/" ] ++ lib.optionals pythonBindings [ "--with-python-binding" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/irrlicht/default.nix b/third_party/nixpkgs/pkgs/development/libraries/irrlicht/default.nix index 260be948ce..7a68f13066 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/irrlicht/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/irrlicht/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, libGLU, libGL, libXrandr, libX11, libXxf86vm }: +{ lib, stdenv, fetchzip, libGLU, libGL, libXrandr, libX11, libXxf86vm, zlib }: let common = import ./common.nix { inherit fetchzip; }; @@ -12,22 +12,29 @@ stdenv.mkDerivation rec { postPatch = '' sed -ie '/sys\/sysctl.h/d' source/Irrlicht/COSOperator.cpp + '' + lib.optionalString stdenv.isAarch64 '' + substituteInPlace source/Irrlicht/Makefile \ + --replace "-DIRRLICHT_EXPORTS=1" "-DIRRLICHT_EXPORTS=1 -DPNG_ARM_NEON_OPT=0" ''; preConfigure = '' cd source/Irrlicht ''; - buildPhase = '' - make sharedlib NDEBUG=1 "LDFLAGS=-lX11 -lGL -lXxf86vm" + preBuild = '' + makeFlagsArray+=(sharedlib NDEBUG=1 LDFLAGS="-lX11 -lGL -lXxf86vm") ''; + enableParallelBuilding = true; + preInstall = '' sed -i s,/usr/local/lib,$out/lib, Makefile mkdir -p $out/lib ''; - buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm ]; + buildInputs = [ + libGLU libGL libXrandr libX11 libXxf86vm + ] ++ lib.optional stdenv.isAarch64 zlib; meta = { homepage = "http://irrlicht.sourceforge.net/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix index b43bcd07ca..7618110e86 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome }: stdenv.mkDerivation rec { pname = "jsonrpc-glib"; - version = "3.38.0"; + version = "3.40.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "3F8ZFKkRUrcPqPyaEe3hMUirSvZE2yejZjI4jJJ6ioI="; + sha256 = "wuPRYlfHJmzTkBiE4iN1V1v2Go4fZ1lsiODYeucNDvQ="; }; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libblockdev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libblockdev/default.nix index 9b1654420e..feb721dce4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libblockdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libblockdev/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, autoreconfHook, pkg-config, gtk-doc +{ lib, stdenv, fetchFromGitHub, 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 @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "libblockdev"; - version = "2.25"; + version = "2.26"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libblockdev"; rev = "${version}-1"; - sha256 = "sha256-eHUHTogKoNrnwwSo6JaI7NMxVt9JeMqfWyhR62bDMuQ="; + sha256 = "sha256-e7j5b1KbjgVN9JpJtK2o7RNEHZjKDoDyoY4f8GlIdyI="; }; outputs = [ "out" "dev" "devdoc" ]; @@ -22,13 +22,6 @@ 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/third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix index d62614c56c..426ffadf4c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "libdazzle"; - version = "3.40.0"; + version = "3.42.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/libdazzle/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19abrrjsyjhhl1xflnb0likb9wwzz78fa1mk2b064rpscmz9mafv"; + sha256 = "09b9l56yiwad7xqr7g7ragmm4gmqxjnvc2pcx6741klw7lxpmrpa"; }; nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb-run glib ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix index 6fd108b3b7..87061ae655 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "libgudev"; - version = "236"; + version = "237"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5"; + sha256 = "1al6nr492nzbm8ql02xhzwci2kwb1advnkaky3j9636jf08v41hd"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgxps/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgxps/default.nix index df05754da5..3979391034 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgxps/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgxps/default.nix @@ -6,6 +6,8 @@ stdenv.mkDerivation rec { pname = "libgxps"; version = "0.3.2"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "bSeGclajXM+baSU+sqiKMrrKO5fV9O9/guNmf6Q1JRw="; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmediaart/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmediaart/default.nix index ee1b306c3e..7f9c4d6ac9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmediaart/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmediaart/default.nix @@ -1,31 +1,23 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome, fetchpatch }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome }: stdenv.mkDerivation rec { pname = "libmediaart"; - version = "1.9.4"; + version = "1.9.5"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d"; + sha256 = "1mlw1qgj8nkd9ll6b6h54r1gfdy3zp8a8xqz7qfyfaj85jjgbph7"; }; nativeBuildInputs = [ meson ninja pkg-config vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; buildInputs = [ glib gdk-pixbuf ]; - patches = [ - # https://bugzilla.gnome.org/show_bug.cgi?id=792272 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libmediaart/commit/a704d0b6cfea091274bd79aca6d15f19b4f6e5b5.patch"; - sha256 = "0606qfmdqxcxrydv1fgwq11hmas34ba4a5kzbbqdhfh0h9ldgwkv"; - }) + mesonFlags = [ + "-Dgtk_doc=true" ]; - # FIXME: Turn on again when https://github.com/NixOS/nixpkgs/issues/53701 - # is fixed on master. - doCheck = false; - passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix index 05b7a00be5..03bd2eb96b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "librsvg"; - version = "2.50.7"; + version = "2.52.0"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "//thsIzVKCqq4UegKzBRZqdCb60iqLlCdwjw8vxCbrw="; + sha256 = "14zkdd7a9mymnfs3laqj0gr69c16nwixvbc5a4gvd534w6riz0mx"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix new file mode 100644 index 0000000000..e987e5a892 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix @@ -0,0 +1,85 @@ +{ lib +, stdenv +, fetchFromGitLab +, gi-docgen +, meson +, ninja +, pkg-config +, vala +, gobject-introspection +, glib +, cairo +, sqlite +, libsoup +, gtk4 +, xvfb-run +, unstableGitUpdater +}: + +stdenv.mkDerivation rec { + pname = "libshumate"; + version = "unstable-2021-10-06"; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "devdoc"; # demo app + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "libshumate"; + rev = "7a0a03f299881e8faaac7d904cc47b74795ae5dd"; + sha256 = "df8ZHn/wmkzaYH0L3E6ULUtqxqU71EqL0jSgKhWqlT8="; + }; + + nativeBuildInputs = [ + gi-docgen + meson + ninja + pkg-config + vala + gobject-introspection + ]; + + buildInputs = [ + glib + cairo + sqlite + libsoup + gtk4 + ]; + + checkInputs = [ + xvfb-run + ]; + + mesonFlags = [ + "-Ddemos=true" + ]; + + doCheck = true; + + checkPhase = '' + runHook preCheck + + HOME=$TMPDIR xvfb-run meson test --print-errorlogs + + runHook postCheck + ''; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput share/doc/libshumate-0.0 "$devdoc" + ''; + + passthru.updateScript = unstableGitUpdater { + url = meta.homepage; + }; + + meta = with lib; { + description = "GTK toolkit providing widgets for embedded maps"; + homepage = "https://gitlab.gnome.org/GNOME/libshumate"; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix new file mode 100644 index 0000000000..6fd7f3e696 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libsoup/3.x.nix @@ -0,0 +1,102 @@ +{ stdenv +, lib +, fetchurl +, glib +, meson +, ninja +, pkg-config +, gnome +, libsysprof-capture +, sqlite +, glib-networking +, gobject-introspection +, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform +, vala +, withVala ? stdenv.buildPlatform == stdenv.hostPlatform +, libpsl +, python3 +, brotli +, libnghttp2 +}: + +stdenv.mkDerivation rec { + pname = "libsoup"; + version = "3.0.1"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-bwwxbRD4RYuW9WTHZEvjwgEb11rVBUyNsmr7DJqRvEc="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + glib + ] ++ lib.optionals withIntrospection [ + gobject-introspection + ] ++ lib.optionals withVala [ + vala + ]; + + buildInputs = [ + python3 + sqlite + libpsl + glib.out + brotli + libnghttp2 + ] ++ lib.optionals stdenv.isLinux [ + libsysprof-capture + ]; + + propagatedBuildInputs = [ + glib + ]; + + mesonFlags = [ + "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency + "-Dgssapi=disabled" + "-Dvapi=${if withVala then "enabled" else "disabled"}" + "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" + "-Dntlm=disabled" + # Requires wstest from autobahn-testsuite. + "-Dautobahn=disabled" + # Requires quart Python module. + "-Dhttp2_tests=disabled" + # Requires gnutls, not added for closure size. + "-Dpkcs11_tests=disabled" + ] ++ lib.optionals (!stdenv.isLinux) [ + "-Dsysprof=disabled" + ]; + + # TODO: For some reason the pkg-config setup hook does not pick this up. + PKG_CONFIG_PATH = "${libnghttp2.dev}/lib/pkgconfig"; + + # HSTS tests fail. + doCheck = false; + + postPatch = '' + patchShebangs libsoup/ + ''; + + passthru = { + propagatedUserEnvPackages = [ + glib-networking.out + ]; + updateScript = gnome.updateScript { + attrPath = "libsoup3"; + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + + meta = { + description = "HTTP client/server library for GNOME"; + homepage = "https://wiki.gnome.org/Projects/libsoup"; + license = lib.licenses.lgpl2Plus; + inherit (glib.meta) maintainers platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix index 0cc4c8b345..6d2150103a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix @@ -18,32 +18,30 @@ , libpsl , python3 , brotli -, fetchpatch }: stdenv.mkDerivation rec { pname = "libsoup"; - version = "2.72.0"; + version = "2.74.0"; + + outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p"; + sha256 = "sha256-M7HU4NY5RWxnXCJ4d+lKgHjXMSM+LVdonBGrzvfTxI4="; }; - patches = [ - (fetchpatch { - # https://gitlab.gnome.org/GNOME/libsoup/-/issues/222 - url = "https://gitlab.gnome.org/GNOME/libsoup/commit/b5e4f15a09d197b6a9b4b2d78b33779f27d828af.patch"; - sha256 = "1hqk8lqzc200hi0nwbwq9qm6f03z296cnd79d4ql30683s80xqws"; - }) + nativeBuildInputs = [ + meson + ninja + pkg-config + glib + ] ++ lib.optionals withIntrospection [ + gobject-introspection + ] ++ lib.optionals withVala [ + vala ]; - postPatch = '' - patchShebangs libsoup/ - ''; - - outputs = [ "out" "dev" ]; - buildInputs = [ python3 sqlite @@ -53,12 +51,11 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ libsysprof-capture ]; - nativeBuildInputs = [ meson ninja pkg-config glib ] - ++ lib.optional withIntrospection gobject-introspection - ++ lib.optional withVala vala; - propagatedBuildInputs = [ glib libxml2 ]; - NIX_CFLAGS_COMPILE = [ "-lpthread" ]; + propagatedBuildInputs = [ + glib + libxml2 + ]; mesonFlags = [ "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency @@ -71,10 +68,18 @@ stdenv.mkDerivation rec { "-Dsysprof=disabled" ]; + NIX_CFLAGS_COMPILE = "-lpthread"; + doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200) + postPatch = '' + patchShebangs libsoup/ + ''; + passthru = { - propagatedUserEnvPackages = [ glib-networking.out ]; + propagatedUserEnvPackages = [ + glib-networking.out + ]; updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix index 6c2cb095a8..f86edf1bfb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -25,6 +26,14 @@ stdenv.mkDerivation rec { sha256 = "hCP3Bp2qR2MHMh0cEeLswoU0DNMsqfwFIHdihD7erL0="; }; + patches = [ + # Fix build with GLib 2.70 + (fetchpatch { + url = "https://gitlab.com/libvirt/libvirt-glib/-/commit/9a34c4ea55e0246c34896e48b8ecd637bc559ac7.patch"; + sha256 = "UU70uTi55EzPMuLYVKRzpVcd3WogeAtWAWEC2hWlR7k="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/third_party/nixpkgs/pkgs/development/libraries/nanopb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nanopb/default.nix index ca078a3f9d..c70298c4ff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nanopb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nanopb/default.nix @@ -5,6 +5,7 @@ , protobuf , python3 , stdenv +, buildPackages }: stdenv.mkDerivation rec { @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.so{.0,} "-DBUILD_STATIC_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.a - "-Dnanopb_PROTOC_PATH=${protobuf}/bin/protoc" + "-Dnanopb_PROTOC_PATH=${buildPackages.protobuf}/bin/protoc" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss/3.53.nix b/third_party/nixpkgs/pkgs/development/libraries/nss/3.53.nix index 4d22e9a1a7..2f18b466f9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nss/3.53.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nss/3.53.nix @@ -151,13 +151,11 @@ stdenv.mkDerivation rec { in (lib.optionalString enableFIPS ('' for libname in freebl3 nssdbm3 softokn3 - do '' + + do libfile="$out/lib/lib$libname${stdenv.hostPlatform.extensions.sharedLibrary}"'' + (if stdenv.isDarwin then '' - libfile="$out/lib/lib$libname.dylib" DYLD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ '' else '' - libfile="$out/lib/lib$libname.so" LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ '') + '' ${nss}/bin/shlibsign -v -i "$libfile" diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nss/default.nix index f8bd34a164..c1b90a8da8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nss/default.nix @@ -166,13 +166,11 @@ stdenv.mkDerivation rec { in (lib.optionalString enableFIPS ('' for libname in freebl3 nssdbm3 softokn3 - do '' + + do libfile="$out/lib/lib$libname${stdenv.hostPlatform.extensions.sharedLibrary}"'' + (if stdenv.isDarwin then '' - libfile="$out/lib/lib$libname.dylib" DYLD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ '' else '' - libfile="$out/lib/lib$libname.so" LD_LIBRARY_PATH=$out/lib:${nspr.out}/lib \ '') + '' ${nss}/bin/shlibsign -v -i "$libfile" diff --git a/third_party/nixpkgs/pkgs/development/libraries/nv-codec-headers/11_x.nix b/third_party/nixpkgs/pkgs/development/libraries/nv-codec-headers/11_x.nix new file mode 100644 index 0000000000..a4bdd60028 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/nv-codec-headers/11_x.nix @@ -0,0 +1,27 @@ +{ stdenv +, lib +, fetchgit +}: + +stdenv.mkDerivation rec { + pname = "nv-codec-headers"; + version = "11.1.5.0"; + + src = fetchgit { + url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; + rev = "n${version}"; + sha256 = "5d6LCKQB31UZ0veanSeKJVrPkJ8o2nvQWRfIG8YuekM="; + }; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + meta = with lib; { + description = "FFmpeg version of headers for NVENC"; + homepage = "https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"; + license = licenses.mit; + maintainers = with maintainers; [ MP2E ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/openfst/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openfst/default.nix index 51e661eabb..08767680ff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openfst/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openfst/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "openfst"; - version = "1.7.9"; + version = "1.8.1"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz"; - sha256 = "1pmx1yhn2gknj0an0zwqmzgwjaycapi896244np50a8y3nrsw6ck"; + sha256 = "sha256-JPtTtyu2h+P6julscqMf8pINmbmAoKj2HdpCb8pnE/A="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/opengrm-ngram/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opengrm-ngram/default.nix index 9b105808b8..3b00ae17e9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opengrm-ngram/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opengrm-ngram/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "opengrm-ngram"; - version = "1.3.11"; + version = "1.3.13"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/GRM/NGramDownload/ngram-${version}.tar.gz"; - sha256 = "0wwpcj8qncdr9f2pmi0vhlw277dyxr85ygdi8g57xp2ifysigm05"; + sha256 = "sha256-5CXf6OXs7owny3yZQrWYA6yhIyN0dgA2B8TSDEUTF1Q="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix index c75e33a068..513bfe2d17 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix @@ -24,14 +24,14 @@ let in stdenv.mkDerivation rec { pname = "pango"; - version = "1.48.5"; + version = "1.48.10"; outputs = [ "bin" "out" "dev" ] ++ lib.optionals withDocs [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0aivpd6l5687lj5293j859zd7vq97yxpzvad0b6jvh3kc54p87jh"; + sha256 = "IeH1eYvN/adeq8QoBRSwiWq1b2VtTn5mAwuaJTXs3Jg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/pangomm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pangomm/default.nix index d5921a5afe..f13dce99c1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pangomm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pangomm/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "pangomm"; - version= "2.42.2"; + version= "2.46.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-GyTJJiSuEnXMtXdYF10198Oa0zQtjAtLpg8NmEnS0Io="; + sha256 = "sha256-yIUBP+YaTFEX/aOVdw1QdWNBHGPkn0o6ztTJ7+NNmXU="; }; outputs = [ "out" "dev" ]; @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 7290b3830d..c7a8a400a9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "0.16.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "05ihjslnv7rrp4giwvvyaiig0dpfmw3jijfaadzax8jhbyscmxsq"; + sha256 = "sha256-sY2slI9ZVuEurBIEaJMxUiKiUNXx+h7UEwEZKKr7R2Y="; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix index 3233a29449..52822baca6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/htslib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "htslib"; - version = "1.11"; + version = "1.13"; src = fetchurl { url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1mrq4mihzx37yqhj3sfz6da6mw49niia808bzsw2gkkgmadxvyng"; + sha256 = "sha256-8kB9+fl/C7awdlZXnkGhylEARkBntrIb+WKi6ksO/WU="; }; # perl is only used during the check phase. diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix index 0ee5e0fa56..39ac21b7ad 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl -, fetchpatch , gettext , meson , ninja @@ -8,7 +8,6 @@ , asciidoc , gobject-introspection , python3 -, gtk-doc , docbook-xsl-nons , docbook_xml_dtd_45 , libxml2 @@ -22,6 +21,7 @@ , icu , libuuid , libsoup +, libsoup_3 , json-glib , systemd , dbus @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "3.1.1"; + version = "3.2.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Q3bi6YRUBm9E96JC5FuZs7/kwDtn+rGauw7Vhsp0iuc="; + sha256 = "sha256-8RelKHXUpNCceqmT+Mio0GRo1dz7FT642qUesThEUTo="; }; patches = [ @@ -44,17 +44,6 @@ 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 = [ @@ -67,7 +56,6 @@ stdenv.mkDerivation rec { libxslt wrapGAppsNoGuiHook gobject-introspection - gtk-doc docbook-xsl-nons docbook_xml_dtd_45 python3 # for data-generators @@ -81,6 +69,7 @@ stdenv.mkDerivation rec { sqlite icu libsoup + libsoup_3 libuuid json-glib libstemmer diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker/fix-docs.patch b/third_party/nixpkgs/pkgs/development/libraries/tracker/fix-docs.patch deleted file mode 100644 index a6ff84cda3..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker/fix-docs.patch +++ /dev/null @@ -1,28 +0,0 @@ -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/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix index 2dac161bb4..d432fd1588 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix @@ -2,11 +2,11 @@ , lib , docbook-xsl-nons , fetchurl -, fetchpatch , glib , gobject-introspection , gtk-doc , libgudev +, libpcap , meson , ninja , pkg-config @@ -19,23 +19,15 @@ stdenv.mkDerivation rec { pname = "umockdev"; - version = "0.15.4"; + version = "0.16.3"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "09k8jwvsphd97hcagf0zaf0hwzlzq2r8jfgbmvj55k7ylrg8hjxg"; + sha256 = "TjHxqtz8mPhzpsMb5lXWdj8hx/whsadTfor4S2x4U2M="; }; - patches = [ - # Fix build with Vala 0.52 - (fetchpatch { - url = "https://github.com/martinpitt/umockdev/commit/a236f0b55fbb6ff50a6429da9d404703d6637d94.patch"; - sha256 = "sZs9Ove1r7te/a9vmWUmFetLVhyzhHmx7ijhkK/2S5o="; - }) - ]; - nativeBuildInputs = [ docbook-xsl-nons gobject-introspection @@ -50,6 +42,7 @@ stdenv.mkDerivation rec { glib systemd libgudev + libpcap ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix b/third_party/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix index 14f41b015e..b766b933a6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -57,7 +57,7 @@ passthru = { fancyName = "MariaDB"; - driver = if stdenv.isDarwin then "lib/libmaodbc.dylib" else "lib/libmaodbc.so"; + driver = "lib/libmaodbc${stdenv.hostPlatform.extensions.sharedLibrary}"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix index c3631cccbe..0411086c78 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.64.1"; + version = "0.64.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-EvtBqf+OA8XxcRtGVgkQpLmzECrsPp52Cc7vTfqYqio="; + sha256 = "sha256-KzyCC2WmZ8HYhZuiBHi+Ym0VGcwxWdrCX3AzMMbQfhg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 9165bb4be6..23307b0f36 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -15,6 +15,7 @@ , libnotify , gnutls , libgcrypt +, libgpg-error , gtk3 , wayland , libwebp @@ -41,6 +42,7 @@ , libGLU , mesa , libintl +, lcms2 , libmanette , openjpeg , enableGeoLocation ? true @@ -63,7 +65,7 @@ assert enableGeoLocation -> geoclue2 != null; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.32.4"; + version = "2.34.0"; outputs = [ "out" "dev" ]; @@ -71,7 +73,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1zfkfyhm4i7901pp32wcwcfxax69qgq5k44x0glwaywdg4zjvkh0"; + sha256 = "sha256-iAyO5ib2cBn2dVfKCeWaI+zyReYPYXMhXxqII8sJrzQ="; }; patches = lib.optionals stdenv.isLinux [ @@ -140,8 +142,10 @@ stdenv.mkDerivation rec { libGLU mesa # for libEGL headers libgcrypt + libgpg-error libidn libintl + lcms2 ] ++ lib.optionals stdenv.isLinux [ libmanette ] ++ [ @@ -193,6 +197,7 @@ stdenv.mkDerivation rec { "-DPORT=GTK" "-DUSE_LIBHYPHEN=OFF" "-DUSE_WPE_RENDERER=OFF" + "-DUSE_SOUP2=${if lib.versions.major libsoup.version == "2" then "ON" else "OFF"}" ] ++ lib.optionals stdenv.isDarwin [ "-DENABLE_GAMEPAD=OFF" "-DENABLE_GTKDOC=OFF" diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix new file mode 100644 index 0000000000..ad68f13fe0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix @@ -0,0 +1,60 @@ +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, wrapGAppsHook4 +, fontconfig +, glib +, gsettings-desktop-schemas +, gtk4 +, libadwaita +, xdg-desktop-portal +, wayland +, gnome +}: + +stdenv.mkDerivation rec { + pname = "xdg-desktop-portal-gnome"; + version = "41.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "u6FEGZ5+1LlJCyScGvZFqGnWKZMmXerDjyGb8EL//fI="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + fontconfig + glib + gsettings-desktop-schemas # settings exposed by settings portal + gtk4 + libadwaita + xdg-desktop-portal + wayland # required by GTK 4 + ]; + + mesonFlags = [ + "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + + meta = with lib; { + description = "Backend implementation for xdg-desktop-portal for the GNOME desktop environment"; + maintainers = teams.gnome.members; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index 93a308a658..08d695c15e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , libxml2 @@ -9,19 +11,33 @@ , glib , wrapGAppsHook , gsettings-desktop-schemas +, buildPortalsInGnome ? true }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.8.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "0987fwsdgkcd3mh3scvg2kyg4ay1rr5w16js4pl3pavw9yhl9lbi"; + sha256 = "7w+evZLtmTmDHVVsw25bJz99xtlSCE8qTFSxez9tlZk="; }; + patches = [ + # Fix broken translation. + # https://github.com/flatpak/xdg-desktop-portal-gtk/issues/353 + (fetchpatch { + url = "https://github.com/flatpak/xdg-desktop-portal-gtk/commit/e34f49ca8365801a7fcacccb46ab1e62aec17435.patch"; + sha256 = "umMsSP0fuSQgxlHLaZlg25ln1aAL1mssWzPMIWAOUt4="; + }) + (fetchpatch { + url = "https://github.com/flatpak/xdg-desktop-portal-gtk/commit/19c5385b9f5fe0f8dac8ae7cc4493bb08f802de6.patch"; + sha256 = "nbmOb5er20zBOO4K2geYITafqBaNHbDpq1OOvIVD6hY="; + }) + ]; + nativeBuildInputs = [ autoreconfHook libxml2 @@ -38,6 +54,15 @@ stdenv.mkDerivation rec { gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s) ]; + configureFlags = lib.optionals buildPortalsInGnome [ + "--enable-wallpaper" + "--enable-screenshot" + "--enable-screencast" + "--enable-background" + "--enable-settings" + "--enable-appchooser" + ]; + meta = with lib; { description = "Desktop integration portals for sandboxed apps"; maintainers = with maintainers; [ jtojnar ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix index 2b425300b3..71674a6c38 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub , nixosTests , substituteAll @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.8.1"; + version = "1.10.1"; outputs = [ "out" "installedTests" ]; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "sha256-tuRKCBj9ELC7yFPs/Sut/EdO+L8nwW3S8NWU+XedAF8="; + sha256 = "Q1ZP/ljdIxJHg+3JaTL/LIZV+3cK2+dognsTC95udVA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/default.nix index 08bb426d8a..e7426cf10e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/default.nix @@ -1,34 +1,22 @@ -{ lib, fetchFromGitLab, buildDunePackage, ff, zarith, ctypes, tezos-rust-libs, alcotest }: +{ lib, buildDunePackage, bls12-381-gen, ff-sig, zarith, ctypes, alcotest }: buildDunePackage rec { pname = "bls12-381"; - version = "0.3.15"; - src = fetchFromGitLab { - owner = "dannywillems"; - repo = "ocaml-bls12-381"; - rev = version; - sha256 = "1s8n657fsl2gs01p7v2ffpcfzymavifhhpriyx1gq5qh4zvvw4vr"; - }; - useDune2 = true; + inherit (bls12-381-gen) version src useDune2 doCheck; minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ - ff + ff-sig zarith ctypes - tezos-rust-libs + bls12-381-gen ]; checkInputs = [ alcotest ]; - # This is a hack to work around the hack used in the dune files - OPAM_SWITCH_PREFIX = "${tezos-rust-libs}"; - - doCheck = true; - meta = { homepage = "https://gitlab.com/dannywillems/ocaml-bls12-381"; description = "OCaml binding for bls12-381 from librustzcash"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/gen.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/gen.nix new file mode 100644 index 0000000000..d7daba263c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/gen.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromGitLab, buildDunePackage, ff-sig, zarith }: + +buildDunePackage rec { + pname = "bls12-381-gen"; + version = "0.4.2"; + + src = fetchFromGitLab { + owner = "dannywillems"; + repo = "ocaml-bls12-381"; + rev = version; + sha256 = "0jxc8qrdn74brmzjns1xycv3cb257kx5pa3ripgl9ci4njkv87n2"; + }; + useDune2 = true; + + minimalOCamlVersion = "4.08"; + + propagatedBuildInputs = [ + ff-sig + zarith + ]; + + doCheck = true; + + meta = { + homepage = "https://gitlab.com/dannywillems/ocaml-bls12-381"; + description = "Functors to generate BLS12-381 primitives based on stubs"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/unix.nix new file mode 100644 index 0000000000..4da1a489e2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/unix.nix @@ -0,0 +1,48 @@ +{ lib +, buildDunePackage +, rustc +, cargo +, dune-configurator +, bls12-381 +, bls12-381-gen +, ff-pbt +, ff-sig +, zarith +, ctypes +, tezos-rust-libs +, alcotest +}: + +buildDunePackage { + pname = "bls12-381-unix"; + + inherit (bls12-381-gen) version src useDune2 doCheck; + + checkInputs = [ + alcotest + ff-pbt + ]; + + buildInputs = [ + rustc + cargo + dune-configurator + ]; + + propagatedBuildInputs = [ + ff-sig + zarith + ctypes + bls12-381-gen + bls12-381 + tezos-rust-libs + ]; + + # This is a hack to work around the hack used in the dune files + OPAM_SWITCH_PREFIX = "${tezos-rust-libs}"; + + meta = { + description = "UNIX version of BLS12-381 primitives implementing the virtual package bls12-381"; + license = lib.licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/data-encoding/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/data-encoding/default.nix index 2e4e0518a5..f7036d38d3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/data-encoding/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/data-encoding/default.nix @@ -12,13 +12,13 @@ buildDunePackage { pname = "data-encoding"; - version = "0.2.0"; + version = "0.4.0"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "data-encoding"; - rev = "0.2"; - sha256 = "0d9c2ix2imqk4r0jfhnwak9laarlbsq9kmswvbnjzdm2g0hwin1d"; + rev = "v0.4"; + sha256 = "1f88l9azpfk730hps5v6zlg4yyyyhj1gl27qy3cbbkzjc82d2rhx"; }; useDune2 = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/pbt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/pbt.nix new file mode 100644 index 0000000000..e0363160dd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/pbt.nix @@ -0,0 +1,21 @@ +{ lib, fetchFromGitLab, buildDunePackage, zarith, ff-sig, alcotest }: + +buildDunePackage { + pname = "ff-pbt"; + inherit (ff-sig) version src doCheck useDune2; + + minimalOCamlVersion = "4.08"; + + checkInputs = [ + alcotest + ]; + + propagatedBuildInputs = [ + zarith + ff-sig + ]; + + meta = ff-sig.meta // { + description = "Property based testing library for finite fields over the package ff-sig"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/sig.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/sig.nix new file mode 100644 index 0000000000..a2c7ca0d0c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/sig.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitLab, buildDunePackage, zarith }: + +buildDunePackage rec { + pname = "ff-sig"; + version = "0.6.1"; + src = fetchFromGitLab { + owner = "dannywillems"; + repo = "ocaml-ff"; + rev = version; + sha256 = "0p42ivyfbn1pwm18773y4ga9cm64ysha0rplzvrnhszg01anarc0"; + }; + + useDune2 = true; + + propagatedBuildInputs = [ + zarith + ]; + + doCheck = true; + + meta = { + homepage = "https://gitlab.com/dannywillems/ocaml-ff"; + description = "Minimal finite field signatures"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/getopt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/getopt/default.nix new file mode 100644 index 0000000000..3400774d4c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/getopt/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchzip, stdenv, ocaml, findlib, ocamlbuild }: + +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-getopt"; + version = "20120615"; + + src = fetchzip { + url = "https://download.ocamlcore.org/ocaml-getopt/ocaml-getopt/${version}/ocaml-getopt-${version}.tar.gz"; + sha256 = "0bng2mmdixpmj23xn8krlnaq66k22iclwz46r8zjrsrq3wcn1xgn"; + }; + + buildInputs = [ + ocaml + findlib + ocamlbuild + ]; + + doCheck = true; + createFindlibDestdir = true; + + meta = { + inherit (ocaml.meta) platforms; + homepage = "https://github.com/gildor478/ocaml-getopt"; + description = "Parsing of command line arguments (similar to GNU GetOpt) for OCaml"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/hashcons/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/hashcons/default.nix new file mode 100644 index 0000000000..2bfaced115 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/hashcons/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, buildDunePackage }: + +buildDunePackage rec { + pname = "hashcons"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "backtracking"; + repo = "ocaml-${pname}"; + rev = "d733325eeb55878bed285120c2c088daf78f0e2b"; + sha256 = "0h4pvwj34pndaw3pajkhl710ywwinhc9pqimgllfmkl37wz2d8zq"; + }; + + useDune2 = true; + + doCheck = true; + + meta = { + description = "OCaml hash-consing library"; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/bson.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/bson.nix index 5048a8fd06..d131acf4b4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/bson.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/bson.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, json-data-encoding, ocplib-endian, crowbar }: +{ lib, buildDunePackage, json-data-encoding, ocplib-endian, crowbar, alcotest }: buildDunePackage { pname = "json-data-encoding-bson"; @@ -12,6 +12,7 @@ buildDunePackage { checkInputs = [ crowbar + alcotest ]; meta = json-data-encoding.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/default.nix index 6dfea612b1..69fbdb6ed1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/default.nix @@ -1,14 +1,14 @@ -{ lib, fetchFromGitLab, buildDunePackage, uri, crowbar }: +{ lib, fetchFromGitLab, buildDunePackage, uri, crowbar, alcotest }: buildDunePackage rec { pname = "json-data-encoding"; - version = "0.8"; - + version = "0.10"; + minimalOCamlVersion = "4.10"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "json-data-encoding"; - rev = "v${version}"; - sha256 = "1c6m2qvi9bm6qjxc38p6cia1f66r0rb9xf6b8svlj3jjymvqw889"; + rev = "${version}"; + sha256 = "0m0xx382wr44wz7gxf7mpfjx2w287pvqhg2lfvzmclfq3y5iy6mx"; }; useDune2 = true; @@ -18,6 +18,7 @@ buildDunePackage rec { checkInputs = [ crowbar + alcotest ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-canceler/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-canceler/default.nix index 2e4d12082b..97b2715726 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-canceler/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-canceler/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "lwt-canceler"; - version = "0.2"; + version = "0.3"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "lwt-canceler"; rev = "v${version}"; - sha256 = "07931486vg83sl1c268i0vyw61l8n8xs2krjsj43070zljqi8rf1"; + sha256 = "1xbb7012hp901b755kxmfgg293rz34rkhwzg2z9i6sakwd7i0h9p"; }; useDune2 = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-exit/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-exit/default.nix new file mode 100644 index 0000000000..34aadc8761 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-exit/default.nix @@ -0,0 +1,34 @@ +{ lib +, fetchFromGitLab +, buildDunePackage +, lwt +, ptime +}: + +buildDunePackage rec { + pname = "lwt-exit"; + version = "1.0"; + src = fetchFromGitLab { + owner = "nomadic-labs"; + repo = pname; + rev = "${version}"; + sha256 = "1k763bmj1asj9ijar39rh3h1d59rckmsf21h2y8966lgglsf42bd"; + }; + + useDune2 = true; + + minimalOCamlVersion = "4.08"; + + propagatedBuildInputs = [ + lwt + ptime + ]; + + doCheck = true; + + meta = { + description = "An opinionated clean-exit and signal-handling library for Lwt programs"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pyml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pyml/default.nix new file mode 100644 index 0000000000..7bc794fa24 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pyml/default.nix @@ -0,0 +1,44 @@ +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, utop, python3, stdcompat, ncurses }: + +stdenv.mkDerivation rec { + pname = "pyml"; + version = "20210226"; + + src = fetchFromGitHub { + owner = "thierry-martinez"; + repo = pname; + rev = version; + sha256 = "15xk6bgdzsf04d6wdjpr3s1ci2g7d7qnbq3102avkz179d5n62h7"; + }; + + buildInputs = [ + ocaml + findlib + utop + ncurses + ]; + + propagatedBuildInputs = [ + python3 + stdcompat + ]; + + buildPhase = '' + make all pymltop pymlutop PREFIX=$out + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mkdir -p $OCAMLFIND_DESTDIR/stublibs + make install PREFIX=$out + runHook postInstall + ''; + + doCheck = true; + + meta = { + description = "OCaml bindings for Python"; + license = lib.licenses.bsd2; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tar/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tar/default.nix new file mode 100644 index 0000000000..abc28e2d87 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tar/default.nix @@ -0,0 +1,39 @@ +{ lib +, fetchFromGitHub +, buildDunePackage +, ppx_cstruct +, cstruct +, re +, ppx_tools +}: + +buildDunePackage rec { + pname = "tar"; + version = "1.1.0"; + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-tar"; + rev = "v${version}"; + sha256 = "14k24vn3q5jl0iyrynb5vwg80670qsv12fsmc6cdgh4zwdpjh7zs"; + }; + + useDune2 = true; + + propagatedBuildInputs = [ + ppx_cstruct + cstruct + re + ]; + + buildInputs = [ + ppx_tools + ]; + + doCheck = true; + + meta = { + description = "Decode and encode tar format files from Unix"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tar/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tar/unix.nix new file mode 100644 index 0000000000..4ac1f625a0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tar/unix.nix @@ -0,0 +1,27 @@ +{ lib +, buildDunePackage +, tar +, cstruct +, cstruct-lwt +, re +, lwt +}: + +buildDunePackage rec { + pname = "tar-unix"; + inherit (tar) version src useDune2 doCheck; + + propagatedBuildInputs = [ + tar + cstruct + cstruct-lwt + re + lwt + ]; + + meta = { + description = "Decode and encode tar format files from Unix"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/010-PtGRANAD-test-helpers.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/010-PtGRANAD-test-helpers.nix new file mode 100644 index 0000000000..fe2664333e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/010-PtGRANAD-test-helpers.nix @@ -0,0 +1,39 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-stdlib-unix +, tezos-base +, tezos-shell-services +, tezos-protocol-environment +, tezos-protocol-010-PtGRANAD +, tezos-protocol-010-PtGRANAD-parameters +, tezos-client-010-PtGRANAD +, alcotest-lwt +}: + +buildDunePackage { + pname = "tezos-010-PtGRANAD-test-helpers"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_protocol/test/helpers"; + + propagatedBuildInputs = [ + tezos-base + tezos-stdlib-unix + tezos-shell-services + tezos-protocol-environment + tezos-protocol-010-PtGRANAD + tezos-protocol-010-PtGRANAD-parameters + tezos-client-010-PtGRANAD + alcotest-lwt + ]; + + checkInputs = [ + alcotest-lwt + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: protocol testing framework"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/base.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/base.nix index 2f5d765813..544daa297a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/base.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/base.nix @@ -2,31 +2,35 @@ , buildDunePackage , tezos-stdlib , tezos-crypto +, tezos-hacl-glue-unix , tezos-micheline +, tezos-test-helpers , ptime -, ezjsonm , ipaddr -, qcheck-alcotest -, crowbar +, bls12-381-unix }: buildDunePackage { pname = "tezos-base"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_base"; propagatedBuildInputs = [ tezos-crypto tezos-micheline + tezos-hacl-glue-unix + bls12-381-unix ptime - ezjsonm ipaddr ]; checkInputs = [ - qcheck-alcotest - crowbar + # tezos-test-helpers ]; + # circular dependency if we add this + doCheck = false; + meta = tezos-stdlib.meta // { description = "Tezos: meta-package and pervasive type definitions for Tezos"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/clic.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/clic.nix index d69174e5f2..863ecb8df4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/clic.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/clic.nix @@ -8,7 +8,8 @@ buildDunePackage { pname = "tezos-clic"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_clic"; propagatedBuildInputs = [ tezos-stdlib-unix @@ -19,6 +20,8 @@ buildDunePackage { alcotest-lwt ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: library of auto-documented command-line-parsing combinators"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/client-010-PtGRANAD.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/client-010-PtGRANAD.nix new file mode 100644 index 0000000000..55a9845450 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/client-010-PtGRANAD.nix @@ -0,0 +1,38 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-mockup-registration +, tezos-proxy +, tezos-signer-backends +, tezos-protocol-010-PtGRANAD-parameters +, tezos-protocol-plugin-010-PtGRANAD +, alcotest-lwt +, ppx_inline_test +, cacert +}: + +buildDunePackage { + pname = "tezos-client-010-PtGRANAD"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_client"; + + propagatedBuildInputs = [ + tezos-mockup-registration + tezos-proxy + tezos-signer-backends + tezos-protocol-010-PtGRANAD-parameters + tezos-protocol-plugin-010-PtGRANAD + ppx_inline_test + ]; + + checkInputs = [ + alcotest-lwt + cacert + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: protocol specific library for `tezos-client`"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/client-base.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/client-base.nix new file mode 100644 index 0000000000..f250348172 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/client-base.nix @@ -0,0 +1,28 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-shell-services +, tezos-sapling +, alcotest +}: + +buildDunePackage { + pname = "tezos-client-base"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_client_base"; + + propagatedBuildInputs = [ + tezos-shell-services + tezos-sapling + ]; + + checkInputs = [ + alcotest + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: protocol registration for the mockup mode"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/context.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/context.nix new file mode 100644 index 0000000000..e118c3e1eb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/context.nix @@ -0,0 +1,34 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-base +, tezos-shell-services +, irmin +, irmin-pack +, digestif +, alcotest-lwt +}: + +buildDunePackage { + pname = "tezos-context"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_context"; + + propagatedBuildInputs = [ + tezos-base + tezos-shell-services + irmin + irmin-pack + digestif + ]; + + checkInputs = [ + alcotest-lwt + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: library of auto-documented RPCs (service and hierarchy descriptions)"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/crypto.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/crypto.nix index 9c5bd45f94..532e8fc12b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/crypto.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/crypto.nix @@ -1,37 +1,41 @@ { lib , buildDunePackage , tezos-stdlib -, tezos-clic , tezos-rpc -, bls12-381 -, hacl-star +, tezos-clic +, tezos-hacl-glue +, tezos-hacl-glue-unix , secp256k1-internal -, uecc , ringo -, ff -, alcotest +, bls12-381 +, bls12-381-unix +, tezos-test-helpers , alcotest-lwt }: buildDunePackage { pname = "tezos-crypto"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_crypto"; propagatedBuildInputs = [ - tezos-clic tezos-rpc - bls12-381 - hacl-star + tezos-clic + tezos-hacl-glue + tezos-hacl-glue-unix secp256k1-internal - uecc ringo + bls12-381 + bls12-381-unix ]; checkInputs = [ - alcotest + tezos-test-helpers alcotest-lwt ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: library with all the cryptographic primitives used by Tezos"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/embedded-protocol-010-PtGRANAD.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/embedded-protocol-010-PtGRANAD.nix new file mode 100644 index 0000000000..f0f9c2be77 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/embedded-protocol-010-PtGRANAD.nix @@ -0,0 +1,30 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-010-PtGRANAD +, tezos-protocol-updater +, tezos-protocol-compiler +}: + +buildDunePackage { + pname = "tezos-embedded-protocol-010-PtGRANAD"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_protocol"; + + preBuild = tezos-protocol-010-PtGRANAD.preBuild; + + propagatedBuildInputs = [ + tezos-protocol-010-PtGRANAD + tezos-protocol-updater + ]; + + buildInputs = [ + tezos-protocol-compiler + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: economic-protocol definition, embedded in `tezos-node`"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/error-monad.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/error-monad.nix index 70cdff0c0a..cbebf1e51c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/error-monad.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/error-monad.nix @@ -4,19 +4,22 @@ , data-encoding , lwt , lwt-canceler +, tezos-lwt-result-stdlib , alcotest , alcotest-lwt }: buildDunePackage { pname = "tezos-error-monad"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_error_monad"; propagatedBuildInputs = [ tezos-stdlib data-encoding lwt lwt-canceler + tezos-lwt-result-stdlib ]; checkInputs = [ @@ -24,6 +27,8 @@ buildDunePackage { alcotest-lwt ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: error monad"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/event-logging.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/event-logging.nix index 30d6c12087..75b4a5d064 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/event-logging.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/event-logging.nix @@ -1,21 +1,27 @@ { lib , buildDunePackage , tezos-stdlib -, tezos-lwt-result-stdlib +, tezos-error-monad +, data-encoding , lwt_log -, alcotest -, alcotest-lwt +, lwt }: buildDunePackage { pname = "tezos-event-logging"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_event_logging"; propagatedBuildInputs = [ - tezos-lwt-result-stdlib + tezos-stdlib + tezos-error-monad + data-encoding lwt_log + lwt ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: event logging library"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/hacl-glue-unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/hacl-glue-unix.nix new file mode 100644 index 0000000000..5c8afad0f2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/hacl-glue-unix.nix @@ -0,0 +1,26 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-hacl-glue +, ctypes +, hacl-star +}: + +buildDunePackage { + pname = "tezos-hacl-glue-unix"; + + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_hacl_glue/unix"; + + propagatedBuildInputs = [ + ctypes + hacl-star + tezos-hacl-glue + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: thin layer of glue around hacl-star (unix implementation)"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/hacl-glue.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/hacl-glue.nix new file mode 100644 index 0000000000..409d04bb26 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/hacl-glue.nix @@ -0,0 +1,17 @@ +{ lib +, buildDunePackage +, tezos-stdlib +}: + +buildDunePackage { + pname = "tezos-hacl-glue"; + + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_hacl_glue/virtual"; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: thin layer of glue around hacl-star (virtual package)"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/legacy-store.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/legacy-store.nix new file mode 100644 index 0000000000..6029401e36 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/legacy-store.nix @@ -0,0 +1,40 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-context +, tezos-lmdb +, tezos-validation +, tezos-shell-services +, tezos-protocol-compiler +, lwt-watcher +, alcotest-lwt +}: + +buildDunePackage { + pname = "tezos-legacy-store"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_store/legacy_store"; + + propagatedBuildInputs = [ + tezos-context + tezos-lmdb + tezos-validation + tezos-shell-services + lwt-watcher + ]; + + buildInputs = [ + tezos-protocol-compiler + ]; + + checkInputs = [ + alcotest-lwt + ]; + + # A lot of extra deps with wide dependency cones needed + doCheck = false; + + meta = tezos-stdlib.meta // { + description = "Tezos: custom economic-protocols environment implementation for `tezos-client` and testing"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/lmdb.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/lmdb.nix index 960b2532c3..6eaed94231 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/lmdb.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/lmdb.nix @@ -8,25 +8,23 @@ , alcotest }: -buildDunePackage rec { - pname = "tezos-lmdb"; +let version = "7.4"; src = fetchFromGitLab { owner = "tezos"; repo = "tezos"; rev = "v${version}"; - sha256 = "18q02j74aa8mxv233kvyb62xbhjngzpgppp6kgr4m53d7a78wgsm"; + sha256 = "0sghc60xzr02pmmkr626pnhzrnczf7mki7qyxzzfn7rbbdbrf4wp"; }; +in + +buildDunePackage { + pname = "tezos-lmdb"; + version = version; + src = "${src}/vendors/ocaml-lmdb"; useDune2 = true; - preBuild = '' - rm dune - rm -rf src - rm -rf docs - ls vendors | grep -v ocaml-lmdb |xargs rm -rf - ''; - buildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/micheline.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/micheline.nix index a729cdef15..c28e8f8974 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/micheline.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/micheline.nix @@ -10,11 +10,13 @@ buildDunePackage { pname = "tezos-micheline"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_micheline"; propagatedBuildInputs = [ tezos-error-monad uutf + ppx_inline_test ]; checkInputs = [ @@ -22,6 +24,8 @@ buildDunePackage { alcotest-lwt ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: internal AST and parser for the Michelson language"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/mockup-proxy.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/mockup-proxy.nix new file mode 100644 index 0000000000..d949439fce --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/mockup-proxy.nix @@ -0,0 +1,27 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-client-base +, tezos-protocol-environment +, tezos-rpc-http-client +, resto-cohttp-self-serving-client +}: + +buildDunePackage { + pname = "tezos-mockup-proxy"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_mockup_proxy"; + + propagatedBuildInputs = [ + tezos-client-base + tezos-protocol-environment + tezos-rpc-http-client + resto-cohttp-self-serving-client + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: local RPCs"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/mockup-registration.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/mockup-registration.nix new file mode 100644 index 0000000000..651c89a598 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/mockup-registration.nix @@ -0,0 +1,23 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-client-base +, tezos-protocol-environment +}: + +buildDunePackage { + pname = "tezos-mockup-registration"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_mockup"; + + propagatedBuildInputs = [ + tezos-client-base + tezos-protocol-environment + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: protocol registration for the mockup mode"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/p2p-services.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/p2p-services.nix index b4243f589f..da15852aa9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/p2p-services.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/p2p-services.nix @@ -6,7 +6,8 @@ buildDunePackage { pname = "tezos-p2p-services"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_p2p_services"; propagatedBuildInputs = [ tezos-base diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/p2p.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/p2p.nix index b75c03debf..cec1f1ef7b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/p2p.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/p2p.nix @@ -2,13 +2,16 @@ , buildDunePackage , tezos-stdlib , tezos-p2p-services +, tezos-test-services , alcotest-lwt +, astring , lwt-watcher }: buildDunePackage { pname = "tezos-p2p"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_p2p"; propagatedBuildInputs = [ tezos-p2p-services @@ -16,9 +19,13 @@ buildDunePackage { ]; checkInputs = [ + astring alcotest-lwt + tezos-test-services ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: library for a pool of P2P connections"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix deleted file mode 100644 index 5b043eede9..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib -, buildDunePackage -, tezos-stdlib -, tezos-protocol-008-PtEdo2Zk -, qcheck-alcotest -}: - -buildDunePackage { - pname = "tezos-protocol-008-PtEdo2Zk-parameters"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; - - propagatedBuildInputs = [ - tezos-protocol-008-PtEdo2Zk - ]; - - meta = tezos-stdlib.meta // { - description = "Tezos/Protocol: parameters"; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix deleted file mode 100644 index 49a7f0e638..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib -, buildDunePackage -, tezos-stdlib -, tezos-protocol-compiler -}: - -buildDunePackage { - pname = "tezos-protocol-008-PtEdo2Zk"; - inherit (tezos-stdlib) version src useDune2 doCheck; - - preBuild = '' - rm -rf vendors - substituteInPlace src/proto_008_PtEdo2Zk/lib_protocol/dune.inc --replace "-nostdlib" "" - ''; - - propagatedBuildInputs = [ - tezos-protocol-compiler - ]; - - meta = tezos-stdlib.meta // { - description = "Tezos/Protocol: economic-protocol definition"; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD-parameters.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD-parameters.nix new file mode 100644 index 0000000000..832ca9df30 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD-parameters.nix @@ -0,0 +1,23 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-010-PtGRANAD +, tezos-protocol-environment +}: + +buildDunePackage { + pname = "tezos-protocol-010-PtGRANAD-parameters"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_parameters"; + + propagatedBuildInputs = [ + tezos-protocol-010-PtGRANAD + tezos-protocol-environment + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: parameters"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix new file mode 100644 index 0000000000..80809cafba --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix @@ -0,0 +1,27 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-compiler +}: + +buildDunePackage { + pname = "tezos-protocol-010-PtGRANAD"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_protocol"; + + preBuild = '' + rm dune + cp -f ${tezos-protocol-compiler.src}/dune_protocol dune + sed -i.back -e s/-nostdlib//g dune.inc + ''; + + buildInputs = [ + tezos-protocol-compiler + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: economic-protocol definition"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-compiler.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-compiler.nix index a43356d9cb..6178fb6c08 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-compiler.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-compiler.nix @@ -4,6 +4,7 @@ , tezos-stdlib , tezos-protocol-environment , ocp-ocamlres +, re , pprint }: @@ -13,16 +14,20 @@ else buildDunePackage { pname = "tezos-protocol-compiler"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_protocol_compiler"; - minimalOCamlVersion = "4.09"; + minimalOCamlVersion = "4.10"; propagatedBuildInputs = [ tezos-protocol-environment ocp-ocamlres + re pprint ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: economic-protocol compiler"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix deleted file mode 100644 index 51efe69418..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib -, buildDunePackage -, tezos-stdlib -, tezos-protocol-compiler -}: - -buildDunePackage { - pname = "tezos-protocol-demo-noops"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; - - propagatedBuildInputs = [ - tezos-protocol-compiler - ]; - - meta = tezos-stdlib.meta // { - description = "Tezos/Protocol: demo_noops economic-protocol definition"; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment-packer.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment-packer.nix index 42662105b9..3aa5e0f6fc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment-packer.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment-packer.nix @@ -5,10 +5,13 @@ buildDunePackage { pname = "tezos-protocol-environment-packer"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_protocol_environment"; minimalOCamlVersion = "4.03"; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: sigs/structs packer for economic protocol environment"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix index 79b84360a9..3008de6243 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix @@ -8,7 +8,21 @@ buildDunePackage { pname = "tezos-protocol-environment-sigs"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_protocol_environment"; + + postPatch = '' + ls ./sigs/v0 + cp -f ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith/z.mli ./sigs/v1/z.mli + cp -f ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith/z.mli ./sigs/v2/z.mli + cp -f ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith/z.mli ./sigs/v3/z.mli + sed -i 's/out_channel/Stdlib.out_channel/g' ./sigs/v1/z.mli + sed -i 's/Buffer/Stdlib.Buffer/g' ./sigs/v1/z.mli + sed -i 's/out_channel/Stdlib.out_channel/g' ./sigs/v2/z.mli + sed -i 's/Buffer/Stdlib.Buffer/g' ./sigs/v2/z.mli + sed -i 's/out_channel/Stdlib.out_channel/g' ./sigs/v3/z.mli + sed -i 's/Buffer/Stdlib.Buffer/g' ./sigs/v3/z.mli + ''; propagatedBuildInputs = [ tezos-protocol-environment-packer @@ -18,11 +32,7 @@ buildDunePackage { tezos-stdlib ]; - postPatch = '' - cp -f ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith/z.mli ./src/lib_protocol_environment/sigs/v1/z.mli - sed -i 's/out_channel/Stdlib.out_channel/g' ./src/lib_protocol_environment/sigs/v1/z.mli - sed -i 's/Buffer/Stdlib.Buffer/g' ./src/lib_protocol_environment/sigs/v1/z.mli - ''; + doCheck = true; meta = tezos-stdlib.meta // { description = "Tezos: restricted typing environment for the economic protocols"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix index feddca046f..f7b61b22b2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix @@ -7,13 +7,16 @@ buildDunePackage { pname = "tezos-protocol-environment-structs"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_protocol_environment"; propagatedBuildInputs = [ tezos-crypto tezos-protocol-environment-packer ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: restricted typing environment for the economic protocols"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment.nix index 60d9ae2922..292e4ce41e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-environment.nix @@ -1,22 +1,26 @@ { lib +, ocaml , buildDunePackage , tezos-stdlib , tezos-base , tezos-sapling +, tezos-context , tezos-protocol-environment-sigs , tezos-protocol-environment-structs +, tezos-test-helpers , zarith , alcotest-lwt -, crowbar }: buildDunePackage { pname = "tezos-protocol-environment"; - inherit (tezos-stdlib) version src useDune2 doCheck preBuild; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_protocol_environment"; propagatedBuildInputs = [ tezos-sapling tezos-base + tezos-context tezos-protocol-environment-sigs tezos-protocol-environment-structs zarith # this might break, since they actually want 1.11 @@ -24,9 +28,11 @@ buildDunePackage { checkInputs = [ alcotest-lwt - crowbar + tezos-test-helpers ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: custom economic-protocols environment implementation for `tezos-client` and testing"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-plugin-010-PtGRANAD.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-plugin-010-PtGRANAD.nix new file mode 100644 index 0000000000..2ce2315774 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-plugin-010-PtGRANAD.nix @@ -0,0 +1,25 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-embedded-protocol-010-PtGRANAD +, tezos-protocol-010-PtGRANAD +, tezos-shell +}: + +buildDunePackage { + pname = "tezos-protocol-plugin-010-PtGRANAD"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_plugin"; + + buildInputs = [ + tezos-embedded-protocol-010-PtGRANAD + tezos-protocol-010-PtGRANAD + tezos-shell + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: protocol plugin registerer"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-updater.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-updater.nix new file mode 100644 index 0000000000..29aaa8be73 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/protocol-updater.nix @@ -0,0 +1,26 @@ +{ lib +, ocaml +, buildDunePackage +, tezos-stdlib +, tezos-protocol-compiler +, tezos-shell-context +, lwt-exit +}: + +buildDunePackage { + pname = "tezos-protocol-updater"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_protocol_updater"; + + propagatedBuildInputs = [ + tezos-shell-context + lwt-exit + tezos-protocol-compiler + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: economic-protocol dynamic loading for `tezos-node`"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/proxy.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/proxy.nix new file mode 100644 index 0000000000..4e46027de0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/proxy.nix @@ -0,0 +1,36 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-mockup-proxy +, tezos-context +, ringo-lwt +, alcotest-lwt +, crowbar +, tezos-test-services +, tezos-test-helpers +}: + +buildDunePackage { + pname = "tezos-proxy"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_proxy"; + + propagatedBuildInputs = [ + ringo-lwt + tezos-mockup-proxy + tezos-context + ]; + + checkInputs = [ + alcotest-lwt + crowbar + tezos-test-services + tezos-test-helpers + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: protocol registration for the mockup mode"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/requester.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/requester.nix index d4a2b69eaa..2326f8ec91 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/requester.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/requester.nix @@ -9,7 +9,8 @@ buildDunePackage { pname = "tezos-requester"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_requester"; propagatedBuildInputs = [ tezos-base @@ -21,6 +22,8 @@ buildDunePackage { tezos-test-services ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: generic resource fetching service"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/rpc-http-client-unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/rpc-http-client-unix.nix new file mode 100644 index 0000000000..246618ce07 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/rpc-http-client-unix.nix @@ -0,0 +1,23 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-rpc-http-client +, cohttp-lwt-unix +}: + +buildDunePackage { + pname = "tezos-rpc-http-client-unix"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_rpc_http"; + + propagatedBuildInputs = [ + tezos-rpc-http-client + cohttp-lwt-unix + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: unix implementation of the RPC client"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/rpc-http-client.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/rpc-http-client.nix new file mode 100644 index 0000000000..54cb71617b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/rpc-http-client.nix @@ -0,0 +1,23 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-rpc-http +, resto-cohttp-client +}: + +buildDunePackage { + pname = "tezos-rpc-http-client"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_rpc_http"; + + propagatedBuildInputs = [ + tezos-rpc-http + resto-cohttp-client + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: library of auto-documented RPCs (http client)"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/rpc-http.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/rpc-http.nix new file mode 100644 index 0000000000..56fda87f93 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/rpc-http.nix @@ -0,0 +1,25 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-base +, resto-directory +, resto-cohttp +}: + +buildDunePackage { + pname = "tezos-rpc-http"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_rpc_http"; + + propagatedBuildInputs = [ + tezos-base + resto-directory + resto-cohttp + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: library of auto-documented RPCs (http server and client)"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/rpc.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/rpc.nix index 33450bdf16..f8a1336146 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/rpc.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/rpc.nix @@ -8,7 +8,8 @@ buildDunePackage { pname = "tezos-rpc"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_rpc"; propagatedBuildInputs = [ tezos-error-monad @@ -16,6 +17,8 @@ buildDunePackage { resto-directory ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: library of auto-documented RPCs (service and hierarchy descriptions)"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/sapling.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/sapling.nix index 40665e3805..a51973ed72 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/sapling.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/sapling.nix @@ -4,12 +4,14 @@ , tezos-stdlib , tezos-crypto , tezos-rust-libs +, tezos-test-services , alcotest-lwt }: buildDunePackage { pname = "tezos-sapling"; - inherit (tezos-stdlib) version src useDune2 preBuild; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_sapling"; propagatedBuildInputs = [ tezos-crypto @@ -18,8 +20,10 @@ buildDunePackage { checkInputs = [ alcotest-lwt + tezos-test-services ]; + # requires the "zcash-params" files doCheck = false; # This is a hack to work around the hack used in the dune files diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/shell-context.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/shell-context.nix new file mode 100644 index 0000000000..89b50177f2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/shell-context.nix @@ -0,0 +1,21 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-environment +}: + +buildDunePackage { + pname = "tezos-shell-context"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_protocol_environment"; + + propagatedBuildInputs = [ + tezos-protocol-environment + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: economic-protocols environment implementation for `tezos-node`"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/shell-services.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/shell-services.nix index 4e2f40497e..d15993e0a9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/shell-services.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/shell-services.nix @@ -8,7 +8,8 @@ buildDunePackage { pname = "tezos-shell-services"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_shell_services"; propagatedBuildInputs = [ tezos-workers @@ -16,6 +17,8 @@ buildDunePackage { tezos-version ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: descriptions of RPCs exported by `tezos-shell`"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/shell.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/shell.nix new file mode 100644 index 0000000000..268db42fcd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/shell.nix @@ -0,0 +1,45 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-p2p +, tezos-requester +, tezos-validation +, tezos-store +, tezos-workers +, tezos-test-services +# , tezos-embedded-protocol-demo-noops +, tezos-test-helpers +# , tezos-protocol-plugin-alpha +, alcotest-lwt +, crowbar +}: + +buildDunePackage { + pname = "tezos-shell"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_shell"; + + propagatedBuildInputs = [ + tezos-p2p + tezos-requester + tezos-validation + tezos-store + tezos-workers + ]; + + checkInputs = [ + alcotest-lwt + crowbar + tezos-test-helpers + tezos-test-services + # tezos-embedded-protocol-demo-noops + # tezos-protocol-plugin-alpha + ]; + + # A lot of extra deps with wide dependency cones needed + doCheck = false; + + meta = tezos-stdlib.meta // { + description = "Tezos: descriptions of RPCs exported by `tezos-shell`"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/signer-backends.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/signer-backends.nix new file mode 100644 index 0000000000..0b49779c27 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/signer-backends.nix @@ -0,0 +1,30 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-rpc-http-client-unix +, tezos-signer-services +, alcotest +, alcotest-lwt +}: + +buildDunePackage { + pname = "tezos-signer-backends"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_signer_backends"; + + propagatedBuildInputs = [ + tezos-rpc-http-client-unix + tezos-signer-services + ]; + + checkInputs = [ + alcotest + alcotest-lwt + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: remote-signature backends for `tezos-client`"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/signer-services.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/signer-services.nix new file mode 100644 index 0000000000..2f7333312f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/signer-services.nix @@ -0,0 +1,21 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-client-base +}: + +buildDunePackage { + pname = "tezos-signer-services"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_signer_services"; + + propagatedBuildInputs = [ + tezos-client-base + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: descriptions of RPCs exported by `tezos-signer`"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/stdlib-unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/stdlib-unix.nix index 2b3a01469a..1b275d03df 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/stdlib-unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/stdlib-unix.nix @@ -2,28 +2,31 @@ , buildDunePackage , tezos-stdlib , tezos-event-logging -, lwt +, re , ptime , mtime , ipaddr -, re -, alcotest -, alcotest-lwt +, ezjsonm +, fmt }: buildDunePackage { pname = "tezos-stdlib-unix"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_stdlib_unix"; propagatedBuildInputs = [ tezos-event-logging - lwt + re ptime mtime ipaddr - re + ezjsonm + fmt ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: yet-another local-extension of the OCaml standard library (unix-specific fragment)"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/stdlib.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/stdlib.nix index eff403ba80..07ec63785b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/stdlib.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/stdlib.nix @@ -9,19 +9,24 @@ , crowbar , bigstring , lwt_log +, ppx_inline_test +, qcheck-alcotest +, tezos-test-helpers }: buildDunePackage rec { pname = "tezos-stdlib"; - version = "8.3"; - src = fetchFromGitLab { + version = "10.2"; + base_src = fetchFromGitLab { owner = "tezos"; repo = "tezos"; rev = "v${version}"; - sha256 = "1ykhz5m5sb2hq04nspbsbq8wspkhimagb5g6yi65hpdbn8f4zr6h"; + sha256 = "1sqwbdclsvzz0781r0830ncy1j048h12jp3hsdy7hz4dpqp80jsq"; }; - minimalOCamlVersion = "4.0.8"; + src = "${base_src}/src/lib_stdlib"; + + minimalOCamlVersion = "4.10.0"; useDune2 = true; @@ -33,17 +38,23 @@ buildDunePackage rec { hex lwt zarith + ppx_inline_test ]; checkInputs = [ + bigstring + lwt_log alcotest alcotest-lwt crowbar bigstring lwt_log + qcheck-alcotest + # tezos-test-helpers ]; - doCheck = true; + # circular dependency if we add this + doCheck = false; meta = { description = "Tezos: yet-another local-extension of the OCaml standard library"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/store.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/store.nix new file mode 100644 index 0000000000..69dad75127 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/store.nix @@ -0,0 +1,48 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-updater +, tezos-validation +, tezos-legacy-store +, tezos-protocol-compiler +, index +, camlzip +, tar-unix +, ringo-lwt +, digestif +, alcotest-lwt +, lwt-watcher +}: + +buildDunePackage { + pname = "tezos-store"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_store"; + + propagatedBuildInputs = [ + index + camlzip + tar-unix + ringo-lwt + digestif + lwt-watcher + tezos-protocol-updater + tezos-validation + tezos-legacy-store + ]; + + buildInputs = [ + tezos-protocol-compiler + ]; + + checkInputs = [ + alcotest-lwt + ]; + + # A lot of extra deps with wide dependency cones needed + doCheck = false; + + meta = tezos-stdlib.meta // { + description = "Tezos: custom economic-protocols environment implementation for `tezos-client` and testing"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/test-helpers.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/test-helpers.nix new file mode 100644 index 0000000000..68a0d841cc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/test-helpers.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitLab +, buildDunePackage +, qcheck-alcotest +, alcotest +, alcotest-lwt +, hashcons +, pyml +, uri +, tezos-test-services +, tezos-stdlib +}: + +buildDunePackage rec { + pname = "tezos-test-helpers"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_test"; + + propagatedBuildInputs = [ + qcheck-alcotest + alcotest + alcotest-lwt + hashcons + pyml + uri + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: yet-another local-extension of the OCaml standard library"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/test-services.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/test-services.nix index ba30b922d1..0da38d896e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/test-services.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/test-services.nix @@ -1,4 +1,5 @@ { lib +, fetchFromGitLab , buildDunePackage , tezos-stdlib , tezos-base @@ -7,13 +8,16 @@ buildDunePackage { pname = "tezos-test-services"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_test_services"; propagatedBuildInputs = [ tezos-base alcotest-lwt ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: Alcotest-based test services"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/validation.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/validation.nix new file mode 100644 index 0000000000..b26b81f4a7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/validation.nix @@ -0,0 +1,26 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-updater +, tezos-protocol-compiler +}: + +buildDunePackage { + pname = "tezos-validation"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_validation"; + + propagatedBuildInputs = [ + tezos-protocol-updater + ]; + + buildInputs = [ + tezos-protocol-compiler + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: library for blocks validation"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/version.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/version.nix index 3b4bdd4bf6..a0928d15f4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/version.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/version.nix @@ -6,12 +6,15 @@ buildDunePackage { pname = "tezos-version"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_version"; propagatedBuildInputs = [ tezos-base ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: version information generated from Git"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/workers.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/workers.nix index ca659f8adf..65a60a216c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/workers.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos/workers.nix @@ -6,12 +6,15 @@ buildDunePackage { pname = "tezos-workers"; - inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_workers"; propagatedBuildInputs = [ tezos-base ]; + doCheck = true; + meta = tezos-stdlib.meta // { description = "Tezos: worker library"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix index 898bbbba91..b71442a6a8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix @@ -1,50 +1,24 @@ -{ lib, stdenv, fetchurl, unzip, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner, uucd }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner }: let pname = "uunf"; webpage = "https://erratique.ch/software/${pname}"; - version = "13.0.0"; - ucdxml = fetchurl { - url = "http://www.unicode.org/Public/${version}/ucdxml/ucd.all.grouped.zip"; - sha256 = "04gpl09ggb6fb0kmk6298rd8184dv6vcscn28l1gpdv1yjlw1a8q"; - }; - gen = fetchurl { - url = "https://raw.githubusercontent.com/dbuenzli/uunf/v12.0.0/support/gen.ml"; - sha256 = "08j2mpi7j6q3rqc6bcdwspqn1s7pkkphznxfdycqjv4h9yaqsymj"; - }; - gen_norm = fetchurl { - url = "https://raw.githubusercontent.com/dbuenzli/uunf/v12.0.0/support/gen_norm.ml"; - sha256 = "11vx5l5bag6bja7qj8jv4s2x9fknj3557n0mj87k2apq5gs5f4m5"; - }; - gen_props = fetchurl { - url = "https://raw.githubusercontent.com/dbuenzli/uunf/v12.0.0/support/gen_props.ml"; - sha256 = "0a6lhja498kp9lxql0pbfvkgvajs10wx88wkqc7y5m3lrvw46268"; - }; + version = "14.0.0"; in -assert lib.versionAtLeast ocaml.version "4.03"; +if !lib.versionAtLeast ocaml.version "4.03" +then throw "${pname} is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation { - name = "ocaml-${pname}-${version}"; + name = "ocaml${ocaml.version}-${pname}-${version}"; inherit version; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1qci04nkp24kdls1z4s8kz5dzgky4nwd5r8345nwdrgwmxhw7ksm"; + sha256 = "sha256:17wv0nm3vvwcbzb1b09akw8jblmigyhbfmh1sy9lkb5756ni94a2"; }; - postConfigure = '' - rm -f src/uunf_data.ml - mkdir -p support/ - cp ${gen} support/gen.ml - cp ${gen_norm} support/gen_norm.ml - cp ${gen_props} support/gen_props.ml - funzip ${ucdxml} > support/ucd.xml - ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/build_support.ml - ''; - - nativeBuildInputs = [ unzip ]; - - buildInputs = [ ocaml findlib ocamlbuild topkg uutf cmdliner uucd ]; + buildInputs = [ ocaml findlib ocamlbuild topkg uutf cmdliner ]; propagatedBuildInputs = [ uchar ]; @@ -53,11 +27,8 @@ stdenv.mkDerivation { meta = with lib; { description = "An OCaml module for normalizing Unicode text"; homepage = webpage; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; - # See https://github.com/dbuenzli/uunf/issues/15#issuecomment-903151264 - broken = lib.versions.majorMinor ocaml.version == "4.08" - && stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix index ccacef6df5..6185103636 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "accuweather"; - version = "0.2.0"; + version = "0.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-Swe8vegRcyaeG4n/8aeGFLrXkwcLM/Al53yD6oD/0GA="; + sha256 = "sha256-Kn2hP0mdnC4+Lk8wsTznC23CsYLYKhya+HlHox1Fo2o="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix index f98cf112eb..8d719f4c33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.10072"; + version = "9.0.10159"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sUyR9X/+JedJGsiQQuwgJQB5e1+S1I516P5jDCQRzAw="; + sha256 = "sha256-45wdHlAkuzLqwy3B7bEm2fhHD8iT5xSVmeRGOa2SNnI="; }; propagatedBuildInputs = [ pyvex ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix index 1ad7c0bfd9..268654ea9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "aiodiscover"; - version = "1.4.4"; + version = "1.4.5"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DobTx6oUr25J8bolo84V4yTT0b0jBsOIzPn93uAmDl0="; + sha256 = "sha256-QfeAEFB5WikuriBTcfFIgnJw5H4vEcGIVX47fyDb1Dk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index 3d40e7ff52..5b69a33261 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "9.1.5"; + version = "10.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PPag65ZMz9KZEe9FmiB42/DgeM0vJw5L0haAG/jBjqg="; + sha256 = "sha256-ZVexJt1CE7Q0j9QzrPFLYYSXzoWYtfw1BWwL/hnAkD0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix index 5e8e9327c4..d64f936ef1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiomusiccast"; - version = "0.9.2"; + version = "0.10.0"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vigonotion"; repo = "aiomusiccast"; rev = version; - sha256 = "sha256-xZPNEynj0kbeika15ZDEIRUe519V6Asaw+CEiBu7VL4="; + sha256 = "sha256-UdWZLthpCuKLjASVwi4GTkrHY+K9c1xrNYVLezC/NGM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix index 342ff82c3a..21539a93f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.10072"; + version = "9.0.10159"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-mdGcEeuWXo0Qyi8+mU8RSpUoTbUkVBmduTz3B4TW2zg="; + sha256 = "sha256-j3SbKBoREeB4IJmXVm27K4C1FLcZwqFMFXQwWnMtE0g="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix index a71c6e3c7e..71690bf31b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.10072"; + version = "9.0.10159"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FTKvGhONDUifwZhoKBXTZQFNbC/vTcHdLIge3j6U8uo="; + sha256 = "sha256-gVYriEt0/DPB0lDK9hGSnipGLCZtSOf27gtF8KwCMDA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/base.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/base.nix index 3156ba18e1..e6113b93dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/base.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/base.nix @@ -28,11 +28,11 @@ let in buildPythonPackage rec { pname = "ansible-base"; - version = "2.10.14"; + version = "2.10.15"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gAxGRsWKWJf3HyIwFn21YmoZbeuiCPDvRWChg//Z39o="; + sha256 = "sha256-RHiBi6gh26FD4SNWjsXTF9yPpKxuFRP3pQFzTlKXa/8="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix index b64942b107..dc87dcfeda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix @@ -29,11 +29,11 @@ let in buildPythonPackage rec { pname = "ansible-core"; - version = "2.11.5"; + version = "2.11.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fTzkcBQSKQdFRwQ2NIXkhRP4rQ8AE4uIhw622IlT0SE="; + sha256 = "sha256-k9UCg8fFtHbev4PcCJs/Z5uTmouae11ijSjar7s9MDo="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/legacy.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/legacy.nix index 3957e109c7..50662b43f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/legacy.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/legacy.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.26"; + version = "2.9.27"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OuAqrSu+3PtBnOdevSpkjp3rc+ni2N6GyC1gR7G962M="; + sha256 = "sha256-R5FZ5Qs72Qkg0GvFlBDDpR0/m+m04QKeEdHkotBwVzY="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index e20cb09326..88bb434a2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.10072"; + version = "9.0.10159"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Nwt2QD+A67Lbgzg/HSR+yaNWk9+EsUWA5nxm4JTikS8="; + sha256 = "sha256-WkA4vSXzndd7ldNBVagEEodj+2GuYg9OURnMLhRq8W8="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix index c19dcda245..4bb201b251 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "asyncwhois"; - version = "0.4.0"; + version = "0.4.1"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yJ+AHUyzAl8lRcKcLfMJ8InhV0LVUK+Neb5ngQOwFTM="; + sha256 = "sha256-mKKN2IuveOE+3mZGS5LFa15lJPA9y7KgLd0FoRuEMH0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/augeas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/augeas/default.nix index cf1d4544e4..6b70f36752 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/augeas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/augeas/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { # TODO: not very nice! postPatch = - let libname = if stdenv.isDarwin then "libaugeas.dylib" else "libaugeas.so"; + let libname = "libaugeas${stdenv.hostPlatform.extensions.sharedLibrary}"; in '' substituteInPlace augeas/ffi.py \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index 02d2c6a013..a6920815f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "8.0.0"; + version = "9.0.0"; pname = "azure-mgmt-hdinsight"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "2c43f1a62e5b83304392b0ad7cfdaeef2ef2f47cb3fdfa2577b703b6ea126000"; + sha256 = "41ebdc69c0d1f81d25dd30438c14fff4331f66639f55805b918b9649eaffe78a"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix index 792501b24e..20d3db5669 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -10,14 +10,14 @@ }: buildPythonPackage rec { - version = "19.0.0"; + version = "19.1.0"; pname = "azure-mgmt-network"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "5e39a26ae81fa58c13c02029700f8c7b22c3fd832a294c543e3156a91b9459e8"; + sha256 = "62ef7fe8ba98e56412b434c9c35dc755b3c5e469f2c01bbed2ce0d12973a044b"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix index 59f3e7189f..626a60d7c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-rdbms"; - version = "9.1.0"; + version = "10.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f738d9e6db8f6da6bb4e84e59dd0548c8adef948357a447337e78d1035ac960a"; + sha256 = "bdc479b3bbcac423943d63e746a81dd5fc80b46a4dbb4393e760016e3fa4f74a"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix index be011a1ed0..ea6f47183a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "0.6.2"; + version = "0.7.0"; pname = "azure-multiapi-storage"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "74061f99730fa82c54d9b8ab3c7d6e219da3f30912740ecf0456b20cb3555ebc"; + sha256 = "cd4f184be8c9ca8aca969f93ed50dc7fe556d28ca11520440fc182cf876abdf9"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix index 2f4552ca3f..17d46940e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "brother"; - version = "1.0.2"; + version = "1.1.0"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-xs/GIsJUuKKbDotV1BeT/ng86UVkNsH48uHR4i3vqow="; + sha256 = "sha256-ZDQIpzdr3XkYrSUgrBDZsUwUZRQCdJdvmniMezvJxzU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cachetools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cachetools/default.nix index fe7ad48274..21529174eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cachetools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cachetools/default.nix @@ -1,24 +1,26 @@ { lib , buildPythonPackage -, isPy27 , fetchFromGitHub , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "cachetools"; - version = "4.2.2"; + version = "4.2.3"; - disabled = isPy27; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "tkem"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JTm8ht2Ubn34uQLR0yjUjXSdDQggWfYUlS0T628OUoI="; + sha256 = "sha256-9CHXvb+Nn3N2oWHwNbqKguzDO/q+4EnMZ50+E+MWS/A="; }; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "cachetools" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix index 584067e102..8a1da0241c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.10072"; + version = "9.0.10159"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bsFfp1ocgHhe0/1wWwgnXDQm37gmWQylZvy6HiyQGSw="; + sha256 = "sha256-0I3ITMCOuYm5fmmnQN+zy9lunvfsLb1qlUzSOnPGwlQ="; }; # Use upstream z3 implementation diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix index c5dea6ece1..7cdfec13c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.10072"; + version = "9.0.10159"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uY0Pp+BssnkQvF8fsVlRW2Wj/JmMBSBudDf9AHekBtw="; + sha256 = "sha256-DkddaVmSIQToF5b7uj+96vCSZU0cJdfqIDSwDIFEEyI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix index d99f66943d..fceab5088e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { pname = "cloudsplaining"; version = "0.4.5"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -44,7 +45,19 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "cloudsplaining" ]; + postPatch = '' + # Ignore pinned versions + sed -i "s/'\(.*\)\(==\|>=\).*'/'\1'/g" requirements.txt + ''; + + disabledTests = [ + "test_policy_expansion" + "test_statement_details_for_allow_not_action" + ]; + + pythonImportsCheck = [ + "cloudsplaining" + ]; meta = with lib; { description = "Python module for AWS IAM security assessment"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crownstone-cloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crownstone-cloud/default.nix new file mode 100644 index 0000000000..94e6219264 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/crownstone-cloud/default.nix @@ -0,0 +1,50 @@ +{ lib +, aiohttp +, asynctest +, buildPythonPackage +, fetchFromGitHub +, certifi +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "crownstone-cloud"; + version = "1.4.5"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "crownstone"; + repo = "crownstone-lib-python-cloud"; + rev = "v${version}"; + sha256 = "1a8bkqkrc7iyggr5rr20qdqg67sycdx2d94dd1ylkmr7627r34ys"; + }; + + propagatedBuildInputs = [ + aiohttp + asynctest + certifi + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "codecov>=2.1.10" "" + ''; + + pythonImportsCheck = [ + "crownstone_cloud" + ]; + + meta = with lib; { + description = "Python module for communicating with Crownstone Cloud and devices"; + homepage = "https://github.com/crownstone/crownstone-lib-python-cloud"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crownstone-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crownstone-core/default.nix new file mode 100644 index 0000000000..35289cf195 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/crownstone-core/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyaes +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "crownstone-core"; + version = "3.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "crownstone"; + repo = "crownstone-lib-python-core"; + rev = version; + sha256 = "138lignv7c8kkqbqfkdcfpg39gm9x44h7r2j403m4ib7gq420hsn"; + }; + + propagatedBuildInputs = [ + pyaes + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "crownstone_core" + ]; + + meta = with lib; { + description = "Python module with shared classes, util functions and definition of Crownstone"; + homepage = "https://github.com/crownstone/crownstone-lib-python-core"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crownstone-sse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crownstone-sse/default.nix new file mode 100644 index 0000000000..ef2e2cbc24 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/crownstone-sse/default.nix @@ -0,0 +1,44 @@ +{ lib +, aiohttp +, asynctest +, buildPythonPackage +, certifi +, fetchFromGitHub +, pythonOlder +, coverage +}: + +buildPythonPackage rec { + pname = "crownstone-sse"; + version = "2.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "crownstone"; + repo = "crownstone-lib-python-sse"; + rev = version; + sha256 = "0rrr92j8pi5annrfa22k1hggsyyacl9asi9i8yrj4jqdjvwjn2gc"; + }; + + propagatedBuildInputs = [ + aiohttp + asynctest + certifi + ]; + + # Tests are only providing coverage + doCheck = false; + + pythonImportsCheck = [ + "crownstone_sse" + ]; + + meta = with lib; { + description = "Python module for listening to Crownstone SSE events"; + homepage = "https://github.com/crownstone/crownstone-lib-python-sse"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crownstone-uart/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crownstone-uart/default.nix new file mode 100644 index 0000000000..fd1c209433 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/crownstone-uart/default.nix @@ -0,0 +1,41 @@ +{ lib +, crownstone-core +, buildPythonPackage +, pyserial +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "crownstone-uart"; + version = "2.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "crownstone"; + repo = "crownstone-lib-python-uart"; + rev = version; + sha256 = "0sdz131vmrfp6hrm9iwqw8mj9qazsxg7b85yadib1122w9f3b1zc"; + }; + + propagatedBuildInputs = [ + crownstone-core + pyserial + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "crownstone_uart" + ]; + + meta = with lib; { + description = "Python module for communicating with Crownstone USB dongles"; + homepage = "https://github.com/crownstone/crownstone-lib-python-uart"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dogtail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dogtail/default.nix index 808c2916dd..fb513a20c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dogtail/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dogtail/default.nix @@ -19,6 +19,8 @@ buildPythonPackage { pname = "dogtail"; version = "0.9.11"; + outputs = [ "out" "dev" ]; + # https://gitlab.com/dogtail/dogtail/issues/1 # src = fetchPypi { # inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix index e53346510d..b434a92923 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vZ6wcJ9OEN1v3bMv0HiKGQtDRCbCWL5uAO9A2hNtdo0="; + sha256 = "sha256-XsJ7lCs00EVZy/NnRDC7g/w9dOfTK4u9McRGbnF0C4M="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix index 45d6044b8e..b612a58c4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.18.0"; + version = "2.25.0"; src = fetchPypi { inherit pname version; - sha256 = "a25661ec6cf4c159f41fe9c061c2bee31b2dddaf2ad787e23617048a25b53842"; + sha256 = "sha256-dNgF7xC4sfWL04U53T0D+vEYj2TuPKQorAQtU59fVcc="; }; # No tests included in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 940d04e5a4..1d23af5a3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.4.5"; + version = "0.4.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SrWObD3GzPES+SH8ztQOVCb7omZ2iYbqUCIoSIJ26ro="; + sha256 = "sha256-qQoHL2mT8sMnBnv2UnAEY4TNpajssguU6ppofx8jOno="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix index c10e3807f2..69cd266250 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "2.0.1"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6hrwULPgbrc+RHD3BNIwBzB7wOh8E+AV9rkEYPFAe9M="; + sha256 = "sha256-KAD2360pxs7V+vnKDDjqi6Hr4lWbEMApvQIePeMwFic="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index 8f95705309..0bfd6945b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "0.1.5"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "9d31647238a8ee05abd0a860bf333ccdda3d6540059fbf3c75c28cf58ee8dc4e"; + sha256 = "f10760c7df7052e63a79547b36fb439ab8a0f72fe28ff8356a0755c45ab75412"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix index 18c427a75f..cceda84be1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.6.0"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "4aa14659d1b406d98b7d39f5d7b9399c4eaeb0c0b9f669fe51a5ac45a28b784e"; + sha256 = "sha256-ug96Nj50fg29QHVCD95Cs+bFDnObqAiAdXh4l4qPT/k="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix index f7a5673573..98ff29921d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.4.2"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-c3zlpCejXB/RO8RnyFUpDknefpoMZWXWgaS7ACpqdAw="; + sha256 = "c360f40f4c63e16ae6dfe701892bb74a1055169e58f1ef39136809eecf73264e"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index a89c7eba69..9caa65ae1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.3.4"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "e0beee002f435236bf8026872ce34bd03c9d4f91467c79fc5e7cde591bd15596"; + sha256 = "672a86089093e94ccbb3f95dd315f1152ecd239cfab49e1963d217929bab3bcc"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 9e46a9ecf3..60aea98d9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "0.2.2"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "2dc15be4fdcd574c23124bfc0a678c864581038c96b86275c7b41d9fced06534"; + sha256 = "a85d11c28733792ee55218fce7786f51fdd013c79ff1d92531ffd50a8a51692c"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 89d0c1f873..b96d61bf67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.26.0"; + version = "2.28.1"; src = fetchPypi { inherit pname version; - sha256 = "15ca1f9c8165b584c2d593620354cd3b17c007e87cfd1abd1eebd2c08eb5d109"; + sha256 = "sha256-DiNT2X5SktyM5URHtxL7nolJbnFLXKz8PVNmFNHEYdw="; }; propagatedBuildInputs = [ @@ -53,7 +53,7 @@ buildPythonPackage rec { # requires credentials "test_bigquery_magic" "TestBigQuery" - "test_query_retry_539" + "test_arrow_extension_types_same_for_storage_and_REST_APIs_894" "test_query_retry_539" "test_list_rows_empty_table" "test_list_rows_page_size" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix index 15f496c991..39358062fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.8.1"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "dc0302b1fa4a435ffd97c13d669ed5b1a60c5a0a21d5528418466ca54d0cd4d5"; + sha256 = "2454e8dd93093fe6f6ec8e6771f8a7dab19f1d02c629dbbe8972e84b5d9c01e0"; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix index a51ed38402..657fe314b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kO6ZZIzPnhGhZ4Gn/FjRPlj2YrQ5xzfUjCTvGGYsJwI="; + sha256 = "sha256-NaH18CqG4PouKMZp8NtKdtkoZxoo+7u0k6tZup0cuak="; }; propagatedBuildInputs = [ google-api-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 6e9bf1aa29..74410ea129 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.4.2"; + version = "3.4.3"; src = fetchPypi { inherit pname version; - sha256 = "f16ff1bb49ff760cdc0ff30bbc352f0c27b8bdd2ba76d8bf22e0fd9af3a2ca16"; + sha256 = "1b0f7bb8aaf8a3e0f4b4509808ee9e1de77b5f076214b0b3e52e0ce86734fd84"; }; propagatedBuildInputs = [ libcst google-api-core grpc-google-iam-v1 proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 718c5998a3..1ea514ef9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "2.5.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wRGIuut2mJ6RJh8fRUAT0JDmnUreQYXhgVgsfRxvyxo="; + sha256 = "sha256-a81HBeNoLXSpJJJ0BBqJz24ls0TFMwiHJgkkNyHZGvo="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; @@ -30,12 +30,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "google.cloud.dataproc" "google.cloud.dataproc_v1" - "google.cloud.dataproc_v1beta2" ]; meta = with lib; { description = "Google Cloud Dataproc API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-dataproc"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix index a433ccdc69..f4b6301f21 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -7,19 +7,20 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pytz , mock }: buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.2.2"; + version = "3.2.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZxGWTsqCIvpTSN+aThVgjPuMJE7hHMVn4zsidpXk7xk="; + sha256 = "sha256-5Z4/jUXyBlC1vpuwS7dPrTRFw1lqf+GGjm2fqFfIOjQ="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ]; checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix index 05b2d954c4..3ce93893a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-dns"; - version = "0.33.1"; + version = "0.34.0"; src = fetchPypi { inherit pname version; - sha256 = "e4aa73fc6ca22764fd7294de19b602dff084d924c77366c136fb9c28e70ae739"; + sha256 = "bd75d6e9fd456ce643ee936a113a1ead5405704515caa679db30d7f036e447f3"; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index e9bf6f82d0..3e1a1c93bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.2.3"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "5a7d742ab1c94525a68c75c94ccb7af3f19759627ebe7869fe16db158f0eba4e"; + sha256 = "a5482a7b05ac3be13a3d96db32d158cb4cebf0ac35c82c3a27ee2fd9aa0dcc25"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix index f476dcea7a..50a08e66f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.3.3"; + version = "2.3.4"; src = fetchPypi { inherit pname version; - sha256 = "ef7572cbc83412dbc9cadd95962e77bfa9962a5cb030706638a4aafa7cad84aa"; + sha256 = "sha256-cU4bwfxRAp14qmSTO+8u/APa7clWXqeeyRuEOwUgFuw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix index 702deeb6eb..da0fab4ce9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.3.2"; + version = "2.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c59ceebe2ff5d45a7367ddbe1a702bbbb010d6d3423d278797835d59e885fa50"; + sha256 = "c5002e29febdd6c63a842e30709fa597742dae82181d8b062fe849d7d638047c"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix index 2264cb7482..3cba24e12b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.6.1"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "ccf90b2a14098258648364dc16a0a58a3d281b8c7c6050fb9c05640c3809e7bb"; + sha256 = "sha256-4RQCpgJ+QkTgNAu/9rJmnA0wxOUm3HeAEDLWBbMMuSo="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix index 140f5be3cf..ec3125926d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.2.2"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-X8lh+90HyyktxgJiRaiJF9ExKHmgiVcQiYDotg3AqaQ="; + sha256 = "feb7e04fc1e70ca6faf1b0b517ff1be644125283c54b24dd698f985afde6a2bf"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 938c97689a..1ebb1fa633 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.5.1"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "f8b3842fd11965a3872622988359a21bff62bd1b7b9be3ccf095b7ae2f4c796f"; + sha256 = "47feb2e635ef79af98696eb22a5af1db8a78b3a2919e39bdec65ba45659b59ac"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 95142cc6a5..f96ce0a8f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.0.2"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "e5489dffc6b6558125e548bc8c5be78f13d11bb9916470992816e6ed66a9d7fb"; + sha256 = "8ad50ce9145c3b477536752785635295c318b2b123bc9d251020cc1cfe98b131"; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix index 5dc2f5eead..8b9f98a1b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.5.1"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "4dc498d6fede223049c415f301ba1129ecaf628f31a77ae87d2678e6d71556f6"; + sha256 = "204ecbe480e5e5abc17752ac2ac17877e0325f31ed7e57f019724c3041ecc1fa"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix index 6ee8ccc3e9..94a1a5e342 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.2.3"; + version = "2.2.4"; src = fetchPypi { inherit pname version; - sha256 = "2a95ad2d99cfc480513bfaf6b301829446a0f50503d07f54524873d723e585b7"; + sha256 = "sha256-3gbCBb+jnz4hE2T02JsSGxoFSIVg2UDTOaRMKCXh1vg="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 91a1e354ac..fb581ee0c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.32.6"; + version = "0.33.0"; src = fetchPypi { inherit pname version; - sha256 = "3f333aa1f6a47cb5a38f3416c4ac9a4bbeaceeb1f3f2381fef9553c9fb665cc7"; + sha256 = "cc85e5de7cdb58a27561885021ee6fcf1d9f89e0f0db7c371bdca9c54788dd15"; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 74fb1f1e01..404a515299 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "5ac6bad2506d21e9176dcc1afd74cd9c87209c40e85cd2a03bb0421f76b7fa77"; + sha256 = "7321a88191d61ca0cc720b7ad07d9693e07726728492739930562bcd33ec1494"; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix index 90ec3078d2..849f1ea6ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.9.3"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "52b8a056f26e9ed082576b7b173c9a86f286a12c2883ec7cf5a0e8be68020bac"; + sha256 = "bc85ae6694c9a1e02046364776b9f2401a3826ddc7b532b32c316559ff4f1afa"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix index be3abb3637..5ad4c2a31f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.42.1"; + version = "1.42.3"; src = fetchPypi { inherit pname version; - sha256 = "b37ec5b0cd69aacb09270674c4c14873898cbc77624d17fef41ec0cb08004866"; + sha256 = "sha256-d1TU3KpFl1UUtATs4NortCkqy8Z8pVmmnhKhnVT82wY="; }; propagatedBuildInputs = [ @@ -56,9 +56,12 @@ buildPythonPackage rec { "tests/system/test_kms_integration.py" ]; - # prevent google directory from shadowing google imports preCheck = '' + # prevent google directory from shadowing google imports rm -r google + + # requires docker and network + rm tests/conformance/test_conformance.py ''; pythonImportsCheck = [ "google.cloud.storage" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix index 138637d70a..45999fb332 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.5.2"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "af870971187b3d58fc87a81323cabec1628fac910c6af82076dd6270b111f17e"; + sha256 = "fd9fe318063ec0f7e4e1780aca81a798d3e90e8def1c24b6f450ea1a8c131c0a"; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 201e0ce821..9adb5df959 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.5.3"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "2672f5caf518105fe9389269efd59a0761ad48b8140e68bac3f6a5062be9d8a4"; + sha256 = "d24dec1ee71bb63a7f6805b2d78923b2325de59407b4688978b7769bbafc3eb8"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix index 697489602d..ced6464860 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.4.0"; + version = "3.4.1"; src = fetchPypi { inherit pname version; - sha256 = "7da158734db646867deb125c144a7a1692a48a134692c4dc54ba420f89db64ae"; + sha256 = "sha256-cxuLaZ4cBdsWsyfRqb4NJ1+RWZSJhvTTclYF9uy6QM4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 942c100a59..e405c43e90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.3.3"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "bb3a98b5b8044be80c5fdbd76e7acd9b9bdd6026729a53eae9692a9a6c6683ef"; + sha256 = "92dd4f1e87b02ab414ad744eefa321e079358527cb8c352e1054ae1dab5f1055"; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix index b3952f222f..23698885ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.4.3"; + version = "2.4.4"; src = fetchPypi { inherit pname version; - sha256 = "4a7b1c025baedae220abef612dc01b822665e5db83d680d9a31be4e0a8490e3a"; + sha256 = "sha256-RqFvdF4sYDTgz0uZfqOn1trcSQX6qrbUH89957zbUoU="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix index 6c946b8262..8d3d4f240b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix @@ -43,7 +43,14 @@ buildPythonPackage rec { }) ]; - pythonImportsCheck = [ "gvmtools" ]; + disabledTests = [ + # Don't test sending + "SendTargetTestCase" + ]; + + pythonImportsCheck = [ + "gvmtools" + ]; meta = with lib; { description = "Collection of APIs that help with remote controlling a Greenbone Security Manager"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix index 1b4996f4cb..a95d4816c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.14.5"; + version = "1.14.6"; src = fetchPypi { inherit pname version; - sha256 = "268e07c09012d24233d8957f0207b9aec33000b639e661ca50e68458d735e6be"; + sha256 = "3a25c4fe3195fdc4639461abbfa5a8bebce8ab737674b6673da2236a901cfefd"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix index 2eedaaece6..3381663158 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { "-DOPENCOLLADA_LIBRARY_DIR=${opencollada}/lib/opencollada" "-DSWIG_EXECUTABLE=${swig}/bin/swig" "-DLIBXML2_INCLUDE_DIR=${libxml2.dev}/include/libxml2" - "-DLIBXML2_LIBRARIES=${libxml2.out}/lib/${if stdenv.isDarwin then "libxml2.dylib" else "libxml2.so"}" + "-DLIBXML2_LIBRARIES=${libxml2.out}/lib/libxml2${stdenv.hostPlatform.extensions.sharedLibrary}" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix index 3e36b4dd8e..fc1cb34d32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix @@ -1,4 +1,10 @@ -{ buildPythonPackage, lib, fetchFromGitHub, isPy27, nixosTests, fetchpatch, fetchPypi +{ buildPythonPackage +, lib +, fetchFromGitHub +, isPy27 +, nixosTests +, fetchpatch +, fetchPypi , alembic , aniso8601 , Babel @@ -12,7 +18,6 @@ , flask_mail , flask_migrate , flask-restful -, flask_script , flask_sqlalchemy , flask_wtf , debts @@ -25,7 +30,9 @@ , pytz , six , sqlalchemy +, sqlalchemy-utils , sqlalchemy-continuum +, sqlalchemy-i18n , werkzeug , wtforms , psycopg2 # optional, for postgresql support @@ -36,6 +43,7 @@ # ihatemoney is not really a library. It will only ever be imported # by the interpreter of uwsgi. So overrides for its depencies are fine. let + # fixed in next release, but patches don't apply # https://github.com/spiral-project/ihatemoney/issues/567 pinned_wtforms = wtforms.overridePythonAttrs (old: rec { pname = "WTForms"; @@ -45,7 +53,19 @@ let sha256 = "0q9vkcq6jnnn618h27lx9sas6s9qlg2mv8ja6dn0hy38gwzarnqc"; }; }); - pinned_flask_wtf = flask_wtf.override { wtforms = pinned_wtforms; }; + + # sqlalchemy-continuum requires sqlalchemy < 1.4 + pinned_sqlalchemy = sqlalchemy.overridePythonAttrs ( + old: rec { + pname = "SQLAlchemy"; + version = "1.3.24"; + + src = fetchPypi { + inherit pname version; + sha256 = "06bmxzssc66cblk1hamskyv5q3xf1nh1py3vi6dka4lkpxy7gfzb"; + }; + } + ); in buildPythonPackage rec { @@ -73,6 +93,9 @@ buildPythonPackage rec { url = "https://github.com/spiral-project/ihatemoney/commit/8d77cf5d5646e1d2d8ded13f0660638f57e98471.patch"; sha256 = "0y855sk3qsbpq7slj876k2ifa1lccc2dccag98pkyaadpz5gbabv"; }) + # backported from current master + # remove dependency on flask-script, which removed support on some features ihm used to need + ./remove_flask_script.patch ]; postPatch = '' @@ -81,7 +104,6 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - alembic aniso8601 Babel blinker @@ -92,11 +114,18 @@ buildPythonPackage rec { flask-babel flask-cors flask_mail - flask_migrate + ( + flask_migrate.override { + flask_sqlalchemy = flask_sqlalchemy.override { + sqlalchemy = pinned_sqlalchemy; + }; + alembic = alembic.override { + sqlalchemy = pinned_sqlalchemy; + }; + } + ) flask-restful - flask_script - flask_sqlalchemy - pinned_flask_wtf + (flask_wtf.override { wtforms = pinned_wtforms; }) idna itsdangerous jinja2 @@ -105,8 +134,29 @@ buildPythonPackage rec { python-dateutil pytz six - sqlalchemy - sqlalchemy-continuum + ( + ( + sqlalchemy-continuum.override { + sqlalchemy = pinned_sqlalchemy; + sqlalchemy-utils = sqlalchemy-utils.override { + sqlalchemy = pinned_sqlalchemy; + }; + sqlalchemy-i18n = sqlalchemy-i18n.override { + sqlalchemy = pinned_sqlalchemy; + sqlalchemy-utils = sqlalchemy-utils.override { + sqlalchemy = pinned_sqlalchemy; + }; + }; + flask_sqlalchemy = flask_sqlalchemy.override { + sqlalchemy = pinned_sqlalchemy; + }; + } + ).overridePythonAttrs ( + old: { + doCheck = false; + } + ) + ) werkzeug pinned_wtforms psycopg2 @@ -114,7 +164,8 @@ buildPythonPackage rec { ]; checkInputs = [ - flask_testing pytestCheckHook + flask_testing + pytestCheckHook ]; pytestFlagsArray = [ "--pyargs ihatemoney.tests.tests" ]; @@ -134,5 +185,3 @@ buildPythonPackage rec { maintainers = [ maintainers.symphorien ]; }; } - - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/remove_flask_script.patch b/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/remove_flask_script.patch new file mode 100644 index 0000000000..dac59680a0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/remove_flask_script.patch @@ -0,0 +1,284 @@ +commit 4d831ba2316d54f4916fb9d1160ec7a3856b47d4 +Author: Glandos +Date: Sun Jun 6 14:30:52 2021 +0200 + + remove usage of Flask-Script + + Use flask.cli instead with compatibility layer for existing commands, + such as "runserver". + + cherry-pick from 74e222f1a1cbfc2fac102fefc1115e9d0a6586dc + +diff --git a/Makefile b/Makefile +index a681709..90ab1bb 100644 +--- a/Makefile ++++ b/Makefile +@@ -38,7 +38,7 @@ update: remove-install-stamp install ## Update the dependencies + .PHONY: serve + serve: install ## Run the ihatemoney server + @echo 'Running ihatemoney on http://localhost:5000' +- $(PYTHON) -m ihatemoney.manage runserver ++ $(PYTHON) -m ihatemoney.manage run + + .PHONY: test + test: install-dev ## Run the tests +diff --git a/docs/installation.rst b/docs/installation.rst +index 4994499..4df70a2 100644 +--- a/docs/installation.rst ++++ b/docs/installation.rst +@@ -59,7 +59,7 @@ Test it + + Once installed, you can start a test server:: + +- ihatemoney runserver ++ ihatemoney run + + And point your browser at `http://localhost:5000 `_. + +diff --git a/ihatemoney/manage.py b/ihatemoney/manage.py +index a192844..805a07f 100755 +--- a/ihatemoney/manage.py ++++ b/ihatemoney/manage.py +@@ -5,8 +5,8 @@ import os + import random + import sys + +-from flask_migrate import Migrate, MigrateCommand +-from flask_script import Command, Manager, Option ++import click ++from flask.cli import FlaskGroup + from werkzeug.security import generate_password_hash + + from ihatemoney.models import Project, db +@@ -14,31 +14,48 @@ from ihatemoney.run import create_app + from ihatemoney.utils import create_jinja_env + + +-class GeneratePasswordHash(Command): ++@click.group(cls=FlaskGroup, create_app=create_app) ++def cli(): ++ """IHateMoney Management script""" + +- """Get password from user and hash it without printing it in clear text.""" + +- def run(self): +- password = getpass.getpass(prompt="Password: ") +- print(generate_password_hash(password)) +- +- +-class GenerateConfig(Command): +- def get_options(self): +- return [ +- Option( +- "config_file", +- choices=[ +- "ihatemoney.cfg", +- "apache-vhost.conf", +- "gunicorn.conf.py", +- "supervisord.conf", +- "nginx.conf", +- ], +- ) ++@cli.command( ++ context_settings={"ignore_unknown_options": True, "allow_extra_args": True} ++) ++@click.pass_context ++def runserver(ctx): ++ """Deprecated, use the "run" command instead""" ++ click.secho( ++ '"runserver" is deprecated, please use the standard "run" flask command', ++ fg="red", ++ ) ++ run = cli.get_command(ctx, "run") ++ ctx.forward(run) ++ ++ ++@click.command(name="generate_password_hash") ++def password_hash(): ++ """Get password from user and hash it without printing it in clear text.""" ++ password = getpass.getpass(prompt="Password: ") ++ print(generate_password_hash(password)) ++ ++ ++@click.command() ++@click.argument( ++ "config_file", ++ type=click.Choice( ++ [ ++ "ihatemoney.cfg", ++ "apache-vhost.conf", ++ "gunicorn.conf.py", ++ "supervisord.conf", ++ "nginx.conf", + ] ++ ), ++) ++def generate_config(config_file): ++ """Generate front-end server configuration""" + +- @staticmethod + def gen_secret_key(): + return "".join( + [ +@@ -49,59 +66,33 @@ class GenerateConfig(Command): + ] + ) + +- def run(self, config_file): +- env = create_jinja_env("conf-templates", strict_rendering=True) +- template = env.get_template("%s.j2" % config_file) ++ env = create_jinja_env("conf-templates", strict_rendering=True) ++ template = env.get_template(f"{config_file}.j2") + +- bin_path = os.path.dirname(sys.executable) +- pkg_path = os.path.abspath(os.path.dirname(__file__)) ++ bin_path = os.path.dirname(sys.executable) ++ pkg_path = os.path.abspath(os.path.dirname(__file__)) + +- print( +- template.render( +- pkg_path=pkg_path, +- bin_path=bin_path, +- sys_prefix=sys.prefix, +- secret_key=self.gen_secret_key(), +- ) ++ print( ++ template.render( ++ pkg_path=pkg_path, ++ bin_path=bin_path, ++ sys_prefix=sys.prefix, ++ secret_key=gen_secret_key(), + ) +- +- +-class DeleteProject(Command): +- def run(self, project_name): +- demo_project = Project.query.get(project_name) +- db.session.delete(demo_project) ++ ) ++ ++ ++@cli.command() ++@click.argument("project_name") ++def delete_project(project_name): ++ """Delete a project""" ++ project = Project.query.get(project_name) ++ if project is None: ++ click.secho(f'Project "{project_name}" not found', fg="red") ++ else: ++ db.session.delete(project) + db.session.commit() + + +-def main(): +- QUIET_COMMANDS = ("generate_password_hash", "generate-config") +- +- exception = None +- backup_stderr = sys.stderr +- # Hack to divert stderr for commands generating content to stdout +- # to avoid confusing the user +- if len(sys.argv) > 1 and sys.argv[1] in QUIET_COMMANDS: +- sys.stderr = open(os.devnull, "w") +- +- try: +- app = create_app() +- Migrate(app, db) +- except Exception as e: +- exception = e +- +- # Restore stderr +- sys.stderr = backup_stderr +- +- if exception: +- raise exception +- +- manager = Manager(app) +- manager.add_command("db", MigrateCommand) +- manager.add_command("generate_password_hash", GeneratePasswordHash) +- manager.add_command("generate-config", GenerateConfig) +- manager.add_command("delete-project", DeleteProject) +- manager.run() +- +- + if __name__ == "__main__": +- main() ++ cli() +diff --git a/ihatemoney/tests/tests.py b/ihatemoney/tests/tests.py +index b27fafc..23f19a6 100644 +--- a/ihatemoney/tests/tests.py ++++ b/ihatemoney/tests/tests.py +@@ -15,7 +15,7 @@ from sqlalchemy import orm + from werkzeug.security import check_password_hash, generate_password_hash + + from ihatemoney import history, models, utils +-from ihatemoney.manage import DeleteProject, GenerateConfig, GeneratePasswordHash ++from ihatemoney.manage import delete_project, generate_config, password_hash + from ihatemoney.run import create_app, db, load_configuration + from ihatemoney.versioning import LoggingMode + +@@ -2157,28 +2157,24 @@ class CommandTestCase(BaseTestCase): + - raise no exception + - produce something non-empty + """ +- cmd = GenerateConfig() +- for config_file in cmd.get_options()[0].kwargs["choices"]: +- with patch("sys.stdout", new=io.StringIO()) as stdout: +- cmd.run(config_file) +- print(stdout.getvalue()) +- self.assertNotEqual(len(stdout.getvalue().strip()), 0) ++ runner = self.app.test_cli_runner() ++ for config_file in generate_config.params[0].type.choices: ++ result = runner.invoke(generate_config, config_file) ++ self.assertNotEqual(len(result.output.strip()), 0) + + def test_generate_password_hash(self): +- cmd = GeneratePasswordHash() +- with patch("sys.stdout", new=io.StringIO()) as stdout, patch( +- "getpass.getpass", new=lambda prompt: "secret" +- ): # NOQA +- cmd.run() +- print(stdout.getvalue()) +- self.assertEqual(len(stdout.getvalue().strip()), 189) ++ runner = self.app.test_cli_runner() ++ with patch("getpass.getpass", new=lambda prompt: "secret"): ++ result = runner.invoke(password_hash) ++ print(result.output.strip()) ++ self.assertEqual(len(result.output.strip()), 102) + + def test_demo_project_deletion(self): + self.create_project("demo") + self.assertEquals(models.Project.query.get("demo").name, "demo") + +- cmd = DeleteProject() +- cmd.run("demo") ++ runner = self.app.test_cli_runner() ++ runner.invoke(delete_project, "demo") + + self.assertEqual(len(models.Project.query.all()), 0) + +diff --git a/setup.cfg b/setup.cfg +index d493717..48e447c 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -31,7 +31,6 @@ install_requires = + Flask-Mail==0.9.1 + Flask-Migrate==2.5.3 + Flask-RESTful==0.3.8 +- Flask-Script==2.0.6 + Flask-SQLAlchemy==2.4.1 + Flask-WTF==0.14.3 + WTForms==2.2.1 +@@ -51,8 +50,12 @@ dev = + zest.releaser==6.20.1 + + [options.entry_points] ++flask.commands = ++ generate_password_hash = ihatemoney.manage:password_hash ++ generate-config = ihatemoney.manage:generate_config ++ + console_scripts = +- ihatemoney = ihatemoney.manage:main ++ ihatemoney = ihatemoney.manage:cli + + paste.app_factory = + main = ihatemoney.run:main diff --git a/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix index 204e3e93b8..48557d34bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "img2pdf"; - version = "0.4.1"; + version = "0.4.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-OKEinKhLIR13gtHWWtclGpeBvyT29kl8c4x1X8/tVVI="; + sha256 = "sha256-qs9YZQPWET5Tv7A8hcheVGw4RBOlbBXd0I7lHIZEeaI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix index b45b852f85..6979f84805 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "immutabledict"; - version = "2.2.0"; + version = "2.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "corenting"; repo = "immutabledict"; rev = "v${version}"; - sha256 = "sha256-Jf7ad3ImPfEvCBrUZ1NVXMCBqwLmd0hwpKfe9rVsehc="; + sha256 = "sha256-z04xxoCw0eBtkt++y/1yUsAPaLlAGUtWBdRBM74ul1c="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix index d884e7ff45..e3f09860e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "intensity-normalization"; - version = "2.0.2"; + version = "2.0.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f963e90671fec51d1b248862a9bcc4639c1d6d3b1dbc1ee34d042cb765d8730a"; + sha256 = "d6f2ac360f51f5314e690272cb26c454e6deab69ef48a7c650ea760247d1d4db"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lsassy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lsassy/default.nix index 19d9141a0d..7b550b2430 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lsassy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lsassy/default.nix @@ -4,28 +4,33 @@ , impacket , netaddr , pypykatz +, rich }: buildPythonPackage rec { pname = "lsassy"; - version = "2.1.5"; + version = "3.0.0"; src = fetchFromGitHub { owner = "Hackndo"; repo = pname; rev = "v${version}"; - sha256 = "15w12asy797dxsz57avbxy6dbi7va9p5jx6i3gm9df9mbj0j3lcc"; + sha256 = "sha256-75gs08QGjN5iUT4HQZZTSKi3vzNNKQvZR2JTObYNb7w="; }; propagatedBuildInputs = [ impacket netaddr pypykatz + rich ]; # Tests require an active domain controller doCheck = false; - pythonImportsCheck = [ "lsassy" ]; + + pythonImportsCheck = [ + "lsassy" + ]; meta = with lib; { description = "Python module to extract data from Local Security Authority Subsystem Service (LSASS)"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix index d16260dd57..96f333fcf8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix @@ -1,41 +1,41 @@ { lib , buildPythonPackage , fetchFromGitHub -, git -, poetry-core -, attrs -, future +, Logbook +, aiofiles , aiohttp , aiohttp-socks -, aiofiles +, aioresponses +, atomicwrites +, attrs +, cachetools +, faker +, future +, git , h11 , h2 -, Logbook -, jsonschema -, unpaddedbase64 -, pycryptodome -, python-olm -, peewee -, cachetools -, atomicwrites -, pytestCheckHook -, faker -, aioresponses , hypothesis +, jsonschema +, peewee +, poetry-core +, pycryptodome , pytest-aiohttp , pytest-benchmark +, pytestCheckHook +, python-olm +, unpaddedbase64 }: buildPythonPackage rec { pname = "matrix-nio"; - version = "0.18.3"; + version = "0.18.7"; format = "pyproject"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "1sjdqzlk8vgv0748ayhnadw1bip3i4bfga4knb94cfkd3s4rgb39"; + hash = "sha256-eti9kvfv3y7m+mJzcxftyn8OyVSd2Ehqd3eU2ezMV5Q="; }; postPatch = '' @@ -50,26 +50,26 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - attrs - future + Logbook + aiofiles aiohttp aiohttp-socks - aiofiles + atomicwrites + attrs + cachetools + future h11 h2 - Logbook jsonschema - unpaddedbase64 + peewee pycryptodome python-olm - peewee - cachetools - atomicwrites + unpaddedbase64 ]; checkInputs = [ - faker aioresponses + faker hypothesis pytest-aiohttp pytest-benchmark @@ -83,8 +83,8 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A Python Matrix client library, designed according to sans I/O principles"; homepage = "https://github.com/poljar/matrix-nio"; + description = "A Python Matrix client library, designed according to sans I/O principles"; license = licenses.isc; maintainers = with maintainers; [ tilpner emily symphorien ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/millheater/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/millheater/default.nix index 4ede1e9eca..7926b15711 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/millheater/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/millheater/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "millheater"; - version = "0.6.1"; + version = "0.6.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pymill"; rev = version; - sha256 = "sha256-cDj6lrGPeSWwuvVd00z12+EWaqDZOHpoRZSloalhni8="; + sha256 = "sha256-CG0hQN4m8EE+j5yUqODJX8/DLTVWS9tSPADSDHl6K9o="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 668ee057f1..17f3ff34ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.18.58"; + version = "1.18.60"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3e96a40314cd8c61b833f2f198179fb1056935c5349c5b4369432788a30ed098"; + sha256 = "4881fdbb41a74a15076c12285abd925a40e29d9f1b06d92b4d7cb12e8d208ae0"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 914fd4fa25..6142972c0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.1.0"; + version = "1.1.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-YfRPfOJ0uEBounRMSUHcjNASLBqEwS2nVJKbsfrSpGQ="; + sha256 = "sha256-OIB1d6XtstUr5P0q/dmyJS7+UbtkFQIiuSnzwcdP1mE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ospd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ospd/default.nix index 2c90a0e066..c4fe8be0b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ospd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ospd/default.nix @@ -6,7 +6,6 @@ , fetchFromGitHub , lxml , paramiko -, poetry , psutil , pytestCheckHook , pythonOlder @@ -14,8 +13,8 @@ buildPythonPackage rec { pname = "ospd"; - version = "21.4.3"; - format = "pyproject"; + version = "21.4.4"; + format = "setuptools"; disabled = pythonOlder "3.7" || stdenv.isDarwin; @@ -23,13 +22,9 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "v${version}"; - sha256 = "1i4nfvxgxibqmqb6jwih951960sm2zy00i1wnjfnwb6za1xkpbkp"; + sha256 = "sha256-dZgs+G2vJQIKnN9xHcNeNViG7mOIdKb+Ms2AKE+FC4M="; }; - nativeBuildInputs = [ - poetry - ]; - propagatedBuildInputs = [ defusedxml deprecated @@ -42,7 +37,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "ospd" ]; + pythonImportsCheck = [ + "ospd" + ]; meta = with lib; { description = "Framework for vulnerability scanners which support OSP"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix index a4e50d1d46..c3b34b1fc1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix @@ -3,27 +3,32 @@ , fetchPypi , isPy3k , setuptools -, pytest-cov , pytest }: buildPythonPackage rec { pname = "pglast"; - version = "3.6"; + version = "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1594d536137b888556b7187d25355ba88b3a14ef0d8aacccef15bfed74cf0af9"; + sha256 = "3f0f36cebdb68d5b3aaacb11cbf09db44250194845fbf3b49b0aef93c30991bf"; }; disabled = !isPy3k; + # ModuleNotFoundError: No module named 'pkg_resources' propagatedBuildInputs = [ setuptools ]; - checkInputs = [ pytest pytest-cov ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=pglast --cov-report term-missing" "" + ''; - pythonImportsCheck = [ "pglast" ]; + checkInputs = [ pytest ]; + # pytestCheckHook doesn't work + # ImportError: cannot import name 'parse_sql' from 'pglast' checkPhase = '' pytest ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix index 8240e86af2..a9e3930f67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "policy-sentry"; - version = "0.11.16"; + version = "0.11.18"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "salesforce"; repo = "policy_sentry"; rev = version; - sha256 = "0m3sr1mhnmm22xgd3h9dgkrq20pdghwx505xld4pahj686z4bva2"; + sha256 = "sha256-1wpy4WofqrPusOI2BHRqSHfXlRpbuLOx97egzSAbB8E="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pooch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pooch/default.nix index d9c8dda135..3b7ddaf280 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pooch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pooch/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pooch"; - version = "1.5.1"; + version = "1.5.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "57ab0c43e9c5bd81227b08b9931435d71c118cd53339cc5925123a740f40b312"; + sha256 = "5969b2f1defbdc405df932767e05e0b536e2771c27f1f95d7f260bc99bf13581"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix index 373577dc46..fda11ef89e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pygobject"; - version = "3.40.1"; + version = "3.42.0"; outputs = [ "out" "dev" ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0d80g5kgf2i9cginyhalvb7ibfk9g30yilqzmcsw6h6byj8xbih0"; + sha256 = "mxJhbjLPx5L53IQdnEcqQaNbhbpn06brQn4wem/kNns="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix index 751bd79649..36f4f43446 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyhaversion"; - version = "21.10.1"; + version = "21.10.0"; # Only 3.8.0 and beyond are supported disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-7J7zzJlevNQb7TpFYuGvsk3EWBgwhmV32xPNSLA/LS4="; + sha256 = "sha256-EvVkewFgkfYL6BjmJ/IWeuCyR+0R0ZxI35i9sxKcqxo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix index 31e01e83db..41cdcad203 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pysam"; - version = "0.16.0.1"; + version = "0.17.0"; # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is # missing some files which cause test failures. @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pysam-developers"; repo = "pysam"; rev = "v${version}"; - sha256 = "168bwwm8c2k22m7paip8q0yajyl7xdxgnik0bgjl7rhqg0majz0f"; + sha256 = "sha256-RDeBq6pwBGCBNIn8YOPQr96GuL6FKEYeLAPQD6XN0iE="; }; nativeBuildInputs = [ samtools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytautulli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytautulli/default.nix new file mode 100644 index 0000000000..32806004f7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytautulli/default.nix @@ -0,0 +1,52 @@ +{ lib +, aiohttp +, aresponses +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pytautulli"; + version = "21.10.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ludeeus"; + repo = pname; + rev = version; + sha256 = "1gi1jalwzf1aykvdmdbvr7hvfch9wbbjra87f1vzdmkb5iiirw01"; + }; + + postPatch = '' + # Upstream is releasing with the help of a CI to PyPI, GitHub releases + # are not in their focus + substituteInPlace setup.py \ + --replace 'version="main",' 'version="${version}",' + ''; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "pytautulli" ]; + + meta = with lib; { + description = "Python module to get information from Tautulli"; + homepage = "https://github.com/ludeeus/pytautulli"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix index 27b85215e6..5f3ff50d1a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix @@ -1,19 +1,18 @@ { lib , stdenv , buildPythonPackage +, defusedxml , fetchFromGitHub -, fetchpatch +, lxml +, paramiko , poetry-core , pytestCheckHook , pythonOlder -, paramiko -, lxml -, defusedxml }: buildPythonPackage rec { pname = "python-gvm"; - version = "21.6.0"; + version = "21.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "v${version}"; - sha256 = "070qpj2y7834i50lhkkbv93s77j91js06zs1bpbmplppiraxqmyz"; + sha256 = "sha256-6cNoeuB9449HB2/41VjazpSAGvaHmBjG/hqmBKX5FEA="; }; nativeBuildInputs = [ @@ -30,24 +29,15 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - paramiko - lxml defusedxml + lxml + paramiko ]; checkInputs = [ pytestCheckHook ]; - patches = [ - # Switch to poetry-core, https://github.com/greenbone/python-gvm/pull/552 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/greenbone/python-gvm/commit/e48afa614ba9cf69d9b22ce1a4642c625acbaa06.patch"; - sha256 = "0f5wfdymp5dcjk1xb7ynsf0g6idjg2ifwgggp4agic5nkh1k1inl"; - }) - ]; - disabledTests = [ # No running SSH available "test_connect_error" @@ -55,7 +45,9 @@ buildPythonPackage rec { "test_feed_xml_error" ]; - pythonImportsCheck = [ "gvm" ]; + pythonImportsCheck = [ + "gvm" + ]; meta = with lib; { description = "Collection of APIs that help with remote controlling a Greenbone Security Manager"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix index 9e44a6b151..39597afa85 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.2.3"; + version = "1.2.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "python-lsp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zoKJ9g7cXcQhickkhRjYwl6SqOar2Kautg5dHf3PqGk="; + sha256 = "0c1g46hpzjhqbjcmv6xm3by3jprcjhzjslqzrp95hdkbykvrgs5x"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix index 6ddc4543d3..e188a3ef86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -36,13 +36,15 @@ buildPythonPackage rec { rm -r telegram/vendor substituteInPlace requirements.txt \ - --replace 'APScheduler==3.6.3' 'APScheduler' + --replace "APScheduler==3.6.3" "APScheduler" \ + --replace "cachetools==4.2.2" "cachetools" ''; setupPyGlobalFlags = "--with-upstream-urllib3"; # tests not included with release doCheck = false; + pythonImportsCheck = [ "telegram" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytradfri/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytradfri/default.nix index e06a7e6813..5854c45a25 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytradfri/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytradfri/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pytradfri"; - version = "7.0.6"; + version = "7.0.7"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "pytradfri"; rev = version; - sha256 = "0ckh2waz3xpz51pmigg1q336igqvvkl2pzncszvblkwv38a0rj3a"; + sha256 = "sha256-gUaDPm1hq4SZm9beSbfdX0qGEGWGiq13UjchdN1+Kfc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index dc7c0c84b7..e8babafdf9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.10072"; + version = "9.0.10159"; src = fetchPypi { inherit pname version; - sha256 = "sha256-F6NUvcGYshPbfcfhkfbnzIxkXmfpAc/kfHFk5fuaICA="; + sha256 = "sha256-9I9gAPbazuPdZDyoXpjw0IrTu+97dwznoOnyBzkNNCw="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qualysclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qualysclient/default.nix new file mode 100644 index 0000000000..21708dd8e5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/qualysclient/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, certifi +, charset-normalizer +, fetchFromGitHub +, idna +, lxml +, pytest-mock +, pytestCheckHook +, pythonOlder +, requests +, responses +, urllib3 +}: + +buildPythonPackage rec { + pname = "qualysclient"; + version = "0.0.4.8.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "woodtechie1428"; + repo = pname; + rev = "v${version}"; + sha256 = "1fdcmspjm1cy53x9gm7frfq175saskcwn565zqprgxzfcigip1n3"; + }; + + propagatedBuildInputs = [ + certifi + charset-normalizer + idna + lxml + requests + urllib3 + ]; + + checkInputs = [ + pytest-mock + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ + "qualysclient" + ]; + + meta = with lib; { + description = "Python SDK for interacting with the Qualys API"; + homepage = "https://qualysclient.readthedocs.io/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix index fb767e5c46..1d7b4e95e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.6.2"; + version = "1.6.4"; postPatch = let r2lib = "${lib.getOutput "lib" radare2}/lib"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "088e1a0778f8021af90b9458c9b706ae3d303a3e6a5064e1ca25d4fd737dc3c7"; + sha256 = "a79877781b8e8e9bd5612faebd3991d75d7189f2941021d2adea9b4b4c5b9b7b"; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rangehttpserver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rangehttpserver/default.nix new file mode 100644 index 0000000000..217bffb174 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/rangehttpserver/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, requests +}: + +buildPythonPackage rec { + pname = "rangehttpserver"; + version = "1.2.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "danvk"; + repo = "RangeHTTPServer"; + rev = version; + sha256 = "1sy9j6y8kp5jiwv2vd652v94kspp1yd4dwxrfqfn6zwnfyv2mzv5"; + }; + + checkInputs = [ + nose + requests + ]; + + checkPhase = '' + runHook preCheck + nosetests + runHook postCheck + ''; + + pythonImportsCheck = [ + "RangeHTTPServer" + ]; + + meta = with lib; { + description = "SimpleHTTPServer with support for Range requests"; + homepage = "https://github.com/danvk/RangeHTTPServer"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/recommonmark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/recommonmark/default.nix index 8ad1e6f7df..48d92d43ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/recommonmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/recommonmark/default.nix @@ -10,14 +10,13 @@ buildPythonPackage rec { pname = "recommonmark"; - version = "0.6.0"; + version = "0.7.1"; - # PyPI tarball is missing some test files: https://github.com/rtfd/recommonmark/pull/128 src = fetchFromGitHub { owner = "rtfd"; repo = pname; rev = version; - sha256 = "0m6qk17irka448vcz5b39yck1qsq90k98dmkx80mni0w00yq9ggd"; + sha256 = "0kwm4smxbgq0c0ybkxfvlgrfb3gq9amdw94141jyykk9mmz38379"; }; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rxv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rxv/default.nix index 5f0653236a..728d56527b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rxv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rxv/default.nix @@ -1,40 +1,51 @@ { lib , buildPythonPackage -, fetchFromGitHub , defusedxml -, requests -, pytest -, requests-mock +, fetchFromGitHub , mock -, pytest-cov +, pytest-asyncio , pytest-timeout -, testtools +, pytest-vcr +, pytestCheckHook +, pythonOlder +, requests +, requests-mock }: buildPythonPackage rec { pname = "rxv"; - version = "0.6.0"; + version = "0.7.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "wuub"; repo = pname; - # Releases are not tagged - rev = "9b586203665031f93960543a272bb1a8f541ed37"; - sha256 = "1dw3ayrzknai2279bhkgzcapzw06rhijlny33rymlbp7irp0gvnj"; + rev = "v${version}"; + sha256 = "0jldnlzbfg5jm1nbgv91mlvcqkswd9f2n3qj9aqlbmj1cxq19yz8"; }; - propagatedBuildInputs = [ defusedxml requests ]; + propagatedBuildInputs = [ + defusedxml + requests + ]; - checkInputs = [ pytest requests-mock mock pytest-cov pytest-timeout testtools ]; - checkPhase = '' - pytest - ''; + checkInputs = [ + mock + pytest-asyncio + pytest-timeout + pytest-vcr + pytestCheckHook + requests-mock + ]; + + pythonImportsCheck = [ "rxv" ]; meta = with lib; { - description = "Automation Library for Yamaha RX-V473, RX-V573, RX-V673, RX-V773 receivers"; + description = "Python library for communicate with Yamaha RX-Vxxx receivers"; homepage = "https://github.com/wuub/rxv"; license = licenses.mit; maintainers = with maintainers; [ flyfloh ]; }; } - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix index 95a649bf9a..32c6cc4f9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.59.8"; + version = "2.60.0"; src = fetchPypi { inherit pname version; - sha256 = "655cf9b86fdba71f505e809b97a63c5cd5973158578a141748db83c469e87d87"; + sha256 = "0fbd43343918137460eb1b563a81fe6de9b51c2ae4be0b844cf198c5567cd82e"; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix index 3b7106ac4f..5e87c58511 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "scikit-optimize"; - version = "0.8.1"; + version = "0.9.0"; disabled = isPy27; src = fetchFromGitHub { owner = "scikit-optimize"; repo = "scikit-optimize"; rev = "v${version}"; - sha256 = "1bz8gxccx8n99abw49j8h5zf3i568g5hcf8nz1yinma8jqhxjkjh"; + sha256 = "0hsq6pmryimxc275yrcy4bv217bx7ma6rz0q6m4138bv4zgq18d1"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simple-rest-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simple-rest-client/default.nix index b9b1cbe7b0..014f5d6ffa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simple-rest-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simple-rest-client/default.nix @@ -1,5 +1,4 @@ { lib -, asynctest , buildPythonPackage , fetchFromGitHub , httpx @@ -13,15 +12,15 @@ buildPythonPackage rec { pname = "simple-rest-client"; - version = "1.0.8"; + version = "1.1.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "allisson"; repo = "python-simple-rest-client"; rev = version; - sha256 = "12qxhrjhlbyyr1pkvwfkcxbsmyns5b0mfdn42vz310za5x76ldj3"; + sha256 = "sha256-i+wUc9qxyei+Jbch8vyIrm9ElClnOIKp+YK6jIDkbTA="; }; propagatedBuildInputs = [ @@ -31,7 +30,6 @@ buildPythonPackage rec { ]; checkInputs = [ - asynctest pytest-asyncio pytest-httpserver pytestCheckHook @@ -42,9 +40,17 @@ buildPythonPackage rec { --replace "pytest-runner" "" substituteInPlace pytest.ini \ --replace " --cov=simple_rest_client --cov-report=term-missing" "" + substituteInPlace requirements-dev.txt \ + --replace "asyncmock" "" ''; - pythonImportsCheck = [ "simple_rest_client" ]; + disabledTestPaths = [ + "tests/test_decorators.py" + ]; + + pythonImportsCheck = [ + "simple_rest_client" + ]; meta = with lib; { description = "Simple REST client for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx_rtd_theme/default.nix index f5ec90755c..1d890de94f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx_rtd_theme/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sphinx_rtd_theme"; - version = "0.5.2"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "32bd3b5d13dc8186d7a42fc816a23d32e83a4827d7d9882948e7b837c232da5a"; + sha256 = "0p3abj91c3l72ajj5jwblscsdf1jflrnn0djx2h5y6f2wjbx9ipf"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index 33b408240f..944a2cf08e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -41,5 +41,7 @@ buildPythonPackage rec { homepage = "https://github.com/kvesteri/sqlalchemy-continuum/"; description = "Versioning and auditing extension for SQLAlchemy"; license = licenses.bsd3; + # https://github.com/kvesteri/sqlalchemy-continuum/issues/255 + broken = lib.versionAtLeast sqlalchemy.version "1.4"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix index dc7aea0c3b..3d1a8f8af6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "structlog"; - version = "21.1.0"; + version = "21.2.0"; src = fetchPypi { inherit pname version; - sha256 = "d9d2d890532e8db83c6977a2a676fb1889922ff0c26ad4dc0ecac26f9fafbc57"; + sha256 = "7ac42b565e1295712313f91edbcb64e0840a9037d888c8954f11fa6c43270e99"; }; checkInputs = [ pytest pytest-asyncio pretend freezegun simplejson twisted ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix index 9b834fe5c5..943bbd22c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix @@ -31,12 +31,12 @@ buildPythonPackage rec { pname = "sunpy"; - version = "3.0.1"; + version = "3.0.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WpqkCAwDYb6L+W4VTC/1auGVbblnNYwBxbk+tZbAiBw="; + sha256 = "5dcd2c5cbf2f419da00abde00798d067b515c2f082ce63f4fbe1de47682c1c41"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix index 3b6869fbf9..8f6d86abdd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/systembridge/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "systembridge"; - version = "2.1.3"; + version = "2.2.0"; src = fetchFromGitHub { owner = "timmo001"; repo = "system-bridge-connector-py"; rev = "v${version}"; - sha256 = "1p0w1phmlifkag7inx8395g8li13r4b7dvgkpj6fysdi42glvvxp"; + sha256 = "sha256-VR5juaZdZaEo7S0XXJkspcKmH1alitNIWmI0g/dFBbM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix index f6b2f18073..b7b863101b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "zabuldon"; repo = pname; rev = "v${version}"; - sha256 = "1xkr0pmz458vh8b90ydykmgddhisay347vp48j50d1v0a55xvqsa"; + sha256 = "0pb0kgddyzpipa0sqrkwyg1jgh95726irb306lr0pyyg0rsk54k7"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-decorator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-decorator/default.nix index b0f857196d..631d4836d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-decorator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-decorator/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-decorator"; - version = "0.1.7"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0pmcc8xpsmij4174ky81vp811yxgic2lj1dfj2fa0ii87nlcfwhp"; + sha256 = "sha256-mavQDGFOVOde4I2IeZiGrMKRjMiJBeymR0upF7Mncps="; }; # Modules doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-futures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-futures/default.nix index 5e9ebe7fa7..845dab08d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-futures/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-futures/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "types-futures"; - version = "3.3.0"; + version = "3.3.1"; src = fetchPypi { inherit pname version; - sha256 = "1p00wb93af01b6fw9wxk9qm4kbhqwb48nszmm16slsrc1nx4px25"; + sha256 = "bbdad92cec642693bac10fbbecf834776009db7782d91dc293bdd123be73186d"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix index 5d9737c580..af8ef6d956 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "3.17.4"; + version = "3.17.5"; src = fetchPypi { inherit pname version; - sha256 = "0r42kzspqna2b2jiz9bjzagrd4gbh0sd6jp4v7i9nv09y0ifrkrn"; + sha256 = "f719a3f436a09d4a13411c9df1209e61b788dca64c6478fcd68e0ae5c5671283"; }; propagatedBuildInputs = [ types-futures ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix index 4b3f9c1726..a6139eb9c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2021.1.2"; + version = "2021.3.0"; src = fetchPypi { inherit pname version; - sha256 = "448828a06f2aaa840e57364d866c661645a045e532f817e4f10c8c3ab2b66651"; + sha256 = "sha256-hqYZZ4NNzuqvmLaQLtg1fv3SYruK/K9LyMzs90hZJ3g="; }; # Modules doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix index 464b0d5876..772ea06ad5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.25.9"; + version = "2.25.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Tsi3Hac+U0Stub7nJadOyFmOcob5vLF1ANYn8ln+T7k="; + sha256 = "sha256-PhIZiBaM/8+mHv+vSPkOvF7gI/bMUNBMAUTt16ImW2U="; }; # Modules doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix index dc12234192..cc6655a3b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "94cff37e03f89fc4c5e4b2d4c913c7d5d7450f5a205d14f709b39e0a4202be95"; + sha256 = "ce0abfc5909d06031dc612ec321d7f75df50bcb47a31e14e882a299cea2ea7a3"; }; propagatedBuildInputs = [ future python-dateutil six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index 46377a238b..650f09558c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.36.7"; + version = "0.36.8"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "sha256-jGbYd56JCXYUE4N2He5Ds8vVcgfny1kUYbd1rL7upcM="; + sha256 = "sha256-lsvrttfyUtQneUkQlWFpmQ99BSJp/YiVYUKY7AWh0rs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix index 5417f2b83a..977f05aea5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix @@ -8,9 +8,7 @@ , stdenv }: -let - node-api-lib = (if stdenv.isDarwin then "libquery_engine.dylib" else "libquery_engine.so"); -in rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "prisma-engines"; version = "3.2.0"; @@ -47,7 +45,7 @@ in rustPlatform.buildRustPackage rec { cargoBuildFlags = "-p query-engine -p query-engine-node-api -p migration-engine-cli -p introspection-core -p prisma-fmt"; postInstall = '' - mv $out/lib/${node-api-lib} $out/lib/libquery_engine.node + mv $out/lib/libquery_engine${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libquery_engine.node ''; # Tests are long to compile diff --git a/third_party/nixpkgs/pkgs/development/tools/documentation/gi-docgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/documentation/gi-docgen/default.nix index 2218b44147..7e8c61e1c8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/documentation/gi-docgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/documentation/gi-docgen/default.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "gi-docgen"; - version = "2021.5"; + version = "2021.7"; format = "other"; @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { owner = "GNOME"; repo = pname; rev = version; - sha256 = "1fz6r6mkp4fw1mn6gn9745wcdcqg7696bbwvdcnmhinlhrcnaiz6"; + sha256 = "i2s4JXg+D9sYq1QwVcDRLIr9qnRmzHC+cBInHv4SXHI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix index 4aca895c6a..5a70d57045 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix @@ -105,24 +105,24 @@ rec { headers = "1zkdgpjrh1dc9j8qyrrrh49v24960yhvwi2c530qbpf2azgqj71b"; }; - electron_12 = mkElectron "12.2.1" { - armv7l-linux = "7cad4f432655e3ac8b4b2f792648015f820f52abe4f2f489302de6d5a170d62a"; - aarch64-linux = "53f4397bf88f026f1a73919b6d1c74eb15b908283f93935801b76647530acd08"; - x86_64-linux = "a3e736c286f326eced0080f29a56b546c308716f4ce0d4f144adc37b530990ef"; - i686-linux = "be333c8fffb8adbf96b19b33f87e1cbe6ff8a36ecd0a5c48fa8352fed8850510"; - x86_64-darwin = "9a8e4fe8069e164fb2a87736bc9f9a1546a5c4060c499a92a7f9a95bd3c5c19d"; - aarch64-darwin = "e9844eeb0e2a26ba60a8eb1540f0d1c52069806c885842a33b45b4fd2b2bb187"; - headers = "1m1hcdb96rcxcdg812cn2m68bh1s1h6qyy39lmvkjvhbpyzd02pr"; + electron_12 = mkElectron "12.2.2" { + armv7l-linux = "aeee4acf40afa0397c10a4c76bc61ed2967433bab5c6f11de181fa33d0b168ff"; + aarch64-linux = "593a3fef97a7fed8e93b64d659af9c736dff445eedcbfd037f7d226a88d58862"; + x86_64-linux = "a8e88c67f375e41f3a6f8b8a8c3a1e41b8c0a46f1b731e05de21208caa005fb2"; + i686-linux = "5f0bdc9581237f2f87b5d34e232d711617bd8bf5ff5d7ebd66480779c13fba0a"; + x86_64-darwin = "8a33d2bed668e30a6d64856e01d2aa3b1f1d9efe4eb0e808e916694d32d5e8f2"; + aarch64-darwin = "256daa25a8375c565b32c3c2f0e12fbac8d5039a13a9edbb3673a863149b750a"; + headers = "1fvqkw08pync38ixi5cq4f8a108k2ajxpm1w2f8sn2hjph9kpbsd"; }; - electron_13 = mkElectron "13.5.1" { - armv7l-linux = "9cb773eaa9882c313513cb1bb552f8bcac859f35854de477dc2ec6cc24e7d003"; - aarch64-linux = "ae605f169482b1c40e9449073c0f962cceeac4166a00cb304ba22f4f5a7a5d48"; - x86_64-linux = "4d145dbca59541d665435198c9fb697b1ec85c6e525878b7f48ecb8431dc4836"; - i686-linux = "95acabcf7d0a5a3bbfa0634c1956d8aea59565fb695d22ec65edd77c2a09e3a8"; - x86_64-darwin = "ac342741a17034ccc305b83fde18d014f8c6080f8f7143e953545a945542168d"; - aarch64-darwin = "79ad1c22afb2e5338467621fc16a092d16be329c3b60bb753caa311e9933a4b4"; - headers = "0pjj0ra5ksn6cdqiy84ydy45hivksknzbq3szs9r9dlajcczgw9l"; + electron_13 = mkElectron "13.5.2" { + armv7l-linux = "f325d48761ec222a2f9bbf0d0a3b995959266314b8375d4d6bb8e014bddd3a06"; + aarch64-linux = "6d89c41e53d8c14ae4a4b7f2f9d7b477055decad3074675e4cef745967829688"; + x86_64-linux = "6f9b9ad08f74ea8a2c214a7bafbc5b08e316674ff964b91a93f575e499d00464"; + i686-linux = "62d8766c1c921a95b24e2128bcee66e2e832491715df51554d9a12a16087d35c"; + x86_64-darwin = "d5f6262e89a986e3a453f37086ce27e389c9b3fab0f797d169c7a065aac80850"; + aarch64-darwin = "04213cc9303b2114b0db2db0e1a598427788118c125d306b68d1da6ee41a8d2f"; + headers = "1hpcpnkzs834fr5kqaiww4dpq44bpxhgbrrs6a2njkdfv4j3xmrk"; }; electron_14 = mkElectron "14.1.1" { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix index 31c5d0d26e..c6c8ff2a8a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "blackfire-agent"; - version = "1.46.0"; + version = "1.49.4"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-agent_${version}_amd64.deb"; - sha256 = "0cxgc18xpwyb5wp08km7aj8asn5biqnwq9fkgkk6wv1r1ihqlhf2"; + sha256 = "t1S54z3xTMTUBWz0jCFX1A7GJdWWsP/lTa9MMjo8t1A="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix b/third_party/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix index 6ceda01604..7bcf387202 100644 --- a/third_party/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/profiling/sysprof/default.nix @@ -2,6 +2,7 @@ , lib , desktop-file-utils , fetchurl +, fetchpatch , gettext , glib , gtk3 @@ -21,15 +22,23 @@ stdenv.mkDerivation rec { pname = "sysprof"; - version = "3.40.1"; + version = "3.42.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0dvlzjwi3a4g37cpyhqpf41f5hypf0gim1jw9wqlv30flbb00l62"; + sha256 = "PBbgPv3+XT5xxNI5xndBrTf3LOiXHi9/rxaNvV6T6IY="; }; + patches = [ + # Fix missing unistd.h include. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/sysprof/commit/b113c89af1de2f87589175795a197f6384852a78.patch"; + sha256 = "3Q8d6IZYNJl/vbyzRgoRR2sdl4aRkbcKPeVjSSqxb98="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils gettext diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deadlinks/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deadlinks/default.nix index ebd66a9b00..a7c1b885a6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deadlinks/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deadlinks/default.nix @@ -2,22 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deadlinks"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "deadlinks"; repo = pname; rev = "${version}"; - sha256 = "1zd5zgq3346xijllr0qdvvmsilpawisrqgdmsqir8v3bk55ybj4g"; + sha256 = "0s5q9aghncsk9834azn5cgnn5ms3zzyjan2rq06kaqcgzhld4cjh"; }; - cargoSha256 = "1ar3iwpy9mng4j09z4g3ynxra2qwc8454dnc0wjal4h16fk8gxwv"; + cargoSha256 = "00g06zf0m1wry0mhf098pw99kbb99d8a17985pb90yf1w74rdkh6"; checkFlags = [ # uses internet "--skip non_existent_http_link --skip working_http_check" - # expects top-level directory to be named "cargo-deadlinks" - "--skip simple_project::it_checks_okay_project_correctly" ]; buildInputs = lib.optional stdenv.isDarwin Security; @@ -25,6 +23,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Cargo subcommand to check rust documentation for broken links"; homepage = "https://github.com/deadlinks/cargo-deadlinks"; + changelog = "https://github.com/deadlinks/cargo-deadlinks/blob/${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ newam ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/devserver/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/devserver/default.nix new file mode 100644 index 0000000000..9e4545e5e8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/devserver/default.nix @@ -0,0 +1,29 @@ +{ lib +, fetchCrate +, rustPlatform +, openssl +, pkg-config +}: + +rustPlatform.buildRustPackage rec { + pname = "devserver"; + version = "0.4.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-UcrLzsALwl0zqNRMS1kTTXsR6wN8XDd5Iq+yrudh6M4="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + cargoSha256 = "sha256-XlrQ6CvjeWnzvfaeNbe8FtMXMVSQNLxDVIEjyHm57Js="; + + meta = with lib; { + description = "An extremely tiny tool to serve a static folder locally"; + homepage = "https://github.com/kettle11/devserver"; + license = licenses.zlib; + maintainers = with maintainers; [ nickhu ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index 34bcd7992e..50632e4610 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.14.3"; + version = "1.15.0"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ersfn69vRGKzJ4LV7qLI2orLftHz7tuI8+/zUEPctAE="; + sha256 = "sha256-oVcp1tICw+Wluzp/nVTv8iWR04ihmwa5lzqKyrPcOPE="; }; - cargoSha256 = "sha256-BnJH/jbNiPyRmNjvfE5bNQX58iuAFFaQ93bZsXooTfI="; + cargoSha256 = "sha256-GkKxm1M0e/yWWuY71BqCLd8KaqJFLpWuh4nrLSWM2nw="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix b/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix index 6fb597b81a..6e63681f66 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.31.0"; + version = "0.32.0"; shas = { - x86_64-linux = "sha256-KPoxq6rZnwghcDR5cMexN8EMeCfyuKoBcTZ3bv1mEpw="; - aarch64-linux = "sha256-S+lHGwbnCu2uNCIE+R5MljltOIqXpFAxvx0cglV8ZNI="; - x86_64-darwin = "sha256-o8O+X4SEXP7eY/dfHqe8NT7johtnPJQTBOgApFqOOhY="; - aarch64-darwin = "sha256-OQNQh6byNn9R0a6madgUMdUxbUv/R9psnwtTSr3BfzE="; + x86_64-linux = "sha256-35Rm4j4BJNCfl3MQJIpKw1altzm9fgvZ6WeC2cF4Qzc="; + aarch64-linux = "sha256-w1ljFwao/YMO27QSaEyVl7HEVnfzZyVOXZK4xN0205Y="; + x86_64-darwin = "sha256-oNrF9lFkgMgphDElKQRXMq9uYua75e2HrfflNO+CyPk="; + aarch64-darwin = "sha256-Bz9C1AChvGJYamnIg1XtYyTzmIisL0Oe/yDjB7ZebMw="; }; } diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix index 0e52dd5f80..86332bf7b6 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix @@ -139,6 +139,7 @@ in meta = { description = "Event-driven I/O framework for the V8 JavaScript engine"; homepage = "https://nodejs.org"; + changelog = "https://github.com/nodejs/node/blob/v${version}/doc/changelogs/CHANGELOG_V${majorVersion}.md#${version}"; license = licenses.mit; maintainers = with maintainers; [ goibhniu gilligan cko marsam ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix index 7717dfa6c9..54f077e718 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.22.6"; - sha256 = "0yhgkcp7lx5nglxsrybbjymx1fys3wkbbhkj6h6652gnp0b2y0n2"; + version = "12.22.7"; + sha256 = "0sszg3k5jd26hymqhs5328kvnxsb3x78sg4gpna9lrvh92s26snc"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix index 89a3556506..698108a42b 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "16.11.0"; - sha256 = "1bk5f47hm409129w437h8qdvmqjdr11awblvnhkfsp911nyk3xnk"; + version = "16.11.1"; + sha256 = "0y32mdv8zs35la2bny8d9rxjvj1vr8z079ji1g6ajc2yw96pyn37"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; } diff --git a/third_party/nixpkgs/pkgs/development/web/postman/default.nix b/third_party/nixpkgs/pkgs/development/web/postman/default.nix index abcf6bfc16..0ec3754bff 100644 --- a/third_party/nixpkgs/pkgs/development/web/postman/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "8.10.0"; + version = "9.0.5"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "05f3eaa229483a7e1f698e6e2ea2031d37687de540d4fad05ce677ac216db24d"; + sha256 = "1z28v5vrjld99ydai66k8hw01x54647324ax459bvblw989lzp7v"; name = "${pname}.tar.gz"; }; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { rm $out/share/postman/Postman mkdir -p $out/bin - ln -s $out/share/postman/_Postman $out/bin/postman + ln -s $out/share/postman/postman $out/bin/postman mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications/ @@ -88,8 +88,8 @@ stdenv.mkDerivation rec { postFixup = '' pushd $out/share/postman - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" _Postman - for file in $(find . -type f \( -name \*.node -o -name _Postman -o -name \*.so\* \) ); do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" postman + for file in $(find . -type f \( -name \*.node -o -name postman -o -name \*.so\* \) ); do ORIGIN=$(patchelf --print-rpath $file); \ patchelf --set-rpath "${lib.makeLibraryPath buildInputs}:$ORIGIN" $file done @@ -101,6 +101,6 @@ stdenv.mkDerivation rec { description = "API Development Environment"; license = licenses.postman; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ xurei evanjs ]; + maintainers = with maintainers; [ johnrichardrinehart evanjs ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/gzdoom/default.nix b/third_party/nixpkgs/pkgs/games/gzdoom/default.nix index 787184273f..beba37c07a 100644 --- a/third_party/nixpkgs/pkgs/games/gzdoom/default.nix +++ b/third_party/nixpkgs/pkgs/games/gzdoom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth_1 +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth , soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, mpg123 , game-music-emu, pkg-config, copyDesktopItems, makeDesktopItem }: @@ -28,13 +28,13 @@ let gzdoom = stdenv.mkDerivation rec { pname = "gzdoom"; - version = "4.5.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "0kmqnyhdi5psi7zwrx9j3pz0cplypsvhg4cr8w2jbawh6jb71sk9"; + sha256 = "0xxxy7k2zr5g0vr1lnwv4n5amiwq1wln7r6hr37gmrjr72zkcjqn"; fetchSubmodules = true; }; @@ -43,7 +43,7 @@ let SDL2 libGL openal - fluidsynth_1 + fluidsynth bzip2 zlib libjpeg diff --git a/third_party/nixpkgs/pkgs/games/tintin/default.nix b/third_party/nixpkgs/pkgs/games/tintin/default.nix index b813900ca3..e064be66cb 100644 --- a/third_party/nixpkgs/pkgs/games/tintin/default.nix +++ b/third_party/nixpkgs/pkgs/games/tintin/default.nix @@ -8,11 +8,11 @@ assert tlsSupport -> gnutls != null; stdenv.mkDerivation rec { pname = "tintin"; - version = "2.02.05"; + version = "2.02.11"; src = fetchurl { url = "mirror://sourceforge/tintin/tintin-${version}.tar.gz"; - sha256 = "sha256-Y6cAUhItJNade8ASOVdF8aBBLf/UVqjoqrhXBNRL1aE="; + sha256 = "sha256-s5KJ7x4m0vW39+M/cLzYlAYMld2WwVe7l28GPFmosfU="; }; nativeBuildInputs = lib.optional tlsSupport gnutls.dev; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/default.nix index bd4022526e..72c342e7b6 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/xboxdrv/default.nix @@ -1,15 +1,24 @@ -{ lib, stdenv, fetchurl, sconsPackages, libX11, pkg-config -, libusb1, boost, glib, dbus-glib }: +{ lib +, stdenv +, fetchFromGitHub +, sconsPackages +, libX11 +, pkg-config +, libusb1 +, boost +, glib +, dbus-glib +}: -let - version = "0.8.8"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xboxdrv"; - inherit version; + version = "0.8.8"; - src = fetchurl { - url = "https://github.com/xboxdrv/xboxdrv/archive/v${version}.tar.gz"; - sha256 = "0jx2wqmc7602dxyj19n3h8x0cpy929h7c0h39vcc5rf0q74fh3id"; + src = fetchFromGitHub { + owner = "xboxdrv"; + repo = "xboxdrv"; + rev = "v${version}"; + hash = "sha256-R0Bt4xfzQA1EmZbf7lcWLwSSUayf5Y711QhlAVhiLrY="; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -24,5 +33,4 @@ in stdenv.mkDerivation { maintainers = [ ]; platforms = platforms.linux; }; - } diff --git a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix index 78f942352d..d082ec7e1b 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix @@ -1,11 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs -, dotnet-sdk_5, dotnetPackages, dotnetCorePackages, cacert +{ lib, buildDotnetModule, fetchFromGitHub, makeDesktopItem , libX11, libgdiplus, ffmpeg , SDL2_mixer, openal, libsoundio, sndio, pulseaudio , gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook }: -let +buildDotnetModule rec { + pname = "ryujinx"; + version = "1.0.7058"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + + src = fetchFromGitHub { + owner = "Ryujinx"; + repo = "Ryujinx"; + rev = "d92fff541bf6fddadabf6ab628ddf8fec41cd52e"; + sha256 = "1lsg4v15x8i43pwkgn4y8d2m95m6w7izwm4zhspnq8r2lv18lqb2"; + }; + + projectFile = "Ryujinx.sln"; + executables = [ "Ryujinx" ]; + nugetDeps = ./deps.nix; + + nativeBuildInputs = [ wrapGAppsHook gobject-introspection gdk-pixbuf ]; runtimeDeps = [ gtk3 libX11 @@ -17,81 +31,24 @@ let sndio pulseaudio ]; -in stdenv.mkDerivation rec { - pname = "ryujinx"; - version = "1.0.7058"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx - - src = fetchFromGitHub { - owner = "Ryujinx"; - repo = "Ryujinx"; - rev = "d92fff541bf6fddadabf6ab628ddf8fec41cd52e"; - sha256 = "1lsg4v15x8i43pwkgn4y8d2m95m6w7izwm4zhspnq8r2lv18lqb2"; - }; - - nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ]; - - nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix { - fetchNuGet = { name, version, sha256 }: fetchurl { - name = "nuget-${name}-${version}.nupkg"; - url = "https://www.nuget.org/api/v2/package/${name}/${version}"; - inherit sha256; - }; - }); patches = [ ./log.patch # Without this, Ryujinx attempts to write logs to the nix store. This patch makes it write to "~/.config/Ryujinx/Logs" on Linux. ]; - configurePhase = '' - runHook preConfigure - - export HOME=$(mktemp -d) - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_NOLOGO=1 - - nuget sources Add -Name nixos -Source "$PWD/nixos" - nuget init "$nugetDeps" "$PWD/nixos" - - # FIXME: https://github.com/NuGet/Home/issues/4413 - mkdir -p $HOME/.nuget/NuGet - cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet - - dotnet restore --source "$PWD/nixos" Ryujinx.sln - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - dotnet build Ryujinx.sln \ - --no-restore \ - --configuration Release \ - -p:Version=${version} - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - dotnet publish Ryujinx.sln \ - --no-build \ - --configuration Release \ - --no-self-contained \ - --output $out/lib/ryujinx - shopt -s extglob - + preInstall = '' # TODO: fix this hack https://github.com/Ryujinx/Ryujinx/issues/2349 mkdir -p $out/lib/sndio-6 ln -s ${sndio}/lib/libsndio.so $out/lib/sndio-6/libsndio.so.6 - makeWrapper $out/lib/ryujinx/Ryujinx $out/bin/Ryujinx \ - --set DOTNET_ROOT "${dotnetCorePackages.net_5_0}" \ - --suffix LD_LIBRARY_PATH : "${builtins.concatStringsSep ":" [ (lib.makeLibraryPath runtimeDeps) "$out/lib/sndio-6" ]}" \ - ''${gappsWrapperArgs[@]} + makeWrapperArgs+=( + --suffix LD_LIBRARY_PATH : "$out/lib/sndio-6" + ) for i in 16 32 48 64 96 128 256 512 1024; do install -D ${src}/Ryujinx/Ui/Resources/Logo_Ryujinx.png $out/share/icons/hicolor/''${i}x$i/apps/ryujinx.png done + cp -r ${makeDesktopItem { desktopName = "Ryujinx"; name = "ryujinx"; @@ -101,13 +58,8 @@ in stdenv.mkDerivation rec { type = "Application"; categories = "Game;"; }}/share/applications $out/share - - runHook postInstall ''; - # Strip breaks the executable. - dontStrip = true; - meta = with lib; { description = "Experimental Nintendo Switch Emulator written in C#"; homepage = "https://ryujinx.org/"; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/zesarux/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/zesarux/default.nix new file mode 100644 index 0000000000..4df6cfafbc --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/emulators/zesarux/default.nix @@ -0,0 +1,89 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, SDL2 +, aalib +, alsa-lib +, libXext +, libXxf86vm +, libcaca +, libpulseaudio +, libsndfile +, ncurses +, openssl +, which +}: + +stdenv.mkDerivation rec { + pname = "zesarux"; + version = "10.0"; + + src = fetchFromGitHub { + owner = "chernandezba"; + repo = pname; + rev = version; + hash = "sha256-cxV2dAzGnIzJiCRdq8vN/Cl4AQeJqjmiCAahijIJQ9k="; + }; + + nativeBuildInputs = [ + which + ]; + + buildInputs = [ + SDL2 + aalib + alsa-lib + libXxf86vm + libXext + libcaca + libpulseaudio + libsndfile + ncurses + openssl + ]; + + patches = [ + # Patch the shell scripts; remove it when the next version arrives + (fetchpatch { + name = "000-fix-shebangs.patch"; + url = "https://github.com/chernandezba/zesarux/commit/4493439b38f565c5be7c36239ecaf0cf80045627.diff"; + sha256 = "sha256-f+21naPcPXdcVvqU8ymlGfl1WkYGOeOBe9B/WFUauTI="; + }) + ]; + + postPatch = '' + cd src + patchShebangs ./configure *.sh + ''; + + configureFlags = [ + "--prefix=${placeholder "out"}" + "--c-compiler ${stdenv.cc.targetPrefix}cc" + "--enable-cpustats" + "--enable-memptr" + "--enable-sdl2" + "--enable-ssl" + "--enable-undoc-scfccf" + "--enable-visualmem" + ]; + + installPhase = '' + runHook preInstall + + ./generate_install_sh.sh + patchShebangs ./install.sh + ./install.sh + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/chernandezba/zesarux"; + description = " ZX Second-Emulator And Released for UniX"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} +# TODO: Darwin support diff --git a/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix b/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix index 369add0a58..676c24b3f7 100644 --- a/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix +++ b/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix @@ -157,5 +157,6 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.viric ]; + mainProgram = "gs"; }; } diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/pipes/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/pipes/default.nix index be605192ac..9962601875 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/pipes/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/pipes/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, makeWrapper, coreutils, ncurses }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, ncurses }: stdenv.mkDerivation rec { pname = "pipes"; version = "1.3.0"; - src = fetchurl { - url = "https://github.com/pipeseroni/pipes.sh/archive/v${version}.tar.gz"; - sha256 = "09m4alb3clp3rhnqga5v6070p7n1gmnwp2ssqhq87nf2ipfpcaak"; + src = fetchFromGitHub { + owner = "pipeseroni"; + repo = "pipes.sh"; + rev = "v${version}"; + hash = "sha256-856OWlnNiGB20571TJg7Ayzcz4r6NqdW5DMDiim09mc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bolt/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bolt/default.nix index d38a97387f..dd9436d9b0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bolt/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bolt/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , meson , ninja , pkg-config @@ -30,6 +31,25 @@ stdenv.mkDerivation rec { sha256 = "1phgp8fs0dlj74kbkqlvfniwc32daz47b3pvsxlfxqzyrp77xrfm"; }; + patches = [ + # meson install tries to create /var/lib/boltd + ./0001-skip-mkdir.patch + + # https://github.com/NixOS/nixpkgs/issues/104429 + # Upstream issue: https://gitlab.freedesktop.org/bolt/bolt/-/issues/167 + (fetchpatch { + name = "disable-atime-tests.diff"; + url = "https://gitlab.freedesktop.org/roberth/bolt/-/commit/1f672a7de2ebc4dd51590bb90f3b873a8ac0f4e6.diff"; + sha256 = "134f5s6kjqs6612pwq5pm1miy58crn1kxbyyqhzjnzmf9m57fnc8"; + }) + + # Fix tests with newer umockdev + (fetchpatch { + url = "https://gitlab.freedesktop.org/bolt/bolt/-/commit/130e09d1c7ff02c09e4ad1c9c36e9940b68e58d8.patch"; + sha256 = "HycuM7z4VvtBuZZLU68tBxGT1YjaqJRS4sKyoTGHZEk="; + }) + ]; + nativeBuildInputs = [ asciidoc docbook_xml_dtd_45 @@ -61,19 +81,6 @@ stdenv.mkDerivation rec { (p: [ p.pygobject3 p.dbus-python p.python-dbusmock ])) ]; - patches = [ - # meson install tries to create /var/lib/boltd - ./0001-skip-mkdir.patch - - # https://github.com/NixOS/nixpkgs/issues/104429 - # Upstream issue: https://gitlab.freedesktop.org/bolt/bolt/-/issues/167 - (fetchpatch { - name = "disable-atime-tests.diff"; - url = "https://gitlab.freedesktop.org/roberth/bolt/-/commit/1f672a7de2ebc4dd51590bb90f3b873a8ac0f4e6.diff"; - sha256 = "134f5s6kjqs6612pwq5pm1miy58crn1kxbyyqhzjnzmf9m57fnc8"; - }) - ]; - postPatch = '' patchShebangs scripts tests ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix index 4949cd7c14..b8a017adcf 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix @@ -49,14 +49,14 @@ in stdenv.mkDerivation rec { pname = "busybox"; - version = "1.33.1"; + version = "1.34.1"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "https://busybox.net/downloads/${pname}-${version}.tar.bz2"; - sha256 = "0a0dcvsh7nxnhxc5y73fky0z30i9p7r30qfidm2akn0n5fywdkhj"; + sha256 = "0jfm9fik7nv4w21zqdg830pddgkdjmplmna9yjn9ck1lwn4vsps1"; }; hardeningDisable = [ "format" "pie" ] @@ -81,6 +81,14 @@ stdenv.mkDerivation rec { CONFIG_LFS y + # More features for modprobe. + ${lib.optionalString (!enableMinimal) '' + CONFIG_FEATURE_MODPROBE_BLACKLIST y + CONFIG_FEATURE_MODUTILS_ALIAS y + CONFIG_FEATURE_MODUTILS_SYMBOLS y + CONFIG_MODPROBE_SMALL n + ''} + ${lib.optionalString enableStatic '' CONFIG_STATIC y ''} @@ -135,7 +143,7 @@ stdenv.mkDerivation rec { description = "Tiny versions of common UNIX utilities in a single small executable"; homepage = "https://busybox.net/"; license = licenses.gpl2Only; - maintainers = with maintainers; [ TethysSvensson ]; + maintainers = with maintainers; [ TethysSvensson qyliss ]; platforms = platforms.linux; priority = 10; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index 6b9aaccadd..8e1902b61d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,32 +1,32 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.248-hardened1.patch", - "sha256": "1lwqlpd21f8rwqfyz61083w0lg2bjzdjf7rzrqxsw1jz0l879035", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.248-hardened1/linux-hardened-4.14.248-hardened1.patch" + "name": "linux-hardened-4.14.250-hardened1.patch", + "sha256": "1jgqmrj5djapvk56jwlfq181knhywzrk9cswv1lp5y2jwnnvlj9x", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.250-hardened1/linux-hardened-4.14.250-hardened1.patch" }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.208-hardened1.patch", - "sha256": "0bg45n1kgd628gwjkp1vxslxyci6589ygy9mmmhpl7kj3y7370ck", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.208-hardened1/linux-hardened-4.19.208-hardened1.patch" + "name": "linux-hardened-4.19.210-hardened1.patch", + "sha256": "0lnv0ym6jcf460hsn26lax65n2yb1vvzsfmckaz04jb2kdgm6hr5", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.210-hardened1/linux-hardened-4.19.210-hardened1.patch" }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.70-hardened1.patch", - "sha256": "12r6x7v7n3f7c7pn86ivykg6gqmqlzwrsncdkvj5qf7raw38ad5r", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.70-hardened1/linux-hardened-5.10.70-hardened1.patch" + "name": "linux-hardened-5.10.72-hardened1.patch", + "sha256": "14zchx1hc4jrq7prv4kkswjnmyqv74wfkjvky57scc8yl04yaqs6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.72-hardened1/linux-hardened-5.10.72-hardened1.patch" }, "5.14": { "extra": "-hardened1", - "name": "linux-hardened-5.14.9-hardened1.patch", - "sha256": "190588p6xw65y1f106zgnv5s043yi633vg0zdbz85qjz27g49db8", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.9-hardened1/linux-hardened-5.14.9-hardened1.patch" + "name": "linux-hardened-5.14.11-hardened1.patch", + "sha256": "05n74rnq5c2jx7iynxwgj5wypb0i0p3dar0ri2zxmyssasmbkfa7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.11-hardened1/linux-hardened-5.14.11-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.150-hardened1.patch", - "sha256": "0vaxp5lfs7d5py0530sdhz8yzbzjxlwaam63mflwfd4mm8gf3ggc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.150-hardened1/linux-hardened-5.4.150-hardened1.patch" + "name": "linux-hardened-5.4.152-hardened1.patch", + "sha256": "01rf9za9sv14pxpi0pj1izq4bihhldi2qnhaka5rxlw7nifzzsj2", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.152-hardened1/linux-hardened-5.4.152-hardened1.patch" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index 8eff0d4d78..69ca1d3e25 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.249"; + version = "4.14.250"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0wn4yw9fliw3a8knvj2hdprbyyx7akm9ycclr2y1whpa5gmrc3rj"; + sha256 = "0zbf6gxm8iwf7cra310gfd0zyj8l9ckdahky9w6wb9wlznwkvd54"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index 1e4abbdb67..922675fa42 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.209"; + version = "4.19.210"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "04z9hxgqw2p86xxi2667kaj2w99xxxiw9gn9i1217c305swxa9vk"; + sha256 = "0cv126j4sghwgzjm9p5l1brcnxkbgggja2ai37gl8m2s99cj59wv"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix index 72a0d434e8..8f52d3af51 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.287"; + version = "4.4.288"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0qraild006in01vsqbhx1lf585g34skzwi2m3hv3kal8s03q0gzw"; + sha256 = "028w3yzmzymy7l1nf3n1pfbg95hfi4ilphkyl00ddgj8sfm542c7"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index 8b67538fb3..4c00580a8a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.285"; + version = "4.9.286"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1hkkk4mhr5qnrhwqcz0b20rff6j8pnwd868a5hsq8s867pa24ajb"; + sha256 = "0id62p43dmkl9ir278p0dsfg3q7m1d8rlxv0c9qi1pzalkygv8p2"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index 0f7acb6ccc..5a8ef895c2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.71"; + version = "5.10.72"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "15x4jbwy6j78ss31avdl7nr0mw4w6a1y6c6dyljh6gwngp98irh2"; + sha256 = "0z2cp8gqnbv7iz8kb5ydfmk019m0gds8wwvwc6kccsk4wypkbmml"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.14.nix index c086423913..465a3f82d5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.14.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.14.10"; + version = "5.14.11"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1n454038vp55wbi814fqpidjmk8k6p6h0jl07hknpd6imgh2bkj5"; + sha256 = "0capilz3wx29pw7n2m5cn229vy9psrccmdspp27znhjkvwj0m0wk"; }; } // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index ca4ad25ebf..931f9f56f8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.151"; + version = "5.4.152"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "04rkymyg79mp1frdlkizc7k33palplmnnnz8klkag9ii7jw3zrxv"; + sha256 = "1may19d47d06mplpk29dpjsq31sxk8wwbwb2jspj3vay9h9wfi40"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix index d9f8912416..d8d9edcf4a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18314"; - sha256 = "0fic073zafwdsw7i0j4z57a4aknk8kpgnbrxpbi181n5axdlm99k"; + rev = "18380"; + sha256 = "0sg7mnxqzc5zdnl8l7gfy1kc52w7c85fdhywvdbjgs7inx2bb1qd"; } , ... }: diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix index e5a9032d3b..a0da293548 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.14.9"; - suffix = "lqx4"; + version = "5.14.11"; + suffix = "lqx1"; in buildLinux (args // { @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-nT8lc/JeuXsKVHGPQxK+w8BTasxyIfxCdKbAvoFgbYg="; + sha256 = "sha256-4SSAcI1TwaKgz/bwma+YQtIBtodEAYxqdtUI3ESM7I8="; }; extraMeta = { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/perf.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/perf.nix index b58bca352e..045f80ce9a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/perf.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/perf.nix @@ -1,5 +1,5 @@ { lib, stdenv, kernel, elfutils, python2, python3, perl, newt, slang, asciidoc, xmlto, makeWrapper -, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkg-config, libunwind, binutils +, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkg-config, libunwind, binutils-unwrapped , libiberty, audit, libbfd, libopcodes, openssl, systemtap, numactl , zlib , withGtk ? false, gtk2 @@ -54,7 +54,6 @@ stdenv.mkDerivation { "-Wno-error=cpp" "-Wno-error=bool-compare" "-Wno-error=deprecated-declarations" - "-DOBJDUMP_PATH=\"${binutils}/bin/objdump\"" "-Wno-error=stringop-truncation" ]; @@ -69,8 +68,9 @@ stdenv.mkDerivation { installFlags = [ "install" "install-man" "ASCIIDOC8=1" "prefix=$(out)" ]; preFixup = '' + # pull in 'objdump' into PATH to make annotations work wrapProgram $out/bin/perf \ - --prefix PATH : "${binutils}/bin" + --prefix PATH : "${binutils-unwrapped}/bin" ''; meta = { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mceinject/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mceinject/default.nix new file mode 100644 index 0000000000..3e89ed8336 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/mceinject/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, bison, flex }: + +stdenv.mkDerivation rec { + pname = "mceinject"; + version = "unstable-2013-01-19"; + + src = fetchFromGitHub { + owner = "andikleen"; + repo = "mce-inject"; + rev = "4cbe46321b4a81365ff3aafafe63967264dbfec5"; + sha256 = "0gjapg2hrlxp8ssrnhvc19i3r1xpcnql7xv0zjgbv09zyha08g6z"; + }; + + nativeBuildInputs = [ flex bison ]; + + NIX_CFLAGS_COMPILE = "-Os -g -Wall"; + + NIX_LDFLAGS = [ "-lpthread" ]; + + makeFlags = [ "prefix=" ]; + + enableParallelBuilding = true; + + installFlags = [ "destdir=$(out)" "manprefix=/share" ]; + + meta = with lib; { + description = "A tool to inject machine checks into x86 kernel for testing"; + longDescription = '' + mce-inject allows to inject machine check errors on the software level + into a running Linux kernel. This is intended for validation of the + kernel machine check handler. + ''; + homepage = "https://github.com/andikleen/mce-inject/"; + license = licenses.gpl2; + maintainers = with maintainers; [ arkivm ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/multipath-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/multipath-tools/default.nix index 2414980572..13e9892436 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/multipath-tools/default.nix @@ -19,9 +19,11 @@ stdenv.mkDerivation rec { substituteInPlace libmultipath/Makefile \ --replace /usr/include/libdevmapper.h ${lib.getDev lvm2}/include/libdevmapper.h + # systemd-udev-settle.service is deprecated. substituteInPlace multipathd/multipathd.service \ --replace /sbin/modprobe ${lib.getBin kmod}/sbin/modprobe \ - --replace /sbin/multipathd "$out/bin/multipathd" + --replace /sbin/multipathd "$out/bin/multipathd" \ + --replace " systemd-udev-settle.service" "" sed -i -re ' s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tbs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/tbs/default.nix index f2a7b692ba..5426869345 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/tbs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/tbs/default.nix @@ -59,6 +59,6 @@ in stdenv.mkDerivation { license = licenses.gpl2; maintainers = with maintainers; [ ck3d ]; priority = -1; - broken = lib.versionAtLeast kernel.version "4.18"; + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 13547f56a2..d7bdbb451f 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.10.2"; + version = "2021.10.4"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -859,7 +859,7 @@ "tankerkoenig" = ps: with ps; [ pytankerkoenig ]; "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff "tasmota" = ps: with ps; [ aiohttp-cors hatasmota paho-mqtt ]; - "tautulli" = ps: with ps; [ ]; # missing inputs: pytautulli + "tautulli" = ps: with ps; [ pytautulli ]; "tcp" = ps: with ps; [ ]; "ted5000" = ps: with ps; [ xmltodict ]; "telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 95d434460f..b2c3196bdb 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -114,7 +114,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.10.2"; + hassVersion = "2021.10.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -131,7 +131,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "0nds4491v8wy4d8w842asjpjj7xhqghlq0h61i7z6wp8jln7m418"; + sha256 = "1cl0h15285x7xba425d9anv882adi6bdqx4i3cicg3gf0nzcc8am"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -768,9 +768,6 @@ in with py.pkgs; buildPythonApplication rec { # wemo/test_sensor.py: KeyError for various power attributes "--deselect tests/components/wemo/test_sensor.py::TestInsightTodayEnergy::test_state_unavailable" "--deselect tests/components/wemo/test_sensor.py::TestInsightCurrentPower::test_state_unavailable" - # tado/test_climate.py: Tries to connect to my.tado.com - "--deselect tests/components/tado/test_climate.py::test_air_con" - "--deselect tests/components/tado/test_climate.py::test_heater" # helpers/test_system_info.py: AssertionError: assert 'Unknown' == 'Home Assistant Container' "--deselect tests/helpers/test_system_info.py::test_container_installationtype" # tests are located in tests/ @@ -785,7 +782,8 @@ in with py.pkgs; buildPythonApplication rec { "tests/auth/mfa_modules/test_notify.py" # emulated_hue/test_upnp.py: Tries to establish the public ipv4 address "tests/components/emulated_hue/test_upnp.py" - + # tado/test_climate.py: Tries to connect to my.tado.com + "tests/components/tado/test_climate.py" ]; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix index 9b3746fb2d..7207a937c3 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix +++ b/third_party/nixpkgs/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 = "20211007.0"; + version = "20211007.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GchSCqdVPk8RVe4iNEVvrsIgrV9/CHE5bQwyaT+ErvU="; + sha256 = "sha256-wsDNLwzhpwH5vwdHRWhZGlumjFM8/S+kXProbD+VpE8="; }; # there is nothing to strip in this package diff --git a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index a0a6235ace..4f4236e91b 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -20,8 +20,18 @@ stdenv.mkDerivation rec { }) ]; installPhase = '' + runHook preInstall + mkdir -p $out/modules cp src/.libs/mod_dnssd.so $out/modules + + runHook postInstall + ''; + + preFixup = '' + # TODO: Packages in non-standard directories not stripped. + # https://github.com/NixOS/nixpkgs/issues/141554 + stripDebugList=modules ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/http/couchdb/3.nix b/third_party/nixpkgs/pkgs/servers/http/couchdb/3.nix index 94b94081d4..50d4012297 100644 --- a/third_party/nixpkgs/pkgs/servers/http/couchdb/3.nix +++ b/third_party/nixpkgs/pkgs/servers/http/couchdb/3.nix @@ -1,26 +1,26 @@ -{ lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_68 +{ lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_78 , coreutils, bash, makeWrapper, python3 }: stdenv.mkDerivation rec { pname = "couchdb"; - version = "3.1.1"; + version = "3.2.0"; # when updating this, please consider bumping the erlang/OTP version # in all-packages.nix src = fetchurl { url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz"; - sha256 = "18wcqxrv2bz88xadkqpqznprrxmcmwr0g6k895xrm8rbp9mpdzlg"; + sha256 = "035hy76399yy32rxl536gv7nh8ijihqxhhh5cxn95c3bm97mgslb"; }; - buildInputs = [ erlang icu openssl spidermonkey_68 (python3.withPackages(ps: with ps; [ requests ]))]; + buildInputs = [ erlang icu openssl spidermonkey_78 (python3.withPackages(ps: with ps; [ requests ]))]; postPatch = '' - substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-68' "${spidermonkey_68.dev}/include/mozjs-68" + substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-78' "${spidermonkey_78.dev}/include/mozjs-78" patchShebangs bin/rebar ''; dontAddPrefix= "True"; - configureFlags = ["--spidermonkey-version=68"]; + configureFlags = ["--spidermonkey-version=78"]; buildFlags = ["release"]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/maddy/default.nix b/third_party/nixpkgs/pkgs/servers/maddy/default.nix index 658d5e34fb..3f495add9f 100644 --- a/third_party/nixpkgs/pkgs/servers/maddy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/maddy/default.nix @@ -1,23 +1,31 @@ -{ lib, buildGoModule, fetchFromGitHub, coreutils }: +{ lib, buildGoModule, fetchFromGitHub, coreutils, installShellFiles, scdoc }: buildGoModule rec { pname = "maddy"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "foxcpp"; repo = "maddy"; rev = "v${version}"; - sha256 = "sha256-SxJfuNZBtwaILF4zD4hrTANc/GlOG53XVwg3NvKYAkg="; + sha256 = "sha256-b85g8Eu7qWTI+ggMr7JL/2BAVbkXocpsR89P6s6TfMg="; }; - vendorSha256 = "sha256-bxKEQaOubjRfLX+dMxVDzLOUInHykUdy9X8wvFE6Va4="; + vendorSha256 = "sha256-kzSwqT3r6uGxq1GNzCWCn8VoCxmVtiUb23XLCpsPv/c="; ldflags = [ "-s" "-w" "-X github.com/foxcpp/maddy.Version=${version}" ]; subPackages = [ "cmd/maddy" "cmd/maddyctl" ]; + nativeBuildInputs = [ installShellFiles scdoc ]; + postInstall = '' + for f in docs/man/*.scd; do + local page="docs/man/$(basename "$f" .scd)" + scdoc < "$f" > "$page" + installManPage "$page" + done + mkdir -p $out/lib/systemd/system substitute dist/systemd/maddy.service $out/lib/systemd/system/maddy.service \ @@ -33,6 +41,6 @@ buildGoModule rec { description = "Composable all-in-one mail server"; homepage = "https://maddy.email"; license = licenses.gpl3Plus; - maintainers = with maintainers; []; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mail/sympa/default.nix b/third_party/nixpkgs/pkgs/servers/mail/sympa/default.nix index 82d8d30265..5272b389b2 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/sympa/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/sympa/default.nix @@ -61,13 +61,13 @@ let in stdenv.mkDerivation rec { pname = "sympa"; - version = "6.2.60"; + version = "6.2.64"; src = fetchFromGitHub { owner = "sympa-community"; repo = pname; rev = version; - sha256 = "0mnpmkvxf3bmrmahkf3d0i5r6sj7xb1yca5v7xdnwnh5wh9vlx7v"; + sha256 = "sha256-7bBOhx6sDyln37OEgRLJwgu0rklJm872hINog2EJ/+E="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix index 596739a45d..327ab8a672 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix @@ -3,8 +3,8 @@ let src = fetchFromGitHub { owner = "matrix-org"; repo = "matrix-appservice-slack"; - rev = "1.8.0"; - sha256 = "sha256-FA6SMivMnloeZmnUhGx6N+ZLDTZFO3y17xJYclkp5w0="; + rev = "1.9.0"; + sha256 = "tx+dul+O7HZTGYW8ZSxoOZZmzm44nz0pYGQYp8xaVCw="; }; nodePackages = import ./node-composition.nix { diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh index 9fab488917..33f0554573 100755 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh @@ -1,9 +1,9 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix -# Download package.json and package-lock.json from the v1.8.0 release -curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.8.0/package.json -o package.json -curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.8.0/package-lock.json -o package-lock.json +# Download package.json and package-lock.json from the v1.9.0 release +curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.9.0/package.json -o package.json +curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.9.0/package-lock.json -o package-lock.json node2nix \ --nodejs-12 \ diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix index bc5bc8cf1c..9fa290f1c7 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix @@ -4,6 +4,15 @@ let sources = { + "@alloc/quick-lru-5.2.0" = { + name = "_at_alloc_slash_quick-lru"; + packageName = "@alloc/quick-lru"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz"; + sha512 = "UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw=="; + }; + }; "@babel/code-frame-7.12.11" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; @@ -49,40 +58,77 @@ let sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; }; }; - "@eslint/eslintrc-0.4.0" = { + "@es-joy/jsdoccomment-0.9.0-alpha.1" = { + name = "_at_es-joy_slash_jsdoccomment"; + packageName = "@es-joy/jsdoccomment"; + version = "0.9.0-alpha.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.9.0-alpha.1.tgz"; + sha512 = "Clxxc0PwpISoYYBibA+1L2qFJ7gvFVhI2Hos87S06K+Q0cXdOhZQJNKWuaQGPAeHjZEuUB/YoWOfwjuF2wirqA=="; + }; + }; + "@eslint/eslintrc-0.4.3" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "0.4.0"; + version = "0.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz"; - sha512 = "2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz"; + sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; }; }; - "@nodelib/fs.scandir-2.1.4" = { + "@humanwhocodes/config-array-0.5.0" = { + name = "_at_humanwhocodes_slash_config-array"; + packageName = "@humanwhocodes/config-array"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz"; + sha512 = "FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg=="; + }; + }; + "@humanwhocodes/object-schema-1.2.0" = { + name = "_at_humanwhocodes_slash_object-schema"; + packageName = "@humanwhocodes/object-schema"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz"; + sha512 = "wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w=="; + }; + }; + "@matrix-org/olm-https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.4.tgz" = { + name = "_at_matrix-org_slash_olm"; + packageName = "@matrix-org/olm"; + version = 1; + src = fetchurl { + name = "olm-1.tar.gz"; + url = "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.4.tgz"; + sha512 = "ddaXWILlm1U0Z9qpcZffJjBFZRpz/GxQ1n/Qth3xKvYRUbniuPOgftNTDaxkEC4h04uJG5Ls/OdI1YJUyfuRzQ=="; + }; + }; + "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; - sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; }; }; - "@nodelib/fs.stat-2.0.4" = { + "@nodelib/fs.stat-2.0.5" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; - sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; }; }; - "@nodelib/fs.walk-1.2.6" = { + "@nodelib/fs.walk-1.2.8" = { name = "_at_nodelib_slash_fs.walk"; packageName = "@nodelib/fs.walk"; - version = "1.2.6"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; - sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; + sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; "@slack/logger-2.0.0" = { @@ -121,6 +167,42 @@ let sha512 = "tjQ8Zqv/Fmj9SOL9yIEd7IpTiKfKHi9DKAkfRVeotoX0clMr3SqQtBqO+KZMX27gm7dmgJsQaDKlILyzdCO+IA=="; }; }; + "@tsconfig/node10-1.0.8" = { + name = "_at_tsconfig_slash_node10"; + packageName = "@tsconfig/node10"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz"; + sha512 = "6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg=="; + }; + }; + "@tsconfig/node12-1.0.9" = { + name = "_at_tsconfig_slash_node12"; + packageName = "@tsconfig/node12"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz"; + sha512 = "/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw=="; + }; + }; + "@tsconfig/node14-1.0.1" = { + name = "_at_tsconfig_slash_node14"; + packageName = "@tsconfig/node14"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz"; + sha512 = "509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg=="; + }; + }; + "@tsconfig/node16-1.0.1" = { + name = "_at_tsconfig_slash_node16"; + packageName = "@tsconfig/node16"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.1.tgz"; + sha512 = "FTgBI767POY/lKNDNbIzgAX6miIDBs6NTCbdlDb8TrWovHsSvaVIZDlTqym29C6UqhzwcJx4CYr+AlrMywA0cA=="; + }; + }; "@types/body-parser-1.19.0" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; @@ -130,13 +212,13 @@ let sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; }; }; - "@types/chai-4.2.16" = { + "@types/chai-4.2.21" = { name = "_at_types_slash_chai"; packageName = "@types/chai"; - version = "4.2.16"; + version = "4.2.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/chai/-/chai-4.2.16.tgz"; - sha512 = "vI5iOAsez9+roLS3M3+Xx7w+WRuDtSmF8bQkrbcIJ2sC1PcDgVoA0WGpa+bIrJ+y8zqY2oi//fUctkxtIcXJCw=="; + url = "https://registry.npmjs.org/@types/chai/-/chai-4.2.21.tgz"; + sha512 = "yd+9qKmJxm496BOV9CMNaey8TWsikaZOwMRwPHQIjcOJM9oV+fi9ZMNw3JsVnbEEbo2gRTDnGEBv8pjyn67hNg=="; }; }; "@types/connect-3.4.34" = { @@ -148,13 +230,13 @@ let sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ=="; }; }; - "@types/express-4.17.11" = { + "@types/express-4.17.13" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.11"; + version = "4.17.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz"; - sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz"; + sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; }; }; "@types/express-serve-static-core-4.17.19" = { @@ -175,22 +257,22 @@ let sha512 = "jkZatu4QVbR60mpIzjINmtS1ZF4a/FqdTUTBeQDVOQ2PYyidtwFKr0B5G6ERukKwliq+7mIXvxyppwzG5EgRYg=="; }; }; - "@types/js-yaml-4.0.0" = { + "@types/js-yaml-4.0.2" = { name = "_at_types_slash_js-yaml"; packageName = "@types/js-yaml"; - version = "4.0.0"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.0.tgz"; - sha512 = "4vlpCM5KPCL5CfGmTbpjwVKbISRYhduEJvvUWsH5EB7QInhEj94XPZ3ts/9FPiLZFqYO0xoW4ZL8z2AabTGgJA=="; + url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.2.tgz"; + sha512 = "KbeHS/Y4R+k+5sWXEYzAZKuB1yQlZtEghuhRxrVRLaqhtoG5+26JwQsa4HyS3AWX8v1Uwukma5HheduUDskasA=="; }; }; - "@types/json-schema-7.0.7" = { + "@types/json-schema-7.0.8" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.7"; + version = "7.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz"; - sha512 = "cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz"; + sha512 = "YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg=="; }; }; "@types/mime-1.3.2" = { @@ -202,31 +284,31 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/mocha-8.2.2" = { + "@types/mocha-8.2.3" = { name = "_at_types_slash_mocha"; packageName = "@types/mocha"; - version = "8.2.2"; + version = "8.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.2.tgz"; - sha512 = "Lwh0lzzqT5Pqh6z61P3c3P5nm6fzQK/MMHl9UKeneAeInVflBSz1O2EkX6gM6xfJd7FBXBY5purtLx7fUiZ7Hw=="; + url = "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.3.tgz"; + sha512 = "ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw=="; }; }; - "@types/nedb-1.8.11" = { + "@types/nedb-1.8.12" = { name = "_at_types_slash_nedb"; packageName = "@types/nedb"; - version = "1.8.11"; + version = "1.8.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/nedb/-/nedb-1.8.11.tgz"; - sha512 = "qHQRLZ0e6l/XK/2Qb2v5N1ujmdttYkUvnRI4nPIifMy6vYwoAnER10xhX13isWjjQtNsrjNLinZgDDguzPmEKw=="; + url = "https://registry.npmjs.org/@types/nedb/-/nedb-1.8.12.tgz"; + sha512 = "ICDoQMORMjOSqfNFXT4ENXfwwCir1BPblXNm0SPH7C4Q10ou+pvVagcFAJ+rrzf3A47tGU4K/KbzKu7wO9j45Q=="; }; }; - "@types/node-14.14.41" = { + "@types/node-12.20.16" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.41"; + version = "12.20.16"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz"; - sha512 = "dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.20.16.tgz"; + sha512 = "6CLxw83vQf6DKqXxMPwl8qpF8I7THFZuIwLt4TnNsumxkp1VsRZWT8txQxncT/Rl2UojTsFzWgDG4FRMwafrlA=="; }; }; "@types/node-emoji-1.8.1" = { @@ -238,13 +320,13 @@ let sha512 = "0fRfA90FWm6KJfw6P9QGyo0HDTCmthZ7cWaBQndITlaWLTZ6njRyKwrwpzpg+n6kBXBIGKeUHEQuBx7bphGJkA=="; }; }; - "@types/nunjucks-3.1.4" = { + "@types/nunjucks-3.1.5" = { name = "_at_types_slash_nunjucks"; packageName = "@types/nunjucks"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/nunjucks/-/nunjucks-3.1.4.tgz"; - sha512 = "cR65PLlHKW/qxxj840dbNb3ICO+iAVQzaNKJ8TcKOVKFi+QcAkhw9SCY8VFAyU41SmJMs+2nrIN2JGhX+jYb7A=="; + url = "https://registry.npmjs.org/@types/nunjucks/-/nunjucks-3.1.5.tgz"; + sha512 = "0zEdmQNNvQ+xyV9kqQvAV93UVroTwhE78toVUDT0GBnGcW2jQBZnB4al9qq2LqI5qHOqROy/DvvAY/UwrbvV1A=="; }; }; "@types/p-queue-2.3.2" = { @@ -265,13 +347,13 @@ let sha512 = "0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA=="; }; }; - "@types/randomstring-1.1.6" = { + "@types/randomstring-1.1.7" = { name = "_at_types_slash_randomstring"; packageName = "@types/randomstring"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/randomstring/-/randomstring-1.1.6.tgz"; - sha512 = "XRIZIMTxjcUukqQcYBdpFWGbcRDyNBXrvTEtTYgFMIbBNUVt+9mCKsU+jUUDLeFO/RXopUgR5OLiBqbY18vSHQ=="; + url = "https://registry.npmjs.org/@types/randomstring/-/randomstring-1.1.7.tgz"; + sha512 = "S6NRYPiH8VGcLW4m9KEMUPtGxXqToCOLLCutQh8sSMaZGrL6/PEQCZAPGBtMP6SKd43ep5eWuPFN732h23h15w=="; }; }; "@types/range-parser-1.2.3" = { @@ -301,13 +383,13 @@ let sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA=="; }; }; - "@types/uuid-8.3.0" = { + "@types/uuid-8.3.1" = { name = "_at_types_slash_uuid"; packageName = "@types/uuid"; - version = "8.3.0"; + version = "8.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.0.tgz"; - sha512 = "eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ=="; + url = "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.1.tgz"; + sha512 = "Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg=="; }; }; "@types/ws-7.2.6" = { @@ -319,94 +401,85 @@ let sha512 = "Q07IrQUSNpr+cXU4E4LtkSIBPie5GLZyyMC1QtQYRLWz701+XcoVygGUZgvLqElq1nU4ICldMYPnexlBsg3dqQ=="; }; }; - "@types/yargs-15.0.13" = { + "@types/yargs-17.0.3" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "15.0.13"; + version = "17.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz"; - sha512 = "kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.3.tgz"; + sha512 = "K7rm3Ke3ag/pAniBe80A6J6fjoqRibvCrl3dRmtXV9eCEt9h/pZwmHX9MzjQVUc/elneQTL4Ky7XKorC71Lmxw=="; }; }; - "@types/yargs-parser-15.0.0" = { + "@types/yargs-parser-20.2.1" = { name = "_at_types_slash_yargs-parser"; packageName = "@types/yargs-parser"; - version = "15.0.0"; + version = "20.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; - sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; + url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"; + sha512 = "7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="; }; }; - "@typescript-eslint/eslint-plugin-4.22.0" = { + "@typescript-eslint/eslint-plugin-4.28.4" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.22.0"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.0.tgz"; - sha512 = "U8SP9VOs275iDXaL08Ln1Fa/wLXfj5aTr/1c0t0j6CdbOnxh+TruXu1p4I0NAvdPBQgoPjHsgKn28mOi0FzfoA=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.4.tgz"; + sha512 = "s1oY4RmYDlWMlcV0kKPBaADn46JirZzvvH7c2CtAqxCY96S538JRBAzt83RrfkDheV/+G/vWNK0zek+8TB3Gmw=="; }; }; - "@typescript-eslint/eslint-plugin-tslint-4.22.0" = { - name = "_at_typescript-eslint_slash_eslint-plugin-tslint"; - packageName = "@typescript-eslint/eslint-plugin-tslint"; - version = "4.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.22.0.tgz"; - sha512 = "r4lhAPmd69ohf5grgDALtekETv4WVCpvfXtT3Nf3UUO/88sn4HB4h8xN1afwL48BprQ4TxH7ZUv7Ou6xgRlkAA=="; - }; - }; - "@typescript-eslint/experimental-utils-4.22.0" = { + "@typescript-eslint/experimental-utils-4.28.4" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.22.0"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz"; - sha512 = "xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.4.tgz"; + sha512 = "OglKWOQRWTCoqMSy6pm/kpinEIgdcXYceIcH3EKWUl4S8xhFtN34GQRaAvTIZB9DD94rW7d/U7tUg3SYeDFNHA=="; }; }; - "@typescript-eslint/parser-4.22.0" = { + "@typescript-eslint/parser-4.28.4" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.22.0"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.22.0.tgz"; - sha512 = "z/bGdBJJZJN76nvAY9DkJANYgK3nlRstRRi74WHm3jjgf2I8AglrSY+6l7ogxOmn55YJ6oKZCLLy+6PW70z15Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.4.tgz"; + sha512 = "4i0jq3C6n+og7/uCHiE6q5ssw87zVdpUj1k6VlVYMonE3ILdFApEzTWgppSRG4kVNB/5jxnH+gTeKLMNfUelQA=="; }; }; - "@typescript-eslint/scope-manager-4.22.0" = { + "@typescript-eslint/scope-manager-4.28.4" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.22.0"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz"; - sha512 = "OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.4.tgz"; + sha512 = "ZJBNs4usViOmlyFMt9X9l+X0WAFcDH7EdSArGqpldXu7aeZxDAuAzHiMAeI+JpSefY2INHrXeqnha39FVqXb8w=="; }; }; - "@typescript-eslint/types-4.22.0" = { + "@typescript-eslint/types-4.28.4" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.22.0"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz"; - sha512 = "sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.4.tgz"; + sha512 = "3eap4QWxGqkYuEmVebUGULMskR6Cuoc/Wii0oSOddleP4EGx1tjLnZQ0ZP33YRoMDCs5O3j56RBV4g14T4jvww=="; }; }; - "@typescript-eslint/typescript-estree-4.22.0" = { + "@typescript-eslint/typescript-estree-4.28.4" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.22.0"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz"; - sha512 = "TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.4.tgz"; + sha512 = "z7d8HK8XvCRyN2SNp+OXC2iZaF+O2BTquGhEYLKLx5k6p0r05ureUtgEfo5f6anLkhCxdHtCf6rPM1p4efHYDQ=="; }; }; - "@typescript-eslint/visitor-keys-4.22.0" = { + "@typescript-eslint/visitor-keys-4.28.4" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.22.0"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz"; - sha512 = "nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.4.tgz"; + sha512 = "NIAXAdbz1XdOuzqkJHjNKXKj8QQ4cv5cxR/g0uQhCYf/6//XrmfpaYsM7PnBcNbfvTDLUkqQ5TPNm1sozDdTWg=="; }; }; "@ungap/promise-all-settled-1.1.2" = { @@ -418,12 +491,12 @@ let sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; }; }; - "Slackdown-git://github.com/half-shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" = { + "Slackdown-git+https://Half-Shot@github.com/half-shot/slackdown.git#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" = { name = "Slackdown"; packageName = "Slackdown"; version = "0.1.2"; src = fetchgit { - url = "git://github.com/half-shot/slackdown"; + url = "https://Half-Shot@github.com/half-shot/slackdown.git"; rev = "efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4"; sha256 = "474e972819b3e1db3af70be75966a3d501c6b9285f4550ff5548193e031eaf9b"; }; @@ -464,13 +537,13 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-jsx-5.3.1" = { + "acorn-jsx-5.3.2" = { name = "acorn-jsx"; packageName = "acorn-jsx"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; - sha512 = "K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng=="; + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; + sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; }; }; "ajv-6.12.6" = { @@ -509,6 +582,15 @@ let sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; }; }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; "ansi-regex-3.0.0" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -554,6 +636,24 @@ let sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; }; }; + "aproba-1.2.0" = { + name = "aproba"; + packageName = "aproba"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + }; + }; + "are-we-there-yet-1.1.7" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; + sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; + }; + }; "arg-4.1.3" = { name = "arg"; packageName = "arg"; @@ -716,13 +816,13 @@ let sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; }; }; - "axios-0.21.1" = { + "axios-0.21.4" = { name = "axios"; packageName = "axios"; - version = "0.21.1"; + version = "0.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz"; - sha512 = "dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA=="; + url = "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"; + sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; }; }; "balanced-match-1.0.2" = { @@ -743,6 +843,15 @@ let sha512 = "Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA=="; }; }; + "base64-js-1.5.1" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; + }; + }; "basic-auth-2.0.1" = { name = "basic-auth"; packageName = "basic-auth"; @@ -761,6 +870,15 @@ let sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; + "better-sqlite3-7.4.3" = { + name = "better-sqlite3"; + packageName = "better-sqlite3"; + version = "7.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.4.3.tgz"; + sha512 = "07bKjClZg/f4KMVRkzWtoIvazVPcF1gsvVKVIXlxwleC2DxuIhnra3KCMlUT1rFeRYXXckot2a46UciF2d9KLw=="; + }; + }; "binary-extensions-2.2.0" = { name = "binary-extensions"; packageName = "binary-extensions"; @@ -779,6 +897,15 @@ let sha1 = "7dbb3b210fdca082450dad2334c304af39bdc784"; }; }; + "bindings-1.5.0" = { + name = "bindings"; + packageName = "bindings"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"; + sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; + }; + }; "bintrees-1.0.1" = { name = "bintrees"; packageName = "bintrees"; @@ -788,6 +915,24 @@ let sha1 = "0e655c9b9c2435eaab68bf4027226d2b55a34524"; }; }; + "bl-4.1.0" = { + name = "bl"; + packageName = "bl"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; + }; + }; + "bluebird-3.7.2" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"; + sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; + }; + }; "body-parser-1.19.0" = { name = "body-parser"; packageName = "body-parser"; @@ -842,6 +987,15 @@ let sha1 = "be161e76c354f6f788ae4071f63f34e8c4f0a42a"; }; }; + "buffer-5.7.1" = { + name = "buffer"; + packageName = "buffer"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; + }; + }; "buffer-from-1.1.1" = { name = "buffer-from"; packageName = "buffer-from"; @@ -941,13 +1095,31 @@ let sha1 = "574d312edd88bb5dd8912e9286dd6c0aed4aac82"; }; }; - "chokidar-3.5.1" = { + "chokidar-3.5.2" = { name = "chokidar"; packageName = "chokidar"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz"; - sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz"; + sha512 = "ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ=="; + }; + }; + "chownr-1.1.4" = { + name = "chownr"; + packageName = "chownr"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; + }; + }; + "chownr-2.0.0" = { + name = "chownr"; + packageName = "chownr"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"; + sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; }; }; "cliui-7.0.4" = { @@ -959,6 +1131,15 @@ let sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; }; }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; "color-3.0.0" = { name = "color"; packageName = "color"; @@ -1013,6 +1194,15 @@ let sha512 = "dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw=="; }; }; + "colorette-1.4.0" = { + name = "colorette"; + packageName = "colorette"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz"; + sha512 = "Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="; + }; + }; "colors-1.3.3" = { name = "colors"; packageName = "colors"; @@ -1049,13 +1239,13 @@ let sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; - "comment-parser-0.7.6" = { + "comment-parser-1.1.6-beta.0" = { name = "comment-parser"; packageName = "comment-parser"; - version = "0.7.6"; + version = "1.1.6-beta.0"; src = fetchurl { - url = "https://registry.npmjs.org/comment-parser/-/comment-parser-0.7.6.tgz"; - sha512 = "GKNxVA7/iuTnAqGADlTWX4tkhzxZKXp5fLJqKTlQLHkE65XDUKutZ3BHaJC5IGcper2tT3QRD1xr4o3jNpgXXg=="; + url = "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.6-beta.0.tgz"; + sha512 = "q3cA8TSMyqW7wcPSYWzbO/rMahnXgzs4SLG/UIWXdEsnXTFPZkEkWAdNgPiHig2OzxgpPLOh4WwsmClDxndwHw=="; }; }; "concat-map-0.0.1" = { @@ -1067,6 +1257,15 @@ let sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; }; + "console-control-strings-1.1.0" = { + name = "console-control-strings"; + packageName = "console-control-strings"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + }; "content-disposition-0.5.3" = { name = "content-disposition"; packageName = "content-disposition"; @@ -1157,6 +1356,15 @@ let sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="; }; }; + "debug-4.3.2" = { + name = "debug"; + packageName = "debug"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; + }; + }; "decamelize-4.0.0" = { name = "decamelize"; packageName = "decamelize"; @@ -1166,6 +1374,15 @@ let sha512 = "9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ=="; }; }; + "decompress-response-4.2.1" = { + name = "decompress-response"; + packageName = "decompress-response"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz"; + sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw=="; + }; + }; "deep-eql-3.0.1" = { name = "deep-eql"; packageName = "deep-eql"; @@ -1175,6 +1392,15 @@ let sha512 = "+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw=="; }; }; + "deep-extend-0.6.0" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + }; + }; "deep-is-0.1.3" = { name = "deep-is"; packageName = "deep-is"; @@ -1184,6 +1410,15 @@ let sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; }; }; + "deepmerge-4.2.2" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz"; + sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; + }; + }; "delayed-stream-1.0.0" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -1193,6 +1428,15 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; + "delegates-1.0.0" = { + name = "delegates"; + packageName = "delegates"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + }; "depd-1.1.2" = { name = "depd"; packageName = "depd"; @@ -1220,6 +1464,15 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; + "detect-libc-1.0.3" = { + name = "detect-libc"; + packageName = "detect-libc"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + }; + }; "diff-4.0.2" = { name = "diff"; packageName = "diff"; @@ -1256,6 +1509,51 @@ let sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; }; }; + "dom-serializer-1.3.2" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz"; + sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="; + }; + }; + "domelementtype-2.2.0" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz"; + sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; + }; + }; + "domhandler-3.3.0" = { + name = "domhandler"; + packageName = "domhandler"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz"; + sha512 = "J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA=="; + }; + }; + "domhandler-4.2.2" = { + name = "domhandler"; + packageName = "domhandler"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz"; + sha512 = "PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w=="; + }; + }; + "domutils-2.8.0" = { + name = "domutils"; + packageName = "domutils"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"; + sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="; + }; + }; "ecc-jsbn-0.1.2" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; @@ -1301,6 +1599,15 @@ let sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; }; }; + "end-of-stream-1.4.4" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; + }; + }; "enquirer-2.3.6" = { name = "enquirer"; packageName = "enquirer"; @@ -1310,6 +1617,15 @@ let sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="; }; }; + "entities-2.2.0" = { + name = "entities"; + packageName = "entities"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; + sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; + }; + }; "escalade-3.1.1" = { name = "escalade"; packageName = "escalade"; @@ -1346,22 +1662,22 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-7.24.0" = { + "eslint-7.31.0" = { name = "eslint"; packageName = "eslint"; - version = "7.24.0"; + version = "7.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.24.0.tgz"; - sha512 = "k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.31.0.tgz"; + sha512 = "vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA=="; }; }; - "eslint-plugin-jsdoc-30.7.13" = { + "eslint-plugin-jsdoc-35.5.0" = { name = "eslint-plugin-jsdoc"; packageName = "eslint-plugin-jsdoc"; - version = "30.7.13"; + version = "35.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.13.tgz"; - sha512 = "YM4WIsmurrp0rHX6XiXQppqKB8Ne5ATiZLJe2+/fkp9l9ExXFr43BbAbjZaVrpCT+tuPYOZ8k1MICARHnURUNQ=="; + url = "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-35.5.0.tgz"; + sha512 = "QBtfGeKvSFjbMLl28fRVyk/V7NhdSy+/4a6nOUXNsJ+Ya4G88YwbBiHIZgU4COeMKPb+OGGnrLwxYO0tZiw+kg=="; }; }; "eslint-plugin-prefer-arrow-1.2.3" = { @@ -1391,6 +1707,15 @@ let sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; }; }; + "eslint-utils-3.0.0" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz"; + sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; + }; + }; "eslint-visitor-keys-1.3.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; @@ -1499,6 +1824,15 @@ let sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; }; }; + "expand-template-2.0.3" = { + name = "expand-template"; + packageName = "expand-template"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz"; + sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; + }; + }; "express-4.17.1" = { name = "express"; packageName = "express"; @@ -1535,13 +1869,13 @@ let sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; - "fast-glob-3.2.5" = { + "fast-glob-3.2.7" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.5"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz"; - sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz"; + sha512 = "rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -1571,13 +1905,13 @@ let sha512 = "q8BZ89jjc+mz08rSxROs8VsrBBcn1SIw1kq9NjolL509tkABRk9io01RAjSaEv1Xb2uFLt8VtRiZbGp5H8iDtg=="; }; }; - "fastq-1.11.0" = { + "fastq-1.11.1" = { name = "fastq"; packageName = "fastq"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz"; - sha512 = "7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.11.1.tgz"; + sha512 = "HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw=="; }; }; "fecha-4.2.0" = { @@ -1607,6 +1941,15 @@ let sha512 = "VYb3HZ/GiAGUCrfeakO8Mp54YGswNUHvL7P09WQcXAJNSj3iQ5QraYSp3cIn1MUyw6uzfgN/EFOarCNa4JvUHQ=="; }; }; + "file-uri-to-path-1.0.0" = { + name = "file-uri-to-path"; + packageName = "file-uri-to-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; + }; + }; "fill-range-7.0.1" = { name = "fill-range"; packageName = "fill-range"; @@ -1679,13 +2022,13 @@ let sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; - "follow-redirects-1.13.1" = { + "follow-redirects-1.14.4" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.13.1"; + version = "1.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz"; - sha512 = "SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz"; + sha512 = "zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g=="; }; }; "forever-agent-0.6.1" = { @@ -1733,6 +2076,24 @@ let sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; }; }; + "fs-constants-1.0.0" = { + name = "fs-constants"; + packageName = "fs-constants"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"; + sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; + }; + }; + "fs-minipass-2.1.0" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; + }; + }; "fs.realpath-1.0.0" = { name = "fs.realpath"; packageName = "fs.realpath"; @@ -1769,6 +2130,15 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; + "gauge-2.7.4" = { + name = "gauge"; + packageName = "gauge"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + }; "generate-function-2.3.1" = { name = "generate-function"; packageName = "generate-function"; @@ -1823,13 +2193,22 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "glob-7.1.6" = { + "github-from-package-0.0.0" = { + name = "github-from-package"; + packageName = "github-from-package"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz"; + sha1 = "97fb5d96bfde8973313f20e8288ef9a167fa64ce"; + }; + }; + "glob-7.1.7" = { name = "glob"; packageName = "glob"; - version = "7.1.6"; + version = "7.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + url = "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"; + sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; }; }; "glob-parent-5.1.2" = { @@ -1841,31 +2220,40 @@ let sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; }; }; - "globals-12.4.0" = { - name = "globals"; - packageName = "globals"; - version = "12.4.0"; + "glob-to-regexp-0.4.1" = { + name = "glob-to-regexp"; + packageName = "glob-to-regexp"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz"; - sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; + url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"; + sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; }; }; - "globals-13.8.0" = { + "globals-13.10.0" = { name = "globals"; packageName = "globals"; - version = "13.8.0"; + version = "13.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz"; - sha512 = "rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q=="; + url = "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz"; + sha512 = "piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g=="; }; }; - "globby-11.0.3" = { + "globby-11.0.4" = { name = "globby"; packageName = "globby"; - version = "11.0.3"; + version = "11.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz"; - sha512 = "ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg=="; + url = "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz"; + sha512 = "9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg=="; + }; + }; + "graceful-fs-4.2.8" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; }; }; "growl-1.10.5" = { @@ -1931,6 +2319,24 @@ let sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; }; }; + "has-unicode-2.0.1" = { + name = "has-unicode"; + packageName = "has-unicode"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + }; + "hash.js-1.1.7" = { + name = "hash.js"; + packageName = "hash.js"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz"; + sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; + }; + }; "he-1.2.0" = { name = "he"; packageName = "he"; @@ -1940,6 +2346,42 @@ let sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; }; }; + "html-to-text-6.0.0" = { + name = "html-to-text"; + packageName = "html-to-text"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/html-to-text/-/html-to-text-6.0.0.tgz"; + sha512 = "r0KNC5aqCAItsjlgtirW6RW25c92Ee3ybQj8z//4Sl4suE3HIPqM4deGpYCUJULLjtVPEP1+Ma+1ZeX1iMsCiA=="; + }; + }; + "htmlencode-0.0.4" = { + name = "htmlencode"; + packageName = "htmlencode"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlencode/-/htmlencode-0.0.4.tgz"; + sha1 = "f7e2d6afbe18a87a78e63ba3308e753766740e3f"; + }; + }; + "htmlparser2-4.1.0" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz"; + sha512 = "4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q=="; + }; + }; + "htmlparser2-6.1.0" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz"; + sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; + }; + }; "http-errors-1.7.2" = { name = "http-errors"; packageName = "http-errors"; @@ -1967,6 +2409,15 @@ let sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; + "ieee754-1.2.1" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; + }; + }; "ignore-4.0.6" = { name = "ignore"; packageName = "ignore"; @@ -2030,6 +2481,24 @@ let sha1 = "633c2c83e3da42a502f52466022480f4208261de"; }; }; + "inherits-2.0.4" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + }; + "ini-1.3.8" = { + name = "ini"; + packageName = "ini"; + version = "1.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; + }; + }; "ipaddr.js-1.9.1" = { name = "ipaddr.js"; packageName = "ipaddr.js"; @@ -2075,6 +2544,15 @@ let sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; "is-fullwidth-code-point-2.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -2147,6 +2625,24 @@ let sha512 = "YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA=="; }; }; + "is-plain-object-5.0.0" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"; + sha512 = "VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="; + }; + }; + "is-promise-2.2.2" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz"; + sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; + }; + }; "is-property-1.0.2" = { name = "is-property"; packageName = "is-property"; @@ -2192,6 +2688,15 @@ let sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; }; + "is-unicode-supported-0.1.0" = { + name = "is-unicode-supported"; + packageName = "is-unicode-supported"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"; + sha512 = "knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="; + }; + }; "isarray-1.0.0" = { name = "isarray"; packageName = "isarray"; @@ -2237,15 +2742,6 @@ let sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; }; }; - "js-yaml-4.0.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz"; - sha512 = "pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q=="; - }; - }; "js-yaml-4.1.0" = { name = "js-yaml"; packageName = "js-yaml"; @@ -2264,13 +2760,13 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; - "jsdoctypeparser-9.0.0" = { - name = "jsdoctypeparser"; - packageName = "jsdoctypeparser"; - version = "9.0.0"; + "jsdoc-type-pratt-parser-1.0.4" = { + name = "jsdoc-type-pratt-parser"; + packageName = "jsdoc-type-pratt-parser"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz"; - sha512 = "jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw=="; + url = "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.0.4.tgz"; + sha512 = "jzmW9gokeq9+bHPDR1nCeidMyFUikdZlbOhKzh9+/nJqB75XhpNKec1/UuxW5c4+O+Pi31Gc/dCboyfSm/pSpQ=="; }; }; "json-schema-0.2.3" = { @@ -2336,6 +2832,15 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; + "klona-2.0.4" = { + name = "klona"; + packageName = "klona"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz"; + sha512 = "ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA=="; + }; + }; "kuler-2.0.0" = { name = "kuler"; packageName = "kuler"; @@ -2381,15 +2886,6 @@ let sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; }; }; - "lodash-4.17.20" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.20"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz"; - sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="; - }; - }; "lodash-4.17.21" = { name = "lodash"; packageName = "lodash"; @@ -2417,6 +2913,15 @@ let sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; }; }; + "lodash.merge-4.6.2" = { + name = "lodash.merge"; + packageName = "lodash.merge"; + version = "4.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; + }; + }; "lodash.toarray-4.4.0" = { name = "lodash.toarray"; packageName = "lodash.toarray"; @@ -2435,13 +2940,13 @@ let sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; }; }; - "log-symbols-4.0.0" = { + "log-symbols-4.1.0" = { name = "log-symbols"; packageName = "log-symbols"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz"; - sha512 = "FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA=="; + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz"; + sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; }; }; "logform-2.2.0" = { @@ -2462,6 +2967,15 @@ let sha512 = "Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw=="; }; }; + "lowdb-1.0.0" = { + name = "lowdb"; + packageName = "lowdb"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lowdb/-/lowdb-1.0.0.tgz"; + sha512 = "2+x8esE/Wb9SQ1F9IHaYWfsC9FIecLOPrK4g17FGEayjUWH172H6nwicRovGvSE2CPZouc2MCIqCI7h9d+GftQ=="; + }; + }; "lru-cache-6.0.0" = { name = "lru-cache"; packageName = "lru-cache"; @@ -2489,13 +3003,22 @@ let sha512 = "mfgMpmV3dWLtzrd4V/3XtqUD0P44I/mTgsRreW5jMhSaUnnRGZbpptBw2q4/axbLjw2FarlWtOVgertDGMtccA=="; }; }; - "matrix-appservice-bridge-2.6.0" = { + "matrix-appservice-bridge-3.1.0" = { name = "matrix-appservice-bridge"; packageName = "matrix-appservice-bridge"; - version = "2.6.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-2.6.0.tgz"; - sha512 = "o1KHQHG1GdfUhTFBXVLztwbTowuCFO9/h8n2zdkRK/bZsdcXSFQVfUwDtRULcyinD4N7r0Lrwlg1LyR0pg2WSw=="; + url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-3.1.0.tgz"; + sha512 = "mNLWyqLigy5TboZw+EJ38mtsVlJUKa50HEjtyzx0aJLySNvnCgDFFlMahJWedOrZ3ipultnhtaRbtU1ZVsu6yA=="; + }; + }; + "matrix-bot-sdk-0.6.0-beta.2" = { + name = "matrix-bot-sdk"; + packageName = "matrix-bot-sdk"; + version = "0.6.0-beta.2"; + src = fetchurl { + url = "https://registry.npmjs.org/matrix-bot-sdk/-/matrix-bot-sdk-0.6.0-beta.2.tgz"; + sha512 = "D9aQ2++1bJIzka2uIz22HkaeyT058QGOh96xdxiDOaezyzLY5BN7ehYg+P0xRzDYDFKx9DbqDYCt97IkfahtPw=="; }; }; "matrix-js-sdk-9.11.0" = { @@ -2579,6 +3102,24 @@ let sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; }; }; + "mimic-response-2.1.0" = { + name = "mimic-response"; + packageName = "mimic-response"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz"; + sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; + }; + }; + "minimalistic-assert-1.0.1" = { + name = "minimalistic-assert"; + packageName = "minimalistic-assert"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; + sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; + }; + }; "minimatch-3.0.4" = { name = "minimatch"; packageName = "minimatch"; @@ -2597,6 +3138,24 @@ let sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; + "minipass-3.1.5" = { + name = "minipass"; + packageName = "minipass"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz"; + sha512 = "+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw=="; + }; + }; + "minizlib-2.1.2" = { + name = "minizlib"; + packageName = "minizlib"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz"; + sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; + }; + }; "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; @@ -2606,13 +3165,31 @@ let sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "mocha-8.3.2" = { + "mkdirp-1.0.4" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; + sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; + }; + }; + "mkdirp-classic-0.5.3" = { + name = "mkdirp-classic"; + packageName = "mkdirp-classic"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; + sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; + }; + }; + "mocha-9.0.2" = { name = "mocha"; packageName = "mocha"; - version = "8.3.2"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.3.2.tgz"; - sha512 = "UdmISwr/5w+uXLPKspgoV7/RXZwKRTiTjJ2/AC5ZiEztIoOYdfKb19+9jNmEInzx5pBsCyJQzarAxqIGBNYJhg=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.0.2.tgz"; + sha512 = "FpspiWU+UT9Sixx/wKimvnpkeW0mh6ROAKkIaPokj3xZgxeRhcna/k5X57jJghEr8X+Cgu/Vegf8zCX5ugSuTA=="; }; }; "moment-2.29.1" = { @@ -2669,13 +3246,22 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "nanoid-3.1.20" = { + "nanoid-3.1.23" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.20"; + version = "3.1.23"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz"; - sha512 = "a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz"; + sha512 = "FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw=="; + }; + }; + "napi-build-utils-1.0.2" = { + name = "napi-build-utils"; + packageName = "napi-build-utils"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz"; + sha512 = "ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="; }; }; "natural-compare-1.4.0" = { @@ -2705,6 +3291,15 @@ let sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; + "node-abi-2.30.1" = { + name = "node-abi"; + packageName = "node-abi"; + version = "2.30.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz"; + sha512 = "/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w=="; + }; + }; "node-emoji-1.10.0" = { name = "node-emoji"; packageName = "node-emoji"; @@ -2732,6 +3327,24 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; + "npmlog-4.1.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; "nunjucks-3.2.3" = { name = "nunjucks"; packageName = "nunjucks"; @@ -2750,6 +3363,15 @@ let sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; "object-hash-2.1.1" = { name = "object-hash"; packageName = "object-hash"; @@ -2903,6 +3525,15 @@ let sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; }; }; + "parse-srcset-1.0.2" = { + name = "parse-srcset"; + packageName = "parse-srcset"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz"; + sha1 = "f2bd221f6cc970a938d88556abc589caaaa2bde1"; + }; + }; "parseurl-1.3.3" = { name = "parseurl"; packageName = "parseurl"; @@ -2975,13 +3606,13 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "pg-8.5.1" = { + "pg-8.6.0" = { name = "pg"; packageName = "pg"; - version = "8.5.1"; + version = "8.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.5.1.tgz"; - sha512 = "9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw=="; + url = "https://registry.npmjs.org/pg/-/pg-8.6.0.tgz"; + sha512 = "qNS9u61lqljTDFvmk/N66EeGq3n6Ujzj0FFyNMGQr6XuEv4tgNTXvJQTfJdcvGit5p5/DWPu+wj920hAJFI+QQ=="; }; }; "pg-connection-string-2.5.0" = { @@ -3020,13 +3651,13 @@ let sha512 = "0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg=="; }; }; - "pg-promise-10.10.1" = { + "pg-promise-10.10.2" = { name = "pg-promise"; packageName = "pg-promise"; - version = "10.10.1"; + version = "10.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.10.1.tgz"; - sha512 = "sopmuOr2PrUNh3XI0Y15ssmjcwhZnGHyGYwuDDmWFnBydq7lvrhTMBI3hefAp3YMx07+HSXfSpJse9z5vC4bsw=="; + url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.10.2.tgz"; + sha512 = "ezc5Jn2DdtYpNoDjo7v9TVQFXBEGR+tnseot8IsZ3/B4XD/CnIjyUPMfizDdbXWNO66hN8p2m8nNrcrJ8uhM/g=="; }; }; "pg-protocol-1.5.0" = { @@ -3065,6 +3696,24 @@ let sha512 = "KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg=="; }; }; + "pify-3.0.0" = { + name = "pify"; + packageName = "pify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + }; + "postcss-8.3.6" = { + name = "postcss"; + packageName = "postcss"; + version = "8.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz"; + sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A=="; + }; + }; "postgres-array-2.0.0" = { name = "postgres-array"; packageName = "postgres-array"; @@ -3101,6 +3750,15 @@ let sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; }; + "prebuild-install-6.1.4" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "6.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz"; + sha512 = "Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ=="; + }; + }; "prelude-ls-1.2.1" = { name = "prelude-ls"; packageName = "prelude-ls"; @@ -3155,6 +3813,15 @@ let sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; }; }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + }; + }; "punycode-2.1.1" = { name = "punycode"; packageName = "punycode"; @@ -3200,13 +3867,13 @@ let sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; }; }; - "quick-lru-5.1.1" = { - name = "quick-lru"; - packageName = "quick-lru"; - version = "5.1.1"; + "randombytes-2.0.3" = { + name = "randombytes"; + packageName = "randombytes"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz"; - sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="; + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.3.tgz"; + sha1 = "674c99760901c3c4112771a31e521dc349cc09ec"; }; }; "randombytes-2.1.0" = { @@ -3218,13 +3885,13 @@ let sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; }; }; - "randomstring-1.1.5" = { + "randomstring-1.2.1" = { name = "randomstring"; packageName = "randomstring"; - version = "1.1.5"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/randomstring/-/randomstring-1.1.5.tgz"; - sha1 = "6df0628f75cbd5932930d9fe3ab4e956a18518c3"; + url = "https://registry.npmjs.org/randomstring/-/randomstring-1.2.1.tgz"; + sha512 = "eMnfell9XuU3jfCx3f4xCaFAt0YMFPZhx9R3PSStmLarDKg5j5vivqKhf/8pvG+VX/YkxsckHK/VPUrKa5V07A=="; }; }; "range-parser-1.2.1" = { @@ -3245,6 +3912,15 @@ let sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; }; + "rc-1.2.8" = { + name = "rc"; + packageName = "rc"; + version = "1.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; + }; + }; "readable-stream-2.3.7" = { name = "readable-stream"; packageName = "readable-stream"; @@ -3263,13 +3939,13 @@ let sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; - "readdirp-3.5.0" = { + "readdirp-3.6.0" = { name = "readdirp"; packageName = "readdirp"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz"; - sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ=="; + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"; + sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; }; }; "regenerator-runtime-0.13.7" = { @@ -3290,13 +3966,13 @@ let sha512 = "ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="; }; }; - "regextras-0.7.1" = { + "regextras-0.8.0" = { name = "regextras"; packageName = "regextras"; - version = "0.7.1"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/regextras/-/regextras-0.7.1.tgz"; - sha512 = "9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w=="; + url = "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz"; + sha512 = "k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ=="; }; }; "request-2.88.2" = { @@ -3308,6 +3984,24 @@ let sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; }; + "request-promise-4.2.6" = { + name = "request-promise"; + packageName = "request-promise"; + version = "4.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/request-promise/-/request-promise-4.2.6.tgz"; + sha512 = "HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ=="; + }; + }; + "request-promise-core-1.1.4" = { + name = "request-promise-core"; + packageName = "request-promise-core"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz"; + sha512 = "TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw=="; + }; + }; "require-directory-2.1.1" = { name = "require-directory"; packageName = "require-directory"; @@ -3398,6 +4092,24 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; + "sanitize-html-2.5.1" = { + name = "sanitize-html"; + packageName = "sanitize-html"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.5.1.tgz"; + sha512 = "hUITPitQk+eFNLtr4dEkaaiAJndG2YE87IOpcfBSL1XdklWgwcNDJdr9Ppe8QKL/C3jFt1xH/Mbj20e0GZQOfg=="; + }; + }; + "semver-5.7.1" = { + name = "semver"; + packageName = "semver"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + }; + }; "semver-7.3.4" = { name = "semver"; packageName = "semver"; @@ -3407,6 +4119,15 @@ let sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw=="; }; }; + "semver-7.3.5" = { + name = "semver"; + packageName = "semver"; + version = "7.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; + }; + }; "send-0.17.1" = { name = "send"; packageName = "send"; @@ -3416,13 +4137,13 @@ let sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; - "serialize-javascript-5.0.1" = { + "serialize-javascript-6.0.0" = { name = "serialize-javascript"; packageName = "serialize-javascript"; - version = "5.0.1"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; - sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz"; + sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag=="; }; }; "serve-static-1.14.1" = { @@ -3434,6 +4155,15 @@ let sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; }; }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; "setprototypeof-1.1.1" = { name = "setprototypeof"; packageName = "setprototypeof"; @@ -3470,6 +4200,33 @@ let sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; }; }; + "signal-exit-3.0.4" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.4.tgz"; + sha512 = "rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q=="; + }; + }; + "simple-concat-1.0.1" = { + name = "simple-concat"; + packageName = "simple-concat"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz"; + sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; + }; + }; + "simple-get-3.1.0" = { + name = "simple-get"; + packageName = "simple-get"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz"; + sha512 = "bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA=="; + }; + }; "simple-swizzle-0.2.2" = { name = "simple-swizzle"; packageName = "simple-swizzle"; @@ -3506,6 +4263,15 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; + "source-map-js-0.6.2" = { + name = "source-map-js"; + packageName = "source-map-js"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz"; + sha512 = "/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug=="; + }; + }; "source-map-support-0.5.19" = { name = "source-map-support"; packageName = "source-map-support"; @@ -3596,6 +4362,33 @@ let sha1 = "161c7dac177659fd9811f43771fa99381478628c"; }; }; + "stealthy-require-1.1.1" = { + name = "stealthy-require"; + packageName = "stealthy-require"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz"; + sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; + }; + }; + "steno-0.4.4" = { + name = "steno"; + packageName = "steno"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/steno/-/steno-0.4.4.tgz"; + sha1 = "071105bdfc286e6615c0403c27e9d7b5dcb855cb"; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; "string-width-2.1.1" = { name = "string-width"; packageName = "string-width"; @@ -3632,6 +4425,15 @@ let sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; "strip-ansi-4.0.0" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -3650,6 +4452,15 @@ let sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; }; }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + }; "strip-json-comments-3.1.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -3695,6 +4506,33 @@ let sha512 = "WMBBLuauiLXJjth35K4vOnd/xkaZ/dxEcyoZ+YhxSwfxFqvh+av06+oRqIwbR14m1lENB1egSWOFv/bNEt2D8A=="; }; }; + "tar-6.1.11" = { + name = "tar"; + packageName = "tar"; + version = "6.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz"; + sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; + }; + }; + "tar-fs-2.1.1" = { + name = "tar-fs"; + packageName = "tar-fs"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz"; + sha512 = "V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng=="; + }; + }; + "tar-stream-2.2.0" = { + name = "tar-stream"; + packageName = "tar-stream"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz"; + sha512 = "ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="; + }; + }; "tdigest-0.1.1" = { name = "tdigest"; packageName = "tdigest"; @@ -3758,13 +4596,13 @@ let sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; }; }; - "ts-node-9.1.1" = { + "ts-node-10.1.0" = { name = "ts-node"; packageName = "ts-node"; - version = "9.1.1"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz"; - sha512 = "hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-10.1.0.tgz"; + sha512 = "6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA=="; }; }; "tslib-1.14.1" = { @@ -3830,15 +4668,6 @@ let sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; }; }; - "type-fest-0.8.1" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"; - sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; - }; - }; "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; @@ -3848,13 +4677,13 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typescript-4.2.4" = { + "typescript-4.4.3" = { name = "typescript"; packageName = "typescript"; - version = "4.2.4"; + version = "4.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz"; - sha512 = "V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz"; + sha512 = "4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA=="; }; }; "underscore-1.4.4" = { @@ -3983,13 +4812,13 @@ let sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw=="; }; }; - "winston-daily-rotate-file-4.5.2" = { + "winston-daily-rotate-file-4.5.5" = { name = "winston-daily-rotate-file"; packageName = "winston-daily-rotate-file"; - version = "4.5.2"; + version = "4.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.5.2.tgz"; - sha512 = "DpAz9djExzFGVGRIKCKzsjOQaIINbjOUJ8CRsZGz0SQOMMcO1kM7jqTdzQAM9CRTEksZV9bBw9TT0ddQBGxs9g=="; + url = "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.5.5.tgz"; + sha512 = "ds0WahIjiDhKCiMXmY799pDBW+58ByqIBtUcsqr4oDoXrAI3Zn+hbgFdUxzMfqA93OG0mPLYVMiotqTgE/WeWQ=="; }; }; "winston-transport-4.4.0" = { @@ -4010,13 +4839,13 @@ let sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; }; }; - "workerpool-6.1.0" = { + "workerpool-6.1.5" = { name = "workerpool"; packageName = "workerpool"; - version = "6.1.0"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz"; - sha512 = "toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg=="; + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz"; + sha512 = "XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw=="; }; }; "wrap-ansi-7.0.0" = { @@ -4037,13 +4866,13 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "ws-5.2.2" = { + "ws-5.2.3" = { name = "ws"; packageName = "ws"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz"; - sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA=="; + url = "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz"; + sha512 = "jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA=="; }; }; "xtend-4.0.2" = { @@ -4055,13 +4884,13 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; - "y18n-5.0.5" = { + "y18n-5.0.8" = { name = "y18n"; packageName = "y18n"; - version = "5.0.5"; + version = "5.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz"; - sha512 = "hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg=="; + url = "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"; + sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; }; }; "yallist-4.0.0" = { @@ -4082,6 +4911,15 @@ let sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; }; }; + "yargs-17.2.1" = { + name = "yargs"; + packageName = "yargs"; + version = "17.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-17.2.1.tgz"; + sha512 = "XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q=="; + }; + }; "yargs-parser-20.2.4" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -4122,9 +4960,10 @@ let args = { name = "matrix-appservice-slack"; packageName = "matrix-appservice-slack"; - version = "1.8.0"; + version = "1.9.0"; src = ./.; dependencies = [ + sources."@alloc/quick-lru-5.2.0" sources."@babel/code-frame-7.12.11" sources."@babel/helper-validator-identifier-7.12.11" (sources."@babel/highlight-7.13.10" // { @@ -4135,18 +4974,25 @@ let }) sources."@babel/runtime-7.13.10" sources."@dabh/diagnostics-2.0.2" - (sources."@eslint/eslintrc-0.4.0" // { + sources."@es-joy/jsdoccomment-0.9.0-alpha.1" + (sources."@eslint/eslintrc-0.4.3" // { dependencies = [ - sources."debug-4.3.1" - sources."globals-12.4.0" - sources."ignore-4.0.6" + sources."debug-4.3.2" sources."js-yaml-3.14.1" sources."ms-2.1.2" ]; }) - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + (sources."@humanwhocodes/config-array-0.5.0" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + sources."@humanwhocodes/object-schema-1.2.0" + sources."@matrix-org/olm-https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.4.tgz" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" sources."@slack/logger-2.0.0" (sources."@slack/rtm-api-5.0.5" // { dependencies = [ @@ -4154,71 +5000,83 @@ let ]; }) sources."@slack/types-1.10.0" - (sources."@slack/web-api-5.15.0" // { - dependencies = [ - sources."axios-0.21.1" - ]; - }) + sources."@slack/web-api-5.15.0" + sources."@tsconfig/node10-1.0.8" + sources."@tsconfig/node12-1.0.9" + sources."@tsconfig/node14-1.0.1" + sources."@tsconfig/node16-1.0.1" sources."@types/body-parser-1.19.0" - sources."@types/chai-4.2.16" + sources."@types/chai-4.2.21" sources."@types/connect-3.4.34" - sources."@types/express-4.17.11" + sources."@types/express-4.17.13" sources."@types/express-serve-static-core-4.17.19" sources."@types/is-stream-1.1.0" - sources."@types/js-yaml-4.0.0" - sources."@types/json-schema-7.0.7" + sources."@types/js-yaml-4.0.2" + sources."@types/json-schema-7.0.8" sources."@types/mime-1.3.2" - sources."@types/mocha-8.2.2" - sources."@types/nedb-1.8.11" - sources."@types/node-14.14.41" + sources."@types/mocha-8.2.3" + sources."@types/nedb-1.8.12" + sources."@types/node-12.20.16" sources."@types/node-emoji-1.8.1" - sources."@types/nunjucks-3.1.4" + sources."@types/nunjucks-3.1.5" sources."@types/p-queue-2.3.2" sources."@types/qs-6.9.6" - sources."@types/randomstring-1.1.6" + sources."@types/randomstring-1.1.7" sources."@types/range-parser-1.2.3" sources."@types/retry-0.12.0" sources."@types/serve-static-1.13.9" - sources."@types/uuid-8.3.0" + sources."@types/uuid-8.3.1" sources."@types/ws-7.2.6" - sources."@types/yargs-15.0.13" - sources."@types/yargs-parser-15.0.0" - (sources."@typescript-eslint/eslint-plugin-4.22.0" // { + sources."@types/yargs-17.0.3" + sources."@types/yargs-parser-20.2.1" + (sources."@typescript-eslint/eslint-plugin-4.28.4" // { + dependencies = [ + sources."debug-4.3.1" + sources."ms-2.1.2" + sources."semver-7.3.5" + ]; + }) + (sources."@typescript-eslint/experimental-utils-4.28.4" // { + dependencies = [ + sources."eslint-utils-3.0.0" + ]; + }) + (sources."@typescript-eslint/parser-4.28.4" // { dependencies = [ sources."debug-4.3.1" sources."ms-2.1.2" ]; }) - sources."@typescript-eslint/eslint-plugin-tslint-4.22.0" - sources."@typescript-eslint/experimental-utils-4.22.0" - (sources."@typescript-eslint/parser-4.22.0" // { + sources."@typescript-eslint/scope-manager-4.28.4" + sources."@typescript-eslint/types-4.28.4" + (sources."@typescript-eslint/typescript-estree-4.28.4" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" + sources."semver-7.3.5" ]; }) - sources."@typescript-eslint/scope-manager-4.22.0" - sources."@typescript-eslint/types-4.22.0" - (sources."@typescript-eslint/typescript-estree-4.22.0" // { - dependencies = [ - sources."debug-4.3.1" - sources."ms-2.1.2" - ]; - }) - sources."@typescript-eslint/visitor-keys-4.22.0" + sources."@typescript-eslint/visitor-keys-4.28.4" sources."@ungap/promise-all-settled-1.1.2" - sources."Slackdown-git://github.com/half-shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" + sources."Slackdown-git+https://Half-Shot@github.com/half-shot/slackdown.git#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" sources."a-sync-waterfall-1.0.1" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."acorn-7.4.1" - sources."acorn-jsx-5.3.1" + sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."another-json-0.2.0" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" + sources."aproba-1.2.0" + (sources."are-we-there-yet-1.1.7" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."arg-4.1.3" sources."argparse-1.0.10" sources."array-flatten-1.1.1" @@ -4235,20 +5093,30 @@ let sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."axios-0.21.1" + sources."axios-0.21.4" sources."balanced-match-1.0.2" sources."base-x-3.0.8" + sources."base64-js-1.5.1" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" + sources."better-sqlite3-7.4.3" sources."binary-extensions-2.2.0" sources."binary-search-tree-0.2.5" + sources."bindings-1.5.0" sources."bintrees-1.0.1" + (sources."bl-4.1.0" // { + dependencies = [ + sources."inherits-2.0.4" + ]; + }) + sources."bluebird-3.7.2" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-request-0.3.3" sources."browser-stdout-1.3.1" sources."bs58-4.0.1" + sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."buffer-writer-2.0.0" sources."bytes-3.1.0" @@ -4267,17 +5135,22 @@ let ]; }) sources."check-error-1.0.2" - sources."chokidar-3.5.1" + sources."chokidar-3.5.2" + sources."chownr-2.0.0" + sources."cliui-7.0.4" + sources."code-point-at-1.1.0" sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.5.3" + sources."colorette-1.4.0" sources."colors-1.3.3" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" sources."commander-5.1.0" - sources."comment-parser-0.7.6" + sources."comment-parser-1.1.6-beta.0" sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" sources."content-disposition-0.5.3" sources."content-type-1.0.4" sources."cookie-0.4.0" @@ -4288,36 +5161,54 @@ let sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-4.0.0" + sources."decompress-response-4.2.1" sources."deep-eql-3.0.1" + sources."deep-extend-0.6.0" sources."deep-is-0.1.3" + sources."deepmerge-4.2.2" sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" + sources."detect-libc-1.0.3" sources."diff-4.0.2" sources."dir-glob-3.0.1" sources."doctrine-3.0.0" + (sources."dom-serializer-1.3.2" // { + dependencies = [ + sources."domhandler-4.2.2" + ]; + }) + sources."domelementtype-2.2.0" + sources."domhandler-3.3.0" + (sources."domutils-2.8.0" // { + dependencies = [ + sources."domhandler-4.2.2" + ]; + }) sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."enabled-2.0.0" sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" + sources."entities-2.2.0" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" - (sources."eslint-7.24.0" // { + (sources."eslint-7.31.0" // { dependencies = [ sources."debug-4.3.1" - sources."ignore-4.0.6" sources."js-yaml-3.14.1" - sources."lodash-4.17.21" sources."ms-2.1.2" ]; }) - (sources."eslint-plugin-jsdoc-30.7.13" // { + (sources."eslint-plugin-jsdoc-35.5.0" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.2" sources."ms-2.1.2" + sources."semver-7.3.5" ]; }) sources."eslint-plugin-prefer-arrow-1.2.3" @@ -4348,17 +5239,19 @@ let sources."esutils-2.0.3" sources."etag-1.8.1" sources."eventemitter3-3.1.2" + sources."expand-template-2.0.3" sources."express-4.17.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.6" - sources."fastq-1.11.0" + sources."fastq-1.11.1" sources."file-entry-cache-6.0.1" sources."file-stream-rotator-0.5.7" + sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" sources."find-up-5.0.0" @@ -4367,45 +5260,69 @@ let sources."flat-cache-3.0.4" sources."flatted-3.1.1" sources."fn.name-1.1.0" - sources."follow-redirects-1.13.1" + sources."follow-redirects-1.14.4" sources."forever-agent-0.6.1" sources."form-data-2.5.1" sources."forwarded-0.1.2" sources."fresh-0.5.2" + sources."fs-constants-1.0.0" + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-2.0.5" sources."get-func-name-2.0.0" sources."get-intrinsic-1.1.1" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."github-from-package-0.0.0" + sources."glob-7.1.7" sources."glob-parent-5.1.2" - (sources."globals-13.8.0" // { + sources."glob-to-regexp-0.4.1" + (sources."globals-13.10.0" // { dependencies = [ sources."type-fest-0.20.2" ]; }) - sources."globby-11.0.3" + (sources."globby-11.0.4" // { + dependencies = [ + sources."ignore-5.1.8" + ]; + }) + sources."graceful-fs-4.2.8" sources."growl-1.10.5" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" + sources."has-unicode-2.0.1" + sources."hash.js-1.1.7" sources."he-1.2.0" + sources."html-to-text-6.0.0" + sources."htmlencode-0.0.4" + sources."htmlparser2-4.1.0" sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" - sources."ignore-5.1.8" + sources."ieee754-1.2.1" + sources."ignore-4.0.6" sources."immediate-3.0.6" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" + sources."ini-1.3.8" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" @@ -4418,10 +5335,13 @@ let sources."is-number-7.0.0" sources."is-number-object-1.0.4" sources."is-plain-obj-2.1.0" + sources."is-plain-object-5.0.0" + sources."is-promise-2.2.2" sources."is-property-1.0.2" sources."is-stream-1.1.0" sources."is-string-1.0.5" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" @@ -4432,24 +5352,26 @@ let ]; }) sources."jsbn-0.1.1" - sources."jsdoctypeparser-9.0.0" + sources."jsdoc-type-pratt-parser-1.0.4" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" sources."jsonpointer-4.1.0" sources."jsprim-1.4.1" + sources."klona-2.0.4" sources."kuler-2.0.0" sources."levn-0.4.1" sources."lie-3.1.1" sources."localforage-1.7.3" sources."locate-path-6.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.clonedeep-4.5.0" sources."lodash.flatten-4.4.0" + sources."lodash.merge-4.6.2" sources."lodash.toarray-4.4.0" sources."lodash.truncate-4.4.2" - sources."log-symbols-4.0.0" + sources."log-symbols-4.1.0" (sources."logform-2.2.0" // { dependencies = [ sources."fecha-4.2.0" @@ -4457,15 +5379,23 @@ let ]; }) sources."loglevel-1.7.1" + sources."lowdb-1.0.0" sources."lru-cache-6.0.0" sources."make-error-1.3.6" - (sources."matrix-appservice-0.8.0" // { + (sources."matrix-appservice-bridge-3.1.0" // { dependencies = [ - sources."argparse-1.0.10" - sources."js-yaml-3.14.1" + (sources."matrix-appservice-0.8.0" // { + dependencies = [ + sources."js-yaml-3.14.1" + ]; + }) + ]; + }) + (sources."matrix-bot-sdk-0.6.0-beta.2" // { + dependencies = [ + sources."mkdirp-1.0.4" ]; }) - sources."matrix-appservice-bridge-2.6.0" (sources."matrix-js-sdk-9.11.0" // { dependencies = [ sources."qs-6.10.1" @@ -4479,12 +5409,16 @@ let sources."mime-1.6.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" + sources."mimic-response-2.1.0" + sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" + sources."minipass-3.1.5" + sources."minizlib-2.1.2" sources."mkdirp-0.5.5" - (sources."mocha-8.3.2" // { + sources."mkdirp-classic-0.5.3" + (sources."mocha-9.0.2" // { dependencies = [ - sources."argparse-2.0.1" (sources."debug-4.3.1" // { dependencies = [ sources."ms-2.1.2" @@ -4492,9 +5426,9 @@ let }) sources."diff-5.0.0" sources."has-flag-4.0.0" - sources."js-yaml-4.0.0" sources."ms-2.1.3" sources."supports-color-8.1.1" + sources."yargs-16.2.0" ]; }) sources."moment-2.29.1" @@ -4504,15 +5438,24 @@ let ]; }) sources."ms-2.0.0" - sources."nanoid-3.1.20" + sources."nanoid-3.1.23" + sources."napi-build-utils-1.0.2" sources."natural-compare-1.4.0" sources."nedb-1.8.0" sources."negotiator-0.6.2" + (sources."node-abi-2.30.1" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."node-emoji-1.10.0" sources."nopt-5.0.0" sources."normalize-path-3.0.0" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" sources."nunjucks-3.2.3" sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" sources."object-hash-2.1.1" sources."object-inspect-1.9.0" sources."on-finished-2.3.0" @@ -4533,6 +5476,7 @@ let sources."p-timeout-3.2.0" sources."packet-reader-1.0.0" sources."parent-module-1.0.1" + sources."parse-srcset-1.0.2" sources."parseurl-1.3.3" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -4541,39 +5485,47 @@ let sources."path-type-4.0.0" sources."pathval-1.1.1" sources."performance-now-2.1.0" - sources."pg-8.5.1" + sources."pg-8.6.0" sources."pg-connection-string-2.5.0" sources."pg-int8-1.0.1" sources."pg-minify-1.6.2" sources."pg-pool-3.3.0" - sources."pg-promise-10.10.1" + sources."pg-promise-10.10.2" sources."pg-protocol-1.5.0" sources."pg-types-2.2.0" sources."pgpass-1.0.4" sources."picomatch-2.2.3" + sources."pify-3.0.0" + sources."postcss-8.3.6" sources."postgres-array-2.0.0" sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" sources."postgres-interval-1.2.0" + sources."prebuild-install-6.1.4" sources."prelude-ls-1.2.1" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."prom-client-13.1.0" sources."proxy-addr-2.0.6" sources."psl-1.8.0" + sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" sources."queue-microtask-1.2.3" - sources."quick-lru-5.1.1" - sources."randombytes-2.1.0" - sources."randomstring-1.1.5" + sources."randombytes-2.0.3" + sources."randomstring-1.2.1" sources."range-parser-1.2.1" sources."raw-body-2.4.0" + (sources."rc-1.2.8" // { + dependencies = [ + sources."strip-json-comments-2.0.1" + ]; + }) sources."readable-stream-3.6.0" - sources."readdirp-3.5.0" + sources."readdirp-3.6.0" sources."regenerator-runtime-0.13.7" sources."regexpp-3.1.0" - sources."regextras-0.7.1" + sources."regextras-0.8.0" (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" @@ -4581,6 +5533,8 @@ let sources."uuid-3.4.0" ]; }) + sources."request-promise-4.2.6" + sources."request-promise-core-1.1.4" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."resolve-from-4.0.0" @@ -4590,18 +5544,32 @@ let sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" + (sources."sanitize-html-2.5.1" // { + dependencies = [ + sources."domhandler-4.2.2" + sources."htmlparser2-6.1.0" + ]; + }) sources."semver-7.3.4" (sources."send-0.17.1" // { dependencies = [ sources."ms-2.1.1" ]; }) - sources."serialize-javascript-5.0.1" + (sources."serialize-javascript-6.0.0" // { + dependencies = [ + sources."randombytes-2.1.0" + ]; + }) sources."serve-static-1.14.1" + sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" + sources."signal-exit-3.0.4" + sources."simple-concat-1.0.1" + sources."simple-get-3.1.0" sources."simple-swizzle-0.2.2" sources."slash-3.0.0" (sources."slice-ansi-4.0.0" // { @@ -4612,6 +5580,7 @@ let ]; }) sources."source-map-0.6.1" + sources."source-map-js-0.6.2" sources."source-map-support-0.5.19" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -4622,6 +5591,8 @@ let sources."sshpk-1.16.1" sources."stack-trace-0.0.10" sources."statuses-1.5.0" + sources."stealthy-require-1.1.1" + sources."steno-0.4.4" sources."string-width-4.2.0" (sources."string_decoder-1.3.0" // { dependencies = [ @@ -4637,6 +5608,17 @@ let sources."json-schema-traverse-1.0.0" ]; }) + (sources."tar-6.1.11" // { + dependencies = [ + sources."mkdirp-1.0.4" + ]; + }) + (sources."tar-fs-2.1.1" // { + dependencies = [ + sources."chownr-1.1.4" + ]; + }) + sources."tar-stream-2.2.0" sources."tdigest-0.1.1" sources."text-hex-1.0.0" sources."text-table-0.2.0" @@ -4644,16 +5626,15 @@ let sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" sources."triple-beam-1.3.0" - sources."ts-node-9.1.1" + sources."ts-node-10.1.0" sources."tslib-1.14.1" sources."tsutils-3.21.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.4.0" sources."type-detect-4.0.8" - sources."type-fest-0.8.1" sources."type-is-1.6.18" - sources."typescript-4.2.4" + sources."typescript-4.4.3" sources."underscore-1.4.4" sources."unhomoglyph-1.0.6" sources."unpipe-1.0.0" @@ -4677,15 +5658,9 @@ let dependencies = [ sources."async-3.2.0" sources."is-stream-2.0.0" - sources."string_decoder-1.1.1" - (sources."winston-transport-4.4.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - ]; - }) ]; }) - sources."winston-daily-rotate-file-4.5.2" + sources."winston-daily-rotate-file-4.5.5" (sources."winston-transport-4.4.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -4693,22 +5668,20 @@ let ]; }) sources."word-wrap-1.2.3" - sources."workerpool-6.1.0" - sources."wrappy-1.0.2" - sources."ws-5.2.2" - sources."xtend-4.0.2" - sources."yallist-4.0.0" - (sources."yargs-16.2.0" // { + sources."workerpool-6.1.5" + (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.5" - sources."yargs-parser-20.2.4" ]; }) + sources."wrappy-1.0.2" + sources."ws-5.2.3" + sources."xtend-4.0.2" + sources."y18n-5.0.8" + sources."yallist-4.0.0" + sources."yargs-17.2.1" sources."yargs-parser-20.2.4" sources."yargs-unparser-2.0.0" sources."yn-3.1.1" diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix index 02d6fd7828..520f5e5a37 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix @@ -4,12 +4,12 @@ with python3Packages; buildPythonApplication rec { pname = "synadm"; - version = "0.30"; + version = "0.31"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "9e7c2e2540fb786c1064a9a2bfe6ef3ec8b0ed27f6fd6beda80ed615c72a6103"; + sha256 = "1098a5248a1e2de53ced3c699b3b78ced3327c5f4e0ff092a95ef4940e4f9c6e"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/moonraker/default.nix b/third_party/nixpkgs/pkgs/servers/moonraker/default.nix index 00d721be2e..9e1c82836c 100644 --- a/third_party/nixpkgs/pkgs/servers/moonraker/default.nix +++ b/third_party/nixpkgs/pkgs/servers/moonraker/default.nix @@ -15,13 +15,13 @@ let ]); in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "unstable-2021-09-21"; + version = "unstable-2021-10-03"; src = fetchFromGitHub { owner = "Arksine"; repo = "moonraker"; - rev = "2447ccab6252fddc829da3eec8b29d1abe3dee60"; - sha256 = "qaorF26e2pkOCxiUfo8MOPQVpZjx5G1uo66jFoQpMcs="; + rev = "c3f1b290f8667f771f2d58a3f012e87853c4e85c"; + sha256 = "a49sVvgzpGHrjWbSH6GiH5kGeXm1LrLgd+lKv7Xxi9w="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/mycorrhiza/default.nix b/third_party/nixpkgs/pkgs/servers/mycorrhiza/default.nix new file mode 100644 index 0000000000..b0f255e165 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mycorrhiza/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, buildGoModule +, makeWrapper, git +}: + +buildGoModule rec { + pname = "mycorrhiza"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "bouncepaw"; + repo = "mycorrhiza"; + rev = "v${version}"; + sha256 = "0manay7gfybzk28dp9a8xdfpbhxm1dbnvcyp4mjhh449n8jlp4bq"; + }; + + vendorSha256 = "1br1p8cnyv2xpwnld3ydd87zxbdwl962f6yww8i8xbsm7881bl0d"; + + subPackages = [ "." ]; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/mycorrhiza \ + --prefix PATH : ${lib.makeBinPath [ git ]} + ''; + + meta = with lib; { + description = "Filesystem and git-based wiki engine written in Go using mycomarkup as its primary markup language"; + homepage = "https://github.com/bouncepaw/mycorrhiza"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ chekoopa ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/plex/raw.nix b/third_party/nixpkgs/pkgs/servers/plex/raw.nix index 802e538207..47198243cb 100644 --- a/third_party/nixpkgs/pkgs/servers/plex/raw.nix +++ b/third_party/nixpkgs/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.24.3.5033-757abe6b4"; + version = "1.24.4.5081-e362dc1ee"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "063llf34h6dbzrysm98xwwmv8fwyk8vsc3sj7dniy9j29wwygwdz"; + sha256 = "0q3s1qcr65rx2jbf9k0i38w5xvnzw1wcy13gvm0150ad2hqw358b"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0cnv1i00xv7ls5yb9xlim4haal7bvn41p3zskbab85vwhffr9irx"; + sha256 = "17igy0lq7mjmrw5xq92b57np422x8hj6m8qzjri493yc6fw1cl1m"; }; outputs = [ "out" "basedb" ]; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index 41ff2b4354..ba9ac9fdab 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-10-06"; + version = "2021-10-11"; pname = "oh-my-zsh"; - rev = "29b5c182bec4cec7704fb8bac9ee0ab971dfb89a"; + rev = "beeda72826f7288d3edf6cec4114bbda9bbae347"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "pPBeZj/QTQCIuBtE7+4CmuXacblU4RGXty+cdeQw+54="; + sha256 = "Ch1r4fSKR3VGDO/4GLJj2vETOEa6oRb1noEl8N4vJps="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix index f2fec6fe6b..4f0609d0a5 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.28.0"; + version = "2.28.1"; srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ let owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-fTt6tIcc96f8t3NUaR0RG0JQ+LPgqSHuJSmVx4a6X7M="; + sha256 = "sha256-9EkCScEj5kuKtkfnCmFUZg/qDzvmI3rvDS+NtkZC7sk="; }; # put packages that needs to be overriden in the py package scope diff --git a/third_party/nixpkgs/pkgs/tools/admin/damon/default.nix b/third_party/nixpkgs/pkgs/tools/admin/damon/default.nix new file mode 100644 index 0000000000..10687bce09 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/damon/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "damon"; + version = "unstable-2021-10-06"; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "damon"; + rev = "542c79aecc44b1d0500f9cb9b2e13f07db1e2f35"; + sha256 = "sha256-vg5PISNqk8N2nn7eABm+/7qzePDbKPkvovdZk2sZYsg="; + }; + + vendorSha256 = "sha256-/ZZxw6qEUJQUz3J0TxUYJECCcX276r74g0N2tV77+8I="; + + meta = with lib; { + homepage = "https://github.com/hashicorp/damon"; + license = licenses.mpl20; + description = "A terminal UI (TUI) for HashiCorp Nomad"; + maintainers = teams.iog.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/admin/netplan/default.nix b/third_party/nixpkgs/pkgs/tools/admin/netplan/default.nix index b9dc2c0707..77f2ad26de 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/netplan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/netplan/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "netplan"; - version = "0.101"; + version = "0.103"; src = fetchFromGitHub { - owner = "CanonicalLtd"; + owner = "canonical"; repo = "netplan"; rev = version; - hash = "sha256-bCK7J2pCQUwjZu8c1n6jhF6T/gvUGwydqAXpxUMLgMc="; + hash = "sha256-d8Ze8S/w2nyJkATzLfizMqmr7ad2wrK1mjADClee6WE="; fetchSubmodules = false; }; @@ -45,6 +45,9 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace 'SYSTEMD_GENERATOR_DIR=' 'SYSTEMD_GENERATOR_DIR ?= ' \ --replace 'SYSTEMD_UNIT_DIR=' 'SYSTEMD_UNIT_DIR ?= ' \ --replace 'BASH_COMPLETIONS_DIR=' 'BASH_COMPLETIONS_DIR ?= ' + + # from upstream https://github.com/canonical/netplan/blob/ee0d5df7b1dfbc3197865f02c724204b955e0e58/rpm/netplan.spec#L81 + sed -e "s/-Werror//g" -i Makefile ''; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/audio/soco-cli/default.nix b/third_party/nixpkgs/pkgs/tools/audio/soco-cli/default.nix new file mode 100644 index 0000000000..52614a8dc2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/audio/soco-cli/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "soco-cli"; + version = "0.4.21"; + format = "setuptools"; + + disabled = python3.pythonOlder "3.6"; + + src = fetchFromGitHub rec { + owner = "avantrec"; + repo = pname; + rev = "v${version}"; + sha256 = "1kz2zx59gjfs01jiyzmps8j6yca06yqn6wkidvdk4s3izdm0rarw"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + fastapi + rangehttpserver + soco + tabulate + uvicorn + ]; + + # Tests wants to communicate with hardware + doCheck = false; + + pythonImportsCheck = [ + "soco_cli" + ]; + + meta = with lib; { + description = "Command-line interface to control Sonos sound systems"; + homepage = "https://github.com/avantrec/soco-cli"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix b/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix index fe7b041b15..60437403e5 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -1,11 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper, autoPatchelfHook -, dotnet-sdk_5, dotnetPackages, dotnetCorePackages, cacert +{ lib +, stdenv +, buildDotnetModule +, fetchFromGitHub +, autoPatchelfHook +, dotnetCorePackages }: -let - projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; -in -stdenv.mkDerivation rec { +buildDotnetModule rec { pname = "discordchatexporter-cli"; version = "2.30.1"; @@ -16,66 +17,13 @@ stdenv.mkDerivation rec { sha256 = "JSYIhd+DNVOKseHtWNNChECR5hKr+ntu1Yyqtnlg8rM="; }; - nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper autoPatchelfHook ]; + projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; + dotnet-runtime = dotnetCorePackages.netcore_3_1; + nugetDeps = ./deps.nix; + + nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib ]; - nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix { - fetchNuGet = { name, version, sha256 }: fetchurl { - name = "nuget-${name}-${version}.nupkg"; - url = "https://www.nuget.org/api/v2/package/${name}/${version}"; - inherit sha256; - }; - }); - - configurePhase = '' - runHook preConfigure - - export HOME=$(mktemp -d) - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_NOLOGO=1 - - nuget sources Add -Name nixos -Source "$PWD/nixos" - nuget init "$nugetDeps" "$PWD/nixos" - - # FIXME: https://github.com/NuGet/Home/issues/4413 - mkdir -p $HOME/.nuget/NuGet - cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet - - dotnet restore --source "$PWD/nixos" ${projectFile} - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - dotnet build ${projectFile} \ - --no-restore \ - --configuration Release \ - -p:Version=${version} - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - dotnet publish ${projectFile} \ - --no-build \ - --configuration Release \ - --no-self-contained \ - --output $out/lib/${pname} - shopt -s extglob - - makeWrapper $out/lib/${pname}/DiscordChatExporter.Cli $out/bin/discordchatexporter-cli \ - --set DOTNET_ROOT "${dotnetCorePackages.sdk_3_1}" - - runHook postInstall - ''; - - # Strip breaks the executable. - dontStrip = true; - meta = with lib; { description = "A tool to export Discord chat logs to a file"; homepage = "https://github.com/Tyrrrz/DiscordChatExporter"; diff --git a/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix b/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix index ad113ed615..ac552abda0 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.8.4"; + version = "0.9.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Or6RL6yT/X3rVIySqt5lWbXbI25f8HNLBpY3cOhMC0g="; + sha256 = "sha256-xfGx9rtpLmotW00pB4822dwBzB2u+QYNSLWtA+JDffU="; }; - vendorSha256 = "sha256-1FK5IIvm2iyzGqj8IPL3/qvxFj0dC37aycQQ5MO0mBI="; + vendorSha256 = "sha256-USWrI2vH0RpGJgxoEfEwqDUwXjxylOOqA9g7GltOdYQ="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix index 8a07b2c6c9..90af547f68 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "adafruit-ampy"; - version = "1.0.7"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1dz5sksalccv4c3bzk3c1jxpg3s28lwlw8hfwc9dfxhw3a1np3fd"; + sha256 = "f4cba36f564096f2aafd173f7fbabb845365cc3bb3f41c37541edf98b58d3976"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/aspcud/default.nix b/third_party/nixpkgs/pkgs/tools/misc/aspcud/default.nix index a50bc311f2..ef1b6a5a4c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/aspcud/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/aspcud/default.nix @@ -1,14 +1,22 @@ -{ lib, stdenv, fetchzip -, boost, clasp, cmake, gringo, re2c +{ lib +, stdenv +, fetchFromGitHub +, boost +, clasp +, cmake +, gringo +, re2c }: stdenv.mkDerivation rec { version = "1.9.5"; pname = "aspcud"; - src = fetchzip { - url = "https://github.com/potassco/aspcud/archive/v${version}.tar.gz"; - sha256 = "sha256-d04GPMoz6PMGq6iiul0zT1C9Mljdl9uJJ2C8MIwcmaw="; + src = fetchFromGitHub { + owner = "potassco"; + repo = "aspcud"; + rev = "v${version}"; + hash = "sha256-d04GPMoz6PMGq6iiul0zT1C9Mljdl9uJJ2C8MIwcmaw="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ccze/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ccze/default.nix index 348cbb1f52..4946fd64d8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ccze/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ccze/default.nix @@ -1,17 +1,24 @@ -{ lib, stdenv, fetchurl, autoconf, ncurses, pcre }: +{ lib, stdenv, fetchFromGitHub, autoconf, ncurses, pcre }: stdenv.mkDerivation rec { pname = "ccze"; version = "0.2.1-2"; - src = fetchurl { - url = "https://github.com/madhouse/ccze/archive/ccze-${version}.tar.gz"; - sha256 = "1amavfvyls4v0gnikk43n2rpciaspxifgrmvi99qj6imv3mfg66n"; + src = fetchFromGitHub { + owner = "madhouse"; + repo = "ccze"; + rev = "ccze-${version}"; + hash = "sha256-LVwmbrq78mZcAEuAqjXTqLE5we83H9mcMPtxQx2Tn/c="; }; - buildInputs = [ autoconf ncurses pcre ]; + nativeBuildInputs = [ autoconf ]; - preConfigure = "autoheader && autoconf "; + buildInputs = [ ncurses pcre ]; + + preConfigure = '' + autoheader + autoconf + ''; meta = with lib; { description = "Fast, modular log colorizer"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/contacts/default.nix b/third_party/nixpkgs/pkgs/tools/misc/contacts/default.nix index 7b652f36a1..08ba484f51 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/contacts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/contacts/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, xcbuildHook, Foundation, AddressBook }: +{ lib, stdenv, fetchFromGitHub, xcbuildHook, Foundation, AddressBook }: stdenv.mkDerivation { version = "1.1a-3"; pname = "contacts"; - src = fetchurl { - url = "https://github.com/dhess/contacts/archive/4092a3c6615d7a22852a3bafc44e4aeeb698aa8f.tar.gz"; - sha256 = "0wdqc1ndgrdhqapvvgx5xihc750szv08lp91x4l6n0gh59cpxpg3"; + src = fetchFromGitHub { + owner = "dhess"; + repo = "contacts"; + rev = "4092a3c6615d7a22852a3bafc44e4aeeb698aa8f"; + hash = "sha256-Li/c5uf9rfpuU+hduuSm7EmhVwIIkS72dqzmN+0cE3A="; }; nativeBuildInputs = [ xcbuildHook ]; @@ -19,10 +21,10 @@ stdenv.mkDerivation { meta = with lib; { description = "Access contacts from the Mac address book from command-line"; - homepage = "http://www.gnufoo.org/contacts/contacts.html"; - license = licenses.gpl2; + homepage = "http://www.gnufoo.org/contacts/contacts.html"; + license = licenses.gpl2; maintainers = with maintainers; [ jwiegley ]; - platforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.darwin; + platforms = platforms.darwin; + hydraPlatforms = platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index db39980016..37ea9ebd02 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -9,11 +9,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "186"; + version = "187"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-lOVKhpzDkm7NM9Ti0AAQ3CRpdQ3DTJElQWx7eXP7E3o="; + sha256 = "sha256-oXWdXJhf8OOxBcLumjeWW0Xev0LjcTScAw9baDOs6ls="; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix b/third_party/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix index d0bd0c76a8..4cca88a9b4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, util-linux, coreutils}: +{ lib, stdenv, fetchFromGitHub, util-linux, coreutils }: stdenv.mkDerivation rec { - version = "6.44"; pname = "profile-sync-daemon"; + version = "6.44"; - src = fetchurl { - url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz"; - sha256 = "sha256-+iQr7T99X/jYYgq0xNHLPCJG5mZU/6dN76Z1FB51Z54="; + src = fetchFromGitHub { + owner = "graysky2"; + repo = "profile-sync-daemon"; + rev = "v${version}"; + hash = "sha256-7sEC2b4mzgbDTFgpH5abZ/kiwEmGdbKkTLiD73Efdls="; }; installPhase = '' @@ -21,8 +23,6 @@ stdenv.mkDerivation rec { --replace "sudo " "/run/wrappers/bin/sudo " ''; - preferLocalBuild = true; - meta = with lib; { description = "Syncs browser profile dirs to RAM"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/recutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/recutils/default.nix index d6a5b517a8..1501f8edda 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/recutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/recutils/default.nix @@ -1,36 +1,42 @@ -{ fetchurl, lib, stdenv, emacs, curl, check, bc }: +{ lib +, stdenv +, fetchurl +, bc +, check +, curl +}: stdenv.mkDerivation rec { pname = "recutils"; version = "1.8"; src = fetchurl { - url = "mirror://gnu/recutils/recutils-${version}.tar.gz"; - sha256 = "14xiln4immfsw8isnvwvq0h23f6z0wilpgsc4qzabnrzb5lsx3nz"; + url = "mirror://gnu/recutils/${pname}-${version}.tar.gz"; + hash = "sha256-346uaVk/26U+Jky/SyMH37ghIMCbb6sj4trVGomlsZM="; }; hardeningDisable = [ "format" ]; - buildInputs = [ curl emacs ]; + buildInputs = [ + curl + ]; - checkInputs = [ check bc ]; + checkInputs = [ + check + bc + ]; doCheck = true; - meta = { - description = "Tools and libraries to access human-editable, text-based databases"; - - longDescription = - '' GNU Recutils is a set of tools and libraries to access - human-editable, text-based databases called recfiles. The data is - stored as a sequence of records, each record containing an arbitrary - number of named fields. - ''; - + meta = with lib; { homepage = "https://www.gnu.org/software/recutils/"; - - license = lib.licenses.gpl3Plus; - - platforms = lib.platforms.all; - maintainers = [ ]; + description = "Tools and libraries to access human-editable, text-based databases"; + longDescription = '' + GNU Recutils is a set of tools and libraries to access human-editable, + text-based databases called recfiles. The data is stored as a sequence of + records, each record containing an arbitrary number of named fields. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/sdate/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sdate/default.nix index 69c9d72671..abc046bb6d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sdate/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sdate/default.nix @@ -1,19 +1,23 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: + stdenv.mkDerivation rec { pname = "sdate"; version = "0.7"; - src = fetchurl { - url = "https://github.com/ChristophBerg/sdate/archive/${version}.tar.gz"; - sha256 = "1lfnsb8prac8rspnxcawd138jyhyivwf35rrmfvwq6dhsx23c6vy"; + + src = fetchFromGitHub { + owner = "ChristophBerg"; + repo = "sdate"; + rev = version; + hash = "sha256-jkwe+bSBa0p1Xzfetsdpw0RYw/gSRxnY2jBOzC5HtJ8="; }; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; - meta = { + meta = with lib; { homepage = "https://www.df7cb.de/projects/sdate"; description = "Eternal september version of the date program"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ edef ]; - platforms = lib.platforms.all; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ edef ]; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/tio/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tio/default.nix index a25b821c7e..9b8e76f10c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tio/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tio/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchzip, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "tio"; version = "1.32"; - src = fetchzip { - url = "https://github.com/tio/tio/archive/v${version}.tar.gz"; - sha256 = "0lwqdm73kshi9qs8pks1b4by6yb9jf3bbyw3bv52xmggnr5s1hcv"; + src = fetchFromGitHub { + owner = "tio"; + repo = "tio"; + rev = "v${version}"; + hash = "sha256-m8GgS7bv1S7KXoP7tYaTaXnjF1lBz4s0ThHqOU5tmFM="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/txt2man/default.nix b/third_party/nixpkgs/pkgs/tools/misc/txt2man/default.nix index 27ff219a6e..a6ebcb2882 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/txt2man/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/txt2man/default.nix @@ -1,27 +1,29 @@ -{ lib, stdenv, fetchurl, coreutils, gawk }: +{ lib, stdenv, fetchFromGitHub, coreutils, gawk }: stdenv.mkDerivation rec { pname = "txt2man"; version = "1.7.1"; - src = fetchurl { - url = "https://github.com/mvertes/txt2man/archive/${pname}-${version}.tar.gz"; - sha256 = "0ka3krmblsprv0v6h6wnm8lv08w30z0ynfnbwns6alks5gx1p6sd"; + src = fetchFromGitHub { + owner = "mvertes"; + repo = "txt2man"; + rev = "${pname}-${version}"; + hash = "sha256-Aqi5PNNaaM/tr9A/7vKeafYKYIs/kHbwHzE7+R/9r9s="; }; - preConfigure = '' - makeFlags=prefix="$out" - ''; + makeFlags = [ + "prefix=${placeholder "out"}" + ]; - patchPhase = '' + postPatch = '' for f in bookman src2man txt2man; do - substituteInPlace $f --replace "gawk" "${gawk}/bin/gawk" - - substituteInPlace $f --replace "(date" "(${coreutils}/bin/date" - substituteInPlace $f --replace "=cat" "=${coreutils}/bin/cat" - substituteInPlace $f --replace "cat <<" "${coreutils}/bin/cat <<" - substituteInPlace $f --replace "expand" "${coreutils}/bin/expand" - substituteInPlace $f --replace "(uname" "(${coreutils}/bin/uname" + substituteInPlace $f \ + --replace "gawk" "${gawk}/bin/gawk" \ + --replace "(date" "(${coreutils}/bin/date" \ + --replace "=cat" "=${coreutils}/bin/cat" \ + --replace "cat <<" "${coreutils}/bin/cat <<" \ + --replace "expand" "${coreutils}/bin/expand" \ + --replace "(uname" "(${coreutils}/bin/uname" done ''; @@ -33,11 +35,11 @@ stdenv.mkDerivation rec { sh -c 'unset PATH; printf hello | ./txt2man' ''; - meta = { + meta = with lib; { description = "Convert flat ASCII text to man page format"; homepage = "http://mvertes.free.fr/"; - license = lib.licenses.gpl2; - platforms = with lib.platforms; linux ++ darwin; - maintainers = with lib.maintainers; [ bjornfor ]; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/xtitle/default.nix b/third_party/nixpkgs/pkgs/tools/misc/xtitle/default.nix index 2820958443..e3454538bf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/xtitle/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/xtitle/default.nix @@ -1,24 +1,27 @@ -{ lib, stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }: +{ lib, stdenv, fetchFromGitHub, libxcb, xcbutil, xcbutilwm, git }: stdenv.mkDerivation rec { - pname = "xtitle"; - version = "0.4.4"; + pname = "xtitle"; + version = "0.4.4"; - src = fetchurl { - url = "https://github.com/baskerville/xtitle/archive/${version}.tar.gz"; - sha256 = "0w490a6ki90si1ri48jzhma473a598l1b12j8dp4ckici41z9yy2"; - }; + src = fetchFromGitHub { + owner = "baskerville"; + repo = "xtitle"; + rev = version; + hash = "sha256-SVfM2vCCacgchXj0c0sPk3VR6DUI4R0ofFnxJSY4oDg="; + }; + postPatch = '' + sed -i "s|/usr/local|$out|" Makefile + ''; - buildInputs = [ libxcb git xcbutil xcbutilwm ]; + buildInputs = [ libxcb git xcbutil xcbutilwm ]; - prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; - - meta = { - description = "Outputs X window titles"; - homepage = "https://github.com/baskerville/xtitle"; - maintainers = [ lib.maintainers.meisternu ]; - license = "Custom"; - platforms = lib.platforms.linux; - }; + meta = with lib; { + description = "Outputs X window titles"; + homepage = "https://github.com/baskerville/xtitle"; + maintainers = with maintainers; [ meisternu ]; + license = "Custom"; + platforms = platforms.linux; + }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/gvproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gvproxy/default.nix index 662f909b62..535e8d6bdf 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gvproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gvproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gvproxy"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "containers"; repo = "gvisor-tap-vsock"; rev = "v${version}"; - sha256 = "sha256-cXaX7A8Wgq/PEHnFrparZjOKdENX3pWWXYfrEuFLDx0="; + sha256 = "sha256-iRFjELJCgxPvqkhBvJqCFapQrHLL3uRpKsJ/DaXSKnw="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix index 06df79e470..ca5ec7abff 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/openvpn/default.nix @@ -3,13 +3,13 @@ let pname = "NetworkManager-openvpn"; - version = "1.8.12"; + version = "1.8.16"; in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "062kh4zj7jfbwy4zzcwpq2m457bzbpm3l18s0ysnw3mgia3siz8f"; + sha256 = "iSDeCceuXx9SDIP4REVduPrsMUJzUCaP4t2VuGD5H7U="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix b/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix index 874205f592..bb17691cba 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix @@ -13,14 +13,12 @@ buildGoModule rec { vendorSha256 = "sha256-QQN8ePOQ7DT9KeuY4ohFuPtocuinh3Y3us6QMnCQ4gc="; - doCheck = false; - # Change the default location of the management socket on Linux # systems so that the yggdrasil system service unit does not have to # be granted write permission to /run. patches = [ ./change-runtime-dir.patch ]; - subPackages = [ "cmd/yggdrasil" "cmd/yggdrasilctl" ]; + subPackages = [ "cmd/genkeys" "cmd/yggdrasil" "cmd/yggdrasilctl" ]; ldflags = [ "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version}" diff --git a/third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix index d645a4cdb0..f273d3ede7 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "ytcc"; - version = "2.4.2"; + version = "2.5.0"; src = fetchFromGitHub { owner = "woefe"; repo = "ytcc"; rev = "v${version}"; - sha256 = "013dhw7kn1s3r6w7kfvhqh0l74kgijfni47l71p7wicg3hzhm3mr"; + sha256 = "0d5zlj5c9n8kq38sq2napc2pnqq866v8jpsyg07q5yjcjwlmihap"; }; nativeBuildInputs = [ gettext ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix index 30dbbd9a3b..9d2e23e3bd 100644 --- a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-10-09"; + version = "2021-10-13"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-VdiZFUl2vZRocwR+398fJa602wWIiB1URU+54X2XiDc="; + sha256 = "sha256-rJRr8MEt3GMNPgC/YvWWs8zh1X0DBstM/UeCMlV7VqI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix b/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix index 08f4929bd2..07becc2c34 100644 --- a/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "v${version}"; - sha256 = "sha256-8PX1jUbS5qf5KqeZXv3oijtZCPo5LsabqHSA3rsd3tQ="; + sha256 = "sha256-sB/z7Z35SQt2D6YHgSJjXS/O9qbkqVrcl/OB+YhGhwQ="; }; - vendorSha256 = "sha256-bkk/gXMLiZGHebrIeDsj3OyiEcH4hriI4TFNdoh3SBk="; + vendorSha256 = "sha256-/GC81ukWpC7h86noPv6zayS9fxWhJpWGXPM8u56F5c4="; meta = with lib; { description = "Fast and multi-purpose HTTP toolkit"; diff --git a/third_party/nixpkgs/pkgs/tools/security/naabu/default.nix b/third_party/nixpkgs/pkgs/tools/security/naabu/default.nix index da59867e1b..83bb83e4e2 100644 --- a/third_party/nixpkgs/pkgs/tools/security/naabu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/naabu/default.nix @@ -1,27 +1,31 @@ -{ buildGoModule +{ lib +, buildGoModule , fetchFromGitHub -, lib , libpcap }: buildGoModule rec { pname = "naabu"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "naabu"; rev = "v${version}"; - sha256 = "sha256-t5Ij3UeH3z8obOH90cnmwcX9iC97sH7VIKvannSZ+MM="; + sha256 = "0kbpfb1ryfqy8a54ksm7zm8pqy8f4adh06jc1ccpdxks3k0rygid"; }; - vendorSha256 = "sha256-veOIt3hELk3smrGlTyldtdaz5uI4U8/2SeD0UNykB8A="; + vendorSha256 = "0kkkx8p0r04gg3pp0qy835afaxnqxjggnr7q7l6azdvg8qvgxfms"; - buildInputs = [ libpcap ]; + buildInputs = [ + libpcap + ]; - preBuild = '' - mv v2/* . - ''; + modRoot = "./v2"; + + subPackages = [ + "cmd/naabu/" + ]; meta = with lib; { description = "Fast SYN/CONNECT port scanner"; diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-graphviz/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook-graphviz/default.nix new file mode 100644 index 0000000000..d8412605dc --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/mdbook-graphviz/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, graphviz }: + +rustPlatform.buildRustPackage rec { + pname = "mdbook-graphviz"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "dylanowen"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-wIgWaCjJrrajvUZbJjpx9P4urN2/eVo3+Za2NjTKWvM="; + }; + + cargoSha256 = "sha256-F8JuEk0ztB7jfcPNjU9vGsr3HLEJ2DmWGWxvdbLuyvQ="; + + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + + checkInputs = [ graphviz ]; + + meta = with lib; { + description = "A preprocessor for mdbook, rendering Graphviz graphs to HTML at build time."; + homepage = "https://github.com/dylanowen/mdbook-graphviz"; + license = [ licenses.mpl20 ]; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/coq2html/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/coq2html/default.nix similarity index 91% rename from third_party/nixpkgs/pkgs/applications/science/logic/coq2html/default.nix rename to third_party/nixpkgs/pkgs/tools/typesetting/coq2html/default.nix index 393b846408..924eea3c0a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/coq2html/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/coq2html/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "coq2html"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "xavierleroy"; repo = "coq2html"; rev = "v${version}"; - sha256 = "sha256-ty/6A3wivjDCrmlZAcZyaIwQQ+vPBJm9MhtW6nZcV3s="; + sha256 = "sha256:1ad825yifn518wk1c2y2ji10q3m468r8ajjgw2nzzy7d608nx7yq"; }; nativeBuildInputs = [ ocaml ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix index bbdb9c9b14..32907ea3fb 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.9.0"; + version = "0.9.2"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "0v3l70c9mal67i369bk3q67qyn07kmclybcd5lj5ibdrrccq1jzsxn2sy39ziy77in7cygcb1lgf9vzacx9rscw94i6259fy0dpnf0h"; + sha512 = "2dnjyx3q46n7v1wl46vfgs9rhb3kvhijsd3ydq6amdf6vlf4mf1zsiakd5iycdh0i799zq61yspsibc87mcrs8l289lnwl955avs068"; }; nativeBuildInputs = [ which ] diff --git a/third_party/nixpkgs/pkgs/tools/wayland/sirula/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/sirula/default.nix index b58f37368f..c95cbd00c5 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/sirula/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/sirula/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "sirula"; - version = "unstable-2021-07-11"; + version = "unstable-2021-10-12"; src = fetchFromGitHub { owner = "DorianRudolph"; repo = "sirula"; - rev = "574725bc307fc704c42380cd0fa50b0b80c4764d"; - sha256 = "1m58j1hymjw4l2z1jdfirw1vb3rblc1qffpvc2lqy99frfz0dlvp"; + rev = "b300cabde03ec4d8c28ed84e318166b675fb4a77"; + sha256 = "0pxdgjpqaf1bq1y1flafg0ksk8548rif6pfbw0lp31p655pq95c8"; }; - cargoSha256 = "0wk90p20qkbpr866h8cvdshr8cl2kmc3dh2zxws5mlsh3sx2ld4w"; + cargoSha256 = "175rl09jmnj8pd5isyp2chnn66vdz1c16fgqhnjsxvbcasmn8vdj"; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 6bd2c55fc7..4ce1bb73ba 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -520,6 +520,8 @@ with pkgs; tests = callPackages ../build-support/fetchfirefoxaddon/tests.nix { }; }; + fetchNextcloudApp = callPackage ../build-support/fetchnextcloudapp {}; + # `fetchurl' downloads a file from the network. fetchurl = if stdenv.buildPlatform != stdenv.hostPlatform then buildPackages.fetchurl # No need to do special overrides twice, @@ -605,6 +607,7 @@ with pkgs; fetchNuGet = callPackage ../build-support/fetchnuget { }; buildDotnetPackage = callPackage ../build-support/build-dotnet-package { }; + buildDotnetModule = callPackage ../build-support/build-dotnet-module { }; nuget-to-nix = callPackage ../build-support/nuget-to-nix { }; fetchgx = callPackage ../build-support/fetchgx { }; @@ -996,6 +999,8 @@ with pkgs; inherit (lxqt) qtermwidget; }; + ctx = callPackage ../applications/terminal-emulators/ctx { }; + darktile = callPackage ../applications/terminal-emulators/darktile { }; eterm = callPackage ../applications/terminal-emulators/eterm { }; @@ -2543,6 +2548,8 @@ with pkgs; dale = callPackage ../development/compilers/dale { }; + damon = callPackage ../tools/admin/damon { }; + dante = callPackage ../servers/dante { }; dapr-cli = callPackage ../development/tools/dapr/cli {}; @@ -3548,6 +3555,8 @@ with pkgs; mslink = callPackage ../tools/misc/mslink { }; + mceinject = callPackage ../os-specific/linux/mceinject { }; + mcelog = callPackage ../os-specific/linux/mcelog { util-linux = util-linuxMinimal; }; @@ -6686,6 +6695,8 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; + libshumate = callPackage ../development/libraries/libshumate { }; + libsmartcols = callPackage ../development/libraries/libsmartcols { }; libsmi = callPackage ../development/libraries/libsmi { }; @@ -6820,6 +6831,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + mdbook-graphviz = callPackage ../tools/text/mdbook-graphviz { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + mdbook-katex = callPackage ../tools/text/mdbook-katex { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -8449,7 +8464,10 @@ with pkgs; podiff = callPackage ../tools/text/podiff { }; - podman = callPackage ../applications/virtualization/podman/wrapper.nix { }; + podman = if stdenv.isDarwin then + callPackage ../applications/virtualization/podman { } + else + callPackage ../applications/virtualization/podman/wrapper.nix { }; podman-unwrapped = callPackage ../applications/virtualization/podman { }; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; @@ -9685,7 +9703,7 @@ with pkgs; ted = callPackage ../tools/typesetting/ted { }; - teamviewer = libsForQt514.callPackage ../applications/networking/remote/teamviewer { }; + teamviewer = libsForQt515.callPackage ../applications/networking/remote/teamviewer { }; teleconsole = callPackage ../tools/misc/teleconsole { }; @@ -12678,6 +12696,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + devserver = callPackage ../development/tools/rust/devserver { }; + maturin = callPackage ../development/tools/rust/maturin { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -12849,6 +12869,7 @@ with pkgs; vala_0_48 vala_0_50 vala_0_52 + vala_0_54 vala; vyper = with python3Packages; toPythonApplication vyper; @@ -16388,6 +16409,8 @@ with pkgs; atkmm = callPackage ../development/libraries/atkmm { }; + atkmm_2_36 = callPackage ../development/libraries/atkmm/2.36.nix { }; + pixman = callPackage ../development/libraries/pixman { }; cairo = callPackage ../development/libraries/cairo { }; @@ -17864,6 +17887,8 @@ with pkgs; libsoup = callPackage ../development/libraries/libsoup { }; + libsoup_3 = callPackage ../development/libraries/libsoup/3.x.nix { }; + libspectrum = callPackage ../development/libraries/libspectrum { }; libspiro = callPackage ../development/libraries/libspiro {}; @@ -18472,6 +18497,7 @@ with pkgs; nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { }; nv-codec-headers-10 = callPackage ../development/libraries/nv-codec-headers/10_x.nix { }; + nv-codec-headers-11 = callPackage ../development/libraries/nv-codec-headers/11_x.nix { }; mkNvidiaContainerPkg = { name, containerRuntimePath, configTemplate, additionalPaths ? [] }: let @@ -19264,6 +19290,8 @@ with pkgs; socket_wrapper = callPackage ../development/libraries/socket_wrapper { }; + soco-cli = callPackage ../tools/audio/soco-cli { }; + sofia_sip = callPackage ../development/libraries/sofia-sip { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; }; @@ -19704,6 +19732,10 @@ with pkgs; inherit (darwin) apple_sdk; }; + webkitgtk_4_1 = webkitgtk.override { + libsoup = libsoup_3; + }; + websocketpp = callPackage ../development/libraries/websocket++ { }; webrtc-audio-processing = callPackage ../development/libraries/webrtc-audio-processing { }; @@ -20583,6 +20615,8 @@ with pkgs; mumsi = callPackage ../servers/mumsi { }; + mycorrhiza = callPackage ../servers/mycorrhiza { }; + myserver = callPackage ../servers/http/myserver { }; nas = callPackage ../servers/nas { }; @@ -23598,6 +23632,8 @@ with pkgs; av-98 = callPackage ../applications/networking/browsers/av-98 { }; + avizo = callPackage ../applications/misc/avizo { }; + avocode = callPackage ../applications/graphics/avocode {}; azpainter = callPackage ../applications/graphics/azpainter { }; @@ -25287,6 +25323,8 @@ with pkgs; go-org = callPackage ../applications/misc/go-org { }; + hushboard = python3.pkgs.callPackage ../applications/audio/hushboard { }; + hydrogen = qt5.callPackage ../applications/audio/hydrogen { }; hydrogen_0 = callPackage ../applications/audio/hydrogen/0.nix { }; # Old stable, has GMKit. @@ -25787,6 +25825,7 @@ with pkgs; krane = callPackage ../applications/networking/cluster/krane { }; krita = libsForQt5.callPackage ../applications/graphics/krita { }; + krita-beta = libsForQt5.callPackage ../applications/graphics/krita/beta.nix { }; krusader = libsForQt5.callPackage ../applications/misc/krusader { }; @@ -27975,6 +28014,8 @@ with pkgs; tev = callPackage ../applications/graphics/tev { }; + themechanger = callPackage ../applications/misc/themechanger { }; + thinkingRock = callPackage ../applications/misc/thinking-rock { }; thonny = callPackage ../applications/editors/thonny { }; @@ -28788,6 +28829,8 @@ with pkgs; xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { }; + xdg-desktop-portal-gnome = callPackage ../development/libraries/xdg-desktop-portal-gnome { }; + xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { }; xdg-desktop-portal-wlr = callPackage ../development/libraries/xdg-desktop-portal-wlr { }; @@ -31029,10 +31072,11 @@ with pkgs; coqPackages_8_11 coq_8_11 coqPackages_8_12 coq_8_12 coqPackages_8_13 coq_8_13 + coqPackages_8_14 coq_8_14 coqPackages coq ; - coq2html = callPackage ../applications/science/logic/coq2html { }; + coq2html = callPackage ../tools/typesetting/coq2html { }; cryptoverif = callPackage ../applications/science/logic/cryptoverif { }; @@ -33011,7 +33055,16 @@ with pkgs; python = python3; }; - phonetisaurus = callPackage ../development/libraries/phonetisaurus {}; + phonetisaurus = callPackage ../development/libraries/phonetisaurus { + # https://github.com/AdolfVonKleist/Phonetisaurus/issues/70 + openfst = openfst.overrideAttrs (_: rec { + version = "1.7.9"; + src = fetchurl { + url = "http://www.openfst.org/twiki/pub/FST/FstDownload/openfst-${version}.tar.gz"; + sha256 = "1pmx1yhn2gknj0an0zwqmzgwjaycapi896244np50a8y3nrsw6ck"; + }; + }); + }; duti = callPackage ../os-specific/darwin/duti { inherit (darwin.apple_sdk.frameworks) ApplicationServices; @@ -33215,6 +33268,8 @@ with pkgs; xcfun = callPackage ../development/libraries/science/chemistry/xcfun { }; + zesarux = callPackage ../misc/emulators/zesarux { }; + zthrottle = callPackage ../tools/misc/zthrottle { }; zktree = callPackage ../applications/misc/zktree {}; diff --git a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix index c785d6c16c..dc657ab1df 100644 --- a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix @@ -131,6 +131,7 @@ in rec { coq_8_11 = mkCoq "8.11"; coq_8_12 = mkCoq "8.12"; coq_8_13 = mkCoq "8.13"; + coq_8_14 = mkCoq "8.14"; coqPackages_8_5 = mkCoqPackages coq_8_5; coqPackages_8_6 = mkCoqPackages coq_8_6; @@ -141,6 +142,7 @@ in rec { coqPackages_8_11 = mkCoqPackages coq_8_11; coqPackages_8_12 = mkCoqPackages coq_8_12; coqPackages_8_13 = mkCoqPackages coq_8_13; + coqPackages_8_14 = mkCoqPackages coq_8_14; coqPackages = recurseIntoAttrs coqPackages_8_13; coq = coqPackages.coq; diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index c9ab3fc2ab..c80919e07a 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -79,6 +79,8 @@ let bitv = callPackage ../development/ocaml-modules/bitv { }; bls12-381 = callPackage ../development/ocaml-modules/bls12-381 { }; + bls12-381-gen = callPackage ../development/ocaml-modules/bls12-381/gen.nix { }; + bls12-381-unix = callPackage ../development/ocaml-modules/bls12-381/unix.nix { }; bolt = callPackage ../development/ocaml-modules/bolt { }; @@ -378,6 +380,8 @@ let fdkaac = callPackage ../development/ocaml-modules/fdkaac { }; ff = callPackage ../development/ocaml-modules/ff { }; + ff-pbt = callPackage ../development/ocaml-modules/ff/pbt.nix { }; + ff-sig = callPackage ../development/ocaml-modules/ff/sig.nix { }; fiat-p256 = callPackage ../development/ocaml-modules/fiat-p256 { }; @@ -407,6 +411,8 @@ let genspio = callPackage ../development/ocaml-modules/genspio { }; + getopt = callPackage ../development/ocaml-modules/getopt { }; + gmap = callPackage ../development/ocaml-modules/gmap { }; gnuplot = callPackage ../development/ocaml-modules/gnuplot { @@ -426,6 +432,8 @@ let hacl-star = callPackage ../development/ocaml-modules/hacl-star { }; hacl-star-raw = callPackage ../development/ocaml-modules/hacl-star/raw.nix { }; + hashcons = callPackage ../development/ocaml-modules/hashcons { }; + herelib = callPackage ../development/ocaml-modules/herelib { }; hidapi = callPackage ../development/ocaml-modules/hidapi { }; @@ -645,6 +653,8 @@ let lwt-dllist = callPackage ../development/ocaml-modules/lwt-dllist { }; + lwt-exit = callPackage ../development/ocaml-modules/lwt-exit { }; + lwt-watcher = callPackage ../development/ocaml-modules/lwt-watcher { }; lwt_log = callPackage ../development/ocaml-modules/lwt_log { }; @@ -1068,6 +1078,10 @@ let spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { }; + tar-unix = callPackage ../development/ocaml-modules/tar/unix.nix { }; + + tar = callPackage ../development/ocaml-modules/tar { }; + tcpip = callPackage ../development/ocaml-modules/tcpip { }; tsort = callPackage ../development/ocaml-modules/tsort { }; @@ -1174,6 +1188,8 @@ let pycaml = callPackage ../development/ocaml-modules/pycaml { }; + pyml = callPackage ../development/ocaml-modules/pyml { }; + qcheck-alcotest = callPackage ../development/ocaml-modules/qcheck/alcotest.nix { }; qcheck-core = callPackage ../development/ocaml-modules/qcheck/core.nix { }; @@ -1263,31 +1279,53 @@ let terminal_size = callPackage ../development/ocaml-modules/terminal_size { }; + tezos-010-PtGRANAD-test-helpers = callPackage ../development/ocaml-modules/tezos/010-PtGRANAD-test-helpers.nix { }; tezos-base = callPackage ../development/ocaml-modules/tezos/base.nix { }; tezos-clic = callPackage ../development/ocaml-modules/tezos/clic.nix { }; + tezos-client-010-PtGRANAD = callPackage ../development/ocaml-modules/tezos/client-010-PtGRANAD.nix { }; + tezos-client-base = callPackage ../development/ocaml-modules/tezos/client-base.nix { }; + tezos-context = callPackage ../development/ocaml-modules/tezos/context.nix { }; tezos-crypto = callPackage ../development/ocaml-modules/tezos/crypto.nix { }; + tezos-embedded-protocol-010-PtGRANAD = callPackage ../development/ocaml-modules/tezos/embedded-protocol-010-PtGRANAD.nix { }; tezos-error-monad = callPackage ../development/ocaml-modules/tezos/error-monad.nix { }; tezos-event-logging = callPackage ../development/ocaml-modules/tezos/event-logging.nix { }; + tezos-legacy-store = callPackage ../development/ocaml-modules/tezos/legacy-store.nix { }; tezos-lmdb = callPackage ../development/ocaml-modules/tezos/lmdb.nix { }; + tezos-hacl-glue = callPackage ../development/ocaml-modules/tezos/hacl-glue.nix { }; + tezos-hacl-glue-unix = callPackage ../development/ocaml-modules/tezos/hacl-glue-unix.nix { }; tezos-lwt-result-stdlib = callPackage ../development/ocaml-modules/tezos/lwt-result-stdlib.nix { }; tezos-micheline = callPackage ../development/ocaml-modules/tezos/micheline.nix { }; + tezos-mockup-proxy = callPackage ../development/ocaml-modules/tezos/mockup-proxy.nix { }; + tezos-mockup-registration = callPackage ../development/ocaml-modules/tezos/mockup-registration.nix { }; tezos-p2p-services = callPackage ../development/ocaml-modules/tezos/p2p-services.nix { }; tezos-p2p = callPackage ../development/ocaml-modules/tezos/p2p.nix { }; - tezos-protocol-008-PtEdo2Zk-parameters = callPackage ../development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix { }; - tezos-protocol-008-PtEdo2Zk = callPackage ../development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix { }; + tezos-protocol-010-PtGRANAD-parameters = callPackage ../development/ocaml-modules/tezos/protocol-010-PtGRANAD-parameters.nix { }; + tezos-protocol-010-PtGRANAD = callPackage ../development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix { }; tezos-protocol-compiler = callPackage ../development/ocaml-modules/tezos/protocol-compiler.nix { }; - tezos-protocol-demo-noops = callPackage ../development/ocaml-modules/tezos/protocol-demo-noops.nix { }; tezos-protocol-environment-packer = callPackage ../development/ocaml-modules/tezos/protocol-environment-packer.nix { }; tezos-protocol-environment-sigs = callPackage ../development/ocaml-modules/tezos/protocol-environment-sigs.nix { }; tezos-protocol-environment-structs = callPackage ../development/ocaml-modules/tezos/protocol-environment-structs.nix { }; tezos-protocol-environment = callPackage ../development/ocaml-modules/tezos/protocol-environment.nix { }; + tezos-protocol-plugin-010-PtGRANAD = callPackage ../development/ocaml-modules/tezos/protocol-plugin-010-PtGRANAD.nix { }; + tezos-protocol-updater = callPackage ../development/ocaml-modules/tezos/protocol-updater.nix { }; + tezos-proxy = callPackage ../development/ocaml-modules/tezos/proxy.nix { }; tezos-requester = callPackage ../development/ocaml-modules/tezos/requester.nix { }; + tezos-rpc-http-client-unix = callPackage ../development/ocaml-modules/tezos/rpc-http-client-unix.nix { }; + tezos-rpc-http-client = callPackage ../development/ocaml-modules/tezos/rpc-http-client.nix { }; + tezos-rpc-http = callPackage ../development/ocaml-modules/tezos/rpc-http.nix { }; tezos-rpc = callPackage ../development/ocaml-modules/tezos/rpc.nix { }; tezos-sapling = callPackage ../development/ocaml-modules/tezos/sapling.nix { }; + tezos-shell-context = callPackage ../development/ocaml-modules/tezos/shell-context.nix { }; tezos-shell-services = callPackage ../development/ocaml-modules/tezos/shell-services.nix { }; + tezos-shell = callPackage ../development/ocaml-modules/tezos/shell.nix { }; + tezos-signer-backends = callPackage ../development/ocaml-modules/tezos/signer-backends.nix { }; + tezos-signer-services = callPackage ../development/ocaml-modules/tezos/signer-services.nix { }; tezos-stdlib-unix = callPackage ../development/ocaml-modules/tezos/stdlib-unix.nix { }; tezos-stdlib = callPackage ../development/ocaml-modules/tezos/stdlib.nix { }; + tezos-test-helpers = callPackage ../development/ocaml-modules/tezos/test-helpers.nix { }; + tezos-store = callPackage ../development/ocaml-modules/tezos/store.nix { }; tezos-test-services = callPackage ../development/ocaml-modules/tezos/test-services.nix { }; + tezos-validation = callPackage ../development/ocaml-modules/tezos/validation.nix { }; tezos-version = callPackage ../development/ocaml-modules/tezos/version.nix { }; tezos-workers = callPackage ../development/ocaml-modules/tezos/workers.nix { }; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index e6d6a08447..10f2bbca09 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -1751,6 +1751,14 @@ in { croniter = callPackage ../development/python-modules/croniter { }; + crownstone-cloud = callPackage ../development/python-modules/crownstone-cloud { }; + + crownstone-core = callPackage ../development/python-modules/crownstone-core { }; + + crownstone-sse = callPackage ../development/python-modules/crownstone-sse { }; + + crownstone-uart = callPackage ../development/python-modules/crownstone-uart { }; + cryptacular = callPackage ../development/python-modules/cryptacular { }; cryptography = callPackage ../development/python-modules/cryptography { @@ -7041,6 +7049,8 @@ in { pytankerkoenig = callPackage ../development/python-modules/pytankerkoenig { }; + pytautulli = callPackage ../development/python-modules/pytautulli { }; + pyte = callPackage ../development/python-modules/pyte { }; pytenable = callPackage ../development/python-modules/pytenable { }; @@ -7784,6 +7794,8 @@ in { qtpy = callPackage ../development/python-modules/qtpy { }; + qualysclient = callPackage ../development/python-modules/qualysclient { }; + quamash = callPackage ../development/python-modules/quamash { }; quandl = callPackage ../development/python-modules/quandl { }; @@ -7821,6 +7833,8 @@ in { random2 = callPackage ../development/python-modules/random2 { }; + rangehttpserver = callPackage ../development/python-modules/rangehttpserver { }; + rapidfuzz = callPackage ../development/python-modules/rapidfuzz { }; rarfile = callPackage ../development/python-modules/rarfile {