diff options
152 files changed, 1571 insertions, 1694 deletions
diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index ca3532ea83d..09ffba3dc6f 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -246,11 +246,21 @@ If the branch is already in a broken state, please refrain from adding extra new ### Stable release branches {#submitting-changes-stable-release-branches} -For cherry-picking a commit to a stable release branch (“backporting”), use `git cherry-pick -x <original commit>` so that the original commit id is included in the commit. +The same staging workflow applies to stable release branches, but the main branch is called `release-*` instead of `master`. -Add a reason for the backport by using `git cherry-pick -xe <original commit>` instead when it is not obvious from the original commit message. It is not needed when it's a minor version update that includes security and bug fixes but don't add new features or when the commit fixes an otherwise broken package. +Example branch names: `release-21.11`, `staging-21.11`, `staging-next-21.11`. -For backporting Pull Requests to stable branches, assign label `backport <branch>` to the original Pull Requests and automation should take care of the rest once the Pull Requests is merged. +Most changes added to the stable release branches are cherry-picked (“backported”) from the `master` and staging branches. + +#### Automatically backporting a Pull Request {#submitting-changes-stable-release-branches-automatic-backports} + +Assign label `backport <branch>` (e.g. `backport release-21.11`) to the PR and a backport PR is automatically created after the PR is merged. + +#### Manually backporting changes {#submitting-changes-stable-release-branches-manual-backports} + +Cherry-pick changes via `git cherry-pick -x <original commit>` so that the original commit id is included in the commit message. + +Add a reason for the backport when it is not obvious from the original commit message. You can do this by cherry picking with `git cherry-pick -xe <original commit>`, which allows editing the commit message. This is not needed for minor version updates that include security and bug fixes but don't add new features or when the commit fixes an otherwise broken package. Here is an example of a cherry-picked commit message with good reason description: diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 4a68bc94186..517a2e458aa 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -105,6 +105,12 @@ </listitem> <listitem> <para> + <literal>services.kubernetes.addons.dashboard</literal> was + removed due to it being an outdated version. + </para> + </listitem> + <listitem> + <para> The <literal>wafHook</literal> hook now honors <literal>NIX_BUILD_CORES</literal> when <literal>enableParallelBuilding</literal> is not set diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 55655272310..cfe1130068c 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -41,6 +41,8 @@ In addition to numerous new and upgraded packages, this release has the followin org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and `pkgs.emacsPackages.nongnuPackages` where the new versions will release. +- `services.kubernetes.addons.dashboard` was removed due to it being an outdated version. + - The `wafHook` hook now honors `NIX_BUILD_CORES` when `enableParallelBuilding` is not set explicitly. Packages can restore the old behaviour by setting `enableParallelBuilding=false`. - `pkgs.claws-mail-gtk2`, representing Claws Mail's older release version three, was removed in order to get rid of Python 2. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 55de0173502..dd6a74df30c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -296,7 +296,6 @@ ./services/cluster/hadoop/default.nix ./services/cluster/k3s/default.nix ./services/cluster/kubernetes/addons/dns.nix - ./services/cluster/kubernetes/addons/dashboard.nix ./services/cluster/kubernetes/addon-manager.nix ./services/cluster/kubernetes/apiserver.nix ./services/cluster/kubernetes/controller-manager.nix diff --git a/nixos/modules/services/cluster/kubernetes/addon-manager.nix b/nixos/modules/services/cluster/kubernetes/addon-manager.nix index 3d988dc2479..9159d5915eb 100644 --- a/nixos/modules/services/cluster/kubernetes/addon-manager.nix +++ b/nixos/modules/services/cluster/kubernetes/addon-manager.nix @@ -58,7 +58,7 @@ in "spec" = { ... }; }; } - // import <nixpkgs/nixos/modules/services/cluster/kubernetes/dashboard.nix> { cfg = config.services.kubernetes; }; + // import <nixpkgs/nixos/modules/services/cluster/kubernetes/dns.nix> { cfg = config.services.kubernetes; }; ''; }; diff --git a/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix b/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix deleted file mode 100644 index 54b1f3859fc..00000000000 --- a/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix +++ /dev/null @@ -1,344 +0,0 @@ -{ config, options, pkgs, lib, ... }: - -with lib; - -let - cfg = config.services.kubernetes.addons.dashboard; - opt = options.services.kubernetes.addons.dashboard; -in { - imports = [ - (mkRenamedOptionModule [ "services" "kubernetes" "addons" "dashboard" "enableRBAC" ] [ "services" "kubernetes" "addons" "dashboard" "rbac" "enable" ]) - ]; - - options.services.kubernetes.addons.dashboard = { - enable = mkEnableOption "kubernetes dashboard addon"; - - extraArgs = mkOption { - description = "Extra arguments to append to the dashboard cmdline"; - type = types.listOf types.str; - default = []; - example = ["--enable-skip-login"]; - }; - - rbac = mkOption { - description = "Role-based access control (RBAC) options"; - default = {}; - type = types.submodule { - options = { - enable = mkOption { - description = "Whether to enable role based access control is enabled for kubernetes dashboard"; - type = types.bool; - default = elem "RBAC" config.services.kubernetes.apiserver.authorizationMode; - defaultText = literalExpression '' - elem "RBAC" config.${options.services.kubernetes.apiserver.authorizationMode} - ''; - }; - - clusterAdmin = mkOption { - description = "Whether to assign cluster admin rights to the kubernetes dashboard"; - type = types.bool; - default = false; - }; - }; - }; - }; - - version = mkOption { - description = "Which version of the kubernetes dashboard to deploy"; - type = types.str; - default = "v1.10.1"; - }; - - image = mkOption { - description = "Docker image to seed for the kubernetes dashboard container."; - type = types.attrs; - default = { - imageName = "k8s.gcr.io/kubernetes-dashboard-amd64"; - imageDigest = "sha256:0ae6b69432e78069c5ce2bcde0fe409c5c4d6f0f4d9cd50a17974fea38898747"; - finalImageTag = cfg.version; - sha256 = "01xrr4pwgr2hcjrjsi3d14ifpzdfbxzqpzxbk2fkbjb9zkv38zxy"; - }; - defaultText = literalExpression '' - { - imageName = "k8s.gcr.io/kubernetes-dashboard-amd64"; - imageDigest = "sha256:0ae6b69432e78069c5ce2bcde0fe409c5c4d6f0f4d9cd50a17974fea38898747"; - finalImageTag = config.${opt.version}; - sha256 = "01xrr4pwgr2hcjrjsi3d14ifpzdfbxzqpzxbk2fkbjb9zkv38zxy"; - }; - ''; - }; - }; - - config = mkIf cfg.enable { - services.kubernetes.kubelet.seedDockerImages = [(pkgs.dockerTools.pullImage cfg.image)]; - - services.kubernetes.addonManager.addons = { - kubernetes-dashboard-deployment = { - kind = "Deployment"; - apiVersion = "apps/v1"; - metadata = { - labels = { - k8s-addon = "kubernetes-dashboard.addons.k8s.io"; - k8s-app = "kubernetes-dashboard"; - version = cfg.version; - "kubernetes.io/cluster-service" = "true"; - "addonmanager.kubernetes.io/mode" = "Reconcile"; - }; - name = "kubernetes-dashboard"; - namespace = "kube-system"; - }; - spec = { - replicas = 1; - revisionHistoryLimit = 10; - selector.matchLabels.k8s-app = "kubernetes-dashboard"; - template = { - metadata = { - labels = { - k8s-addon = "kubernetes-dashboard.addons.k8s.io"; - k8s-app = "kubernetes-dashboard"; - version = cfg.version; - "kubernetes.io/cluster-service" = "true"; - }; - annotations = { - "scheduler.alpha.kubernetes.io/critical-pod" = ""; - }; - }; - spec = { - priorityClassName = "system-cluster-critical"; - containers = [{ - name = "kubernetes-dashboard"; - image = with cfg.image; "${imageName}:${finalImageTag}"; - ports = [{ - containerPort = 8443; - protocol = "TCP"; - }]; - resources = { - limits = { - cpu = "100m"; - memory = "300Mi"; - }; - requests = { - cpu = "100m"; - memory = "100Mi"; - }; - }; - args = ["--auto-generate-certificates"] ++ cfg.extraArgs; - volumeMounts = [{ - name = "tmp-volume"; - mountPath = "/tmp"; - } { - name = "kubernetes-dashboard-certs"; - mountPath = "/certs"; - }]; - livenessProbe = { - httpGet = { - scheme = "HTTPS"; - path = "/"; - port = 8443; - }; - initialDelaySeconds = 30; - timeoutSeconds = 30; - }; - }]; - volumes = [{ - name = "kubernetes-dashboard-certs"; - secret = { - secretName = "kubernetes-dashboard-certs"; - }; - } { - name = "tmp-volume"; - emptyDir = {}; - }]; - serviceAccountName = "kubernetes-dashboard"; - tolerations = [{ - key = "node-role.kubernetes.io/master"; - effect = "NoSchedule"; - } { - key = "CriticalAddonsOnly"; - operator = "Exists"; - }]; - }; - }; - }; - }; - - kubernetes-dashboard-svc = { - apiVersion = "v1"; - kind = "Service"; - metadata = { - labels = { - k8s-addon = "kubernetes-dashboard.addons.k8s.io"; - k8s-app = "kubernetes-dashboard"; - "kubernetes.io/cluster-service" = "true"; - "kubernetes.io/name" = "KubeDashboard"; - "addonmanager.kubernetes.io/mode" = "Reconcile"; - }; - name = "kubernetes-dashboard"; - namespace = "kube-system"; - }; - spec = { - ports = [{ - port = 443; - targetPort = 8443; - }]; - selector.k8s-app = "kubernetes-dashboard"; - }; - }; - - kubernetes-dashboard-sa = { - apiVersion = "v1"; - kind = "ServiceAccount"; - metadata = { - labels = { - k8s-app = "kubernetes-dashboard"; - k8s-addon = "kubernetes-dashboard.addons.k8s.io"; - "addonmanager.kubernetes.io/mode" = "Reconcile"; - }; - name = "kubernetes-dashboard"; - namespace = "kube-system"; - }; - }; - kubernetes-dashboard-sec-certs = { - apiVersion = "v1"; - kind = "Secret"; - metadata = { - labels = { - k8s-app = "kubernetes-dashboard"; - # Allows editing resource and makes sure it is created first. - "addonmanager.kubernetes.io/mode" = "EnsureExists"; - }; - name = "kubernetes-dashboard-certs"; - namespace = "kube-system"; - }; - type = "Opaque"; - }; - kubernetes-dashboard-sec-kholder = { - apiVersion = "v1"; - kind = "Secret"; - metadata = { - labels = { - k8s-app = "kubernetes-dashboard"; - # Allows editing resource and makes sure it is created first. - "addonmanager.kubernetes.io/mode" = "EnsureExists"; - }; - name = "kubernetes-dashboard-key-holder"; - namespace = "kube-system"; - }; - type = "Opaque"; - }; - kubernetes-dashboard-cm = { - apiVersion = "v1"; - kind = "ConfigMap"; - metadata = { - labels = { - k8s-app = "kubernetes-dashboard"; - # Allows editing resource and makes sure it is created first. - "addonmanager.kubernetes.io/mode" = "EnsureExists"; - }; - name = "kubernetes-dashboard-settings"; - namespace = "kube-system"; - }; - }; - } // (optionalAttrs cfg.rbac.enable - (let - subjects = [{ - kind = "ServiceAccount"; - name = "kubernetes-dashboard"; - namespace = "kube-system"; - }]; - labels = { - k8s-app = "kubernetes-dashboard"; - k8s-addon = "kubernetes-dashboard.addons.k8s.io"; - "addonmanager.kubernetes.io/mode" = "Reconcile"; - }; - in - (if cfg.rbac.clusterAdmin then { - kubernetes-dashboard-crb = { - apiVersion = "rbac.authorization.k8s.io/v1"; - kind = "ClusterRoleBinding"; - metadata = { - name = "kubernetes-dashboard"; - inherit labels; - }; - roleRef = { - apiGroup = "rbac.authorization.k8s.io"; - kind = "ClusterRole"; - name = "cluster-admin"; - }; - inherit subjects; - }; - } - else - { - # Upstream role- and rolebinding as per: - # https://raw.githubusercontent.com/kubernetes/dashboard/master/src/deploy/alternative/kubernetes-dashboard.yaml - kubernetes-dashboard-role = { - apiVersion = "rbac.authorization.k8s.io/v1"; - kind = "Role"; - metadata = { - name = "kubernetes-dashboard-minimal"; - namespace = "kube-system"; - inherit labels; - }; - rules = [ - # Allow Dashboard to create 'kubernetes-dashboard-key-holder' secret. - { - apiGroups = [""]; - resources = ["secrets"]; - verbs = ["create"]; - } - # Allow Dashboard to create 'kubernetes-dashboard-settings' config map. - { - apiGroups = [""]; - resources = ["configmaps"]; - verbs = ["create"]; - } - # Allow Dashboard to get, update and delete Dashboard exclusive secrets. - { - apiGroups = [""]; - resources = ["secrets"]; - resourceNames = ["kubernetes-dashboard-key-holder"]; - verbs = ["get" "update" "delete"]; - } - # Allow Dashboard to get and update 'kubernetes-dashboard-settings' config map. - { - apiGroups = [""]; - resources = ["configmaps"]; - resourceNames = ["kubernetes-dashboard-settings"]; - verbs = ["get" "update"]; - } - # Allow Dashboard to get metrics from heapster. - { - apiGroups = [""]; - resources = ["services"]; - resourceNames = ["heapster"]; - verbs = ["proxy"]; - } - { - apiGroups = [""]; - resources = ["services/proxy"]; - resourceNames = ["heapster" "http:heapster:" "https:heapster:"]; - verbs = ["get"]; - } - ]; - }; - - kubernetes-dashboard-rb = { - apiVersion = "rbac.authorization.k8s.io/v1"; - kind = "RoleBinding"; - metadata = { - name = "kubernetes-dashboard-minimal"; - namespace = "kube-system"; - inherit labels; - }; - roleRef = { - apiGroup = "rbac.authorization.k8s.io"; - kind = "Role"; - name = "kubernetes-dashboard-minimal"; - }; - inherit subjects; - }; - }) - )); - }; -} diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index cf7fcb0a6d7..227c69fec36 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -106,6 +106,7 @@ let in { imports = [ + (mkRemovedOptionModule [ "services" "kubernetes" "addons" "dashboard" ] "Removed due to it being an outdated version") (mkRemovedOptionModule [ "services" "kubernetes" "verbose" ] "") ]; diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix index 3c4c0069dfd..54e4f900285 100644 --- a/nixos/modules/services/networking/dhcpd.nix +++ b/nixos/modules/services/networking/dhcpd.nix @@ -28,45 +28,38 @@ let } ''; - dhcpdService = postfix: cfg: - let - configFile = - if cfg.configFile != null - then cfg.configFile - else writeConfig cfg; - leaseFile = "/var/lib/dhcpd${postfix}/dhcpd.leases"; - args = [ - "@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}" - "-pf" "/run/dhcpd${postfix}/dhcpd.pid" - "-cf" configFile - "-lf" leaseFile - ] ++ cfg.extraFlags - ++ cfg.interfaces; - in - optionalAttrs cfg.enable { - "dhcpd${postfix}" = { - description = "DHCPv${postfix} server"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - preStart = "touch ${leaseFile}"; - serviceConfig = { - ExecStart = concatMapStringsSep " " escapeShellArg args; - Type = "forking"; - Restart = "always"; - DynamicUser = true; - User = "dhcpd"; - Group = "dhcpd"; - AmbientCapabilities = [ - "CAP_NET_RAW" # to send ICMP messages - "CAP_NET_BIND_SERVICE" # to bind on DHCP port (67) - ]; - StateDirectory = "dhcpd${postfix}"; - RuntimeDirectory = "dhcpd${postfix}"; - PIDFile = "/run/dhcpd${postfix}/dhcpd.pid"; - }; + dhcpdService = postfix: cfg: optionalAttrs cfg.enable { + "dhcpd${postfix}" = { + description = "DHCPv${postfix} server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + preStart = '' + mkdir -m 755 -p ${cfg.stateDir} + chown dhcpd:nogroup ${cfg.stateDir} + touch ${cfg.stateDir}/dhcpd.leases + ''; + + serviceConfig = + let + configFile = if cfg.configFile != null then cfg.configFile else writeConfig cfg; + args = [ "@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}" + "-pf" "/run/dhcpd${postfix}/dhcpd.pid" + "-cf" "${configFile}" + "-lf" "${cfg.stateDir}/dhcpd.leases" + "-user" "dhcpd" "-group" "nogroup" + ] ++ cfg.extraFlags + ++ cfg.interfaces; + + in { + ExecStart = concatMapStringsSep " " escapeShellArg args; + Type = "forking"; + Restart = "always"; + RuntimeDirectory = [ "dhcpd${postfix}" ]; + PIDFile = "/run/dhcpd${postfix}/dhcpd.pid"; }; - }; + }; + }; machineOpts = { ... }: { @@ -109,6 +102,15 @@ let ''; }; + stateDir = mkOption { + type = types.path; + # We use /var/lib/dhcp for DHCPv4 to save backwards compatibility. + default = "/var/lib/dhcp${if postfix == "4" then "" else postfix}"; + description = '' + State directory for the DHCP server. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -192,13 +194,7 @@ in imports = [ (mkRenamedOptionModule [ "services" "dhcpd" ] [ "services" "dhcpd4" ]) - ] ++ flip map [ "4" "6" ] (postfix: - mkRemovedOptionModule [ "services" "dhcpd${postfix}" "stateDir" ] '' - The DHCP server state directory is now managed with the systemd's DynamicUser mechanism. - This means the directory is named after the service (dhcpd${postfix}), created under - /var/lib/private/ and symlinked to /var/lib/. - '' - ); + ]; ###### interface @@ -214,6 +210,15 @@ in config = mkIf (cfg4.enable || cfg6.enable) { + users = { + users.dhcpd = { + isSystemUser = true; + group = "dhcpd"; + description = "DHCP daemon user"; + }; + groups.dhcpd = {}; + }; + systemd.services = dhcpdService "4" cfg4 // dhcpdService "6" cfg6; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 09cd26a7669..63a990d3d81 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -398,6 +398,7 @@ in proxy = handleTest ./proxy.nix {}; prowlarr = handleTest ./prowlarr.nix {}; pt2-clone = handleTest ./pt2-clone.nix {}; + pulseaudio = discoverTests (import ./pulseaudio.nix); qboot = handleTestOn ["x86_64-linux" "i686-linux"] ./qboot.nix {}; quorum = handleTest ./quorum.nix {}; rabbitmq = handleTest ./rabbitmq.nix {}; diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index 1f23ca55fb2..e1736f6fe17 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.nix @@ -51,7 +51,6 @@ let environment.systemPackages = [ kubectl ]; services.flannel.iface = "eth1"; services.kubernetes = { - addons.dashboard.enable = true; proxy.hostname = "${masterName}.${domain}"; easyCerts = true; diff --git a/nixos/tests/pulseaudio.nix b/nixos/tests/pulseaudio.nix new file mode 100644 index 00000000000..4e2ce679acd --- /dev/null +++ b/nixos/tests/pulseaudio.nix @@ -0,0 +1,71 @@ +let + mkTest = { systemWide ? false }: + import ./make-test-python.nix ({ pkgs, lib, ... }: + let + testFile = pkgs.fetchurl { + url = + "https://file-examples-com.github.io/uploads/2017/11/file_example_MP3_700KB.mp3"; + hash = "sha256-+iggJW8s0/LfA/okfXsB550/55Q0Sq3OoIzuBrzOPJQ="; + }; + + makeTestPlay = key: + { sox, alsa-utils }: + pkgs.writeScriptBin key '' + set -euxo pipefail + ${sox}/bin/play ${testFile} + ${sox}/bin/sox ${testFile} -t wav - | ${alsa-utils}/bin/aplay + touch /tmp/${key}_success + ''; + + testers = builtins.mapAttrs makeTestPlay { + testPlay = { inherit (pkgs) sox alsa-utils; }; + testPlay32 = { inherit (pkgs.pkgsi686Linux) sox alsa-utils; }; + }; + in { + name = "pulseaudio${lib.optionalString systemWide "-systemWide"}"; + meta = with pkgs.lib.maintainers; { + maintainers = [ synthetica ] ++ pkgs.pulseaudio.meta.maintainers; + }; + + machine = { ... }: + + { + imports = [ ./common/wayland-cage.nix ]; + hardware.pulseaudio = { + enable = true; + support32Bit = true; + inherit systemWide; + }; + + environment.systemPackages = [ testers.testPlay pkgs.pavucontrol ] + ++ lib.optional pkgs.stdenv.isx86_64 testers.testPlay32; + } // lib.optionalAttrs systemWide { + users.users.alice.extraGroups = [ "audio" ]; + systemd.services.pulseaudio.wantedBy = [ "multi-user.target" ]; + }; + + enableOCR = true; + + testScript = { ... }: '' + machine.wait_until_succeeds("pgrep xterm") + machine.wait_for_text("alice@machine") + + machine.send_chars("testPlay \n") + machine.wait_for_file("/tmp/testPlay_success") + ${lib.optionalString pkgs.stdenv.isx86_64 '' + machine.send_chars("testPlay32 \n") + machine.wait_for_file("/tmp/testPlay32_success") + ''} + machine.screenshot("testPlay") + + # Pavucontrol only loads when Pulseaudio is running. If it isn't, the + # text "Playback" (one of the tabs) will never show. + machine.send_chars("pavucontrol\n") + machine.wait_for_text("Playback") + machine.screenshot("Pavucontrol") + ''; + }); +in builtins.mapAttrs (key: val: mkTest val) { + user = { systemWide = false; }; + system = { systemWide = true; }; +} diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 725bc8f2e9c..691979c4de5 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -3,13 +3,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.3.6"; + version = "1.3.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-8SWbbdPx/cC7EWTkSbB/YqR13jaL76fFIjHPGL4rFyk="; + sha256 = "sha256-W8WRw42hMNUaQZlfrl73REGIvLcj6Vso9Axx53ENkx0="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index 4353352ef09..e1dc572e117 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,13 +9,13 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.11"; + version = "1.10.14"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8kPaa2wRKUQBn4LFDnc7tEbLR62f99NS1HIVDeHHzto="; + sha256 = "sha256-0DQrcei3FM+X4BYokou7dPNVCcJTbY05YsTvzdtsas8="; }; runVend = true; diff --git a/pkgs/applications/blockchains/lightning-loop/default.nix b/pkgs/applications/blockchains/lightning-loop/default.nix index f33b005cdd9..85ec49f3be5 100644 --- a/pkgs/applications/blockchains/lightning-loop/default.nix +++ b/pkgs/applications/blockchains/lightning-loop/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "lightning-loop"; - version = "0.15.0-beta"; + version = "0.16.0-beta"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "loop"; rev = "v${version}"; - sha256 = "1yjc04jiam3836w7vn3b1jqj1dq1k8wwfnccir0vh29cn6v0cf63"; + sha256 = "0q4lk338mr30frilgnjr43gd55z7ryj2s260437b4pnp03hmbf10"; }; - vendorSha256 = "0c3ly0s438sr9iql2ps4biaswphp7dfxshddyw5fcm0ajqzvhrmw"; + vendorSha256 = "14862603rrss14p537j9i7iwflaaprwrnslmqm9hpb7hj52bxqfv"; subPackages = [ "cmd/loop" "cmd/loopd" ]; diff --git a/pkgs/applications/blockchains/lightning-pool/default.nix b/pkgs/applications/blockchains/lightning-pool/default.nix index f33ede49398..ccb65fb0fd8 100644 --- a/pkgs/applications/blockchains/lightning-pool/default.nix +++ b/pkgs/applications/blockchains/lightning-pool/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "lightning-pool"; - version = "0.5.1-alpha"; + version = "0.5.3-alpha"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "pool"; rev = "v${version}"; - sha256 = "147s0p4arfxl2akzm267p8zfy6hgssym5rwxv78kp8i39mfinpkn"; + sha256 = "1nc3hksk9qcxrsyqpz9vcfc8x093rc8yx8ppfk177j9fhdnn8bk7"; }; - vendorSha256 = "0zd3bwqi0hnk0562x9hd62cwjw1xj386m83jagg41kzz0cpcr7zl"; + vendorSha256 = "09yxaa74814l1rp0arqhqpplr2j0p8dj81zqcbxlwp5ckjv9r2za"; subPackages = [ "cmd/pool" "cmd/poold" ]; diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh index ed507622240..8899bdd181d 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_3 git gnupg nix +#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_3 git gnupg nixFlakes set -euo pipefail # This script uses the following env vars: @@ -17,7 +17,7 @@ scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) nixpkgs=$(realpath "$scriptDir"/../../../../..) evalNixpkgs() { - nix eval --raw "(with import \"$nixpkgs\" {}; $1)" + nix eval --impure --raw --expr "(with import \"$nixpkgs\" {}; $1)" } getRepo() { diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 52f4e8def20..85d801e2ec3 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -1,20 +1,21 @@ { lib, fetchFromGitHub , meson, ninja, pkg-config, wrapGAppsHook -, desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy +, desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy, webkitgtk , python3Packages, gettext -, appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3 +, appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3, gnome , steam-run, xdg-utils, pciutils, cabextract, wineWowPackages +, freetype, p7zip, gamemode }: python3Packages.buildPythonApplication rec { pname = "bottles"; - version = "2021.7.28-treviso-2"; + version = "2021.12.28-treviso"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = pname; rev = version; - sha256 = "0kvwcajm9izvkwfg7ir7bks39bpc665idwa8mc8d536ajyjriysn"; + sha256 = "lZbSLLBg7XM6PuOmu5rJ15dg+QHHRcjijRYE6u3WT9Y="; }; postPatch = '' @@ -41,10 +42,13 @@ python3Packages.buildPythonApplication rec { gtk3 libhandy libnotify + webkitgtk + gnome.adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ pyyaml + pytoml requests pycairo pygobject3 @@ -53,12 +57,16 @@ python3Packages.buildPythonApplication rec { gst-python liblarch patool + markdown ] ++ [ steam-run xdg-utils pciutils cabextract wineWowPackages.minimal + freetype + p7zip + gamemode # programs.gamemode.enable ]; format = "other"; @@ -66,13 +74,9 @@ python3Packages.buildPythonApplication rec { dontWrapGApps = true; # prevent double wrapping preConfigure = '' - substituteInPlace build-aux/meson/postinstall.py \ - --replace "'update-desktop-database'" "'${desktop-file-utils}/bin/update-desktop-database'" - substituteInPlace src/runner.py \ - --replace " {runner}" " ${steam-run}/bin/steam-run {runner}" \ - --replace " {dxvk_setup}" " ${steam-run}/bin/steam-run {dxvk_setup}" - substituteInPlace src/runner_utilities.py \ - --replace " {runner}" " ${steam-run}/bin/steam-run {runner}" \ + patchShebangs build-aux/meson/postinstall.py + substituteInPlace src/backend/runner.py \ + --replace "{Paths.runners}" "${steam-run}/bin/steam-run {Paths.runners}" ''; preFixup = '' diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index eeff215679a..284339b13ee 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -1,18 +1,18 @@ -{ lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config, coreutils }: +{ lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config, coreutils, mbedtls }: mkDerivation rec { pname = "openrgb"; - version = "0.6"; + version = "0.7"; src = fetchFromGitLab { owner = "CalcProgrammer1"; repo = "OpenRGB"; rev = "release_${version}"; - sha256 = "sha256-x/wGD39Jm/kmcTEZP3BnLXxyv/jkPOJd6mLCO0dp5wM="; + sha256 = "0xhfaz0b74nfnh7il2cz5c0338xlzay00g6hc2h3lsncarj8d5n7"; }; nativeBuildInputs = [ qmake pkg-config ]; - buildInputs = [ libusb1 hidapi ]; + buildInputs = [ libusb1 hidapi mbedtls ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix index 442750837bb..91a77d8de6f 100644 --- a/pkgs/applications/misc/stog/default.nix +++ b/pkgs/applications/misc/stog/default.nix @@ -1,32 +1,44 @@ -{ lib, stdenv, fetchFromGitLab, ocaml, findlib, ocf, ptime, - uutf, uri, ppx_blob, xtmpl, ocaml_lwt, higlo, omd +{ lib, buildDunePackage, fetchFromGitLab, ocaml +, fmt, lwt_ppx, menhir, ocf_ppx, ppx_blob, xtmpl_ppx +, dune-build-info, dune-site, higlo, logs, lwt, ocf, ptime, uri, uutf, xtmpl }: -stdenv.mkDerivation rec { +if lib.versionAtLeast ocaml.version "4.13" +then throw "stog is not available for OCaml ${ocaml.version}" +else + +buildDunePackage rec { pname = "stog"; - version = "0.18.0"; + version = "0.20.0"; + useDune2 = true; + minimalOCamlVersion = "4.12"; src = fetchFromGitLab { domain = "framagit.org"; owner = "zoggy"; repo = "stog"; rev = version; - sha256 = "154gl3ljxqlw8wz1vmsyv8180igrl5bjq0wir7ybrnzq2cdflkv0"; + sha256 = "sha256:0krj5w4y05bcfx7hk9blmap8avl31gp7yi01lpqzs6ync23mvm0x"; }; - buildInputs = [ ocaml uutf ]; - propagatedBuildInputs = [ findlib omd ppx_blob ocf ptime uri xtmpl ocaml_lwt higlo ]; - - createFindlibDestdir = true; - - patches = [ ./install.patch ./uri.patch ]; + buildInputs = [ fmt lwt_ppx menhir ocf_ppx ppx_blob xtmpl_ppx ]; + propagatedBuildInputs = [ + dune-build-info + dune-site + higlo + logs + lwt + ocf + ppx_blob + ptime + uri + uutf + xtmpl + ]; meta = with lib; { description = "XML documents and web site compiler"; homepage = "https://www.good-eris.net/stog"; license = licenses.lgpl3; - platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ regnat ]; }; } - - diff --git a/pkgs/applications/misc/stog/install.patch b/pkgs/applications/misc/stog/install.patch deleted file mode 100644 index a2407d3079f..00000000000 --- a/pkgs/applications/misc/stog/install.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/Makefile b/src/Makefile -index 736dd037..79a85b9c 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -431,11 +431,12 @@ install-lib: - install-share: - - install-bin: -+ mkdir $(out)/bin - $(CP) $(MAIN) $(MAIN_BYTE) $(TMPL) $(TMPL_BYTE) \ - $(SERVER) $(SERVER_BYTE) $(OCAML_SESSION) \ - $(MK_STOG) $(MK_STOG_BYTE) $(MK_STOG_OCAML) \ - $(LATEX2STOG) $(LATEX2STOG_BYTE) \ -- `dirname \`which $(OCAMLC)\``/ -+ $(out)/bin - - uninstall: uninstall-lib uninstall-share uninstall-bin - diff --git a/pkgs/applications/misc/stog/uri.patch b/pkgs/applications/misc/stog/uri.patch deleted file mode 100644 index 08063a38add..00000000000 --- a/pkgs/applications/misc/stog/uri.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/stog_url.ml b/src/stog_url.ml -index 5d30a43f..c67bfc36 100644 ---- a/src/stog_url.ml -+++ b/src/stog_url.ml -@@ -40,7 +40,7 @@ let of_string s = - with _ -> - failwith (Printf.sprintf "Malformed URL %S" s) - ;; --let to_string = Uri.to_string ;; -+let to_string u = Uri.to_string u;; - - let path url = - let l = diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index dbe25ea06a9..84f46f1b60d 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -13,13 +13,13 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { pname = "elinks"; - version = "0.14.3"; + version = "0.15.0"; src = fetchFromGitHub { owner = "rkd77"; repo = "felinks"; rev = "v${version}"; - sha256 = "sha256-vyzuMU2Qfz8DMRP0+QQmSx8J40ADTMJqg2jQOZJQxUA="; + sha256 = "sha256-2TF0rbmjwhwV2AVUXjfzoprzpeqrETis3AFhMftpaZQ="; }; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index c844c02ef8e..e1c93fe9772 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -297,10 +297,17 @@ stdenv.mkDerivation rec { cp -u --no-preserve=mode,owner "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/bookmarks.html" \ "\$HOME/TorBrowser/Data/Browser/profile.default/bookmarks.html" - # Clear out some files that tend to capture store references but are - # easily generated by firefox at startup. - rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/{addonStartup.json.lz4,compatibility.ini,extensions.ini,extensions.json} - rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/startupCache/* + # Clear some files if the last known store path is different from the new one + : "\''${KNOWN_STORE_PATH:=\$HOME/known-store-path}" + if ! [ "\$KNOWN_STORE_PATH" -ef $out ]; then + echo "Cleanup files with outdated store references" + ln -Tsf $out "\$KNOWN_STORE_PATH" + + # Clear out some files that tend to capture store references but are + # easily generated by firefox at startup. + rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/{addonStartup.json.lz4,compatibility.ini,extensions.ini,extensions.json} + rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/startupCache/* + fi # XDG : "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}" diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix index 2a507f41430..2b9ca9df049 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubeone"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - sha256 = "sha256-Y0IlTOAfwEp8WkFpXSS02vEhCM4+juAY+Nx/e9Vv0F0="; + sha256 = "sha256-IgV1ULxwL17ECsm7MdRfQERcEVy9cEft2L7fHP3XCKo="; }; vendorSha256 = "sha256-/rhV7JHuqejCTizcjKIkaJlbRcx7AfMcGqQYo6dlg48="; diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index 5e8b0bdc0ab..a2ea7e8008e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -13,9 +13,9 @@ # https://github.com/dmacvicar/terraform-provider-libvirt/tree/main/examples let - sha256 = "sha256-8GGPd0+qdw7s4cr0RgLoS0Cu4C+RAuuboZzTyYN/kq8="; - vendorSha256 = "sha256-fpO2sGM+VUKLmdfJ9CQfTFnCfxVTK2m9Sirj9oerD/I="; - version = "0.6.11"; + sha256 = "sha256-1l+ARrXHxtSdnQfYV/6gw3BYHVH8NN4pi+Ttk1nwF88="; + vendorSha256 = "sha256-OJa8pQgf5PlECZZkFV9fyCOdh6CrregY1BWycx7JPFE="; + version = "0.6.12"; in buildGoModule { inherit version; inherit vendorSha256; @@ -41,7 +41,7 @@ in buildGoModule { # Terraform allow checking the provider versions, but this breaks # if the versions are not provided via file paths. postBuild = "mv $GOPATH/bin/terraform-provider-libvirt{,_v${version}}"; - + ldflags = [ "-X main.version=${version}" ]; passthru.provider-source-address = "registry.terraform.io/dmacvicar/libvirt"; @@ -50,7 +50,6 @@ in buildGoModule { meta = with lib; { homepage = "https://github.com/dmacvicar/terraform-provider-libvirt"; description = "Terraform provider for libvirt"; - platforms = platforms.linux; license = licenses.asl20; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b63d4848b5e..67daa13fade 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1129,10 +1129,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vault", "repo": "terraform-provider-vault", - "rev": "v3.0.1", - "sha256": "0ppx8kc4zf0yp09vbkmj875sqvklbx0p8a1ganpzdm3462zskra4", - "vendorSha256": "03l8bk9jsqf4c7gv0hs1rli7wmlcvpdxmxhra9vndnz6g0jvkvyx", - "version": "3.0.1" + "rev": "v3.1.1", + "sha256": "15fwc0sfdpcl85194gq6r97y18ggh61wbyh6lq7nrprwn2xvjch9", + "vendorSha256": "1q2yfmg6g3bl6h0vzanz7874xc4g7ggmysh2dqryijvr4kccnari", + "version": "3.1.1" }, "vcd": { "owner": "terraform-providers", diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 3bd1564af2a..3c43d715c01 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -4,7 +4,7 @@ with ocamlPackages; buildDunePackage rec { pname = "jackline"; - version = "unstable-2021-08-10"; + version = "unstable-2021-12-28"; minimumOCamlVersion = "4.08"; @@ -13,8 +13,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "73d87e9a62d534566bb0fbe64990d32d75487f11"; - sha256 = "0wk574rqfg2vqz27nasxzwf67x51pj5fgl4vkc27r741dg4q6c5a"; + rev = "ca1012098d123c555e9fa5244466d2e009521700"; + sha256 = "1j1azskcdrp4g44rv3a4zylkzbzpcs23zzzrx94llbgssw6cd9ih"; }; nativeBuildInpts = [ diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index c5dc39c69d7..293192908b2 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with lib; let - version = "3.4.10"; + version = "3.6.1"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "sha256-iqfvSkSuYruNtGPPdh4swDuXMF4Od+1b5T+oNykYfO8="; + sha256 = "sha256-BDTtqPtr+I4rQqZ+tdHeJUpn1QW+w7tR/unXyteSWjg="; }; cmakeFlags = [ @@ -67,18 +67,18 @@ in stdenv.mkDerivation { done done '' else optionalString withQt '' - install -Dm644 -t $out/share/applications ../wireshark.desktop + install -Dm644 -t $out/share/applications ../org.wireshark.Wireshark.desktop install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg - mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil,wiretap} -pv + mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil/wmem,wiretap} -pv cp config.h $dev/include/wireshark/ cp ../ws_*.h $dev/include cp ../epan/*.h $dev/include/epan/ - cp ../epan/wmem/*.h $dev/include/epan/wmem/ cp ../epan/ftypes/*.h $dev/include/epan/ftypes/ cp ../epan/dfilter/*.h $dev/include/epan/dfilter/ cp ../wsutil/*.h $dev/include/wsutil/ + cp ../wsutil/wmem/*.h $dev/include/wsutil/wmem/ cp ../wiretap/*.h $dev/include/wiretap ''); diff --git a/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch b/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch index 549da5436e6..5829457375f 100644 --- a/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch +++ b/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch @@ -11,16 +11,18 @@ Also change execv() to execvp() because we've set argv[0] to "dumpcap" and have to enable PATH lookup. Wireshark is not a setuid program, so looking in PATH is not a security issue. +EDITED by teto for wireshark 3.6 + Signed-off-by: Franz Pletz <fpletz@fnordicwalking.de> --- capchild/capture_sync.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c -index 970688e..49914d5 100644 ---- a/capchild/capture_sync.c -+++ b/capchild/capture_sync.c -@@ -332,7 +332,18 @@ init_pipe_args(int *argc) { +index f31914886a..df29b6f0ab 100644 +--- a/capture/capture_sync.c ++++ b/capture/capture_sync.c +@@ -187,7 +187,18 @@ init_pipe_args(int *argc) { #ifdef _WIN32 exename = g_strdup_printf("%s\\dumpcap.exe", progfile_dir); #else @@ -40,7 +42,7 @@ index 970688e..49914d5 100644 #endif /* Make that the first argument in the argument list (argv[0]). */ -@@ -729,7 +740,7 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, voi +@@ -572,7 +583,7 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, inf */ dup2(sync_pipe[PIPE_WRITE], 2); ws_close(sync_pipe[PIPE_READ]); @@ -49,7 +51,7 @@ index 970688e..49914d5 100644 g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", argv[0], g_strerror(errno)); sync_pipe_errmsg_to_parent(2, errmsg, ""); -@@ -997,7 +1008,7 @@ sync_pipe_open_command(char** argv, int *data_read_fd, +@@ -811,7 +822,7 @@ sync_pipe_open_command(char* const argv[], int *data_read_fd, dup2(sync_pipe[PIPE_WRITE], 2); ws_close(sync_pipe[PIPE_READ]); ws_close(sync_pipe[PIPE_WRITE]); @@ -58,6 +60,3 @@ index 970688e..49914d5 100644 g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", argv[0], g_strerror(errno)); sync_pipe_errmsg_to_parent(2, errmsg, ""); --- -2.6.3 - diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index 90608dceba5..73a6b7b457e 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -1,15 +1,12 @@ -{ stdenv , lib , fetchurl , appimageTools , makeWrapper , electron_11 }: +{ stdenv , lib , fetchurl , appimageTools , makeWrapper , electron }: -let - electron = electron_11; -in stdenv.mkDerivation rec { pname = "super-productivity"; - version = "7.6.0"; + version = "7.9.1"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "f02a451a44f48a8e85a0c1269625d89fb1e0b8a75b7e217d96352064e6464ae5"; + sha256 = "sha256:0lxnl5ai23dwfsyrkpi9l1a0gl0qn6vp7hzmca77nyx974d6j8m4"; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 3e19dc2befb..a653762b538 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -24,13 +24,13 @@ assert !(pulseaudioSupport && portaudioSupport); gnuradio3_8Minimal.pkgs.mkDerivation rec { pname = "gqrx"; - version = "2.15"; + version = "2.15.1"; src = fetchFromGitHub { owner = "gqrx-sdr"; repo = "gqrx"; rev = "v${version}"; - sha256 = "sha256-m3YV5Hbu5+3eS+LOy+x6HjpdiJo1iObbeEKuQXXmAak="; + sha256 = "sha256-OL83l3A27rggfGbfLT1CUaPAQHEKXgoGS1jYJZ9eHPQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index a5c687a8db2..29f8ec7b5e5 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -1,5 +1,6 @@ { lib, fetchFromGitHub, python3Packages , hackrf, rtl-sdr, airspy, limesuite, libiio +, libbladeRF , qt5 , USRPSupport ? false, uhd }: @@ -15,7 +16,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - buildInputs = [ hackrf rtl-sdr airspy limesuite libiio ] + buildInputs = [ hackrf rtl-sdr airspy limesuite libiio libbladeRF ] ++ lib.optional USRPSupport uhd; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index f54dcb94e23..0963b4c17e0 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "stellarium"; - version = "0.21.2"; + version = "0.21.3"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "sha256-bh00o++l3sqELX5kgRhiCcQOLVqvjEyEMcJTnnVPNU8="; + sha256 = "sha256-TQMLy5ziBF7YqPDzPwgjY5FHxxMUe7MXo/TGxQ1nGcg="; }; nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index df298aab211..b543252e871 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -47,12 +47,13 @@ stdenv.mkDerivation rec { }; patches = [ + # fix timeouts when docbuilding with >= 64 cpus + # https://github.com/Singular/Singular/issues/1117 + ./vspace-MAX_PROCESS.patch + # add aarch64 support to cpu-check.m4. copied from redhat. ./redhat-aarch64.patch - # vspace causes hangs in modstd and other libraries on aarch64 - ./disable-vspace-on-aarch64.patch - # the newest version of ax-prog-cc-for-build.m4 seems to trigger # linker errors. see # https://github.com/alsa-project/alsa-firmware/issues/3 for a diff --git a/pkgs/applications/science/math/singular/disable-vspace-on-aarch64.patch b/pkgs/applications/science/math/singular/disable-vspace-on-aarch64.patch deleted file mode 100644 index 3e51b7fb2ce..00000000000 --- a/pkgs/applications/science/math/singular/disable-vspace-on-aarch64.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/kernel/mod2.h b/kernel/mod2.h -index 867fcae47..2abd84f23 100644 ---- a/kernel/mod2.h -+++ b/kernel/mod2.h -@@ -60,8 +60,10 @@ - - /* define for parallel processes with shared memory */ - #ifndef __CCYGWIN__ -+#ifndef SI_CPU_AARCH64 - #define HAVE_VSPACE 1 - #endif -+#endif - - /*#define PROFILING*/ - #ifdef PROFILING diff --git a/pkgs/applications/science/math/singular/vspace-MAX_PROCESS.patch b/pkgs/applications/science/math/singular/vspace-MAX_PROCESS.patch new file mode 100644 index 00000000000..78d658f926e --- /dev/null +++ b/pkgs/applications/science/math/singular/vspace-MAX_PROCESS.patch @@ -0,0 +1,35 @@ +diff --git a/kernel/GBEngine/kChinese.cc b/kernel/GBEngine/kChinese.cc +index 829a66609..84655caf2 100644 +--- a/kernel/GBEngine/kChinese.cc ++++ b/kernel/GBEngine/kChinese.cc +@@ -209,6 +209,8 @@ ideal id_ChineseRemainder_0(ideal *xx, number *q, int rl, const ring r) + return NULL; + } + int cpus=(int)(long)feOptValue(FE_OPT_CPUS); ++ if (cpus>=vspace::internals::MAX_PROCESS) ++ cpus=vspace::internals::MAX_PROCESS-1; + if ((cpus==1) || (2*cpus>=cnt)) + /* at least 2 polys for each process, or switch to seriell version */ + return id_ChineseRemainder(xx,q,rl,r); +@@ -295,6 +297,8 @@ ideal id_Farey_0(ideal x, number N, const ring r) + { + int cnt=IDELEMS(x)*x->nrows; + int cpus=(int)(long)feOptValue(FE_OPT_CPUS); ++ if (cpus>=vspace::internals::MAX_PROCESS) ++ cpus=vspace::internals::MAX_PROCESS-1; + if (2*cpus>=cnt) /* at least 2 polys for each process, + or switch to seriell version */ + return id_Farey(x,N,r); +diff --git a/kernel/GBEngine/kverify.cc b/kernel/GBEngine/kverify.cc +index 909d84994..aa06d6624 100644 +--- a/kernel/GBEngine/kverify.cc ++++ b/kernel/GBEngine/kverify.cc +@@ -176,6 +176,8 @@ BOOLEAN kVerify2(ideal F, ideal Q) + /*---------------------------------------------------------------------*/ + BOOLEAN all_okay=TRUE; + int cpus=(int)(long)feOptValue(FE_OPT_CPUS); ++ if (cpus>=vspace::internals::MAX_PROCESS) ++ cpus=vspace::internals::MAX_PROCESS-1; + int parent_pid=getpid(); + using namespace vspace; + vmem_init(); diff --git a/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix b/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix index 143ab6cac9d..b427acf960e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "git-chglog"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "git-chglog"; repo = "git-chglog"; rev = "v${version}"; - sha256 = "sha256-BiTnPCgymfpPxuy0i8u7JbpbEBeaSIJaikjwsPSA3qc="; + sha256 = "sha256-UlhJ004ceXpdB/9296cL2sbBYsjV8D+3YS1vmFgnko8="; }; - vendorSha256 = "sha256-jIq+oacyT71m78iMZwWOBsBVAY/WxgyH9zRr8GiMGTU="; + vendorSha256 = "sha256-FLFPcmkrhZ+/UX1xpexsDv3cgC/Ocj4qTFJOX+rmdyQ="; ldflags = [ "-s" "-w" "-X=main.Version=v${version}" ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix index d2df8e1fe7f..f88130b926a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - sha256 = "sha256-FCBNm51QI1jDdq2BZFwZA1kpIfXIvh1ickmY3ZqwGPY="; + sha256 = "sha256-1ScZ8pxRN/Eot/Q+HWbWOgDWBmVLjqtPeftRsNQIJEI="; }; - cargoSha256 = "sha256-CBCyujJHWTatJO+Tk6MyOk12B0cY1JSwLQizjcXeQzQ="; + cargoSha256 = "sha256-FMlJn/mVcrHhu3gGISb1e7D2mVAocccqXRYZnMVNPqA="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 87b975e80fb..3d44796f78c 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "xine-ui"; - version = "0.99.12"; + version = "0.99.13"; src = fetchurl { url = "mirror://sourceforge/xine/${pname}-${version}.tar.xz"; - sha256 = "10zmmss3hm8gjjyra20qhdc0lb1m6sym2nb2w62bmfk8isfw9gsl"; + sha256 = "sha256-sjgtB1xysbEAOeDpAxDMhsjZEDWMU1We2C09WEIB9cU="; }; nativeBuildInputs = [ diff --git a/pkgs/build-support/build-dotnet-module/default.nix b/pkgs/build-support/build-dotnet-module/default.nix index c8b65f546ac..0a5b17a4a36 100644 --- a/pkgs/build-support/build-dotnet-module/default.nix +++ b/pkgs/build-support/build-dotnet-module/default.nix @@ -117,40 +117,42 @@ let DOTNET_NOLOGO = true; # This disables the welcome message. DOTNET_CLI_TELEMETRY_OPTOUT = true; - passthru.fetch-deps = args.passthru.fetch-deps or writeScript "fetch-${args.pname}-deps" '' - set -euo pipefail - cd "$(dirname "''${BASH_SOURCE[0]}")" - - export HOME=$(mktemp -d) - deps_file="/tmp/${args.pname}-deps.nix" - - store_src="${package.src}" - src="$(mktemp -d /tmp/${args.pname}.XXX)" - cp -rT "$store_src" "$src" - chmod -R +w "$src" - - trap "rm -rf $src $HOME" EXIT - pushd "$src" - - export DOTNET_NOLOGO=1 - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - - mkdir -p "$HOME/nuget_pkgs" - - for project in "${lib.concatStringsSep "\" \"" ((lib.toList projectFile) ++ lib.optionals (testProjectFile != "") (lib.toList testProjectFile))}"; do - ${dotnet-sdk}/bin/dotnet restore "$project" \ - ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - --packages "$HOME/nuget_pkgs" \ - "''${dotnetRestoreFlags[@]}" \ - "''${dotnetFlags[@]}" - done - - echo "Writing lockfile..." - ${nuget-to-nix}/bin/nuget-to-nix "$HOME/nuget_pkgs" > "$deps_file" - echo "Succesfully wrote lockfile to: $deps_file" - ''; + passthru = { + fetch-deps = writeScript "fetch-${args.pname}-deps" '' + set -euo pipefail + cd "$(dirname "''${BASH_SOURCE[0]}")" + + export HOME=$(mktemp -d) + deps_file="/tmp/${args.pname}-deps.nix" + + store_src="${package.src}" + src="$(mktemp -d /tmp/${args.pname}.XXX)" + cp -rT "$store_src" "$src" + chmod -R +w "$src" + + trap "rm -rf $src $HOME" EXIT + pushd "$src" + + export DOTNET_NOLOGO=1 + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + + mkdir -p "$HOME/nuget_pkgs" + + for project in "${lib.concatStringsSep "\" \"" ((lib.toList projectFile) ++ lib.optionals (testProjectFile != "") (lib.toList testProjectFile))}"; do + ${dotnet-sdk}/bin/dotnet restore "$project" \ + ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --packages "$HOME/nuget_pkgs" \ + "''${dotnetRestoreFlags[@]}" \ + "''${dotnetFlags[@]}" + done + + echo "Writing lockfile..." + ${nuget-to-nix}/bin/nuget-to-nix "$HOME/nuget_pkgs" > "$deps_file" + echo "Succesfully wrote lockfile to: $deps_file" + ''; + } // args.passthru or {}; configurePhase = args.configurePhase or '' runHook preConfigure diff --git a/pkgs/build-support/node/fetch-yarn-deps/index.js b/pkgs/build-support/node/fetch-yarn-deps/index.js index e728ad89e1c..f3662a54361 100755 --- a/pkgs/build-support/node/fetch-yarn-deps/index.js +++ b/pkgs/build-support/node/fetch-yarn-deps/index.js @@ -9,6 +9,7 @@ const child_process = require('child_process') const path = require('path') const lockfile = require('./yarnpkg-lockfile.js') const { promisify } = require('util') +const url = require('url') const execFile = promisify(child_process.execFile) @@ -21,15 +22,15 @@ const exec = async (...args) => { // This has to match the logic in pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js // so that fixup_yarn_lock produces the same paths const urlToName = url => { - const isCodeloadGitTarballUrl = url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/') - - if (url.startsWith('git+') || isCodeloadGitTarballUrl) { - return path.basename(url) - } else { - return url - .replace(/https:\/\/(.)*(.com)\//g, '') // prevents having long directory names - .replace(/[@/%:-]/g, '_') // replace @ and : and - and % characters with underscore - } + const isCodeloadGitTarballUrl = url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/') + + if (url.startsWith('git+') || isCodeloadGitTarballUrl) { + return path.basename(url) + } else { + return url + .replace(/https:\/\/(.)*(.com)\//g, '') // prevents having long directory names + .replace(/[@/%:-]/g, '_') // replace @ and : and - and % characters with underscore + } } const downloadFileHttps = (fileName, url, expectedHash) => { @@ -72,6 +73,23 @@ const downloadGit = async (fileName, url, rev) => { await exec('rm', [ '-rf', fileName + '.tmp', ]) } +const isGitUrl = pattern => { + // https://github.com/yarnpkg/yarn/blob/3119382885ea373d3c13d6a846de743eca8c914b/src/resolvers/exotics/git-resolver.js#L15-L47 + const GIT_HOSTS = ['github.com', 'gitlab.com', 'bitbucket.com', 'bitbucket.org'] + const GIT_PATTERN_MATCHERS = [/^git:/, /^git\+.+:/, /^ssh:/, /^https?:.+\.git$/, /^https?:.+\.git#.+/] + + for (const matcher of GIT_PATTERN_MATCHERS) if (matcher.test(pattern)) return true + + const {hostname, path} = url.parse(pattern) + if (hostname && path && GIT_HOSTS.indexOf(hostname) >= 0 + // only if dependency is pointing to a git repo, + // e.g. facebook/flow and not file in a git repo facebook/flow/archive/v1.0.0.tar.gz + && path.split('/').filter(p => !!p).length === 2 + ) return true + + return false +} + const downloadPkg = (pkg, verbose) => { const [ url, hash ] = pkg.resolved.split('#') if (verbose) console.log('downloading ' + url) @@ -79,12 +97,10 @@ const downloadPkg = (pkg, verbose) => { if (url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/')) { const s = url.split('/') downloadGit(fileName, `https://github.com/${s[3]}/${s[4]}.git`, s[6]) + } else if (isGitUrl(url)) { + return downloadGit(fileName, url.replace(/^git\+/, ''), hash) } else if (url.startsWith('https://')) { return downloadFileHttps(fileName, url, hash) - } else if (url.startsWith('git:')) { - return downloadGit(fileName, url.replace(/^git\+/, ''), hash) - } else if (url.startsWith('git+')) { - return downloadGit(fileName, url.replace(/^git\+/, ''), hash) } else if (url.startsWith('file:')) { console.warn(`ignoring unsupported file:path url "${url}"`) } else { diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index d63c6ff0596..11b5f58a12d 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -1,10 +1,13 @@ { lib, stdenv, pkgs -, haskell, haskellPackages, nodejs +, haskell, haskellPackages, nodejs-14_x , fetchurl, fetchpatch, makeWrapper, writeScriptBin # Rust dependecies , curl, rustPlatform, openssl, pkg-config, Security, darwin }: let + # To controll nodejs version we pass down + nodejs = nodejs-14_x; + fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; }; hsPkgs = haskellPackages.override { diff --git a/pkgs/development/compilers/elm/packages/generate-node-packages.sh b/pkgs/development/compilers/elm/packages/generate-node-packages.sh index 0ffa56eae90..49e697e43e8 100755 --- a/pkgs/development/compilers/elm/packages/generate-node-packages.sh +++ b/pkgs/development/compilers/elm/packages/generate-node-packages.sh @@ -4,9 +4,7 @@ ROOT="$(realpath "$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"/../../. set -eu -o pipefail -rm -f node-env.nix $(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \ - --nodejs-12 \ -i node-packages.json \ -o node-packages.nix \ -c node-composition.nix \ diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index c2b5c5a07dc..083ab8530d8 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; }; }; - "@babel/generator-7.16.0" = { + "@babel/generator-7.16.5" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.16.0.tgz"; - sha512 = "RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.16.5.tgz"; + sha512 = "kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA=="; }; }; "@babel/helper-annotate-as-pure-7.16.0" = { @@ -67,13 +67,13 @@ let sha512 = "ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.16.0" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.16.5" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.0.tgz"; - sha512 = "9KuleLT0e77wFUku6TUkqZzCEymBdtuQQ27MhEKzf9UOOJu3cYj98kyaDAzxpC7lV6DGiZFuC8XqDsq8/Kl6aQ=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.5.tgz"; + sha512 = "3JEA9G5dmmnIWdzaT9d0NmFRgYnWUThLsDaL7982H0XqqWr56lRrsmwheXFMjR+TMl7QMBb6mzy9kvgr1lRLUA=="; }; }; "@babel/helper-compilation-targets-7.16.3" = { @@ -85,13 +85,13 @@ let sha512 = "vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA=="; }; }; - "@babel/helper-create-class-features-plugin-7.16.0" = { + "@babel/helper-create-class-features-plugin-7.16.5" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.0.tgz"; - sha512 = "XLwWvqEaq19zFlF5PTgOod4bUA+XbkR4WLQBct1bkzmxJGB0ZEJaoKF4c8cgH9oBtCDuYJ8BP5NB9uFiEgO5QA=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.5.tgz"; + sha512 = "NEohnYA7mkB8L5JhU7BLwcBdU3j83IziR9aseMueWGeAjblbul3zzb8UvJ3a1zuBiqCMObzCJHFqKIQE6hTVmg=="; }; }; "@babel/helper-create-regexp-features-plugin-7.16.0" = { @@ -103,6 +103,15 @@ let sha512 = "3DyG0zAFAZKcOp7aVr33ddwkxJ0Z0Jr5V99y3I690eYLpukJsJvAbzTy1ewoCqsML8SbIrjH14Jc/nSQ4TvNPA=="; }; }; + "@babel/helper-environment-visitor-7.16.5" = { + name = "_at_babel_slash_helper-environment-visitor"; + packageName = "@babel/helper-environment-visitor"; + version = "7.16.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.5.tgz"; + sha512 = "ODQyc5AnxmZWm/R2W7fzhamOk1ey8gSguo5SGvF0zcB3uUzRpTRmM/jmLSm9bDMyPlvbyJ+PwPEK0BWIoZ9wjg=="; + }; + }; "@babel/helper-explode-assignable-expression-7.16.0" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; @@ -139,13 +148,13 @@ let sha512 = "1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg=="; }; }; - "@babel/helper-member-expression-to-functions-7.16.0" = { + "@babel/helper-member-expression-to-functions-7.16.5" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz"; - sha512 = "bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.5.tgz"; + sha512 = "7fecSXq7ZrLE+TWshbGT+HyCLkxloWNhTbU2QM1NTI/tDqyf0oZiMcEfYtDuUDCo528EOlt39G1rftea4bRZIw=="; }; }; "@babel/helper-module-imports-7.16.0" = { @@ -157,13 +166,13 @@ let sha512 = "kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg=="; }; }; - "@babel/helper-module-transforms-7.16.0" = { + "@babel/helper-module-transforms-7.16.5" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz"; - sha512 = "My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.5.tgz"; + sha512 = "CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ=="; }; }; "@babel/helper-optimise-call-expression-7.16.0" = { @@ -175,31 +184,31 @@ let sha512 = "SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw=="; }; }; - "@babel/helper-plugin-utils-7.14.5" = { + "@babel/helper-plugin-utils-7.16.5" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.14.5"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz"; - sha512 = "/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.5.tgz"; + sha512 = "59KHWHXxVA9K4HNF4sbHCf+eJeFe0Te/ZFGqBT4OjXhrwvA04sGfaEGsVTdsjoszq0YTP49RC9UKe5g8uN2RwQ=="; }; }; - "@babel/helper-remap-async-to-generator-7.16.4" = { + "@babel/helper-remap-async-to-generator-7.16.5" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.16.4"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.4.tgz"; - sha512 = "vGERmmhR+s7eH5Y/cp8PCVzj4XEjerq8jooMfxFdA5xVtAk9Sh4AQsrWgiErUEBjtGrBtOFKDUcWQFW4/dFwMA=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.5.tgz"; + sha512 = "X+aAJldyxrOmN9v3FKp+Hu1NO69VWgYgDGq6YDykwRPzxs5f2N+X988CBXS7EQahDU+Vpet5QYMqLk+nsp+Qxw=="; }; }; - "@babel/helper-replace-supers-7.16.0" = { + "@babel/helper-replace-supers-7.16.5" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz"; - sha512 = "TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.5.tgz"; + sha512 = "ao3seGVa/FZCMCCNDuBcqnBFSbdr8N2EW35mzojx3TwfIbdPmNK+JV6+2d5bR0Z71W5ocLnQp9en/cTF7pBJiQ=="; }; }; "@babel/helper-simple-access-7.16.0" = { @@ -247,22 +256,22 @@ let sha512 = "OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="; }; }; - "@babel/helper-wrap-function-7.16.0" = { + "@babel/helper-wrap-function-7.16.5" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.0.tgz"; - sha512 = "VVMGzYY3vkWgCJML+qVLvGIam902mJW0FvT7Avj1zEe0Gn7D93aWdLblYARTxEw+6DhZmtzhBM2zv0ekE5zg1g=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.5.tgz"; + sha512 = "2J2pmLBqUqVdJw78U0KPNdeE2qeuIyKoG4mKV7wAq3mc4jJG282UgjZw4ZYDnqiWQuS3Y3IYdF/AQ6CpyBV3VA=="; }; }; - "@babel/helpers-7.16.3" = { + "@babel/helpers-7.16.5" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.16.3"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.3.tgz"; - sha512 = "Xn8IhDlBPhvYTvgewPKawhADichOsbkZuzN7qz2BusOM0brChsyXMDJvldWaYMMUNiCQdQzNEioXTp3sC8Nt8w=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.5.tgz"; + sha512 = "TLgi6Lh71vvMZGEkFuIxzaPsyeYCHQ5jJOOX1f0xXn0uciFuE8cEk0wyBquMcCxBXZ5BJhE2aUB7pnWTD150Tw=="; }; }; "@babel/highlight-7.16.0" = { @@ -274,130 +283,130 @@ let sha512 = "t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g=="; }; }; - "@babel/parser-7.16.4" = { + "@babel/parser-7.16.6" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.16.4"; + version = "7.16.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz"; - sha512 = "6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.6.tgz"; + sha512 = "Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.16.4" = { + "@babel/plugin-proposal-async-generator-functions-7.16.5" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.16.4"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.4.tgz"; - sha512 = "/CUekqaAaZCQHleSK/9HajvcD/zdnJiKRiuUFq8ITE+0HsPzquf53cpFiqAwl/UfmJbR6n5uGPQSPdrmKOvHHg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.5.tgz"; + sha512 = "C/FX+3HNLV6sz7AqbTQqEo1L9/kfrKjxcVtgyBCmvIgOjvuBVUWooDoi7trsLxOzCEo5FccjRvKHkfDsJFZlfA=="; }; }; - "@babel/plugin-proposal-class-properties-7.16.0" = { + "@babel/plugin-proposal-class-properties-7.16.5" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.0.tgz"; - sha512 = "mCF3HcuZSY9Fcx56Lbn+CGdT44ioBMMvjNVldpKtj8tpniETdLjnxdHI1+sDWXIM1nNt+EanJOZ3IG9lzVjs7A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.5.tgz"; + sha512 = "pJD3HjgRv83s5dv1sTnDbZOaTjghKEz8KUn1Kbh2eAIRhGuyQ1XSeI4xVXU3UlIEVA3DAyIdxqT1eRn7Wcn55A=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.16.0" = { + "@babel/plugin-proposal-dynamic-import-7.16.5" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.0.tgz"; - sha512 = "QGSA6ExWk95jFQgwz5GQ2Dr95cf7eI7TKutIXXTb7B1gCLTCz5hTjFTQGfLFBBiC5WSNi7udNwWsqbbMh1c4yQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.5.tgz"; + sha512 = "P05/SJZTTvHz79LNYTF8ff5xXge0kk5sIIWAypcWgX4BTRUgyHc8wRxJ/Hk+mU0KXldgOOslKaeqnhthcDJCJQ=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.16.0" = { + "@babel/plugin-proposal-export-namespace-from-7.16.5" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.0.tgz"; - sha512 = "CjI4nxM/D+5wCnhD11MHB1AwRSAYeDT+h8gCdcVJZ/OK7+wRzFsf7PFPWVpVpNRkHMmMkQWAHpTq+15IXQ1diA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.5.tgz"; + sha512 = "i+sltzEShH1vsVydvNaTRsgvq2vZsfyrd7K7vPLUU/KgS0D5yZMe6uipM0+izminnkKrEfdUnz7CxMRb6oHZWw=="; }; }; - "@babel/plugin-proposal-json-strings-7.16.0" = { + "@babel/plugin-proposal-json-strings-7.16.5" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.0.tgz"; - sha512 = "kouIPuiv8mSi5JkEhzApg5Gn6hFyKPnlkO0a9YSzqRurH8wYzSlf6RJdzluAsbqecdW5pBvDJDfyDIUR/vLxvg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.5.tgz"; + sha512 = "QQJueTFa0y9E4qHANqIvMsuxM/qcLQmKttBACtPCQzGUEizsXDACGonlPiSwynHfOa3vNw0FPMVvQzbuXwh4SQ=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.16.0" = { + "@babel/plugin-proposal-logical-assignment-operators-7.16.5" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.0.tgz"; - sha512 = "pbW0fE30sVTYXXm9lpVQQ/Vc+iTeQKiXlaNRZPPN2A2VdlWyAtsUrsQ3xydSlDW00TFMK7a8m3cDTkBF5WnV3Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.5.tgz"; + sha512 = "xqibl7ISO2vjuQM+MzR3rkd0zfNWltk7n9QhaD8ghMmMceVguYrNDt7MikRyj4J4v3QehpnrU8RYLnC7z/gZLA=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.16.0" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.16.5" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.0.tgz"; - sha512 = "3bnHA8CAFm7cG93v8loghDYyQ8r97Qydf63BeYiGgYbjKKB/XP53W15wfRC7dvKfoiJ34f6Rbyyx2btExc8XsQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.5.tgz"; + sha512 = "YwMsTp/oOviSBhrjwi0vzCUycseCYwoXnLiXIL3YNjHSMBHicGTz7GjVU/IGgz4DtOEXBdCNG72pvCX22ehfqg=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.16.0" = { + "@babel/plugin-proposal-numeric-separator-7.16.5" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.0.tgz"; - sha512 = "FAhE2I6mjispy+vwwd6xWPyEx3NYFS13pikDBWUAFGZvq6POGs5eNchw8+1CYoEgBl9n11I3NkzD7ghn25PQ9Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.5.tgz"; + sha512 = "DvB9l/TcsCRvsIV9v4jxR/jVP45cslTVC0PMVHvaJhhNuhn2Y1SOhCSFlPK777qLB5wb8rVDaNoqMTyOqtY5Iw=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.16.0" = { + "@babel/plugin-proposal-object-rest-spread-7.16.5" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.0.tgz"; - sha512 = "LU/+jp89efe5HuWJLmMmFG0+xbz+I2rSI7iLc1AlaeSMDMOGzWlc5yJrMN1d04osXN4sSfpo4O+azkBNBes0jg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.5.tgz"; + sha512 = "UEd6KpChoyPhCoE840KRHOlGhEZFutdPDMGj+0I56yuTTOaT51GzmnEl/0uT41fB/vD2nT+Pci2KjezyE3HmUw=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.16.0" = { + "@babel/plugin-proposal-optional-catch-binding-7.16.5" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.0.tgz"; - sha512 = "kicDo0A/5J0nrsCPbn89mTG3Bm4XgYi0CZtvex9Oyw7gGZE3HXGD0zpQNH+mo+tEfbo8wbmMvJftOwpmPy7aVw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.5.tgz"; + sha512 = "ihCMxY1Iljmx4bWy/PIMJGXN4NS4oUj1MKynwO07kiKms23pNvIn1DMB92DNB2R0EA882sw0VXIelYGdtF7xEQ=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.16.0" = { + "@babel/plugin-proposal-optional-chaining-7.16.5" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.0.tgz"; - sha512 = "Y4rFpkZODfHrVo70Uaj6cC1JJOt3Pp0MdWSwIKtb8z1/lsjl9AmnB7ErRFV+QNGIfcY1Eruc2UMx5KaRnXjMyg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.5.tgz"; + sha512 = "kzdHgnaXRonttiTfKYnSVafbWngPPr2qKw9BWYBESl91W54e+9R5pP70LtWxV56g0f05f/SQrwHYkfvbwcdQ/A=="; }; }; - "@babel/plugin-proposal-private-methods-7.16.0" = { + "@babel/plugin-proposal-private-methods-7.16.5" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.0.tgz"; - sha512 = "IvHmcTHDFztQGnn6aWq4t12QaBXTKr1whF/dgp9kz84X6GUcwq9utj7z2wFCUfeOup/QKnOlt2k0zxkGFx9ubg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.5.tgz"; + sha512 = "+yFMO4BGT3sgzXo+lrq7orX5mAZt57DwUK6seqII6AcJnJOIhBJ8pzKH47/ql/d426uQ7YhN8DpUFirQzqYSUA=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.16.0" = { + "@babel/plugin-proposal-unicode-property-regex-7.16.5" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.0.tgz"; - sha512 = "ti7IdM54NXv29cA4+bNNKEMS4jLMCbJgl+Drv+FgYy0erJLAxNAIXcNjNjrRZEcWq0xJHsNVwQezskMFpF8N9g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.5.tgz"; + sha512 = "s5sKtlKQyFSatt781HQwv1hoM5BQ9qRH30r+dK56OLDsHmV74mzwJNX7R1yMuE7VZKG5O6q/gmOGSAO6ikTudg=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -508,229 +517,229 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-transform-arrow-functions-7.16.0" = { + "@babel/plugin-transform-arrow-functions-7.16.5" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.0.tgz"; - sha512 = "vIFb5250Rbh7roWARvCLvIJ/PtAU5Lhv7BtZ1u24COwpI9Ypjsh+bZcKk6rlIyalK+r0jOc1XQ8I4ovNxNrWrA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.5.tgz"; + sha512 = "8bTHiiZyMOyfZFULjsCnYOWG059FVMes0iljEHSfARhNgFfpsqE92OrCffv3veSw9rwMkYcFe9bj0ZoXU2IGtQ=="; }; }; - "@babel/plugin-transform-async-to-generator-7.16.0" = { + "@babel/plugin-transform-async-to-generator-7.16.5" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.0.tgz"; - sha512 = "PbIr7G9kR8tdH6g8Wouir5uVjklETk91GMVSUq+VaOgiinbCkBP6Q7NN/suM/QutZkMJMvcyAriogcYAdhg8Gw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.5.tgz"; + sha512 = "TMXgfioJnkXU+XRoj7P2ED7rUm5jbnDWwlCuFVTpQboMfbSya5WrmubNBAMlk7KXvywpo8rd8WuYZkis1o2H8w=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.16.0" = { + "@babel/plugin-transform-block-scoped-functions-7.16.5" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.0.tgz"; - sha512 = "V14As3haUOP4ZWrLJ3VVx5rCnrYhMSHN/jX7z6FAt5hjRkLsb0snPCmJwSOML5oxkKO4FNoNv7V5hw/y2bjuvg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.5.tgz"; + sha512 = "BxmIyKLjUGksJ99+hJyL/HIxLIGnLKtw772zYDER7UuycDZ+Xvzs98ZQw6NGgM2ss4/hlFAaGiZmMNKvValEjw=="; }; }; - "@babel/plugin-transform-block-scoping-7.16.0" = { + "@babel/plugin-transform-block-scoping-7.16.5" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.0.tgz"; - sha512 = "27n3l67/R3UrXfizlvHGuTwsRIFyce3D/6a37GRxn28iyTPvNXaW4XvznexRh1zUNLPjbLL22Id0XQElV94ruw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.5.tgz"; + sha512 = "JxjSPNZSiOtmxjX7PBRBeRJTUKTyJ607YUYeT0QJCNdsedOe+/rXITjP08eG8xUpsLfPirgzdCFN+h0w6RI+pQ=="; }; }; - "@babel/plugin-transform-classes-7.16.0" = { + "@babel/plugin-transform-classes-7.16.5" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.0.tgz"; - sha512 = "HUxMvy6GtAdd+GKBNYDWCIA776byUQH8zjnfjxwT1P1ARv/wFu8eBDpmXQcLS/IwRtrxIReGiplOwMeyO7nsDQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.5.tgz"; + sha512 = "DzJ1vYf/7TaCYy57J3SJ9rV+JEuvmlnvvyvYKFbk5u46oQbBvuB9/0w+YsVsxkOv8zVWKpDmUoj4T5ILHoXevA=="; }; }; - "@babel/plugin-transform-computed-properties-7.16.0" = { + "@babel/plugin-transform-computed-properties-7.16.5" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.0.tgz"; - sha512 = "63l1dRXday6S8V3WFY5mXJwcRAnPYxvFfTlt67bwV1rTyVTM5zrp0DBBb13Kl7+ehkCVwIZPumPpFP/4u70+Tw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.5.tgz"; + sha512 = "n1+O7xtU5lSLraRzX88CNcpl7vtGdPakKzww74bVwpAIRgz9JVLJJpOLb0uYqcOaXVM0TL6X0RVeIJGD2CnCkg=="; }; }; - "@babel/plugin-transform-destructuring-7.16.0" = { + "@babel/plugin-transform-destructuring-7.16.5" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.0.tgz"; - sha512 = "Q7tBUwjxLTsHEoqktemHBMtb3NYwyJPTJdM+wDwb0g8PZ3kQUIzNvwD5lPaqW/p54TXBc/MXZu9Jr7tbUEUM8Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.5.tgz"; + sha512 = "GuRVAsjq+c9YPK6NeTkRLWyQskDC099XkBSVO+6QzbnOnH2d/4mBVXYStaPrZD3dFRfg00I6BFJ9Atsjfs8mlg=="; }; }; - "@babel/plugin-transform-dotall-regex-7.16.0" = { + "@babel/plugin-transform-dotall-regex-7.16.5" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.0.tgz"; - sha512 = "FXlDZfQeLILfJlC6I1qyEwcHK5UpRCFkaoVyA1nk9A1L1Yu583YO4un2KsLBsu3IJb4CUbctZks8tD9xPQubLw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.5.tgz"; + sha512 = "iQiEMt8Q4/5aRGHpGVK2Zc7a6mx7qEAO7qehgSug3SDImnuMzgmm/wtJALXaz25zUj1PmnNHtShjFgk4PDx4nw=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.16.0" = { + "@babel/plugin-transform-duplicate-keys-7.16.5" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.0.tgz"; - sha512 = "LIe2kcHKAZOJDNxujvmp6z3mfN6V9lJxubU4fJIGoQCkKe3Ec2OcbdlYP+vW++4MpxwG0d1wSDOJtQW5kLnkZQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.5.tgz"; + sha512 = "81tijpDg2a6I1Yhj4aWY1l3O1J4Cg/Pd7LfvuaH2VVInAkXtzibz9+zSPdUM1WvuUi128ksstAP0hM5w48vQgg=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.16.0" = { + "@babel/plugin-transform-exponentiation-operator-7.16.5" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.0.tgz"; - sha512 = "OwYEvzFI38hXklsrbNivzpO3fh87skzx8Pnqi4LoSYeav0xHlueSoCJrSgTPfnbyzopo5b3YVAJkFIcUpK2wsw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.5.tgz"; + sha512 = "12rba2HwemQPa7BLIKCzm1pT2/RuQHtSFHdNl41cFiC6oi4tcrp7gjB07pxQvFpcADojQywSjblQth6gJyE6CA=="; }; }; - "@babel/plugin-transform-for-of-7.16.0" = { + "@babel/plugin-transform-for-of-7.16.5" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.0.tgz"; - sha512 = "5QKUw2kO+GVmKr2wMYSATCTTnHyscl6sxFRAY+rvN7h7WB0lcG0o4NoV6ZQU32OZGVsYUsfLGgPQpDFdkfjlJQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.5.tgz"; + sha512 = "+DpCAJFPAvViR17PIMi9x2AE34dll5wNlXO43wagAX2YcRGgEVHCNFC4azG85b4YyyFarvkc/iD5NPrz4Oneqw=="; }; }; - "@babel/plugin-transform-function-name-7.16.0" = { + "@babel/plugin-transform-function-name-7.16.5" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.0.tgz"; - sha512 = "lBzMle9jcOXtSOXUpc7tvvTpENu/NuekNJVova5lCCWCV9/U1ho2HH2y0p6mBg8fPm/syEAbfaaemYGOHCY3mg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.5.tgz"; + sha512 = "Fuec/KPSpVLbGo6z1RPw4EE1X+z9gZk1uQmnYy7v4xr4TO9p41v1AoUuXEtyqAI7H+xNJYSICzRqZBhDEkd3kQ=="; }; }; - "@babel/plugin-transform-literals-7.16.0" = { + "@babel/plugin-transform-literals-7.16.5" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.0.tgz"; - sha512 = "gQDlsSF1iv9RU04clgXqRjrPyyoJMTclFt3K1cjLmTKikc0s/6vE3hlDeEVC71wLTRu72Fq7650kABrdTc2wMQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.5.tgz"; + sha512 = "B1j9C/IfvshnPcklsc93AVLTrNVa69iSqztylZH6qnmiAsDDOmmjEYqOm3Ts2lGSgTSywnBNiqC949VdD0/gfw=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.16.0" = { + "@babel/plugin-transform-member-expression-literals-7.16.5" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.0.tgz"; - sha512 = "WRpw5HL4Jhnxw8QARzRvwojp9MIE7Tdk3ez6vRyUk1MwgjJN0aNpRoXainLR5SgxmoXx/vsXGZ6OthP6t/RbUg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.5.tgz"; + sha512 = "d57i3vPHWgIde/9Y8W/xSFUndhvhZN5Wu2TjRrN1MVz5KzdUihKnfDVlfP1U7mS5DNj/WHHhaE4/tTi4hIyHwQ=="; }; }; - "@babel/plugin-transform-modules-amd-7.16.0" = { + "@babel/plugin-transform-modules-amd-7.16.5" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.0.tgz"; - sha512 = "rWFhWbCJ9Wdmzln1NmSCqn7P0RAD+ogXG/bd9Kg5c7PKWkJtkiXmYsMBeXjDlzHpVTJ4I/hnjs45zX4dEv81xw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.5.tgz"; + sha512 = "oHI15S/hdJuSCfnwIz+4lm6wu/wBn7oJ8+QrkzPPwSFGXk8kgdI/AIKcbR/XnD1nQVMg/i6eNaXpszbGuwYDRQ=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.16.0" = { + "@babel/plugin-transform-modules-commonjs-7.16.5" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.0.tgz"; - sha512 = "Dzi+NWqyEotgzk/sb7kgQPJQf7AJkQBWsVp1N6JWc1lBVo0vkElUnGdr1PzUBmfsCCN5OOFya3RtpeHk15oLKQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.5.tgz"; + sha512 = "ABhUkxvoQyqhCWyb8xXtfwqNMJD7tx+irIRnUh6lmyFud7Jln1WzONXKlax1fg/ey178EXbs4bSGNd6PngO+SQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.16.0" = { + "@babel/plugin-transform-modules-systemjs-7.16.5" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.0.tgz"; - sha512 = "yuGBaHS3lF1m/5R+6fjIke64ii5luRUg97N2wr+z1sF0V+sNSXPxXDdEEL/iYLszsN5VKxVB1IPfEqhzVpiqvg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.5.tgz"; + sha512 = "53gmLdScNN28XpjEVIm7LbWnD/b/TpbwKbLk6KV4KqC9WyU6rq1jnNmVG6UgAdQZVVGZVoik3DqHNxk4/EvrjA=="; }; }; - "@babel/plugin-transform-modules-umd-7.16.0" = { + "@babel/plugin-transform-modules-umd-7.16.5" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.0.tgz"; - sha512 = "nx4f6no57himWiHhxDM5pjwhae5vLpTK2zCnDH8+wNLJy0TVER/LJRHl2bkt6w9Aad2sPD5iNNoUpY3X9sTGDg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.5.tgz"; + sha512 = "qTFnpxHMoenNHkS3VoWRdwrcJ3FhX567GvDA3hRZKF0Dj8Fmg0UzySZp3AP2mShl/bzcywb/UWAMQIjA1bhXvw=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.16.0" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.16.5" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.0.tgz"; - sha512 = "LogN88uO+7EhxWc8WZuQ8vxdSyVGxhkh8WTC3tzlT8LccMuQdA81e9SGV6zY7kY2LjDhhDOFdQVxdGwPyBCnvg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.5.tgz"; + sha512 = "/wqGDgvFUeKELW6ex6QB7dLVRkd5ehjw34tpXu1nhKC0sFfmaLabIswnpf8JgDyV2NeDmZiwoOb0rAmxciNfjA=="; }; }; - "@babel/plugin-transform-new-target-7.16.0" = { + "@babel/plugin-transform-new-target-7.16.5" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.0.tgz"; - sha512 = "fhjrDEYv2DBsGN/P6rlqakwRwIp7rBGLPbrKxwh7oVt5NNkIhZVOY2GRV+ULLsQri1bDqwDWnU3vhlmx5B2aCw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.5.tgz"; + sha512 = "ZaIrnXF08ZC8jnKR4/5g7YakGVL6go6V9ql6Jl3ecO8PQaQqFE74CuM384kezju7Z9nGCCA20BqZaR1tJ/WvHg=="; }; }; - "@babel/plugin-transform-object-super-7.16.0" = { + "@babel/plugin-transform-object-super-7.16.5" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.0.tgz"; - sha512 = "fds+puedQHn4cPLshoHcR1DTMN0q1V9ou0mUjm8whx9pGcNvDrVVrgw+KJzzCaiTdaYhldtrUps8DWVMgrSEyg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.5.tgz"; + sha512 = "tded+yZEXuxt9Jdtkc1RraW1zMF/GalVxaVVxh41IYwirdRgyAxxxCKZ9XB7LxZqmsjfjALxupNE1MIz9KH+Zg=="; }; }; - "@babel/plugin-transform-parameters-7.16.3" = { + "@babel/plugin-transform-parameters-7.16.5" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.16.3"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.3.tgz"; - sha512 = "3MaDpJrOXT1MZ/WCmkOFo7EtmVVC8H4EUZVrHvFOsmwkk4lOjQj8rzv8JKUZV4YoQKeoIgk07GO+acPU9IMu/w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.5.tgz"; + sha512 = "B3O6AL5oPop1jAVg8CV+haeUte9oFuY85zu0jwnRNZZi3tVAbJriu5tag/oaO2kGaQM/7q7aGPBlTI5/sr9enA=="; }; }; - "@babel/plugin-transform-property-literals-7.16.0" = { + "@babel/plugin-transform-property-literals-7.16.5" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.0.tgz"; - sha512 = "XLldD4V8+pOqX2hwfWhgwXzGdnDOThxaNTgqagOcpBgIxbUvpgU2FMvo5E1RyHbk756WYgdbS0T8y0Cj9FKkWQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.5.tgz"; + sha512 = "+IRcVW71VdF9pEH/2R/Apab4a19LVvdVsr/gEeotH00vSDVlKD+XgfSIw+cgGWsjDB/ziqGv/pGoQZBIiQVXHg=="; }; }; - "@babel/plugin-transform-regenerator-7.16.0" = { + "@babel/plugin-transform-regenerator-7.16.5" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.0.tgz"; - sha512 = "JAvGxgKuwS2PihiSFaDrp94XOzzTUeDeOQlcKzVAyaPap7BnZXK/lvMDiubkPTdotPKOIZq9xWXWnggUMYiExg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.5.tgz"; + sha512 = "2z+it2eVWU8TtQQRauvGUqZwLy4+7rTfo6wO4npr+fvvN1SW30ZF3O/ZRCNmTuu4F5MIP8OJhXAhRV5QMJOuYg=="; }; }; - "@babel/plugin-transform-reserved-words-7.16.0" = { + "@babel/plugin-transform-reserved-words-7.16.5" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.0.tgz"; - sha512 = "Dgs8NNCehHSvXdhEhln8u/TtJxfVwGYCgP2OOr5Z3Ar+B+zXicEOKNTyc+eca2cuEOMtjW6m9P9ijOt8QdqWkg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.5.tgz"; + sha512 = "aIB16u8lNcf7drkhXJRoggOxSTUAuihTSTfAcpynowGJOZiGf+Yvi7RuTwFzVYSYPmWyARsPqUGoZWWWxLiknw=="; }; }; "@babel/plugin-transform-runtime-7.12.10" = { @@ -742,67 +751,67 @@ let sha512 = "xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.16.0" = { + "@babel/plugin-transform-shorthand-properties-7.16.5" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.0.tgz"; - sha512 = "iVb1mTcD8fuhSv3k99+5tlXu5N0v8/DPm2mO3WACLG6al1CGZH7v09HJyUb1TtYl/Z+KrM6pHSIJdZxP5A+xow=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.5.tgz"; + sha512 = "ZbuWVcY+MAXJuuW7qDoCwoxDUNClfZxoo7/4swVbOW1s/qYLOMHlm9YRWMsxMFuLs44eXsv4op1vAaBaBaDMVg=="; }; }; - "@babel/plugin-transform-spread-7.16.0" = { + "@babel/plugin-transform-spread-7.16.5" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.0.tgz"; - sha512 = "Ao4MSYRaLAQczZVp9/7E7QHsCuK92yHRrmVNRe/SlEJjhzivq0BSn8mEraimL8wizHZ3fuaHxKH0iwzI13GyGg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.5.tgz"; + sha512 = "5d6l/cnG7Lw4tGHEoga4xSkYp1euP7LAtrah1h1PgJ3JY7yNsjybsxQAnVK4JbtReZ/8z6ASVmd3QhYYKLaKZw=="; }; }; - "@babel/plugin-transform-sticky-regex-7.16.0" = { + "@babel/plugin-transform-sticky-regex-7.16.5" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.0.tgz"; - sha512 = "/ntT2NljR9foobKk4E/YyOSwcGUXtYWv5tinMK/3RkypyNBNdhHUaq6Orw5DWq9ZcNlS03BIlEALFeQgeVAo4Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.5.tgz"; + sha512 = "usYsuO1ID2LXxzuUxifgWtJemP7wL2uZtyrTVM4PKqsmJycdS4U4mGovL5xXkfUheds10Dd2PjoQLXw6zCsCbg=="; }; }; - "@babel/plugin-transform-template-literals-7.16.0" = { + "@babel/plugin-transform-template-literals-7.16.5" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.0.tgz"; - sha512 = "Rd4Ic89hA/f7xUSJQk5PnC+4so50vBoBfxjdQAdvngwidM8jYIBVxBZ/sARxD4e0yMXRbJVDrYf7dyRtIIKT6Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.5.tgz"; + sha512 = "gnyKy9RyFhkovex4BjKWL3BVYzUDG6zC0gba7VMLbQoDuqMfJ1SDXs8k/XK41Mmt1Hyp4qNAvGFb9hKzdCqBRQ=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.16.0" = { + "@babel/plugin-transform-typeof-symbol-7.16.5" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.0.tgz"; - sha512 = "++V2L8Bdf4vcaHi2raILnptTBjGEFxn5315YU+e8+EqXIucA+q349qWngCLpUYqqv233suJ6NOienIVUpS9cqg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.5.tgz"; + sha512 = "ldxCkW180qbrvyCVDzAUZqB0TAeF8W/vGJoRcaf75awm6By+PxfJKvuqVAnq8N9wz5Xa6mSpM19OfVKKVmGHSQ=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.16.0" = { + "@babel/plugin-transform-unicode-escapes-7.16.5" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.0.tgz"; - sha512 = "VFi4dhgJM7Bpk8lRc5CMaRGlKZ29W9C3geZjt9beuzSUrlJxsNwX7ReLwaL6WEvsOf2EQkyIJEPtF8EXjB/g2A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.5.tgz"; + sha512 = "shiCBHTIIChGLdyojsKQjoAyB8MBwat25lKM7MJjbe1hE0bgIppD+LX9afr41lLHOhqceqeWl4FkLp+Bgn9o1Q=="; }; }; - "@babel/plugin-transform-unicode-regex-7.16.0" = { + "@babel/plugin-transform-unicode-regex-7.16.5" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.0.tgz"; - sha512 = "jHLK4LxhHjvCeZDWyA9c+P9XH1sOxRd1RO9xMtDVRAOND/PczPqizEtVdx4TQF/wyPaewqpT+tgQFYMnN/P94A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.5.tgz"; + sha512 = "GTJ4IW012tiPEMMubd7sD07iU9O/LOo8Q/oU4xNhcaq0Xn8+6TcUQaHtC8YxySo1T+ErQ8RaWogIEeFhKGNPzw=="; }; }; "@babel/preset-env-7.12.10" = { @@ -841,13 +850,13 @@ let sha512 = "MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A=="; }; }; - "@babel/traverse-7.16.3" = { + "@babel/traverse-7.16.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.16.3"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.3.tgz"; - sha512 = "eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.5.tgz"; + sha512 = "FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ=="; }; }; "@babel/types-7.16.0" = { @@ -1021,13 +1030,13 @@ let sha512 = "SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="; }; }; - "@types/http-proxy-1.17.7" = { + "@types/http-proxy-1.17.8" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.7"; + version = "1.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.7.tgz"; - sha512 = "9hdj6iXH64tHSLTY+Vt2eYOGzSogC+JQ2H7bdPWkuh7KXP5qLllWx++t+K9Wk556c3dkDdPws/SpMRi0sdCT1w=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.8.tgz"; + sha512 = "5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA=="; }; }; "@types/json-schema-7.0.9" = { @@ -1057,13 +1066,13 @@ let sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; }; }; - "@types/node-16.11.12" = { + "@types/node-17.0.5" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.11.12"; + version = "17.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz"; - sha512 = "+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.5.tgz"; + sha512 = "w3mrvNXLeDYV1GKTZorGJQivK6XLCoGwpnyJFbJVK/aTBQUxOCaa/GlFAAN3OTDFcb7h5tiFG+YXCO2By+riZw=="; }; }; "@types/parse-json-4.0.0" = { @@ -2047,6 +2056,15 @@ let sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; }; + "body-parser-1.19.1" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.1.tgz"; + sha512 = "8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA=="; + }; + }; "bonjour-3.5.0" = { name = "bonjour"; packageName = "bonjour"; @@ -2164,13 +2182,13 @@ let sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q=="; }; }; - "browserslist-4.18.1" = { + "browserslist-4.19.1" = { name = "browserslist"; packageName = "browserslist"; - version = "4.18.1"; + version = "4.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz"; - sha512 = "8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz"; + sha512 = "u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A=="; }; }; "buffer-4.9.2" = { @@ -2254,6 +2272,15 @@ let sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; }; }; + "bytes-3.1.1" = { + name = "bytes"; + packageName = "bytes"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz"; + sha512 = "dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg=="; + }; + }; "cacache-10.0.4" = { name = "cacache"; packageName = "cacache"; @@ -2407,13 +2434,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001286" = { + "caniuse-lite-1.0.30001294" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001286"; + version = "1.0.30001294"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001286.tgz"; - sha512 = "zaEMRH6xg8ESMi2eQ3R4eZ5qw/hJiVsO/HlLwniIwErij0JDr9P+8V4dtx1l+kLq6j3yy8l8W4fst1lBnat5wQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001294.tgz"; + sha512 = "LiMlrs1nSKZ8qkNhpUf5KD0Al1KCBE3zaT7OLOwEkagXMEDij98SiOovn9wxVGQpklk9vVC/pUSqgYmkmKOS8g=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -3001,13 +3028,13 @@ let sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; }; }; - "content-disposition-0.5.3" = { + "content-disposition-0.5.4" = { name = "content-disposition"; packageName = "content-disposition"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"; - sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz"; + sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; }; }; "content-type-1.0.4" = { @@ -3037,13 +3064,13 @@ let sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; }; }; - "cookie-0.4.0" = { + "cookie-0.4.1" = { name = "cookie"; packageName = "cookie"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; - sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz"; + sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; }; }; "cookie-signature-1.0.6" = { @@ -3091,13 +3118,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-compat-3.19.3" = { + "core-js-compat-3.20.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.19.3"; + version = "3.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.3.tgz"; - sha512 = "59tYzuWgEEVU9r+SRgceIGXSSUn47JknoiXW6Oq7RW8QHjXWz3/vp8pa7dbtuVu40sewz3OP3JmQEcDdztrLhA=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.20.1.tgz"; + sha512 = "AVhKZNpqMV3Jz8hU0YEXXE06qoxtQGsAqU0u1neUngz5IusDJRX/ZJ6t3i7mS7QxNyEONbCo14GprkBrxPlTZA=="; }; }; "core-util-is-1.0.2" = { @@ -3271,13 +3298,13 @@ let sha512 = "Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ=="; }; }; - "css-select-4.1.3" = { + "css-select-4.2.1" = { name = "css-select"; packageName = "css-select"; - version = "4.1.3"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz"; - sha512 = "gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA=="; + url = "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz"; + sha512 = "/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ=="; }; }; "css-select-base-adapter-0.1.1" = { @@ -3865,13 +3892,13 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.4.16" = { + "electron-to-chromium-1.4.30" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.16"; + version = "1.4.30"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.16.tgz"; - sha512 = "BQb7FgYwnu6haWLU63/CdVW+9xhmHls3RCQUFiV4lvw3wimEHTVcUk2hkuZo76QhR8nnDdfZE7evJIZqijwPdA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.30.tgz"; + sha512 = "609z9sIMxDHg+TcR/VB3MXwH+uwtrYyeAwWc/orhnr90ixs6WVGSrt85CDLGUdNnLqCA7liv426V20EecjvflQ=="; }; }; "elliptic-6.5.4" = { @@ -4306,13 +4333,13 @@ let sha1 = "6af8a502350db3246ecc4becf6b5a34d22f7ed53"; }; }; - "express-4.17.1" = { + "express-4.17.2" = { name = "express"; packageName = "express"; - version = "4.17.1"; + version = "4.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; - sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; + url = "https://registry.npmjs.org/express/-/express-4.17.2.tgz"; + sha512 = "oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg=="; }; }; "express-ws-2.0.0" = { @@ -5521,6 +5548,15 @@ let sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; }; }; + "http-errors-1.8.1" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz"; + sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; + }; + }; "http-parser-js-0.5.5" = { name = "http-parser-js"; packageName = "http-parser-js"; @@ -5656,13 +5692,13 @@ let sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="; }; }; - "ignore-5.1.9" = { + "ignore-5.2.0" = { name = "ignore"; packageName = "ignore"; - version = "5.1.9"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz"; - sha512 = "2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ=="; + url = "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"; + sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; }; }; "immer-1.7.2" = { @@ -7411,6 +7447,15 @@ let sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; + "ms-2.1.3" = { + name = "ms"; + packageName = "ms"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; + }; + }; "multicast-dns-6.2.3" = { name = "multicast-dns"; packageName = "multicast-dns"; @@ -7762,13 +7807,13 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; - "object-inspect-1.11.1" = { + "object-inspect-1.12.0" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.11.1"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz"; - sha512 = "If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz"; + sha512 = "Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="; }; }; "object-is-1.1.5" = { @@ -8563,13 +8608,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.4" = { + "postcss-8.4.5" = { name = "postcss"; packageName = "postcss"; - version = "8.4.4"; + version = "8.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.4.tgz"; - sha512 = "joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz"; + sha512 = "jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg=="; }; }; "postcss-calc-7.0.5" = { @@ -8869,13 +8914,13 @@ let sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; }; }; - "postcss-selector-parser-6.0.7" = { + "postcss-selector-parser-6.0.8" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; - version = "6.0.7"; + version = "6.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.7.tgz"; - sha512 = "U+b/Deoi4I/UmE6KOVPpnhS7I7AYdKbhGcat+qTQ27gycvaACvNEw11ba6RrkwVmDVRW7sigWgLj4/KbbJjeDA=="; + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz"; + sha512 = "D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ=="; }; }; "postcss-svgo-4.0.3" = { @@ -9157,6 +9202,15 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; + "qs-6.9.6" = { + name = "qs"; + packageName = "qs"; + version = "6.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz"; + sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; + }; + }; "query-string-4.3.4" = { name = "query-string"; packageName = "query-string"; @@ -9247,6 +9301,15 @@ let sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; }; + "raw-body-2.4.2" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz"; + sha512 = "RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ=="; + }; + }; "rc-1.2.8" = { name = "rc"; packageName = "rc"; @@ -10021,6 +10084,15 @@ let sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; + "send-0.17.2" = { + name = "send"; + packageName = "send"; + version = "0.17.2"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.17.2.tgz"; + sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww=="; + }; + }; "serialize-javascript-1.9.1" = { name = "serialize-javascript"; packageName = "serialize-javascript"; @@ -10066,6 +10138,15 @@ let sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; }; }; + "serve-static-1.14.2" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.14.2"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz"; + sha512 = "+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ=="; + }; + }; "set-blocking-2.0.0" = { name = "set-blocking"; packageName = "set-blocking"; @@ -10120,6 +10201,15 @@ let sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; + "setprototypeof-1.2.0" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"; + sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; + }; + }; "sha.js-2.4.11" = { name = "sha.js"; packageName = "sha.js"; @@ -11128,6 +11218,15 @@ let sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; }; }; + "toidentifier-1.0.1" = { + name = "toidentifier"; + packageName = "toidentifier"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"; + sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; + }; + }; "touch-3.1.0" = { name = "touch"; packageName = "touch"; @@ -11524,13 +11623,13 @@ let sha512 = "3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA=="; }; }; - "url-parse-1.5.3" = { + "url-parse-1.5.4" = { name = "url-parse"; packageName = "url-parse"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz"; - sha512 = "IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ=="; + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.4.tgz"; + sha512 = "ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg=="; }; }; "url-parse-lax-3.0.0" = { @@ -11722,13 +11821,13 @@ let sha512 = "k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA=="; }; }; - "vscode-uri-3.0.2" = { + "vscode-uri-3.0.3" = { name = "vscode-uri"; packageName = "vscode-uri"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.2.tgz"; - sha512 = "jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA=="; + url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.3.tgz"; + sha512 = "EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA=="; }; }; "watchpack-1.7.5" = { @@ -12784,10 +12883,10 @@ in sources."balanced-match-1.0.2" sources."batch-0.6.1" sources."binary-extensions-2.2.0" - sources."body-parser-1.19.0" + sources."body-parser-1.19.1" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."bytes-3.1.0" + sources."bytes-3.1.1" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -12801,9 +12900,9 @@ in sources."color-name-1.1.4" sources."commander-5.1.0" sources."concat-map-0.0.1" - sources."content-disposition-0.5.3" + sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."cookie-0.4.0" + sources."cookie-0.4.1" sources."cookie-signature-1.0.6" sources."cross-spawn-7.0.3" sources."debug-2.6.9" @@ -12818,7 +12917,7 @@ in sources."end-of-stream-1.4.4" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."express-4.17.1" + sources."express-4.17.2" (sources."express-ws-4.0.0" // { dependencies = [ sources."ws-5.2.3" @@ -12836,10 +12935,10 @@ in sources."got-9.6.0" sources."has-flag-4.0.0" sources."http-cache-semantics-4.1.0" - sources."http-errors-1.7.2" + sources."http-errors-1.8.1" sources."iconv-lite-0.4.24" sources."inflight-1.0.6" - sources."inherits-2.0.3" + sources."inherits-2.0.4" sources."ini-1.3.8" sources."ipaddr.js-1.9.1" sources."is-binary-path-2.1.0" @@ -12879,31 +12978,32 @@ in sources."prepend-http-2.0.0" sources."proxy-addr-2.0.7" sources."pump-3.0.0" - sources."qs-6.7.0" + sources."qs-6.9.6" sources."range-parser-1.2.1" - sources."raw-body-2.4.0" + sources."raw-body-2.4.2" sources."rc-1.2.8" sources."readdirp-3.6.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."responselike-1.0.2" sources."rimraf-2.7.1" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-6.3.0" - (sources."send-0.17.1" // { + (sources."send-0.17.2" // { dependencies = [ - sources."ms-2.1.1" + sources."ms-2.1.3" ]; }) (sources."serve-index-1.9.1" // { dependencies = [ sources."http-errors-1.6.3" + sources."inherits-2.0.3" sources."setprototypeof-1.1.0" ]; }) - sources."serve-static-1.14.1" - sources."setprototypeof-1.1.1" + sources."serve-static-1.14.2" + sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."statuses-1.5.0" @@ -12912,7 +13012,7 @@ in sources."tmp-0.1.0" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.0" + sources."toidentifier-1.0.1" sources."type-is-1.6.18" sources."unpipe-1.0.0" sources."url-parse-lax-3.0.0" @@ -12962,7 +13062,7 @@ in sources."glob-parent-5.1.2" sources."globby-11.0.4" sources."human-signals-2.1.0" - sources."ignore-5.1.9" + sources."ignore-5.2.0" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" @@ -12999,7 +13099,7 @@ in sources."vscode-languageserver-protocol-3.16.0" sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-languageserver-types-3.16.0" - sources."vscode-uri-3.0.2" + sources."vscode-uri-3.0.3" sources."web-tree-sitter-0.19.4" sources."which-2.0.2" ]; @@ -13209,7 +13309,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-16.11.12" + sources."@types/node-17.0.5" sources."@types/responselike-1.0.0" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.2" @@ -13528,49 +13628,50 @@ in sources."@babel/code-frame-7.16.0" sources."@babel/compat-data-7.16.4" sources."@babel/core-7.12.10" - sources."@babel/generator-7.16.0" + sources."@babel/generator-7.16.5" sources."@babel/helper-annotate-as-pure-7.16.0" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.0" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.5" (sources."@babel/helper-compilation-targets-7.16.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.16.0" + sources."@babel/helper-create-class-features-plugin-7.16.5" sources."@babel/helper-create-regexp-features-plugin-7.16.0" + sources."@babel/helper-environment-visitor-7.16.5" sources."@babel/helper-explode-assignable-expression-7.16.0" sources."@babel/helper-function-name-7.16.0" sources."@babel/helper-get-function-arity-7.16.0" sources."@babel/helper-hoist-variables-7.16.0" - sources."@babel/helper-member-expression-to-functions-7.16.0" + sources."@babel/helper-member-expression-to-functions-7.16.5" sources."@babel/helper-module-imports-7.16.0" - sources."@babel/helper-module-transforms-7.16.0" + sources."@babel/helper-module-transforms-7.16.5" sources."@babel/helper-optimise-call-expression-7.16.0" - sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-remap-async-to-generator-7.16.4" - sources."@babel/helper-replace-supers-7.16.0" + sources."@babel/helper-plugin-utils-7.16.5" + sources."@babel/helper-remap-async-to-generator-7.16.5" + sources."@babel/helper-replace-supers-7.16.5" sources."@babel/helper-simple-access-7.16.0" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" sources."@babel/helper-split-export-declaration-7.16.0" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helper-wrap-function-7.16.0" - sources."@babel/helpers-7.16.3" + sources."@babel/helper-wrap-function-7.16.5" + sources."@babel/helpers-7.16.5" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.4" - sources."@babel/plugin-proposal-async-generator-functions-7.16.4" - sources."@babel/plugin-proposal-class-properties-7.16.0" - sources."@babel/plugin-proposal-dynamic-import-7.16.0" - sources."@babel/plugin-proposal-export-namespace-from-7.16.0" - sources."@babel/plugin-proposal-json-strings-7.16.0" - sources."@babel/plugin-proposal-logical-assignment-operators-7.16.0" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.0" - sources."@babel/plugin-proposal-numeric-separator-7.16.0" - sources."@babel/plugin-proposal-object-rest-spread-7.16.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.16.0" - sources."@babel/plugin-proposal-optional-chaining-7.16.0" - sources."@babel/plugin-proposal-private-methods-7.16.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.16.0" + sources."@babel/parser-7.16.6" + sources."@babel/plugin-proposal-async-generator-functions-7.16.5" + sources."@babel/plugin-proposal-class-properties-7.16.5" + sources."@babel/plugin-proposal-dynamic-import-7.16.5" + sources."@babel/plugin-proposal-export-namespace-from-7.16.5" + sources."@babel/plugin-proposal-json-strings-7.16.5" + sources."@babel/plugin-proposal-logical-assignment-operators-7.16.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.5" + sources."@babel/plugin-proposal-numeric-separator-7.16.5" + sources."@babel/plugin-proposal-object-rest-spread-7.16.5" + sources."@babel/plugin-proposal-optional-catch-binding-7.16.5" + sources."@babel/plugin-proposal-optional-chaining-7.16.5" + sources."@babel/plugin-proposal-private-methods-7.16.5" + sources."@babel/plugin-proposal-unicode-property-regex-7.16.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" @@ -13583,44 +13684,44 @@ in sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.16.0" - sources."@babel/plugin-transform-async-to-generator-7.16.0" - sources."@babel/plugin-transform-block-scoped-functions-7.16.0" - sources."@babel/plugin-transform-block-scoping-7.16.0" - sources."@babel/plugin-transform-classes-7.16.0" - sources."@babel/plugin-transform-computed-properties-7.16.0" - sources."@babel/plugin-transform-destructuring-7.16.0" - sources."@babel/plugin-transform-dotall-regex-7.16.0" - sources."@babel/plugin-transform-duplicate-keys-7.16.0" - sources."@babel/plugin-transform-exponentiation-operator-7.16.0" - sources."@babel/plugin-transform-for-of-7.16.0" - sources."@babel/plugin-transform-function-name-7.16.0" - sources."@babel/plugin-transform-literals-7.16.0" - sources."@babel/plugin-transform-member-expression-literals-7.16.0" - sources."@babel/plugin-transform-modules-amd-7.16.0" - sources."@babel/plugin-transform-modules-commonjs-7.16.0" - sources."@babel/plugin-transform-modules-systemjs-7.16.0" - sources."@babel/plugin-transform-modules-umd-7.16.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.0" - sources."@babel/plugin-transform-new-target-7.16.0" - sources."@babel/plugin-transform-object-super-7.16.0" - sources."@babel/plugin-transform-parameters-7.16.3" - sources."@babel/plugin-transform-property-literals-7.16.0" - sources."@babel/plugin-transform-regenerator-7.16.0" - sources."@babel/plugin-transform-reserved-words-7.16.0" + sources."@babel/plugin-transform-arrow-functions-7.16.5" + sources."@babel/plugin-transform-async-to-generator-7.16.5" + sources."@babel/plugin-transform-block-scoped-functions-7.16.5" + sources."@babel/plugin-transform-block-scoping-7.16.5" + sources."@babel/plugin-transform-classes-7.16.5" + sources."@babel/plugin-transform-computed-properties-7.16.5" + sources."@babel/plugin-transform-destructuring-7.16.5" + sources."@babel/plugin-transform-dotall-regex-7.16.5" + sources."@babel/plugin-transform-duplicate-keys-7.16.5" + sources."@babel/plugin-transform-exponentiation-operator-7.16.5" + sources."@babel/plugin-transform-for-of-7.16.5" + sources."@babel/plugin-transform-function-name-7.16.5" + sources."@babel/plugin-transform-literals-7.16.5" + sources."@babel/plugin-transform-member-expression-literals-7.16.5" + sources."@babel/plugin-transform-modules-amd-7.16.5" + sources."@babel/plugin-transform-modules-commonjs-7.16.5" + sources."@babel/plugin-transform-modules-systemjs-7.16.5" + sources."@babel/plugin-transform-modules-umd-7.16.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.5" + sources."@babel/plugin-transform-new-target-7.16.5" + sources."@babel/plugin-transform-object-super-7.16.5" + sources."@babel/plugin-transform-parameters-7.16.5" + sources."@babel/plugin-transform-property-literals-7.16.5" + sources."@babel/plugin-transform-regenerator-7.16.5" + sources."@babel/plugin-transform-reserved-words-7.16.5" sources."@babel/plugin-transform-runtime-7.12.10" - sources."@babel/plugin-transform-shorthand-properties-7.16.0" - sources."@babel/plugin-transform-spread-7.16.0" - sources."@babel/plugin-transform-sticky-regex-7.16.0" - sources."@babel/plugin-transform-template-literals-7.16.0" - sources."@babel/plugin-transform-typeof-symbol-7.16.0" - sources."@babel/plugin-transform-unicode-escapes-7.16.0" - sources."@babel/plugin-transform-unicode-regex-7.16.0" + sources."@babel/plugin-transform-shorthand-properties-7.16.5" + sources."@babel/plugin-transform-spread-7.16.5" + sources."@babel/plugin-transform-sticky-regex-7.16.5" + sources."@babel/plugin-transform-template-literals-7.16.5" + sources."@babel/plugin-transform-typeof-symbol-7.16.5" + sources."@babel/plugin-transform-unicode-escapes-7.16.5" + sources."@babel/plugin-transform-unicode-regex-7.16.5" sources."@babel/preset-env-7.12.10" sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.12.5" sources."@babel/template-7.16.0" - sources."@babel/traverse-7.16.3" + sources."@babel/traverse-7.16.5" sources."@babel/types-7.16.0" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" @@ -13631,10 +13732,10 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-5.1.2" - sources."@types/http-proxy-1.17.7" + sources."@types/http-proxy-1.17.8" sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" - sources."@types/node-16.11.12" + sources."@types/node-17.0.5" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@types/source-list-map-0.1.2" @@ -13757,12 +13858,12 @@ in sources."bindings-1.5.0" sources."bluebird-3.7.2" sources."bn.js-5.2.0" - (sources."body-parser-1.19.0" // { + (sources."body-parser-1.19.1" // { dependencies = [ - sources."bytes-3.1.0" + sources."bytes-3.1.1" sources."debug-2.6.9" sources."ms-2.0.0" - sources."qs-6.7.0" + sources."qs-6.9.6" ]; }) (sources."bonjour-3.5.0" // { @@ -13785,7 +13886,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.18.1" + sources."browserslist-4.19.1" sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" @@ -13802,7 +13903,7 @@ in sources."camel-case-4.1.2" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001286" + sources."caniuse-lite-1.0.30001294" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" (sources."chalk-2.4.2" // { @@ -13878,10 +13979,14 @@ in sources."connect-history-api-fallback-1.6.0" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."content-disposition-0.5.3" + (sources."content-disposition-0.5.4" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) sources."content-type-1.0.4" sources."convert-source-map-1.8.0" - sources."cookie-0.4.0" + sources."cookie-0.4.1" sources."cookie-signature-1.0.6" sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" @@ -13897,7 +14002,7 @@ in ]; }) sources."core-js-2.6.12" - (sources."core-js-compat-3.19.3" // { + (sources."core-js-compat-3.20.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -13924,7 +14029,7 @@ in sources."yallist-4.0.0" ]; }) - sources."css-select-4.1.3" + sources."css-select-4.2.1" sources."css-select-base-adapter-0.1.1" (sources."css-tree-1.0.0-alpha.37" // { dependencies = [ @@ -13998,7 +14103,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.16" + sources."electron-to-chromium-1.4.30" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -14083,12 +14188,13 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."express-4.17.1" // { + (sources."express-4.17.2" // { dependencies = [ sources."array-flatten-1.1.1" sources."debug-2.6.9" sources."ms-2.0.0" - sources."qs-6.7.0" + sources."qs-6.9.6" + sources."safe-buffer-5.2.1" ]; }) sources."extend-3.0.2" @@ -14249,11 +14355,7 @@ in sources."html-webpack-plugin-4.5.0" sources."htmlparser2-6.1.0" sources."http-deceiver-1.2.7" - (sources."http-errors-1.7.2" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) + sources."http-errors-1.8.1" sources."http-parser-js-0.5.5" sources."http-proxy-1.18.1" sources."http-proxy-middleware-0.21.0" @@ -14476,7 +14578,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.11.1" + sources."object-inspect-1.12.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -14681,10 +14783,10 @@ in }) (sources."postcss-safe-parser-5.0.2" // { dependencies = [ - sources."postcss-8.4.4" + sources."postcss-8.4.5" ]; }) - sources."postcss-selector-parser-6.0.7" + sources."postcss-selector-parser-6.0.8" (sources."postcss-svgo-4.0.3" // { dependencies = [ sources."postcss-value-parser-3.3.1" @@ -14725,9 +14827,9 @@ in sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.1" - (sources."raw-body-2.4.0" // { + (sources."raw-body-2.4.2" // { dependencies = [ - sources."bytes-3.1.0" + sources."bytes-3.1.1" ]; }) (sources."react-dev-utils-6.1.1" // { @@ -14833,14 +14935,14 @@ in sources."select-hose-2.0.0" sources."selfsigned-1.10.11" sources."semver-5.7.1" - (sources."send-0.17.1" // { + (sources."send-0.17.2" // { dependencies = [ (sources."debug-2.6.9" // { dependencies = [ sources."ms-2.0.0" ]; }) - sources."ms-2.1.1" + sources."ms-2.1.3" ]; }) sources."serialize-javascript-4.0.0" @@ -14853,7 +14955,7 @@ in sources."setprototypeof-1.1.0" ]; }) - sources."serve-static-1.14.1" + sources."serve-static-1.14.2" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -14861,7 +14963,7 @@ in ]; }) sources."setimmediate-1.0.5" - sources."setprototypeof-1.1.1" + sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -15050,7 +15152,7 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.0" + sources."toidentifier-1.0.1" sources."tough-cookie-2.5.0" sources."tslib-2.3.1" sources."tty-browserify-0.0.0" @@ -15124,7 +15226,7 @@ in sources."schema-utils-3.1.1" ]; }) - sources."url-parse-1.5.3" + sources."url-parse-1.5.4" sources."use-3.1.1" (sources."util-0.11.1" // { dependencies = [ @@ -15394,7 +15496,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-16.11.12" + sources."@types/node-17.0.5" sources."@types/responselike-1.0.0" (sources."ansi-escapes-4.3.2" // { dependencies = [ diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 97fa1dbe3d6..43bdbda8184 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fstar"; - version = "2021.11.27"; + version = "2021.12.25"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - sha256 = "sha256-OpY7vDb37ym4srsmD+deXiuofUJKRyKXG7g3zsJKvHo="; + sha256 = "RmXKv/admC1w26z/ClNhH11J8n87WTfDr2lYOF6Fx7I="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index f9f0396ef07..e766683f022 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.18.0"; + version = "0.18.2"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-S7PYN0iiSXEApIG0Tyb/PJmKjHzjz3S+ToDy+pwPK18="; + sha256 = "sha256-uakZmaIkBgC/FTQ7us58pJT6IzpcF1cQxBfehlB3bWk="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoSha256 = "sha256-Q5WyKQ4HFOIL1KAQ0QvAbZfy+WRAWf9HxSvSabSz4W4="; + cargoSha256 = "sha256-NogDrd7YWl/CV0aCd1jfYWYB9VZG7u890VLEktI3sOQ="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/pkgs/development/coq-modules/semantics/default.nix b/pkgs/development/coq-modules/semantics/default.nix index 796c9dee0a4..9b8bb10a5f2 100644 --- a/pkgs/development/coq-modules/semantics/default.nix +++ b/pkgs/development/coq-modules/semantics/default.nix @@ -6,6 +6,7 @@ mkCoqDerivation rec { owner = "coq-community"; releaseRev = v: "v${v}"; + release."8.14.0".sha256 = "sha256-TB12C3hX9XucbsXr+UL+8jM19NOFXASW/lcytwy6uVE="; release."8.13.0".sha256 = "sha256-8bDr/Ovl6s8BFaRcHeS5H33/K/pYdeKfSN+krVuKulQ="; release."8.11.1".sha256 = "sha256-jTPgcXSNn1G2mMDC7ocFcmqs8svB7Yo1emXP15iuxiU="; release."8.9.0".sha256 = "sha256-UBsvzlDEZsZsVkbUI0GbFEhpxnnLCiaqlqDyWVC5I6s="; @@ -15,7 +16,7 @@ mkCoqDerivation rec { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.10" "8.13"; out = "8.13.0"; } + { case = range "8.10" "8.14"; out = "8.14.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/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index ffb33713a91..93755e83a3d 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "0.7.0"; + version = "0.7.3"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-zSjiHacetJ68U0GciIbuGET9I/51EM8JnPPUGemDfEI="; + sha256 = "sha256-zbxFMc02hbsU2ERlUzqMBHwHYfORB7TkMINrKC52PPU="; }; executable = "bb"; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 59aaeb6ad92..644975ca66c 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "21.3.3"; + version = "22.0.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "0hvly3fykhy4m7mzaa7xadaz7jz8krnfgj3zgzl2a2rpzja6frdn"; + sha256 = "1s46vwcs26hdlsa8h51gq4fyi9i8k5hrcx5ffbv9g7v3x706nplf"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 689a70a320d..d76a58fc633 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -7,13 +7,14 @@ , libva , libpciaccess , intel-gmmlib +, libdrm , enableX11 ? stdenv.isLinux , libX11 }: stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "21.4.3"; + version = "22.1.0"; outputs = [ "out" "dev" ]; @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "04r03f48j1nly0j6aq8017va9m3yrnscv6lbrvf3a98fpwk9gc1l"; + sha256 = "0giba5274kzpjb5rp3d9bbnvcz7fp8ybi4s3hha2idxk0l5yamf1"; }; patches = [ @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libva libpciaccess intel-gmmlib ] + buildInputs = [ libva libpciaccess intel-gmmlib libdrm ] ++ lib.optional enableX11 libX11; postFixup = lib.optionalString enableX11 '' diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix deleted file mode 100644 index 5abde13a2e6..00000000000 --- a/pkgs/development/libraries/jemalloc/common.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ version, sha256 }: -{ lib, stdenv, fetchurl -, fetchpatch -# By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which -# then stops downstream builds (mariadb in particular) from detecting it. This -# option should remove the prefix and give us a working jemalloc. -# Causes segfaults with some software (ex. rustc), but defaults to true for backward -# compatibility. -, stripPrefix ? stdenv.hostPlatform.isDarwin -, disableInitExecTls ? false -}: - -with lib; - -stdenv.mkDerivation rec { - pname = "jemalloc"; - inherit version; - - src = fetchurl { - url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${pname}-${version}.tar.bz2"; - inherit sha256; - }; - - patches = [ - # workaround https://github.com/jemalloc/jemalloc/issues/2091 - (fetchpatch { - url = "https://github.com/jemalloc/jemalloc/commit/3b4a03b92b2e415415a08f0150fdb9eeb659cd52.diff"; - sha256 = "sha256-6AYtADREhfj93ZLk9xnXtjc6vHDU0EKLLOvLd6YdJeI="; - }) - ]; - - # see the comment on stripPrefix - configureFlags = [] - ++ optional stripPrefix "--with-jemalloc-prefix=" - ++ optional disableInitExecTls "--disable-initial-exec-tls" - # jemalloc is unable to correctly detect transparent hugepage support on - # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default - # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support - ++ optionals (stdenv.isAarch32 && versionOlder version "5") [ - "--disable-thp" - "je_cv_thp=no" - ] - ; - - doCheck = true; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "http://jemalloc.net"; - description = "General purpose malloc(3) implementation"; - longDescription = '' - malloc(3)-compatible memory allocator that emphasizes fragmentation - avoidance and scalable concurrency support. - ''; - license = licenses.bsd2; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 9324279ed10..8ed9219fb7b 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -1,4 +1,58 @@ -import ./common.nix { +{ lib +, stdenv +, fetchurl +, fetchpatch +# By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which +# then stops downstream builds (mariadb in particular) from detecting it. This +# option should remove the prefix and give us a working jemalloc. +# Causes segfaults with some software (ex. rustc), but defaults to true for backward +# compatibility. +, stripPrefix ? stdenv.hostPlatform.isDarwin +, disableInitExecTls ? false +}: + +stdenv.mkDerivation rec { + pname = "jemalloc"; version = "5.2.1"; - sha256 = "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl"; + + src = fetchurl { + url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${pname}-${version}.tar.bz2"; + sha256 = "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl"; + }; + + patches = [ + # workaround https://github.com/jemalloc/jemalloc/issues/2091 + (fetchpatch { + url = "https://github.com/jemalloc/jemalloc/commit/3b4a03b92b2e415415a08f0150fdb9eeb659cd52.diff"; + sha256 = "sha256-6AYtADREhfj93ZLk9xnXtjc6vHDU0EKLLOvLd6YdJeI="; + }) + ]; + + # see the comment on stripPrefix + configureFlags = [] + ++ lib.optional stripPrefix "--with-jemalloc-prefix=" + ++ lib.optional disableInitExecTls "--disable-initial-exec-tls" + # jemalloc is unable to correctly detect transparent hugepage support on + # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default + # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support + ++ lib.optionals (stdenv.isAarch32 && lib.versionOlder version "5") [ + "--disable-thp" + "je_cv_thp=no" + ] + ; + + doCheck = true; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "http://jemalloc.net"; + description = "General purpose malloc(3) implementation"; + longDescription = '' + malloc(3)-compatible memory allocator that emphasizes fragmentation + avoidance and scalable concurrency support. + ''; + license = licenses.bsd2; + platforms = platforms.all; + }; } diff --git a/pkgs/development/libraries/jemalloc/jemalloc450.nix b/pkgs/development/libraries/jemalloc/jemalloc450.nix deleted file mode 100644 index 85b4fb100f7..00000000000 --- a/pkgs/development/libraries/jemalloc/jemalloc450.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common.nix { - version = "4.5.0"; - sha256 = "10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl"; -} diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index 81ba4263a1d..987a36cd79f 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -19,7 +19,11 @@ stdenv.mkDerivation rec { url = "https://github.com/libb64/libb64/commit/4fe47c052e9123da8f751545deb48be08c3411f6.patch"; sha256 = "18b3np3gpyzimqmk6001riqv5n70wfbclky6zzsrvj5zl1dj4ljf"; }) - ]; + ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) (fetchpatch { + name = "0001-example-Do-not-run-the-tests.patch"; + url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch?id=484e0de1e4ee107f21ae2a5c5f976ed987978baf"; + sha256 = "sha256-KTsiIWJe66BKlu/A43FWfW0XAu4E7lWX/RY4NITRrm4="; + }); enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ntirpc/default.nix b/pkgs/development/libraries/ntirpc/default.nix index e98cfac7858..55f1edf490b 100644 --- a/pkgs/development/libraries/ntirpc/default.nix +++ b/pkgs/development/libraries/ntirpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ntirpc"; - version = "3.4"; + version = "4.0"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "ntirpc"; rev = "v${version}"; - sha256 = "1xdwqyc9m4lbsgr7ll1g0f84c2h8jrfkg67cgvsp424i1a7r9mm1"; + sha256 = "0hffma57b4c7g7862yvfr8bvbsbxh5w383mvjkjv3jpzi01l79yv"; }; postPatch = '' diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix index 2be3c950829..ce1f91eee86 100644 --- a/pkgs/development/libraries/unicorn/default.nix +++ b/pkgs/development/libraries/unicorn/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "unicorn"; - version = "2.0.0-rc4"; + version = "2.0.0-rc5"; src = fetchFromGitHub { owner = "unicorn-engine"; repo = pname; rev = version; - sha256 = "sha256-dNBebXp8HVmmY1RVRYuRFoJ3PStCf4taNTeYKi2lhQM="; + sha256 = "1q9k8swnq4qsi54zdfaap69z56w3yj4n4ggm9pscmmmr69nply5f"; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/development/libraries/v8/plv8_6_x.nix b/pkgs/development/libraries/v8/plv8_6_x.nix deleted file mode 100644 index 71e14a82c3e..00000000000 --- a/pkgs/development/libraries/v8/plv8_6_x.nix +++ /dev/null @@ -1,189 +0,0 @@ -# NOTE: this expression is NOT exported from the top-level of all-packages.nix, -# it is exclusively used by the 'plv8' PostgreSQL extension. -# Since plv8 2.3.2, plv8 no longer requires this specific version, but as of -# 2019-08-29, nixpkgs does not have v8 6.x, and v8_5 is bumped to 5.4.232, which -# is a bit outdated. plv8 3.x is planned to support v8 7.x - -{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkg-config -, doCheck ? false -, snapshot ? true -}: - -let - arch = if stdenv.isAarch32 - then if stdenv.is64bit - then"arm64" - else "arm" - else if stdenv.is64bit - then"x64" - else "ia32"; - git_url = "https://chromium.googlesource.com"; - - # This data is from the DEPS file in the root of a V8 checkout - deps = { - "base/trace_event/common" = fetchgit { - url = "${git_url}/chromium/src/base/trace_event/common.git"; - rev = "0e9a47d74970bee1bbfc063c47215406f8918699"; - sha256 = "07rbzrlscp8adh4z86yl5jxdnvgkc3xs950xldpk318wf9i3bh6c"; - }; - build = fetchgit { - url = "${git_url}/chromium/src/build.git"; - rev = "9338ce52d0b9bcef34c38285fbd5023b62739fac"; - sha256 = "1s2sa8dy3waidsirjylc82ggb18l1108bczjc8z0v4ywyj4k0cvh"; - }; - buildtools = fetchgit { - url = "${git_url}/chromium/buildtools.git"; - rev = "505de88083136eefd056e5ee4ca0f01fe9b33de8"; - sha256 = "0vj216nhb803bggsl0hnyagj8njrm96pn8sim6xcnqb7nhz1vabw"; - }; - "test/benchmarks/data" = fetchgit { - url = "${git_url}/v8/deps/third_party/benchmarks.git"; - rev = "05d7188267b4560491ff9155c5ee13e207ecd65f"; - sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl"; - }; - "test/mozilla/data" = fetchgit { - url = "${git_url}/v8/deps/third_party/mozilla-tests.git"; - rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be"; - sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn"; - }; - "test/test262/data" = fetchgit { - url = "${git_url}/external/github.com/tc39/test262.git"; - rev = "5d4c667b271a9b39d0de73aef5ffe6879c6f8811"; - sha256 = "0q9iwb2nkybf9np95wgf5m372aw2lhx9wlsw41a2a80kbkvb2kqg"; - }; - "test/test262/harness" = fetchgit { - url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git"; - rev = "0f2acdd882c84cff43b9d60df7574a1901e2cdcd"; - sha256 = "00brj5avp43yamc92kinba2mg3a2x1rcd7wnm7z093l73idprvkp"; - }; - "test/wasm-js" = fetchgit { - url = "${git_url}/external/github.com/WebAssembly/spec.git"; - rev = "a7e226a92e660a3d5413cfea4269824f513259d2"; - sha256 = "0z3aybj3ykajwh2bv5fwd6pwqjjsq8dnwrqc2wncb6r9xcjwbgxp"; - }; - "testing/gtest" = fetchgit { - url = "${git_url}/external/github.com/google/googletest.git"; - rev = "6f8a66431cb592dad629028a50b3dd418a408c87"; - sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw"; - }; - "third_party/icu" = fetchgit { - url = "${git_url}/chromium/deps/icu.git"; - rev = "741688ebf328da9adc52505248bf4e2ef868722c"; - sha256 = "02ifm18qjlrkn5nm2rxkf9yz9bdlyq7c65jfjndv63vi1drqh1r9"; - }; - "third_party/instrumented_libraries" = fetchgit { - url = "${git_url}/chromium/src/third_party/instrumented_libraries.git"; - rev = "28417458ac4dc79f68915079d0f283f682504cc0"; - sha256 = "1qf5c2946n37p843yriv7xawi6ss6samabghq43s49cgd4wq8dc3"; - }; - "third_party/jinja2" = fetchgit { - url = "${git_url}/chromium/src/third_party/jinja2.git"; - rev = "d34383206fa42d52faa10bb9931d6d538f3a57e0"; - sha256 = "0d9hyw0bvp3p0dbwy833cm9vdqxcam0qbm9jc561ynphddxlkmgd"; - }; - "third_party/markupsafe" = fetchgit { - url = "${git_url}/chromium/src/third_party/markupsafe.git"; - rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783"; - sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz"; - }; - "tools/clang" = fetchgit { - url = "${git_url}/chromium/src/tools/clang.git"; - rev = "8688d267571de76a56746324dcc249bf4232b85a"; - sha256 = "0krq4zz1vnwp064bm517gwr2napy18wyccdh8w5s4qgkjwwxd63s"; - }; - "tools/gyp" = fetchgit { - url = "${git_url}/external/gyp.git"; - rev = "d61a9397e668fa9843c4aa7da9e79460fe590bfb"; - sha256 = "1z081h72mjy285jb1kj5xd0pb4p12n9blvsimsavyn3ldmswv0r0"; - }; - "tools/luci-go" = fetchgit { - url = "${git_url}/chromium/src/tools/luci-go.git"; - rev = "45a8a51fda92e123619a69e7644d9c64a320b0c1"; - sha256 = "0r7736gqk7r0i7ig0b5ib10d9q8a8xzsmc0f0fbkm9k78v847vpj"; - }; - "tools/swarming_client" = fetchgit { - url = "${git_url}/infra/luci/client-py.git"; - rev = "4bd9152f8a975d57c972c071dfb4ddf668e02200"; - sha256 = "03zk91gzvqv01g1vbl8d7h8al7vs4ymrrdc8ipg9wpq52yh65smh"; - }; - }; - -in - -stdenv.mkDerivation rec { - pname = "v8"; - version = "6.4.388.40"; - - inherit doCheck; - - src = fetchFromGitHub { - owner = "v8"; - repo = "v8"; - rev = version; - sha256 = "1lq239cgqyidrynz8g3wbdv70ymzv6s0ppad8s219gb3jnizm16a"; - }; - - postUnpack = '' - ${lib.concatStringsSep "\n" ( - lib.mapAttrsToList (n: v: '' - mkdir -p $sourceRoot/${n} - cp -r ${v}/* $sourceRoot/${n} - '') deps)} - ''; - - prePatch = '' - # use our gn, not the bundled one - sed -i -e 's#gn_path = .*#gn_path = "${gn}/bin/gn"#' tools/mb/mb.py - - # disable tests - if [ "$doCheck" = "" ]; then sed -i -e '/"test:gn_all",/d' BUILD.gn; fi - - # disable sysroot usage - chmod u+w build/config build/config/sysroot.gni - sed -i build/config/sysroot.gni \ - -e '/use_sysroot =/ { s#\(use_sysroot =\).*#\1 false#; :a n; /current_cpu/ { s/^/#/; ba }; }' - - # patch shebangs (/usr/bin/env) - patchShebangs tools/dev/v8gen.py - ''; - - configurePhase = '' - tools/dev/v8gen.py -vv ${arch}.release -- \ - is_component_build=true \ - ${if snapshot then "v8_use_external_startup_data=false" else "v8_use_snapshot=false"} \ - is_clang=false \ - linux_use_bundled_binutils=false \ - treat_warnings_as_errors=false \ - use_custom_libcxx=false \ - use_custom_libcxx_for_host=false - ''; - - nativeBuildInputs = [ gn ninja pkg-config ]; - buildInputs = [ python glib ]; - - buildPhase = '' - ninja -C out.gn/${arch}.release/ - ''; - - enableParallelBuilding = true; - - installPhase = '' - install -vD out.gn/${arch}.release/d8 "$out/bin/d8" - install -vD out.gn/${arch}.release/mksnapshot "$out/bin/mksnapshot" - mkdir -p "$out/lib" - for f in libicui18n.so libicuuc.so libv8_libbase.so libv8_libplatform.so libv8.so; do - install -vD out.gn/${arch}.release/$f "$out/lib/$f" - done - install -vD out.gn/${arch}.release/icudtl.dat "$out/lib/icudtl.dat" - mkdir -p "$out/include" - cp -vr include/*.h "$out/include" - cp -vr include/libplatform "$out/include" - ''; - - meta = with lib; { - description = "Google's open source JavaScript engine"; - maintainers = with maintainers; [ cstrahan proglodyte ]; - platforms = platforms.linux; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix index 4316d06d935..d870ab86505 100644 --- a/pkgs/development/ocaml-modules/awa/default.nix +++ b/pkgs/development/ocaml-modules/awa/default.nix @@ -1,21 +1,21 @@ { lib, buildDunePackage, fetchurl , ppx_sexp_conv, ppx_cstruct , mirage-crypto, mirage-crypto-rng, mirage-crypto-pk -, x509, cstruct, cstruct-unix, cstruct-sexp, sexplib +, x509, cstruct, cstruct-unix, cstruct-sexp, sexplib, eqaf , rresult, mtime, logs, fmt, cmdliner, base64, hacl_x25519 , zarith }: buildDunePackage rec { pname = "awa"; - version = "0.0.4"; + version = "0.0.5"; minimumOCamlVersion = "4.07"; useDune2 = true; src = fetchurl { - url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-v${version}.tbz"; - sha256 = "1l7nsd8jifxjq78xyzcc0z9igc02m2qlvv4cxzsgdim6n1jfzxj2"; + url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-${version}.tbz"; + sha256 = "14hqzmikp3hlynhs0wnwj2491106if183swsl7ldk4215a0b7ms4"; }; nativeBuildInputs = [ ppx_cstruct ]; @@ -24,7 +24,7 @@ buildDunePackage rec { mirage-crypto mirage-crypto-rng mirage-crypto-pk x509 cstruct cstruct-sexp sexplib mtime logs base64 hacl_x25519 zarith - ppx_sexp_conv + ppx_sexp_conv eqaf ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix index 31dea9201bb..2835852d670 100644 --- a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix @@ -1,13 +1,11 @@ { lib , buildDunePackage , fetchurl -, rresult , mirage-crypto , mirage-clock , x509 , logs , fmt -, hex , bos , astring , cmdliner @@ -16,19 +14,18 @@ buildDunePackage rec { pname = "ca-certs-nss"; - version = "3.66"; + version = "3.71.0.1"; minimumOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-v${version}.tbz"; - sha256 = "f0f8035b470f2a48360b92d0e6287f41f98e4ba71576a1cd4c9246c468932f09"; + sha256 = "b83749d983781631745079dccb7345d9ee1b52c1844ce865e97a25349289a124"; }; useDune2 = true; propagatedBuildInputs = [ - rresult mirage-crypto mirage-clock x509 @@ -37,7 +34,6 @@ buildDunePackage rec { buildInputs = [ logs fmt - hex bos astring cmdliner diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index 077180124e4..1dc28b2b5f7 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -5,14 +5,14 @@ buildDunePackage rec { pname = "conduit"; - version = "4.0.1"; + version = "4.0.2"; useDune2 = true; minimumOCamlVersion = "4.03"; src = fetchurl { url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-v${version}.tbz"; - sha256 = "500d95bf2a524f4851e94373e32d26b6e99ee04e5134db69fe6e151c3aad9b1f"; + sha256 = "2a37ffaa352a1e145ef3d80ac28661213c69a741b238623e59f29e3d5a12c537"; }; buildInputs = [ ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix index 3c4b7a37f99..19b2fa8942a 100644 --- a/pkgs/development/ocaml-modules/higlo/default.nix +++ b/pkgs/development/ocaml-modules/higlo/default.nix @@ -1,27 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, ocaml, findlib, xtmpl, ulex }: +{ lib, buildDunePackage, fetchFromGitLab, sedlex_2, xtmpl }: -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "higlo"; - version = "0.6"; - src = fetchFromGitHub { + version = "0.8"; + useDune2 = true; + src = fetchFromGitLab { + domain = "framagit.org"; owner = "zoggy"; repo = "higlo"; - rev = "release-${version}"; - sha256 = "0m0qyk2ydivai54502s45sdw9w4xr0j3jpwyc4vqk62a7iz9ihxh"; + rev = version; + sha256 = "sha256:09hsbwy5asacgh4gdj0vjpy4kzfnq3qji9szbsbyswsf1nbyczir"; }; - buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ xtmpl ulex ]; - - createFindlibDestdir = true; - - patches = ./install.patch; + propagatedBuildInputs = [ sedlex_2 xtmpl ]; meta = with lib; { description = "OCaml library for syntax highlighting"; - homepage = "https://zoggy.github.io/higlo/"; + inherit (src.meta) homepage; license = licenses.lgpl3; - platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ regnat ]; }; } diff --git a/pkgs/development/ocaml-modules/higlo/install.patch b/pkgs/development/ocaml-modules/higlo/install.patch deleted file mode 100644 index bbdaace293b..00000000000 --- a/pkgs/development/ocaml-modules/higlo/install.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Makefile b/Makefile -index b8c2e01..fcd07ed 100644 ---- a/Makefile -+++ b/Makefile -@@ -149,7 +149,8 @@ webdoc: - install: install-lib install-bin - - install-bin: -- $(CP) $(HIGLO) $(HIGLO_BYTE) $(MK_HIGLO) `dirname \`which ocamlfind\``/ -+ mkdir -p $(out)/bin -+ $(CP) $(HIGLO) $(HIGLO_BYTE) $(MK_HIGLO) $(out)/bin - - install-lib: higlo.cmo higlo.cmx higlo.cmxs $(HIGLO) $(HIGLO_BYTE) - ocamlfind install higlo META LICENSE \ diff --git a/pkgs/development/ocaml-modules/iri/default.nix b/pkgs/development/ocaml-modules/iri/default.nix index 0845e4c1841..6a00fb453df 100644 --- a/pkgs/development/ocaml-modules/iri/default.nix +++ b/pkgs/development/ocaml-modules/iri/default.nix @@ -1,34 +1,26 @@ -{ stdenv, lib, fetchFromGitLab, ocaml, findlib -, sedlex, uunf, uutf +{ lib, buildDunePackage, fetchFromGitLab +, sedlex_2, uunf, uutf }: -if !lib.versionAtLeast ocaml.version "4.03" -then throw "iri is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - version = "0.4.0"; - name = "ocaml${ocaml.version}-iri-${version}"; +buildDunePackage rec { + pname = "iri"; + version = "0.6.0"; + useDune2 = true; src = fetchFromGitLab { domain = "framagit.org"; owner = "zoggy"; repo = "ocaml-iri"; rev = version; - sha256 = "0fsmfmzmyggm0h77a7mb0n41vqi6q4ln1xzsv72zbvysa7l8w84q"; + sha256 = "sha256:0zk8nnwcyljkc1a556byncv6cn1vqhk4267z1lm15flh1k7chyax"; }; - buildInputs = [ ocaml findlib ]; - - propagatedBuildInputs = [ sedlex uunf uutf ]; - - createFindlibDestdir = true; + propagatedBuildInputs = [ sedlex_2 uunf uutf ]; meta = { description = "IRI (RFC3987) native OCaml implementation"; license = lib.licenses.lgpl3; maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/letsencrypt/app.nix b/pkgs/development/ocaml-modules/letsencrypt/app.nix index dc9006d6d16..de1dbbb8c84 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/app.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/app.nix @@ -12,6 +12,7 @@ , bos , fpath , randomconv +, cstruct }: buildDunePackage { @@ -37,6 +38,7 @@ buildDunePackage { bos fpath randomconv + cstruct ]; meta = letsencrypt.meta // { diff --git a/pkgs/development/ocaml-modules/letsencrypt/default.nix b/pkgs/development/ocaml-modules/letsencrypt/default.nix index 623fba942f2..a0646517b1b 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -1,15 +1,14 @@ { buildDunePackage , lib , fetchurl -, astring , asn1-combinators , uri -, rresult , base64 , logs , fmt , lwt , mirage-crypto +, mirage-crypto-ec , mirage-crypto-pk , mirage-crypto-rng , x509 @@ -17,15 +16,16 @@ , ounit , ptime , domain-name +, cstruct }: buildDunePackage rec { pname = "letsencrypt"; - version = "0.3.0"; + version = "0.4.1"; src = fetchurl { url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-v${version}.tbz"; - sha256 = "8772b7e6dbda0559a03a7b23b75c1431d42ae09a154eefd64b4c7e23b8d92deb"; + sha256 = "f90875f5c9bdcab4c8be5ec7ebe9ea763030fa708e02857300996bb16e7c2070"; }; minimumOCamlVersion = "4.08"; @@ -43,12 +43,12 @@ buildDunePackage rec { lwt base64 mirage-crypto + mirage-crypto-ec mirage-crypto-pk asn1-combinators x509 uri - rresult - astring + cstruct ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix index ee14a83d57c..30f589e7561 100644 --- a/pkgs/development/ocaml-modules/ocf/default.nix +++ b/pkgs/development/ocaml-modules/ocf/default.nix @@ -1,37 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ppx_tools, yojson }: +{ lib, buildDunePackage, fetchFromGitLab, yojson }: -if lib.versionOlder ocaml.version "4.03" -|| lib.versionAtLeast ocaml.version "4.08" -then throw "ocf not supported for ocaml ${ocaml.version}" -else -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "ocf"; - version = "0.5.0"; - src = fetchFromGitHub { + version = "0.8.0"; + useDune2 = true; + minimalOCamlVersion = "4.03"; + src = fetchFromGitLab { + domain = "framagit.org"; owner = "zoggy"; repo = "ocf"; - rev = "release-${version}"; - sha256 = "1fhq9l2nmr39hxzpavc0jssmba71nnmhsncdn4dsbh2ylv29w56y"; + rev = version; + sha256 = "sha256:00ap3q5yjqmpk87lxqv1j2wkc7583ynhjr1jjrfn9r0j2h9pfd60"; }; - buildInputs = [ ocaml findlib ppx_tools ]; propagatedBuildInputs = [ yojson ]; - createFindlibDestdir = true; - - dontStrip = true; - - patches = [(fetchpatch { - url = "https://github.com/zoggy/ocf/commit/3a231c7a6c5e535a77c25e207af8952793436444.patch"; - sha256 = "0nc8cggc5gxhch9amaz3s71lxs1xbgi7fs9p90cng04dsgr64xk5"; - }) - ]; - meta = with lib; { description = "OCaml library to read and write configuration options in JSON syntax"; - homepage = "https://zoggy.github.io/ocf/"; + homepage = "https://zoggy.frama.io/ocf/"; license = licenses.lgpl3; - platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ regnat ]; }; } diff --git a/pkgs/development/ocaml-modules/ocf/ppx.nix b/pkgs/development/ocaml-modules/ocf/ppx.nix new file mode 100644 index 00000000000..0b1f6998cca --- /dev/null +++ b/pkgs/development/ocaml-modules/ocf/ppx.nix @@ -0,0 +1,14 @@ +{ buildDunePackage, ocf, ppxlib }: + +buildDunePackage { + pname = "ocf_ppx"; + minimalOCamlVersion = "4.11"; + + inherit (ocf) src version useDune2; + + buildInputs = [ ppxlib ocf ]; + + meta = ocf.meta // { + description = "Preprocessor for Ocf library"; + }; +} diff --git a/pkgs/development/ocaml-modules/paf/default.nix b/pkgs/development/ocaml-modules/paf/default.nix index a4f3a99ce48..30277de4e51 100644 --- a/pkgs/development/ocaml-modules/paf/default.nix +++ b/pkgs/development/ocaml-modules/paf/default.nix @@ -7,17 +7,10 @@ , h2 , tls-mirage , mimic -, cohttp-lwt -, letsencrypt -, emile , ke , bigstringaf -, domain-name -, duration , faraday -, ipaddr , tls -, x509 , lwt , logs , fmt @@ -32,11 +25,11 @@ buildDunePackage rec { pname = "paf"; - version = "0.0.5"; + version = "0.0.6"; src = fetchurl { url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz"; - sha256 = "e85a018046eb062d2399fdbe8d9d3400a4d5cd51bb62840446503f557c3eeff1"; + sha256 = "21adbe0f7f9c0242354fa996468d01bf21d5cbcbdd978c911df8e2e299e8f9ae"; }; useDune2 = true; @@ -48,17 +41,10 @@ buildDunePackage rec { h2 tls-mirage mimic - cohttp-lwt - letsencrypt - emile ke bigstringaf - domain-name - ipaddr - duration faraday tls - x509 cstruct ]; diff --git a/pkgs/development/ocaml-modules/paf/le.nix b/pkgs/development/ocaml-modules/paf/le.nix index 9281e48b6c2..06a8d9b51eb 100644 --- a/pkgs/development/ocaml-modules/paf/le.nix +++ b/pkgs/development/ocaml-modules/paf/le.nix @@ -8,6 +8,7 @@ , mirage-stack , mirage-time , tls-mirage +, x509 }: buildDunePackage { @@ -29,6 +30,7 @@ buildDunePackage { mirage-stack mirage-time tls-mirage + x509 ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/tls/async.nix b/pkgs/development/ocaml-modules/tls/async.nix index 0215ac18088..ceac7a7c074 100644 --- a/pkgs/development/ocaml-modules/tls/async.nix +++ b/pkgs/development/ocaml-modules/tls/async.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, tls, async, cstruct-async, core, cstruct, mirage-crypto-rng-async, async_find }: +{ lib, buildDunePackage, tls, async, cstruct-async, core, cstruct, mirage-crypto-rng-async }: buildDunePackage rec { pname = "tls-async"; @@ -12,7 +12,6 @@ buildDunePackage rec { propagatedBuildInputs = [ async - async_find core cstruct cstruct-async diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index e5c9b7b54b1..81f0a176bfc 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -1,15 +1,16 @@ { lib, fetchurl, buildDunePackage -, cstruct, cstruct-sexp, domain-name, fmt, ppx_cstruct, ppx_sexp_conv, logs, hkdf, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, mirage-crypto-rng, ocaml_lwt, ptime, rresult, sexplib, x509 +, cstruct, cstruct-sexp, domain-name, fmt, ppx_cstruct, ppx_sexp_conv, logs, hkdf, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, mirage-crypto-rng, ocaml_lwt, ptime, sexplib, x509 +, ipaddr, ipaddr-sexp , alcotest, cstruct-unix, ounit2, randomconv }: buildDunePackage rec { pname = "tls"; - version = "0.14.1"; + version = "0.15.2"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz"; - sha256 = "58cf2d517d6eac5b1ccc5eeb656da690aef2125a19c1eca3fbececd858046216"; + sha256 = "b76371757249bbeabb12c333de4ea2a09c095767bdbbc83322538c0da1fc1e36"; }; minimumOCamlVersion = "4.08"; @@ -30,9 +31,10 @@ buildDunePackage rec { mirage-crypto-rng ocaml_lwt ptime - rresult sexplib x509 + ipaddr + ipaddr-sexp ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index 8330eb27965..116772e7819 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, buildDunePackage , alcotest, cstruct-unix -, asn1-combinators, domain-name, fmt, gmap, pbkdf, rresult, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk +, asn1-combinators, domain-name, fmt, gmap, pbkdf, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, ipaddr , logs, base64 }: @@ -8,17 +8,17 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; pname = "x509"; - version = "0.14.1"; + version = "0.15.2"; src = fetchurl { url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz"; - sha256 = "d91eb4f2790f9d098713c71cc4b5d12706aedb1795666b5e6d667fe5c262f9c3"; + sha256 = "4034afdd83a0cb8291b1f809403015da9139bd772813d59d6093e42ec31ba643"; }; useDune2 = true; buildInputs = [ alcotest cstruct-unix ]; - propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk mirage-crypto-ec pbkdf rresult logs base64 ]; + propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk mirage-crypto-ec pbkdf logs base64 ipaddr ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix index f1c1f15dc72..7c2f0a01e53 100644 --- a/pkgs/development/ocaml-modules/xtmpl/default.nix +++ b/pkgs/development/ocaml-modules/xtmpl/default.nix @@ -1,39 +1,23 @@ -{ lib, stdenv, fetchFromGitLab, ocaml, findlib, iri, ppx_tools, js_of_ocaml -, js_of_ocaml-ppx, re }: +{ lib, buildDunePackage, fetchFromGitLab, iri, re, sedlex_2, uutf }: -if lib.versionOlder ocaml.version "4.03" -|| lib.versionAtLeast ocaml.version "4.11" -then throw "xtmpl not supported for ocaml ${ocaml.version}" -else -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-xtmpl-${version}"; - version = "0.17.0"; +buildDunePackage rec { + pname = "xtmpl"; + version = "0.19.0"; + useDune2 = true; src = fetchFromGitLab { domain = "framagit.org"; owner = "zoggy"; repo = "xtmpl"; rev = version; - sha256 = "1hq6y4rhz958q40145k4av8hx8jyvspg78xf741samd7vc3jd221"; + sha256 = "sha256:0vwj0aayg60wm98d91fg3hmj90730liljy4cn8771dpxvz8m07bw"; }; - patches = [ ./jsoo.patch ]; - - postPatch = '' - substituteInPlace Makefile --replace js_of_ocaml.ppx js_of_ocaml-ppx - ''; - - buildInputs = [ ocaml findlib ppx_tools js_of_ocaml js_of_ocaml-ppx ]; - propagatedBuildInputs = [ iri re ]; - - createFindlibDestdir = true; - - dontStrip = true; + propagatedBuildInputs = [ iri re sedlex_2 uutf ]; meta = with lib; { description = "XML templating library for OCaml"; homepage = "https://www.good-eris.net/xtmpl/"; license = licenses.lgpl3; - platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ regnat ]; }; } diff --git a/pkgs/development/ocaml-modules/xtmpl/jsoo.patch b/pkgs/development/ocaml-modules/xtmpl/jsoo.patch deleted file mode 100644 index 7546dbca924..00000000000 --- a/pkgs/development/ocaml-modules/xtmpl/jsoo.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/xtmpl_js.ml b/xtmpl_js.ml -index e0d3894..991d1b3 100644 ---- a/xtmpl_js.ml -+++ b/xtmpl_js.ml -@@ -25,6 +25,8 @@ - - (** *) - -+open Js_of_ocaml -+ - let log s = Firebug.console##log (Js.string s);; - - module X = Xtmpl_rewrite -diff --git a/xtmpl_js.mli b/xtmpl_js.mli -index d709896..5ed471c 100644 ---- a/xtmpl_js.mli -+++ b/xtmpl_js.mli -@@ -25,6 +25,8 @@ - - (** Convenient functions to use in JS code *) - -+open Js_of_ocaml -+ - (** Create a new tree of DOM nodes from a given XML tree. - Errors are logged to the firebug console. - @param doc Default is [Dom_html.document]. diff --git a/pkgs/development/ocaml-modules/xtmpl/ppx.nix b/pkgs/development/ocaml-modules/xtmpl/ppx.nix new file mode 100644 index 00000000000..b6f5bd65000 --- /dev/null +++ b/pkgs/development/ocaml-modules/xtmpl/ppx.nix @@ -0,0 +1,14 @@ +{ buildDunePackage, xtmpl, ppxlib }: + +buildDunePackage { + pname = "xtmpl_ppx"; + minimalOCamlVersion = "4.11"; + + inherit (xtmpl) src version useDune2; + + buildInputs = [ ppxlib xtmpl ]; + + meta = xtmpl.meta // { + description = "Xml templating library, ppx extension"; + }; +} diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index 364e50c1024..faa17a83839 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -41,12 +41,12 @@ buildPythonPackage rec { pname = "Nikola"; - version = "8.1.3"; + version = "8.2.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "05eac356bb4273cdd05d2dd6ad676226133496c457af91987c3f0d40e2fe57ef"; + sha256 = "9998fedfcb932e19e3b54faeb497a49cde8b15163af764c5afe5847fef5ec1ff"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index c1ab1843eb3..dd0a1c20cc7 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "actdiag"; - version = "2.0.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "blockdiag"; repo = pname; rev = version; - sha256 = "sha256-pTWunoc6T1m+4SOe0ob0ac4ZwwXsYNZwkdwVtlMZrIo="; + sha256 = "sha256-WmprkHOgvlsOIg8H77P7fzEqxGnj6xaL7Df7urRkg3o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix index 4e75f56a8da..e782eed49b7 100644 --- a/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -2,18 +2,19 @@ buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.6.0"; + version = "0.7.1"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - sha256 = "04w010bvi719ifpc3sshav95k10hf9nq8czn9yglkj206yxcypdr"; + sha256 = "sha256-IhXKxIke8/oUt9YA7TQ+0PCmcMI7EOQUKqhis9sgNBo="; }; propagatedBuildInputs = [ aiohttp attrs python-socks ]; # Checks needs internet access doCheck = false; + pythonImportsCheck = [ "aiohttp_socks" ]; disabled = pythonOlder "3.5.3"; diff --git a/pkgs/development/python-modules/aiomusiccast/default.nix b/pkgs/development/python-modules/aiomusiccast/default.nix index 704315b225e..6d1116bfefa 100644 --- a/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/pkgs/development/python-modules/aiomusiccast/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiomusiccast"; - version = "0.14.2"; + version = "0.14.3"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vigonotion"; repo = "aiomusiccast"; rev = version; - sha256 = "sha256-5xIz36FgNwcaesmkYp3EWTxCe/8RaUJOJW9dqK+eang="; + hash = "sha256-ELdNxeU9dajWr4VeOyuvNrSi7B+ImVJM/BlZsw3tcKE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index d6fb43d0705..4468dfabecd 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , ailment , archinfo , buildPythonPackage @@ -54,6 +55,8 @@ buildPythonPackage rec { sha256 = "sha256-AZlqSalTOQh3QR959ZuanFuTZVKi9valKJ3snsquC/A="; }; + setupPyBuildFlags = lib.optionals stdenv.isLinux [ "--plat-name" "linux" ]; + propagatedBuildInputs = [ ailment archinfo diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index bf21025e862..c79dc8b3fcb 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "av"; - version = "8.0.3"; + version = "8.1.0"; disabled = isPy27; # setup.py no longer compatible src = fetchPypi { inherit pname version; - sha256 = "521814309c91d526b6b5c9517018aef2dd12bc3d86351037db69aa67730692b8"; + sha256 = "0402169bc27e38e0f44e0e0e1854cf488337e86206b6d25d6dae2bfd7a1a0230"; }; checkInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index c427886a032..572dbad932b 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "blinkpy"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "fronzbot"; repo = "blinkpy"; rev = "v${version}"; - sha256 = "11h4r2vkrlxwjig1lay1n5wpny5isfgz85f7lsn8ndnqa2wpsymp"; + hash = "sha256-96HoGXVQE5PbUbu0oDOC0es0HXYig4ScTeexiUhGse4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/brother-ql/default.nix b/pkgs/development/python-modules/brother-ql/default.nix new file mode 100644 index 00000000000..891791dfecb --- /dev/null +++ b/pkgs/development/python-modules/brother-ql/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, future +, packbits +, pillow +, pyusb +, pytest +, mock +, click +, attrs +, lib +}: + +buildPythonPackage rec { + pname = "brother-ql"; + version = "0.9.4"; + + src = fetchPypi { + pname = "brother_ql"; + inherit version; + sha256 = "sha256-H1xXoDnwEsnCBDl/RwAB9267dINCHr3phdDLPGFOhmA="; + }; + + propagatedBuildInputs = [ future packbits pillow pyusb click attrs ]; + + meta = with lib; { + description = "Python package for the raster language protocol of the Brother QL series label printers"; + longDescription = '' + Python package for the raster language protocol of the Brother QL series label printers + (QL-500, QL-550, QL-570, QL-700, QL-710W, QL-720NW, QL-800, QL-820NWB, QL-1050 and more) + ''; + homepage = "https://github.com/pklaus/brother_ql"; + license = licenses.gpl3; + maintainers = with maintainers; [ grahamc ]; + }; +} diff --git a/pkgs/development/python-modules/django-statici18n/default.nix b/pkgs/development/python-modules/django-statici18n/default.nix index 7282cf3b987..78c807903c4 100644 --- a/pkgs/development/python-modules/django-statici18n/default.nix +++ b/pkgs/development/python-modules/django-statici18n/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "django-statici18n"; - version = "2.1.1"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "5c85192fa95e3ef3727517ac104add8959fc0a54be3d13440a8a3319fddbc778"; + sha256 = "dbcdac190d93e0b4eabcab8875c8eb68795eceb442f926843ec5cbe1432fe628"; }; propagatedBuildInputs = [ django django_appconf ]; diff --git a/pkgs/development/python-modules/emv/default.nix b/pkgs/development/python-modules/emv/default.nix index a962151aeaf..d688e1e22e6 100644 --- a/pkgs/development/python-modules/emv/default.nix +++ b/pkgs/development/python-modules/emv/default.nix @@ -1,31 +1,29 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, click, enum-compat, pyscard, pycountry, terminaltables -, pytestCheckHook, pythonOlder +{ lib +, buildPythonPackage +, fetchFromGitHub +, click +, pyscard +, pycountry +, terminaltables +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "emv"; - version = "1.0.13"; + version = "1.0.14"; + format = "setuptools"; + disabled = pythonOlder "3.4"; src = fetchFromGitHub { owner = "russss"; repo = "python-emv"; rev = "v${version}"; - hash = "sha256-Jobw8OyKMaLfVsvMadrUrg5BijFo9G6kjgjhGIV8H1M="; + hash = "sha256-MnaeQZ0rA3i0CoUA6HgJQpwk5yo4rm9e+pc5XzRd1eg="; }; - postPatch = '' - # argparse is part of the standard libary since python 2.7/3.2 - sed -i '/argparse==1.4.0/d' setup.py - - substituteInPlace setup.py \ - --replace "click==7.1.2" "click" \ - --replace "pyscard==2.0.0" "pyscard" - ''; - propagatedBuildInputs = [ - enum-compat click pyscard pycountry @@ -36,9 +34,21 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.py \ + --replace '"enum-compat==0.0.3",' "" \ + --replace '"argparse==1.4.0",' "" \ + --replace "click==7.1.2" "click" \ + --replace "pyscard==2.0.0" "pyscard" + ''; + + pythonImportsCheck = [ + "emv" + ]; + meta = with lib; { - homepage = "https://github.com/russss/python-emv"; description = "Implementation of the EMV chip-and-pin smartcard protocol"; + homepage = "https://github.com/russss/python-emv"; license = licenses.mit; maintainers = with maintainers; [ lukegb ]; }; diff --git a/pkgs/development/python-modules/filebrowser_safe/default.nix b/pkgs/development/python-modules/filebrowser_safe/default.nix index 0ffc8a06b52..d571f76f922 100644 --- a/pkgs/development/python-modules/filebrowser_safe/default.nix +++ b/pkgs/development/python-modules/filebrowser_safe/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "1.1.0"; pname = "filebrowser_safe"; src = fetchPypi { inherit pname version; - sha256 = "1209a26abd5a085a6453e020513fd94e920bde3908a2bcf3fe0ad5e4292b943b"; + sha256 = "14b6e0af9697f1d0f08508cc88bc8459273cd6453636cebe8504dccc80e926e4"; }; buildInputs = [ django ]; diff --git a/pkgs/development/python-modules/formbox/default.nix b/pkgs/development/python-modules/formbox/default.nix new file mode 100644 index 00000000000..d099b745454 --- /dev/null +++ b/pkgs/development/python-modules/formbox/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, pythonOlder, fetchFromSourcehut, bleach, markdown }: + +buildPythonPackage rec { + pname = "formbox"; + version = "0.1.0"; + format = "flit"; + disabled = pythonOlder "3.7"; + + src = fetchFromSourcehut { + owner = "~cnx"; + repo = pname; + rev = version; + sha256 = "sha256-6OzmYqUC3mmrAMeMExI4rdVGUoWrxRuBfjKFYbHUlgE="; + }; + + propagatedBuildInputs = [ bleach markdown ]; + doCheck = false; # there's no test + pythonImportsCheck = [ "formbox" ]; + + meta = with lib; { + description = "A script to format mbox as HTML/XML"; + homepage = "https://sr.ht/~cnx/formbox"; + license = licenses.agpl3Plus; + maintainers = [ maintainers.McSinyx ]; + }; +} diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index 855c7f3f81d..567ffef56e6 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.8"; + version = "0.2.9"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "v${version}"; - sha256 = "0ij87hyfv4c93nb4irpxax8p1i6swnm8b6ncs70s6z5sk7ipp663"; + sha256 = "0l895nyq2g7isvim2fx4ivdh3xzhyc10yzqvqnlg3fr56l5srfch"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index 11590048851..881dec6b932 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -8,13 +8,14 @@ , makeFontsConf , freefont_ttf , mock -, pytestCheckHook +, pytest , pytest-mock +, python }: buildPythonPackage rec { pname = "graphviz"; - version = "0.18.1"; + version = "0.19.1"; disabled = pythonOlder "3.6"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "xflr6"; repo = "graphviz"; rev = version; - sha256 = "sha256-Y3w9btjYvKfcEQGuAzV+o6edJ9VmVcWhc+ICOqy87uM="; + sha256 = "sha256-pE1lsx/r/BjvW5W2niDx/UeRXxx4kvCyHzAUAG3bdGc="; }; patches = [ @@ -43,10 +44,18 @@ buildPythonPackage rec { fontDirectories = [ freefont_ttf ]; }; - checkInputs = [ mock pytestCheckHook pytest-mock ]; + checkInputs = [ + mock + pytest + pytest-mock + ]; + + checkPhase = '' + runHook preCheck + + HOME=$TMPDIR ${python.interpreter} run-tests.py - preCheck = '' - export HOME=$TMPDIR + runHook postCheck ''; meta = with lib; { diff --git a/pkgs/development/python-modules/graphviz/paths.patch b/pkgs/development/python-modules/graphviz/paths.patch index 337435c6bba..f53852544a2 100644 --- a/pkgs/development/python-modules/graphviz/paths.patch +++ b/pkgs/development/python-modules/graphviz/paths.patch @@ -1,36 +1,36 @@ diff --git a/graphviz/backend/dot_command.py b/graphviz/backend/dot_command.py -index 1e123d1..41e19c2 100644 +index 60654bd..2c62b47 100644 --- a/graphviz/backend/dot_command.py +++ b/graphviz/backend/dot_command.py -@@ -11,7 +11,7 @@ from . import _common - __all__ = ['command'] +@@ -9,7 +9,7 @@ from .. import parameters + + __all__ = ['DOT_BINARY', 'command'] - #: :class:`pathlib.Path` of layout command (``Path('dot')``). -DOT_BINARY = pathlib.Path('dot') +DOT_BINARY = pathlib.Path('@graphviz@/bin/dot') def command(engine: str, format_: str, *, diff --git a/graphviz/backend/unflattening.py b/graphviz/backend/unflattening.py -index 5ed25d6..8d2faf8 100644 +index a386b8c..883cdc6 100644 --- a/graphviz/backend/unflattening.py +++ b/graphviz/backend/unflattening.py @@ -11,7 +11,7 @@ from . import execute - __all__ = ['unflatten'] - #: :class:`pathlib.Path` of unflatten command (``Path('unflatten')``). + __all__ = ['UNFLATTEN_BINARY', 'unflatten'] + -UNFLATTEN_BINARY = pathlib.Path('unflatten') +UNFLATTEN_BINARY = pathlib.Path('@graphviz@/bin/unflatten') - def unflatten(source: str, + @_tools.deprecate_positional_args(supported_number=1) diff --git a/graphviz/backend/viewing.py b/graphviz/backend/viewing.py -index 6d4a4d1..2cc6cd8 100644 +index fde74a6..6f29b68 100644 --- a/graphviz/backend/viewing.py +++ b/graphviz/backend/viewing.py -@@ -54,7 +54,7 @@ def view_darwin(filepath, *, quiet: bool) -> None: - @tools.attach(view, 'freebsd') - def view_unixoid(filepath, *, quiet: bool) -> None: +@@ -55,7 +55,7 @@ def view_darwin(filepath: typing.Union[os.PathLike, str], *, + def view_unixoid(filepath: typing.Union[os.PathLike, str], *, + quiet: bool) -> None: """Open filepath in the user's preferred application (linux, freebsd).""" - cmd = ['xdg-open', filepath] + cmd = ['@xdgutils@/bin/xdg-open', filepath] diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index 3beb08f1bd0..5f72411e9e8 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "1.0.0"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cmroche"; repo = "greeclimate"; - rev = version; - sha256 = "sha256-zaa3Z6w1BdmOV1otoewc1Zpvltnn5QDJHkAVldZCQlY="; + rev = "v${version}"; + hash = "sha256-O9SaEveZntb7VWL5k1WjTDK9fXhTWFIsVh5v7NKASnQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index b786c1efab6..777f82a3e5a 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.13.3"; + version = "1.13.5"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "mwouts"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HzWAEy7z3qi+lSD3yVBGYclfvKTkG1fTsG29NlKPgQw="; + sha256 = "0rapp2baqml1z3n8k7ijf5461b3p8wgr45y3njz54q75v0jk7v45"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/keystone-engine/default.nix b/pkgs/development/python-modules/keystone-engine/default.nix index ed9f3a6bb70..7c3cf2e70d8 100644 --- a/pkgs/development/python-modules/keystone-engine/default.nix +++ b/pkgs/development/python-modules/keystone-engine/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, keystone }: +{ lib, stdenv, buildPythonPackage, fetchPypi, keystone }: buildPythonPackage rec { pname = "keystone-engine"; @@ -9,6 +9,8 @@ buildPythonPackage rec { sha256 = "1xahdr6bh3dw5swrc2r8kqa8ljhqlb7k2kxv5mrw5rhcmcnzcyig"; }; + setupPyBuildFlags = lib.optionals stdenv.isLinux [ "--plat-name" "linux" ]; + preConfigure = '' substituteInPlace setup.py --replace \ "libkeystone" "${keystone}/lib/libkeystone" diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 96f333fcf8a..69721aeb828 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -41,12 +41,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace 'aiofiles = "^0.6.0"' 'aiofiles = "*"' + # Remove after https://github.com/poljar/matrix-nio/pull/288 + substituteInPlace pyproject.toml \ + --replace 'aiohttp-socks = "^0.6.0"' 'aiohttp-socks = "^0.7.0"' ''; nativeBuildInputs = [ git poetry-core - pytestCheckHook ]; propagatedBuildInputs = [ @@ -73,8 +75,11 @@ buildPythonPackage rec { hypothesis pytest-aiohttp pytest-benchmark + pytestCheckHook ]; + pytestFlagsArray = [ "--benchmark-disable" ]; + disabledTests = [ # touches network "test_connect_wrapper" diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 72e8a711bb8..359bed40b1e 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.46"; + version = "1.2.48"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-XNoAt0R3Jt8i0erovwHBIJ3l9bY5po2UjRl/uzGBs9k="; + sha256 = "sha256-hf+9WmYLRN53cSipNRA+mRYzSLu6NAO6HSQ3NOeCPM8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 7225e695c87..9d6c64da215 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.10.1"; + version = "3.10.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "c77e75432c21108e5a28a529793eb2b82753b6f7050ac9f59fc5d7a72fa74c0f"; + sha256 = "sha256-bb/Uf9xWKRNr27SHzTzI14a0At9Ua5xxBr7XN2d6qfQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix index 637708e2c15..4579be5c3c1 100644 --- a/pkgs/development/python-modules/nwdiag/default.nix +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nwdiag"; - version = "2.0.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "blockdiag"; repo = pname; rev = version; - sha256 = "sha256-PWLFJhXQeuUQQpGkXN2pEJs/1WECpJpUqWbGH3150TI="; + sha256 = "sha256-uKrdkXpL5YBr953sRsHknYg+2/WwrZmyDf8BMA2+0tU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/packbits/default.nix b/pkgs/development/python-modules/packbits/default.nix new file mode 100644 index 00000000000..561903e8f5f --- /dev/null +++ b/pkgs/development/python-modules/packbits/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pyparsing +, six +, pytest +, pretend +, lib +}: + +buildPythonPackage rec { + pname = "packbits"; + version = "0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "bc6b370bb34e04ac8cfa835e06c0484380affc6d593adb8009dd6c0f7bfff034"; + }; + + meta = with lib; { + description = "PackBits encoder/decoder for Python"; + homepage = "https://github.com/psd-tools/packbits"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ grahamc ]; + }; +} diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index c3b34b1fc19..673b3c8ffe8 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pglast"; - version = "3.7"; + version = "3.8"; src = fetchPypi { inherit pname version; - sha256 = "3f0f36cebdb68d5b3aaacb11cbf09db44250194845fbf3b49b0aef93c30991bf"; + sha256 = "31ad29b6a27048b1a26c072992fc5213d2eaf366854679e6c97111e300e0ef01"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix index aa247c8e426..d47805bb643 100644 --- a/pkgs/development/python-modules/plyvel/default.nix +++ b/pkgs/development/python-modules/plyvel/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "plyvel"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "a7a09033a0fd33ca47094e8bbe01714abfcf644f4b7a337d3970e91a2599e2c4"; + sha256 = "4ea98bea04ebf0f44747bacdfafefc8827787106fbb787f0aedc46482b2dfd53"; }; buildInputs = [ pkgs.leveldb ] ++ lib.optional isPy3k pytest; diff --git a/pkgs/development/python-modules/pykeyatome/default.nix b/pkgs/development/python-modules/pykeyatome/default.nix index b1890388faf..b27ee6b2ece 100644 --- a/pkgs/development/python-modules/pykeyatome/default.nix +++ b/pkgs/development/python-modules/pykeyatome/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pykeyatome"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jugla"; repo = "pyKeyAtome"; rev = "V${version}"; - sha256 = "173bf4nrj4jqp2119gfmbra7rhbr30bkjkd44rw9450nmpfmh7pk"; + sha256 = "1brcfgqj0bana6yii4083kppz822fgk9xf4mg141b0zfvx2gyjw9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix index 49068fec5d5..3afa8fcf865 100644 --- a/pkgs/development/python-modules/pynetdicom/default.nix +++ b/pkgs/development/python-modules/pynetdicom/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pynetdicom"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pydicom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kfcfk76au2ymbX+nl0PhuuCd+t6dYRbTurGlW6msv3Y="; + sha256 = "sha256-28SoOdS6sAj3KrfJT8PR2k8XLEY2zh0k9w1eq1y7V8M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysimplegui/default.nix b/pkgs/development/python-modules/pysimplegui/default.nix new file mode 100644 index 00000000000..9542ffe1b3b --- /dev/null +++ b/pkgs/development/python-modules/pysimplegui/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, tkinter +}: +buildPythonPackage rec { + pname = "PySimpleGUI"; + version = "4.55.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-nUDAoMK0w9Luk1hU5I1yT1CK5oEj9LrIByYS3Z5wfew="; + }; + + pythonImportsCheck = [ "PySimpleGUI" ]; + + propagatedBuildInputs = [ + tkinter + ]; + + meta = with lib; { + description = "Python GUIs for Humans."; + homepage = "https://github.com/PySimpleGUI/PySimpleGUI"; + license = licenses.gpl3; + maintainers = with maintainers; [ lucasew ]; + }; +} diff --git a/pkgs/development/python-modules/python-lzo/default.nix b/pkgs/development/python-modules/python-lzo/default.nix index 5025b86361a..dcf55e8e32b 100644 --- a/pkgs/development/python-modules/python-lzo/default.nix +++ b/pkgs/development/python-modules/python-lzo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-lzo"; - version = "1.12"; + version = "1.14"; src = fetchPypi { inherit pname version; - sha256 = "0iakqgd51n1cd7r3lpdylm2rgbmd16y74cra9kcapwg84mlf9a4p"; + sha256 = "83cbd8ecaae284735250e31d6c0ecc18ac08763fab2a8c910dc5a6910db6250c"; }; buildInputs = [ lzo ]; diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix index 98bf1b1da4e..3e50debd835 100644 --- a/pkgs/development/python-modules/pytradfri/default.nix +++ b/pkgs/development/python-modules/pytradfri/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pytradfri"; - version = "7.2.1"; + version = "8.0.0"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "pytradfri"; rev = version; - sha256 = "sha256-4+QdMuwDMLhIIzffHXG+LehuwR9QMcI/CeL5g8wOQfU="; + hash = "sha256-YnQUZcqSldtRqzMac5sPoSNDT+ifs3Jqek2CoDeobe8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyweatherflowrest/default.nix b/pkgs/development/python-modules/pyweatherflowrest/default.nix index 070cbe6acd4..d2ecce51970 100644 --- a/pkgs/development/python-modules/pyweatherflowrest/default.nix +++ b/pkgs/development/python-modules/pyweatherflowrest/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyweatherflowrest"; - version = "1.0.0"; + version = "1.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LS7vwQQBCVwi098aJd8ZSkEEwZKL1bikvAvjH+XHaok="; + sha256 = "0zvmvhl47wlqgjsznbqb7rqgsnxlyiiv7v3kxbxiz6b0hq4mq146"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix index dc722e947d0..3505537f47c 100644 --- a/pkgs/development/python-modules/supervisor/default.nix +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "supervisor"; - version = "4.2.2"; + version = "4.2.3"; src = fetchPypi { inherit pname version; - sha256 = "5b2b8882ec8a3c3733cce6965cc098b6d80b417f21229ab90b18fe551d619f90"; + sha256 = "6472da45fd552184c64713b4b9c0bcc586beec21d22af271e1bf8efe60b08836"; }; # wants to write to /tmp/foo which is likely already owned by another diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index 8545db539fb..382bd311174 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -1,15 +1,29 @@ -{ buildPythonPackage, fetchPypi, lib, types-futures }: +{ lib +, buildPythonPackage +, fetchPypi +, types-futures +}: buildPythonPackage rec { pname = "types-protobuf"; - version = "3.18.1"; + version = "3.18.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "6696bf3cabc51dcc076e8de025c405dbdea7488c5268c2febd14527dac82c233"; + sha256 = "sha256-yiHe3+d1msvrDNj1xyp0/zxAmuDAe8HZTv9RI6wPojw="; }; - propagatedBuildInputs = [ types-futures ]; + propagatedBuildInputs = [ + types-futures + ]; + + # Module doesn't have tests + doCheck = false; + + pythonImportsCheck = [ + "google-stubs" + ]; meta = with lib; { description = "Typing stubs for protobuf"; diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index c8ac731ce9d..b88dc5b0260 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,18 +5,20 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "57.4.4"; + version = "57.4.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-o8vL8/AhQrtdO1xfWRj0U7h1I2K5bViroqXPpDum0gk="; + sha256 = "sha256-pGAO/cpoozIErZwIP9mWbWOu5hp9AH6RK2r8b/V9bgI="; }; # Module doesn't have tests doCheck = false; - pythonImportsCheck = [ "setuptools-stubs" ]; + pythonImportsCheck = [ + "setuptools-stubs" + ]; meta = with lib; { description = "Typing stubs for setuptools"; diff --git a/pkgs/development/tools/analysis/tartan/default.nix b/pkgs/development/tools/analysis/tartan/default.nix new file mode 100644 index 00000000000..0ac4bf32528 --- /dev/null +++ b/pkgs/development/tools/analysis/tartan/default.nix @@ -0,0 +1,52 @@ +{ stdenv +, lib +, fetchFromGitLab +, meson +, ninja +, pkg-config +, llvmPackages +, gobject-introspection +, glib +, unstableGitUpdater +}: + +stdenv.mkDerivation rec { + pname = "tartan"; + version = "unstable-2021-12-23"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "tartan"; + repo = "tartan"; + rev = "bd4ea95d8b3ce1258491e9fac7fcc37d2b241a16"; + sha256 = "l3duPt8Kh/JljzOV+Dm26XbS7gZ+mmFfYUYofWSJRyo="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + gobject-introspection + glib + llvmPackages.libclang + llvmPackages.libllvm + ]; + + passthru = { + updateScript = unstableGitUpdater { + # The updater tries src.url by default, which does not exist for fetchFromGitLab (fetchurl). + url = "https://gitlab.freedesktop.org/tartan/tartan.git"; + }; + }; + + meta = with lib; { + description = "Tools and Clang plugins for developing code with GLib"; + homepage = "https://freedesktop.org/wiki/Software/tartan"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/tools/hjson-go/default.nix b/pkgs/development/tools/hjson-go/default.nix index bbd1f3c0ec0..ce6da30d3b5 100644 --- a/pkgs/development/tools/hjson-go/default.nix +++ b/pkgs/development/tools/hjson-go/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "hjson-go"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "hjson"; repo = pname; rev = "v${version}"; - sha256 = "sha256-X02NnSefJfKUfagzJpdW1UpOLe84SvRaTN+8GqGKzbU="; + sha256 = "sha256-yU1VkxwQ12CjzITR9X6LLaOfiteN+807rfB/tWcRR1c="; }; goPackagePath = "github.com/hjson/hjson-go"; diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix index c5488cdb900..f88fcd9f429 100644 --- a/pkgs/development/tools/metal-cli/default.nix +++ b/pkgs/development/tools/metal-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "metal-cli"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dGeOFrsqhW0+aQyB4f6pvv4ZBawqKX2+WRskDWoLS7E="; + sha256 = "sha256-Zl0OuyqF+bNsp1AqnS8jhQlY7l4U6OjHHgth7pRPwEc="; }; - vendorSha256 = "sha256-ifSfeJjrZI1Hrsq64zAGBiLVc8GKvq+Ddg26gQooyTs="; + vendorSha256 = "sha256-F8d5i9jvjY11Pv6w0ZXI3jr0Wix++B/w9oRTuJGpQfE="; doCheck = false; diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix index fc2937a8b0f..7f42c39cb21 100644 --- a/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/pkgs/development/tools/profiling/heaptrack/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "heaptrack"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "KDE"; repo = "heaptrack"; rev = "v${version}"; - sha256 = "0pw82c26da014i1qxnaib3fqa52ijhf0m4swhjc3qq4hm2dx9bxj"; + sha256 = "sha256-GXwlauLspbY+h/Y75zlHPoP27pr3xVl05LuDW+WVYxU="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index 85cdb9d53b4..d27506e2c4b 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "2.5.1"; + version = "2.5.6"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-3iWD0kXbF8Rad7fQ36ppD5q8V8COacLrT+vasCkygDc="; + sha256 = "sha256-dSj3wNbQghiGfqe7dNDbWnbXYLSiG+0mYv2yFmGsAc8="; fetchSubmodules = true; }; @@ -55,15 +55,15 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -Dt "$out"/share/lua-language-server/bin/${target} bin/${target}/lua-language-server - install -m644 -t "$out"/share/lua-language-server/bin/${target} bin/${target}/*.* + install -Dt "$out"/share/lua-language-server/bin bin/lua-language-server + install -m644 -t "$out"/share/lua-language-server/bin bin/*.* install -m644 -t "$out"/share/lua-language-server {debugger,main}.lua cp -r locale meta script "$out"/share/lua-language-server # necessary for --version to work: install -m644 -t "$out"/share/lua-language-server changelog.md - makeWrapper "$out"/share/lua-language-server/bin/${target}/lua-language-server \ + makeWrapper "$out"/share/lua-language-server/bin/lua-language-server \ $out/bin/lua-language-server \ --add-flags "-E $out/share/lua-language-server/main.lua \ --logpath='~/.cache/sumneko_lua/log' \ diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index d29795d31b9..37dc97d5597 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,48 +2,48 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.48.tar.xz", + "name": "factorio_alpha_x64-1.1.50.tar.xz", "needsAuth": true, - "sha256": "1j26rrllmbk535xspqp3czl19ijbvyglxfa0ivpmw4wj2cm6796n", + "sha256": "1sb3kvpj3kikr1bvm4si4f3dmj7873dhbz6zj57kin6d5mbmhq4p", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.48/alpha/linux64", - "version": "1.1.48" + "url": "https://factorio.com/get-download/1.1.50/alpha/linux64", + "version": "1.1.50" }, "stable": { - "name": "factorio_alpha_x64-1.1.48.tar.xz", + "name": "factorio_alpha_x64-1.1.50.tar.xz", "needsAuth": true, - "sha256": "1j26rrllmbk535xspqp3czl19ijbvyglxfa0ivpmw4wj2cm6796n", + "sha256": "1sb3kvpj3kikr1bvm4si4f3dmj7873dhbz6zj57kin6d5mbmhq4p", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.48/alpha/linux64", - "version": "1.1.48" + "url": "https://factorio.com/get-download/1.1.50/alpha/linux64", + "version": "1.1.50" } }, "demo": { "stable": { - "name": "factorio_demo_x64-1.1.46.tar.xz", + "name": "factorio_demo_x64-1.1.50.tar.xz", "needsAuth": false, - "sha256": "sha256-CJVk1b3GXqs8xV2a7Pa6p6JxEOy86xAnRfz6kphCDHk=", + "sha256": "0i3r21i7s4yzjfqrwf82x87pfjg7d3bhkz3zqi0x398j9bykpw43", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.46/demo/linux64", - "version": "1.1.46" + "url": "https://factorio.com/get-download/1.1.50/demo/linux64", + "version": "1.1.50" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.48.tar.xz", + "name": "factorio_headless_x64-1.1.50.tar.xz", "needsAuth": false, - "sha256": "0hipzxaj322y4g1if44p818f7f5zmhg831xw6ahxnqg5g8kvf19y", + "sha256": "0j75wbnszhlmyk655b2h8jd1lvmnplq44blixl959hh3lxvqn50m", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.48/headless/linux64", - "version": "1.1.48" + "url": "https://factorio.com/get-download/1.1.50/headless/linux64", + "version": "1.1.50" }, "stable": { - "name": "factorio_headless_x64-1.1.48.tar.xz", + "name": "factorio_headless_x64-1.1.50.tar.xz", "needsAuth": false, - "sha256": "0hipzxaj322y4g1if44p818f7f5zmhg831xw6ahxnqg5g8kvf19y", + "sha256": "0j75wbnszhlmyk655b2h8jd1lvmnplq44blixl959hh3lxvqn50m", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.48/headless/linux64", - "version": "1.1.48" + "url": "https://factorio.com/get-download/1.1.50/headless/linux64", + "version": "1.1.50" } } } diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index d7208265e39..8de6206ecd0 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "scummvm"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { url = "http://scummvm.org/frs/scummvm/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256:08ynw1cmld41p4bwrw84gb1nv229va70i91qiqsjr3c2jnqy8zml"; + sha256 = "sha256-n9jbOORFYUS/jDTazffyBOdfGOjkSOwBzgjOgmoDXwE="; }; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 395d504e136..44c6e8a4c61 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,19 +2,15 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.42"; + version = "1.1.45"; src = fetchurl { # To find new versions, visit # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for # some printer like for instance "WF-7210" to get to the most recent # version. - # NOTE: Don't forget to update the webarchive link too! - urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/13/07/72/df79cc238a167b9526f70cc123459c6bbe1edbad/epson-inkjet-printer-escpr2-1.1.42-1lsb3.2.src.rpm" - "https://web.archive.org/web/20211029093638/https://download3.ebz.epson.net/dsc/f/03/00/13/07/72/df79cc238a167b9526f70cc123459c6bbe1edbad/epson-inkjet-printer-escpr2-1.1.42-1lsb3.2.src.rpm" - ]; - sha256 = "sha256-CsZUurwwoXNWONZKAIkRd0ztmAr5wLWZhirCzJWWqMA="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/13/38/11/01e244e8529c5cbcec8d39220a9512d5e6c08eec/epson-inkjet-printer-escpr2-1.1.45-1lsb3.2.src.rpm"; + sha256 = "sha256-MZXn1fsD3D6W5vlX+NwRkwLtaBRqQwe9lwnJC2L9Lfk="; }; unpackPhase = '' diff --git a/pkgs/os-specific/linux/bcc/absolute-ausyscall.patch b/pkgs/os-specific/linux/bcc/absolute-ausyscall.patch new file mode 100644 index 00000000000..7480e9c5d97 --- /dev/null +++ b/pkgs/os-specific/linux/bcc/absolute-ausyscall.patch @@ -0,0 +1,43 @@ +From 01e793163231c5085afced37471df32b94a313f5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Thu, 30 Dec 2021 06:34:41 +0100 +Subject: [PATCH] absolute ausyscall +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim <joerg@thalheim.io> +--- + libbpf-tools/syscall_helpers.c | 2 +- + src/python/bcc/syscall.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libbpf-tools/syscall_helpers.c b/libbpf-tools/syscall_helpers.c +index e114a08f..62adea78 100644 +--- a/libbpf-tools/syscall_helpers.c ++++ b/libbpf-tools/syscall_helpers.c +@@ -47,7 +47,7 @@ void init_syscall_names(void) + int err; + FILE *f; + +- f = popen("ausyscall --dump 2>/dev/null", "r"); ++ f = popen("@ausyscall@ --dump 2>/dev/null", "r"); + if (!f) { + warn("popen: ausyscall --dump: %s\n", strerror(errno)); + return; +diff --git a/src/python/bcc/syscall.py b/src/python/bcc/syscall.py +index 1346b4e8..e7e29a11 100644 +--- a/src/python/bcc/syscall.py ++++ b/src/python/bcc/syscall.py +@@ -376,7 +376,7 @@ def _parse_syscall(line): + try: + # Skip the first line, which is a header. The rest of the lines are simply + # SYSCALL_NUM\tSYSCALL_NAME pairs. +- out = subprocess.check_output(['ausyscall', '--dump'], stderr=subprocess.STDOUT) ++ out = subprocess.check_output(['@ausyscall@', '--dump'], stderr=subprocess.STDOUT) + # remove the first line of expected output + out = out.split(b'\n',1)[1] + syscalls = dict(map(_parse_syscall, out.strip().split(b'\n'))) +-- +2.34.0 + diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index c87740ed021..caeaed455f7 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -2,6 +2,7 @@ , makeWrapper, cmake, llvmPackages , flex, bison, elfutils, python, luajit, netperf, iperf, libelf , bash, libbpf, nixosTests +, audit }: python.pkgs.buildPythonApplication rec { @@ -41,9 +42,16 @@ python.pkgs.buildPythonApplication rec { "-DCMAKE_USE_LIBBPF_PACKAGE=ON" ]; + # to replace this executable path: + # https://github.com/iovisor/bcc/blob/master/src/python/bcc/syscall.py#L384 + ausyscall = "${audit}/bin/ausyscall"; + postPatch = '' substituteAll ${./libbcc-path.patch} ./libbcc-path.patch patch -p1 < libbcc-path.patch + + substituteAll ${./absolute-ausyscall.patch} ./absolute-ausyscall.patch + patch -p1 < absolute-ausyscall.patch ''; postInstall = '' diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index f45dd87edfb..e6104c6ed0c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.259"; + version = "4.14.260"; # 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 = "0s23iq89xdgckzyh8xv7p7wx0agjpj8ac2p42jpx6yzp3xa89qi6"; + sha256 = "1bylxn6hsq17cann2w02ggz6xz3b3synrapcwlwfcfydf71hzj9f"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 2dfdf8af2c0..d87a635c5ef 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.222"; + version = "4.19.223"; # 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 = "0f48c6lv0nqggn5rn1wfnlf3xjz6ckmzvjqbhpyar43x7l687c4p"; + sha256 = "1cnjk49g8sxsbzk375ji47lnx36drqh1x2pbfiqdwgrbjcb043sz"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index e3deaf62f04..4bc6ca32c16 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/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.296"; + version = "4.4.297"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1ydh6qiib6anxv5kxd13d9p2hjh3ni7r3whxazlzvckijmzqd5nb"; + sha256 = "116346nkbhaz8jc1118gh40y6pw1kq7c7hm74f8bjga1p0gjqn0c"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 940df7cdbab..eefe4fc7fb6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/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.294"; + version = "4.9.295"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0s527wr1zngyfz4p7nss1id14amc448g19i1wy20s13n43gm1jii"; + sha256 = "095am71hl7qryrcn1blvxsq5zsy0gixmj7062p7vvz5ypcvqcd52"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 3165e8b7e34..7b38ba8b095 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.88"; + version = "5.10.89"; # 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 = "1sv8j34k75xpbdgyddhlszlgn74fbj0girgixz7v18l2qfv331kg"; + sha256 = "0c5v8fsv9sazdmdw4m1canm54x2p8777yavxq2gcpw8q98d8n8cj"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 0a940d5e60d..f5f98e3317c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.11"; + version = "5.15.12"; # 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 = "1km1fglpg1a67vsfx6gqz9ikb6pywdl146bhws915n8jgrz8n5y1"; + sha256 = "182iwy2288layl2290cxla0k6y436lxlx43yaa8par325dviksbx"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 6a9ddc2e840..d568a285381 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.168"; + version = "5.4.169"; # 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 = "108i35bnfhv7cpq8ifp915ybngygl2qf6cfslrh3aqk5sk29mdzc"; + sha256 = "068sw1p50vcygi422bfjpahf2fxy3ifyp4ljnkwxbbvibzcq4hsm"; }; } // (args.argsOverride or {})) diff --git a/pkgs/servers/libreddit/default.nix b/pkgs/servers/libreddit/default.nix index 23b8ffd1f3e..5ad43a89522 100644 --- a/pkgs/servers/libreddit/default.nix +++ b/pkgs/servers/libreddit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "libreddit"; - version = "0.19.1"; + version = "0.21.4"; src = fetchFromGitHub { owner = "spikecodes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d6MDyFwQGvPQ1o+oYzZWhG2vFhBrFwMoV7a9vqFj+gs="; + sha256 = "sha256-9Qr1afzp5BwcnJ4WjACJQk4NA81JTnNBmZZNFMZ6FvU="; }; - cargoSha256 = "sha256-Dpfs4kC8wijmEd2HejT/RfWAbfxqO701uFcUtBGmCjo="; + cargoSha256 = "sha256-HD6asNFb0ZICeXnUwF4ZZ568GJRPeSy4XwflpIuWJw8="; buildInputs = lib.optional stdenv.isDarwin Security; @@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec { description = "Private front-end for Reddit"; homepage = "https://github.com/spikecodes/libreddit"; license = with licenses; [ agpl3Only ]; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab jojosch ]; }; } diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index bf13859bd01..bf5977f8252 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -37,7 +37,6 @@ in python.pkgs.buildPythonPackage rec { patches = [ ./0001-Re-add-entrypoint.patch ]; postPatch = '' - sed -i -e '/alembic>/d' requirements.txt substituteInPlace requirements.txt \ --replace "telethon>=1.22,<1.23" "telethon" ''; @@ -64,18 +63,6 @@ in python.pkgs.buildPythonPackage rec { unpaddedbase64 ]) ++ dbDrivers; - # `alembic` (a database migration tool) is only needed for the initial setup, - # and not needed during the actual runtime. However `alembic` requires `mautrix-telegram` - # in its environment to create a database schema from all models. - # - # Hence we need to patch away `alembic` from `mautrix-telegram` and create an `alembic` - # which has `mautrix-telegram` in its environment. - passthru.alembic = python.pkgs.alembic.overrideAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ dbDrivers ++ [ - mautrix-telegram - ]; - }); - # Tests are broken and throw the following for every test: # TypeError: 'Mock' object is not subscriptable # diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index b5533e10b2f..0c8b871ade7 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -5,17 +5,15 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "3.5"; + version = "4.0"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "sha256-N0qVlnMshsEcWEpPhtR+zXwFKXlik1XnEuZdFMjpZTE="; + sha256 = "1zv7aprmydyjs53xnn1h1s6xxb22pic7va23459zq0nfnhmsgd26"; }; - patches = [ ./sysstatedir.patch ]; - preConfigure = "cd src"; cmakeFlags = [ "-DUSE_SYSTEM_NTIRPC=ON" ]; diff --git a/pkgs/servers/nfs-ganesha/sysstatedir.patch b/pkgs/servers/nfs-ganesha/sysstatedir.patch deleted file mode 100644 index fff3d589735..00000000000 --- a/pkgs/servers/nfs-ganesha/sysstatedir.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake -index 2a5795e9f..7314e0594 100644 ---- a/src/include/config-h.in.cmake -+++ b/src/include/config-h.in.cmake -@@ -71,13 +71,13 @@ - #cmakedefine HAVE_URCU_REF_GET_UNLESS_ZERO 1 - #define NFS_GANESHA 1 - --#define GANESHA_CONFIG_PATH "@SYSCONFDIR@/ganesha/ganesha.conf" --#define GANESHA_PIDFILE_PATH "@SYSSTATEDIR@/run/ganesha.pid" --#define NFS_V4_RECOV_ROOT "@SYSSTATEDIR@/lib/nfs/ganesha" -+#define GANESHA_CONFIG_PATH "/etc/ganesha/ganesha.conf" -+#define GANESHA_PIDFILE_PATH "/run/ganesha.pid" -+#define NFS_V4_RECOV_ROOT "/var/lib/nfs/ganesha" - /** - * @brief Default value for krb5_param.ccache_dir - */ --#define DEFAULT_NFS_CCACHE_DIR "@SYSSTATEDIR@/run/ganesha" -+#define DEFAULT_NFS_CCACHE_DIR "/run/ganesha" - - /* We're LGPL'd */ - #define _LGPL_SOURCE 1 diff --git a/pkgs/servers/sql/postgresql/ext/plv8.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix index a546c3a687f..6f5411340e4 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "plv8"; - version = "2.3.15"; + version = "3.0.0"; nativeBuildInputs = [ perl ]; buildInputs = [ v8 postgresql ]; @@ -11,22 +11,42 @@ stdenv.mkDerivation rec { owner = "plv8"; repo = "plv8"; rev = "v${version}"; - sha256 = "1cv94n49gq2b377gqyq7pjjzw98czv4mwl3sx97y18c20zwp6rk3"; + sha256 = "KJz8wnGcTXnVn6umpP+UquuJTtQrkBTJ33rB/JIH4kU="; }; makefile = "Makefile.shared"; buildFlags = [ "all" ]; + makeFlags = [ + # Nixpkgs build a v8 monolith instead of separate v8_libplatform. + "V8_OUTDIR=${v8}/lib" + ]; + + installFlags = [ + # PGXS only supports installing to postgresql prefix so we need to redirect this + "DESTDIR=${placeholder "out"}" + ]; + preConfigure = '' patchShebangs ./generate_upgrade.sh + substituteInPlace generate_upgrade.sh \ + --replace " 2.3.10)" " 2.3.10 2.3.11 2.3.12 2.3.13 2.3.14 2.3.15)" ''; - installPhase = '' - install -D plv8*.so -t $out/lib - install -D {plls,plcoffee,plv8}{--${version}.sql,.control} -t $out/share/postgresql/extension + postInstall = '' + # Move the redirected to proper directory. + # There appear to be no references to the install directories + # so changing them does not cause issues. + mv "$out/nix/store"/*/* "$out" + rmdir "$out/nix/store"/* "$out/nix/store" "$out/nix" ''; + # Without this, PostgreSQL will crash at runtime. + # The flags are only included in Makefile, not Makefile.shared. + # https://github.com/plv8/plv8/pull/469 + NIX_CFLAGS_COMPILE = "-DJSONB_DIRECT_CONVERSION -DV8_COMPRESS_POINTERS=1 -DV8_31BIT_SMIS_ON_64BIT_ARCH=1"; + meta = with lib; { description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL"; homepage = "https://plv8.github.io/"; diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 1986ed68199..e751ae621f3 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -26,11 +26,7 @@ self: super: { plr = super.callPackage ./ext/plr.nix { }; - plv8 = super.callPackage ./ext/plv8.nix { - v8 = super.callPackage ../../../development/libraries/v8/plv8_6_x.nix { - python = self.python2; - }; - }; + plv8 = super.callPackage ./ext/plv8.nix { }; pgjwt = super.callPackage ./ext/pgjwt.nix { }; diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 93d3f663734..2a019d75e72 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "sha256-2J2MCByLxTbfx7Q3uWWiZcB+JM9RQv8mshtMxKMTnjI="; + sha256 = "sha256-4cfRysJ202y1996TB/7jvlWO5K2vNJ70IjIkANXIpcQ="; }; postPatch = '' diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index ab8c5813884..182e594084e 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.49.1"; + version = "1.49.2"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-QBRRx+3ltLlUeckvJBA3rSLna6L44X44ObCMyhBnBhg="; + sha256 = "sha256-8v+U0h0+3NVSXBlulOKY0A5oDlqkgNZPoyflRNycDxU="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index d5d3124038f..a71f6e8f634 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.10.4"; + version = "0.10.5"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - sha256 = "sha256-D5LICE7CAwCqvaHIYfRWC8Te4W0tGhKAETmus2qa0UM="; + sha256 = "sha256-l01c1tjS0L+T/kHreYx3A5/N/oRDuDywXS/GAvUCxSk="; }; - vendorSha256 = "sha256-ImKN3rNotgUkQaKzoetAEG6Q/zlfH8FTK4HTIO0xn4s="; + vendorSha256 = "sha256-iJlNNovsIgTOPfAzwqkumrmCQu2xI/neqH+Z4tvSXeY="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index b0524e9bc68..dab69649fdc 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -2,7 +2,7 @@ autoconf, automake, libtool, pkg-config, zlib, libaio, libxml2, acl, sqlite, liburcu, liburing, attr, makeWrapper, coreutils, gnused, gnugrep, which, openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, - rsync, glibc, rpcsvc-proto, libtirpc, gperftools + rsync, glibc, rpcsvc-proto, libtirpc, gperftools, nixosTests }: let # NOTE: On each glusterfs release, it should be checked if gluster added @@ -85,6 +85,7 @@ in stdenv.mkDerivation rec { # but fails when the version is empty. # See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705 preConfigure = '' + patchShebangs build-aux/pkg-version echo "v${version}" > VERSION ./autogen.sh export PYTHON=${python3}/bin/python @@ -181,6 +182,10 @@ in stdenv.mkDerivation rec { rm -r $out/bin/conf.py ''; + passthru.tests = { + glusterfs = nixosTests.glusterfs; + }; + meta = with lib; { description = "Distributed storage system"; homepage = "https://www.gluster.org"; diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 480201b8879..3f4dbb01e5a 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { description = "For when you really just want to serve some files over HTTP right now!"; homepage = "https://github.com/svenstaro/miniserve"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ zowoq ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 6fbee9b8e82..379c8962101 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -14,6 +14,7 @@ , coreutils , CoreServices , tzdata +, cmake # kafka is optional but one of the most used features , enableKafka ? true # TODO investigate adding "api" "api-client" "vrl-cli" and various "vendor-*" @@ -28,7 +29,7 @@ let pname = "vector"; - version = "0.18.1"; + version = "0.19.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -37,11 +38,11 @@ rustPlatform.buildRustPackage { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OD7lYoTlQNdrWT1f+BAp6zI0N+9W2LOHNNgpvAMXKDM="; + sha256 = "sha256-A+Ok/BNEs0V00B8P6ghSHZ2pQ8tumfpkurplnvjpWZ8="; }; - cargoSha256 = "sha256-BqnXXTNE1TmrF7pSOCQpnHHve0lCb9W6MbJXk2QHAOs="; - nativeBuildInputs = [ pkg-config ]; + cargoSha256 = "sha256-B9z+8TqAl0yFaou1LfNcFsDJjw7qGti6MakDPhz49tc="; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; diff --git a/pkgs/tools/misc/vial/default.nix b/pkgs/tools/misc/vial/default.nix index 5685141e446..7bc78803167 100644 --- a/pkgs/tools/misc/vial/default.nix +++ b/pkgs/tools/misc/vial/default.nix @@ -1,12 +1,12 @@ { lib, fetchurl, appimageTools }: let name = "vial-${version}"; - version = "0.4.1"; + version = "0.4.2"; pname = "Vial"; src = fetchurl { url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; - sha256 = "sha256-aN0wvgahWPNSXP/JmV1JWaEnARIOTyRdz1ko6eC7Y5s="; + sha256 = "sha256-T3aSwv/qTJHR/Fa6qU1fWbp3duvny4lC+9jBwQzpw2w="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; @@ -24,7 +24,7 @@ appimageTools.wrapType2 { ''; meta = with lib; { - description = "An Open-source cross-platform (Windows, Linux and Mac) GUI and a QMK fork for configuring your keyboard in real time"; + description = "An Open-source QMK GUI fork for configuring your keyboard in real time"; homepage = "https://get.vial.today"; license = licenses.gpl2Plus; maintainers = with maintainers; [ kranzes ]; diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix index a35e9200a71..95b4a890723 100644 --- a/pkgs/tools/misc/ytfzf/default.nix +++ b/pkgs/tools/misc/ytfzf/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , makeWrapper +, chafa , coreutils , curl , dmenu @@ -9,27 +10,21 @@ , gnused , jq , mpv -, ncurses , ueberzug -, youtube-dl +, yt-dlp }: stdenv.mkDerivation rec { pname = "ytfzf"; - version = "1.2.0"; + version = "2.0"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - sha256 = "sha256-3wbjCtRmnd9tm8kqKaIF6VmMdKsWznhOvQkEsrAJpAE="; + sha256 = "sha256-JuLfFC3oz2FvCaD+XPuL1N8tGKmv4atyZIBeDKWYgT8="; }; - patches = [ - # Updates have to be installed through Nix. - ./no-update.patch - ]; - nativeBuildInputs = [ makeWrapper ]; makeFlags = [ "PREFIX=${placeholder "out"}/bin" ]; @@ -38,8 +33,13 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/ytfzf" --prefix PATH : ${lib.makeBinPath [ - coreutils curl dmenu fzf gnused jq mpv ncurses ueberzug youtube-dl + chafa coreutils curl dmenu fzf gnused jq mpv ueberzug yt-dlp ]} + + gzip -c docs/man/ytfzf.1 > docs/man/ytfzf.1.gz + gzip -c docs/man/ytfzf.5 > docs/man/ytfzf.5.gz + install -Dt "$out/share/man/man1" docs/man/ytfzf.1.gz + install -Dt "$out/share/man/man5" docs/man/ytfzf.5.gz ''; meta = with lib; { diff --git a/pkgs/tools/misc/ytfzf/no-update.patch b/pkgs/tools/misc/ytfzf/no-update.patch deleted file mode 100644 index e71582f6364..00000000000 --- a/pkgs/tools/misc/ytfzf/no-update.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/ytfzf b/ytfzf -index f4d2e0d..7a3b4b6 100755 ---- a/ytfzf -+++ b/ytfzf -@@ -1260,22 +1260,8 @@ EOF - } - - update_ytfzf () { -- branch="$1" -- updatefile="/tmp/ytfzf-update" -- curl -L "https://raw.githubusercontent.com/pystardust/ytfzf/$branch/ytfzf" -o "$updatefile" -- -- if sed -n '1p' < "$updatefile" | grep -q '#!/bin/sh'; then -- chmod 755 "$updatefile" -- [ "$(uname)" = "Darwin" ] && prefix="/usr/local/bin" || prefix="/usr/bin" -- function_exists "sudo" && doasroot="sudo" || doasroot="doas" -- $doasroot cp "$updatefile" "$prefix/ytfzf" -- unset prefix doasroot -- else -- printf "%bFailed to update ytfzf. Try again later.%b" "$c_red" "$c_reset" -- fi -- -- rm "$updatefile" -- exit 0 -+ printf "%bUpdates have to be installed through Nix.%b\n" "$c_red" "$c_reset" -+ exit 1 - } - - #gives a value to sort by (this will give the unix time the video was uploaded) diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index 1383d211c84..09524b80895 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "5.0.1"; + version = "5.1.1"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "sha256-qmXtFVfBXCuXhIac0Y6HrhTPWsIHp5pwrxnOJkoSzm4="; + sha256 = "sha256-nfpVW+Y6+YtMhDepj2DbnzItH11zABlnEs9c0FzfouA="; }; - cargoSha256 = "sha256-CyiBA6XQjExnjGVpMonhtoIwU2W57T5L6glt9G/xwDs="; + cargoSha256 = "sha256-s7xikSZx29zv8TD/YOTckCUh/8MBBIdZOUUwfkVZfx8="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 8241851d532..9d327f37af6 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grype"; - version = "0.27.3"; + version = "0.28.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W1HP+bzsLY8SaZQK+H33mibM7lfxoGnKnOvsStwzv4E="; + sha256 = "sha256-Mc0bO9BDcIXEoHwhQDbX9g84kagcT3gVz8PPxXpG7dw="; }; - vendorSha256 = "sha256-IwEQkdspSjdlm4siwhaBZsIaRz8oKKG6d6PAK1MvHlw="; + vendorSha256 = "sha256-su0dg9Gidd8tQKM5IzX6/GC5jk8SCIO+qsI3UGlvpwg="; propagatedBuildInputs = [ docker ]; diff --git a/pkgs/tools/security/log4j-sniffer/default.nix b/pkgs/tools/security/log4j-sniffer/default.nix index c3c4a0cd086..07d966353ab 100644 --- a/pkgs/tools/security/log4j-sniffer/default.nix +++ b/pkgs/tools/security/log4j-sniffer/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "log4j-sniffer"; - version = "0.8.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "palantir"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dsuIeNAYe/iuxfezfs+hyyziFrE3M+GRxqYuawYFKDU="; + sha256 = "sha256-2scESCuENM4m3YrxPjoXcPKEkBPTMWOGJR3WenkTNBA="; }; vendorSha256 = null; diff --git a/pkgs/tools/security/log4j-vuln-scanner/default.nix b/pkgs/tools/security/log4j-vuln-scanner/default.nix index 0cd6534f909..67bfa89ad2e 100644 --- a/pkgs/tools/security/log4j-vuln-scanner/default.nix +++ b/pkgs/tools/security/log4j-vuln-scanner/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "log4j-vuln-scanner"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "hillu"; repo = "local-log4j-vuln-scanner"; rev = "v${version}"; - sha256 = "sha256-w3S+OxSTRgmFJOODDOoK33ddckv18LNnZyx7/HBTl9I="; + sha256 = "sha256-YGo2dhfqLPNP8O9gdRJfxKmEK/pKd17WNTXQ2cq78qg="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; postInstall = '' mv $out/bin/scanner $out/bin/$pname diff --git a/pkgs/tools/security/snallygaster/default.nix b/pkgs/tools/security/snallygaster/default.nix index e77743d8648..31619ea7f54 100644 --- a/pkgs/tools/security/snallygaster/default.nix +++ b/pkgs/tools/security/snallygaster/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "snallygaster"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "hannob"; repo = pname; rev = "v${version}"; - sha256 = "1xd483sl94zhs7yhc52s0zrn3pj7vf5izggp4ap1d2j0lbwwcyka"; + sha256 = "sha256-xUWnu+T6+5Ro6TrmtFD/Qd40FffY5rfuAvWzNkBhTME="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/security/vaultwarden/vault.nix b/pkgs/tools/security/vaultwarden/vault.nix index 0d4070e47ab..5ec014de959 100644 --- a/pkgs/tools/security/vaultwarden/vault.nix +++ b/pkgs/tools/security/vaultwarden/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "vaultwarden-vault"; - version = "2.22.3"; + version = "2.25.0"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "sha256-cPyh6Hyvqw6ygmOP+qiyhSNAwdryC4nowm8n2ULOJxs="; + sha256 = "sha256-0uxkHz/oHWl4MdzV7zRVKgkEqOkrl7Fd405TOf472gw="; }; buildCommand = '' diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index 9c926381dc4..70b1a78586c 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -1,6 +1,8 @@ { lib , stdenv , fetchFromGitHub +, runCommand +, darwin }: stdenv.mkDerivation rec { @@ -14,6 +16,26 @@ stdenv.mkDerivation rec { sha256 = "sha256-uKR1ogQwEoyxyWBiLnW8BsOsYgTpeIpKrKspq0JwYjY="; }; + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + + ADDFLAGS = with darwin.apple_sdk.frameworks; + lib.optional stdenv.isDarwin + "-F${IOKit}/Library/Frameworks/"; + + buildInputs = with darwin.apple_sdk; + lib.optionals stdenv.isDarwin [ + frameworks.CoreFoundation + frameworks.IOKit + ] ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) ( + # Found this explanation for needing to create a header directory for libproc.h alone. + # https://github.com/NixOS/nixpkgs/blob/049e5e93af9bbbe06b4c40fd001a4e138ce1d677/pkgs/development/libraries/webkitgtk/default.nix#L154 + # TL;DR, the other headers in the include path for the macOS SDK is not compatible with the C++ stdlib and causes issues, so we copy + # this to avoid those issues + runCommand "${pname}_headers" { } '' + install -Dm444 "${lib.getDev sdk}"/include/libproc.h "$out"/include/libproc.h + '' + ); + installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { @@ -21,7 +43,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/aristocratos/btop"; changelog = "https://github.com/aristocratos/btop/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ rmcgibbo ]; }; } diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/tools/wayland/swayr/default.nix index 374e1b0e181..9ccc13532c2 100644 --- a/pkgs/tools/wayland/swayr/default.nix +++ b/pkgs/tools/wayland/swayr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swayr"; - version = "0.10.1"; + version = "0.11.2"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; rev = "v${version}"; - sha256 = "sha256-xkNfdO/3MiI3BhCabGNYWkUXkLcLDQmcf+gd5u7KM6Q="; + sha256 = "sha256-IjOoQbKCiwuoCsh2bOmvcSH3/9KMmavmn1Ib1TLBH8w="; }; - cargoSha256 = "sha256-FAg3vKSTHA0LVqAu7HE6vI9N1Ro58ZIp29qw2KUHpw4="; + cargoSha256 = "sha256-EYaISBnWKplKUAKa9SZufWcykeR/qeApvqwIGB9jt3Q="; patches = [ ./icon-paths.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af08892fb49..482f17ce47e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10069,6 +10069,8 @@ with pkgs; tarssh = callPackage ../servers/tarssh { }; + tartan = callPackage ../development/tools/analysis/tartan {}; + tartube = callPackage ../applications/video/tartube { }; tartube-yt-dlp = callPackage ../applications/video/tartube { @@ -16337,7 +16339,9 @@ with pkgs; fflas-ffpack = callPackage ../development/libraries/fflas-ffpack { }; - forge = callPackage ../development/libraries/forge { }; + forge = callPackage ../development/libraries/forge { + cudatoolkit = buildPackages.cudatoolkit_11; + }; linbox = callPackage ../development/libraries/linbox { }; @@ -17294,8 +17298,6 @@ with pkgs; stdenv = if stdenv.cc.isClang then llvmPackages_10.stdenv else stdenv; }; - jemalloc450 = callPackage ../development/libraries/jemalloc/jemalloc450.nix { }; - jose = callPackage ../development/libraries/jose { }; jshon = callPackage ../development/tools/parsing/jshon { }; @@ -26156,7 +26158,9 @@ with pkgs; srain = callPackage ../applications/networking/irc/srain { }; - super-productivity = callPackage ../applications/office/super-productivity { }; + super-productivity = callPackage ../applications/office/super-productivity { + electron = electron_13; + }; wlroots = callPackage ../development/libraries/wlroots { inherit (xorg) xcbutilrenderutil; @@ -28659,7 +28663,7 @@ with pkgs; stalonetray = callPackage ../applications/window-managers/stalonetray {}; - inherit (ocaml-ng.ocamlPackages_4_07) stog; + inherit (ocamlPackages) stog; stp = callPackage ../applications/science/logic/stp { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b80eb3f0e55..aed62686865 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -932,6 +932,8 @@ let ocf = callPackage ../development/ocaml-modules/ocf { }; + ocf_ppx = callPackage ../development/ocaml-modules/ocf/ppx.nix { }; + ocp-build = callPackage ../development/tools/ocaml/ocp-build { }; ocp-indent = callPackage ../development/tools/ocaml/ocp-indent { }; @@ -1404,6 +1406,8 @@ let xtmpl = callPackage ../development/ocaml-modules/xtmpl { }; + xtmpl_ppx = callPackage ../development/ocaml-modules/xtmpl/ppx.nix { }; + yaml = callPackage ../development/ocaml-modules/yaml { }; yaml-sexp = callPackage ../development/ocaml-modules/yaml/yaml-sexp.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2860bee5308..a8a2a6f0d8b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1320,6 +1320,8 @@ in { brother = callPackage ../development/python-modules/brother { }; + brother-ql = callPackage ../development/python-modules/brother-ql { }; + brotli = callPackage ../development/python-modules/brotli { }; brotlicffi = callPackage ../development/python-modules/brotlicffi { @@ -2986,6 +2988,8 @@ in { forecast-solar = callPackage ../development/python-modules/forecast-solar { }; + formbox = callPackage ../development/python-modules/formbox { }; + fortiosapi = callPackage ../development/python-modules/fortiosapi { }; FormEncode = callPackage ../development/python-modules/FormEncode { }; @@ -5640,6 +5644,8 @@ in { packaging = callPackage ../development/python-modules/packaging { }; + packbits = callPackage ../development/python-modules/packbits { }; + packet-python = callPackage ../development/python-modules/packet-python { }; pafy = callPackage ../development/python-modules/pafy { }; @@ -7357,6 +7363,8 @@ in { pysigset = callPackage ../development/python-modules/pysigset { }; + pysimplegui = callPackage ../development/python-modules/pysimplegui { }; + pysingleton = callPackage ../development/python-modules/pysingleton { }; pyslurm = callPackage ../development/python-modules/pyslurm { |