diff options
528 files changed, 4520 insertions, 3505 deletions
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 847a41cf23c..53df328f8d4 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -8,7 +8,7 @@ Several versions of the Python interpreter are available on Nix, as well as a high amount of packages. The attribute `python3` refers to the default -interpreter, which is currently CPython 3.8. The attribute `python` refers to +interpreter, which is currently CPython 3.9. The attribute `python` refers to CPython 2.7 for backwards-compatibility. It is also possible to refer to specific versions, e.g. `python38` refers to CPython 3.8, and `pypy` refers to the default PyPy interpreter. @@ -839,7 +839,7 @@ sets are and the aliases * `pkgs.python2Packages` pointing to `pkgs.python27Packages` -* `pkgs.python3Packages` pointing to `pkgs.python38Packages` +* `pkgs.python3Packages` pointing to `pkgs.python39Packages` * `pkgs.pythonPackages` pointing to `pkgs.python2Packages` #### `buildPythonPackage` function {#buildpythonpackage-function} diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9ba85483ccd..09732359eed 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2469,6 +2469,12 @@ githubId = 452652; name = "Kosyrev Serge"; }; + DeeUnderscore = { + email = "d.anzorge@gmail.com"; + github = "DeeUnderscore"; + githubId = 156239; + name = "D Anzorge"; + }; delan = { name = "Delan Azabani"; email = "delan@azabani.com"; @@ -4213,6 +4219,12 @@ githubId = 6430643; name = "Henry Till"; }; + heph2 = { + email = "srht@mrkeebs.eu"; + github = "heph2"; + githubId = 87579883; + name = "Marco"; + }; herberteuler = { email = "herberteuler@gmail.com"; github = "herberteuler"; @@ -5490,6 +5502,12 @@ githubId = 25607; name = "Raimon Grau"; }; + kidonng = { + email = "hi@xuann.wang"; + github = "kidonng"; + githubId = 44045911; + name = "Kid"; + }; kierdavis = { email = "kierdavis@gmail.com"; github = "kierdavis"; @@ -7582,6 +7600,12 @@ githubId = 26231126; name = "Nils ANDRÉ-CHANG"; }; + nils-degroot = { + email = "nils@peeko.nl"; + github = "nils-degroot"; + githubId = 53556985; + name = "Nils de Groot"; + }; ninjatrappeur = { email = "felix@alternativebit.fr"; github = "ninjatrappeur"; @@ -11326,6 +11350,12 @@ githubId = 19174984; name = "Alex Whitt"; }; + whonore = { + email = "wolfhonore@gmail.com"; + github = "whonore"; + githubId = 7121530; + name = "Wolf Honoré"; + }; wildsebastian = { name = "Sebastian Wild"; email = "sebastian@wild-siena.com"; diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index 59696a4432d..6a08eb88bf8 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -165,6 +165,20 @@ elsif (defined $expr) { my $hash = $fetch->{hash}; my $name = $fetch->{name}; + if ($hash =~ /^([a-z0-9]+)-([A-Za-z0-9+\/=]+)$/) { + $algo = $1; + $hash = `nix hash to-base16 $hash` or die; + chomp $hash; + } + + next unless $algo =~ /^[a-z0-9]+$/; + + # Convert non-SRI base-64 to base-16. + if ($hash =~ /^[A-Za-z0-9+\/=]+$/) { + $hash = `nix hash to-base16 --type '$algo' $hash` or die; + chomp $hash; + } + if (defined $ENV{DEBUG}) { print "$url $algo $hash\n"; next; @@ -184,7 +198,7 @@ elsif (defined $expr) { my $storePath = makeFixedOutputPath(0, $algo, $hash, $name); - print STDERR "mirroring $url ($storePath)...\n"; + print STDERR "mirroring $url ($storePath, $algo, $hash)...\n"; if ($dryRun) { $mirrored++; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 88d075a9a48..cc4ec8da958 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -14,7 +14,7 @@ </itemizedlist> <section xml:id="sec-release-21.11-highlights"> <title>Highlights</title> - <itemizedlist spacing="compact"> + <itemizedlist> <listitem> <para> PHP now defaults to PHP 8.0, updated from 7.4. @@ -26,6 +26,12 @@ default runtime. </para> </listitem> + <listitem> + <para> + <literal>python3</literal> now defaults to Python 3.9, updated + from Python 3.8. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-new-services"> @@ -99,6 +105,14 @@ <link linkend="opt-services.hockeypuck.enable">services.hockeypuck</link>. </para> </listitem> + <listitem> + <para> + <link xlink:href="https://github.com/buildkite/buildkite-agent-metrics">buildkite-agent-metrics</link>, + a command-line tool for collecting Buildkite agent metrics, + now has a Prometheus exporter available as + <link linkend="opt-services.prometheus.exporters.buildkite-agent.enable">services.prometheus.exporters.buildkite-agent</link>. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-incompatibilities"> @@ -560,6 +574,14 @@ </listitem> <listitem> <para> + <literal>python3</literal> now defaults to Python 3.9. Python + 3.9 introduces many deprecation warnings, please look at the + <link xlink:href="https://docs.python.org/3/whatsnew/3.9.html">What’s + New In Python 3.9 post</link> for more information. + </para> + </listitem> + <listitem> + <para> The <literal>claws-mail</literal> package now references the new GTK+ 3 release branch, major version 4. To use the GTK+ 2 releases, one can install the diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index f7275480ff8..3b9631aa753 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -9,6 +9,8 @@ In addition to numerous new and upgraded packages, this release has the followin - PHP now defaults to PHP 8.0, updated from 7.4. - kOps now defaults to 1.21.0, which uses containerd as the default runtime. +- `python3` now defaults to Python 3.9, updated from Python 3.8. + ## New Services {#sec-release-21.11-new-services} - [btrbk](https://digint.ch/btrbk/index.html), a backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations. Available as [services.btrbk](options.html#opt-services.brtbk.instances). @@ -30,6 +32,7 @@ In addition to numerous new and upgraded packages, this release has the followin - [Hockeypuck](https://github.com/hockeypuck/hockeypuck), a OpenPGP Key Server. Available as [services.hockeypuck](#opt-services.hockeypuck.enable). +- [buildkite-agent-metrics](https://github.com/buildkite/buildkite-agent-metrics), a command-line tool for collecting Buildkite agent metrics, now has a Prometheus exporter available as [services.prometheus.exporters.buildkite-agent](#opt-services.prometheus.exporters.buildkite-agent.enable). ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} @@ -140,6 +143,8 @@ In addition to numerous new and upgraded packages, this release has the followin - Sway: The terminal emulator `rxvt-unicode` is no longer installed by default via `programs.sway.extraPackages`. The current default configuration uses `alacritty` (and soon `foot`) so this is only an issue when using a customized configuration and not installing `rxvt-unicode` explicitly. +- `python3` now defaults to Python 3.9. Python 3.9 introduces many deprecation warnings, please look at the [What's New In Python 3.9 post](https://docs.python.org/3/whatsnew/3.9.html) for more information. + - The `claws-mail` package now references the new GTK+ 3 release branch, major version 4. To use the GTK+ 2 releases, one can install the `claws-mail-gtk2` package. - The wordpress module provides a new interface which allows to use different webservers with the new option [`services.wordpress.webserver`](options.html#opt-services.wordpress.webserver). Currently `httpd` and `nginx` are supported. The definitions of wordpress sites should now be set in [`services.wordpress.sites`](options.html#opt-services.wordpress.sites). diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 15eaba88476..2a3e4d94b94 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -499,7 +499,7 @@ class Machine: output += out return output - def wait_until_succeeds(self, command: str) -> str: + def wait_until_succeeds(self, command: str, timeout: int = 900) -> str: """Wait until a command returns success and return its output. Throws an exception on timeout. """ @@ -511,7 +511,7 @@ class Machine: return status == 0 with self.nested("waiting for success: {}".format(command)): - retry(check_success) + retry(check_success, timeout) return output def wait_until_fails(self, command: str) -> str: diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 801e28cec44..e3576074a5b 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,7 @@ { - x86_64-linux = "/nix/store/d1ppfhjhdwcsb4npfzyifv5z8i00fzsk-nix-2.3.11"; - i686-linux = "/nix/store/c6ikndcrzwpfn2sb5b9xb1f17p9b8iga-nix-2.3.11"; - aarch64-linux = "/nix/store/fb0lfrn0m8s197d264jzd64vhz9c8zbx-nix-2.3.11"; - x86_64-darwin = "/nix/store/qvb86ffv08q3r66qbd6nqifz425lyyhf-nix-2.3.11"; + x86_64-linux = "/nix/store/qsgz2hhn6mzlzp53a7pwf9z2pq3l5z6h-nix-2.3.14"; + i686-linux = "/nix/store/1yw40bj04lykisw2jilq06lir3k9ga4a-nix-2.3.14"; + aarch64-linux = "/nix/store/32yzwmynmjxfrkb6y6l55liaqdrgkj4a-nix-2.3.14"; + x86_64-darwin = "/nix/store/06j0vi2d13w4l0p3jsigq7lk4x6gkycj-nix-2.3.14"; + aarch64-darwin = "/nix/store/77wi7vpbrghw5rgws25w30bwb8yggnk9-nix-2.3.14"; } diff --git a/nixos/modules/services/backup/sanoid.nix b/nixos/modules/services/backup/sanoid.nix index be44a43b6d3..abc4def1c61 100644 --- a/nixos/modules/services/backup/sanoid.nix +++ b/nixos/modules/services/backup/sanoid.nix @@ -108,8 +108,8 @@ in { type = types.attrsOf (types.submodule ({config, options, ...}: { freeformType = datasetSettingsType; options = commonOptions // datasetOptions; - config.use_template = mkAliasDefinitions (options.useTemplate or {}); - config.process_children_only = mkAliasDefinitions (options.processChildrenOnly or {}); + config.use_template = mkAliasDefinitions (mkDefault options.useTemplate or {}); + config.process_children_only = mkAliasDefinitions (mkDefault options.processChildrenOnly or {}); })); default = {}; description = "Datasets to snapshot."; diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 6bd075697fa..d648de6a414 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -27,6 +27,7 @@ let "bird" "bitcoin" "blackbox" + "buildkite-agent" "collectd" "dnsmasq" "domain" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/buildkite-agent.nix b/nixos/modules/services/monitoring/prometheus/exporters/buildkite-agent.nix new file mode 100644 index 00000000000..7557480ac06 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/buildkite-agent.nix @@ -0,0 +1,64 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.buildkite-agent; +in +{ + port = 9876; + extraOpts = { + tokenPath = mkOption { + type = types.nullOr types.path; + apply = final: if final == null then null else toString final; + description = '' + The token from your Buildkite "Agents" page. + + A run-time path to the token file, which is supposed to be provisioned + outside of Nix store. + ''; + }; + interval = mkOption { + type = types.str; + default = "30s"; + example = "1min"; + description = '' + How often to update metrics. + ''; + }; + endpoint = mkOption { + type = types.str; + default = "https://agent.buildkite.com/v3"; + description = '' + The Buildkite Agent API endpoint. + ''; + }; + queues = mkOption { + type = with types; nullOr (listOf str); + default = null; + example = literalExample ''[ "my-queue1" "my-queue2" ]''; + description = '' + Which specific queues to process. + ''; + }; + }; + serviceOpts = { + script = + let + queues = concatStringsSep " " (map (q: "-queue ${q}") cfg.queues); + in + '' + export BUILDKITE_AGENT_TOKEN="$(cat ${toString cfg.tokenPath})" + exec ${pkgs.buildkite-agent-metrics}/bin/buildkite-agent-metrics \ + -backend prometheus \ + -interval ${cfg.interval} \ + -endpoint ${cfg.endpoint} \ + ${optionalString (cfg.queues != null) queues} \ + -prometheus-addr "${cfg.listenAddress}:${toString cfg.port}" ${concatStringsSep " " cfg.extraFlags} + ''; + serviceConfig = { + DynamicUser = false; + RuntimeDirectory = "buildkite-agent-metrics"; + }; + }; +} diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 8d352e36ef9..c135081959a 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -6,6 +6,9 @@ let crioPackage = (pkgs.cri-o.override { inherit (cfg) extraPackages; }); + format = pkgs.formats.toml { }; + + cfgFile = format.generate "00-default.conf" cfg.settings; in { imports = [ @@ -13,7 +16,7 @@ in ]; meta = { - maintainers = lib.teams.podman.members; + maintainers = teams.podman.members; }; options.virtualisation.cri-o = { @@ -55,7 +58,7 @@ in extraPackages = mkOption { type = with types; listOf package; default = [ ]; - example = lib.literalExample '' + example = literalExample '' [ pkgs.gvisor ] @@ -65,7 +68,7 @@ in ''; }; - package = lib.mkOption { + package = mkOption { type = types.package; default = crioPackage; internal = true; @@ -80,6 +83,15 @@ in description = "Override the network_dir option."; internal = true; }; + + settings = mkOption { + type = format.type; + default = { }; + description = '' + Configuration for cri-o, see + <link xlink:href="https://github.com/cri-o/cri-o/blob/master/docs/crio.conf.5.md"/>. + ''; + }; }; config = mkIf cfg.enable { @@ -87,36 +99,38 @@ in environment.etc."crictl.yaml".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml"; - environment.etc."crio/crio.conf.d/00-default.conf".text = '' - [crio] - storage_driver = "${cfg.storageDriver}" - - [crio.image] - ${optionalString (cfg.pauseImage != null) ''pause_image = "${cfg.pauseImage}"''} - ${optionalString (cfg.pauseCommand != null) ''pause_command = "${cfg.pauseCommand}"''} - - [crio.network] - plugin_dirs = ["${pkgs.cni-plugins}/bin/"] - ${optionalString (cfg.networkDir != null) ''network_dir = "${cfg.networkDir}"''} - - [crio.runtime] - cgroup_manager = "systemd" - log_level = "${cfg.logLevel}" - pinns_path = "${cfg.package}/bin/pinns" - hooks_dir = [ - ${lib.optionalString config.virtualisation.containers.ociSeccompBpfHook.enable - ''"${config.boot.kernelPackages.oci-seccomp-bpf-hook}",''} - ] - - ${optionalString (cfg.runtime != null) '' - default_runtime = "${cfg.runtime}" - [crio.runtime.runtimes] - [crio.runtime.runtimes.${cfg.runtime}] - ''} - ''; + virtualisation.cri-o.settings.crio = { + storage_driver = cfg.storageDriver; + + image = { + pause_image = mkIf (cfg.pauseImage != null) cfg.pauseImage; + pause_command = mkIf (cfg.pauseCommand != null) cfg.pauseCommand; + }; + + network = { + plugin_dirs = [ "${pkgs.cni-plugins}/bin" ]; + network_dir = mkIf (cfg.networkDir != null) cfg.networkDir; + }; + + runtime = { + cgroup_manager = "systemd"; + log_level = cfg.logLevel; + manage_ns_lifecycle = true; + pinns_path = "${cfg.package}/bin/pinns"; + hooks_dir = + optional (config.virtualisation.containers.ociSeccompBpfHook.enable) + config.boot.kernelPackages.oci-seccomp-bpf-hook; + + default_runtime = mkIf (cfg.runtime != null) cfg.runtime; + runtimes = mkIf (cfg.runtime != null) { + "${cfg.runtime}" = { }; + }; + }; + }; environment.etc."cni/net.d/10-crio-bridge.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/10-crio-bridge.conf"; environment.etc."cni/net.d/99-loopback.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/99-loopback.conf"; + environment.etc."crio/crio.conf.d/00-default.conf".source = cfgFile; # Enable common /etc/containers configuration virtualisation.containers.enable = true; @@ -139,6 +153,7 @@ in TimeoutStartSec = "0"; Restart = "on-abnormal"; }; + restartTriggers = [ cfgFile ]; }; }; } diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 746139c4816..0e2104a20e2 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -424,6 +424,7 @@ in taskserver = handleTest ./taskserver.nix {}; telegraf = handleTest ./telegraf.nix {}; tiddlywiki = handleTest ./tiddlywiki.nix {}; + tigervnc = handleTest ./tigervnc.nix {}; timezone = handleTest ./timezone.nix {}; tinc = handleTest ./tinc {}; tinydns = handleTest ./tinydns.nix {}; diff --git a/nixos/tests/tigervnc.nix b/nixos/tests/tigervnc.nix new file mode 100644 index 00000000000..c0a52808b27 --- /dev/null +++ b/nixos/tests/tigervnc.nix @@ -0,0 +1,53 @@ +{ system ? builtins.currentSystem +, config ? {} +, pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +makeTest { + name = "tigervnc"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ lheckemann ]; + }; + + nodes = { + server = { pkgs, ...}: { + environment.systemPackages = with pkgs; [ + tigervnc # for Xvnc + xorg.xwininfo + imagemagickBig # for display with working label: support + ]; + networking.firewall.allowedTCPPorts = [ 5901 ]; + }; + + client = { pkgs, ... }: { + imports = [ ./common/x11.nix ]; + # for vncviewer + environment.systemPackages = [ pkgs.tigervnc ]; + }; + }; + + enableOCR = true; + + testScript = '' + start_all() + + for host in [server, client]: + host.succeed("echo foobar | vncpasswd -f > vncpasswd") + + server.succeed("Xvnc -geometry 720x576 :1 -PasswordFile vncpasswd &") + server.wait_until_succeeds("nc -z localhost 5901", timeout=10) + server.succeed("DISPLAY=:1 xwininfo -root | grep 720x576") + server.execute("DISPLAY=:1 display -size 360x200 -font sans -gravity south label:'HELLO VNC WORLD' &") + + client.wait_for_x() + client.execute("vncviewer server:1 -PasswordFile vncpasswd &") + client.wait_for_window(r"VNC") + client.screenshot("screenshot") + text = client.get_screen_text() + # Displayed text + assert 'HELLO VNC WORLD' in text + # Client window title + assert 'TigerVNC' in text + ''; +} diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix index 0f9b511d455..517a53a5fec 100644 --- a/pkgs/applications/audio/aacgain/default.nix +++ b/pkgs/applications/audio/aacgain/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitLab, fetchpatch }: -stdenv.mkDerivation { - name = "aacgain-1.9.0"; +stdenv.mkDerivation rec { + pname = "aacgain"; + version = "1.9.0"; src = fetchFromGitLab { owner = "mulx"; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index b6dea53012d..49205439670 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "4.0"; + version = "4.0.1"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "38381c1a382abd9543931f34d5ae1789c31ec1217a1c852b5c5c442ccaf97063"; + sha256 = "sha256-yhCAKlbLjyBywkSYY1aqbUGFlAHBLR8g8xPDIqoUIZk="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 11c141e9c55..36686655f36 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gnu-config, IOKit, Carbon }: stdenv.mkDerivation rec { - name = "cdparanoia-III-10.2"; + pname = "cdparanoia-III"; + version = "10.2"; src = fetchurl { - url = "http://downloads.xiph.org/releases/cdparanoia/${name}.src.tgz"; + url = "https://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-${version}.src.tgz"; sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80"; }; diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/applications/audio/crip/default.nix index c61f838bc3a..d635dce83f4 100644 --- a/pkgs/applications/audio/crip/default.nix +++ b/pkgs/applications/audio/crip/default.nix @@ -19,9 +19,10 @@ with lib; stdenv.mkDerivation rec { - name = "crip-3.9"; + pname = "crip"; + version = "3.9"; src = fetchurl { - url = "http://bach.dynet.com/crip/src/${name}.tar.gz"; + url = "http://bach.dynet.com/${pname}/src/${pname}-${version}.tar.gz"; sha256 = "0pk9152wll6fmkj1pki3fz3ijlf06jyk32v31yarwvdkwrk7s9xz"; }; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index dbf895ed02c..029710206f0 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # When updating, please check if https://github.com/csound/csound/issues/1078 # has been fixed in the new version so we can use the normal fluidsynth # version and remove fluidsynth 1.x from nixpkgs again. - version = "6.16.0"; + version = "6.16.2"; hardeningDisable = [ "format" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "sha256-1+P2W8auc34sNJdKHUcilOBCK+Is9GHnM+J+M4oNR3U="; + sha256 = "sha256-1rcS3kOspU9ACx45yB8betph4G0hso1OSJQRiabX6tE="; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix index 333c1d08b3a..a456d62e6f6 100644 --- a/pkgs/applications/audio/dirt/default.nix +++ b/pkgs/applications/audio/dirt/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }: stdenv.mkDerivation { - name = "dirt-2018-01-01"; + pname = "dirt"; + version = "unstable-2018-01-01"; src = fetchFromGitHub { repo = "Dirt"; owner = "tidalcycles"; diff --git a/pkgs/applications/audio/gmu/default.nix b/pkgs/applications/audio/gmu/default.nix index 3e2087162f5..b2b9f5e3475 100644 --- a/pkgs/applications/audio/gmu/default.nix +++ b/pkgs/applications/audio/gmu/default.nix @@ -5,10 +5,11 @@ }: stdenv.mkDerivation rec { - name = "gmu-0.10.1"; + pname = "gmu"; + version = "0.10.1"; src = fetchurl { - url = "http://wejp.k.vu/files/${name}.tar.gz"; + url = "https://wej.k.vu/files/${pname}-${version}.tar.gz"; sha256 = "03x0mc0xw2if0bpf0a15yprcyx1xccki039zvl2099dagwk6xskv"; }; diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index 520b55e96da..25ee53d3f43 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -1,8 +1,9 @@ { lib, stdenv, fetchurl, pkg-config, libjack2, ladspaH, gtk2, alsa-lib, libxml2, lrdf }: stdenv.mkDerivation rec { - name = "jack-rack-1.4.7"; + pname = "jack-rack"; + version = "1.4.7"; src = fetchurl { - url = "mirror://sourceforge/jack-rack/${name}.tar.bz2"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 2b4d413526a..95fc88a8696 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libjack2, pkg-config }: stdenv.mkDerivation rec { - name = "jackmeter-0.4"; + pname = "jackmeter"; + version = "0.4"; src = fetchurl { - url = "https://www.aelius.com/njh/jackmeter/${name}.tar.gz"; + url = "https://www.aelius.com/njh/${pname}/${pname}-${version}.tar.gz"; sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r"; }; diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix index 4d39616c99d..4cc0fec2e2f 100644 --- a/pkgs/applications/audio/mikmod/default.nix +++ b/pkgs/applications/audio/mikmod/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libmikmod, ncurses }: stdenv.mkDerivation rec { - name = "mikmod-3.2.8"; + pname = "mikmod"; + version = "3.2.8"; src = fetchurl { - url = "mirror://sourceforge/mikmod/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "1k54p8pn3jinha0f2i23ad15pf1pamibzcxjrbzjbklpcz1ipc6v"; }; diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix index bf0a347d14b..ba2a757e090 100644 --- a/pkgs/applications/audio/mp3gain/default.nix +++ b/pkgs/applications/audio/mp3gain/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, fetchpatch, unzip, mpg123 }: -stdenv.mkDerivation { - name = "mp3gain-1.6.2"; +stdenv.mkDerivation rec { + pname = "mp3gain"; + version = "1.6.2"; src = fetchurl { - url = "mirror://sourceforge/mp3gain/mp3gain-1_6_2-src.zip"; + url = "mirror://sourceforge/${pname}/${pname}-${lib.replaceStrings ["."] ["_"] version}-src.zip"; sha256 = "0varr6y7k8zarr56b42r0ad9g3brhn5vv3xjg1c0v19jxwr4gh2w"; }; diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index d67b4da5eb2..86c1f87f522 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, ncurses, pkg-config, gtk2 }: stdenv.mkDerivation rec { - name = "mp3info-0.8.5a"; + pname = "mp3info"; + version = "0.8.5a"; src = fetchurl { - url = "ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/mp3info/${name}.tgz"; + url = "ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/${pname}/${pname}-${version}.tgz"; sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04"; }; diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 8f9489befc5..44788467d8f 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -7,10 +7,11 @@ }: stdenv.mkDerivation rec { - name = "mpg123-1.26.5"; + pname = "mpg123"; + version = "1.26.5"; src = fetchurl { - url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; sha256 = "sha256-UCqX4Nk1vn432YczgCHY8wG641wohPKoPVnEtSRm7wY="; }; diff --git a/pkgs/applications/audio/nootka/default.nix b/pkgs/applications/audio/nootka/default.nix index 8b2284f9b30..59d58df8c8d 100644 --- a/pkgs/applications/audio/nootka/default.nix +++ b/pkgs/applications/audio/nootka/default.nix @@ -3,10 +3,11 @@ }: stdenv.mkDerivation rec { - name = "nootka-1.4.7"; + pname = "nootka"; + version = "1.4.7"; src = fetchurl { - url = "mirror://sourceforge/nootka/${name}-source.tar.bz2"; + url = "mirror://sourceforge/nootka/${pname}-${version}-source.tar.bz2"; sha256 = "1y9wlwri74v2z9dwbcfjs7xri54yra24vpwq19xi2lfv1nbs518x"; }; diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix index 8ca75eecde1..6c602ef1d03 100644 --- a/pkgs/applications/audio/opus-tools/default.nix +++ b/pkgs/applications/audio/opus-tools/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl, libogg, libao, pkg-config, flac, opusfile, libopusenc}: stdenv.mkDerivation rec { - name = "opus-tools-0.2"; + pname = "opus-tools"; + version = "0.2"; + src = fetchurl { - url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz"; + url = "https://downloads.xiph.org/releases/opus/${pname}-${version}.tar.gz"; sha256 = "11pzl27s4vcz4m18ch72nivbhww2zmzn56wspb7rll1y1nq6rrdl"; }; diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 25d7857c353..460b97479c6 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,10 +29,11 @@ # handle that. mkDerivation rec { - name = "qmmp-1.4.4"; + pname = "qmmp"; + version = "1.4.4"; src = fetchurl { - url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; + url = "https://qmmp.ylsoftware.com/files/${pname}-${version}.tar.bz2"; sha256 = "sha256-sZRZVhCf2ceETuV4AULA0kVkuIMn3C+aYdKThqvPnVQ="; }; diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 5a5671ec773..a1cba439c49 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -35,13 +35,13 @@ mkDerivation rec { pname = "strawberry"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "sha256:0d9asg21j9ai23sb35cimws8bd8fsnpha777rgscraa7i09q0rx2"; + sha256 = "sha256-OOdHsii6O4okVHDhrqCNJ7WVB0VKPs8q0AhEY+IvflE="; }; buildInputs = [ @@ -77,7 +77,10 @@ mkDerivation rec { ++ lib.optional withVlc libvlc; nativeBuildInputs = [ - cmake ninja pkg-config qttools + cmake + ninja + pkg-config + qttools ] ++ lib.optionals stdenv.isLinux [ util-linux ]; diff --git a/pkgs/applications/audio/tony/default.nix b/pkgs/applications/audio/tony/default.nix index aa18a5e397e..15c973a46fc 100644 --- a/pkgs/applications/audio/tony/default.nix +++ b/pkgs/applications/audio/tony/default.nix @@ -5,10 +5,11 @@ }: stdenv.mkDerivation rec { - name = "tony-2.1.1"; + pname = "tony"; + version = "2.1.1"; src = fetchurl { - url = "https://code.soundsoftware.ac.uk/attachments/download/2616/${name}.tar.gz"; + url = "https://code.soundsoftware.ac.uk/attachments/download/2616/${pname}-${version}.tar.gz"; sha256 = "03g2bmlj08lmgvh54dyd635xccjn730g4wwlhpvsw04bffz8b7fp"; }; diff --git a/pkgs/applications/audio/transcode/default.nix b/pkgs/applications/audio/transcode/default.nix index ff10ff13e19..7a7ec1e4188 100644 --- a/pkgs/applications/audio/transcode/default.nix +++ b/pkgs/applications/audio/transcode/default.nix @@ -2,9 +2,10 @@ , lzo, libdvdread, pkg-config, x264, libmpeg2, xvidcore }: stdenv.mkDerivation rec { - name = "transcode-1.1.7"; + pname = "transcode"; + version = "1.1.7"; src = fetchurl { - url = "https://bitbucket.org/france/transcode-tcforge/downloads/${name}.tar.bz2"; + url = "https://bitbucket.org/france/transcode-tcforge/downloads/${pname}-${version}.tar.bz2"; sha256 = "1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92"; }; diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index 6158f33713a..5f99555d376 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, alsa-lib, libxmp }: stdenv.mkDerivation rec { - name = "xmp-4.1.0"; + pname = "xmp"; + version = "4.1.0"; meta = with lib; { description = "Extended module player"; @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://sourceforge/xmp/xmp/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.gz"; sha256 = "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x"; }; diff --git a/pkgs/applications/audio/zita-ajbridge/default.nix b/pkgs/applications/audio/zita-ajbridge/default.nix index db6fc7d3381..873a294540d 100644 --- a/pkgs/applications/audio/zita-ajbridge/default.nix +++ b/pkgs/applications/audio/zita-ajbridge/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, alsa-lib, libjack2, zita-alsa-pcmi, zita-resampler }: stdenv.mkDerivation rec { - name = "zita-ajbridge-0.8.4"; + pname = "zita-ajbridge"; + version = "0.8.4"; src = fetchurl { - url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "0g5v0l0zmqh049mhv62n8s5bpm0yrlby7mkxxhs5qwadp8v4w9mw"; }; diff --git a/pkgs/applications/audio/zita-at1/default.nix b/pkgs/applications/audio/zita-at1/default.nix index 7a66ed42b05..8a629e145c4 100644 --- a/pkgs/applications/audio/zita-at1/default.nix +++ b/pkgs/applications/audio/zita-at1/default.nix @@ -4,10 +4,11 @@ }: stdenv.mkDerivation rec { - name = "zita-at1-0.6.2"; + pname = "zita-at1"; + version = "0.6.2"; src = fetchurl { - url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; sha256 = "0mxfn61zvhlq3r1mqipyqzjbanrfdkk8x4nxbz8nlbdk0bf3vfqr"; }; diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index d942ac768a8..ba029aedeeb 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper, - dotnetPackages, dotnetCorePackages + dotnetPackages, dotnetCorePackages, altcoinSupport ? false }: let @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { nuget sources Add -Name tmpsrc -Source $TMP/nuget nuget init ${linkFarmFromDrvs "deps" deps} $TMP/nuget - dotnet restore --source $TMP/nuget BTCPayServer/BTCPayServer.csproj - dotnet publish --no-restore --output $out/share/$pname -c Release BTCPayServer/BTCPayServer.csproj + dotnet restore --source $TMP/nuget ${lib.optionalString altcoinSupport ''/p:Configuration="Altcoins-Release"''} BTCPayServer/BTCPayServer.csproj + dotnet publish --no-restore --output $out/share/$pname ${lib.optionalString altcoinSupport "-c Altcoins-Release"} BTCPayServer/BTCPayServer.csproj ''; # btcpayserver requires the publish directory as its working dir diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 20b97972107..8884dc2fe14 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -85,6 +85,11 @@ sha256 = "0ksmby0lzgsxkv0xfzr840262kcqra9vds91mcx0rf20blksfvsk"; }) (fetchNuGet { + name = "Common.Logging.Core"; + version = "3.4.1"; + sha256 = "06h80c7l12nh6gnkzskcs4w8741xhprv72vf88f33ilzfy37h5jy"; + }) + (fetchNuGet { name = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; @@ -761,6 +766,11 @@ }) (fetchNuGet { name = "NBitcoin"; + version = "5.0.33"; + sha256 = "030q609b9lhapq4wfl1w3impjw5m40kz2rg1s9jn3bn8yjfmsi4a"; + }) + (fetchNuGet { + name = "NBitcoin"; version = "5.0.4"; sha256 = "04iafda61izzxb691brk72qs01m5dadqb4970nw5ayck6275s71i"; }) @@ -795,6 +805,86 @@ sha256 = "1asri2wsjq3ljf2p4r4x52ba9cirh8ccc5ysxpnv4cvladkdazbi"; }) (fetchNuGet { + name = "Nethereum.ABI"; + version = "3.8.0"; + sha256 = "10saq2qsqqgsf9d5cjji4lay74ydwkvkqgnns6gxikqicci8yx5c"; + }) + (fetchNuGet { + name = "Nethereum.Accounts"; + version = "3.8.0"; + sha256 = "03dq4l1gsd6r2hah5flas8d8pfys7hh5srd279kiidaaxrp8fv2m"; + }) + (fetchNuGet { + name = "Nethereum.BlockchainProcessing"; + version = "3.8.0"; + sha256 = "0sz6710a3rvzbj1ghx8dx9adfpsaydw8129c5nj2bqvvh6shi4ax"; + }) + (fetchNuGet { + name = "Nethereum.Contracts"; + version = "3.8.0"; + sha256 = "0989as81dqz4j0h8b5a9f5hnd4lrjdj851cfc4j5h6hd633a13f8"; + }) + (fetchNuGet { + name = "Nethereum.HdWallet"; + version = "3.8.0"; + sha256 = "0dy1bcm0gsp137286q3bx5q9gyd8lymrdmnh1ip3sszs5j31l9k2"; + }) + (fetchNuGet { + name = "Nethereum.Hex"; + version = "3.8.0"; + sha256 = "0sbi982jnfs39sp7w85wf8lb51mijpwr9mpsmws08zrm90n93kb6"; + }) + (fetchNuGet { + name = "Nethereum.JsonRpc.Client"; + version = "3.8.0"; + sha256 = "0gmdvsxhs398cj14f16r3dl8yv52iaxr9c9214k2ra28r14gfd1l"; + }) + (fetchNuGet { + name = "Nethereum.JsonRpc.RpcClient"; + version = "3.8.0"; + sha256 = "05k5f0dfcx4afbkc1w7cfnz514i7840j2haxyzsxkp8818yvfg0a"; + }) + (fetchNuGet { + name = "Nethereum.KeyStore"; + version = "3.8.0"; + sha256 = "05pj95vcfznlk4saq9dw19377gd1sqgmjcg5h92b5rzpgm9v811s"; + }) + (fetchNuGet { + name = "Nethereum.Model"; + version = "3.8.0"; + sha256 = "1qfhzqirj9bi49zb6rdcy7w5bm9jyv3a79q7crmgpq3qx4lmz5yh"; + }) + (fetchNuGet { + name = "Nethereum.RLP"; + version = "3.8.0"; + sha256 = "16142ag09h95394ip0ffkci09hchxh2i5xaw2rq46qcr8xd3kiym"; + }) + (fetchNuGet { + name = "Nethereum.RPC"; + version = "3.8.0"; + sha256 = "1m2p10dds1k0r3gci25lh6cxl9z7ciw18g6wwa4yqi1hsw7n59vb"; + }) + (fetchNuGet { + name = "Nethereum.Signer"; + version = "3.8.0"; + sha256 = "175acfqjqacc5zwh2kmrfnwd15jm3fjpv0xlgpyqry52mqxd9khf"; + }) + (fetchNuGet { + name = "Nethereum.StandardTokenEIP20"; + version = "3.8.0"; + sha256 = "0xqb32x5b9y9r380frhj52i1lxsfs92nfgcpmys3shjxz6fnwf6g"; + }) + (fetchNuGet { + name = "Nethereum.Util"; + version = "3.8.0"; + sha256 = "1ig1zkzpglq2q465n4c0ckv8w9gca9cfxz1qnrdhap0f1z90jyg8"; + }) + (fetchNuGet { + name = "Nethereum.Web3"; + version = "3.8.0"; + sha256 = "0n18chc9h1cxqp01kncik9lqfgiqrzl2zr8jgzbb05drlf6k0f3i"; + }) + (fetchNuGet { name = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; @@ -915,6 +1005,11 @@ sha256 = "1w6s9wjbsyvq8cnqknkdzm9chnv0g5gcsrq5i94zp6br9vg7c627"; }) (fetchNuGet { + name = "Portable.BouncyCastle"; + version = "1.8.2"; + sha256 = "0xqc8q40lr4r7ahsmzpa1q0jagp12abb6rsj80p37q34hsv5284q"; + }) + (fetchNuGet { name = "QRCoder"; version = "1.4.1"; sha256 = "1xgwhpqrm4ycnj8nk4ibxfwkmkiwc5i15l1za3ci5alghlpcb6ch"; diff --git a/pkgs/applications/blockchains/btcpayserver/update.sh b/pkgs/applications/blockchains/btcpayserver/update.sh index 9debe6780f2..082911b42a3 100755 --- a/pkgs/applications/blockchains/btcpayserver/update.sh +++ b/pkgs/applications/blockchains/btcpayserver/update.sh @@ -8,4 +8,5 @@ echo "Updating nbxplorer" ../nbxplorer/update.sh echo echo "Updating btcpayserver" -../nbxplorer/util/update-common.sh btcpayserver deps.nix +# Include Razor SDK packages in deps.nix +../nbxplorer/util/update-common.sh btcpayserver deps.nix '"/p:Configuration="Altcoins-Release" /p:RazorCompileOnBuild=false' diff --git a/pkgs/applications/blockchains/eclair.nix b/pkgs/applications/blockchains/eclair.nix new file mode 100644 index 00000000000..7b74512a388 --- /dev/null +++ b/pkgs/applications/blockchains/eclair.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchzip +, jq +, openjdk11 +}: + +stdenv.mkDerivation rec { + pname = "eclair"; + version = "0.6.1"; + revision = "d3ae323"; + + src = fetchzip { + url = "https://github.com/ACINQ/eclair/releases/download/v${version}/eclair-node-${version}-${revision}-bin.zip"; + sha256 = "0hmdssj6pxhvadrgr1svb2lh7hfbd2axr5wsl7glizv1a21g0l2c"; + }; + + propagatedBuildInputs = [ jq openjdk11 ]; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -a * $out + mv $out/bin/eclair-node.sh $out/bin/eclair-node + rm $out/bin/eclair-node.bat + + runHook postInstall + ''; + + meta = with lib; { + description = "A scala implementation of the Lightning Network"; + homepage = "https://github.com/ACINQ/eclair"; + license = licenses.asl20; + maintainers = with maintainers; [ prusnak ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix index e8c6d14b3db..c956bca9a1a 100644 --- a/pkgs/applications/blockchains/lnd.nix +++ b/pkgs/applications/blockchains/lnd.nix @@ -1,21 +1,21 @@ { buildGoModule , fetchFromGitHub , lib -, tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" ] +, tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" "monitoring" ] }: buildGoModule rec { pname = "lnd"; - version = "0.13.0-beta"; + version = "0.13.1-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "0fwidjkfzzd7k891x5z7jrx2arl0kwj6vm9z2acsyy7riv4zfjbq"; + sha256 = "07cs9yq83laajmfwfv42xfkfai3q873wg4qg7bfzw18w5fllivkg"; }; - vendorSha256 = "19myr9f5zh05y6lagd9pra60y8df7pz837310cbpq9a6zzwpdxk2"; + vendorSha256 = "1hk67x8nlc0wm1pg8k8hywih623p4c0klfhfyy26b7mqq62lazia"; subPackages = ["cmd/lncli" "cmd/lnd"]; diff --git a/pkgs/applications/blockchains/nbxplorer/update.sh b/pkgs/applications/blockchains/nbxplorer/update.sh index 5db2723ef8e..caab20c928f 100755 --- a/pkgs/applications/blockchains/nbxplorer/update.sh +++ b/pkgs/applications/blockchains/nbxplorer/update.sh @@ -3,4 +3,4 @@ set -euo pipefail scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) -getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix +getVersionFromTags=1 "$scriptDir"/util/update-common.sh nbxplorer "$scriptDir"/deps.nix '' diff --git a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh index 14b1687dfff..fb10446142e 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/create-deps.sh @@ -7,6 +7,7 @@ set -euo pipefail pkgSrc=$1 depsFile=$(realpath "$2") +customFlags=$3 sln=$(cd "$pkgSrc"; find * -maxdepth 0 -name '*.sln' | head -1) [[ $sln ]] || { echo "No .sln file in $pkgSrc" ; exit 1; } @@ -20,7 +21,7 @@ pushd "$tmpdir" > /dev/null mkdir home echo "Running dotnet restore for $sln" HOME=home DOTNET_CLI_TELEMETRY_OPTOUT=1 \ - dotnet restore -v normal --no-cache "$sln" > restore_log + dotnet restore $customFlags -v normal --no-cache "$sln" > restore_log echo "{ fetchNuGet }: [" > "$depsFile" while read pkgSpec; do diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh index 7a9262bf483..a9912b8b368 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh @@ -8,6 +8,7 @@ set -euo pipefail pkgName=$1 depsFile=$2 +customFlags=$3 : ${getVersionFromTags:=} : ${refetch:=} @@ -71,4 +72,4 @@ echo # Create deps file storeSrc="$(nix-build "$nixpkgs" -A $pkgName.src --no-out-link)" -. "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile" +. "$scriptDir"/create-deps.sh "$storeSrc" "$depsFile" "$customFlags" diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index de1dacd50c2..5c96a328224 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -1,32 +1,68 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake -, qtbase, qtscript, qtwebkit, libXfixes, libXtst, qtx11extras, git -, webkitSupport ? true +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, extra-cmake-modules +, qtbase +, qtscript +, libXfixes +, libXtst +, qtx11extras +, git +, knotifications +, qtwayland +, wayland +, fetchpatch }: mkDerivation rec { pname = "CopyQ"; - version = "3.13.0"; + version = "4.1.0"; - src = fetchFromGitHub { + src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "0qssyavx0dkgsyj2myqg8n7sih8niy960nyb1yknsbjm37iqraah"; + sha256 = "1iacnd9dn0mrajff80r2g5nlks5sch9lmpl633mnyqmih9dwx2li"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; buildInputs = [ - git qtbase qtscript libXfixes libXtst qtx11extras - ] ++ lib.optional webkitSupport qtwebkit; + qtbase + qtscript + libXfixes + libXtst + qtx11extras + knotifications + qtwayland + wayland + ]; + + patches = [ + # Install the bash completion script correctly + # Remove once 4.1.1 is released + (fetchpatch { + url = "https://github.com/hluk/CopyQ/commit/aca7222ec28589af0b08f63686104b992d63ee42.patch"; + sha256 = "0d440d0zsdzm9cd0b6c42y9qbrvxg7gdam0qmif62mr8qa0ylidl"; + }) + ]; + + postPatch = '' + substituteInPlace shared/com.github.hluk.copyq.desktop.in \ + --replace copyq "$out/bin/copyq" + ''; meta = with lib; { - homepage = "https://hluk.github.io/CopyQ"; + homepage = "https://hluk.github.io/CopyQ"; description = "Clipboard Manager with Advanced Features"; - license = licenses.gpl3; - maintainers = [ maintainers.willtim ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ willtim artturin ]; # NOTE: CopyQ supports windows and osx, but I cannot test these. # OSX build requires QT5. - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/inkcut/default.nix b/pkgs/applications/misc/inkcut/default.nix index 4ca373ee275..300423cb7f6 100644 --- a/pkgs/applications/misc/inkcut/default.nix +++ b/pkgs/applications/misc/inkcut/default.nix @@ -2,6 +2,7 @@ , python3Packages , fetchFromGitHub , wrapQtAppsHook +, cups }: with python3Packages; @@ -17,6 +18,11 @@ buildPythonApplication rec { sha256 = "0px0xdv6kyzkkpmvryrdfavv1qy2xrqdxkpmhvx1gj649xcabv32"; }; + postPatch = '' + substituteInPlace inkcut/device/transports/printer/plugin.py \ + --replace ", 'lpr', " ", '${cups}/bin/lpr', " + ''; + nativeBuildInputs = [ wrapQtAppsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/rm-improved/default.nix b/pkgs/applications/misc/rm-improved/default.nix new file mode 100644 index 00000000000..0a1d38f5f7f --- /dev/null +++ b/pkgs/applications/misc/rm-improved/default.nix @@ -0,0 +1,24 @@ +{ fetchFromGitHub, rustPlatform, lib }: + +with lib; + +rustPlatform.buildRustPackage rec { + pname = "rm-improved"; + version = "0.13.0"; + + cargoSha256 = "0wgpr6gx9dpvf02xgvrdbyiqfz1k9vipnvriz3jg0cz7n1afqisj"; + + src = fetchFromGitHub { + owner = "nivekuil"; + repo = "rip"; + rev = "0.13.0"; + sha256 = "0d065xia4mwdhxkiqfg7pic6scfzipzmsvvx7l6l97w62lzpiqx3"; + }; + + meta = { + description = "Replacement for rm with focus on safety, ergonomics and performance"; + homepage = "https://github.com/nivekuil/rip"; + maintainers = with maintainers; [ nils-degroot ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index 860e8f8adb5..20b944efd5d 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -21,7 +21,6 @@ python3Packages.buildPythonApplication rec { blinker natsort # extras_require - boto brotli feedgenerator zopfli diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index ee781c75e69..812c9b72f99 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { srcs = [ (fetchurl { - url = " https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${version}/${sourceRoot}.tar.gz"; + url = "https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${version}/${sourceRoot}.tar.gz"; sha256 = "0fwnxshhlha21hlgg5z1ad01w13zm1hlmncs274y5n8i15gdfhvj"; }) (fetchurl { diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index 13b09865c6a..5994df7c559 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0yfzr80pw632lkayg4qfmwzrqk02y30yz8br7isyhmgkswyp5rnx"; }; - phases = "installPhase"; + dontUnpack = true; installPhase = '' mkdir -p "$out"/{share/vue,bin} diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 602e2e6a829..6398b82dbe3 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -88,7 +88,7 @@ mkChromiumDerivation (base: rec { license = if enableWideVine then licenses.unfree else licenses.bsd3; platforms = platforms.linux; mainProgram = "chromium"; - hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium") + hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium" || channel == "beta") then ["aarch64-linux" "x86_64-linux"] else []; timeout = 172800; # 48 hours (increased from the Hydra default of 10h) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index d7b14cb4ba6..71887b8b85f 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "92.0.4515.101", - "sha256": "1jcas265hhlqd9f63h4zw4n4xsl26c5zmjlmbf1px5icvcjfb2xd", - "sha256bin64": "0sb5l5nzfzisvrnhcfwhdh9rn6z6pkzqz4p92c40q2mlhmjrfhj0", + "version": "92.0.4515.107", + "sha256": "04khamgxwzgbm2rn7is53j5g55vm5qfyz7zwxqc51sd429jsqlbf", + "sha256bin64": "179i18lckd85i6cc60mqpvv2jqdshc338m686yackdgz9qjrrlwd", "deps": { "gn": { "version": "2021-05-07", diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 12c76c8e4dd..5813868286a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,975 +1,975 @@ { - version = "90.0"; + version = "90.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ach/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ach/firefox-90.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "b21effb602d202574d3498a2a1d4d381f1581eb794691123fa00eb25adb21b5a"; + sha256 = "b985849c5109b6a9992ca0fc4699b769af37c84f1aea5fc6c1b66845f51da83d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/af/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/af/firefox-90.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "2ee727fe495f586ca0f825e1bbadd4d737b1c6e4050ad1e77f3cb84cd9d50e3a"; + sha256 = "7ddb078a80b7991576f691a1c3bc76635621aa13d64c465651e16ae4dade7436"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/an/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/an/firefox-90.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "f33700fc2178d6ea0bc6bd47cf16744a7551e3987abe9cd9bb891cd48a019000"; + sha256 = "dca47858177ed263332c7cb093e3285b5c8f61782a66cf683ee52896c3fc76a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ar/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ar/firefox-90.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "5633334afb6a338a861b665c78209ba13558c0b6dfab44f80cd690533633575d"; + sha256 = "2249834099e5cc9a5feb0b38bdc277e5e3f65635b1a1179afe1240113f0ee1d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ast/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ast/firefox-90.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "98fff4f8216441b7b404dc00ca4bbd3b8161514dde85bfe56c23ea15a20c1ba6"; + sha256 = "7ad21576299643e480922a2a7b6077a0edc84d362e33bb8318b33d04133a7c7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/az/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/az/firefox-90.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "02a48160df4f22842f09bbf54190ed91f83f0b0af9b15134ce6f83a163de8891"; + sha256 = "10eabc925d651985229d6bac1c34b12267a31886f5354ba943178f6a2d0ef04a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/be/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/be/firefox-90.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "1848205609b3bb57a84fb2ddd002e57868dce7f2046a4603e2058fb4bf6b4046"; + sha256 = "d1e6d939233b23e5378161c79f338e66c010056d9d3e619b9eb6c26dc4461724"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/bg/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/bg/firefox-90.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "27a40aba90c5b8ef51d2077770ee0803e0d8327db36d1f95a463c54ca74a7536"; + sha256 = "d59e69127462aa3efff558d5cd5035951dbe54161f913dacb4142a8bd3f258fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/bn/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/bn/firefox-90.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "490da4669e9711bbdb309abba2251b88407ec843065b5c81e61cae5be59d8e9e"; + sha256 = "56ca1d7e84ada3f0124e36186a32dfdf287547bdc8d3b111baf9407fedf0a7ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/br/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/br/firefox-90.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "be50bcfb6bfc9144cf690165801abc294dfa9b67597d727f7707025b8a61be97"; + sha256 = "33a6ceb6d37b73d03fe5a6e93e19e29346b2861ee69ab2fffd6cca4a2dbaf40f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/bs/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/bs/firefox-90.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "90fcf0f8a7fa13ca4157ec710e06053485df7e47264ba46bebe4551154244b89"; + sha256 = "7c853a13afd74307e7a468b85ed430b20f1622dbecb697b8c80945ccea9f0805"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ca-valencia/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ca-valencia/firefox-90.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "bb32faff40658d974d9f1909ee574043c3501d7d5149629a8abce919aeb37232"; + sha256 = "0aa103c471b3f71ef638cbf9e8f83447875ef5cd96bdc8535435188510272c65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ca/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ca/firefox-90.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "bd5b977e54ee504dce9aafcb093419b23da0c85ca1f84c6c0060014d3ec3b32a"; + sha256 = "4672d9fe667f72de45af1eb6a205792440afa9de86eae1f33426d3b948fbc841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/cak/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/cak/firefox-90.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "aa2e5b116ebfc296cfb6522b2b35bf006cd2d4154b04d20ac4c6a720fad90008"; + sha256 = "7b12a52926888f52957a75f639f09094dc4cbc18a1c6d14bf433028461c4a71a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/cs/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/cs/firefox-90.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "ec9b5c46617f9ef8f29374793c8a5f272d370b9e974d004ec0db85a65b5a76d3"; + sha256 = "7dfdf0c4c740dab356205c52384faf61e9963a42675031f0292be1c0f4e402c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/cy/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/cy/firefox-90.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "17ef10b7e321db0374c87595d13e4bad57707902dd02a4a20e7f375ff328b905"; + sha256 = "ad7f76b997bced6df5c240273fb736fe7dcb0c86ae867a5cbdb5097dd5c382ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/da/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/da/firefox-90.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "46d83a4256eb11f5db42039184e0ed138280f21ecdbafb1e7533399cfd58f88d"; + sha256 = "9f59ff2eec510b75312bcbe29e9706fe0710f300c12e33200937571414254d31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/de/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/de/firefox-90.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "b4417505454008a2722c691c9006450d90ec80c7461eaf0ecb9b4f9cc0883ed0"; + sha256 = "c838f9238939cc8e91fff903a231062c03388c2202e273f7b99701415a8f3f22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/dsb/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/dsb/firefox-90.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "8eec9d5753aaa92c31fd52556595c9fb5889f36904cb05722bb2d727fa618941"; + sha256 = "5370c32283f8bf7fc3273dbe3cb5c77db829723a39401b00f0e8f70c9f3dba91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/el/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/el/firefox-90.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "ca3e4958df9aedc5e6e1f5a9a8778248cc8b3f8b988b143aa2da94a8fbc6b3af"; + sha256 = "2af4feceeea5c0932935d91c22df516ae2e25d9006ab41ba6274783b74b3a5e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/en-CA/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/en-CA/firefox-90.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "341f133b3787746993df3e9176601b485bb7a0a16c7a294e7de64f8af39c2ac7"; + sha256 = "e805c2eebe0c9892082b900af2bd1511264ed5fd5d47864ca5a8fc3e6c0a05de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/en-GB/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/en-GB/firefox-90.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "13343f3cb63be5c02ee7c8d6883ff473681bff8f55377f74095768c87109f620"; + sha256 = "2d888fdd72a65137790b10f02056d6194fd9c374cc6ff09cf7217cfbb84e2d7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/en-US/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/en-US/firefox-90.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "29fd51b6316d1e589220c2f47e5ff7cdd996cddd450f64ce1dd28ed0e8e4e8fa"; + sha256 = "998607f028043b3780f296eee03027279ef059acab5b50f9754df2bd69ca42b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/eo/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/eo/firefox-90.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "41c9ed4d9da13fa798e6d75e67b854b84fa0bb76a0771d387a1cf3261838408d"; + sha256 = "3fee8ee742d6ebc03a6fd66404979b7e2fc823757801ac205ca291c249f7b31c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-AR/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/es-AR/firefox-90.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "8b5c954f4942834a93424b2af17e01f1bcea3d07e1ac404cb205b7b53094088c"; + sha256 = "854cf81090ccdb2f8d4ccf0729c7228c2945626a56d1cfee524f927c5bb67c47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-CL/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/es-CL/firefox-90.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "cdd4eefae21d33263feb67f020e727e4f9d569a49a0311483f24837a19a88c49"; + sha256 = "c0b92a9e2defa74171c880be9ed84f12ab946d4d9af888d7d9ed735114968fb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-ES/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/es-ES/firefox-90.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "7cc98380be959aa6375b05b7861e0bd29ab0c2f87824fe0a7a4d0655fb2daf6f"; + sha256 = "a2fcc7126f6c5b6edf162357ddf7493df2873ecbe36d74a176c3924b877c4448"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-MX/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/es-MX/firefox-90.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "52ab52d3c2d92cb7919b1505f1a72a2a066629f1adb45600c08b5f1a7df7b714"; + sha256 = "fd27c822086cfdd3636d1edd0afb62be22546d2dcb86d968ef4e1875acbb66fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/et/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/et/firefox-90.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "aacc5ae2e7750d917e117349183afe8f166f4f51ff7c442f205e119c60faec7d"; + sha256 = "13f34d32f05de7d77d4ffed59a00d539cc819edb3ad9ab52d1a77d9f92a05264"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/eu/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/eu/firefox-90.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "c6c9276e9e4ac8f34005f6cc6c6fc8d1ec06a25665d9564e864fd77faf0cf777"; + sha256 = "b53133754eadfd473a68b0647bbf3ada70ad46cd0820ffc94b96ca0bd259db62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fa/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/fa/firefox-90.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "a1253cf75cbb09b9aed574464285360c6f4bae185ca2ec0e4ee28ecbe2582c19"; + sha256 = "048ab2377915cf7efd4daab495873f9c1282f74907bedc22093b0cf17cc3b301"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ff/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ff/firefox-90.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "e7a13e96f1f231053de8599d1a1b75ffe0d10a2303938ffb74b5bf0ad954da41"; + sha256 = "99de5853888020d6435e8a369eb8b983fe4374e754451dabc2785b9ab2d5bb24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fi/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/fi/firefox-90.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "0e7651b6c88fe0308490d716193a16ed6fcfead4f490f299047604c49662a56b"; + sha256 = "03513b1d725a6f5ffa243fe38e19a66c2850d849c09d7b80c3ba17fcb3012b17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fr/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/fr/firefox-90.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "72b35bd4c84d3ea42c40873500177c0cbde37e5ebcbc49c2dc2c5f436d261a15"; + sha256 = "350c5ded72a988773acdb3411f0d9d1ecfdd79501cbc04a9ed8777ada8248ae5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fy-NL/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/fy-NL/firefox-90.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "62aa9cb69604233483bd7d510980f4b6a1c96874e98effa9d4179b150f4118a1"; + sha256 = "026a5a3e8140110c830c237b1dee5857d07c9eacd1e803d0f5b054afd0d5d06b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ga-IE/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ga-IE/firefox-90.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "159dabccaab426c9aade1379be14874b04ee099752d38bbf0bca5db6b82dc4b1"; + sha256 = "1b522979314c1c672c30da02ea7d38f94ea811df91d86b8327836937069ed956"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gd/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/gd/firefox-90.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "26b2deeeabf6fb49cd87c138a7c5a1142358db743f2a55468374ad63ff7f60f7"; + sha256 = "d6830e901c20477dd4121cd3a0f918634bc3107d799eaf4439b9ba036acd88d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/gl/firefox-90.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "31cd8e5029cbad931492ab3dcc0abf9b194e08292f4ab7876ebf662ab707bea7"; + sha256 = "f25adcd9c7c027a7e531a9072201f174cb69e30c30dffabfff4d0d8e12250f68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gn/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/gn/firefox-90.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "ccdd7ad239105e642a721a44737165bb075f1e6db74733fc2f5b30c863b8222e"; + sha256 = "a0df03aa486320a1fbb554a5be600067d2447af0a63726290f2c7d599c9a9534"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gu-IN/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/gu-IN/firefox-90.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "a25562ca23e69f03f2d6d106afefcf11c5770820aed885a8efbcef001c256fe0"; + sha256 = "daf1ba05f971b8b8f04da9085eefb03ad15fa5bf6d637ad1bcedb94665bb150d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/he/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/he/firefox-90.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "e28b51837f7a9c8b8ac4a62bc5b7ac6c834696c8c41c7609b77c9d2807bb05b0"; + sha256 = "cedcbd2e76bf371ed8daefd100631e0381470b3980946e033b39a2b94035a55c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hi-IN/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hi-IN/firefox-90.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "8e6a5104be7e05a58e01acae446294d7459289871213e62e26d59076619f674a"; + sha256 = "d0d6ba66c59fed2c33d9e21c9015b40743ac7e4305b1055f39b909754af984bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hr/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hr/firefox-90.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "e2d7f357b9574e0892d3cb8672b43ac9532e59c32f9eba0e36bac32d65fb0c25"; + sha256 = "11ba8ffdf88bbaec536e4a362dd40f2eb535edb652fb01587ed46ba09fa7f17e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hsb/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hsb/firefox-90.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "9039cd192bb39e3b4a828fdea48630f8e113f54db87644ecf2b3c84eb8201990"; + sha256 = "d1e1fbba7748ffc2c0f92e4be4dbe346359bc145fa2dc063ed4660d14ffb0b1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hu/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hu/firefox-90.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "98550b7e259df01476dad15cfe8bb3ec055e1ff57041ae73d09156671dcfdf6f"; + sha256 = "ba8d28151ddd5e02b530b653f5bf5de9dc97669355a8b6370e5067527f22bf34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hy-AM/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hy-AM/firefox-90.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "74d34585f9ff86fbd5bf68620964bdad82d7f5b5e0cf7087b12cba3fcc795271"; + sha256 = "df7d7543013687f02a88f9e6d52d4bfbb46c6ce6646bfbbf86571d7473be2554"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ia/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ia/firefox-90.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "fa705d3b2c9dde9e0cd190e183219f879d72a57f7a1209a293a1bf74cc0a86d8"; + sha256 = "1df0469ba5a368bf5ddd323e68ab458d29042b85e471bb7e20dfccefdf086ba9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/id/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/id/firefox-90.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "23bda2ac0b1026bd3443f89e78157cbe47807ae2e0316d68804fd734ed6e196c"; + sha256 = "fee462d383763763a6034a452150166d507d424e303b114b68bb13b6779605d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/is/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/is/firefox-90.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "257dbec349ed5368a10463a1cf1e21d03c1eac1ed3b093a54b1f28e274ec575c"; + sha256 = "86568d6afaed2043d916343c565689047246ff3dbab5e6d928e5a6722f8d093d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/it/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/it/firefox-90.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "ff19dbc318739dd11cab9424b5058a6ca8396d6988723a4a3d8b72ef7095713d"; + sha256 = "36e5dc00b8f9bc3fdc91441c0939eae5d43356ef0268c2bebea1d087f5d414e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ja/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ja/firefox-90.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "3c3003bf0366ccfe5b6e964720411e06d5622fb5e76ab7f0b2f1d06bb92c8e44"; + sha256 = "b07f66b82be0f6f716384c37286205be455c83d8c9299456376d171167269903"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ka/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ka/firefox-90.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "70b53851ec2b8e512fbafee0d87b0dd32123019c1ed798f4b03b08fed790af68"; + sha256 = "5b391f01586ca70900ce279de8f3e22c670de5b210f350bc8bf82c75dd47e0ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/kab/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/kab/firefox-90.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "175f112e07f75bda7e42291779655a18601f50c81c84d529874baf3aa1c5bd35"; + sha256 = "a833e4c862c8805d4a1571b210de928f5d4fd6e7973d1de5e7ac1e8e3877b722"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/kk/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/kk/firefox-90.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "7aa1edddf9f1d55aa307f8954b0a4043fa8f27243331d97ffb21ccbab4439a3e"; + sha256 = "5041bbd4acba0a2710e705798c8196605c62852de8a1c43f3676631dba5369a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/km/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/km/firefox-90.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "45d013eb6a15558722b9633bbcfbe38c74f20964db716797b4c5358a31596b55"; + sha256 = "f71888db4e4cc49172d625cca26b5b72c6d85180894f29ee0b934781f0f6efff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/kn/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/kn/firefox-90.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "19f7cf799760e51d852981d1217f3303f347631bdc484d44293a85fbe16a2752"; + sha256 = "7d32dee56e657d791eb80e6829ad2ff3624d949531bff1366b685924564d6534"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ko/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ko/firefox-90.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "c2a1aca33c678e225cc66f1f363f666313d41de5629575bccc3244b2246a517a"; + sha256 = "f9f0781ca8eeb1b21060a3cc2df8f8f5fecd659a230fa4f5f2907db5c37fe6c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/lij/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/lij/firefox-90.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "6645b96ea75cf11afa03d7830fcaeb3cf40ae62a34cd780d703632b04c1c70db"; + sha256 = "0cff9a886e2d158ff00638200106d6537a254cc5a64e48a8233770e5798c1ca5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/lt/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/lt/firefox-90.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "c4c9b1c346a2e18d813302094c5048b758db64effd0276fb453d77f76a3795c6"; + sha256 = "69c8e5a6f5c3d2435ed6dd02bc1c4b9264b1543b7763ade3accf4f30eea7b9e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/lv/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/lv/firefox-90.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "3cd2b96471ce03fcc7ce0217ae68534d0f891cbb21c7c325ff37f02e8a96f310"; + sha256 = "55b59adc86e9e91f5a134bb16837c8843449f4dfc85abbb3f292bb34214bbca0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/mk/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/mk/firefox-90.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "95de1a0db3f284e23741f39c9de13acdb2cc8aa3046387f2c923b2fb41ea9e85"; + sha256 = "d670166e34e513ff4dac69740f547542e4e2c3e24f7ae7d165dbe5a4151f17e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/mr/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/mr/firefox-90.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "6336fa56e8eaefc5f30934cb1232bc9b4c5a4a1070612026fd4eaaf79a763af2"; + sha256 = "9cd258a90e1a12a113e626bbaa4d557936b29b71491138e73f74ebf6645a9b76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ms/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ms/firefox-90.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "1efd8100aa12bc3b2c304837b16638bd23fcc1bebbd1b7cdaf8f07bb642eba09"; + sha256 = "0b68ba835ae0f3561eaa2721de08bab95946c1e1111b05f8b02cb7f95bc23335"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/my/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/my/firefox-90.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "4b9dcf5f8d476ff931a497acfb42747b3b788a031d156b1444126fcece789d68"; + sha256 = "071df9d8ee0a5d1e3b3ae8f472173b5da378b6b41646a3d1d2222a3dbc73596a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/nb-NO/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/nb-NO/firefox-90.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "81c5973aa829b52c2ebb3ebe35a355bd65c5e803dd5b02fbfcdb58cad56d768a"; + sha256 = "2623cb59780a1db3cc20267023c93f578ad4c6cfede8b12416f538d62ffa930c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ne-NP/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ne-NP/firefox-90.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "ca1823de015e593f89a78a578fbf136748ae9e56eeb819773c32fc4d21169398"; + sha256 = "a6c6c514cf476bd93d64c1e315161d765792528a632aa881a75abb85076ac998"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/nl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/nl/firefox-90.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "253e19bbca6cdae42673b2f102bf930531a72a6d67ef3c0a93e2c415fefa18e3"; + sha256 = "60d7de62f35cadc8bab987bf81fe6d8635388b361f3157e5d13809604cc41927"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/nn-NO/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/nn-NO/firefox-90.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "248d44236b2111f0aa8b49ac97e17353740f983448dc0b5085efca9ca1401ed8"; + sha256 = "a1b0cebb8de16685011e5cded38add6a3b13738163dbcf6216182b350c293f27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/oc/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/oc/firefox-90.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "85414645c073035536a940f2e2daff958d25213aae01dd5a8617019f5315b9e7"; + sha256 = "f4f491e962ec713e708e9f773de3af9f6251ab6f2f41f516116f83a63824928a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pa-IN/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/pa-IN/firefox-90.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "9ce28522a04464bec876d301380f991e3543e2eb9fabe294066e23ee1a1ffa87"; + sha256 = "5a41333ed465121d212ddc6c61faf2a5c4eab25daf0ec3206196077f490a18e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/pl/firefox-90.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "6a05196e0b881ca19ed405cd42d3dd377a22e0cc7788971ca3fb3ddb6da5c73d"; + sha256 = "de5d8c3e5b8f458c400a98c1b72595ff951a54083ff29e1bf01fc3421443cbd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pt-BR/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/pt-BR/firefox-90.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "e15e7fee01afbd4b585aa74b5de4efbbd2e30cc4e9e87911c4707760c6a8d198"; + sha256 = "53fb72801cc33ded2e31142161faaca04ec5f7742413faeada30e1c5ef51025b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pt-PT/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/pt-PT/firefox-90.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "f76da7fb580424c0d1326f2daf40ba4f27083447bd7051fc77e6162caadd5292"; + sha256 = "2c72ac24a7cbdb79b338ad9a79f649be85caa0377b78fabcf07c42b1ef02a94e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/rm/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/rm/firefox-90.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "55b0aa8f6dc462190a01f3385ff36cc813fcbd071d0e024c388efd3f247b22f0"; + sha256 = "bfd252411406e6a8816ef000fc6fcff6357741924754daf05ee39ff331bdf3e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ro/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ro/firefox-90.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "4d245e0e633e741bf0438603fd0ac76030878bccf69cc28509c018514fbc55be"; + sha256 = "f4c9a173ab7e9fc964f4c255ef9830559fc835d1f18ac388de5fa16d2df5d521"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ru/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ru/firefox-90.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "5687877a5e8dd4c5eb9dcfbde681f1d6fd9997b562d44592956ecc86024c8806"; + sha256 = "07d1c8cd10323f039a040295230f223e9e6b40860830b2e26a0ab9fd2c15d0a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/si/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/si/firefox-90.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "4843700d73e84099cbbca968d2d251fbfd012d3230735c22f8dd8e39edb57ed6"; + sha256 = "6f816e89adaabb79ff1b73eed516e6c5f817d7af0ccaee58262ea47c80a08664"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sk/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sk/firefox-90.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "26bf6c61cf9388f3c0f83362a3f6e744cde8aef12bf48de4e5da0debdd232a4d"; + sha256 = "14fbd3f2057da82c95e2cd194021adc3c7c19b0f64cd56e623ae2341b7414301"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sl/firefox-90.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "65578af61cfde136408690f38867b141d48205514398af1b7f2771f6c219c513"; + sha256 = "388ef17576722a32d22350ac2848c8e7f0239481f1d0172441770052bf1c53d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/son/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/son/firefox-90.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "69d59e4ef8dbaabdf86acd7fe413b0fc3532b13cffd67cb0d122c08e72f234b9"; + sha256 = "f7785fc5a91c991c277b36eca1928c350953043e77cdb4b47f25d5f2f611828d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sq/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sq/firefox-90.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "d8bc0fab11d1d3641159dcbe0248d1987e6d5a25cb45acde769c3c4632f6364f"; + sha256 = "cc0f348c99304e0da47bbc4be45bc350c53574ea1e20d781f88862e5add4c60a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sr/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sr/firefox-90.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "7ea2ff12e6df802e98cef89aede582e3c6ee800e51c4d5cd6a9ba6a7aba0e4a6"; + sha256 = "6824091ffb721ff42072798cd72c3061921eb69f85a710c141407f83ddddd836"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sv-SE/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sv-SE/firefox-90.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "e4924167458d6b1251956de695c610bf311047a2b3cce4cffc3b09bb026c07c0"; + sha256 = "3d86180707aa4f2fbe271e9d8fdf10ef5cd52126648a64e684214f159cbc7512"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/szl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/szl/firefox-90.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "4904579fff0628ba012f269c9be0123f06fe8d414066fa3f52fd28832d6f004e"; + sha256 = "e49776c7820b51648c8e2d19f5e8073515fda5397adae3302383e9f503240e08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ta/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ta/firefox-90.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "9611d0624ea57ead7eb9b889faac6a166a1581c64e0fcf8d89e1ff3c6f43c963"; + sha256 = "d8b32890c9ad376cd9122ae6e80d1dc65c0b8be1e5dd4c7381011b1059dd8bbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/te/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/te/firefox-90.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "d06b945ee1646a37f347f438dcc5cfc2ca34e520fda7e5119d076a35a1636537"; + sha256 = "87974e3cf5214db7f82244b43a584f3cb11d4ba66ac45dfce1d22f417fd63185"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/th/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/th/firefox-90.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "4e0f715b9df45ed6e5c469d31e886184ab3712d65ed9b5f09f930de55bac7cae"; + sha256 = "1d65c868936bd174ae9ecac66e1c1bc30e4b1214aaa0a2762dfcda6929eed1ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/tl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/tl/firefox-90.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "ffb9acf1bdc1470c5d077707a38b8b754b638297bdcae51ecd985faed50d0c51"; + sha256 = "115ecf4d90d13df1352637c9ed6d1701b6a9d0793d3487d582b90d487e27b52f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/tr/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/tr/firefox-90.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "58a4e1b95887aef20744113cc712961cd331afe7b32c9fce9ae95cd10036a075"; + sha256 = "d66f4114e577e945abbb1b32206b2cddff65db1f9a2b1cbd1c8a11e528ce656f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/trs/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/trs/firefox-90.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "f517e93f9819e008f224078af54c6b080e5022cdfb84ae13e16a65368cf3c971"; + sha256 = "1dc6d43229d0912d34394889deba3d91796ac4aac437b7ed86065d978871fbec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/uk/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/uk/firefox-90.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e6f29d8f6e7c92b5c911444c869173a8991bbab60e13c2279c1bb8139bf7d3ee"; + sha256 = "1795fbe577dee1bc042a7b50bceb958446e7f6c95133c2d1432f1494ba86b6a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ur/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ur/firefox-90.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "bcc00d70f7ab06bd024053d5f66d6363f8aaaea65be089bcad99fb0dad2d978c"; + sha256 = "1da88a58d6262c4b2866e765efae0ccc23ff224ed59d5f9a30434a16408b17d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/uz/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/uz/firefox-90.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "62d8ff68b7c144610c05300fcc8072b832c5ca3ea3b0da3f197f04c1c352114b"; + sha256 = "549956dc6ac0eab50becf7562e91a17fdc3f0244197379f03bbdb2b12f2ecaef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/vi/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/vi/firefox-90.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "152b2c3e4b66d5056cf02d6a0d88968da0d2d0d7983ba4a90b17937c752dbc68"; + sha256 = "3e9575342f30b81bebc730c855b54120c95e385edf9273e5355f857da81d55ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xh/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xh/firefox-90.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "bbd12d232fd53c2ca879b55f19abce804ad14da4c47ee11c2723f37f166d69fb"; + sha256 = "d2e7dd3cbd70ef34c53bcfc5b3427508ed368cad548afe0509ff7149a6472ff8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/zh-CN/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/zh-CN/firefox-90.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "44f71d53e7055b19617b66985f583b44b3d8aa6b63621a8ce34cb2f33e2c35fe"; + sha256 = "a65f4a1002422a07083fb8566e3129f781a8083d9427ba4236812204c953a5f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/zh-TW/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/zh-TW/firefox-90.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "23a5054f37211f0b4637baa7b17c0b41cbf16f8c30cbb7c00d486698a98150e9"; + sha256 = "e5f1c0d36c7a4b3634858d691c5f26481018ac4ce7c5ab7a4c19e04b33810941"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ach/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ach/firefox-90.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "985bb9b46a2767f00704f7dbf43ffdf650fa70da1b5c82b66bae9b3ed8e53ec9"; + sha256 = "b5908565dea1f33f82d8e380bb5d648fab9ebcb4af24d602a6c71e176fee5007"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/af/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/af/firefox-90.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "2b9ac10fca0815b755c89eeaaec3db597bd7eb56294452c715615bcd9edb685b"; + sha256 = "d40bd877e5ad156a45c0c325794537ef9dd71770a395aeebf8381075df0c74d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/an/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/an/firefox-90.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "cd6aa9c8b5e384c36f35c4620954fc29facc9e82600f1fe759bcf239bacd5cb6"; + sha256 = "c72b84b92239955c750cdc302cfed32c7ed1a1352a88b5f599b4edfaad79fdf6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ar/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ar/firefox-90.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "c6a75b71f6c24f05a92608401b70ce4b3e91f83f7511eeed0b7dfb91ce52ab22"; + sha256 = "25b4175421efe766e7be49591c04b636699bc685aee6459c48b19fe9aaca07db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ast/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ast/firefox-90.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "ffc9f0b54fb7df8398e5ccedd75902d4872b2b735d79189e2e00bc519b7914be"; + sha256 = "d7919de20cf70de38f03e508b6ac5728b76ceedb626636cfed74c4698ce4dbc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/az/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/az/firefox-90.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "3843e554e11c687e9d0676ed9ed06c11cc6eb571287430cbe8ab26b4c2553e63"; + sha256 = "addbe7fa0121dc3643afde905bf33b764d36d49a60ccf6c427ab97ac941ce9f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/be/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/be/firefox-90.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "412e6a776fbf1cd698092bcaafe30a652a8ab35b72e3edf4cffd0b7438c091c7"; + sha256 = "db52de7ce7236110b28322996303e2a07f69b88eb53393aa4ff75dd841b02aa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/bg/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/bg/firefox-90.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "142d1db515272948aa7788403be55080471773d835476a532fd0e44f08a223c9"; + sha256 = "2abe8c91ce73f350e31de13807fcdc48c2621a29fe25d17ed25a2fb8052ce831"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/bn/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/bn/firefox-90.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "75531cdc30d0c9173ab8d8113ceb9897373f7808e1019834545f0130ebbb8ee9"; + sha256 = "2b5f6e1bd73eda0fdf69f6d8181b83206bfbcfcb5edb11be12f2a29e6ffd4a37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/br/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/br/firefox-90.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "20e76daf7a280c5d50c9a937e409f25aac7f0ee3254f9145605ee00d00316d5f"; + sha256 = "53339a26816934aa1f5edac114844c42b7107326f114ba28818700ae8ee199ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/bs/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/bs/firefox-90.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "1bc0fd2a8ec265d59594bb298cdb51f5506b56e40e5dfc0fc66a37e3d4328e5f"; + sha256 = "d49005f911a027a7628f45103ad2e43438a7ec33142f9a5ec7738a8694d071de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ca-valencia/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ca-valencia/firefox-90.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "dfffd0c2b98641944d74486de4d9f08c2e76b30506942021a5263d1238ab07db"; + sha256 = "ccaa99d7eede57e43c57ab2a185a53061476cedb65f37d4659c1e765297c937a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ca/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ca/firefox-90.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "bcf3b78bcb2bd133ad66d551695d372d099d250e01d790f48bbd69b46c07abd4"; + sha256 = "b4df85c3f723a3e8c44d249f12f37bd27eeade4ec802baccf2e82a92e9869002"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/cak/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/cak/firefox-90.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "e27cc065df6bc8ff338a34c97d9f6d4825d711b77bf24e5f1d16ca68dffd6f74"; + sha256 = "a8e1244c9904e3f5bada11c33f2f542b6dbb5ccb867f7cc6d5a2d1a99e95c48d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/cs/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/cs/firefox-90.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "f25b02aecf709edfd75ceb2faa01979e99ea2a88e981c0d3fa5dc118eca77a5d"; + sha256 = "b2cbe665a6b2482edbe29b50036922708e7bc7aaad65ef6d91b47beb4f53acbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/cy/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/cy/firefox-90.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "d9f09d6c812740f077234dcd5f7caee7be17569526b215d4ebb7d987b8915b47"; + sha256 = "5e151c341812dcf8bdf769ba0a1ae9ec03b3e79d5f55fb18241ab0ef907538fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/da/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/da/firefox-90.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "604342f07532112ca7ad6c8a1d6194dc1487a3f0a05c9785f4d252d6359996c8"; + sha256 = "ebcb60a77185d17114c26d58a61a3a3ef5198709c43133263efbe39c05275dcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/de/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/de/firefox-90.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "c2383d7801ff0fd4a111c49d82d7b41f140f1974d20c8bcbfc745b76a78f24f4"; + sha256 = "8819ad2efc7d49946eed2adbb10280602d0004722207cb46e06f46f4fb0f80d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/dsb/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/dsb/firefox-90.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "9972aef81947ebcd09349776a01f7335c41971ac72d2ed806cfd384831b35623"; + sha256 = "c91e40aed7b1c1c41ebe0cdf77e46cb284d7cd308c6ae66a70f46fc4dab008a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/el/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/el/firefox-90.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "942285c706c4321dc6c4578e665edc76523e46f98aa89521f4276bdb2736f610"; + sha256 = "f9032320f0fd0622c9e6ad048de12533e92660bf56e255d2f79fc0c2adc3356c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/en-CA/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/en-CA/firefox-90.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "71b236a224823a13ea1b0f144217a735e76c4d25b2725591a5aaea068d1a9808"; + sha256 = "9224c71771b26085f067acd29993e48aea66a61c7ae193bb6442569b9291677a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/en-GB/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/en-GB/firefox-90.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "1c9f4c7b35faa87d7c1b046abd629e2d4305ff8769f986a4e1def8e381a0ca94"; + sha256 = "fd27cadfa31f81d7103f867aea3efb6f03f341708c4ed93df5d6d8fba601c1eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/en-US/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/en-US/firefox-90.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "f983e7537f54131697366c0926b6aad8045c2f1e16c78a0d5edb392d214e535f"; + sha256 = "1043cc2125aa682953340fb40b721b3dcffab1ad0c06184fc5a92740638d4a13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/eo/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/eo/firefox-90.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "90f713f53326849e1b41c7aad160eb5828e4a06f2e9f11918ba61b9ec4d29fef"; + sha256 = "1dd42f52563463c146ddef224f97b6e87f82f01249f7bea290a4cb8331dc9fde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-AR/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/es-AR/firefox-90.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e9abf48307351d5461086d34cd765dcd5af38eac50dbaf3833ddcdd5432908c8"; + sha256 = "fae114afacd99e045abad6dd5a6d4ad5669b00158431ea8458d48e43aa06d4af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-CL/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/es-CL/firefox-90.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "04797e8c12c08eb25f8048f0a653380582cff4f193d03e8e6d3e0d66cf1e59ea"; + sha256 = "1a4b839f8b55ef758c56ce18770cc31e871278e58f378fa7e7cbf4502e3b930c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-ES/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/es-ES/firefox-90.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "1f655463e919d3546a841e86e3aac0bb6b4bc3482153a24d6afaf4eb4f09db0d"; + sha256 = "cc21e66b7c7250d57067c8fc133a8b6f4a4f4020474bb7d4510c94ca02c316c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-MX/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/es-MX/firefox-90.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "3e9b14809de0df3d1f5c0d7bb83f9a769fb5852194511b1cfc33275ca1bbed41"; + sha256 = "cfd89dd866f633359c57af8915586abc7d3bedcf2523bf60f7878d70417c09db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/et/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/et/firefox-90.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "918f284c60618404b7f8130b7e14a57d4ca483adeb6007a79422e6fdb7908114"; + sha256 = "6e678eeef5ebe30b6005533e69ebbc4f096e3a1e2fc07be8c8f1cf3d1b5c1b06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/eu/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/eu/firefox-90.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "5f682f553356652d92684dff3f8385d1d675539d6cb8b155f12874682c0de235"; + sha256 = "4fcab02f0a755db4baadd5e04fe9589226b0082768ef58e32680a72a86ef52f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fa/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/fa/firefox-90.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "5056f42eaef5f5538bfa9af23e123bf9f0a0d370d6fd7848dcdbc50d0cf61d92"; + sha256 = "bd7500a850ae6c4ea9702521716336bd2809c8e3fc058ea021ee27a1b6d40aa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ff/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ff/firefox-90.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "cf58279f578ef725e2b89ed4a89021a811b3e237d46d02c7d98137fef3775318"; + sha256 = "76b4327258aedc72fcae8b56dc5dd0c99952f0a2021252c5d0e36d1366b68016"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fi/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/fi/firefox-90.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "28bd2f67ae638fd602adac6327fe51ebf90ff52c8695e8c8ff4161d6bc20be2b"; + sha256 = "4500cd834525149ad46b94a7b86ff776511f3173a48064ed88d6b2e67596dc68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fr/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/fr/firefox-90.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "53b69cbc6cd3097b67537979637614a6bcc01450426883b7d35a8de5df6647ae"; + sha256 = "85313248992ddcc04bc5b72802929a2c601daae07d5e6d8a11c762159caecf86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fy-NL/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/fy-NL/firefox-90.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "8ee8e11a845a2e2b0f9d12d95f8dcc6b58be2722a68f1a8707b0c1f3a66f90d5"; + sha256 = "ba0d003e88355027ccf1be545555e68e06a19e11b7090844707e0053796f2a1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ga-IE/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ga-IE/firefox-90.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "39a2bbb6c9a3b3a0ec2c21eeb9f919a54502f891834556ee439704af3705f3fa"; + sha256 = "52f94cb53101e4d2564cb4f4589cb2246a4c78314e38e3d566290adf43f40e74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gd/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/gd/firefox-90.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "b667e68662d81518f03ffa0bab538d4601457b6b1eab1f51dc0be3752855d5ad"; + sha256 = "0998440173e3b5886ff3a356a79fd05e7ea113cab4582a9400abad44ecbf6c48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/gl/firefox-90.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "65e9376490e6ee833312b99aa7d8f730495f8320e14203a8d6cc7a94e83e6adc"; + sha256 = "6ab3ef1a97c8382160420f563c814f14610f1a0d4565ef8f86b8c8ddbf34e162"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gn/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/gn/firefox-90.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "45f3da559b51c5ec300ac64f8d5f0e7583c55abfca4c22e72994f65682d0717e"; + sha256 = "f57a5d2ed2b9eb8d35b9bbbb9f76a988409db09c7855d6cb93abf151f8e449c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gu-IN/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/gu-IN/firefox-90.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "db1394cf1c52fc0eeab116d49fff3bbcef07f64870345490a1f46f3045268d94"; + sha256 = "eb62873a8c7e2b5b706cd0033b5042a4f4496c265f7e57e1c65f23e3fc896a6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/he/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/he/firefox-90.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "52b49a0014fa2aad266f2503b6e455310d37af0d93102f22404b303de6afe772"; + sha256 = "6c22304604f9e93153d55251e31bb250168015a4ac6c3d93cffcdd9c64ece7e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hi-IN/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hi-IN/firefox-90.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "59484d61d3d4802f9389d668f6125299ba072077a87a16d9b09f9780e975d120"; + sha256 = "155f425d7d9b867acc7035d1220f60148fb94c25dd51ee7049e9c2e9b096a0fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hr/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hr/firefox-90.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "292ac6975f6319c0b4274fbe64bd9512a8361c254f82c079e8ac75c974839316"; + sha256 = "96faca700f49d3f8d9337f0f4f820f8a5a6335b06348b835bd39a26619e4efdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hsb/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hsb/firefox-90.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "81bcc94349b7b83533b5a60d3f8bcef9b3fd0d85628ce0f043013a4c7fe0aacd"; + sha256 = "42ce59b460cf94705f88b80c91705bba81142798803bb1d7a3a0bc34dd96a7e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hu/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hu/firefox-90.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "1c5867bd108e9232472ccdec0bc24a6558d9a5a6d9147d0c44a4fba2c44ae01a"; + sha256 = "804db507b43af04716bbb4d53525aa9b2958b1d3ff08b93812f1d78531eb01da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hy-AM/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hy-AM/firefox-90.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "de35f4653730d253e5bf147e65ec1f8680ef1fda008f785eb3e49831a00d8b4d"; + sha256 = "488e6bdd3d36490a33d5794f5ede500bad29cd2014cdd50ab5edf74c829fd424"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ia/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ia/firefox-90.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "5ea51c02e6f41291da5840d511bf4ad743e475d6d35fbbfa76c4df3e8f45fb50"; + sha256 = "fd3f22e1247b394b654c12aed384c515a390e91651bcc66f3823205c67951287"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/id/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/id/firefox-90.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b9ebc450eb9097902f13c7c30e45a361ade71b99b273d0da898301d3e9bdae36"; + sha256 = "2a197f4f2aa069b888ad9bfaa54da1b3bc461309a2f0475c298b7e501f06e6fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/is/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/is/firefox-90.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "64f7480703eb13e9ba4f12615bd84dead1322d139af1115813b7ab8e6819190d"; + sha256 = "b215c19156d129ef30c2d5b30d723d3923e57658888736bd31d3c7fd4a30f835"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/it/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/it/firefox-90.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "3f314ed7442d57345d6d1b368dd55bb9e2dd966e269e56d5ea2abfd9140aca67"; + sha256 = "f94a4ddd3278993c80e776849cd52721f40a2808a41f37c74f34ef4b7deea972"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ja/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ja/firefox-90.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "7cbd06ee69dec66522d35163427f8034bd3ee928aa6bd3c5203f3c9a5e526018"; + sha256 = "4b22759406f177c98ee2496ff17de565f87a0f566e3759ce030fd757c1555e32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ka/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ka/firefox-90.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "81575f637a65d1d31503967b380b3337a8af532d5ebd3bc7d35026c37831d50e"; + sha256 = "7e602c099b680f1da42030067988f818e954ec4b02ddc6ec5473e02402a06428"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/kab/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/kab/firefox-90.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "bb84536e819cd77b4d45786982384821b7d08dda48fc8fa3f0e12e90e75a688e"; + sha256 = "92d0441b33b179d515c88711bb13684e37c748a938d818723256092930428dea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/kk/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/kk/firefox-90.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "ced99ad16e7b84fd1c344ff2ad96715e0654ed6cfa0cf6379179bdabf5cb0443"; + sha256 = "50a44e34e2a12ba6357f62bc82d9de9c5250c6e3b5635c81724d0a96f5111436"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/km/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/km/firefox-90.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "f2641008a2bfd95467b274419d4305014b8b3e5c75622d30a46c5eb9ad761990"; + sha256 = "de8bddaf5a937bfc5bc21897cf95b3d40068133df4c9edfe7eb9eaf76d23e17f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/kn/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/kn/firefox-90.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "5bcda92360ae86a1ed015736847e7d43eac239a6bd995fc932259f169a7f3821"; + sha256 = "86e88fbc62e131f6b6a599575f5c507385251e7d03a114b61e8c1b78c4a8c22f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ko/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ko/firefox-90.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "5be9eaa06a7e35b1d401643601ac7e212489609c52961303cb8fe054bf698190"; + sha256 = "10e0169e337cbef4a33e227ea57ff517ec570997fc471509ff95f098cfb52b12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/lij/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/lij/firefox-90.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "01baf23ab6d89adb3eed47b9f216a0b17b8bc8850b10d09c2bef10792fb1d76a"; + sha256 = "3e054180575b29c5afb286f6d7e8453bc8d4bfaf1ff5d8ac5fc53757b9dc48f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/lt/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/lt/firefox-90.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "a5f8a4fa438fe054d1e8d09ced0079673bc25431aa9cbc6b36ca2e5a1dc58d72"; + sha256 = "79685f8b0d646dc6fb446a85808e22107760343a63be429551866a22581106da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/lv/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/lv/firefox-90.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "8ed19c630ad2cabdd374d2499ddda0ab8993a79c50e7e6728081a6842d1f68d2"; + sha256 = "4df1044be63e35775c89005cddba209760b169be29a3e49d3d29bc370b11dacc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/mk/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/mk/firefox-90.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "cb497f4b8f1766afdeed4e351a597bd1da4376c78cdb4172d4815c055583ef4c"; + sha256 = "8040fd3637b5e25215e1e50cb74b6f25736f78d610cc862eef08b5a7e4905f2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/mr/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/mr/firefox-90.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "0e03049ef7efb5c78963b4f718a61469cb6b1931313ffb50d3e4484b6cf14837"; + sha256 = "49b9eddd2dff87a631ad143e66019d52574ea16b136956e4da473fcee4b810ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ms/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ms/firefox-90.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "1a92300fdd218d1fff96388794cea650371c0b1da72b20b22d6deaef7a794c24"; + sha256 = "629d480a6cc207b558cc2aff169225ec636c3d5656b0d04d34b60f8235151bc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/my/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/my/firefox-90.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "066061e09aace32d8a7a67499a75aeb143ef1e474e8ce37131e6c37472704169"; + sha256 = "25b330fa564734cd9ead80a58a770a6453d64483cd448dc8ac93e70a2a06a04b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/nb-NO/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/nb-NO/firefox-90.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "12771de667402fc8d8d782ad1b799cc20974f2ee6dba8db87b39f319e6752dc1"; + sha256 = "4d2a0b7101197a603c136b7476e6887d6d9731bbb62e5176ad9876039cc7e166"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ne-NP/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ne-NP/firefox-90.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "d2d8610eb11fe1aeb948a2ad2b580a396450c92458a9b4cf6cc2b3b051e6b7c1"; + sha256 = "74c9685da27d362a2729303ddf451f684be097d3ca74bf3596585a869921a881"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/nl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/nl/firefox-90.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "99c76cd723c19c6a2192de4f588557060284185047e4597c067e35ba623f01f4"; + sha256 = "a10dc5b62f058d71b3dbd8cb12083fc583528b1642d4f2bccce0f1a422147c7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/nn-NO/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/nn-NO/firefox-90.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "5e25d25ae36bbe8346aab027ad684fee3766a1b79c9bf86a370b91e36ab417b9"; + sha256 = "479c022dbadf9b10b2c37577199c3f4df714501502bc894c63efde9358b59745"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/oc/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/oc/firefox-90.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "462c07c7a8864711c0309fa0847bbb993eee518508dbb5614571f994f2241099"; + sha256 = "3b702fcd7972cc48151498783e8d0129766fa7adef311369acdba7902bd08f19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pa-IN/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/pa-IN/firefox-90.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d1b1f53ed3aa7bd139541e249f29e6672c30d5f88eb980be793b6c6622338eb0"; + sha256 = "69727d81e5dd911bfa426f3f66385caed061e3b22825eeea270925e6d7997a03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/pl/firefox-90.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "b63144adb425b8477f3b8c9026ea3a1168fb3af513d25d5594b810a0aa4be831"; + sha256 = "29d59a753381aed8fd4838cf6da0a43389b1dd408988ffd4e97ec3262c1ec75a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pt-BR/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/pt-BR/firefox-90.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "218108b556c88c9d4ce6f0cc37b3b45dd5b03e7beb591ba0c52aa257d17c54db"; + sha256 = "6ca5bf042fc2a94dd229303cec352ec797e8494ca58b12a337997b8289dff78a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pt-PT/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/pt-PT/firefox-90.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "96600b7012300cfea1ede41e2c3ac9756cac3981691908e8b2e7c2624eca2d9d"; + sha256 = "50e682cf9bff2b4202ee4c9e64d5efcca66acbcb74d4074ae5d571875cd0f509"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/rm/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/rm/firefox-90.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "93bf70fc04f53f779335db31a264a0298188459aa3687d15c7b890199dfd76fc"; + sha256 = "983c8fb011f348b6de1665b1347cdbda23fe130ea33c7c58a49cd417d0419cff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ro/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ro/firefox-90.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "bd38c728d06513f3b8fc0ebcfadce3e3029a5779f0c745085d52d823075f0266"; + sha256 = "1f2ff5fe5d65f5f143e89e258a247291d10c25ee2270607250817187353bafa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ru/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ru/firefox-90.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "abc35efade33dc03e6a4ce093d5995e79daea3383c8a4a4b63d83f8336ecfad1"; + sha256 = "3a2f872bcdd7736c1e528d306cb9409826c4958d1e8aea627ef0e2c26b7d8889"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/si/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/si/firefox-90.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "201dd56f43db3862243b41fc5b41eefba737d91a05826d50e922f206bd6f6906"; + sha256 = "cfb67ee121130d9ea92af43e33751c31f778f9ff6f9beca2dc609ef5340f09b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sk/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sk/firefox-90.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "fa5b0d2d00c146ffc0fafb760e870db3133d9b387d383f34099e7e5446986169"; + sha256 = "c045f5c48e3f3f9b20229e744b85920e47e3858f97262ab4d3a8fd61db80da40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sl/firefox-90.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "84900580af3f7b7b10481f6acd42bcf30b98ffa5af3b80cc020f4217a150252a"; + sha256 = "ae3bf5e327c4f4fb7a36b8367539de466acf8f60f40e9deee3bd4928959f0111"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/son/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/son/firefox-90.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "122f4a2f50a5bf38e59fd7ea1fc5eaefa8f4dd55a603220a272a32252d6b7c80"; + sha256 = "a7d7f7d1ffdc9126f04f8f96001bce26d21de0e0c65dd1fd00f6f85f75976ba8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sq/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sq/firefox-90.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "b829a9b18ca57b53b029841812ce6bd4400f3df60d71980258b9a8e7f5b4c33b"; + sha256 = "2982b315ab29ab375d77b1093c53a4a207f36a2d9a40b34aed3376ce96ce5dbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sr/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sr/firefox-90.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "523bc6ed11bd320067361f8be81b0c0793618e376be9a8ef1a7a513b544a279a"; + sha256 = "0a2a702216adf7c98ddb19cebfea886b5d0582523ca64f2d7c8656ec663aaf6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sv-SE/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sv-SE/firefox-90.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "8c8a7f21fedf76d294a1521f4c786c944498e98567c969c9e1455f6b2a535022"; + sha256 = "dded767dd98cc3725044c988354842086768bf9a35eb316111df96368a95900e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/szl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/szl/firefox-90.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "a1530e1ad9eef4cad401d0374db80593a3960feca67715d352aac51c66dc0415"; + sha256 = "4ab8b5112cdfdc051a65b5cd562015bf85e11d5ccc0773111439cd469e175c33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ta/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ta/firefox-90.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "0d4da9f60ffaa360424e73120a782d0480d52227e8b110a1eafdaeb0e6f47092"; + sha256 = "0240cb3f5357a213f622f1c708e2116db4a4271f4b36135d6614bacdee88f00c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/te/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/te/firefox-90.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "fe7cfd5db5b98a9245fa30a8970a729497e563ddf5511609d7930537b5586f2b"; + sha256 = "83b5ed844b16f6b9108432a692bc0895d733de03701ab800bb330d06796176bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/th/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/th/firefox-90.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "1c1a643ea94193bbb063e35921db54bcb6b6333fa06b2de6b91c88ecb888e868"; + sha256 = "faedac7df604ed9cd321a655d27ebf313c08b085c4eeecc310a94c3afd979b6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/tl/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/tl/firefox-90.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "89ec5b3f116c6e86bc8e003548c9be2772b7d46c86233b87e96b579d5d7d8851"; + sha256 = "5abdce18c7b0e53f5efd00aa0381c6e90f669c51dcb4c021128a0e7a0a86223e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/tr/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/tr/firefox-90.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "03a367c5f7b52a8e8e863ea108485dafc0232e5dea5da538a3a632e8ae5de454"; + sha256 = "92fd9bb4aef9b723b00cb84ffd253b81d5c86b2bfcefad93e948e443d871bd95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/trs/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/trs/firefox-90.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "85d3ba651e9f39a76f2ef1d92d6ce34ed792f6477848b7e75a806c699c72c3c6"; + sha256 = "291c64e95d8accc64fd83738a9b7060122e713786cbb360acbd26b5ed0dc3793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/uk/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/uk/firefox-90.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "90649b7b2cad702b53b7b63fea7e72e666bad605841887bb42d69d487a561678"; + sha256 = "163de4dd52684912f794c1f9c35b003f9cd38acf1be3bc68f42b2da9c1e13fce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ur/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ur/firefox-90.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "9b9c80716edc99a3e0b7bec2da38a7391798d401734fce4d1bee60f0c71a18ea"; + sha256 = "72ebffebcaf8848c5a9cfbc6c9e33cd1a7bfd62b7689f938065730249506a6eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/uz/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/uz/firefox-90.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "5b154b4f8c036ed7c62bf123e0802f2318cfede67bfafe9aa86cda7b2650a2b2"; + sha256 = "f9c56e6adfa9a0e7289e2a80f88869ebb1556843c940574cfcba4295aac464c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/vi/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/vi/firefox-90.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "8c3b943e33a1f33086fcce734e183dcf96cd29be0daedc1b4a1f4cd068aaca8b"; + sha256 = "f15136e2e432ae999df5efda82d44c2c61cd680995436cda094bd2fd705e541b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/xh/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/xh/firefox-90.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "c43f991777a8fbf8372f1928a465de170b25b07ede53dfb0adc83af18fd11e02"; + sha256 = "360623cac6e11c9179f9c08f2f7f3eb844c3671b8f26a2680e097e1c84896b06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/zh-CN/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/zh-CN/firefox-90.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "1b8f9f96ee1d59b92b974f9f18639c7e38cd3124c5fb2f9ba7fd44ceb5c532a0"; + sha256 = "f69c7f0fad2bbefbe477ed7ee5414dab2c9ab14e1009970eca07092357cfc7ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/zh-TW/firefox-90.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/zh-TW/firefox-90.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7a6b520e84e7f5cbf372f1482e4b138a7bf785215776f193e49b30c3860e3625"; + sha256 = "612abc1a9b8b116753ee1417d774fc2ea2f2f931248c57ea93c32ee1c534f9c0"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 8799764fe21..091ca7b4485 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "90.0"; + ffversion = "90.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "233ad59e4ab2f08d2253b49235b51b26fa32fb7c285928110573ccbe67c79965d9401a6c58a3af2ad22b8a58ca5d9b3154e3e8c9d29b153acd16152d9b75442c"; + sha512 = "9f87c3f3dad33e42a7a9d2161d7f23ff2e7184b2274f9081511c7982957ae9954784bd844a2348ff4744231415aac195d1f12971392db90be0375b4738acb590"; }; meta = { diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 6afdf61886a..2cd3ee11d27 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -52,14 +52,14 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.2.1"; + version = "29.3.0"; src = fetchFromGitHub { githubBase = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "0djjl79jrnny16p32db5w7pwwv0a24dc8mg1s1bnavhlvmmk52vq"; + sha256 = "1q0w1ffmdfk22df4p2ks4n55zmz44ir8fbcdn5a5h4ihy73nf6xp"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/browsers/telescope/default.nix b/pkgs/applications/networking/browsers/telescope/default.nix new file mode 100644 index 00000000000..fa9b3853a9d --- /dev/null +++ b/pkgs/applications/networking/browsers/telescope/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, bison +, libevent +, libressl +, ncurses +}: + +stdenv.mkDerivation rec { + pname = "telescope"; + version = "0.3.1"; + + src = fetchurl { + url = "https://github.com/omar-polo/telescope/releases/download/${version}/telescope-${version}.tar.gz"; + sha256 = "11xrsh064ph1idhygh52y4mqapgwn1cqr0l3naj5n2a2p7lcsvvw"; + }; + + nativeBuildInputs = [ + pkg-config + bison + ]; + + buildInputs = [ + libevent + libressl + ncurses + ]; + + meta = with lib; { + description = "Telescope is a w3m-like browser for Gemini"; + homepage = "https://telescope.omarpolo.com/"; + license = licenses.isc; + maintainers = with maintainers; [ heph2 ]; + platforms = platforms.unix; + }; +} 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 d1830f1c52f..ca57c27ba50 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -88,19 +88,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.0.18"; + version = "10.5.2"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "15ni33mkg3awfmk3ynr0vi4max1h2k0s10xw3dpmdx6chzv4ll14"; + sha256 = "16zk7d0sxm2j00vb002mjj38wxcxxlahnfdb9lmkmkfms9p9xfkb"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "16lx8wkxli1fzq5f6gcw3im4p8k3xdmnmf6w0p7n8hd8681b1w5s"; + sha256 = "0xc3ac2y9xf7ff3pqrp5n6l9j8i5hk3y2y3zwykwhnycnfi6dfv4"; }; }; in @@ -311,6 +311,13 @@ stdenv.mkDerivation rec { # chance that TBB would continue using old font files. rm -rf "\$HOME/.cache/fontconfig" + # Manually specify data paths (by default TB attempts to create these in the store) + { + echo "user_pref(\"extensions.torlauncher.toronionauthdir_path\", \"\$HOME/TorBrowser/Data/Tor/onion-auth\");" + echo "user_pref(\"extensions.torlauncher.torrc_path\", \"\$HOME/TorBrowser/Data/Tor/torrc\");" + echo "user_pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/TorBrowser/Data/Tor\");" + } >> "\$HOME/TorBrowser/Data/Browser/profile.default/prefs.js" + # Lift-off # # XAUTHORITY and DISPLAY are required for TBB to work at all. diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 3c69fe05cfc..f3da9705795 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-jzLffTAGlNeglzoJ3AG4d0pwrkXmT5ttJxr2z4MwP90="; + sha256 = "sha256-MHERRJ9t7EG4sd4gevUnZLA25UnRqZprCXFWkp5roms="; }; - vendorSha256 = "sha256-q/m1H6gcnn35ULi+e8fVuJg8eIXhzizGwXJmyf1Hfy4="; + vendorSha256 = "sha256-lzRIXZXrNQOwgl774B9r6OW/O8QwykSk3Mv5oGmvDuY="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 2dfbac5c5ac..2a66b391ae8 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.21.2"; + version = "1.21.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-GAX8ODjGj5LM44KgJC0N5uuOH4z33lDWoQgImOl8/xo="; + sha256 = "sha256-GMigdVuqJN6eIN0nhY5PVUEnCqjAYUzitetk2QmX5wQ="; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 418f3259178..4909d734ff3 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cqIIpdkQ6DF7DKXvwCoJBQKG0+lL8iP/Vx0q7rL8prg="; + sha256 = "sha256-uYiGerxZb5GW1dOcflERF3wvgJ8VOtRmQkyzC/ztwjk="; }; - vendorSha256 = "sha256-0+k1e7Sn+NYGAJDVUbUm0oedc1t2blezUhsjDIuIKvA="; + vendorSha256 = "sha256-kGSibuXutyOvDkmajIQ0AqrwR3VUiWoM1Y2zk3MwwyU="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index 26967b7ed85..55f1a5a2c09 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal"; - version = "1.10.5"; + version = "1.11.1"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - sha256 = "sha256-+rU/Tn3k/VmAgZl169tVZsRf5SL4bI9r3p1svVfKN2E="; + sha256 = "sha256-upoWftm82QBdax0lbeu+Nmwscsj/fsOzGUPI+fzcKUM="; }; - vendorSha256 = "sha256-jbQPhGfZPPxjYTSJ9wMLzQIOhAwxJZypRzqwL421RfM="; + vendorSha256 = "sha256-eO/23MQpdXQNPCIzMC9nxvrgUFuEPABJ7vkBZKv+XZI"; # Errors: # > === RUN TestNamespaceHandlerGlobalNamespaceDisabledSuite diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index e7f8a9e7726..9d8a0d68e75 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -21,13 +21,13 @@ with lib; stdenv.mkDerivation rec { pname = "profanity"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = version; - sha256 = "0a9rzhnivxcr8v02xxzrbck7pvvv4c66ap2zy0gzxhri5p8ac03r"; + sha256 = "0xmzsh0szm8x3hgw65j0cd2bp8cmrnq5pjz49lqajircyzflsngm"; }; patches = [ diff --git a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix index 18264c5c6af..ffd30c754b4 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { src = notmuch.src; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontConfigure = true; + dontBuild = true; installPhase = '' ${coreutils}/bin/install -Dm755 \ @@ -36,7 +37,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit version; description = "Mutt support for notmuch"; homepage = "https://notmuchmail.org/"; license = with licenses; gpl3; diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix index 3e2231c10e8..f5641c762ec 100644 --- a/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/pkgs/applications/networking/remote/wayvnc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc +{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc, wayland-scanner , pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml, pam }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0q48fgh6gf3jicy4bk3kq18h9lhqfq9qz32ri6j9ffvbb8mcw64s"; }; - nativeBuildInputs = [ meson pkg-config ninja scdoc wayland ]; + nativeBuildInputs = [ meson pkg-config ninja scdoc wayland-scanner ]; buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml pam ]; meta = with lib; { diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index 1ca22cf769c..9b3f42dd4ba 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -1,29 +1,28 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: -let version = "2.7.1"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "logisim"; - inherit version; + version = "2.7.1"; src = fetchurl { - url = "mirror://sourceforge/project/circuit/2.7.x/${version}/logisim-generic-${version}.jar"; + url = "mirror://sourceforge/project/circuit/${lib.versions.majorMinor version}.x/${version}/logisim-generic-${version}.jar"; sha256 = "1hkvc9zc7qmvjbl9579p84hw3n8wl3275246xlzj136i5b0phain"; }; - phases = [ "installPhase" ]; + dontUnpack = true; - nativeBuildInputs = [makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' - mkdir -pv $out/bin + mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/logisim --add-flags "-jar $src" ''; - meta = { + meta = with lib; { homepage = "http://ozark.hendrix.edu/~burch/logisim"; description = "Educational tool for designing and simulating digital logic circuits"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 5ecde839606..5270cac5782 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "6.5.3"; + version = "6.6.1"; propagatedBuildInputs = with python3Packages; [ appdirs @@ -12,10 +12,13 @@ python3Packages.buildPythonApplication rec { docutils filelock GitPython + jinja2 jsonschema nbformat + networkx psutil pulp + pygraphviz pyyaml ratelimiter requests @@ -28,7 +31,7 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "a06839346425c74542e6e2e6047db3133cd747ef89e1ebd87dad1fbba041f62d"; + sha256 = "91637a801342f3bc349c033b284fef7c0201b4e5e29d5650cb6c7f69096d4184"; }; doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix index aa40291790e..b559a85d44c 100644 --- a/pkgs/applications/video/ccextractor/default.nix +++ b/pkgs/applications/video/ccextractor/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "ccextractor"; - version = "0.89"; + version = "0.90"; src = fetchFromGitHub { owner = "CCExtractor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-847yt6pUTsDnVbrMQQPJ0pqu6UnKmYmr8UtR8+TP11A="; + sha256 = "sha256-NVFCwUZZVt8GrWXWyvoF8UrUZ/ix+GWubKtc3218k7o="; }; sourceRoot = "source/src"; diff --git a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix index e3cf4621ca6..784e0f7faf0 100644 --- a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "2.6.17"; + version = "2.6.20"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "sha256-MHwLTSyMF7vYiVTof3xePW2eOySCr4/xYlPvWSzBZUg="; + sha256 = "0g0pvfdmnd3frsd5sdckv3llwyjiw809rqy1slq3xj6i08xhcmd5"; }; extraNativeBuildInputs = [ gtest ]; diff --git a/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix b/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix index 1e91c267985..53abde6c3f4 100644 --- a/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix +++ b/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-ffmpegdirect"; namespace = "inputstream.ffmpegdirect"; - version = "1.21.3"; + version = "1.21.8"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.ffmpegdirect"; rev = "${version}-${rel}"; - sha256 = "sha256-OShd6sPGXXu0rlSwuQFMWqrLscE6Y0I2eV2YJYyZNMs="; + sha256 = "0iq89vfb3p3b5qhivxs95xk122vgmbpixdvqpmkxp19rlyn3z9j6"; }; extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ]; diff --git a/pkgs/applications/video/kodi-packages/netflix/default.nix b/pkgs/applications/video/kodi-packages/netflix/default.nix index 20317b26828..d9d11657e8b 100644 --- a/pkgs/applications/video/kodi-packages/netflix/default.nix +++ b/pkgs/applications/video/kodi-packages/netflix/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "netflix"; namespace = "plugin.video.netflix"; - version = "1.16.0"; + version = "1.16.2"; src = fetchFromGitHub { owner = "CastagnaIT"; repo = namespace; rev = "v${version}"; - sha256 = "0k5jz6zjsazf0z2xv7gk848p4hvkzd79d0kl71a5d20f96g3938k"; + sha256 = "0yycwm8vrpkr4fsbf713mhpnaxfd849nhzp5r1898sb9vldab4xk"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi-packages/pvr-hts/default.nix b/pkgs/applications/video/kodi-packages/pvr-hts/default.nix index 5e7f39d911f..30f5c895c35 100644 --- a/pkgs/applications/video/kodi-packages/pvr-hts/default.nix +++ b/pkgs/applications/video/kodi-packages/pvr-hts/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hts"; namespace = "pvr.hts"; - version = "8.3.0"; + version = "8.3.4"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hts"; rev = "${version}-${rel}"; - sha256 = "1lqd0kkfv06n8ax8ywsi1rx9glvx3pwi9yj9yb3fdf39xmd3hz7y"; + sha256 = "15gv499r6jf89chp7xpv0z4v0nia907czs83lz57lxydqcbmmjnn"; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix index b6feec8ab03..7905ffc8ef5 100644 --- a/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix +++ b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix @@ -6,13 +6,13 @@ buildKodiBinaryAddon rec { pname = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "7.6.5"; + version = "7.6.9"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; rev = "${version}-${rel}"; - sha256 = "sha256-Z4H+5dUYJ3vAgodPxWmttVhPVdPVYTJbmYxo1lzLHNA="; + sha256 = "1nj4qgr35cw5ly16w2fdgscz5245d7mgvm4sxgxy19jkyv7jmzn3"; }; extraBuildInputs = [ diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index d7ade6899dc..fde2833c98c 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "streamlink"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = version; - sha256 = "14vqh4pck3q766qln7c57n9bz8zrlgfqrpkdn8x0ac9zhlhfn1zm"; + sha256 = "1323v1pavmbb2vk3djdkxd8j6i3yrcgrkyl2d7xwkb7nwlla1x1v"; }; checkInputs = with python3.pkgs; [ @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/streamlink/streamlink"; description = "CLI for extracting streams from various websites to video player of your choosing"; longDescription = '' - Streamlink is a CLI utility that pipes flash videos from online + Streamlink is a CLI utility that pipes videos from online streaming services to a variety of video players such as VLC, or alternatively, a browser. @@ -51,6 +51,6 @@ python3.pkgs.buildPythonApplication rec { ''; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ dezgeg zraexy ]; + maintainers = with maintainers; [ dezgeg zraexy DeeUnderscore ]; }; } diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix index 0b8d1ad22b9..18b35c0d398 100644 --- a/pkgs/applications/video/wf-recorder/default.nix +++ b/pkgs/applications/video/wf-recorder/default.nix @@ -1,5 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland, scdoc -, wayland-protocols, ffmpeg, x264, libpulseaudio, ocl-icd, opencl-headers +{ lib, stdenv, fetchFromGitHub +, meson, ninja, pkg-config, scdoc, wayland-scanner +, wayland, wayland-protocols, ffmpeg, x264, libpulseaudio, ocl-icd, opencl-headers }: stdenv.mkDerivation rec { @@ -13,9 +14,9 @@ stdenv.mkDerivation rec { sha256 = "1cw6kpcbl33wh95pvy32xrsrm6kkk1awccr3phyh885xjs3b3iim"; }; - nativeBuildInputs = [ meson ninja pkg-config wayland scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc ]; buildInputs = [ - wayland-protocols ffmpeg x264 libpulseaudio ocl-icd opencl-headers + wayland wayland-protocols ffmpeg x264 libpulseaudio ocl-icd opencl-headers ]; meta = with lib; { diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index ca9ae20f346..0c44805bedd 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "containerd"; - version = "1.5.2"; + version = "1.5.4"; outputs = [ "out" "man" ]; @@ -18,7 +18,7 @@ buildGoModule rec { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-RDLAmPBjDHCx9al+gstUTrvKc/L0vAm8IEd/mvX5Als="; + sha256 = "sha256-VV1cxA8tDRiPDxKV8OGu3T7sgutmyL+VPNqTeFcVjJA="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 42095da8f52..26e56ccc609 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.21.1"; + version = "1.21.2"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-WoQeZkHuCQGv//UKTpvucJXq7xI9Fkil8V1B1qTM75k="; + sha256 = "sha256-hapXwd7K0xbkZ0MKkJ5wv4zfDKRTC3IC4oLYLL460oI="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 84019395853..020e22db601 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - sha256 = "0l03ncs1x4lhgy0kf7bd1zq00md8fi93f8xq6k0ans4400divfzk"; + sha256 = "sha256-5j1+3FlLc0gYDnYvDsAdmILxgjHCU1bTVOytfaF03iU="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index a8fbb1d09c1..1d049621aa5 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { aarch64-linux = "0m7xs12g97z1ipzaf7dgknf3azlah0p6bdr9i454azvzg955238b"; }; - configurePhase = ":"; + dontConfigure = true; buildPhase = '' mv firecracker-* firecracker diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 3c9e7ae8c52..4df14e030ae 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -124,6 +124,18 @@ stdenv.mkDerivation rec { # This means `-accel hvf` is broken for now, on aarch64-darwin only. substituteInPlace meson.build \ --replace 'if exe_sign' 'if false' + + # glibc 2.33 compat fix: if `has_statx = true` is set, `tools/virtiofsd/passthrough_ll.c` will + # rely on `stx_mnt_id`[1] which is not part of glibc's `statx`-struct definition. + # + # `has_statx` will be set to `true` if a simple C program which uses a few `statx` + # consts & struct fields successfully compiles. It seems as this only builds on glibc-2.33 + # since most likely[2] and because of that, the problematic code-path will be used. + # + # [1] https://github.com/torvalds/linux/commit/fa2fcf4f1df1559a0a4ee0f46915b496cc2ebf60#diff-64bab5a0a3fcb55e1a6ad77b1dfab89d2c9c71a770a07ecf44e6b82aae76a03a + # [2] https://sourceware.org/git/?p=glibc.git;a=blobdiff;f=io/bits/statx-generic.h;h=c34697e3c1fd79cddd60db294302e461ed8db6e2;hp=7a09e94be2abb92d2df612090c132e686a24d764;hb=88a2cf6c4bab6e94a65e9c0db8813709372e9180;hpb=c4e4b2e149705559d28b16a9b47ba2f6142d6a6c + substituteInPlace meson.build \ + --replace 'has_statx = cc.links(statx_test)' 'has_statx = false' ''; preConfigure = '' diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix index 7aabdf27197..963f8676883 100644 --- a/pkgs/applications/window-managers/cage/default.nix +++ b/pkgs/applications/window-managers/cage/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, wayland, scdoc, makeWrapper -, wlroots, wayland-protocols, pixman, libxkbcommon +, meson, ninja, pkg-config, wayland-scanner, scdoc, makeWrapper +, wlroots, wayland, wayland-protocols, pixman, libxkbcommon , systemd, libGL, libX11, mesa , xwayland ? null , nixosTests @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0vm96gxinhy48m3x9p1sfldyd03w3gk6iflb7n9kn06j1vqyswr6"; }; - nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc makeWrapper ]; buildInputs = [ wlroots wayland wayland-protocols pixman libxkbcommon diff --git a/pkgs/applications/window-managers/i3/lock-blur.nix b/pkgs/applications/window-managers/i3/lock-blur.nix new file mode 100644 index 00000000000..a536a44d452 --- /dev/null +++ b/pkgs/applications/window-managers/i3/lock-blur.nix @@ -0,0 +1,21 @@ +{ i3lock-color, lib, fetchFromGitHub }: + +i3lock-color.overrideAttrs (oldAttrs : rec { + pname = "i3lock-blur"; + version = "2.10"; + + src = fetchFromGitHub { + owner = "karulont"; + repo = "i3lock-blur"; + rev = version; + sha256 = "sha256-rBQHYVD9rurzTEXrgEnOziOP22D2EePC1+EV9Wi2pa0="; + }; + + meta = with lib; { + description = "An improved screenlocker based upon XCB and PAM with background blurring filter"; + homepage = "https://github.com/karulont/i3lock-blur/"; + license = licenses.bsd3; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 4e91c35146f..92de633f0fa 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, substituteAll, swaybg -, meson, ninja, pkg-config, wayland, scdoc -, libxkbcommon, pcre, json_c, dbus, libevdev +, meson, ninja, pkg-config, wayland-scanner, scdoc +, wayland, libxkbcommon, pcre, json_c, dbus, libevdev , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg , wlroots, wayland-protocols, libdrm , nixosTests @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - meson ninja pkg-config wayland scdoc + meson ninja pkg-config wayland-scanner scdoc ]; buildInputs = [ diff --git a/pkgs/applications/window-managers/tinywl/default.nix b/pkgs/applications/window-managers/tinywl/default.nix index ea8a92615a4..965ec67b6e9 100644 --- a/pkgs/applications/window-managers/tinywl/default.nix +++ b/pkgs/applications/window-managers/tinywl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, wlroots, pkg-config +{ lib, stdenv, wlroots, pkg-config, wayland-scanner , libxkbcommon, pixman, udev, wayland, wayland-protocols }: @@ -8,7 +8,7 @@ stdenv.mkDerivation { sourceRoot = "source/tinywl"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wayland-scanner ]; buildInputs = [ libxkbcommon pixman udev wayland wayland-protocols wlroots ]; installPhase = '' @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/swaywm/wlroots/tree/master/tinywl"; - description = ''"minimum viable product" Wayland compositor based on wlroots.''; + description = ''A "minimum viable product" Wayland compositor based on wlroots''; maintainers = with maintainers; [ qyliss ]; license = licenses.cc0; inherit (wlroots.meta) platforms; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 3a11444bcf4..598e78be264 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland -, libGL, mesa, libxkbcommon, cairo, libxcb +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland-scanner +, wayland, libGL, mesa, libxkbcommon, cairo, libxcb , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev , colord, lcms2, pipewire ? null , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1zlql0xgiqc3pvgbpnnvj4xvpd91pwva8qf83xfb23if377ddxaw"; }; - nativeBuildInputs = [ meson ninja pkg-config wayland ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; buildInputs = [ wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 292baed20df..e5095478002 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -19,9 +19,9 @@ sourceforge = [ "https://downloads.sourceforge.net/" "https://prdownloads.sourceforge.net/" - "https://heanet.dl.sourceforge.net/sourceforge/" - "https://surfnet.dl.sourceforge.net/sourceforge/" - "https://dfn.dl.sourceforge.net/sourceforge/" + "https://netcologne.dl.sourceforge.net/sourceforge/" + "https://versaweb.dl.sourceforge.net/sourceforge/" + "https://freefr.dl.sourceforge.net/sourceforge/" "https://osdn.dl.sourceforge.net/sourceforge/" "https://kent.dl.sourceforge.net/sourceforge/" ]; diff --git a/pkgs/build-support/icon-conv-tools/default.nix b/pkgs/build-support/icon-conv-tools/default.nix index 79d3838e688..442f1f2235f 100644 --- a/pkgs/build-support/icon-conv-tools/default.nix +++ b/pkgs/build-support/icon-conv-tools/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, icoutils }: stdenv.mkDerivation { - name = "icon-conv-tools-0.0.0"; + pname = "icon-conv-tools"; + version = "0.0.0"; src = ./bin; diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix index 70da5bf5b5f..4678d35442f 100644 --- a/pkgs/build-support/libredirect/default.nix +++ b/pkgs/build-support/libredirect/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, coreutils }: -stdenv.mkDerivation { - name = "libredirect-0"; +stdenv.mkDerivation rec { + pname = "libredirect"; + version = "0"; unpackPhase = '' cp ${./libredirect.c} libredirect.c diff --git a/pkgs/data/fonts/andika/default.nix b/pkgs/data/fonts/andika/default.nix index 4799804b9ec..aaa380098a2 100644 --- a/pkgs/data/fonts/andika/default.nix +++ b/pkgs/data/fonts/andika/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "6.000"; + version = "6.001"; in fetchzip rec { name = "andika-${version}"; @@ -14,7 +14,7 @@ in unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - sha256 = "sha256-5ymTBFssoEhmc2Z+JyEcMqw2p91i9/R44GRzEzUzK9Q="; + sha256 = "sha256-ukPFBLjHQbOosQ1h0ImVlz8HhNNMp0e41SjzUhQaZtc="; meta = with lib; { homepage = "https://software.sil.org/andika"; diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/data/fonts/cascadia-code/default.nix index a78bf6b4a78..c223f9366af 100644 --- a/pkgs/data/fonts/cascadia-code/default.nix +++ b/pkgs/data/fonts/cascadia-code/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2105.24"; + version = "2106.17"; in fetchzip { name = "cascadia-code-${version}"; url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"; - sha256 = "sha256-j3IPzrch8oueOmCDa2gpD8uYFs8cKWjkxcmicZcfqQ8="; + sha256 = "sha256-EsXD6gY3q3KIk37vYPz731lLz5989cd+s5fz5rKIn2k="; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/pkgs/data/fonts/charis-sil/default.nix b/pkgs/data/fonts/charis-sil/default.nix index 6639cb57d8b..75f1d89be77 100644 --- a/pkgs/data/fonts/charis-sil/default.nix +++ b/pkgs/data/fonts/charis-sil/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "6.000"; + version = "6.001"; in fetchzip rec { name = "charis-sil-${version}"; @@ -14,7 +14,7 @@ in unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - sha256 = "sha256-eMmC893rI42qzZVCI17i9XSAbQzXCK2fHVe5Pf1/VnM="; + sha256 = "sha256-eKSOvYuTMpAnTk4sRiWFUDJrTsF+K5716ALCepaUU08="; meta = with lib; { homepage = "https://software.sil.org/charis"; diff --git a/pkgs/data/misc/cacert/setup-hook.sh b/pkgs/data/misc/cacert/setup-hook.sh index 77b68a5c251..93b682fbbd1 100644 --- a/pkgs/data/misc/cacert/setup-hook.sh +++ b/pkgs/data/misc/cacert/setup-hook.sh @@ -1,3 +1,7 @@ export NIX_SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt -# left for compatibility + +# compatibility +# - openssl export SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt +# - Haskell x509-system +export SYSTEM_CERTIFICATE_PATH=@out@/etc/ssl/certs/ca-bundle.crt diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index ec0fa407d73..17a63debdc6 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ]; - phases = [ "installPhase" ]; - installPhase = '' osinfo-db-import --dir "$out/share/osinfo" "${src}" ''; diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 63b8467e6cc..416bf009518 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -39,16 +39,16 @@ stdenv.mkDerivation rec { pkg-config gettext itstool - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ libxml2 - shared-mime-info - ]; + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) shared-mime-info; buildInputs = [ libxml2 glib ]; + strictDeps = true; + mesonFlags = [ "-Dupdate-mimedb=true" ]; diff --git a/pkgs/data/themes/flat-remix-gnome/default.nix b/pkgs/data/themes/flat-remix-gnome/default.nix index cff5f911584..f9eed54534c 100644 --- a/pkgs/data/themes/flat-remix-gnome/default.nix +++ b/pkgs/data/themes/flat-remix-gnome/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-gnome"; - version = "20210623"; + version = "20210715"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - hash = "sha256-FKsbAvjhXb2ipe3XqACM6OwGYwbBbzvDjsUQYCIQ8NM="; + hash = "sha256-e7sXzmhfBfcp+KqIc9yuqqXLfYzVlQVn9TNYoa2lZcA="; }; nativeBuildInputs = [ glib ]; diff --git a/pkgs/desktops/gnome/core/gnome-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-desktop/default.nix index 56bd074c2cb..1a7887fc35d 100644 --- a/pkgs/desktops/gnome/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-desktop/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "40.1"; + version = "40.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-igeJcwUhnFaZVJriBI9xVVFe+Xx85NZYXd2hXVhZ4c8="; + sha256 = "sha256-U9ZGlEbXoJsCaTZ2nllTUv3zvlYy80a7Af5XyLUWLOs="; }; patches = [ diff --git a/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix b/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix deleted file mode 100755 index 552e0a2dcaf..00000000000 --- a/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, gnome, glib }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-fuzzy-app-search"; - version = "4.0.1"; - - src = fetchFromGitLab { - owner = "Czarlie"; - repo = "gnome-fuzzy-app-search"; - rev = "v${version}"; - sha256 = "127n3jc5d6cl0yrpjf8acdj76br97knks1wx4f6jcswkx9x47w0a"; - }; - - passthru.extensionUuid = "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com"; - - nativeBuildInputs = [ glib ]; - - makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ]; - - meta = with lib; { - description = "Fuzzy application search results for Gnome Search"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ rhoriguchi ]; - homepage = "https://gitlab.com/Czarlie/gnome-fuzzy-app-search"; - broken = versionOlder gnome.gnome-shell.version "3.18"; - }; -} diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 53395c5c861..3e99f3143d2 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -9,7 +9,6 @@ "EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { }; "emoji-selector@maestroschan.fr" = callPackage ./emoji-selector { }; "freon@UshakovVasilii_Github.yahoo.com" = callPackage ./freon { }; - "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com" = callPackage ./fuzzy-app-search { }; "gsconnect@andyholmes.github.io" = callPackage ./gsconnect { }; "icon-hider@kalnitsky.org" = callPackage ./icon-hider { }; "impatience@gfxmonk.net" = callPackage ./impatience { }; diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix index a89ea19079e..d273f03f4bd 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "elementary-sound-theme"; - version = "1.0"; + version = "1.1.0"; repoName = "sound-theme"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-v8ludbPCJaMHCxuzjZchTJwpGiF6UJlVMIMFg+lAhbU="; + sha256 = "sha256-fR6gtKx9J6o2R1vQZ5yx4kEX3Ak+q8I6hRVMZzyB2E8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 07d90f9e013..7e46e4bf2ea 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.5.20"; + version = "1.5.21"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "12wa7blf7l4360rfm8fk5x36ij0x1m61wrjrxkvligdavmil5wzd"; + sha256 = "sha256-8zE6/dar8bjHXGKS9OQfLbr+/I9scnYse6mz2u712lk="; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/llvm/12/clang/default.nix b/pkgs/development/compilers/llvm/12/clang/default.nix index 87cdca834ea..d6ee3752441 100644 --- a/pkgs/development/compilers/llvm/12/clang/default.nix +++ b/pkgs/development/compilers/llvm/12/clang/default.nix @@ -9,7 +9,7 @@ let pname = "clang"; inherit version; - src = fetch "clang" "1vd9rhhrd8ghdg111lac7w8by71y9l14yh5zxfijsm6lj4p4avp2"; + src = fetch "clang" "0px4gl27az6cdz6adds89qzdwb1cqpjsfvrldbz9qvpmphrj34bf"; inherit clang-tools-extra_src; unpackPhase = '' diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix index cde1317ca35..fdc134bdf4b 100644 --- a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation { pname = "compiler-rt" + lib.optionalString (haveLibc) "-libc"; inherit version; - src = fetch "compiler-rt" "0d444qihq9jhqnfv003cr704v363va72zl6qaw2algj1c85cva45"; + src = fetch "compiler-rt" "1950rg294izdwkaasi7yjrmadc9mzdd5paf0q63jjcq2m3rdbj5l"; nativeBuildInputs = [ cmake python3 llvm.dev ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 35228eac43b..212c6e52876 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -18,7 +18,7 @@ }: let - release_version = "12.0.0"; + release_version = "12.0.1"; candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs @@ -29,7 +29,7 @@ let inherit sha256; }; - clang-tools-extra_src = fetch "clang-tools-extra" "0p3dzr0qa7mar83y66xa5m5apynf6ia0lsdsq6axwnm64ysy0hdd"; + clang-tools-extra_src = fetch "clang-tools-extra" "1r9a4fdz9ci58b5z2inwvm4z4cdp6scrivnaw05dggkxz7yrwrb5"; llvm_meta = { license = lib.licenses.ncsa; diff --git a/pkgs/development/compilers/llvm/12/libcxx/default.nix b/pkgs/development/compilers/llvm/12/libcxx/default.nix index 1c9a7dd3c53..3ddcb799750 100644 --- a/pkgs/development/compilers/llvm/12/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/12/libcxx/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "libcxx"; inherit version; - src = fetch "libcxx" "1wf3ww29xkx7prs7pdwicy5qqfapib26110jgmkjrbka9z57bjvx"; + src = fetch "libcxx" "05cx39ldlxchck454lgfly1xj0c7x65iyx4hqhiihrlg6p6qj854"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/12/libcxxabi/default.nix b/pkgs/development/compilers/llvm/12/libcxxabi/default.nix index e360cf8d0b2..16eaed20d78 100644 --- a/pkgs/development/compilers/llvm/12/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/12/libcxxabi/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "libcxxabi"; inherit version; - src = fetch "libcxxabi" "1cbmzspwjlr8f6sp73pw6ivf4dpg6rpc61by0q1m2zca2k6yif3a"; + src = fetch "libcxxabi" "1l4idd8npbkm168d26kqn529yv3npsd8f2dm8a7iwyknj7iyivw8"; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/compilers/llvm/12/libunwind/default.nix b/pkgs/development/compilers/llvm/12/libunwind/default.nix index abfe950614a..8ed24687695 100644 --- a/pkgs/development/compilers/llvm/12/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/12/libunwind/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "libunwind"; inherit version; - src = fetch pname "1x8wpmsrsgnwj2v5ih52ylni7r6n8gzkcj6hx65zbxski2rablly"; + src = fetch pname "192ww6n81lj2mb9pj4043z79jp3cf58a9c2qrxjwm5c3a64n1shb"; postUnpack = '' unpackFile ${libcxx.src} diff --git a/pkgs/development/compilers/llvm/12/lld/default.nix b/pkgs/development/compilers/llvm/12/lld/default.nix index e2c7470d2fc..f9b0effbff3 100644 --- a/pkgs/development/compilers/llvm/12/lld/default.nix +++ b/pkgs/development/compilers/llvm/12/lld/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "lld"; inherit version; - src = fetch pname "1zakyxk5bwnh7jarckcd4rbmzi58jgn2dbah5j5cwcyfyfbx9drc"; + src = fetch pname "0qg3fgc7wj34hdkqn21y03zcmsdd01szhhm1hfki63iifrm3y2v9"; patches = [ ./gnu-install-dirs.patch diff --git a/pkgs/development/compilers/llvm/12/lldb/default.nix b/pkgs/development/compilers/llvm/12/lldb/default.nix index 0712396cccf..b6659034e81 100644 --- a/pkgs/development/compilers/llvm/12/lldb/default.nix +++ b/pkgs/development/compilers/llvm/12/lldb/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (rec { pname = "lldb"; inherit version; - src = fetch pname "1v85qyq3snk81vjmwq5q7xikyyqsfpqy2c4qmr81mps4avsw1g0l"; + src = fetch pname "0g3pj1m3chafavpr35r9fynm85y2hdyla6klj0h28khxs2613i78"; patches = [ ./procfs.patch diff --git a/pkgs/development/compilers/llvm/12/llvm/default.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix index 8413f0f5745..361c6798385 100644 --- a/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -34,8 +34,8 @@ in stdenv.mkDerivation (rec { pname = "llvm"; inherit version; - src = fetch pname "0l4b79gwfvxild974aigcq1yigypjsk2j5p59syhl6ksd744gp29"; - polly_src = fetch "polly" "1ixl9yj526n8iqh9ckyiah2vzravs9d1akybqq7rvy32n9vgr6hd"; + src = fetch pname "1pzx9zrmd7r3481sbhwvkms68fwhffpp4mmz45dgrkjpyl2q96kx"; + polly_src = fetch "polly" "1yfm9ixda4a2sx7ak5vswijx4ydk5lv1c1xh39xmd2kh299y4m12"; unpackPhase = '' unpackFile $src @@ -84,6 +84,8 @@ in stdenv.mkDerivation (rec { substituteInPlace unittests/IR/CMakeLists.txt \ --replace "PassBuilderCallbacksTest.cpp" "" rm unittests/IR/PassBuilderCallbacksTest.cpp + # TODO: Fix failing tests: + rm test/DebugInfo/X86/vla-multi.ll '' + optionalString stdenv.hostPlatform.isMusl '' patch -p1 -i ${../../TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ diff --git a/pkgs/development/compilers/llvm/12/openmp/default.nix b/pkgs/development/compilers/llvm/12/openmp/default.nix index c107258dd18..8ed1bf71f00 100644 --- a/pkgs/development/compilers/llvm/12/openmp/default.nix +++ b/pkgs/development/compilers/llvm/12/openmp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "openmp"; inherit version; - src = fetch pname "0z8n1wanby6aq3i7d91mgk72hb33zfl5blayk0a22cs7l8i706zb"; + src = fetch pname "14dh0r6h2xh747ffgnsl4z08h0ri04azi9vf79cbz7ma1r27kzk0"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; diff --git a/pkgs/development/interpreters/hugs/default.nix b/pkgs/development/interpreters/hugs/default.nix index 6af489473c9..b903ab425c6 100644 --- a/pkgs/development/interpreters/hugs/default.nix +++ b/pkgs/development/interpreters/hugs/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, bison }: -stdenv.mkDerivation { - - name = "hugs98-200609"; +stdenv.mkDerivation rec { + pname = "hugs98"; + version = "2006-09"; src = fetchurl { - url = "http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-Sep2006.tar.gz"; + url = "https://www.haskell.org/hugs/downloads/${version}/hugs98-Sep2006.tar.gz"; sha256 = "1dj65c39zpy6qqvvrwns2hzj6ipnd4ih655xj7kgyk2nfdvd5x1w"; }; diff --git a/pkgs/development/interpreters/perl/aarch64-darwin.patch b/pkgs/development/interpreters/perl/aarch64-darwin.patch deleted file mode 100644 index b700c8ca6e0..00000000000 --- a/pkgs/development/interpreters/perl/aarch64-darwin.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/hints/darwin.sh b/hints/darwin.sh -index 0a91bc083c0..fdfbdd4a3b9 100644 ---- a/hints/darwin.sh -+++ b/hints/darwin.sh -@@ -301,7 +301,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x - # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by - # capturing its value and adding it to the flags. - case "$MACOSX_DEPLOYMENT_TARGET" in -- 10.*) -+ [1-9][0-9].*) - add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET - add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET - ;; -@@ -313,7 +313,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x - - *** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET - *** --*** Please either set it to 10.something, or to empty. -+*** Please either set it to a valid macOS version number (e.g., 10.15) or to empty. - - EOM - exit 1 -@@ -327,7 +327,7 @@ EOM - # "ProductVersion: 10.11" "10.11" - prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'` - case "$prodvers" in -- 10.*) -+ [1-9][0-9].*) - add_macosx_version_min ccflags $prodvers - add_macosx_version_min ldflags $prodvers - ;; -@@ -342,11 +342,10 @@ EOM - exit 1 - esac - -- # The X in 10.X -- prodvers_minor=$(echo $prodvers|awk -F. '{print $2}') -+ darwin_major=$(echo $osvers|awk -F. '{print $1}') - -- # macOS (10.12) deprecated syscall(). -- if [ "$prodvers_minor" -ge 12 ]; then -+ # macOS 10.12 (darwin 16.0.0) deprecated syscall(). -+ if [ "$darwin_major" -ge 16 ]; then - d_syscall='undef' - # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime() - case "$MACOSX_DEPLOYMENT_TARGET" in diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 5c75894c4f7..3b39974c16b 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -37,15 +37,11 @@ let patches = [ # Do not look in /usr etc. for dependencies. - (if (versionOlder version "5.31.1") then ./no-sys-dirs-5.29.patch - else ./no-sys-dirs-5.31.patch) + ./no-sys-dirs-5.31.patch ] ++ optional stdenv.isSunOS ./ld-shared.patch ++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ] - ++ optional crossCompiling ./MakeMaker-cross.patch - # Backporting https://github.com/Perl/perl5/pull/17946, can be - # removed if there's ever a 5.30.x release with it included. - ++ optional (versionOlder version "5.32.1") ./aarch64-darwin.patch; + ++ optional crossCompiling ./MakeMaker-cross.patch; # This is not done for native builds because pwd may need to come from # bootstrap tools when building bootstrap perl. @@ -197,14 +193,6 @@ let }); in { # Maint version - perl530 = common { - perl = pkgs.perl530; - buildPerl = buildPackages.perl530; - version = "5.30.3"; - sha256 = "0vs0wwwlw47sswxaflkk4hw0y45cmc7arxx788kwpbminy5lrq1j"; - }; - - # Maint version perl532 = common { perl = pkgs.perl532; buildPerl = buildPackages.perl532; @@ -212,6 +200,14 @@ in { sha256 = "0b7brakq9xs4vavhg391as50nbhzryc7fy5i65r81bnq3j897dh3"; }; + # Maint version + perl534 = common { + perl = pkgs.perl534; + buildPerl = buildPackages.perl534; + version = "5.34.0"; + sha256 = "16mywn5afpv1mczv9dlc1w84rbgjgrr0pyr4c0hhb2wnif0zq7jm"; + }; + # the latest Devel version perldevel = common { perl = pkgs.perldevel; diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.29.patch b/pkgs/development/interpreters/perl/no-sys-dirs-5.29.patch deleted file mode 100644 index 0ccf6254b78..00000000000 --- a/pkgs/development/interpreters/perl/no-sys-dirs-5.29.patch +++ /dev/null @@ -1,251 +0,0 @@ -diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure ---- perl-5.20.0-orig/Configure 2014-05-26 15:34:18.000000000 +0200 -+++ perl-5.20.0/Configure 2014-06-25 10:43:35.368285986 +0200 -@@ -106,15 +106,7 @@ - fi - - : Proper PATH setting --paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' --paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" --paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" --paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" --paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" --paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" --paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" --paths="$paths /sbin /usr/sbin /usr/libexec" --paths="$paths /system/gnu_library/bin" -+paths='' - - for p in $paths - do -@@ -1337,8 +1329,7 @@ - archname='' - : Possible local include directories to search. - : Set locincpth to "" in a hint file to defeat local include searches. --locincpth="/usr/local/include /opt/local/include /usr/gnu/include" --locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" -+locincpth="" - : - : no include file wanted by default - inclwanted='' -@@ -1349,17 +1340,12 @@ - - libnames='' - : change the next line if compiling for Xenix/286 on Xenix/386 --xlibpth='/usr/lib/386 /lib/386' -+xlibpth='' - : Possible local library directories to search. --loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" --loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" -+loclibpth="" - - : general looking path for locating libraries --glibpth="/lib /usr/lib $xlibpth" --glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" --test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" --test -f /shlib/libc.so && glibpth="/shlib $glibpth" --test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" -+glibpth="" - - : Private path used by Configure to find libraries. Its value - : is prepended to libpth. This variable takes care of special -@@ -1391,8 +1377,6 @@ - libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" - : We probably want to search /usr/shlib before most other libraries. - : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. --glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` --glibpth="/usr/shlib $glibpth" - : Do not use vfork unless overridden by a hint file. - usevfork=false - -@@ -2446,7 +2430,6 @@ - zip - " - pth=`echo $PATH | sed -e "s/$p_/ /g"` --pth="$pth $sysroot/lib $sysroot/usr/lib" - for file in $loclist; do - eval xxx=\$$file - case "$xxx" in -@@ -4936,7 +4919,7 @@ - : Set private lib path - case "$plibpth" in - '') if ./mips; then -- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib" -+ plibpth="$incpath/usr/lib" - fi;; - esac - case "$libpth" in -@@ -8600,13 +8583,8 @@ - echo " " - case "$sysman" in - '') -- syspath='/usr/share/man/man1 /usr/man/man1' -- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" -- syspath="$syspath /usr/man/u_man/man1" -- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" -- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" -- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" -- sysman=`./loc . /usr/man/man1 $syspath` -+ syspath='' -+ sysman='' - ;; - esac - if $test -d "$sysman"; then -@@ -19900,9 +19878,10 @@ - case "$full_ar" in - '') full_ar=$ar ;; - esac -+full_ar=ar - - : Store the full pathname to the sed program for use in the C program --full_sed=$sed -+full_sed=sed - - : see what type gids are declared as in the kernel - echo " " -Only in perl-5.20.0/: Configure.orig -diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL ---- perl-5.20.0-orig/ext/Errno/Errno_pm.PL 2014-05-26 15:34:20.000000000 +0200 -+++ perl-5.20.0/ext/Errno/Errno_pm.PL 2014-06-25 10:31:24.317970047 +0200 -@@ -134,12 +126,7 @@ - if ($dep =~ /(\S+errno\.h)/) { - $file{$1} = 1; - } -- } elsif ($^O eq 'linux' && -- $Config{gccversion} ne '' && -- $Config{gccversion} !~ /intel/i && -- # might be using, say, Intel's icc -- $linux_errno_h -- ) { -+ } elsif (0) { - $file{$linux_errno_h} = 1; - } elsif ($^O eq 'haiku') { - # hidden in a special place -Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig -diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh ---- perl-5.20.0-orig/hints/freebsd.sh 2014-01-31 22:55:51.000000000 +0100 -+++ perl-5.20.0/hints/freebsd.sh 2014-06-25 10:25:53.263964680 +0200 -@@ -119,21 +119,21 @@ - objformat=`/usr/bin/objformat` - if [ x$objformat = xaout ]; then - if [ -e /usr/lib/aout ]; then -- libpth="/usr/lib/aout /usr/local/lib /usr/lib" -- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" -+ libpth="" -+ glibpth="" - fi - lddlflags='-Bshareable' - else -- libpth="/usr/lib /usr/local/lib" -- glibpth="/usr/lib /usr/local/lib" -+ libpth="" -+ glibpth="" - ldflags="-Wl,-E " - lddlflags="-shared " - fi - cccdlflags='-DPIC -fPIC' - ;; - *) -- libpth="/usr/lib /usr/local/lib" -- glibpth="/usr/lib /usr/local/lib" -+ libpth="" -+ glibpth="" - ldflags="-Wl,-E " - lddlflags="-shared " - cccdlflags='-DPIC -fPIC' -diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh ---- perl-5.20.0-orig/hints/linux.sh 2014-05-26 15:34:20.000000000 +0200 -+++ perl-5.20.0/hints/linux.sh 2014-06-25 10:33:47.354883843 +0200 -@@ -150,25 +150,6 @@ - ;; - esac - --# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries --# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us --# where to look. We don't want gcc's own libraries, however, so we --# filter those out. --# This could be conditional on Unbuntu, but other distributions may --# follow suit, and this scheme seems to work even on rather old gcc's. --# This unconditionally uses gcc because even if the user is using another --# compiler, we still need to find the math library and friends, and I don't --# know how other compilers will cope with that situation. --# Morever, if the user has their own gcc earlier in $PATH than the system gcc, --# we don't want its libraries. So we try to prefer the system gcc --# Still, as an escape hatch, allow Configure command line overrides to --# plibpth to bypass this check. --if [ -x /usr/bin/gcc ] ; then -- gcc=/usr/bin/gcc --else -- gcc=gcc --fi -- - case "$plibpth" in - '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | - cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'` -@@ -178,32 +159,6 @@ - ;; - esac - --case "$libc" in --'') --# If you have glibc, then report the version for ./myconfig bug reporting. --# (Configure doesn't need to know the specific version since it just uses --# gcc to load the library for all tests.) --# We don't use __GLIBC__ and __GLIBC_MINOR__ because they --# are insufficiently precise to distinguish things like --# libc-2.0.6 and libc-2.0.7. -- for p in $plibpth -- do -- for trylib in libc.so.6 libc.so -- do -- if $test -e $p/$trylib; then -- libc=`ls -l $p/$trylib | awk '{print $NF}'` -- if $test "X$libc" != X; then -- break -- fi -- fi -- done -- if $test "X$libc" != X; then -- break -- fi -- done -- ;; --esac -- - if ${sh:-/bin/sh} -c exit; then - echo '' - echo 'You appear to have a working bash. Good.' -@@ -367,33 +322,6 @@ - ;; - esac - --# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than --# true libraries. The scripts cause binding against static --# version of -lgdbm which is a bad idea. So if we have 'nm' --# make sure it can read the file --# NI-S 2003/08/07 --case "$nm" in -- '') ;; -- *) -- for p in $plibpth -- do -- if $test -r $p/libndbm.so; then -- if $nm $p/libndbm.so >/dev/null 2>&1 ; then -- echo 'Your shared -lndbm seems to be a real library.' -- _libndbm_real=1 -- break -- fi -- fi -- done -- if $test "X$_libndbm_real" = X; then -- echo 'Your shared -lndbm is not a real library.' -- set `echo X "$libswanted "| sed -e 's/ ndbm / /'` -- shift -- libswanted="$*" -- fi -- ;; --esac -- - # Linux on Synology. - if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then - # Tested on Synology DS213 and DS413 diff --git a/pkgs/development/interpreters/proglodyte-wasm/default.nix b/pkgs/development/interpreters/proglodyte-wasm/default.nix deleted file mode 100644 index 2d4acbd398e..00000000000 --- a/pkgs/development/interpreters/proglodyte-wasm/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, clang, python, v8, coreutils }: - -let - sexpr_wasm_prototype = stdenv.mkDerivation { - name = "sexpr_wasm_prototype"; - src = fetchFromGitHub { - owner = "WebAssembly"; - repo = "sexpr-wasm-prototype"; - rev = "1347a367c34876bfe92562f244a8c8b770372479"; - sha256 = "1v1mph5fp1rffhvh8bbx937gpjqjrdgm7yhffdxzdn4pih9d0grn"; - }; - - configurePhase = '' - # set this to nonempty string to disable default cmake configure - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ clang python ]; - - buildPhase = "make clang-debug-no-tests"; - - hardeningDisable = [ "format" ]; - - installPhase = '' - mkdir -p $out/bin - cp out/clang/Debug/no-tests/sexpr-wasm $out/bin - ''; - }; - -in - -stdenv.mkDerivation { - name = "wasm-0.0.1"; - - src = fetchFromGitHub { - owner = "proglodyte"; - repo = "wasm"; - rev = "650188eecaaf4b64f12b341986b4e89e5fdb3bbe"; - sha256 = "1f5mdl0l2448lx7h36b4bdr541a4q1wapn1kdwrd4z7s94n7a5gq"; - }; - - configurePhase = '' - sed -i -e "s|sudo ||g" Makefile - ''; - - installPhase = '' - export DESTDIR=$out - export MKTEMPDIR=${coreutils}/bin - export D8DIR=${v8}/bin - export SWDIR=${sexpr_wasm_prototype}/bin - make install - ''; - - meta = with lib; { - description = "wasm runs WebAssembly from the command line"; - maintainers = with maintainers; [ proglodyte ]; - platforms = platforms.linux; - license = licenses.asl20; - broken = true; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index b8132cea4fc..f52255f4748 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -39,6 +39,13 @@ , includeSiteCustomize ? true , static ? stdenv.hostPlatform.isStatic , enableOptimizations ? false +# enableNoSemanticInterposition is a subset of the enableOptimizations flag that doesn't harm reproducibility. +# clang starts supporting `-fno-sematic-interposition` with version 10 +, enableNoSemanticInterposition ? (!stdenv.cc.isClang || (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "10")) +# enableLTO is a subset of the enableOptimizations flag that doesn't harm reproducibility. +# enabling LTO on 32bit arch causes downstream packages to fail when linking +# enabling LTO on *-darwin causes python3 to fail when linking. +, enableLTO ? stdenv.is64bit && stdenv.isLinux , reproducibleBuild ? true , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" }: @@ -100,6 +107,8 @@ let ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc pythonForBuild + ] ++ optionals (stdenv.cc.isClang && enableLTO) [ + stdenv.cc.cc.libllvm.out ]; buildInputs = filter (p: p != null) ([ @@ -190,6 +199,10 @@ in with passthru; stdenv.mkDerivation { # (since it will do a futile invocation of gcc (!) to find # libuuid, slowing down program startup a lot). (./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch") + # Make sure that the virtualenv activation scripts are + # owner-writable, so venvs can be recreated without permission + # errors. + ./virtualenv-permissions.patch ] ++ optionals mimetypesSupport [ # Make the mimetypes module refer to the right file ./mimetypes.patch @@ -274,6 +287,8 @@ in with passthru; stdenv.mkDerivation { "--with-system-ffi" ] ++ optionals enableOptimizations [ "--enable-optimizations" + ] ++ optionals enableLTO [ + "--with-lto" ] ++ optionals (pythonOlder "3.7") [ # This is unconditionally true starting in CPython 3.7. "--with-threads" @@ -323,6 +338,17 @@ in with passthru; stdenv.mkDerivation { export DETERMINISTIC_BUILD=1; '' + optionalString stdenv.hostPlatform.isMusl '' export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000" + '' + + + # enableNoSemanticInterposition essentially sets that CFLAG -fno-semantic-interposition + # which changes how symbols are looked up. This essentially means we can't override + # libpython symbols via LD_PRELOAD anymore. This is common enough as every build + # that uses --enable-optimizations has the same "issue". + # + # The Fedora wiki has a good article about their journey towards enabling this flag: + # https://fedoraproject.org/wiki/Changes/PythonNoSemanticInterpositionSpeedup + optionalString enableNoSemanticInterposition '' + export CFLAGS_NODIST="-fno-semantic-interposition" ''; setupHook = python-setup-hook sitePackages; diff --git a/pkgs/development/interpreters/python/cpython/virtualenv-permissions.patch b/pkgs/development/interpreters/python/cpython/virtualenv-permissions.patch new file mode 100644 index 00000000000..c686f21bfbb --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/virtualenv-permissions.patch @@ -0,0 +1,13 @@ +diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py +index caa7285..ad666ac 100644 +--- a/Lib/venv/__init__.py ++++ b/Lib/venv/__init__.py +@@ -379,7 +379,7 @@ class EnvBuilder: + if data is not None: + with open(dstfile, 'wb') as f: + f.write(data) +- shutil.copymode(srcfile, dstfile) ++ os.chmod(dstfile, 0o644) + + + def create(env_dir, system_site_packages=False, clear=False, diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index f700eb163a9..f1784c834c2 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -118,14 +118,23 @@ with pkgs; }; sources = { - "python38" = { + python38 = { sourceVersion = { major = "3"; minor = "8"; - patch = "9"; + patch = "10"; suffix = ""; }; - sha256 = "XjkfPsRdopVEGcqwvq79i+OIlepc4zV3w+wUlAxLlXI="; + sha256 = "1n8rjb3jn0j8dvi1qn94rxayc9rh982d8wgkrjy41n1x15k4mwka"; + }; + python39 = { + sourceVersion = { + major = "3"; + minor = "9"; + patch = "5"; + suffix = ""; + }; + sha256 = "10vdf46q5ldnzkprm8pldvr5a9hrdpxjv7mpzgdw6vj3cl318nhc"; }; }; @@ -176,18 +185,11 @@ in { inherit passthruFun; } // sources.python38); - python39 = callPackage ./cpython { + python39 = callPackage ./cpython ({ self = python39; - sourceVersion = { - major = "3"; - minor = "9"; - patch = "4"; - suffix = ""; - }; - sha256 = "Sw5mRKdvjfhkriSsUApRu/aL0Jj2oXPifTthzcqaoTQ="; inherit (darwin) configd; inherit passthruFun; - }; + } // sources.python39); python310 = callPackage ./cpython { self = python310; @@ -195,9 +197,9 @@ in { major = "3"; minor = "10"; patch = "0"; - suffix = "a5"; + suffix = "b3"; }; - sha256 = "BBjlfnA24hnx5rYwOyHnEfZM/Q/dsIlNjxnzev/8XU0="; + sha256 = "05fc4mp2ysb372bzkwbn1b1z01bfldnaqig6rxmif58hs3aawrr2"; inherit (darwin) configd; inherit passthruFun; }; @@ -223,8 +225,9 @@ in { stripBytecode = true; includeSiteCustomize = false; enableOptimizations = false; + enableLTO = false; mimetypesSupport = false; - } // sources.python38)).overrideAttrs(old: { + } // sources.python39)).overrideAttrs(old: { pname = "python3-minimal"; meta = old.meta // { maintainers = []; diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix index 8b49a743b4a..6ba92a041eb 100644 --- a/pkgs/development/interpreters/rascal/default.nix +++ b/pkgs/development/interpreters/rascal/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, makeWrapper, jdk }: stdenv.mkDerivation rec { - name = "rascal-0.6.2"; + pname = "rascal"; + version = "0.6.2"; src = fetchurl { - url = "https://update.rascal-mpl.org/console/${name}.jar"; + url = "https://update.rascal-mpl.org/console/${pname}-${version}.jar"; sha256 = "1z4mwdbdc3r24haljnxng8znlfg2ihm9bf9zq8apd9a32ipcw4i6"; }; diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix index d46c7a6bcd8..4c67c927e57 100644 --- a/pkgs/development/libraries/AntTweakBar/default.nix +++ b/pkgs/development/libraries/AntTweakBar/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchurl, unzip, xorg, libGLU, libGL }: -stdenv.mkDerivation { - name = "AntTweakBar-1.16"; +stdenv.mkDerivation rec { + pname = "AntTweakBar"; + version = "1.16"; nativeBuildInputs = [ unzip ]; buildInputs = [ xorg.libX11 libGLU libGL ]; src = fetchurl { - url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_116.zip"; + url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_${lib.replaceStrings ["."] [""] version}.zip"; sha256 = "0z3frxpzf54cjs07m6kg09p7nljhr7140f4pznwi7srwq4cvgkpv"; }; diff --git a/pkgs/development/libraries/NSPlist/default.nix b/pkgs/development/libraries/NSPlist/default.nix index 1b8ae939eca..680e86dd64e 100644 --- a/pkgs/development/libraries/NSPlist/default.nix +++ b/pkgs/development/libraries/NSPlist/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation { - name = "NSPlist-713decf"; + pname = "NSPlist"; + version = "unstable-2017-04-11"; src = fetchFromGitHub { owner = "matthewbauer"; diff --git a/pkgs/development/libraries/PlistCpp/default.nix b/pkgs/development/libraries/PlistCpp/default.nix index f7c47805748..c2d5e6dceac 100644 --- a/pkgs/development/libraries/PlistCpp/default.nix +++ b/pkgs/development/libraries/PlistCpp/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }: stdenv.mkDerivation { - name = "PlistCpp-11615d"; + pname = "PlistCpp"; + version = "unstable-11615d"; src = fetchFromGitHub { owner = "matthewbauer"; diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 225cadac8c6..059ba65b25c 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -74,18 +74,18 @@ stdenv.mkDerivation rec { }) # Fix drops of keyboard events for SDL_EnableUNICODE (fetchpatch { - url = "http://hg.libsdl.org/SDL/raw-rev/0aade9c0203f"; - sha256 = "1y9izncjlqvk1mkz1pkl9lrk9s452cmg2izjjlqqrhbn8279xy50"; + url = "https://github.com/libsdl-org/SDL-1.2/commit/0332e2bb18dc68d6892c3b653b2547afe323854b.patch"; + sha256 = "0g458iv6pp9sikdch6ms8svz60lf5ks2q5wgid8s9rydhk98lpp5"; }) # Ignore insane joystick axis events (fetchpatch { - url = "http://hg.libsdl.org/SDL/raw-rev/95abff7adcc2"; - sha256 = "0i8x0kx0pw12ld5bfxhyzs466y3c0n9dscw1ijhq1b96r72xyhqq"; + url = "https://github.com/libsdl-org/SDL-1.2/commit/ab99cc82b0a898ad528d46fa128b649a220a94f4.patch"; + sha256 = "1b3473sawfdbkkxaqf1hg0vn37yk8hf655jhnjwdk296z4gclazh"; }) # https://bugzilla.libsdl.org/show_bug.cgi?id=1769 (fetchpatch { - url = "http://hg.libsdl.org/SDL/raw-rev/91ad7b43317a"; - sha256 = "15g537vbl2my4mfrjxfkcx9ri6bk2gjvaqj650rjdxwk2nkdkn4b"; + url = "https://github.com/libsdl-org/SDL-1.2/commit/5d79977ec7a6b58afa6e4817035aaaba186f7e9f.patch"; + sha256 = "1k7y57b1zy5afib1g7w3in36n8cswbcrzdbrjpn5cb105rnb9vmp"; }) # Workaround X11 bug to allow changing gamma # Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222 @@ -97,12 +97,12 @@ stdenv.mkDerivation rec { # Fix a build failure on OS X Mavericks # Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085 (fetchpatch { - url = "http://hg.libsdl.org/SDL/raw-rev/e9466ead70e5"; - sha256 = "0mpwdi09h89df2wxqw87m1rdz7pr46k0w6alk691k8kwv970z6pl"; + url = "https://github.com/libsdl-org/SDL-1.2/commit/19039324be71738d8990e91b9ba341b2ea068445.patch"; + sha256 = "0ckwling2ad27c9vxgp97ndjd098d6zbrydza8b9l77k8airj98c"; }) (fetchpatch { - url = "http://hg.libsdl.org/SDL/raw-rev/bbfb41c13a87"; - sha256 = "1336g7waaf1c8yhkz11xbs500h8bmvabh4h437ax8l1xdwcppfxv"; + url = "https://github.com/libsdl-org/SDL-1.2/commit/7933032ad4d57c24f2230db29f67eb7d21bb5654.patch"; + sha256 = "1by16firaxyr0hjvn35whsgcmq6bl0nwhnpjf75grjzsw9qvwyia"; }) ]; diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index fe97f016743..d6424575a76 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "CVE-2017-2887"; - url = "https://hg.libsdl.org/SDL_image/raw-diff/318484db0705/IMG_xcf.c"; - sha256 = "140dyszz9hkpgwjdiwp1b7jdd8f8l5d862xdaf3ml4cimga1h5kv"; + url = "https://github.com/libsdl-org/SDL_image/commit/e7723676825cd2b2ffef3316ec1879d7726618f2.patch"; + includes = [ "IMG_xcf.c" ]; + sha256 = "174ka2r95i29nlshzgp6x5vc68v7pi8lhzf33and2b1ms49g4jb7"; }) ]; diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index 89585d908da..39e27c909b5 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -2,9 +2,10 @@ , freetype, SDL, libX11 }: stdenv.mkDerivation rec { - name = "agg-2.5"; + pname = "agg"; + version = "2.5"; src = fetchurl { - url = "http://www.antigrain.com/${name}.tar.gz"; + url = "https://www.antigrain.com/${pname}-${version}.tar.gz"; sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 2ef3f3d3920..3978f380a3b 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2021.Q2.5"; + version = "2021.Q3.1"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "0NJoGk++SHt4dtoUj3UQeW4zFtwa7osczUr+vxi8DG8="; + sha256 = "HisJsG27UvVbe0w8zzZArqioQQRxfuK2TPEWggV3TNA="; }; buildInputs = [ diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/development/libraries/amrnb/default.nix index 2316961e399..4e325932b5e 100644 --- a/pkgs/development/libraries/amrnb/default.nix +++ b/pkgs/development/libraries/amrnb/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "amrnb-11.0.0.0"; + pname = "amrnb"; + version = "11.0.0.0"; srcAmr = fetchurl { - url = "http://www.3gpp.org/ftp/Specs/latest/Rel-11/26_series/26104-b00.zip"; + url = "https://www.3gpp.org/ftp/Specs/latest/Rel-11/26_series/26104-b00.zip"; sha256 = "1wf8ih0hk7w20vdlnw7jb7w73v15hbxgbvmq4wq7h2ghn0j8ppr3"; }; diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 64c0b031e47..558ea51eb04 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -23,7 +23,8 @@ , pngquant }: stdenv.mkDerivation rec { - name = "appstream-glib-0.7.18"; + pname = "appstream-glib"; + version = "0.7.18"; outputs = [ "out" "dev" "man" "installedTests" ]; outputBin = "dev"; @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "hughsie"; repo = "appstream-glib"; - rev = lib.replaceStrings [ "." "-" ] [ "_" "_" ] name; + rev = "${lib.replaceStrings ["-"] ["_"] pname}-${lib.replaceStrings ["."] ["_"] version}"; sha256 = "12s7d3nqjs1fldnppbg2mkjg4280f3h8yzj3q1hiz3chh1w0vjbx"; }; diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 51e9271b7d7..bd00a612d4e 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -13,10 +13,11 @@ assert ldapSupport -> openldap != null; with lib; stdenv.mkDerivation rec { - name = "apr-util-1.6.1"; + pname = "apr-util"; + version = "1.6.1"; src = fetchurl { - url = "mirror://apache/apr/${name}.tar.bz2"; + url = "mirror://apache/apr/${pname}-${version}.tar.bz2"; sha256 = "0nq3s1yn13vplgl6qfm09f7n0wm08malff9s59bqf9nid9xjzqfk"; }; diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 03b6c9777df..dd88cf7b1d4 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "apr-1.7.0"; + pname = "apr"; + version = "1.7.0"; src = fetchurl { - url = "mirror://apache/apr/${name}.tar.bz2"; + url = "mirror://apache/apr/${pname}-${version}.tar.bz2"; sha256 = "1spp6r2a3xcl5yajm9safhzyilsdzgagc2dadif8x6z9nbq4iqg2"; }; diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix index bb987d069a7..1a09ed84a1c 100644 --- a/pkgs/development/libraries/argp-standalone/default.nix +++ b/pkgs/development/libraries/argp-standalone/default.nix @@ -19,11 +19,12 @@ let sha256 = "1xx2zdc187a1m2x6c1qs62vcrycbycw7n0q3ks2zkxpaqzx2dgkw"; }; in -stdenv.mkDerivation { - name = "argp-standalone-1.3"; +stdenv.mkDerivation rec { + pname = "argp-standalone"; + version = "1.3"; src = fetchurl { - url = "https://www.lysator.liu.se/~nisse/misc/argp-standalone-1.3.tar.gz"; + url = "https://www.lysator.liu.se/~nisse/misc/argp-standalone-${version}.tar.gz"; sha256 = "dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be"; }; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 4e85c7a92a6..515c60c985a 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.40.1"; + version = "2.40.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0miqn8531czy9ffpxnsxsnk12w3d6sqjda3qyix8kns2xsjf6rlz"; + sha256 = "RNwXr5Q7D9GWxhweA7bBZpYDhcrpbMtelb3v/7aEn5g="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 38c55731698..08e6e5b0e41 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib , fixDarwinDylibNames, gobject-introspection, gnome -, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform }: let @@ -18,9 +17,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkg-config gettext glib ] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames - ++ lib.optional withIntrospection gobject-introspection; + nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ] + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ # Required by atk.pc @@ -34,7 +32,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dintrospection=${lib.boolToString withIntrospection}" + "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" ]; doCheck = true; diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index b7c9287b68b..3ff021222fa 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -6,10 +6,11 @@ # files. stdenv.mkDerivation rec { - name = "attr-2.4.48"; + pname = "attr"; + version = "2.4.48"; src = fetchurl { - url = "mirror://savannah/attr/${name}.tar.gz"; + url = "mirror://savannah/attr/${pname}-${version}.tar.gz"; sha256 = "1rr4adzwax4bzr2c00f06zcsljv5y6p9wymz1g89ww7cb2rp5bay"; }; diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 49a3a5478cf..ab97090e889 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -15,7 +15,7 @@ let x86_64-linux = "x64/libbass.so"; }; urlpath = "bass24-linux.zip"; - sha256 = "1ycvpfa7yyi1qxgflpfzcw1q32f0isd14m9cf351pk8zwndkmp4q"; + sha256 = "1lmysxfhy727zskavml3ibg5w876ir88923bm17c21s59w5lh7l8"; }; bass_fx = { diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index 9913631e854..5c71d079aa2 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.5.11"; + version = "0.6.8"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4CYbL+ICabKvpfjlALJ0wRbuwgy+JKJnKqYbQFsHQsI="; + sha256 = "sha256-wtgD8txViYu7yXdnID6TTf4gCDmvebD19XRxFnubndY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index 79232107cdd..9b1840256ad 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -1,12 +1,10 @@ { lib, stdenv, fetchurl, pkg-config }: - -let baseurl = "https://perso.b2b2c.ca/~sarrazip/dev"; in - stdenv.mkDerivation rec { - name = "boolstuff-0.1.16"; + pname = "boolstuff"; + version = "0.1.16"; src = fetchurl { - url = "${baseurl}/${name}.tar.gz"; + url = "https://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz"; sha256 = "10qynbyw723gz2vrvn4xk2var172kvhlz3l3l80qbdsfb3d12wn0"; }; @@ -14,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for operations on boolean expression binary trees"; - homepage = "${baseurl}/boolstuff.html"; + homepage = "https://perso.b2b2c.ca/~sarrazip/dev/boolstuff.html"; license = "GPL"; maintainers = [ lib.maintainers.marcweber ]; platforms = lib.platforms.all; diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index a333a69ffa1..d6ab4fe0dfe 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, bison }: stdenv.mkDerivation rec { - name = "buddy-2.4"; + pname = "buddy"; + version = "2.4"; src = fetchurl { - url = "mirror://sourceforge/buddy/${name}.tar.gz"; + url = "mirror://sourceforge/buddy/${pname}-${version}.tar.gz"; sha256 = "0dl86l9xkl33wnkz684xa9axhcxx2zzi4q5lii0axnb9lsk81pyk"; }; diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix index 6e21984eb1d..bc609d7bbf1 100644 --- a/pkgs/development/libraries/chmlib/default.nix +++ b/pkgs/development/libraries/chmlib/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "chmlib-0.40a"; + pname = "chmlib"; + version = "0.40a"; src = fetchFromGitHub { owner = "jedwing"; diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix index b2bd2adde43..65d6a392ffd 100644 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ b/pkgs/development/libraries/cloog-ppl/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, ppl, autoreconfHook }: stdenv.mkDerivation rec { - name = "cloog-ppl-0.15.11"; + pname = "cloog-ppl"; + version = "0.15.11"; src = fetchurl { - url = "mirror://gcc/infrastructure/${name}.tar.gz"; + url = "mirror://gcc/infrastructure/${pname}-${version}.tar.gz"; sha256 = "0psdm0bn5gx60glfh955x5b3b23zqrd92idmjr0b00dlnb839mkw"; }; diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix index 54df2df9d4d..02a91050e7b 100644 --- a/pkgs/development/libraries/cloog/default.nix +++ b/pkgs/development/libraries/cloog/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, gmp, isl }: stdenv.mkDerivation rec { - name = "cloog-0.18.4"; + pname = "cloog"; + version = "0.18.4"; src = fetchurl { - url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./${name}.tar.gz"; + url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./${pname}-${version}.tar.gz"; sha256 = "03km1aqaiy3sbqc2f046ms9x0mlmacxlvs5rxsvjj8nf20vxynij"; }; diff --git a/pkgs/development/libraries/dotnetfx35/default.nix b/pkgs/development/libraries/dotnetfx35/default.nix index 68569b516a9..a3045949c6c 100644 --- a/pkgs/development/libraries/dotnetfx35/default.nix +++ b/pkgs/development/libraries/dotnetfx35/default.nix @@ -4,9 +4,10 @@ let windir = "/cygdrive/c/WINDOWS"; in { - pkg = stdenv.mkDerivation { - name = "dotnetfx-3.5"; - src = "${windir}/Microsoft.NET/Framework/v3.5"; + pkg = stdenv.mkDerivation rec { + pname = "dotnetfx"; + version = "3.5"; + src = "${windir}/Microsoft.NET/Framework/v${version}"; buildCommand = '' mkdir -p $out/bin ln -s $src/MSBuild.exe $out/bin diff --git a/pkgs/development/libraries/dotnetfx40/default.nix b/pkgs/development/libraries/dotnetfx40/default.nix index 1ffc10cfc60..379be1bdc26 100644 --- a/pkgs/development/libraries/dotnetfx40/default.nix +++ b/pkgs/development/libraries/dotnetfx40/default.nix @@ -4,9 +4,10 @@ let windir = "/cygdrive/c/WINDOWS"; in { - pkg = stdenv.mkDerivation { - name = "dotnetfx-4.0"; - src = "${windir}/Microsoft.NET/Framework/v4.0.30319"; + pkg = stdenv.mkDerivation rec { + pname = "dotnetfx"; + version = "4.0.30319"; + src = "${windir}/Microsoft.NET/Framework/v${version}"; buildCommand = '' mkdir -p $out/bin ln -s $src/MSBuild.exe $out/bin diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix index ef252ad19f6..53aec96fe70 100644 --- a/pkgs/development/libraries/enet/default.nix +++ b/pkgs/development/libraries/enet/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "enet-1.3.17"; + pname = "enet"; + version = "1.3.17"; src = fetchurl { - url = "http://enet.bespin.org/download/${name}.tar.gz"; + url = "http://enet.bespin.org/download/${pname}-${version}.tar.gz"; sha256 = "1p6f9mby86af6cs7pv6h48032ip9g32c05cb7d9mimam8lchz3x3"; }; diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix index ca460aa71f6..ba4155db1e3 100644 --- a/pkgs/development/libraries/eventlog/default.nix +++ b/pkgs/development/libraries/eventlog/default.nix @@ -1,13 +1,18 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation { - name = "eventlog-0.2.12"; +stdenv.mkDerivation rec { + pname = "eventlog"; + version = "0.2.13"; - src = fetchurl { - url = "http://www.balabit.com/downloads/files/eventlog/0.2/eventlog_0.2.12.tar.gz"; - sha256 = "494dac8e01dc5ce323df2ad554d94874938dab51aa025987677b2bc6906a9c66"; + src = fetchFromGitHub { + owner = "balabit"; + repo = "eventlog"; + rev = "a5c19163ba131f79452c6dfe4e31c2b4ce4be741"; + sha256 = "0a2za3hs7wzy14z7mfgldy1r9xdlqv97yli9wlm8xldr0amsx869"; }; + nativeBuildInputs = [ autoreconfHook ]; + meta = { description = "Syslog event logger library"; longDescription = '' diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index fe30b701ed0..3bfc215aea7 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -27,6 +27,13 @@ stdenv.mkDerivation rec { patchShebangs ./configure ./run.sh ./test-driver-wrapper.sh ''; + # CMake files incorrectly calculate library path from dev prefix + # https://github.com/libexpat/libexpat/issues/501 + postFixup = '' + substituteInPlace $dev/lib/cmake/expat-${version}/expat-noconfig.cmake \ + --replace "$"'{_IMPORT_PREFIX}' $out + ''; + meta = with lib; { homepage = "https://libexpat.github.io/"; description = "A stream-oriented XML parser library written in C"; diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index b046b7aef73..e26ebef0c51 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -14,12 +14,13 @@ }: stdenv.mkDerivation rec { - name = "farstream-0.2.8"; + pname = "farstream"; + version = "0.2.8"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "https://www.freedesktop.org/software/farstream/releases/farstream/${name}.tar.gz"; + url = "https://www.freedesktop.org/software/farstream/releases/farstream/${pname}-${version}.tar.gz"; sha256 = "0249ncd20x5mf884fd8bw75c3118b9fdml837v4fib349xmrqfrb"; }; diff --git a/pkgs/development/libraries/fastpbkdf2/default.nix b/pkgs/development/libraries/fastpbkdf2/default.nix index ac90001fc39..723edd6f29d 100644 --- a/pkgs/development/libraries/fastpbkdf2/default.nix +++ b/pkgs/development/libraries/fastpbkdf2/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchFromGitHub, openssl }: -stdenv.mkDerivation { - name = "fastpbkdf2-1.0.0"; +stdenv.mkDerivation rec { + pname = "fastpbkdf2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "ctz"; repo = "fastpbkdf2"; - rev = "v1.0.0"; + rev = "v${version}"; sha256 = "09ax0h4ik3vhvp3s98lic93l3g9f4v1jkr5k6z4g1lvm7s3lrha2"; }; diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index df3d0732393..d557c87ebdf 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -2,6 +2,7 @@ # Darwin frameworks , Cocoa, CoreMedia, VideoToolbox , stdenv, lib +, fetchpatch , ... }@args: @@ -11,7 +12,18 @@ callPackage ./generic.nix (rec { sha256 = "03kxc29y8190k4y8s8qdpsghlbpmchv1m8iqygq2qn0vfm4ka2a2"; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; - /* Work around https://trac.ffmpeg.org/ticket/9242 */ - patches = lib.optional stdenv.isDarwin - ./v2-0001-avcodec-videotoolboxenc-define-TARGET_CPU_ARM64-t.patch; + patches = [ + # Fix incorrect segment length in HLS child playlist with fmp4 segment format + # FIXME remove in version 4.5 + # https://trac.ffmpeg.org/ticket/9193 + # https://trac.ffmpeg.org/ticket/9205 + (fetchpatch { + name = "ffmpeg_fix_incorrect_segment_length_in_hls.patch"; + url = "https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=59032494e81a1a65c0b960aaae7ec4c2cc9db35a"; + sha256 = "03zz1lw51kkc3g3vh47xa5hfiz3g3g1rbrll3kcnslvwylmrqmy3"; + }) + ] ++ lib.optionals stdenv.isDarwin [ + # Work around https://trac.ffmpeg.org/ticket/9242 + ./v2-0001-avcodec-videotoolboxenc-define-TARGET_CPU_ARM64-t.patch + ]; } // args) diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 6cd651e66eb..720c274ad52 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "folks"; - version = "0.15.2"; + version = "0.15.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08nirjax4m4g4ljr8ksq16wzmrvzq6myqh5rm0dw6pnijqk7nxzg"; + sha256 = "Idc3+vCT9L4GVHPucMogiFuaLDaFlB26JMIjn9PFRKU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 075c810131c..22875e51842 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,5 +1,4 @@ { lib, stdenv -, fetchpatch , substituteAll , fetchurl , pkg-config @@ -15,21 +14,13 @@ stdenv.mkDerivation rec { pname = "fontconfig"; - version = "2.13.93"; + version = "2.13.94"; src = fetchurl { - url = "http://fontconfig.org/release/${pname}-${version}.tar.xz"; - sha256 = "1850q4k80yxma5g3yxkvyv8i5a3xqzswwml8gjy3jmywx8qqd5pa"; + url = "https://www.freedesktop.org/software/fontconfig/release/${pname}-${version}.tar.xz"; + sha256 = "0g004r0bkkqz00mpm3svnnxn7d83158q0yb9ggxryizxfg5m5w55"; }; - patches = [ - # Fix build with no docbook2html. - (fetchpatch { - url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/60ce9b695ee9d1ac514a61f562e210d3278ba605.patch"; - sha256 = "0hfd2jdvsgackdp29dyzf5b1277pnbacihxqh9vdn63rr932ipra"; - }) - ]; - outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config nativeBuildInputs = [ diff --git a/pkgs/development/libraries/freetts/default.nix b/pkgs/development/libraries/freetts/default.nix index dc5f4386030..06535c087dc 100644 --- a/pkgs/development/libraries/freetts/default.nix +++ b/pkgs/development/libraries/freetts/default.nix @@ -1,9 +1,10 @@ {stdenv, fetchurl, apacheAnt, unzip, sharutils, lib, jdk}: -stdenv.mkDerivation { - name = "freetts-1.2.2"; +stdenv.mkDerivation rec { + pname = "freetts"; + version = "1.2.2"; src = fetchurl { - url = "mirror://sourceforge/freetts/freetts-1.2.2-src.zip"; + url = "mirror://sourceforge/freetts/${pname}-${version}-src.zip"; sha256 = "0mnikqhpf4f4jdr0irmibr8yy0dnffx1i257y22iamxi7a6by2r7"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix index 377aa45cf5e..e5ad34a56bb 100644 --- a/pkgs/development/libraries/funambol/default.nix +++ b/pkgs/development/libraries/funambol/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, zlib, curl, autoreconfHook, unzip }: -stdenv.mkDerivation { - name = "funambol-client-cpp-9.0.0"; +stdenv.mkDerivation rec { + pname = "funambol-client-cpp"; + version = "9.0.0"; src = fetchurl { - url = "mirror://sourceforge/funambol/funambol-client-sdk-9.0.0.zip"; + url = "mirror://sourceforge/funambol/funambol-client-sdk-${version}.zip"; sha256 = "1667gahz30i5r8kbv7w415z0hbgm6f6pln1137l5skapi1if6r73"; }; diff --git a/pkgs/development/libraries/garmintools/default.nix b/pkgs/development/libraries/garmintools/default.nix index 424e3751f40..7ad5bc87926 100644 --- a/pkgs/development/libraries/garmintools/default.nix +++ b/pkgs/development/libraries/garmintools/default.nix @@ -1,8 +1,9 @@ { lib, stdenv, fetchurl, libusb-compat-0_1 }: -stdenv.mkDerivation { - name = "garmintools-0.10"; +stdenv.mkDerivation rec { + pname = "garmintools"; + version = "0.10"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/garmintools/garmintools-0.10.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/garmintools/${pname}-${version}.tar.gz"; sha256 = "1vjc8h0z4kx2h52yc3chxn3wh1krn234fg12sggbia9zjrzhpmgz"; }; buildInputs = [ libusb-compat-0_1 ]; diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 660276530aa..53c9b5a30dc 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -5,10 +5,11 @@ with lib; stdenv.mkDerivation rec { - name = "glew-2.2.0"; + pname = "glew"; + version = "2.2.0"; src = fetchurl { - url = "mirror://sourceforge/glew/${name}.tgz"; + url = "mirror://sourceforge/glew/${pname}-${version}.tgz"; sha256 = "1qak8f7g1iswgswrgkzc7idk7jmqgwrs58fhg2ai007v7j4q5z6l"; }; diff --git a/pkgs/development/libraries/glibc/2.32-master.patch.gz b/pkgs/development/libraries/glibc/2.32-master.patch.gz deleted file mode 100644 index 8ea998b5bea..00000000000 --- a/pkgs/development/libraries/glibc/2.32-master.patch.gz +++ /dev/null Binary files differdiff --git a/pkgs/development/libraries/glibc/2.33-master.patch.gz b/pkgs/development/libraries/glibc/2.33-master.patch.gz new file mode 100644 index 00000000000..59230761cd4 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.33-master.patch.gz Binary files differdiff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 93f8f7a8641..e651a8effac 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -41,9 +41,9 @@ } @ args: let - version = "2.32"; - patchSuffix = "-48"; - sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"; + version = "2.33"; + patchSuffix = "-47"; + sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8="; in assert withLinuxHeaders -> linuxHeaders != null; @@ -60,14 +60,14 @@ stdenv.mkDerivation ({ patches = [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. - $ git fetch --all -p && git checkout origin/release/2.32/master && git describe - glibc-2.32-48-g16949aeaa0 - $ git show --minimal --reverse glibc-2.32.. | gzip -9n --rsyncable - > 2.32-master.patch.gz + $ git fetch --all -p && git checkout origin/release/2.33/master && git describe + glibc-2.33-47-gb5711025bc + $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz To compare the archive contents zdiff can be used. - $ zdiff -u 2.32-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz + $ zdiff -u 2.33-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz */ - ./2.32-master.patch.gz + ./2.33-master.patch.gz /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch @@ -153,10 +153,15 @@ stdenv.mkDerivation ({ "--enable-add-ons" "--sysconfdir=/etc" "--enable-stackguard-randomization" - "--enable-static-pie" "--enable-bind-now" (lib.withFeatureAs withLinuxHeaders "headers" "${linuxHeaders}/include") (lib.enableFeature profilingLibraries "profile") + ] ++ lib.optionals (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isAarch64) [ + # This feature is currently supported on + # i386, x86_64 and x32 with binutils 2.29 or later, + # and on aarch64 with binutils 2.30 or later. + # https://sourceware.org/glibc/wiki/PortStatus + "--enable-static-pie" ] ++ lib.optionals withLinuxHeaders [ "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26 ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch b/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch index f84b1049adf..0e0315aca27 100644 --- a/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch +++ b/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch @@ -1,19 +1,8 @@ -diff -Naur glibc-2.27-orig/elf/ldconfig.c glibc-2.27/elf/ldconfig.c ---- glibc-2.27-orig/elf/ldconfig.c 2018-02-01 11:17:18.000000000 -0500 -+++ glibc-2.27/elf/ldconfig.c 2018-02-17 22:43:17.232175182 -0500 -@@ -51,7 +51,7 @@ - #endif - - #ifndef LD_SO_CONF --# define LD_SO_CONF SYSCONFDIR "/ld.so.conf" -+# define LD_SO_CONF PREFIX "/etc/ld.so.conf" - #endif - - /* Get libc version number. */ -diff -Naur glibc-2.27-orig/elf/Makefile glibc-2.27/elf/Makefile ---- glibc-2.27-orig/elf/Makefile 2018-02-01 11:17:18.000000000 -0500 -+++ glibc-2.27/elf/Makefile 2018-02-17 22:44:50.334006750 -0500 -@@ -559,13 +559,13 @@ +diff --git a/elf/Makefile b/elf/Makefile +index 5d666b1b..a5017e9c 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -669,14 +669,14 @@ $(objpfx)sln: $(sln-modules:%=$(objpfx)%.o) $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o) @@ -26,16 +15,45 @@ diff -Naur glibc-2.27-orig/elf/Makefile glibc-2.27/elf/Makefile -CFLAGS-dl-cache.c += $(SYSCONF-FLAGS) -CFLAGS-cache.c += $(SYSCONF-FLAGS) -CFLAGS-rtld.c += $(SYSCONF-FLAGS) +-CFLAGS-dl-usage.c += $(SYSCONF-FLAGS) \ +CFLAGS-dl-cache.c += $(PREFIX-FLAGS) +CFLAGS-cache.c += $(PREFIX-FLAGS) +CFLAGS-rtld.c += $(PREFIX-FLAGS) ++CFLAGS-dl-usage.c += $(PREFIX-FLAGS) \ + -D'RTLD="$(rtlddir)/$(rtld-installed-name)"' cpp-srcs-left := $(all-rtld-routines:=.os) - lib := rtld -diff -Naur glibc-2.27-orig/sysdeps/generic/dl-cache.h glibc-2.27/sysdeps/generic/dl-cache.h ---- glibc-2.27-orig/sysdeps/generic/dl-cache.h 2018-02-01 11:17:18.000000000 -0500 -+++ glibc-2.27/sysdeps/generic/dl-cache.h 2018-02-17 22:45:20.471598816 -0500 -@@ -28,7 +28,7 @@ +diff --git a/elf/dl-diagnostics.c b/elf/dl-diagnostics.c +index bef224b3..8e166b12 100644 +--- a/elf/dl-diagnostics.c ++++ b/elf/dl-diagnostics.c +@@ -205,7 +205,7 @@ print_paths (void) + { + _dl_diagnostics_print_labeled_string ("path.prefix", PREFIX); + _dl_diagnostics_print_labeled_string ("path.rtld", RTLD); +- _dl_diagnostics_print_labeled_string ("path.sysconfdir", SYSCONFDIR); ++ _dl_diagnostics_print_labeled_string ("path.sysconfdir", PREFIX "/etc"); + + unsigned int index = 0; + static const char *system_dirs = SYSTEM_DIRS "\0"; +diff --git a/elf/ldconfig.c b/elf/ldconfig.c +index 28ed637a..6f07b79a 100644 +--- a/elf/ldconfig.c ++++ b/elf/ldconfig.c +@@ -57,7 +57,7 @@ + #define TLS_HWCAP_BIT 63 + + #ifndef LD_SO_CONF +-# define LD_SO_CONF SYSCONFDIR "/ld.so.conf" ++# define LD_SO_CONF PREFIX "/etc/ld.so.conf" + #endif + + /* Get libc version number. */ +diff --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h +index 964d50a4..2224d651 100644 +--- a/sysdeps/generic/dl-cache.h ++++ b/sysdeps/generic/dl-cache.h +@@ -35,7 +35,7 @@ #endif #ifndef LD_SO_CACHE diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix index 8f35407f9dd..debf3eb5926 100644 --- a/pkgs/development/libraries/gnet/default.nix +++ b/pkgs/development/libraries/gnet/default.nix @@ -1,11 +1,12 @@ {lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, glib, libtool }: -stdenv.mkDerivation { - name = "gnet-2.0.8"; +stdenv.mkDerivation rec { + pname = "gnet"; + version = "2.0.8"; src = fetchFromGitHub { owner = "GNOME"; repo = "gnet"; - rev = "GNET_2_0_8"; + rev = "GNET_${lib.replaceStrings ["."] ["_"] version}"; sha256 = "1cy78kglzi235md964ikvm0rg801bx0yk9ya8zavndjnaarzqq87"; }; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 326e5da0812..ccf03ccabdc 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -13,11 +13,11 @@ in stdenv.mkDerivation rec { pname = "gpgme"; - version = "1.15.1"; + version = "1.16.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2"; - sha256 = "1bg13l5s8x9p1v0jyv29n84bay27pflindpzjsc9gj7i4wdkrg7f"; + sha256 = "1l4yw9fqc1blvx1sq1jnfvp1jijla3ca2jw90p4x9m8hvfpc933c"; }; patches = [ @@ -85,6 +85,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ lgpl21Plus gpl3Plus ]; platforms = platforms.unix; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index fc2edc18712..5dcc24cc8bc 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, libidn, libkrb5 }: stdenv.mkDerivation rec { - name = "gsasl-1.10.0"; + pname = "gsasl"; + version = "1.10.0"; src = fetchurl { - url = "mirror://gnu/gsasl/${name}.tar.gz"; + url = "mirror://gnu/gsasl/${pname}-${version}.tar.gz"; sha256 = "sha256-hby9juYJWt54cCY6KOvLiDL1Qepzk5dUlJJgFcB1aNM="; }; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 2dc47a93be3..dec2125974d 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,11 +1,12 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "gsl-2.6"; + pname = "gsl"; + version = "2.7"; src = fetchurl { - url = "mirror://gnu/gsl/${name}.tar.gz"; - sha256 = "1a460zj9xmbgvcymkdhqh313c4l29mn9cffbi5vf33x3qygk70mp"; + url = "mirror://gnu/gsl/${pname}-${version}.tar.gz"; + sha256 = "sha256-77vzeF2g5TA4vnkHUAYotGYVLbw8FzqH3hteui4jYCs="; }; preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then '' diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index faf38a1a05f..5723323defd 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -292,6 +292,8 @@ stdenv.mkDerivation rec { # `applemedia/videotexturecache.h` requires `gst/gl/gl.h`, # but its meson build system does not declare the dependency. "-Dapplemedia=disabled" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dintrospection=disabled" ]; # Argument list too long diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 699f70a0788..3e00050ada2 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -105,6 +105,8 @@ stdenv.mkDerivation rec { "-Dgl-graphene=disabled" # not packaged in nixpkgs as of writing # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices "-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dintrospection=disabled" ] ++ lib.optional (!enableX11) "-Dx11=disabled" # TODO How to disable Wayland? diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 2d43a02725f..9cc1675de3a 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -76,6 +76,8 @@ stdenv.mkDerivation rec { "-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dintrospection=disabled" ] ++ lib.optionals stdenv.isDarwin [ # darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it. "-Dlibunwind=disabled" diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index 517fe9b302d..12cb6dac6f3 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -51,6 +51,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dintrospection=disabled" ]; meta = with lib; { diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 6ada053ea01..840b0f25285 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -59,6 +59,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dintrospection=disabled" ]; postPatch = '' diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 56596960019..d66376b6499 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -54,6 +54,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dintrospection=disabled" ]; postPatch = '' diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix index 438f7feab6c..1e910e3bcf4 100644 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ b/pkgs/development/libraries/gtkimageview/default.nix @@ -1,11 +1,12 @@ { fetchurl, lib, stdenv, pkg-config, gtk2 }: stdenv.mkDerivation rec { - name = "gtkimageview-1.6.4"; + pname = "gtkimageview"; + version = "1.6.4"; src = fetchurl { - url = "http://trac.bjourne.webfactional.com/chrome/common/releases/${name}.tar.gz"; - sha256 = "1if3yh5z6nkv5wnkk0qyy9pkk03vn5rqbfk23q87kj39pqscgr37"; + url = "https://sources.archlinux.org/other/packages/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1wj63af9j9p5i067lpwi9lxvwalamakrmklvl983kvi7s4w1ss2c"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index 78d9956d30a..aca6ccdcccb 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, gtk2, aspell, pkg-config, enchant, intltool}: -stdenv.mkDerivation { - name = "gtkspell-2.0.16"; +stdenv.mkDerivation rec { + pname = "gtkspell"; + version = "2.0.16"; src = fetchurl { - url = "mirror://sourceforge/gtkspell/gtkspell-2.0.16.tar.gz"; + url = "mirror://sourceforge/gtkspell/${pname}-${version}.tar.gz"; sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg"; }; diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix index aacdf0ee933..6d60d62fcce 100644 --- a/pkgs/development/libraries/hawknl/default.nix +++ b/pkgs/development/libraries/hawknl/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, unzip}: -stdenv.mkDerivation { - name = "hawknl-1.68"; +stdenv.mkDerivation rec { + pname = "hawknl"; + version = "1.68"; src = fetchurl { - url = "http://urchlay.naptime.net/~urchlay/src/HawkNL168src.zip"; + url = "http://urchlay.naptime.net/~urchlay/src/HawkNL${lib.replaceStrings ["."] [""] version}src.zip"; sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028"; }; diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix index 31fc4fd6ba3..141be2092a5 100644 --- a/pkgs/development/libraries/id3lib/default.nix +++ b/pkgs/development/libraries/id3lib/default.nix @@ -1,7 +1,8 @@ {lib, stdenv, fetchurl, zlib}: -stdenv.mkDerivation { - name = "id3lib-3.8.3"; +stdenv.mkDerivation rec { + pname = "id3lib"; + version = "3.8.3"; patches = [ ./id3lib-3.8.3-gcc43-1.patch @@ -11,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ zlib ]; src = fetchurl { - url = "mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz"; + url = "mirror://sourceforge/id3lib/${pname}-${version}.tar.gz"; sha256 = "0yfhqwk0w8q2hyv1jib1008jvzmwlpsxvc8qjllhna6p1hycqj97"; }; diff --git a/pkgs/development/libraries/ilixi/default.nix b/pkgs/development/libraries/ilixi/default.nix index b6f1c0ac78a..385baaaf10d 100644 --- a/pkgs/development/libraries/ilixi/default.nix +++ b/pkgs/development/libraries/ilixi/default.nix @@ -1,14 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, directfb, libsigcxx, libxml2, fontconfig }: +{ lib, stdenv, fetchFromGitHub, pkg-config, directfb, libsigcxx, libxml2, fontconfig }: # TODO: optional deps: baresip, FusionDale, FusionSound, SaWMan, doxygen, # Reflex, Wnn, NLS stdenv.mkDerivation rec { - name = "ilixi-1.0.0"; + pname = "ilixi"; + version = "1.0.0"; - src = fetchurl { - url = "http://www.directfb.org/downloads/Libs/${name}.tar.gz"; - sha256 = "1kmdmqf68jiv7y6as41bhbgdy70yy2i811a3l6kccbazlzpif34v"; + src = fetchFromGitHub { + owner = "ilixi"; + repo = "ilixi"; + rev = version; + sha256 = "05h862r9mhis26v8yf967n86qf8y1gdgfzhbqfsr6pjw1k3v3wdr"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index 1d6fed2281e..4bc06a97a7b 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -2,10 +2,11 @@ , libX11, libXext, xorgproto, libjpeg, giflib, libtiff, libpng }: -stdenv.mkDerivation { - name = "imlib-1.9.15"; +stdenv.mkDerivation rec { + pname = "imlib"; + version = "1.9.15"; src = fetchurl { - url = "http://tarballs.nixos.org/imlib-1.9.15.tar.gz"; + url = "https://tarballs.nixos.org/imlib-${version}.tar.gz"; sha256 = "0ggjxyvgp4pxc0b88v40xj9daz90518ydnycw7qax011gxpr12d3"; }; diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index 85451511d7e..21a697f1e3a 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "jansson-2.13.1"; + pname = "jansson"; + version = "2.13.1"; src = fetchurl { - url = "http://www.digip.org/jansson/releases/${name}.tar.gz"; + url = "https://digip.org/jansson/releases/${pname}-${version}.tar.gz"; sha256 = "0ks7gbs0j8p4dmmi2sq129mxy5gfg0z6220i1jk020mi2zd7gwzl"; }; diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index ab55e76f29a..40a46041caa 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "jbigkit-2.1"; + pname = "jbigkit"; + version = "2.1"; src = fetchurl { - url = "https://www.cl.cam.ac.uk/~mgk25/jbigkit/download/${name}.tar.gz"; + url = "https://www.cl.cam.ac.uk/~mgk25/jbigkit/download/${pname}-${version}.tar.gz"; sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy"; }; diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index 037225b86e5..077c4fe90fd 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "judy-1.0.5"; +stdenv.mkDerivation rec { + pname = "judy"; + version = "1.0.5"; src = fetchurl { - url = "mirror://sourceforge/judy/Judy-1.0.5.tar.gz"; + url = "mirror://sourceforge/judy/Judy-${version}.tar.gz"; sha256 = "1sv3990vsx8hrza1mvq3bhvv9m6ff08y4yz7swn6znszz24l0w6j"; }; diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 66bdcc03b96..b600a2ca4c3 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libtiff, libjpeg, zlib }: stdenv.mkDerivation rec { - name = "lcms2-2.12"; + pname = "lcms2"; + version = "2.12"; src = fetchurl { - url = "mirror://sourceforge/lcms/${name}.tar.gz"; + url = "mirror://sourceforge/lcms/${pname}-${version}.tar.gz"; sha256 = "sha256-GGY5hehkEARVrD5QdiXEOMNxA1TYXly7fNQEPhH+EPU="; }; diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix index d0ba4718655..dc0c8c0ed74 100644 --- a/pkgs/development/libraries/lesstif/default.nix +++ b/pkgs/development/libraries/lesstif/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, xlibsWrapper, libXp, libXau}: stdenv.mkDerivation rec { - name = "lesstif-0.95.2"; + pname = "lesstif"; + version = "0.95.2"; src = fetchurl { - url = "mirror://sourceforge/lesstif/${name}.tar.bz2"; + url = "mirror://sourceforge/lesstif/${pname}-${version}.tar.bz2"; sha256 = "1qzpxjjf7ri1jzv71mvq5m9g8hfaj5yzwp30rwxlm6n2b24a6jpb"; }; buildInputs = [xlibsWrapper]; diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix index ed945d9e5a0..f1ba199fc8e 100644 --- a/pkgs/development/libraries/levmar/default.nix +++ b/pkgs/development/libraries/levmar/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "levmar-2.6"; + pname = "levmar"; + version = "2.6"; src = fetchurl { - url = "https://www.ics.forth.gr/~lourakis/levmar/${name}.tgz"; + url = "https://www.ics.forth.gr/~lourakis/levmar/${pname}-${version}.tgz"; sha256 = "1mxsjip9x782z6qa6k5781wjwpvj5aczrn782m9yspa7lhgfzx1v"; }; diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix index c059b9d412a..8761ac1e5ef 100644 --- a/pkgs/development/libraries/libHX/default.nix +++ b/pkgs/development/libraries/libHX/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "libHX-3.22"; + pname = "libHX"; + version = "3.22"; src = fetchurl { - url = "mirror://sourceforge/libhx/libHX/3.22/${name}.tar.xz"; + url = "mirror://sourceforge/libhx/libHX/${version}/${pname}-${version}.tar.xz"; sha256 = "18w39j528lyg2026dr11f2xxxphy91cg870nx182wbd8cjlqf86c"; }; diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix index 6cbf1d20437..aac75fcc225 100644 --- a/pkgs/development/libraries/libantlr3c/default.nix +++ b/pkgs/development/libraries/libantlr3c/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "libantlr3c-3.4"; +stdenv.mkDerivation rec { + pname = "libantlr3c"; + version = "3.4"; src = fetchurl { - url = "https://www.antlr3.org/download/C/libantlr3c-3.4.tar.gz"; + url = "https://www.antlr3.org/download/C/libantlr3c-${version}.tar.gz"; sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"; }; diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/development/libraries/libasyncns/default.nix index 0dc26b68611..c94e1c04e0b 100644 --- a/pkgs/development/libraries/libasyncns/default.nix +++ b/pkgs/development/libraries/libasyncns/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libasyncns-0.8"; + pname = "libasyncns"; + version = "0.8"; src = fetchurl { - url = "http://0pointer.de/lennart/projects/libasyncns/${name}.tar.gz"; + url = "http://0pointer.de/lennart/projects/libasyncns/${pname}-${version}.tar.gz"; sha256 = "0x5b6lcic4cd7q0bx00x93kvpyzl7n2abbgvqbrlzrfb8vknc6jg"; }; diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix index f90815f4ee9..9c790172039 100644 --- a/pkgs/development/libraries/libaudclient/default.nix +++ b/pkgs/development/libraries/libaudclient/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib, dbus-glib }: stdenv.mkDerivation rec { - name = "libaudclient-3.5-rc2"; + pname = "libaudclient"; version = "3.5-rc2"; src = fetchurl { - url = "https://distfiles.audacious-media-player.org/${name}.tar.bz2"; + url = "https://distfiles.audacious-media-player.org/${pname}-${version}.tar.bz2"; sha256 = "0nhpgz0kg8r00z54q5i96pjk7s57krq3fvdypq496c7fmlv9kdap"; }; diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix index d9c10415b67..2ac90a11f08 100644 --- a/pkgs/development/libraries/libavc1394/default.nix +++ b/pkgs/development/libraries/libavc1394/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libraw1394 }: stdenv.mkDerivation rec { - name = "libavc1394-0.5.4"; + pname = "libavc1394"; + version = "0.5.4"; src = fetchurl { - url = "mirror://sourceforge/libavc1394/${name}.tar.gz"; + url = "mirror://sourceforge/libavc1394/${pname}-${version}.tar.gz"; sha256 = "0lsv46jdqvdx5hx92v0z2cz3yh6212pz9gk0k3513sbaa04zzcbw"; }; diff --git a/pkgs/development/libraries/libblocksruntime/default.nix b/pkgs/development/libraries/libblocksruntime/default.nix index 6ba832fb3cd..0ab38006442 100644 --- a/pkgs/development/libraries/libblocksruntime/default.nix +++ b/pkgs/development/libraries/libblocksruntime/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, clang }: stdenv.mkDerivation { - name = "blocksruntime-20140624"; + pname = "blocksruntime"; + version = "unstable-2014-06-24"; src = fetchFromGitHub { owner = "mackyle"; diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index c1b28e22e10..bf20211ee60 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { - name = "libcddb-1.3.2"; + pname = "libcddb"; + version = "1.3.2"; src = fetchurl { - url = "mirror://sourceforge/libcddb/${name}.tar.bz2"; + url = "mirror://sourceforge/libcddb/${pname}-${version}.tar.bz2"; sha256 = "0fr21a7vprdyy1bq6s99m0x420c9jm5fipsd63pqv8qyfkhhxkim"; }; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index b987c3dbb25..a8208820dff 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }: stdenv.mkDerivation rec { - name = "libcdr-0.1.6"; + pname = "libcdr"; + version = "0.1.6"; src = fetchurl { - url = "https://dev-www.libreoffice.org/src/${name}.tar.xz"; + url = "https://dev-www.libreoffice.org/src/${pname}-${version}.tar.xz"; sha256 = "0qgqlw6i25zfq1gf7f6r5hrhawlrgh92sg238kjpf2839aq01k81"; }; diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index 7be5f8b4000..fdcc2ae0081 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -1,35 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, python3, llvmPackages }: +{ lib, stdenv, fetchFromGitHub, ninja, cmake, python3, llvmPackages }: let llvm = llvmPackages.llvm; - clang = llvmPackages.clang; clang-unwrapped = llvmPackages.clang-unwrapped; in -stdenv.mkDerivation { - name = "libclc-2019-06-09"; +stdenv.mkDerivation rec { + pname = "libclc"; + version = "11.0.1"; src = fetchFromGitHub { - owner = "llvm-mirror"; - repo = "libclc"; - rev = "9f6204ec04a8cadb6bef57caa71e3161c4f398f2"; - sha256 = "03l9frx3iw3qdsb9rrscgzdwm6872gv6mkssvn027ndf9y321xk7"; + owner = "llvm"; + repo = "llvm-project"; + rev = "llvmorg-${version}"; + sha256 = "0bxh43hp1vl4axl3s9n2nb2ii8x1cbq98xz9c996f8rl5jy84ags"; }; + sourceRoot = "source/libclc"; - nativeBuildInputs = [ python3 llvm ]; - - strictDeps = true; - + # cmake expects all required binaries to be in the same place, so it will not be able to find clang without the patch postPatch = '' - sed -i 's,llvm_clang =.*,llvm_clang = "${clang-unwrapped}/bin/clang",' configure.py - sed -i 's,cxx_compiler =.*,cxx_compiler = "${clang}/bin/clang++",' configure.py + substituteInPlace CMakeLists.txt \ + --replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_BINDIR} NO_DEFAULT_PATH )' \ + 'find_program( LLVM_CLANG clang PATHS "${clang-unwrapped}/bin" NO_DEFAULT_PATH )' ''; - configurePhase = '' - ${python3.interpreter} ./configure.py --prefix=$out - ''; - - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ninja python3 ]; + buildInputs = [ llvm clang-unwrapped ]; + strictDeps = true; meta = with lib; { homepage = "http://libclc.llvm.org/"; diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/development/libraries/libcredis/default.nix index 247d341bce9..e0224d865d5 100644 --- a/pkgs/development/libraries/libcredis/default.nix +++ b/pkgs/development/libraries/libcredis/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "libcredis-0.2.3"; +stdenv.mkDerivation rec { + pname = "libcredis"; + version = "0.2.3"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/credis/credis-0.2.3.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/credis/credis-${version}.tar.gz"; sha256 = "1l3hlw9rrc11qggbg9a2303p3bhxxx2vqkmlk8avsrbqw15r1ayr"; }; diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix index eeb034ed067..51df4580978 100644 --- a/pkgs/development/libraries/libdaemon/default.nix +++ b/pkgs/development/libraries/libdaemon/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "libdaemon-0.14"; + pname = "libdaemon"; + version = "0.14"; src = fetchurl { - url = "${meta.homepage}/${name}.tar.gz"; + url = "http://0pointer.de/lennart/projects/libdaemon/${pname}-${version}.tar.gz"; sha256 = "0d5qlq5ab95wh1xc87rqrh1vx6i8lddka1w3f1zcqvcqdxgyn8zx"; }; diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/development/libraries/libdbi/default.nix index 48812f091be..ffbc3f67100 100644 --- a/pkgs/development/libraries/libdbi/default.nix +++ b/pkgs/development/libraries/libdbi/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libdbi-0.9.0"; + pname = "libdbi"; + version = "0.9.0"; src = fetchurl { - url = "mirror://sourceforge/libdbi/${name}.tar.gz"; + url = "mirror://sourceforge/libdbi/${pname}-${version}.tar.gz"; sha256 = "00s5ra7hdlq25iv23nwf4h1v3kmbiyzx0v9bhggjiii4lpf6ryys"; }; diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/development/libraries/libdivsufsort/default.nix index 0f332f8ac74..91b32082660 100644 --- a/pkgs/development/libraries/libdivsufsort/default.nix +++ b/pkgs/development/libraries/libdivsufsort/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "libdivsufsort-2.0.1"; +stdenv.mkDerivation rec { + pname = "libdivsufsort"; + version = "2.0.1"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libdivsufsort/libdivsufsort-2.0.1.tar.bz2"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libdivsufsort/libdivsufsort-${version}.tar.bz2"; sha256 = "1g0q40vb2k689bpasa914yi8sjsmih04017mw20zaqqpxa32rh2m"; }; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index ca90750b8c2..c5bf352ff57 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.106"; + version = "2.4.107"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1m3vwpabjg3az84vmyxi96jyd7rrqm6qkhk1gq41w5wv89aarn4j"; + sha256 = "127qf1rzhaf13vdd75a58v5q34617hvangjlfnlkcdh37gqcwm65"; }; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index 2b8cd51ba5f..be328c54c08 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -8,10 +8,11 @@ # files. stdenv.mkDerivation rec { - name = "libelf-0.8.13"; + pname = "libelf"; + version = "0.8.13"; src = fetchurl { - url = "https://fossies.org/linux/misc/old/${name}.tar.gz"; + url = "https://fossies.org/linux/misc/old/${pname}-${version}.tar.gz"; sha256 = "0vf7s9dwk2xkmhb79aigqm0x0yfbw1j0b9ksm51207qwr179n6jr"; }; diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix index 8699e83d0fd..5630047eed7 100644 --- a/pkgs/development/libraries/libestr/default.nix +++ b/pkgs/development/libraries/libestr/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libestr-0.1.11"; + pname = "libestr"; + version = "0.1.11"; src = fetchurl { - url = "http://libestr.adiscon.com/files/download/${name}.tar.gz"; + url = "http://libestr.adiscon.com/files/download/${pname}-${version}.tar.gz"; sha256 = "0910ifzcs8kpd3srrr4fvbacgh2zrc6yn7i4rwfj6jpzhlkjnqs6"; }; diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix index 8e5cc8685da..8efdb1bee02 100644 --- a/pkgs/development/libraries/libexttextcat/default.nix +++ b/pkgs/development/libraries/libexttextcat/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libexttextcat-3.4.5"; + pname = "libexttextcat"; + version = "3.4.5"; src = fetchurl { - url = "https://dev-www.libreoffice.org/src/libexttextcat/${name}.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libexttextcat/${pname}-${version}.tar.xz"; sha256 = "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k"; }; diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index ce1c35c7ec6..5a5d8b93057 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -1,7 +1,8 @@ {lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - name = "libf2c-20160102"; + pname = "libf2c"; + version = "20160102"; src = fetchurl { url = "http://www.netlib.org/f2c/libf2c.zip"; diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 29b76e34d65..48611dffb06 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -9,10 +9,11 @@ # files. stdenv.mkDerivation rec { - name = "libffi-3.3"; + pname = "libffi"; + version = "3.3"; src = fetchurl { - url = "https://sourceware.org/pub/libffi/${name}.tar.gz"; + url = "https://sourceware.org/pub/libffi/${pname}-${version}.tar.gz"; sha256 = "0mi0cpf8aa40ljjmzxb7im6dbj45bb0kllcd09xgmp834y9agyvj"; }; diff --git a/pkgs/development/libraries/libfishsound/default.nix b/pkgs/development/libraries/libfishsound/default.nix index 72dc2986711..bf578b969ef 100644 --- a/pkgs/development/libraries/libfishsound/default.nix +++ b/pkgs/development/libraries/libfishsound/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libvorbis, speex, flac, pkg-config }: stdenv.mkDerivation rec { - name = "libfishsound-1.0.0"; + pname = "libfishsound"; + version = "1.0.0"; src = fetchurl { - url = "http://downloads.xiph.org/releases/libfishsound/${name}.tar.gz"; + url = "https://downloads.xiph.org/releases/libfishsound/${pname}-${version}.tar.gz"; sha256 = "1iz7mn6hw2wg8ljaw74f4g2zdj68ib88x4vjxxg3gjgc5z75f2rf"; }; diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index 2576d426af5..589c08399a7 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "libfpx-1.3.1-7"; + pname = "libfpx"; + version = "1.3.1-7"; src = fetchurl { - url = "mirror://imagemagick/delegates/${name}.tar.xz"; + url = "mirror://imagemagick/delegates/${pname}-${version}.tar.xz"; sha256 = "1s28mwb06w6dj0zl6ashpj8m1qiyadawzl7cvbw7dmj1w39ipghh"; }; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index 0326b9c4f64..68801883df9 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, libusb-compat-0_1}: stdenv.mkDerivation rec { - name = "libftdi-0.20"; + pname = "libftdi"; + version = "0.20"; src = fetchurl { - url = "https://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz"; + url = "https://www.intra2net.com/en/developer/libftdi/download/${pname}-${version}.tar.gz"; sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii"; }; diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/development/libraries/libgssglue/default.nix index d4bf3ff1c2b..0d01b05e223 100644 --- a/pkgs/development/libraries/libgssglue/default.nix +++ b/pkgs/development/libraries/libgssglue/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libkrb5 }: stdenv.mkDerivation rec { - name = "libgssglue-0.4"; + pname = "libgssglue"; + version = "0.4"; src = fetchurl { - url = "http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/${name}.tar.gz"; + url = "http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/${pname}-${version}.tar.gz"; sha256 = "0fh475kxzlabwz30wz3bf7i8kfqiqzhfahayx3jj79rba1sily9z"; }; diff --git a/pkgs/development/libraries/libhangul/default.nix b/pkgs/development/libraries/libhangul/default.nix index eea513a137c..295ed9bf305 100644 --- a/pkgs/development/libraries/libhangul/default.nix +++ b/pkgs/development/libraries/libhangul/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "libhangul-0.1.0"; +stdenv.mkDerivation rec { + pname = "libhangul"; + version = "0.1.0"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libhangul/libhangul-0.1.0.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libhangul/libhangul-${version}.tar.gz"; sha256 = "0ni9b0v70wkm0116na7ghv03pgxsfpfszhgyj3hld3bxamfal1ar"; }; diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix index b6df338f122..9088d902206 100644 --- a/pkgs/development/libraries/libibmad/default.nix +++ b/pkgs/development/libraries/libibmad/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libibumad }: stdenv.mkDerivation rec { - name = "libibmad-1.3.13"; + pname = "libibmad"; + version = "1.3.13"; src = fetchurl { - url = "https://www.openfabrics.org/downloads/management/${name}.tar.gz"; + url = "https://www.openfabrics.org/downloads/management/${pname}-${version}.tar.gz"; sha256 = "02sj8k2jpcbiq8s0l2lqk4vwji2dbb2lc730cv1yzv0zr0hxgk8p"; }; diff --git a/pkgs/development/libraries/libibumad/default.nix b/pkgs/development/libraries/libibumad/default.nix index 6de97ad77cd..b9ebef7d4cc 100644 --- a/pkgs/development/libraries/libibumad/default.nix +++ b/pkgs/development/libraries/libibumad/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libibumad-1.3.10.2"; + pname = "libibumad"; + version = "1.3.10.2"; src = fetchurl { - url = "https://www.openfabrics.org/downloads/management/${name}.tar.gz"; + url = "https://www.openfabrics.org/downloads/management/${pname}-${version}.tar.gz"; sha256 = "0bkygb3lbpaj6s4vsyixybrrkcnilbijv4ga5p1xdwyr3gip83sh"; }; diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index 29d4c3432eb..a15b00a66ef 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -2,10 +2,11 @@ , useGTK ? config.libiodbc.gtk or false }: stdenv.mkDerivation rec { - name = "libiodbc-3.52.12"; + pname = "libiodbc"; + version = "3.52.12"; src = fetchurl { - url = "mirror://sourceforge/iodbc/${name}.tar.gz"; + url = "mirror://sourceforge/iodbc/${pname}-${version}.tar.gz"; sha256 = "0qpvklgr1lcn5g8xbz7fbc9rldqf9r8s6xybhqj20m4sglxgziai"; }; diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/pkgs/development/libraries/libiptcdata/default.nix index 140faab43b1..540d6d01a41 100644 --- a/pkgs/development/libraries/libiptcdata/default.nix +++ b/pkgs/development/libraries/libiptcdata/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "libiptcdata-1.0.4"; + pname = "libiptcdata"; + version = "1.0.4"; src = fetchurl { - url = "mirror://sourceforge/libiptcdata/${name}.tar.gz"; + url = "mirror://sourceforge/libiptcdata/${pname}-${version}.tar.gz"; sha256 = "03pfvkmmx762iydq0q207x2028d275pbdysfsgpmrr0ywy63pxkr"; }; diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix index 2135cc37d91..d2ef623bf15 100644 --- a/pkgs/development/libraries/libkate/default.nix +++ b/pkgs/development/libraries/libkate/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libogg, libpng }: stdenv.mkDerivation rec { - name = "libkate-0.4.1"; + pname = "libkate"; + version = "0.4.1"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libkate/${name}.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libkate/${pname}-${version}.tar.gz"; sha256 = "0s3vr2nxfxlf1k75iqpp4l78yf4gil3f0v778kvlngbchvaq23n4"; }; diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix index fe3038c3249..74d32a6cc74 100644 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ b/pkgs/development/libraries/liblastfmSF/default.nix @@ -1,14 +1,15 @@ { lib, stdenv, fetchurl, pkg-config, curl, openssl }: -stdenv.mkDerivation { - name = "liblastfm-SF-0.5"; +stdenv.mkDerivation rec { + pname = "liblastfm-SF"; + version = "0.5"; nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ curl openssl ]; src = fetchurl { - url = "mirror://sourceforge/liblastfm/libclastfm-0.5.tar.gz"; + url = "mirror://sourceforge/liblastfm/libclastfm-${version}.tar.gz"; sha256 = "0hpfflvfx6r4vvsbvdc564gkby8kr07p8ma7hgpxiy2pnlbpian9"; }; diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix index 5f5b23cdc3a..1a9ce7c331a 100644 --- a/pkgs/development/libraries/liblo/default.nix +++ b/pkgs/development/libraries/liblo/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "liblo-0.31"; + pname = "liblo"; + version = "0.31"; src = fetchurl { - url = "mirror://sourceforge/liblo/liblo/0.31/${name}.tar.gz"; + url = "mirror://sourceforge/liblo/liblo/${version}/${pname}-${version}.tar.gz"; sha256 = "0l67rkdhfa8cffa0nynql3lh2xlbn1454h6qxhjddp1029p48krb"; }; diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index b871dbdb19d..aa6cd0fd57d 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -1,11 +1,14 @@ -{ lib, stdenv, fetchurl, pkg-config, glib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib }: stdenv.mkDerivation rec { - name = "liblqr-1-0.4.2"; + pname = "liblqr-1"; + version = "0.4.2"; - src = fetchurl { - url = "${meta.homepage}/local--files/en:download-page/${name}.tar.bz2"; - sha256 = "0dzikxzjz5zmy3vnydh90aqk23q0qm8ykx6plz6p4z90zlp84fhp"; + src = fetchFromGitHub { + owner = "carlobaldassi"; + repo = "liblqr"; + rev = "v${version}"; + sha256 = "10mrl5k3l2hxjhz4w93n50xwywp6y890rw2vsjcgai8627x5f1df"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/libltc/default.nix b/pkgs/development/libraries/libltc/default.nix index 2391d281d46..a7d52fe17cf 100644 --- a/pkgs/development/libraries/libltc/default.nix +++ b/pkgs/development/libraries/libltc/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "libltc-1.3.1"; +stdenv.mkDerivation rec { + pname = "libltc"; + version = "1.3.1"; src = fetchurl { - url = "https://github.com/x42/libltc/releases/download/v1.3.1/libltc-1.3.1.tar.gz"; + url = "https://github.com/x42/libltc/releases/download/v${version}/libltc-${version}.tar.gz"; sha256 = "173h9dgmain3nyrwk6q2d7yl4fnh4vacag4s2p01n5b7nyrkxrjh"; }; diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix index 44c55cb4682..50bbf8383e6 100644 --- a/pkgs/development/libraries/libmcrypt/default.nix +++ b/pkgs/development/libraries/libmcrypt/default.nix @@ -2,11 +2,12 @@ with lib; -stdenv.mkDerivation { - name = "libmcrypt-2.5.8"; +stdenv.mkDerivation rec { + pname = "libmcrypt"; + version = "2.5.8"; src = fetchurl { - url = "mirror://sourceforge/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.gz"; + url = "mirror://sourceforge/mcrypt/Libmcrypt/${version}/libmcrypt-${version}.tar.gz"; sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4"; }; diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index 0ee0701d929..099dab139c4 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }: -stdenv.mkDerivation { - name = "libmemcached-1.0.18"; +stdenv.mkDerivation rec { + pname = "libmemcached"; + version = "1.0.18"; src = fetchurl { - url = "https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz"; + url = "https://launchpad.net/libmemcached/${lib.versions.majorMinor version}/${version}/+download/libmemcached-${version}.tar.gz"; sha256 = "10jzi14j32lpq0if0p9vygcl2c1352hwbywzvr9qzq7x6aq0nb72"; }; diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index f1704a527b4..15a68bdce58 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, zlib, libpng, libjpeg, lcms2 }: stdenv.mkDerivation rec { - name = "libmng-2.0.3"; + pname = "libmng"; + version = "2.0.3"; src = fetchurl { - url = "mirror://sourceforge/libmng/${name}.tar.xz"; + url = "mirror://sourceforge/libmng/${pname}-${version}.tar.xz"; sha256 = "1lvxnpds0vcf0lil6ia2036ghqlbl740c4d2sz0q5g6l93fjyija"; }; diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix index 4e99258a3e8..a8ec4c5f3b9 100644 --- a/pkgs/development/libraries/libmnl/default.nix +++ b/pkgs/development/libraries/libmnl/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libmnl-1.0.4"; + pname = "libmnl"; + version = "1.0.4"; src = fetchurl { - url = "https://netfilter.org/projects/libmnl/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libmnl/files/${pname}-${version}.tar.bz2"; sha256 = "108zampspaalv44zn0ar9h386dlfixpd149bnxa5hsi8kxlqj7qp"; }; diff --git a/pkgs/development/libraries/libmongo-client/default.nix b/pkgs/development/libraries/libmongo-client/default.nix index f81f6313338..a6a20141cc6 100644 --- a/pkgs/development/libraries/libmongo-client/default.nix +++ b/pkgs/development/libraries/libmongo-client/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib }: stdenv.mkDerivation rec { - name = "libmongo-client-0.1.8"; + pname = "libmongo-client"; + version = "0.1.8"; src = fetchFromGitHub { owner = "algernon"; repo = "libmongo-client"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1cjx06i3gd9zkyvwm2ysjrf0hkhr7bjg3c27s7n0y31j10igfjp0"; }; diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix index 58da7560e13..0e813375b9a 100644 --- a/pkgs/development/libraries/libmp3splt/default.nix +++ b/pkgs/development/libraries/libmp3splt/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libtool, libmad, libid3tag }: stdenv.mkDerivation rec { - name = "libmp3splt-0.9.2"; + pname = "libmp3splt"; + version = "0.9.2"; src = fetchurl { - url = "mirror://sourceforge/mp3splt/${name}.tar.gz"; + url = "mirror://sourceforge/mp3splt/${pname}-${version}.tar.gz"; sha256 = "1p1mn2hsmj5cp40fnc8g1yfvk72p8pjxi866gjdkgjsqrr7xdvih"; }; diff --git a/pkgs/development/libraries/libmpcdec/default.nix b/pkgs/development/libraries/libmpcdec/default.nix index b42d9a3d1e4..75368722124 100644 --- a/pkgs/development/libraries/libmpcdec/default.nix +++ b/pkgs/development/libraries/libmpcdec/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "libmpcdec-1.2.6"; +stdenv.mkDerivation rec { + pname = "libmpcdec"; + version = "1.2.6"; src = fetchurl { - url = "https://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2"; + url = "https://files.musepack.net/source/libmpcdec-${version}.tar.bz2"; sha256 = "1a0jdyga1zfi4wgkg3905y6inghy3s4xfs5m4x7pal08m0llkmab"; }; diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix index df3460970d1..43d829b9834 100644 --- a/pkgs/development/libraries/libmrss/default.nix +++ b/pkgs/development/libraries/libmrss/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, curl, libnxml, pkg-config}: -stdenv.mkDerivation { - name = "libmrss-0.19.2"; +stdenv.mkDerivation rec { + pname = "libmrss"; + version = "0.19.2"; src = fetchurl { - url = "https://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz"; + url = "https://www.autistici.org/bakunin/libmrss/libmrss-${version}.tar.gz"; sha256 = "02r1bgj8qlkn63xqfi5yq8y7wrilxcnkycaag8qskhg5ranic507"; }; diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix index ab67d544a1d..e1ad8305188 100644 --- a/pkgs/development/libraries/libmusicbrainz/default.nix +++ b/pkgs/development/libraries/libmusicbrainz/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchurl, cmake, neon, libdiscid }: stdenv.mkDerivation rec { - name = "libmusicbrainz-3.0.3"; + pname = "libmusicbrainz"; + version = "3.0.3"; nativeBuildInputs = [ cmake ]; buildInputs = [ neon libdiscid ]; src = fetchurl { - url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz"; + url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${pname}-${version}.tar.gz"; sha256 = "1i9qly13bwwmgj68vma766hgvsd1m75236haqsp9zgh5znlmkm3z"; }; diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index 17e43ec29d9..9a0b90e16a4 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook, popt, libiconv }: -stdenv.mkDerivation (rec { - name = "libnatspec-0.3.0"; +stdenv.mkDerivation rec { + pname = "libnatspec"; + version = "0.3.0"; src = fetchurl { - url = "mirror://sourceforge/natspec/${name}.tar.bz2"; + url = "mirror://sourceforge/natspec/${pname}-${version}.tar.bz2"; sha256 = "0wffxjlc8svilwmrcg3crddpfrpv35mzzjgchf8ygqsvwbrbb3b7"; }; @@ -20,4 +21,4 @@ stdenv.mkDerivation (rec { }; } // lib.optionalAttrs (!stdenv.isLinux) { propagatedBuildInputs = [ libiconv ]; -}) +} diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index 5fe5ba86bea..7ca9ec5acb6 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -2,10 +2,11 @@ stdenv.mkDerivation rec { - name = "liboauth-1.0.3"; + pname = "liboauth"; + version = "1.0.3"; src = fetchurl { - url = "mirror://sourceforge/liboauth/${name}.tar.gz"; + url = "mirror://sourceforge/liboauth/${pname}-${version}.tar.gz"; sha256 = "07w1aq8y8wld43wmbk2q8134p3bfkp2vma78mmsfgw2jn1bh3xhd"; }; diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix index 15856c0262c..ecf013363ad 100644 --- a/pkgs/development/libraries/liboggz/default.nix +++ b/pkgs/development/libraries/liboggz/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libogg, pkg-config }: stdenv.mkDerivation rec { - name = "liboggz-1.1.1"; + pname = "liboggz"; + version = "1.1.1"; src = fetchurl { - url = "http://downloads.xiph.org/releases/liboggz/${name}.tar.gz"; + url = "https://downloads.xiph.org/releases/liboggz/${pname}-${version}.tar.gz"; sha256 = "0nj17lhnsw4qbbk8jy4j6a78w6v2llhqdwq46g44mbm9w2qsvbvb"; }; diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix index c309c70e3d3..932133e0192 100644 --- a/pkgs/development/libraries/liboping/default.nix +++ b/pkgs/development/libraries/liboping/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, ncurses ? null, perl ? null, lib }: stdenv.mkDerivation rec { - name = "liboping-1.10.0"; + pname = "liboping"; + version = "1.10.0"; src = fetchurl { - url = "http://verplant.org/liboping/files/${name}.tar.bz2"; + url = "https://noping.cc/files/${pname}-${version}.tar.bz2"; sha256 = "1n2wkmvw6n80ybdwkjq8ka43z2x8mvxq49byv61b52iyz69slf7b"; }; diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix index 14270a36ec5..9db1354677d 100644 --- a/pkgs/development/libraries/libowfat/default.nix +++ b/pkgs/development/libraries/libowfat/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libowfat-0.32"; + pname = "libowfat"; + version = "0.32"; src = fetchurl { - url = "https://www.fefe.de/libowfat/${name}.tar.xz"; + url = "https://www.fefe.de/libowfat/${pname}-${version}.tar.xz"; sha256 = "1hcqg7pvy093bxx8wk7i4gvbmgnxz2grxpyy7b4mphidjbcv7fgl"; }; diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix index 7bf99e739f3..184cb2e7de4 100644 --- a/pkgs/development/libraries/libraw1394/default.nix +++ b/pkgs/development/libraries/libraw1394/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libraw1394-2.1.2"; + pname = "libraw1394"; + version = "2.1.2"; src = fetchurl { - url = "mirror://kernel/linux/libs/ieee1394/${name}.tar.gz"; + url = "mirror://kernel/linux/libs/ieee1394/${pname}-${version}.tar.gz"; sha256 = "0z5md84941ky5l7afayx2z6j0sk0mildxbjajq6niznd44ky7i6x"; }; diff --git a/pkgs/development/libraries/libresample/default.nix b/pkgs/development/libraries/libresample/default.nix index 0756874b3e7..f466229cfe8 100644 --- a/pkgs/development/libraries/libresample/default.nix +++ b/pkgs/development/libraries/libresample/default.nix @@ -6,10 +6,11 @@ let sha256 = "063w8rqxw87fc89gas47vk0ll7xl8cy7d8g70gm1l62bqkkajklx"; }; in -stdenv.mkDerivation { - name = "libresample-0.1.3"; +stdenv.mkDerivation rec { + pname = "libresample"; + version = "0.1.3"; src = fetchurl { - url = "mirror://debian/pool/main/libr/libresample/libresample_0.1.3.orig.tar.gz"; + url = "mirror://debian/pool/main/libr/libresample/libresample_${version}.orig.tar.gz"; sha256 = "05a8mmh1bw5afqx0kfdqzmph4x2npcs4idx0p0v6q95lwf22l8i0"; }; patches = [ patch ]; diff --git a/pkgs/development/libraries/librevisa/default.nix b/pkgs/development/libraries/librevisa/default.nix index 892bbbbbfc0..12d1da460fb 100644 --- a/pkgs/development/libraries/librevisa/default.nix +++ b/pkgs/development/libraries/librevisa/default.nix @@ -3,10 +3,11 @@ # TODO: add VXI development files, for VXI-11 (TCPIP) support stdenv.mkDerivation rec { - name = "librevisa-0.0.20130412"; + pname = "librevisa"; + version = "0.0.20130412"; src = fetchurl { - url = "http://www.librevisa.org/download/${name}.tar.gz"; + url = "http://www.librevisa.org/download/${pname}-${version}.tar.gz"; sha256 = "0bjzq23s3xzw0l9qx4l8achrx5id8xdd6r52lvdl4a28dxzbcfhq"; }; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index c5e4b6e8215..05b7a00be59 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "librsvg"; - version = "2.50.6"; + version = "2.50.7"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "iAdJGZOoevVgxdP1I7jUpLugxQilYPH5NxdytRR3rFc="; + sha256 = "//thsIzVKCqq4UegKzBRZqdCb60iqLlCdwjw8vxCbrw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix index 5a2b8636774..d30fc55fc77 100644 --- a/pkgs/development/libraries/libs3/default.nix +++ b/pkgs/development/libraries/libs3/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, curl, libxml2 }: stdenv.mkDerivation { - name = "libs3-2018-12-03"; + pname = "libs3"; + version = "unstable-2018-12-03"; src = fetchFromGitHub { owner = "bji"; diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index 5cf872c3fc3..5f0863bc49c 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -4,10 +4,11 @@ let inherit (lib) optionals optionalString; in stdenv.mkDerivation rec { - name = "libsamplerate-0.1.9"; + pname = "libsamplerate"; + version = "0.1.9"; src = fetchurl { - url = "http://www.mega-nerd.com/SRC/${name}.tar.gz"; + url = "http://www.mega-nerd.com/SRC/${pname}-${version}.tar.gz"; sha256 = "1ha46i0nbibq0pl0pjwcqiyny4hj8lp1bnl4dpxm64zjw9lb2zha"; }; diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix index 0a2adc4126f..79f46ffca1f 100644 --- a/pkgs/development/libraries/libserialport/default.nix +++ b/pkgs/development/libraries/libserialport/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, udev, darwin }: stdenv.mkDerivation rec { - name = "libserialport-0.1.1"; + pname = "libserialport"; + version = "0.1.1"; src = fetchurl { - url = "https://sigrok.org/download/source/libserialport/${name}.tar.gz"; + url = "https://sigrok.org/download/source/libserialport/${pname}-${version}.tar.gz"; sha256 = "17ajlwgvyyrap8z7f16zcs59pksvncwbmd3mzf98wj7zqgczjaja"; }; diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 1e5cdb38948..5b284e4408c 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -4,10 +4,11 @@ # need pkg-config so that libshout installs ${out}/lib/pkgconfig/shout.pc stdenv.mkDerivation rec { - name = "libshout-2.4.5"; + pname = "libshout"; + version = "2.4.5"; src = fetchurl { - url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz"; + url = "https://downloads.xiph.org/releases/libshout/${pname}-${version}.tar.gz"; sha256 = "sha256-2eVoZopnOZTr4/HrXyvuBuMjal25K40MSH4cD4hqaJA="; }; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index 64ae1713fd4..ba8bc3f334e 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libsodium-1.0.18"; + pname = "libsodium"; + version = "1.0.18"; src = fetchurl { - url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz"; + url = "https://download.libsodium.org/libsodium/releases/${pname}-${version}.tar.gz"; sha256 = "1h9ncvj23qbbni958knzsli8dvybcswcjbx0qjjgi922nf848l3g"; }; diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index 465aa941f39..81e661a9421 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, pkg-config, ghostscript, cairo }: stdenv.mkDerivation rec { - name = "libspectre-0.2.7"; + pname = "libspectre"; + version = "0.2.7"; src = fetchurl { - url = "https://libspectre.freedesktop.org/releases/${name}.tar.gz"; + url = "https://libspectre.freedesktop.org/releases/${pname}-${version}.tar.gz"; sha256 = "1v63lqc6bhhxwkpa43qmz8phqs8ci4dhzizyy16d3vkb20m846z8"; }; diff --git a/pkgs/development/libraries/libspectrum/default.nix b/pkgs/development/libraries/libspectrum/default.nix index 09aa03e6f67..c373f7c24ff 100644 --- a/pkgs/development/libraries/libspectrum/default.nix +++ b/pkgs/development/libraries/libspectrum/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perl, pkg-config, audiofile, bzip2, glib, libgcrypt, zlib }: stdenv.mkDerivation rec { - name = "libspectrum-1.5.0"; + pname = "libspectrum"; + version = "1.5.0"; src = fetchurl { - url = "mirror://sourceforge/fuse-emulator/${name}.tar.gz"; + url = "mirror://sourceforge/fuse-emulator/${pname}-${version}.tar.gz"; sha256 = "sha256-o1PLRumxooEGHYFjU+oBDQpv545qF6oLe3QnHKXkrPw="; }; diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index fe2717cfeb3..5daf93b943b 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -5,10 +5,11 @@ }: stdenv.mkDerivation rec { - name = "libstatgrab-0.92"; + pname = "libstatgrab"; + version = "0.92"; src = fetchurl { - url = "https://ftp.i-scream.org/pub/i-scream/libstatgrab/${name}.tar.gz"; + url = "https://ftp.i-scream.org/pub/i-scream/libstatgrab/${pname}-${version}.tar.gz"; sha256 = "15m1sl990l85ijf8pnc6hdfha6fqyiq74mijrzm3xz4zzxm91wav"; }; diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix index 76f5b6b4b8c..697616f01f3 100644 --- a/pkgs/development/libraries/libstroke/default.nix +++ b/pkgs/development/libraries/libstroke/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, automake, autoconf, xlibsWrapper}: -stdenv.mkDerivation { - name = "libstroke-0.5.1"; +stdenv.mkDerivation rec { + pname = "libstroke"; + version = "0.5.1"; src = fetchurl { - url = "https://web.archive.org/web/20161204100704/http://etla.net/libstroke/libstroke-0.5.1.tar.gz"; + url = "https://web.archive.org/web/20161204100704/http://etla.net/libstroke/${pname}-${version}.tar.gz"; sha256 = "0bbpqzsqh9zrc6cg62f6vp1p4dzvv37blsd0gdlzdskgwvyzba8d"; }; diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index 8f0c4d818f4..1e88218aa0d 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, libogg, libvorbis, pkg-config, autoreconfHook, fetchpatch }: stdenv.mkDerivation rec { - name = "libtheora-1.1.1"; + pname = "libtheora"; + version = "1.1.1"; src = fetchurl { - url = "http://downloads.xiph.org/releases/theora/${name}.tar.gz"; + url = "https://downloads.xiph.org/releases/theora/${pname}-${version}.tar.gz"; sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0"; }; diff --git a/pkgs/development/libraries/libtiff/aarch64-darwin.nix b/pkgs/development/libraries/libtiff/aarch64-darwin.nix new file mode 100644 index 00000000000..5de481066f6 --- /dev/null +++ b/pkgs/development/libraries/libtiff/aarch64-darwin.nix @@ -0,0 +1,53 @@ +{ lib, stdenv +, fetchurl + +, pkg-config +, cmake + +, libdeflate +, libjpeg +, xz +, zlib +}: + +stdenv.mkDerivation rec { + pname = "libtiff"; + version = "4.2.0"; + + src = fetchurl { + url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; + sha256 = "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b"; + }; + + cmakeFlags = lib.optional stdenv.isDarwin "-DCMAKE_SKIP_BUILD_RPATH=OFF"; + + # FreeImage needs this patch + patches = [ ./headers-cmake.patch ]; + + outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; + + postFixup = '' + moveToOutput include/tif_dir.h $dev_private + moveToOutput include/tif_config.h $dev_private + moveToOutput include/tiffiop.h $dev_private + ''; + + nativeBuildInputs = [ cmake pkg-config ]; + + propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection) + + buildInputs = [ libdeflate ]; # TODO: move all propagatedBuildInputs to buildInputs. + + enableParallelBuilding = true; + + doInstallCheck = true; + installCheckTarget = "test"; + + meta = with lib; { + description = "Library and utilities for working with the TIFF image file format"; + homepage = "https://libtiff.gitlab.io/libtiff"; + changelog = "https://libtiff.gitlab.io/libtiff/v${version}.html"; + license = licenses.libtiff; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 46c13bbe4a9..ea246790020 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,8 +1,8 @@ { lib, stdenv , fetchurl +, autoreconfHook , pkg-config -, cmake , libdeflate , libjpeg @@ -10,19 +10,17 @@ , zlib }: +#FIXME: fix aarch64-darwin build and get rid of ./aarch64-darwin.nix + stdenv.mkDerivation rec { pname = "libtiff"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; - sha256 = "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b"; + sha256 = "1j3snghqjbhwmnm5vz3dr1zm68dj15mgbx1wqld7vkl7n2nfaihf"; }; - cmakeFlags = if stdenv.isDarwin then [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" - ] else null; - # FreeImage needs this patch patches = [ ./headers.patch ]; @@ -34,7 +32,9 @@ stdenv.mkDerivation rec { moveToOutput include/tiffiop.h $dev_private ''; - nativeBuildInputs = [ cmake pkg-config ]; + # If you want to change to a different build system, please make + # sure cross-compilation works first! + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection) @@ -42,12 +42,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doInstallCheck = true; - installCheckTarget = "test"; + doCheck = true; meta = with lib; { description = "Library and utilities for working with the TIFF image file format"; - homepage = "http://download.osgeo.org/libtiff"; + homepage = "https://libtiff.gitlab.io/libtiff"; + changelog = "https://libtiff.gitlab.io/libtiff/v${version}.html"; + maintainers = with maintainers; [ qyliss ]; license = licenses.libtiff; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libtiff/headers-cmake.patch b/pkgs/development/libraries/libtiff/headers-cmake.patch new file mode 100644 index 00000000000..5a00502ef28 --- /dev/null +++ b/pkgs/development/libraries/libtiff/headers-cmake.patch @@ -0,0 +1,13 @@ +diff -ruN a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt +--- a/libtiff/CMakeLists.txt 2019-05-31 13:05:22.849705817 +0000 ++++ b/libtiff/CMakeLists.txt 2020-11-27 21:50:03.527831837 +0000 +@@ -42,6 +42,9 @@ + libtiffxx.map) + + set(tiff_HEADERS ++ tiffiop.h ++ ${CMAKE_CURRENT_BINARY_DIR}/tif_config.h ++ tif_dir.h + tiff.h + tiffio.h + tiffvers.h) diff --git a/pkgs/development/libraries/libtiff/headers.patch b/pkgs/development/libraries/libtiff/headers.patch index 5a00502ef28..e1c681502b3 100644 --- a/pkgs/development/libraries/libtiff/headers.patch +++ b/pkgs/development/libraries/libtiff/headers.patch @@ -1,13 +1,16 @@ -diff -ruN a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt ---- a/libtiff/CMakeLists.txt 2019-05-31 13:05:22.849705817 +0000 -+++ b/libtiff/CMakeLists.txt 2020-11-27 21:50:03.527831837 +0000 -@@ -42,6 +42,9 @@ - libtiffxx.map) +diff --git i/libtiff/Makefile.am w/libtiff/Makefile.am +index 44522b62..d66e5948 100644 +--- i/libtiff/Makefile.am ++++ w/libtiff/Makefile.am +@@ -36,8 +36,11 @@ EXTRA_DIST = \ + tiffconf.h.cmake.in - set(tiff_HEADERS -+ tiffiop.h -+ ${CMAKE_CURRENT_BINARY_DIR}/tif_config.h -+ tif_dir.h - tiff.h - tiffio.h - tiffvers.h) + libtiffinclude_HEADERS = \ ++ tif_config.h \ ++ tif_dir.h \ + tiff.h \ + tiffio.h \ ++ tiffiop.h \ + tiffvers.h + + if HAVE_CXX diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/development/libraries/libu2f-server/default.nix index 7f596978cf0..aac71bda369 100644 --- a/pkgs/development/libraries/libu2f-server/default.nix +++ b/pkgs/development/libraries/libu2f-server/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, json_c, openssl, check, file, help2man, which, gengetopt }: stdenv.mkDerivation rec { - name = "libu2f-server-1.1.0"; + pname = "libu2f-server"; + version = "1.1.0"; src = fetchurl { - url = "https://developers.yubico.com/libu2f-server/Releases/${name}.tar.xz"; + url = "https://developers.yubico.com/libu2f-server/Releases/${pname}-${version}.tar.xz"; sha256 = "0xx296nmmqa57w0v5p2kasl5zr1ms2gh6qi4lhv6xvzbmjp3rkcd"; }; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 6b1a0120e49..b630fca1670 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { version = "1.41.0"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-i6AYD1Ony0L2+3yWK6bxOfwoZEvd9qCg33QSqA7bRXI="; }; + patches = [ + (fetchpatch { + # Fixes out-of-bounds read in uv__idna_toascii() function + name = "CVE-2021-22918.patch"; + url = "https://github.com/libuv/libuv/commit/b7466e31e4bee160d82a68fca11b1f61d46debae.patch"; + sha256 = "0fbjy0jh7r9nrd27ag1k6am6d8p5ih7p0ywvjn53nq4cyqdqxhi7"; + }) + ]; + postPatch = let toDisable = [ "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 32ecc34a287..1eee4b3870b 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, meson, pkg-config, ninja, wayland +{ stdenv, lib, fetchFromGitHub, meson, pkg-config, ninja, wayland-scanner , libdrm , minimal ? false, libva-minimal -, libX11, libXext, libXfixes, libffi, libGL +, libX11, libXext, libXfixes, wayland, libffi, libGL , mesa }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; - nativeBuildInputs = [ meson pkg-config ninja wayland ]; + nativeBuildInputs = [ meson pkg-config ninja wayland-scanner ]; buildInputs = [ libdrm ] ++ lib.optionals (!minimal) [ libva-minimal libX11 libXext libXfixes wayland libffi libGL ]; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 5e1c0c671d9..6c2cb095a81 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -15,12 +15,13 @@ }: stdenv.mkDerivation rec { - name = "libvirt-glib-4.0.0"; + pname = "libvirt-glib"; + version = "4.0.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "https://libvirt.org/sources/glib/${name}.tar.xz"; + url = "https://libvirt.org/sources/glib/${pname}-${version}.tar.xz"; sha256 = "hCP3Bp2qR2MHMh0cEeLswoU0DNMsqfwFIHdihD7erL0="; }; diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix index 7a996d3b807..3e61ee8a6a1 100644 --- a/pkgs/development/libraries/libvisual/default.nix +++ b/pkgs/development/libraries/libvisual/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib }: stdenv.mkDerivation rec { - name = "libvisual-0.4.0"; + pname = "libvisual"; + version = "0.4.0"; src = fetchurl { - url = "mirror://sourceforge/libvisual/${name}.tar.gz"; + url = "mirror://sourceforge/libvisual/${pname}-${version}.tar.gz"; sha256 = "1my1ipd5k1ixag96kwgf07bgxkjlicy9w22jfxb2kq95f6wgsk8b"; }; diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index 9fd3fc59ab3..281c7744a33 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libogg, pkg-config }: stdenv.mkDerivation rec { - name = "libvorbis-1.3.7"; + pname = "libvorbis"; + version = "1.3.7"; src = fetchurl { - url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz"; + url = "http://downloads.xiph.org/releases/vorbis/${pname}-${version}.tar.xz"; sha256 = "0jwmf87x5sdis64rbv0l87mdpah1rbilkkxszipbzg128f9w8g5k"; }; diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix index 90914d4186e..066dcb4f34f 100644 --- a/pkgs/development/libraries/libvterm/default.nix +++ b/pkgs/development/libraries/libvterm/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib, ncurses }: stdenv.mkDerivation rec { - name = "libvterm-0.99.7"; + pname = "libvterm"; + version = "0.99.7"; src = fetchurl { - url = "mirror://sourceforge/libvterm/${name}.tar.gz"; + url = "mirror://sourceforge/libvterm/${pname}-${version}.tar.gz"; sha256 = "10gaqygmmwp0cwk3j8qflri5caf8vl3f7pwfl2svw5whv8wkn0k2"; }; diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index b6ef6fa49b2..151d4c7ee48 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -26,8 +26,12 @@ let NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable"; - postInstall = "rm -rf ${placeholder "out"}/share/libwebsockets-test-server"; - disallowedReferences = [ stdenv.cc.cc ]; # $out/share/libwebsockets-test-server/plugins/libprotocol_*.so refers to crtbeginS.o + postInstall = '' + rm -r ${placeholder "out"}/share/libwebsockets-test-server + ''; + + # $out/share/libwebsockets-test-server/plugins/libprotocol_*.so refers to crtbeginS.o + disallowedReferences = [ stdenv.cc.cc ]; meta = with lib; { description = "Light, portable C library for websockets"; diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index cf85d57a7f2..bf0df220935 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libwpd, zlib, librevenge }: stdenv.mkDerivation rec { - name = "libwpg-0.3.3"; + pname = "libwpg"; + version = "0.3.3"; src = fetchurl { - url = "mirror://sourceforge/libwpg/${name}.tar.xz"; + url = "mirror://sourceforge/libwpg/${pname}-${version}.tar.xz"; sha256 = "074x159immf139szkswv2zapnq75p7xk10dbha2p9193hgwggcwr"; }; diff --git a/pkgs/development/libraries/libx86/src-for-default.nix b/pkgs/development/libraries/libx86/src-for-default.nix index a681d9e5890..b7e432d8109 100644 --- a/pkgs/development/libraries/libx86/src-for-default.nix +++ b/pkgs/development/libraries/libx86/src-for-default.nix @@ -1,9 +1,7 @@ rec { + pname="libx86"; version="1.1"; - name="libx86-1.1"; hash="0j6h6bc02c6qi0q7c1ncraz4d1hkm5936r35rfsp4x1jrc233wav"; url="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-${version}.tar.gz"; - advertisedUrl="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-1.1.tar.gz"; - - + advertisedUrl="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-${version}.tar.gz"; } diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index b738089c853..8bec962c0ae 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -16,6 +16,7 @@ , withWaylandTools ? stdenv.isLinux , wayland , wayland-protocols +, wayland-scanner }: stdenv.mkDerivation rec { @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config bison doxygen ] - ++ lib.optional withWaylandTools wayland; + ++ lib.optional withWaylandTools wayland-scanner; buildInputs = [ xkeyboard_config libxcb libxml2 ] ++ lib.optionals withWaylandTools [ wayland wayland-protocols ]; checkInputs = [ python3 ]; diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix index b9a2b6de3cc..2d2a0089c44 100644 --- a/pkgs/development/libraries/libxmi/default.nix +++ b/pkgs/development/libraries/libxmi/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libtool }: -stdenv.mkDerivation { - name = "libxmi-1.2"; +stdenv.mkDerivation rec { + pname = "libxmi"; + version = "1.2"; src = fetchurl { - url = "mirror://gnu/libxmi/libxmi-1.2.tar.gz"; + url = "mirror://gnu/libxmi/${pname}-${version}.tar.gz"; sha256 = "03d4ikh29l38rl1wavb0icw7m5pp7yilnv7bb2k8qij1dinsymlx"; }; diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix index d78bb1a7d94..47dfcab5a49 100644 --- a/pkgs/development/libraries/libxmp/default.nix +++ b/pkgs/development/libraries/libxmp/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libxmp-4.5.0"; + pname = "libxmp"; + version = "4.5.0"; meta = with lib; { description = "Extended module player library"; @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://sourceforge/xmp/libxmp/${name}.tar.gz"; + url = "mirror://sourceforge/xmp/libxmp/${pname}-${version}.tar.gz"; sha256 = "sha256-eEfSYhEtFOhEL0TlrG7Z3bylTCUShHILVjyFKzHybnU="; }; } diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix index a7d35950f03..7f314410667 100644 --- a/pkgs/development/libraries/libykneomgr/default.nix +++ b/pkgs/development/libraries/libykneomgr/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pcsclite, libzip, help2man }: stdenv.mkDerivation rec { - name = "libykneomgr-0.1.8"; + pname = "libykneomgr"; + version = "0.1.8"; src = fetchurl { - url = "https://developers.yubico.com/libykneomgr/Releases/${name}.tar.gz"; + url = "https://developers.yubico.com/libykneomgr/Releases/${pname}-${version}.tar.gz"; sha256 = "12gqblz400kr11m1fdr1vvwr85lgy5v55zy0cf782whpk8lyyj97"; }; diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix index b3aa2b57bdf..3b05be00d90 100644 --- a/pkgs/development/libraries/libyubikey/default.nix +++ b/pkgs/development/libraries/libyubikey/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libyubikey-1.13"; + pname = "libyubikey"; + version = "1.13"; src = fetchurl { - url = "https://developers.yubico.com/yubico-c/Releases/${name}.tar.gz"; + url = "https://developers.yubico.com/yubico-c/Releases/${pname}-${version}.tar.gz"; sha256 = "009l3k2zyn06dbrlja2d4p2vfnzjhlcqxi88v02mlrnb17mx1v84"; }; diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index b93cc96bde0..4544fd08aa5 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -2,10 +2,11 @@ alsa-lib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }: stdenv.mkDerivation rec { - name = "lirc-0.10.1"; + pname = "lirc"; + version = "0.10.1"; src = fetchurl { - url = "mirror://sourceforge/lirc/${name}.tar.bz2"; + url = "mirror://sourceforge/lirc/${pname}-${version}.tar.bz2"; sha256 = "1whlyifvvc7w04ahq07nnk1h18wc8j7c6wnvlb6mszravxh3qxcb"; }; diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix index d4b703a2bda..f7a10d9c31d 100644 --- a/pkgs/development/libraries/log4cpp/default.nix +++ b/pkgs/development/libraries/log4cpp/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "log4cpp-1.1.3"; + pname = "log4cpp"; + version = "1.1.3"; src = fetchurl { - url = "mirror://sourceforge/log4cpp/${name}.tar.gz"; + url = "mirror://sourceforge/log4cpp/${pname}-${version}.tar.gz"; sha256 = "07gmr3jyaf2239n9sp6h7hwdz1pv7b7aka8n06gmr2fnlmaymfrc"; }; diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index 8ea933f0e3a..f5b0111a1a7 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "lzo-2.10"; + pname = "lzo"; + version = "2.10"; src = fetchurl { - url = "${meta.homepage}/download/${name}.tar.gz"; + url = "https://www.oberhumer.com/opensource/lzo/download/${pname}-${version}.tar.gz"; sha256 = "0wm04519pd3g8hqpjqhfr72q8qmbiwqaxcs3cndny9h86aa95y60"; }; diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index 3b0e811097e..e3b3f288cb5 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,8 +1,9 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "matio-1.5.21"; + pname = "matio"; + version = "1.5.21"; src = fetchurl { - url = "mirror://sourceforge/matio/${name}.tar.gz"; + url = "mirror://sourceforge/matio/${pname}-${version}.tar.gz"; sha256 = "sha256-IYCRd+VYOefJTa2nRO5Vwd6n11fdqriWBXdtUBIvsGU="; }; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 725451da943..2790d88387e 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, fetchpatch, buildPackages , meson, pkg-config, ninja -, intltool, bison, flex, file, python3Packages +, intltool, bison, flex, file, python3Packages, wayland-scanner , expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau @@ -31,7 +31,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.1.4"; + version = "21.1.5"; branch = versions.major version; self = stdenv.mkDerivation { @@ -45,7 +45,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "02z9g6zpkg1p1sm8f84xdi7v2n7x534x9pn565bvcr411527y5qz"; + sha256 = "0vbn40azh7izrxvb15c51z3lfcb9zas2v1wc4z9cxvja0y9p4b02"; }; prePatch = "patchShebangs ."; @@ -143,7 +143,7 @@ self = stdenv.mkDerivation { intltool bison flex file python3Packages.python python3Packages.Mako ] ++ lib.optionals (elem "wayland" eglPlatforms) [ - wayland # For wayland-scanner during the build + wayland-scanner ]; propagatedBuildInputs = with xorg; [ diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix index cdcc0548abb..b5eaee26aa0 100644 --- a/pkgs/development/libraries/msilbc/default.nix +++ b/pkgs/development/libraries/msilbc/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, ilbc, mediastreamer, pkg-config }: stdenv.mkDerivation rec { - name = "msilbc-2.1.2"; + pname = "msilbc"; + version = "2.1.2"; src = fetchurl { - url = "mirror://savannah/linphone/plugins/sources/${name}.tar.gz"; + url = "mirror://savannah/linphone/plugins/sources/${pname}-${version}.tar.gz"; sha256 = "07j02y994ybh274fp7ydjvi76h34y2c34ndwjpjfcwwr03b48cfp"; }; diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix index 7873608e589..4a510762f7f 100644 --- a/pkgs/development/libraries/mtdev/default.nix +++ b/pkgs/development/libraries/mtdev/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mtdev-1.1.6"; + pname = "mtdev"; + version = "1.1.6"; src = fetchurl { - url = "http://bitmath.org/code/mtdev/${name}.tar.bz2"; + url = "https://bitmath.org/code/mtdev/${pname}-${version}.tar.bz2"; sha256 = "1q700h9dqcm3zl6c3gj0qxxjcx6ibw2c51wjijydhwdcm26v5mqm"; }; diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index 52d294525a0..7997fc18d11 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, openssl }: -stdenv.mkDerivation { - name = "mysocketw-031026"; +stdenv.mkDerivation rec { + pname = "mysocketw"; + version = "031026"; src = fetchurl { - url = "http://www.digitalfanatics.org/cal/socketw/files/SocketW031026.tar.gz"; + url = "https://www.digitalfanatics.org/cal/socketw/files/SocketW${version}.tar.gz"; sha256 = "0crinikhdl7xihzmc3k3k41pgxy16d5ci8m9sza1lbibns7pdwj4"; }; diff --git a/pkgs/development/libraries/nvidia-video-sdk/default.nix b/pkgs/development/libraries/nvidia-video-sdk/default.nix index 22161e3dc1d..ab674833ebf 100644 --- a/pkgs/development/libraries/nvidia-video-sdk/default.nix +++ b/pkgs/development/libraries/nvidia-video-sdk/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, unzip }: -stdenv.mkDerivation { - name = "nvidia-video-sdk-6.0.1"; +stdenv.mkDerivation rec { + pname = "nvidia-video-sdk"; + version = "6.0.1"; src = fetchurl { url = "https://developer.nvidia.com/video-sdk-601"; - name = "nvidia_video_sdk_6.0.1.zip"; + name = "nvidia_video_sdk_${version}.zip"; sha256 = "08h1vnqsv22js9v3pyim5yb80z87baxb7s2g5gsvvjax07j7w8h5"; }; diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index d9c82f79bb3..211821e084c 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "ode"; - version = "0.12"; + version = "0.16.2"; src = fetchurl { - url = "mirror://sourceforge/opende/ode-${version}.tar.bz2"; - sha256 = "0l63ymlkgfp5cb0ggqwm386lxmc3al21nb7a07dd49f789d33ib5"; + url = "https://bitbucket.org/odedevs/${pname}/downloads/${pname}-${version}.tar.gz"; + sha256 = "08hgh4gqdk77jcw8b7gq2mwsfg4a5v5y0j7g42bxiqhmn3ffnsmj"; }; meta = with lib; { description = "Open Dynamics Engine"; - homepage = "https://sourceforge.net/projects/opende"; + homepage = "https://www.ode.org"; platforms = platforms.linux; license = with licenses; [ bsd3 lgpl21 lgpl3 zlib ]; }; diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index b93e517def6..522c8cfa4a1 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -1,5 +1,5 @@ { - stdenv, lib, fetchFromGitHub, symlinkJoin, + stdenv, lib, fetchFromGitHub, cmake, expat, libyamlcpp, ilmbase, pystring, # Base dependencies glew, freeglut, # Only required on Linux @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { sha256 = "194j9jp5c8ws0fryiz936wyinphnpzwpqnzvw9ryx6rbiwrba487"; }; - nativeBuildInputs = [ cmake (symlinkJoin { name = "expat"; paths = [ expat.out expat.dev ]; }) ]; - buildInputs = [ expat.out libyamlcpp ilmbase pystring ] + nativeBuildInputs = [ cmake ]; + buildInputs = [ expat libyamlcpp ilmbase pystring ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon GLUT Cocoa ] ++ lib.optionals pythonBindings [ python3Packages.python python3Packages.pybind11 ] diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index dc8004d8f48..d60b7b7fc43 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "openexr"; - version = "2.5.3"; + version = "2.5.7"; outputs = [ "bin" "dev" "out" "doc" ]; @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { owner = "AcademySoftwareFoundation"; repo = "openexr"; rev = "v${version}"; - sha256 = "xyYdRrwAYdnRZmErIK0tZspguqtrXvixO5+6nMDoOh8="; + sha256 = "1vja0rbilcd1wn184w8nbcmck00n7bfwlddwiaxw8dhj64nx4468"; }; patches = [ # Fix pkg-config paths (fetchpatch { - url = "https://github.com/AcademySoftwareFoundation/openexr/commit/6442fb71a86c09fb0a8118b6dbd93bcec4883a3c.patch"; - sha256 = "bwD5WTKPT4DjOJDnPXIvT5hJJkH0b71Vo7qupWO9nPA="; + url = "https://github.com/AcademySoftwareFoundation/openexr/commit/2f19a01923885fda75ec9d19332de080ec7102bd.patch"; + sha256 = "1yxmrdzq1x1911wdzwnzr29jmg2r4wd4yx3vhjn0y5dpny0ri5y5"; }) ]; diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index c5a83f782f4..9398c4d2f36 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -25,6 +25,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-MZTOIt468bdPCS7UVfr5hQZUsVy3TpY/TjRrNySIL70="; excludes = [ "ChangeLog" ]; }) + # fix a minor bug + # https://gitlab.com/hepcedar/yoda/-/merge_requests/45 + (fetchpatch { + name = "yoda-fix-yodascale-for-gz.patch"; + url = "https://gitlab.com/hepcedar/yoda/-/commit/b03162aeaa2c99e38512ba6e4818d2e0a825b757.diff"; + sha256 = "sha256-IMuPalQ/GKcdJOKAlwE/IRWtxDdu0inoj+A9nbRl6Gs="; + }) ]; nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index 7a1c3971579..da95f9ef698 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -2,11 +2,12 @@ , libXi, libSM, libXmu, libXext, libX11 }: stdenv.mkDerivation rec { - name = "plib-1.8.5"; + pname = "plib"; + version = "1.8.5"; src = fetchurl { # XXX: The author doesn't use the orthodox SF way to store tarballs. - url = "http://plib.sourceforge.net/dist/${name}.tar.gz"; + url = "http://plib.sourceforge.net/dist/${pname}-${version}.tar.gz"; sha256 = "0cha71mflpa10vh2l7ipyqk67dq2y0k5xbafwdks03fwdyzj4ns8"; }; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index bc7f7e80d9c..a8b012a2099 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -20,28 +20,14 @@ in stdenv.mkDerivation rec { pname = "polkit"; - version = "0.118"; + version = "0.119"; src = fetchurl { url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.gz"; - sha256 = "0swmg37jsxsxfsd2b3qm0l3zxr9ldvhpjw8lsgq3j8q7wy2fjm3d"; + sha256 = "0p0zzmr0kh3mpmqya4q27y4h9b920zp5ya0i8909ahp9hvdrymy8"; }; - patches = [ - # Don't use etc/dbus-1/system.d - # Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/11 - (fetchpatch { - url = "https://gitlab.freedesktop.org/polkit/polkit/commit/5dd4e22efd05d55833c4634b56e473812b5acbf2.patch"; - sha256 = "17lv7xj5ksa27iv4zpm4zwd4iy8zbwjj4ximslfq3sasiz9kxhlp"; - }) - (fetchpatch { - # https://www.openwall.com/lists/oss-security/2021/06/03/1 - # https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/79 - name = "CVE-2021-3560.patch"; - url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81.patch"; - sha256 = "157ddsizgr290jsb8fpafrc37gc1qw5pdvl351vnn3pzhqs7n6f4"; - }) - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + patches = lib.optionals stdenv.hostPlatform.isMusl [ # Make netgroup support optional (musl does not have it) # Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/10 # We use the version of the patch that Alpine uses successfully. @@ -110,18 +96,22 @@ stdenv.mkDerivation rec { inherit doCheck; checkInputs = [ dbus ]; checkPhase = '' + runHook preCheck + # unfortunately this test needs python-dbusmock, but python-dbusmock needs polkit, # leading to a circular dependency substituteInPlace test/Makefile --replace polkitbackend "" # tests need access to the system bus dbus-run-session --config-file=${./system_bus.conf} -- sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS make check' + + runHook postCheck ''; meta = with lib; { homepage = "http://www.freedesktop.org/wiki/Software/polkit"; description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; - license = licenses.gpl2; + license = licenses.lgpl2Plus; platforms = platforms.unix; maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); }; diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 3bbc4c6da33..f22878ec829 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -7,6 +7,7 @@ , libtiff , curl , gtest +, fetchpatch }: stdenv.mkDerivation rec { @@ -20,6 +21,14 @@ stdenv.mkDerivation rec { sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9"; }; + patches = [ + (fetchpatch { # https://github.com/OSGeo/PROJ/issues/2557 + name = "gie_self_tests-fail.diff"; # included in >= 8.0.1 + url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff"; + sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf"; + }) + ]; + postPatch = lib.optionalString (version == "7.2.1") '' substituteInPlace CMakeLists.txt \ --replace "MAJOR 7 MINOR 2 PATCH 0" "MAJOR 7 MINOR 2 PATCH 1" diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix index 82ee5c3ae44..c1a86b1f397 100644 --- a/pkgs/development/libraries/psqlodbc/default.nix +++ b/pkgs/development/libraries/psqlodbc/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libiodbc, postgresql, openssl }: stdenv.mkDerivation rec { - name = "psqlodbc-09.01.0200"; + pname = "psqlodbc"; + version = "09.01.0200"; src = fetchurl { - url = "https://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz"; + url = "https://ftp.postgresql.org/pub/odbc/versions/src/${pname}-${version}.tar.gz"; sha256 = "0b4w1ahfpp34jpscfk2kv9050lh3xl9pvcysqvaigkcd0vsk1hl9"; }; diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix index f5257ad0e8e..fe0616b7d7a 100644 --- a/pkgs/development/libraries/qmlbox2d/default.nix +++ b/pkgs/development/libraries/qmlbox2d/default.nix @@ -1,6 +1,7 @@ {lib, stdenv, qtdeclarative, fetchFromGitHub, qmake }: stdenv.mkDerivation { - name = "qml-box2d-2018-04-06"; + pname = "qml-box2d"; + version = "unstable-2018-04-06"; src = fetchFromGitHub { owner = "qml-box2d"; repo = "qml-box2d"; diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index 2b0be6f0b3d..2c62ea27d19 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -1,12 +1,15 @@ -{ lib, stdenv, fetchurl, qtbase, qmake, qca-qt5 }: +{ lib, stdenv, fetchFromGitHub, qtbase, qmake, qca-qt5 }: -stdenv.mkDerivation { - name = "qoauth-2.0.0"; +stdenv.mkDerivation rec { + pname = "qoauth"; + version = "2.0.0"; - src = fetchurl { - url = "https://github.com/ayoy/qoauth/archive/v2.0.0.tar.gz"; - name = "qoauth-2.0.0.tar.gz"; - sha256 = "a28005986410d333e03d077679cdf6c504ec5a33342867dc0f9fb0b74285e333"; + src = fetchFromGitHub { + owner = "ayoy"; + repo = "qoauth"; + rev = "v${version}"; + name = "qoauth-${version}.tar.gz"; + sha256 = "1b2jdqs526ac635yb2whm049spcsk7almnnr6r5b4yqhq922anw3"; }; postPatch = '' diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix index 5bc30db059e..dd6a7606f6e 100644 --- a/pkgs/development/libraries/qtwebkit-plugins/default.nix +++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, qmake, qtwebkit, hunspell }: stdenv.mkDerivation { - name = "qtwebkit-plugins-2017-01-25"; + pname = "qtwebkit-plugins"; + version = "unstable-2017-01-25"; src = fetchFromGitHub { owner = "QupZilla"; diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index e158fe34885..a5dcfedb849 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, qt4, qmake4Hook }: stdenv.mkDerivation rec { - name = "qwt-5.2.3"; + pname = "qwt"; + version = "5.2.3"; src = fetchurl { - url = "mirror://sourceforge/qwt/${name}.tar.bz2"; + url = "mirror://sourceforge/qwt/${pname}-${version}.tar.bz2"; sha256 = "1dqa096mm6n3bidfq2b67nmdsvsw4ndzzd1qhl6hn8skcwqazzip"; }; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - qmakeFlags="$qmakeFlags INSTALLBASE=$out -after doc.path=$out/share/doc/${name}" + qmakeFlags="$qmakeFlags INSTALLBASE=$out -after doc.path=$out/share/doc/${pname}-${version}" ''; meta = with lib; { diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix index 760546fc471..f177dc768a6 100644 --- a/pkgs/development/libraries/readosm/default.nix +++ b/pkgs/development/libraries/readosm/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, expat, zlib, geos, libspatialite }: stdenv.mkDerivation rec { - name = "readosm-1.1.0a"; + pname = "readosm"; + version = "1.1.0a"; src = fetchurl { - url = "https://www.gaia-gis.it/gaia-sins/readosm-sources/${name}.tar.gz"; + url = "https://www.gaia-gis.it/gaia-sins/readosm-sources/${pname}-${version}.tar.gz"; sha256 = "0igif2bxf4dr82glxz9gyx5mmni0r2dsnx9p9k6pxv3c4lfhaz6v"; }; diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix index 0ff6db17561..edab4037a15 100644 --- a/pkgs/development/libraries/sbc/default.nix +++ b/pkgs/development/libraries/sbc/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libsndfile }: stdenv.mkDerivation rec { - name = "sbc-1.4"; + pname = "sbc"; + version = "1.4"; src = fetchurl { - url = "http://www.kernel.org/pub/linux/bluetooth/${name}.tar.xz"; + url = "https://www.kernel.org/pub/linux/bluetooth/${pname}-${version}.tar.xz"; sha256 = "1jal98pnrjkzxlkiqy0ykh4qmgnydz9bmsp1jn581p5kddpg92si"; }; diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index 7706366dd6d..2b49bfeb498 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, orc, pkg-config, fetchpatch, autoreconfHook }: -stdenv.mkDerivation { - name = "schroedinger-1.0.11"; +stdenv.mkDerivation rec { + pname = "schroedinger"; + version = "1.0.11"; src = fetchurl { - url = "https://download.videolan.org/contrib/schroedinger-1.0.11.tar.gz"; + url = "https://download.videolan.org/contrib/${pname}-${version}.tar.gz"; sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy"; }; diff --git a/pkgs/development/libraries/science/biology/EBTKS/default.nix b/pkgs/development/libraries/science/biology/EBTKS/default.nix index b75ac06627f..2a832fc7c37 100644 --- a/pkgs/development/libraries/science/biology/EBTKS/default.nix +++ b/pkgs/development/libraries/science/biology/EBTKS/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "EBTKS"; - name = "${pname}-2017-09-23"; + version = "unstable-2017-09-23"; src = fetchFromGitHub { owner = "BIC-MNI"; diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/pkgs/development/libraries/science/math/liblbfgs/default.nix index 20c5a2070a0..3c194648c2a 100644 --- a/pkgs/development/libraries/science/math/liblbfgs/default.nix +++ b/pkgs/development/libraries/science/math/liblbfgs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "liblbfgs-1.10"; +stdenv.mkDerivation rec { + pname = "liblbfgs"; + version = "1.10"; configureFlags = [ "--enable-sse2" ]; src = fetchurl { - url = "https://github.com/downloads/chokkan/liblbfgs/liblbfgs-1.10.tar.gz"; + url = "https://github.com/downloads/chokkan/liblbfgs/liblbfgs-${version}.tar.gz"; sha256 = "1kv8d289rbz38wrpswx5dkhr2yh4fg4h6sszkp3fawxm09sann21"; }; diff --git a/pkgs/development/libraries/science/math/metis/default.nix b/pkgs/development/libraries/science/math/metis/default.nix index b06b432372a..da79f6d6249 100644 --- a/pkgs/development/libraries/science/math/metis/default.nix +++ b/pkgs/development/libraries/science/math/metis/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, unzip, cmake }: -stdenv.mkDerivation { - name = "metis-5.1.0"; +stdenv.mkDerivation rec { + name = "metis"; + version = "5.1.0"; src = fetchurl { - url = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz"; + url = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-${version}.tar.gz"; sha256 = "1cjxgh41r8k6j029yxs8msp3z6lcnpm16g5pvckk35kc7zhfpykn"; }; diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/pkgs/development/libraries/science/math/openspecfun/default.nix index a341264d989..cb72fbd2ca4 100644 --- a/pkgs/development/libraries/science/math/openspecfun/default.nix +++ b/pkgs/development/libraries/science/math/openspecfun/default.nix @@ -1,10 +1,13 @@ -{ lib, stdenv, fetchurl, gfortran }: +{ lib, stdenv, fetchFromGitHub, gfortran }: -stdenv.mkDerivation { - name = "openspecfun-0.5.3"; - src = fetchurl { - url = "https://github.com/JuliaLang/openspecfun/archive/v0.5.3.tar.gz"; - sha256 = "1rs1bv8jq751fv9vq79890wqf9xlbjc7lvz3ighzyfczbyjcf18m"; +stdenv.mkDerivation rec { + pname = "openspecfun"; + version = "0.5.3"; + src = fetchFromGitHub { + owner = "JuliaLang"; + repo = "openspecfun"; + rev = "v${version}"; + sha256 = "0pfw6l3ch7isz403llx7inxlvavqh01jh1hb9dpidi86sjjx9kfh"; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix index 0fcb4884de5..f6b9194a608 100644 --- a/pkgs/development/libraries/scmccid/default.nix +++ b/pkgs/development/libraries/scmccid/default.nix @@ -2,15 +2,16 @@ assert stdenv ? cc && stdenv.cc.libc != null; -stdenv.mkDerivation { - name = "scmccid-5.0.11"; +stdenv.mkDerivation rec { + pname = "scmccid"; + version = "5.0.11"; src = if stdenv.hostPlatform.system == "i686-linux" then (fetchurl { - url = "http://www.scmmicro.com/support/download/scmccid_5.0.11_linux.tar.gz"; + url = "http://www.scmmicro.com/support/download/scmccid_${version}_linux.tar.gz"; sha256 = "1r5wkarhzl09ncgj55baizf573czw0nplh1pgddzx9xck66kh5bm"; }) else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl { - url = "http://www.scmmicro.com/support/download/scmccid_5.0.11_linux_x64.tar.gz"; + url = "http://www.scmmicro.com/support/download/scmccid_${version}_linux_x64.tar.gz"; sha256 = "0k9lzlk01sl4ycfqgrqqy3bildz0mcr1r0kkicgjz96l4s0jgz0i"; }) else throw "Architecture not supported"; diff --git a/pkgs/development/libraries/shhopt/default.nix b/pkgs/development/libraries/shhopt/default.nix index 0657b13e557..664d4f3330a 100644 --- a/pkgs/development/libraries/shhopt/default.nix +++ b/pkgs/development/libraries/shhopt/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "shhopt-1.1.7"; + pname = "shhopt"; + version = "1.1.7"; src = fetchurl { - url = "https://shh.thathost.com/pub-unix/files/${name}.tar.gz"; + url = "https://shh.thathost.com/pub-unix/files/${pname}-${version}.tar.gz"; sha256 = "0yd6bl6qw675sxa81nxw6plhpjf9d2ywlm8a5z66zyjf28sl7sds"; }; diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix index 9973e04a670..56c4eccf434 100644 --- a/pkgs/development/libraries/slib/default.nix +++ b/pkgs/development/libraries/slib/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, unzip, scheme, texinfo }: stdenv.mkDerivation rec { - name = "slib-3b5"; + pname = "slib"; + version = "3b5"; src = fetchurl { - url = "https://groups.csail.mit.edu/mac/ftpdir/scm/${name}.zip"; + url = "https://groups.csail.mit.edu/mac/ftpdir/scm/${pname}-${version}.zip"; sha256 = "0q0p2d53p8qw2592yknzgy2y1p5a9k7ppjx0cfrbvk6242c4mdpq"; }; diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 41d776c6869..8750bdf2ac6 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -2,11 +2,12 @@ { lib, stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }: -stdenv.mkDerivation { - name = "snack-2.2.10"; +stdenv.mkDerivation rec { + pname = "snack"; + version = "2.2.10"; src = fetchurl { - url = "https://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz"; + url = "https://www.speech.kth.se/snack/dist/${pname}${version}.tar.gz"; sha256 = "07p89jv9qnjqkszws9sssq93ayvwpdnkcxrvyicbm4mb8x2pdzjb"; }; diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix index c9debd36110..46520714c51 100644 --- a/pkgs/development/libraries/soprano/default.nix +++ b/pkgs/development/libraries/soprano/default.nix @@ -2,10 +2,11 @@ , pkg-config }: stdenv.mkDerivation rec { - name = "soprano-2.9.4"; + pname = "soprano"; + version = "2.9.4"; src = fetchurl { - url = "mirror://sourceforge/soprano/${name}.tar.bz2"; + url = "mirror://sourceforge/soprano/${pname}-${version}.tar.bz2"; sha256 = "1rg0x7yg0a1cbnxz7kqk52580wla8jbnj4d4r3j7l7g7ajyny1k4"; }; diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index f87d79ca6e4..643a83c4700 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook, pkg-config, fftw }: stdenv.mkDerivation rec { - name = "speexdsp-1.2.0"; + pname = "speexdsp"; + version = "1.2.0"; src = fetchurl { - url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz"; + url = "https://downloads.xiph.org/releases/speex/${pname}-${version}.tar.gz"; sha256 = "0wa7sqpk3x61zz99m7lwkgr6yv62ml6lfgs5xja65vlvdzy44838"; }; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index cef23779c7a..001123ead60 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; }; + configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.targetPlatform) [ + "lf_cv_sane_realloc=yes" + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxcb xcbutil ]; diff --git a/pkgs/development/libraries/stlport/default.nix b/pkgs/development/libraries/stlport/default.nix index 5af77d90053..75004b87ee7 100644 --- a/pkgs/development/libraries/stlport/default.nix +++ b/pkgs/development/libraries/stlport/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "STLport-5.2.1"; + pname = "STLport"; + version = "5.2.1"; src = fetchurl { - url = "mirror://sourceforge/stlport/${name}.tar.bz2"; + url = "mirror://sourceforge/stlport/${pname}-${version}.tar.bz2"; sha256 = "1jbgak1m1qk7d4gyn1p2grbws2icsf7grbs3dh44ai9ck1xh0nvm"; }; diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix index 95afae065ef..acb52cc53db 100644 --- a/pkgs/development/libraries/taglib-extras/default.nix +++ b/pkgs/development/libraries/taglib-extras/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, cmake, taglib, zlib}: stdenv.mkDerivation rec { - name = "taglib-extras-1.0.1"; + pname = "taglib-extras"; + version = "1.0.1"; src = fetchurl { - url = "http://ftp.rz.uni-wuerzburg.de/pub/unix/kde/taglib-extras/1.0.1/src/${name}.tar.gz"; + url = "https://ftp.rz.uni-wuerzburg.de/pub/unix/kde/taglib-extras/${version}/src/${pname}-${version}.tar.gz"; sha256 = "0cln49ws9svvvals5fzxjxlzqm0fzjfymn7yfp4jfcjz655nnm7y"; }; buildInputs = [ taglib ]; diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix index feb3825b3d4..8cd9900b65b 100644 --- a/pkgs/development/libraries/tclap/default.nix +++ b/pkgs/development/libraries/tclap/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tclap-1.2.3"; + pname = "tclap"; + version = "1.2.3"; src = fetchurl { - url = "mirror://sourceforge/tclap/${name}.tar.gz"; + url = "mirror://sourceforge/tclap/${pname}-${version}.tar.gz"; sha256 = "sha256-GefbUoFUDxVDSHcLw6dIRXX09Umu+OAKq8yUs5X3c8k="; }; diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix index f4c24a126e5..c676f8f0174 100644 --- a/pkgs/development/libraries/tidyp/default.nix +++ b/pkgs/development/libraries/tidyp/default.nix @@ -1,11 +1,14 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "tidyp-1.04"; + pname = "tidyp"; + version = "1.04"; - src = fetchurl { - url = "https://github.com/downloads/petdance/tidyp/${name}.tar.gz"; - sha256 = "0f5ky0ih4vap9c6j312jn73vn8m2bj69pl2yd3a5nmv35k9zmc10"; + src = fetchFromGitHub { + owner = "petdance"; + repo = "tidyp"; + rev = version; + sha256 = "0jslskziwzk4hb6i640fvpnbv2zxrvim6pdx2gwx5wyc64aviskc"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix index 22d3266b93a..4b3c8a363eb 100644 --- a/pkgs/development/libraries/tokyo-cabinet/default.nix +++ b/pkgs/development/libraries/tokyo-cabinet/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "tokyocabinet-1.4.48"; + pname = "tokyocabinet"; + version = "1.4.48"; src = fetchurl { - url = "http://fallabs.com/tokyocabinet/${name}.tar.gz"; + url = "https://dbmx.net/tokyocabinet/${pname}-${version}.tar.gz"; sha256 = "140zvr0n8kvsl0fbn2qn3f2kh3yynfwnizn4dgbj47m975yg80x0"; }; diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix index e515dd1673f..9ac026ee94b 100644 --- a/pkgs/development/libraries/tre/default.nix +++ b/pkgs/development/libraries/tre/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, fetchpatch}: stdenv.mkDerivation rec { - name = "tre-0.8.0"; + pname = "tre"; + version = "0.8.0"; src = fetchurl { - url = "https://laurikari.net/tre/${name}.tar.gz"; + url = "https://laurikari.net/tre/${pname}-${version}.tar.gz"; sha256 = "1pd7qsa7vc3ybdc6h2gr4pm9inypjysf92kab945gg4qa6jp11my"; }; diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 7cfd9f1edf5..7306243bca9 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -10,10 +10,11 @@ assert xor (openssl != null) (gnutls != null); assert !(xor (openssl != null) (zlib != null)); stdenv.mkDerivation rec { - name = "ucommon-7.0.0"; + pname = "ucommon"; + version = "7.0.0"; src = fetchurl { - url = "mirror://gnu/commoncpp/${name}.tar.gz"; + url = "mirror://gnu/commoncpp/${pname}-${version}.tar.gz"; sha256 = "6ac9f76c2af010f97e916e4bae1cece341dc64ca28e3881ff4ddc3bc334060d7"; }; diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix index 0235912ce53..5c3140a177c 100644 --- a/pkgs/development/libraries/vcdimager/default.nix +++ b/pkgs/development/libraries/vcdimager/default.nix @@ -2,10 +2,11 @@ , libiconv, darwin }: stdenv.mkDerivation rec { - name = "vcdimager-2.0.1"; + pname = "vcdimager"; + version = "2.0.1"; src = fetchurl { - url = "mirror://gnu/vcdimager/${name}.tar.gz"; + url = "mirror://gnu/vcdimager/${pname}-${version}.tar.gz"; sha256 = "0ypnb1vp49nmzp5571ynlz6n1gh90f23w3z4x95hb7c2p7pmylb7"; }; diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 6858cd93ab3..d87adabf56c 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }: stdenv.mkDerivation { - name = "vxl-1.17.0-nix1"; + pname = "vxl"; + version = "1.17.0-nix1"; src = fetchFromGitHub { owner = "vxl"; diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index 81c1b51e658..7983806a309 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -1,11 +1,14 @@ -{ lib, stdenv, fetchurl, cmake, alsa-lib, freepats }: +{ lib, stdenv, fetchFromGitHub, cmake, alsa-lib, freepats }: stdenv.mkDerivation rec { - name = "wildmidi-0.4.3"; + pname = "wildmidi"; + version = "0.4.4"; - src = fetchurl { - url = "https://github.com/Mindwerks/wildmidi/archive/${name}.tar.gz"; - sha256 = "1igkxv4axnqap59d8pjgqj94x0khn3fdd2hq6wdvkd2v8nb5m3j9"; + src = fetchFromGitHub { + owner = "Mindwerks"; + repo = "wildmidi"; + rev = "${pname}-${version}"; + sha256 = "08fbbsvw6pkwwqarjwcvdp8mq4zn5sgahf025hynwc6rvf4sp167"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix index 0bded9d92dd..94dea0edae1 100644 --- a/pkgs/development/libraries/wtk/default.nix +++ b/pkgs/development/libraries/wtk/default.nix @@ -3,11 +3,12 @@ assert stdenv.hostPlatform.system == "i686-linux"; stdenv.mkDerivation rec { - name = "sun-java-wtk-2.5.2_01"; + pname = "sun-java-wtk"; + version = "2.5.2_01"; src = requireFile { - url = meta.homepage; - name = "sun_java_wireless_toolkit-2.5.2_01-linuxi486.bin.sh"; + url = "http://java.sun.com/products/sjwtoolkit/download.html"; + name = "sun_java_wireless_toolkit-${version}-linuxi486.bin.sh"; sha256 = "1cjb9c27847wv0hq3j645ckn4di4vsfvp29fr4zmdqsnvk4ahvj1"; }; diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix index db36c2a34c1..dd5cd21d405 100644 --- a/pkgs/development/libraries/xbase/default.nix +++ b/pkgs/development/libraries/xbase/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "xbase-3.1.2"; +stdenv.mkDerivation rec { + pname = "xbase"; + version = "3.1.2"; src = fetchurl { - url = "mirror://sourceforge/xdb/xbase64-3.1.2.tar.gz"; + url = "mirror://sourceforge/xdb/xbase64-${version}.tar.gz"; sha256 = "17287kz1nmmm64y7zp9nhhl7slzlba09h6cc83w4mvsqwd9w882r"; }; diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix index 3bcc40b5da3..2cb64fe6eb2 100644 --- a/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/pkgs/development/libraries/xmlrpc-c/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, curl, libxml2 }: stdenv.mkDerivation rec { - name = "xmlrpc-c-1.51.07"; + pname = "xmlrpc-c"; + version = "1.51.07"; src = fetchurl { - url = "mirror://sourceforge/xmlrpc-c/${name}.tgz"; + url = "mirror://sourceforge/xmlrpc-c/${pname}-${version}.tgz"; sha256 = "sha256-hNIK4z+SdYL4IdYcC5GUrvvx15JFkKE/qdpa4WmK3tk="; }; diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index df47168c79b..645329f83cd 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "yajl-2.1.0"; + pname = "yajl"; + version = "2.1.0"; - src = fetchurl { - url = "https://github.com/lloyd/yajl/tarball/2.1.0"; - name = "${name}.tar.gz"; - sha256 = "0f6yrjc05aa26wfi7lqn2gslm19m6rm81b30ksllpkappvh162ji"; + src = fetchFromGitHub { + owner = "lloyd"; + repo = "yajl"; + rev = version; + sha256 = "00yj06drb6izcxfxfqlhimlrb089kka0w0x8k27pyzyiq7qzcvml"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index 3364fe796e7..4b5793dc133 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, unzip, runtimeShell }: -stdenv.mkDerivation { - name = "avr8-burn-omat-2.1.2"; +stdenv.mkDerivation rec { + pname = "avr8-burn-omat"; + version = "2.1.2"; src = fetchurl { - url = "http://avr8-burn-o-mat.aaabbb.de/AVR8_Burn-O-Mat_2_1_2.zip"; + url = "http://avr8-burn-o-mat.aaabbb.de/AVR8_Burn-O-Mat_${lib.replaceStrings ["."] ["_"] version}.zip"; sha256 = "02k0fd0cd3y1yqip36wr3bkxbywp8913w4y7jdg6qwqxjnii58ln"; }; diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix deleted file mode 100644 index e00ff3acce0..00000000000 --- a/pkgs/development/mobile/flashtool/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ stdenv, lib, requireFile, p7zip, jre, libusb1, platform-tools, gtk2, glib, libXtst }: - -# TODO: -# -# The FlashTool and FlashToolConsole scripts are messy and should probably we -# replaced entirely. All these scripts do is try to guess the environment in -# which to run the Java binary (and they guess wrong on NixOS). -# -# The FlashTool scripts run 'chmod' on the binaries installed in the Nix -# store. These commands fail, naturally, because the Nix story is (hopefully) -# mounted read-only. This doesn't matter, though, because the build -# instructions fix the executable bits already. - -stdenv.mkDerivation rec { - name = "flashtool-0.9.14.0"; - - src = requireFile { - url = "http://dfiles.eu/files/n8c1c3pgc"; - name = "flashtool-0.9.14.0-linux.tar.7z"; - sha256 = "0mfjdjj7clz2dhkg7lzy1m8hk8ngla7zgcryf51aki1gnpbb2zc1"; - }; - - buildInputs = [ p7zip jre ]; - - unpackPhase = '' - 7z e ${src} - tar xf ${name}-linux.tar - sourceRoot=FlashTool - ''; - - buildPhase = '' - ln -s ${platform-tools}/libexec/android-sdk/platform-tools/adb x10flasher_lib/adb.linux - ln -s ${platform-tools}/libexec/android-sdk/platform-tools/fastboot x10flasher_lib/fastboot.linux - ln -s ${libusb1.out}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so - - chmod +x x10flasher_lib/unyaffs.linux.x86 x10flasher_lib/bin2elf x10flasher_lib/bin2sin - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86 - ln -sf unyaffs.linux.x86 x10flasher_lib/unyaffs.linux - - ln -s swt32.jar x10flasher_lib/swtlin/swt.jar - - sed -i \ - -e 's|$(uname -m)|i686|' \ - -e 's|export JAVA_HOME=.*|export JAVA_HOME=${jre}|' \ - -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${lib.makeLibraryPath [ libXtst glib gtk2 ]}:./x10flasher_lib/linux/lib32|' \ - FlashTool FlashToolConsole - ''; - - installPhase = '' - mkdir -p $out - mv * $out/ - ''; - - meta = with lib; { - homepage = "http://www.flashtool.net/"; - description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra"; - license = licenses.unfreeRedistributableFirmware; - platforms = [ "i686-linux" ]; - hydraPlatforms = platforms.none; - broken = true; - }; -} diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 498f41bc1b3..c632a4cbc1e 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -46,6 +46,17 @@ let ''; }; + fast-cli = super.fast-cli.override ({ + nativeBuildInputs = [ pkgs.makeWrapper ]; + prePatch = '' + export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 + ''; + postInstall = '' + wrapProgram $out/bin/fast \ + --set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium.outPath}/bin/chromium + ''; + }); + hyperspace-cli = super."@hyperspace/cli".override { nativeBuildInputs = with pkgs; [ makeWrapper @@ -68,10 +79,6 @@ let meta.broken = since "10"; }; - "fast-cli-1.x" = super."fast-cli-1.x".override { - meta.broken = since "10"; - }; - jshint = super.jshint.override { buildInputs = [ pkgs.phantomjs2 ]; }; @@ -94,14 +101,6 @@ let meta.mainProgram = "bw"; }); - fast-cli = super."fast-cli-1.x".override { - preRebuild = '' - # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore - sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js - ''; - buildInputs = [ pkgs.phantomjs2 ]; - }; - flood = super.flood.override { buildInputs = [ self.node-pre-gyp ]; meta.mainProgram = "flood"; @@ -218,12 +217,12 @@ let # remove node_ name prefix (fetchpatch { url = "https://github.com/svanderburg/node2nix/commit/b54d45207427ff46e90f16f2f32771fdc8bff5a4.patch"; - sha256 = "03cg2xwryvdlvg299dg91qxicrw2r43grja80an9zkb875ps8jxh"; + sha256 = "sha256-ubUdF0q3l4xxqZ7f9EiQEUQzyqxi9Q6zsRPETHlfzh8="; }) # set meta platform (fetchpatch { url = "https://github.com/svanderburg/node2nix/commit/58736093161f2d237c17e75a96529b018cd0ac64.patch"; - sha256 = "1c91qfqa6p4hzyafv5pq6rpgnny2805n007b1443gbqwrz5awz6n"; + sha256 = "0sif7803c9g6gjmmdniw5qxrq5igiz9nqdmdrcf1hxfi5x43a32h"; }) ]; }; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index f529212b081..7e17928d7dc 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -90,7 +90,7 @@ , "eslint_d" , "esy" , "expo-cli" -, {"fast-cli": "1.x"} +, "fast-cli" , "fauna-shell" , "firebase-tools" , "fixjson" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 3abbf3d0abd..1f759991413 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -1795,166 +1795,166 @@ let sha512 = "Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g=="; }; }; - "@electron-forge/async-ora-6.0.0-beta.57" = { + "@electron-forge/async-ora-6.0.0-beta.58" = { name = "_at_electron-forge_slash_async-ora"; packageName = "@electron-forge/async-ora"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.57.tgz"; - sha512 = "pinf6bB5etIKNwFgMx2V+kwsFlkjU4mApALv0Jn/lmcH5dlAB4zPwuKTccC44xVO4pp/bV1HWb1XJ4lHVxYaJg=="; + url = "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.58.tgz"; + sha512 = "osJoCA+Mxda0ToHnVh0c52UiqG0vYRChFp7YZnXSOFAyv/pJhO1gaSfJeTX+2ddki0SLvWQbgiJS5ysMax6Veg=="; }; }; - "@electron-forge/core-6.0.0-beta.57" = { + "@electron-forge/core-6.0.0-beta.58" = { name = "_at_electron-forge_slash_core"; packageName = "@electron-forge/core"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.57.tgz"; - sha512 = "pLYG0QefjAEjxRazgEjryb4TrxVeebGTqXqZsKOpABAlDaKU4EmBq06SeSu8H9IAzMPwzpDIa6PaXdkMclqhnA=="; + url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.58.tgz"; + sha512 = "mro6o/Oa2BETPfnzlWcpLJ5W5IWVuDokE7HZPzb9c6OTlcm/BWwl8pbfSZU19Q9SLsjou9hAuMwqzFveZRqGew=="; }; }; - "@electron-forge/installer-base-6.0.0-beta.57" = { + "@electron-forge/installer-base-6.0.0-beta.58" = { name = "_at_electron-forge_slash_installer-base"; packageName = "@electron-forge/installer-base"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.57.tgz"; - sha512 = "qeQMUos0WADEddSGhViCUeMswsFz1IL+elIy5h06AxgjoRtOU75VVy9RgVfDAMIN0iKvEWNKLQz1CBUtVAt0fA=="; + url = "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.58.tgz"; + sha512 = "VXA9cjCy9HHWyOcPGkO1Q5ym63AAfBLj/dL0Ezpw9r0/GKbgAN0g8HWgTwvs+rqWCdOAeyhIs+sTNI0rZQjc+A=="; }; }; - "@electron-forge/installer-darwin-6.0.0-beta.57" = { + "@electron-forge/installer-darwin-6.0.0-beta.58" = { name = "_at_electron-forge_slash_installer-darwin"; packageName = "@electron-forge/installer-darwin"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.57.tgz"; - sha512 = "3dsa948r3gCkD+ooKeGwWSUyh5GEJ7ngi9t1dRD+f1jUnkU1e3SqcGXH68dr5NYn3OcsFDWreK3xvx/1qdEQAg=="; + url = "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.58.tgz"; + sha512 = "yfx97cL7+kB77xTeniNqRT4Va++uJX6j9kZwIwgaBFvtyLHZ1DChOlOI8IR6/qctzEtrZHW41DySFKXnsWYwuw=="; }; }; - "@electron-forge/installer-deb-6.0.0-beta.57" = { + "@electron-forge/installer-deb-6.0.0-beta.58" = { name = "_at_electron-forge_slash_installer-deb"; packageName = "@electron-forge/installer-deb"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.57.tgz"; - sha512 = "Dnm68RUwR0UEe1hq1OPWso0LwdkZTa7Rpv0m9bHl+IvXTmrU//S5fdHEtjHAmto8f8PD5VadsLQcxsc3bQVNGQ=="; + url = "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.58.tgz"; + sha512 = "Ukw1ccUtmTOKCiorYLJCAIWGT5zxpinH1W9UpxlMP3JhrzQXApm2rF7n9TEGowkTMtPciEsNXaF/F9lzjRqIpQ=="; }; }; - "@electron-forge/installer-dmg-6.0.0-beta.57" = { + "@electron-forge/installer-dmg-6.0.0-beta.58" = { name = "_at_electron-forge_slash_installer-dmg"; packageName = "@electron-forge/installer-dmg"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.57.tgz"; - sha512 = "kmAYga2yY5JcrRI3Dtpau5Ldsebzs4pGkCCBJqq5asqgDGdCpw+8Cky6ouJDaZMl853C0CEnqxeoGYDTAlVBKA=="; + url = "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.58.tgz"; + sha512 = "zw46CQSZ2Jihx7GBUcEPHGBQJD1pIBv6oTi5HPR7IkEJ7CQ/yjESAfDuu1UfQc9mgAKI+6s+QMuFZMW+ZMqYPg=="; }; }; - "@electron-forge/installer-exe-6.0.0-beta.57" = { + "@electron-forge/installer-exe-6.0.0-beta.58" = { name = "_at_electron-forge_slash_installer-exe"; packageName = "@electron-forge/installer-exe"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.57.tgz"; - sha512 = "hVh4vh2q7BxJ8npsVCSxSdoUMwQwcs0LidbanXK8CqHmTgnb9MNDSHomCxOnX+kMQX85mCj9Nc5ROviXnLN4Xg=="; + url = "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.58.tgz"; + sha512 = "Z7gl1CX8WJ/9kr5As9y0GELK8/u754j7bzSlxmaeyhaO/vSf5+M/MjkEiPUQUKVmqZ77ngdzN/T4IfDGxpk++A=="; }; }; - "@electron-forge/installer-linux-6.0.0-beta.57" = { + "@electron-forge/installer-linux-6.0.0-beta.58" = { name = "_at_electron-forge_slash_installer-linux"; packageName = "@electron-forge/installer-linux"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.57.tgz"; - sha512 = "MTK4wLCWxYctzo/htghNhZ5ptIf46AE3UdeQItjiEhL4+KjJjQN8JAVkl40WeM+rUDA53WRQ35HeykNBmspb6A=="; + url = "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.58.tgz"; + sha512 = "39A2mmhsJg2MEjYS+gtF/9FUYLKEoVmD6e4S+Rn0u9Yv/WOtdqOR0KR/pLYPtsiQKsGQA5nD2V2/ZN8N/qTxZw=="; }; }; - "@electron-forge/installer-rpm-6.0.0-beta.57" = { + "@electron-forge/installer-rpm-6.0.0-beta.58" = { name = "_at_electron-forge_slash_installer-rpm"; packageName = "@electron-forge/installer-rpm"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.57.tgz"; - sha512 = "cTzL6mwkhKEkl4v7NE2ATaEsptf5OhTbtwb/tRVIuEOblYKTxw3x9nnH8iGJ73xPW/54awGiU1kHJTKA6UhcUA=="; + url = "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.58.tgz"; + sha512 = "RyuKOGJoJknnp1C9WPFDc06Jw9K+KBM574byYegNiJPm5eGu+ZL/4tU9hD29YAtImyoGUy8L5dquApaC4d9zKA=="; }; }; - "@electron-forge/installer-zip-6.0.0-beta.57" = { + "@electron-forge/installer-zip-6.0.0-beta.58" = { name = "_at_electron-forge_slash_installer-zip"; packageName = "@electron-forge/installer-zip"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.57.tgz"; - sha512 = "ip/mlC32/mdUzFsM/39cZWshLN1B1f6atYHd2OpXlyAz6IZWrRHdsrJGtYsGdpgeoV/wMm09MTyuKXku3ehPaQ=="; + url = "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.58.tgz"; + sha512 = "J71WhNtHdgFDNCYB2vm3vv4Zt/rCuXFgtXxXRowb+pT39wxyL35DjXsOi/a6j5Vb2lGq0mekMuHvpcD/4MSo8w=="; }; }; - "@electron-forge/maker-base-6.0.0-beta.57" = { + "@electron-forge/maker-base-6.0.0-beta.58" = { name = "_at_electron-forge_slash_maker-base"; packageName = "@electron-forge/maker-base"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.57.tgz"; - sha512 = "VnoSCeyCHBv9q0Bz9JRgKC1b4k3z/Qb2T9DrpMqEVW6ClZVkOAZVmjyEtb+Xn8DnRPc4UtSjpAquycC/AZJ4MQ=="; + url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.58.tgz"; + sha512 = "Ztbv99kznlOAK/iDM03Hu/XmdTEXmfLnkcfAJ+uBlRwJmFqiAcPWNlUrPWtCu5KKxHcOiDl6mN3OC/Ae2/3fMA=="; }; }; - "@electron-forge/plugin-base-6.0.0-beta.57" = { + "@electron-forge/plugin-base-6.0.0-beta.58" = { name = "_at_electron-forge_slash_plugin-base"; packageName = "@electron-forge/plugin-base"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.57.tgz"; - sha512 = "lErdgdSGd+HcIzXsZC1Pf6VuLYsDVHTwFUzuZqUPdl28AOWKfwW+XpIZoPMDt2/Mdd5K0mCcYSylikcSa8RHYA=="; + url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.58.tgz"; + sha512 = "RMRjw8iRqkPChSMKdTSWCSubvDMSdJx+9Q9eO8n3GRN0jx4ExizhSIkxWpLSuze5dPyJXm3i24YUZjKOAR21EA=="; }; }; - "@electron-forge/publisher-base-6.0.0-beta.57" = { + "@electron-forge/publisher-base-6.0.0-beta.58" = { name = "_at_electron-forge_slash_publisher-base"; packageName = "@electron-forge/publisher-base"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.57.tgz"; - sha512 = "eJFVt4JI/zCw86PMu/LERMAMVcPchyFfZ9upFec4YuOOMLaJH1NvbO3gGgYj7vavH1hQWZA6Yn7u8b+E8y8Byw=="; + url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.58.tgz"; + sha512 = "pnAZ7VXnL0vosYn4Au347WukXVTU0XLqUSQrjC4pYCMs7YumL4n+ya+JNy51D6SkcFMmd0nCU2ohz7IHo3ttcg=="; }; }; - "@electron-forge/shared-types-6.0.0-beta.57" = { + "@electron-forge/shared-types-6.0.0-beta.58" = { name = "_at_electron-forge_slash_shared-types"; packageName = "@electron-forge/shared-types"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.57.tgz"; - sha512 = "8jRAf7HsfQC5BA8MTOwh8cXmqJ8JJqzO7WzDW9A50tHOKbpBxPW9YM8036SZzZ4GNZYBSWmJt3d3vW+KFLeYXg=="; + url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.58.tgz"; + sha512 = "Kz21kMg+EnINGK3H6qW4YXjFbXYvRv24O8PBnVaQiFXYIaUOXpaXj42QeytDXR/zMSA/jy78GoGodJLKE+gbdA=="; }; }; - "@electron-forge/template-base-6.0.0-beta.57" = { + "@electron-forge/template-base-6.0.0-beta.58" = { name = "_at_electron-forge_slash_template-base"; packageName = "@electron-forge/template-base"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.57.tgz"; - sha512 = "3Nc7ik99VHQK8eTUrO/lA2tMRM5a0fLX+GgjR32yzkaAv081qd6t/XWS7MfU3k5Ld5cYMturUywJnEP/QdxOvA=="; + url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.58.tgz"; + sha512 = "U2iT2YUY9R2wz9RNkM9dAEzv5q+b3HSDJcqPy/B7lzT3lB9kni0HZTZKihZttlQYGRO6jj+9aWnLqaE3HmtgsQ=="; }; }; - "@electron-forge/template-typescript-6.0.0-beta.57" = { + "@electron-forge/template-typescript-6.0.0-beta.58" = { name = "_at_electron-forge_slash_template-typescript"; packageName = "@electron-forge/template-typescript"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.57.tgz"; - sha512 = "NhcyTaLjbBGtdCTkAJgazKR4B9+yNFNH8QiXm3u6bg0cv2MhPWydmPuiEjFRLqG+Vz6jS4sW6jSIyCjFRK42ow=="; + url = "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.58.tgz"; + sha512 = "x3dJeB4VDg18c69GOOUSk0LFRygaN2fDYxxjTZcGMlnsUTyypXkuaVIoEnMnB01TlY+gTPrsoITeB2e7ahSyaQ=="; }; }; - "@electron-forge/template-typescript-webpack-6.0.0-beta.57" = { + "@electron-forge/template-typescript-webpack-6.0.0-beta.58" = { name = "_at_electron-forge_slash_template-typescript-webpack"; packageName = "@electron-forge/template-typescript-webpack"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.57.tgz"; - sha512 = "S9AzVLB02AvOwEOtQvtSJlv7BPZPSX3gdqwhoxPcTP6Pi/hOvVeEweptkwwRzGsZmSI7/ifi1bq7avhnzjasZw=="; + url = "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.58.tgz"; + sha512 = "PTh0TW+ohn7BT+jjdQ3ubqFU9biP2ilfA36vA1Dgnv9/N8P1IBoEtXFJ4ilsMZOAfbp344ja9vsTFG+qGTsiDw=="; }; }; - "@electron-forge/template-webpack-6.0.0-beta.57" = { + "@electron-forge/template-webpack-6.0.0-beta.58" = { name = "_at_electron-forge_slash_template-webpack"; packageName = "@electron-forge/template-webpack"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.57.tgz"; - sha512 = "df4/jHKcZ6+8qIE+h2U9Ej5P36uGQZjI8+CcIPDE/46avHT+BwCmlMA/ZTGUQ787U9WkoMiI7122jdd7GNyuCQ=="; + url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.58.tgz"; + sha512 = "Uf7Ck17bn3djuoSglzOioXhOBRqY72pqMSZF0K84zNGwfzsW/KSonizmOMG3yrvSDEQf48JE5Ezhssla3SSgiA=="; }; }; "@electron/get-1.12.4" = { @@ -2038,15 +2038,6 @@ let sha512 = "OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="; }; }; - "@eslint/eslintrc-0.4.2" = { - name = "_at_eslint_slash_eslintrc"; - packageName = "@eslint/eslintrc"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz"; - sha512 = "8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg=="; - }; - }; "@eslint/eslintrc-0.4.3" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; @@ -2668,6 +2659,15 @@ let sha512 = "V29L2QNKkLWM3bcJfVFMSo+Z7kkO8A1s7MAfdzBXLYEC1PE5/M0n1iXBDiD5aUtyVLh5GILcbme2bGtIHl0FMQ=="; }; }; + "@grpc/grpc-js-1.3.6" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.6.tgz"; + sha512 = "v7+LQFbqZKmd/Tvf5/j1Xlbq6jXL/4d+gUtm2TNX4QiEC3ELWADmGr2dGlUyLl6aKTuYfsN72vAsO5zmavYkEg=="; + }; + }; "@grpc/proto-loader-0.6.2" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -4018,6 +4018,15 @@ let sha512 = "RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ=="; }; }; + "@malept/cross-spawn-promise-2.0.0" = { + name = "_at_malept_slash_cross-spawn-promise"; + packageName = "@malept/cross-spawn-promise"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz"; + sha512 = "1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg=="; + }; + }; "@mapbox/node-pre-gyp-1.0.5" = { name = "_at_mapbox_slash_node-pre-gyp"; packageName = "@mapbox/node-pre-gyp"; @@ -4234,13 +4243,13 @@ let sha512 = "KiXfYPO/X24p7EYQjcjBTizoyfY3U8zPv68Rte0EtayW2ZSqIslLLpNNd2gteqdh0Q83mzSiESdhlQHd0Ckjjg=="; }; }; - "@netlify/plugin-edge-handlers-1.11.21" = { + "@netlify/plugin-edge-handlers-1.11.22" = { name = "_at_netlify_slash_plugin-edge-handlers"; packageName = "@netlify/plugin-edge-handlers"; - version = "1.11.21"; + version = "1.11.22"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.21.tgz"; - sha512 = "shUFM+l1ALeGCgy4Lag2wQzOD3zcHW0+HFdWXCRsvtjHdNwTMBnbYg7ztnWurwgMthwiQ1jiTmWr8hFrui7Vng=="; + url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.22.tgz"; + sha512 = "tFb7J6+YEtZP0OYpS/b9Rjp1lm02XfhAQR6KRHAaeRlHp98/zgd0hhubfwXUCppP2BLfn+imkeVS0FnANh5B3g=="; }; }; "@netlify/plugins-list-2.19.3" = { @@ -4279,58 +4288,58 @@ let sha512 = "EFUYbcB7g/7Sa4KYZaqNrqe+mJJCeoosUNl8mFyeF3qIqn0po7txSZn0/y1sgjejuv9mRKv8sm7dH8kMM/HJcg=="; }; }; - "@node-red/editor-api-1.3.5" = { + "@node-red/editor-api-2.0.1" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.3.5"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.3.5.tgz"; - sha512 = "IJyfyVhEvkf2YNRPoR+1SPSi76evVV/boAKhOeVoIMBBeuYd1wM1ihMM3rnNWDYXjN/7CbTKz2DVmdMQ5aCIeQ=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-2.0.1.tgz"; + sha512 = "0+wY8FJvS6P3hiRnz7YzjWmkannoJyBMYgnSevQ6euf8dABML5AOYThghpMNPrtl+RzRIar0oabHrTRSoEpDEg=="; }; }; - "@node-red/editor-client-1.3.5" = { + "@node-red/editor-client-2.0.1" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.3.5"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.3.5.tgz"; - sha512 = "B/JB7KuSeTHkiwzrQtCgmkUfHN5nP2htUoE4wkTt118IA/1xUWXEtl+WnT5aDLiFUyFI21q9Fl4BnDOa7JqLEw=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-2.0.1.tgz"; + sha512 = "9YP0n+VFruudzZfcsTL0fofm7j/BYodKzQTqksL3ZlcZsB075O3d8zM8ZuoNlpj2CfROR/PZi7E72ucmNExzlQ=="; }; }; - "@node-red/nodes-1.3.5" = { + "@node-red/nodes-2.0.1" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.3.5"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.3.5.tgz"; - sha512 = "kLZOn8YDiDemJ/ufx0eagpmPPbUzLifgvoF1fHq9Jzf+K/xWtzDLHqNyLM6VSzo6QlCAnS939dU9kDb5G3fs3Q=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-2.0.1.tgz"; + sha512 = "op1gcV99xp/xZAVg1B+VRzylNpWk/oF//I6dcRqiF8xoXjff42VfIJ8l01/JqsvuJD3p9+x9fz82QRMmASOu+w=="; }; }; - "@node-red/registry-1.3.5" = { + "@node-red/registry-2.0.1" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.3.5"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.3.5.tgz"; - sha512 = "wy74xMnD87v/oB5P/HnUiJ6kTgdcCTgIJadeRBh0DSwcMjG3MhSxe8QCk3U9BxLH1fxw0IwxWbNgGwzuM8EOdw=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-2.0.1.tgz"; + sha512 = "B2La0qWpSEqbiiBWVmUKTqS4y/c/pZuUDPu7a5ZibGgcUEe032X05uZ68wIYMt1y2/ltnUlrPSdOjjpzpxEhEQ=="; }; }; - "@node-red/runtime-1.3.5" = { + "@node-red/runtime-2.0.1" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.3.5"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.3.5.tgz"; - sha512 = "4Cz83wX9trvhhPxFkF5HfYzqYQEcVOYf4f1lSDHP2xYowE22+x4BTCs8gZA4hCI4kbon3eyaU5NrzlrKd+nZbQ=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-2.0.1.tgz"; + sha512 = "3MbJk5Xum38Nt13FIvDmsuQYcdo5uxzKu2khHbXN3hG7XlECALSaKqLq19t7yg6e8q8Jqnb7j6184A1m34GVqQ=="; }; }; - "@node-red/util-1.3.5" = { + "@node-red/util-2.0.1" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.3.5"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.3.5.tgz"; - sha512 = "1TTvTwvGMSe9SQMEKN5zGdyGMv8Kth49eiUcdPnUWigtafk1BE9iP7gVSyLVYgijzCwh40GUkSYey0TUaSbRBw=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-2.0.1.tgz"; + sha512 = "gT+3cI134m2pD4U0/iKuOAjRqluPXKlS19eCE06ArWGLxHmqx7Gi6Cyjxu971gNcw69QEfwJzEA2xIrAKRAR+g=="; }; }; "@nodelib/fs.scandir-2.1.5" = { @@ -4765,310 +4774,310 @@ let sha512 = "t4fKikazahwNKmwD+CE/icHyuZldWvNMupJhjxdk9T/KxHFx3zCGjHT3MKavwYP6abzgAAm5WwzD1oHlmj7dyg=="; }; }; - "@ot-builder/bin-composite-types-1.0.11" = { + "@ot-builder/bin-composite-types-1.1.0" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.11.tgz"; - sha512 = "EZaye0ulSh5+SVBSz8loz+EOT+wEhrn5hqL3mGYMVMIXHf/JNexwB1n/uffbENfmRQcFLp+GRlVhsEyw+k2HdA=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.1.0.tgz"; + sha512 = "/JaR3T99LHJWzOp08qLE9yTpe+v9DlgyE/ZwSyueG/fbzfCquHve9qgOaIP/yEiVNhQdMEBMsJdpQyicL6db3w=="; }; }; - "@ot-builder/bin-util-1.0.11" = { + "@ot-builder/bin-util-1.1.0" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.11.tgz"; - sha512 = "pH7MhJDe3WjlkPsbnUz+nLJedIpDhwqgCPKUDmyLeVaS+JD/+gRERRWDPycywzOwusHlHD6GBMDT68Phy9BuCw=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.1.0.tgz"; + sha512 = "Cwk6FsYU9aJmmbFcrE1DI3t+FzdyTb6IotsCY1YAxnS4nEkj70bNRfDbxu4rzpPqBgndIjAz1FSXtlSayW0LMw=="; }; }; - "@ot-builder/cli-help-shower-1.0.11" = { + "@ot-builder/cli-help-shower-1.1.0" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.11.tgz"; - sha512 = "vGn9lGxBBknfGLYQ97fUd6fujTkv8IcOUJtsAG6VlMeu4BdMUNsSeAWX7nA/ZWrKPblBSV9E/H8TbiLwLcOWwg=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.1.0.tgz"; + sha512 = "0KaiPVXkjyuBhHZK5/1fxGX7Ch0/YAmc/+Os3QSwH8xgN2O682TZhW+TaKJzGLe6wuTomQ0H3YzO5Z4PfIyx3g=="; }; }; - "@ot-builder/cli-proc-1.0.11" = { + "@ot-builder/cli-proc-1.1.0" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.11.tgz"; - sha512 = "icbfgW3eXE7G7sK6MxIzyUkeCoJxW3UCVXCyhQKgs7MVgQo/xEl6Mj04YE2fz62L+IsTccEdvMIFJXWUPjw44g=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.1.0.tgz"; + sha512 = "NiFyLMF6YCSum5gvqTWYZai2by0ULkOAX41bRdyoq9i+bq2vLQAisCdo3jZ6rjAWHO+zo4YTvcTyj2ukfABycw=="; }; }; - "@ot-builder/cli-shared-1.0.11" = { + "@ot-builder/cli-shared-1.1.0" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.11.tgz"; - sha512 = "PBdRmB3Mp5mHCxd889UJHq0eJwHUJiiSMY+M9VXfxgu4WxbA0NUY5IpiEs69RnfJhiSUjvdkiaWH5xJzB9+mdA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.1.0.tgz"; + sha512 = "rMsvIZHPc6RPSX1V2XJWM0fO/stSLctRMQZPnoPWQFcChS8Xvjf7iCBD8NA7V07LUI/8hYrcb4DMzp6aoJ4/pg=="; }; }; - "@ot-builder/common-impl-1.0.11" = { + "@ot-builder/common-impl-1.1.0" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.11.tgz"; - sha512 = "7FCjFJb32++fIlPpXzzuNZB7TtrwkYKB32VOBlVz/u/wGAI3DcQEeG4jqAIF9XOUb9jtISQUcEUj7YHDYdOKWQ=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.1.0.tgz"; + sha512 = "Gnm1eCD2UMSXJhqoqK4vEGGIqVHKch+UF6VBO6uezT7vzdHfTW/IltIaB5ukbT4wumQfRMuZs9Eb6cabNae+hg=="; }; }; - "@ot-builder/errors-1.0.11" = { + "@ot-builder/errors-1.1.0" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.11.tgz"; - sha512 = "hNMMJRVYNLgue0tYY2FKEk1RZmUKm4eY3CzoBOkhCNG7FAS1M2m2MGeE/TNaxxlJz3VTEiSXl1uMaFKXQLgrWw=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.1.0.tgz"; + sha512 = "88O6kaLJSWv+n1rboJ/lFEWEs3gRlABlLbqEgUX/tXqVs3cineH7ZZlBDpoNvVYnYV53KzReh8P0P4MIQklejQ=="; }; }; - "@ot-builder/io-bin-cff-1.0.11" = { + "@ot-builder/io-bin-cff-1.1.0" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.11.tgz"; - sha512 = "gcD/FhE6s6Xk2AIurJh8cXjwdB7N1hLhQFf8YkOGgZ4jX1lpSmm9Dx7GrwYx9iii7LodXBDVS5AJh4N+hpaESw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.1.0.tgz"; + sha512 = "bLVT7VnEViiKjL2emb1GbWwybBN0qkfqWgZgkdZJEU930nlnY//FsQhKrpZDW6A9vce7GiwuZaxeSETexF0/ug=="; }; }; - "@ot-builder/io-bin-encoding-1.0.11" = { + "@ot-builder/io-bin-encoding-1.1.0" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.11.tgz"; - sha512 = "5ytVt41rCuyDKi6XCrKOIaW88xf8b3gTKzjSvTRvYcsK/0uqJocpdbB7OIGU2TqpUNVuEs3IktDpMBiUrcFjuw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.1.0.tgz"; + sha512 = "77cYkXoJxfrDfjXkVIGuCHy/E+ff+t5E2zABHIFLoNmpXJvJdjYPupM/roMKkHqWjhnIP6caEwdCuxt3e8UNHA=="; }; }; - "@ot-builder/io-bin-ext-private-1.0.11" = { + "@ot-builder/io-bin-ext-private-1.1.0" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.11.tgz"; - sha512 = "BwG9QBsPebZR1ycakpAYHc1zuCpKcpDr9pxp6D7kNSZAaZsosVinqI1cW0h/AbK99TYblI1MN4+FA2c4DJxWAg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.1.0.tgz"; + sha512 = "EwaHkGdP53bEXm7drrwrD6u63kSHw0A4NX+5xzhsIqDV24LShsZ9t34O2Pby9pN9jCJJFIWN3ryXEq3sHny4cA=="; }; }; - "@ot-builder/io-bin-font-1.0.11" = { + "@ot-builder/io-bin-font-1.1.0" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.11.tgz"; - sha512 = "xtGq9iU48CUAB/xm+a9wsvWKd2K4K637SqRjc9y0jou0h9TZ3g9fDF6RRCva1VJkAPHT4gJes6wALMuoLb9lfg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.1.0.tgz"; + sha512 = "PslL6SFENEGtQ6zOXMewl69cOibOLLzrr8CS2Pe78zNcxJ4BWsP6dwZNeu8gVqWKLsUQJQIWbwaPiP/RDhQKUQ=="; }; }; - "@ot-builder/io-bin-glyph-store-1.0.11" = { + "@ot-builder/io-bin-glyph-store-1.1.0" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.11.tgz"; - sha512 = "ipBYDaX7jsLiaJgpbyrTxeLqCB55KZ3UumVfxxTt8AUEKT1m6PUnG9BvaLBzvZxyjBF0sfiJDVQaS+mznbVj0Q=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.1.0.tgz"; + sha512 = "ontsdJHI6dY1N0HKzdwLIb0o9G5Q+S1ETADuShP/nQD0lV3cxxj1KS/PnFE/LSoyY0AKrs630kLV1lrMS3R4rg=="; }; }; - "@ot-builder/io-bin-layout-1.0.11" = { + "@ot-builder/io-bin-layout-1.1.0" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.11.tgz"; - sha512 = "5oquyNtdX/hRmtnmcgvdy0rxFiC1sqjRIi+6ycPNtMvJx9Z7z5USplveTf14W53Iyr/qGBsbk0QfNmv++fWEiQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.1.0.tgz"; + sha512 = "QEW3kR/Tu1Qtp3f6zrmQKGGeRD6daTpuBwjS4AnR47WhGHLZ9IJxVsNMHJeyYwnjXAWg6Tht5HjHGnI9dKnSDA=="; }; }; - "@ot-builder/io-bin-metadata-1.0.11" = { + "@ot-builder/io-bin-metadata-1.1.0" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.11.tgz"; - sha512 = "JdUp6qrHAfaa8UsCOKnWRveUiQGqa7QYQaPNLKaOVKvzo6jdIKB5uELX+GOc6qQU5ktGIjRuCbKWq2jZxcZToQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.1.0.tgz"; + sha512 = "PjeEoquOsI2mwg3MZL4VDRlzmWVA5LBeYKAY3LH140WOPYFlPN27YfWGVUO/swc98Z+5xgDZau3emj3ElSRvrw=="; }; }; - "@ot-builder/io-bin-metric-1.0.11" = { + "@ot-builder/io-bin-metric-1.1.0" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.11.tgz"; - sha512 = "5mjN6J6hOO7TDUazjI8Hl0eCkogLsod0N1u38UAVL4JmDAVEY6NCwYXVe0TDoNBRG17jfoOW+/xoz40uCI37AA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.1.0.tgz"; + sha512 = "mVjDTkxn6ARu7UUMi7rQCNC+fYK7IgSuO2bmYdzuozP7EmEWI5VQq3rhhMHDlvTodEuNARKJxr/tmzcB5Tx7PQ=="; }; }; - "@ot-builder/io-bin-name-1.0.11" = { + "@ot-builder/io-bin-name-1.1.0" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.11.tgz"; - sha512 = "SjeUgpDTPIqGo/lA7ACvk/L2SAIzzMfKs4WV+QYRh6hzN9IRfhoj2OYepxXpvInOiNj9FHqTzEnYz5l7mskqmw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.1.0.tgz"; + sha512 = "EBQLOP5LFdU18crQuNRQ4lWBzLv3Dw2R8vTvlyUY8nX8OfVUE2KhBreyTjMYTZATfNA2Ey1ZzJPhbT5LpwHg8Q=="; }; }; - "@ot-builder/io-bin-sfnt-1.0.11" = { + "@ot-builder/io-bin-sfnt-1.1.0" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.11.tgz"; - sha512 = "/AhSr/xsXEDY8mCVO+yJTmOKwaUjVuhKtJ9kZrJymV8I7xm1gJjdH+JdTPtikhm36Mc9WWC+KY/2zot+pN2PtQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.1.0.tgz"; + sha512 = "SO0kgwif/7idUMT/Oo8J2N1iwIY98FKtl3yKSFYegiGrMqmL4qYGq26NxCt1NgpQyyZrMQV3D5eC81EpmvEy/Q=="; }; }; - "@ot-builder/io-bin-ttf-1.0.11" = { + "@ot-builder/io-bin-ttf-1.1.0" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.11.tgz"; - sha512 = "euZnFeumI9V21VmezT7yVNFYm2HuBJhWhy9JE8V9aaoIo2Qj5lVpMu+3WAuhCDp1qk2fs+o5JlI83lXrdWeWmQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.1.0.tgz"; + sha512 = "jlyLDuCocNq43uX2wGLspoJ/t901ywgO5OTIfx/x8hg4ka6TKlC13bi0bSvaiVNB6HpDO62GJ69gufRaSCEzvQ=="; }; }; - "@ot-builder/ot-1.0.11" = { + "@ot-builder/ot-1.1.0" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.11.tgz"; - sha512 = "TARoyL9D+i6gEzIijuh2C4MG4rNjY+Jkk1L5yMM/cVnzhLTy4PY+bTkszf2GJgcNi8iH8+XL213oHUOcEN8gWg=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.1.0.tgz"; + sha512 = "9ikUYwiE5ur7l89Ki7uDscMYWm1bxvuRzeWJoMr7thxibtnlMl6rVW5H6NspjEbOZmxgAf3YmiL3oPCq/jiewA=="; }; }; - "@ot-builder/ot-encoding-1.0.11" = { + "@ot-builder/ot-encoding-1.1.0" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.11.tgz"; - sha512 = "Z6ZIuIq+R9E+2HpvrBsXVXTkjJLWWyJgBssTl1n5DRF8nIWIwmKufoCjMXHMtCCMHMK8jlDCCv8U3AAhPjvAZQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.1.0.tgz"; + sha512 = "2x/lVIxC42XJdNB9BhvKq3P/bO1yomTwkLVcBS9R92x6/V1t4KOVCYHOtNL79lCGfZkdCWxHxtHhChF55BetsQ=="; }; }; - "@ot-builder/ot-ext-private-1.0.11" = { + "@ot-builder/ot-ext-private-1.1.0" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.11.tgz"; - sha512 = "7dOIKMYaAEgYj6FtKCxWFqctNhT05zAaCVRRh6QVfOrQf7cldxmIVHW76aHa27eHTWPdtXWBxtb3eA0BVbEzHA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.1.0.tgz"; + sha512 = "MBMiz8RC8crmx7PB89G75y2nIue6+QkIiXGsx402ozlLQVgJe9YznV7dzUHlpLrPGFsbMYPRfZVTV4Ro+YAK0A=="; }; }; - "@ot-builder/ot-glyphs-1.0.11" = { + "@ot-builder/ot-glyphs-1.1.0" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.11.tgz"; - sha512 = "NuhRdeS6vJnV6HVUEUMKDrNxW1PHYS2IWRsz+Dtr2ffrQ/GXtX857MXeZPd8cTrH+i0arfQeIUJPY0ZRmvXlJA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.1.0.tgz"; + sha512 = "EURkR2aUUR4Zlhdx+SdvEAkA7Vx+2mRorozb4gySs5PNqbKq43uzgXIgz1Djq6wasN00KcJGlOjogIv1zKFBwg=="; }; }; - "@ot-builder/ot-layout-1.0.11" = { + "@ot-builder/ot-layout-1.1.0" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.11.tgz"; - sha512 = "x2K3Nnv5WVyOZ6b23p0fOPB5oMqNuj8UyNZ7OCpgZTMTFEXjrIvnkuWpjnYRd6JfWXAYF0vfZdBMHd7F0l+Y4A=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.1.0.tgz"; + sha512 = "x07BUvdLmcU2w8V8JxiMzv1dI5ybkuDrvpVDuwSAL/eBsuDYf7/3i+ewvHv1WlqG9nQ0v2RJK48CicrCGhlpQw=="; }; }; - "@ot-builder/ot-metadata-1.0.11" = { + "@ot-builder/ot-metadata-1.1.0" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.11.tgz"; - sha512 = "yInNtU6UkmzXIGJYARl5VZcA63UOLP3xc6o0APkHwVQNN53e5nN35GFwaDbeaWYYe0uRq/7/bDzeVsqr2GaV0Q=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.1.0.tgz"; + sha512 = "zgUlAqDj8eCuizVbMN4CVA76m+PAUdl91tUO1JTAn5qt0Lo8kfnOWaFc/aU+Q8HD3RXENRpAjA3N3kBm05UNiQ=="; }; }; - "@ot-builder/ot-name-1.0.11" = { + "@ot-builder/ot-name-1.1.0" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.11.tgz"; - sha512 = "opSvFhUgrveV+cpOhKFnD/nrfNj3pbW6Z1mem1Rz/oWnrkx73g8kgDyip+8acW5h3iulYHGWL3XsKVOm4UpKug=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.1.0.tgz"; + sha512 = "mudNPddCD/UD+v1fuFdPv3CzHjVS9Jt4GJhQ7or5HsG3/dIQ9N8jfqtBXtSK5ePEgoUsfhPWN5do/cwd//GQQQ=="; }; }; - "@ot-builder/ot-sfnt-1.0.11" = { + "@ot-builder/ot-sfnt-1.1.0" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.11.tgz"; - sha512 = "w254e5eLINkwS00N0UY4UMTK4UCHN7/Oh8p7/e7INw6EaCR7Gg1j7VKnbU6Fldg2leHDQ939tkGSNIU6uHisKg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.1.0.tgz"; + sha512 = "iyz7npSWu5z9mgSnEjFkBFoOA4mKYIfbG27SGUWWWx0HWHI9cRoE+FHIcQOCJH0PmATvNCXMVfiCSPHesb57GA=="; }; }; - "@ot-builder/ot-standard-glyph-namer-1.0.11" = { + "@ot-builder/ot-standard-glyph-namer-1.1.0" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.11.tgz"; - sha512 = "bynoGWRfxaVhqF6SjQZn7Vo+ApmMePBQn7HRwcnsS3CxxSTzP+O9Z2FtoN7/NiaQiENWrciMkTsDY2VH6iBo4A=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.1.0.tgz"; + sha512 = "2jyZCBOWmkKyLfU/EOS2AZjJ0Y0toqZqOb2vrIhQRUkli9cb1RyALxkOnP60IfGsD2SNa9yxZcEbS9RlRK8rvw=="; }; }; - "@ot-builder/prelude-1.0.11" = { + "@ot-builder/prelude-1.1.0" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.11.tgz"; - sha512 = "BM1TmmUrGsA/goZ8RIGpjvw18nRDeFEWC7wFel/i4hFQuCKbfgfKixEDJ2iKzVXm6nGUl7/7xWZ0pfu3ij6tuA=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.1.0.tgz"; + sha512 = "ghZ04jh2z8WD4UdHJVXKTyjzAo7zUD4lyilrO17fKT3WqD/LW/2vKC7inwepELwVC03uT8xaVhnflF1rYGMzKg=="; }; }; - "@ot-builder/primitive-1.0.11" = { + "@ot-builder/primitive-1.1.0" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.11.tgz"; - sha512 = "Hh6QGMC0XuAfiLWl7Q0eZSAOoEqkO6BPO9d3OFAxaNg05ekRJBzVvtB3iSEkdigbmg1aZChTy4HDFRw9D5SmGw=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.1.0.tgz"; + sha512 = "ob7od9Lr3nlGSM6v4xoM8krXuO2W0bOFfpog4Trsg6BArRz8zFfdFVjsZ8umxAhJX2z0Jroiq1nM8okdkw0TDQ=="; }; }; - "@ot-builder/rectify-1.0.11" = { + "@ot-builder/rectify-1.1.0" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.11.tgz"; - sha512 = "B3hzfmONslDbTtFqX+tKff6zlrDMVD1B0yyC44Sm8iP6OFt1HgPwNKyVUntEs3Wzod9SCCN/hOcRFAeaXTM5RA=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.1.0.tgz"; + sha512 = "nT6VP78JwQtLcyn+DEVp5Xv5bAi+6z9Y8QaaLYWCtv5AnY4aNN7VKwiK4v9Kag77BYDqYT7PI4et2tR5Pf4jSA=="; }; }; - "@ot-builder/stat-glyphs-1.0.11" = { + "@ot-builder/stat-glyphs-1.1.0" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.11.tgz"; - sha512 = "ldzOx2QtDKsqdQolgCM6cCRzCcdS/B46a4Emu3vuMRs2M0yNAoy4EzVkX6h0nEnTBcgq2NKFFL4BxWIG4la1ZQ=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.1.0.tgz"; + sha512 = "FquKCcC2/Z/cCV16vi+8DHoQzMdwaYSgvA8Hv4Djx3aYLyAmYe14ODfZF63RcW5uh7pZsG1c6u82bf1trwZr9g=="; }; }; - "@ot-builder/trace-1.0.11" = { + "@ot-builder/trace-1.1.0" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.11.tgz"; - sha512 = "feOrmdS9Tc0+lnXHtPsq2QfMpI4zQqsIOEBYzzGGK4UPrdwO1a7DhBLgOEJt1C8o7d+2QeLE8KJnB4NGgx6kHQ=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.1.0.tgz"; + sha512 = "1C2vziYWUYe2YzPEPfNIdqjXtVjl5we69EjX5q4ZZPbCFFoeWGRR54Zxgyp8V5GAvKz0Pn94nXGaFlfEdwk3jQ=="; }; }; - "@ot-builder/var-store-1.0.11" = { + "@ot-builder/var-store-1.1.0" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.11.tgz"; - sha512 = "kg1T34FaRepMJ7vgatiVSjScH1H9c2H87vPauNR6lft8oeMORUuowJyFIzeckfaKcUFm/0uip6H5zj8Bypu9Wg=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.1.0.tgz"; + sha512 = "Q60yNeIDJiqlHIPDkqJJXZWN5zodkKQQv/5PpLIocKMdHrQVqltrTQ5QL+V42Nup1+BiGt1zmR+sO+uUa3A/Iw=="; }; }; - "@ot-builder/variance-1.0.11" = { + "@ot-builder/variance-1.1.0" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.11.tgz"; - sha512 = "p1VXo+2ZZl5SDMWPLTzz2rtIlfY3G3RgPDAdG4dwWPjH9PLtZlrWDLQR9SGmisAe3p1NIUQh82TD6X2a9XMnXA=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.1.0.tgz"; + sha512 = "azUnRrvj2LKkPTYWuiEFStbUEQWbaiI6F63SZOL8yIOEr5Jya/iZ33HeeGltx/jbCrLdboad5pBechG/QD44+w=="; }; }; "@parcel/fs-1.11.0" = { @@ -5314,13 +5323,13 @@ let sha512 = "tU8fQs0D76ZKhJ2cWtnfQthWqiZgGBx0gH0+5D8JvaBEBaqA8foPPBt3Nonwr3ygyv5xrw2IzKWgIY86BlGs+w=="; }; }; - "@redocly/openapi-core-1.0.0-beta.53" = { + "@redocly/openapi-core-1.0.0-beta.54" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.53"; + version = "1.0.0-beta.54"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.53.tgz"; - sha512 = "n5WixBRb7oWS31v3/cdOW/eNXbr2M4N8+HjHfCA/oQX6Z4ZYqPOJCekw64sQ/fnUQMIQyT6fKqyaf+iO4tG7YA=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.54.tgz"; + sha512 = "uYs0N1Trjkh7u8IMIuCU2VxCXhMyGWSZUkP/WNdTR1OgBUtvNdF9C32zoQV+hyCIH4gVu42ROHkjisy333ZX+w=="; }; }; "@redocly/react-dropdown-aria-2.0.12" = { @@ -5890,13 +5899,13 @@ let sha512 = "WHhnwyoGOhjFOjBXqUfszD84SErrtjHjium/4xFbqKpEE+yuwxs8OwV/S29BtxhYiGtjpD1azv5QtH30VUMl0A=="; }; }; - "@snyk/snyk-docker-pull-3.6.2" = { + "@snyk/snyk-docker-pull-3.6.3" = { name = "_at_snyk_slash_snyk-docker-pull"; packageName = "@snyk/snyk-docker-pull"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.6.2.tgz"; - sha512 = "Ngebbk2LLMYNj5iMeTrt066nzWZ3oc8I5aN5A1qXpXmuAv8hW/hA1pfF3qwWrskl0RbPIhcSnY833e8l+drjEQ=="; + url = "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.6.3.tgz"; + sha512 = "SXhIAVfBVB/WoMgh3pTJNEKehpHygzqnnqHpg3ucw2rc5z0LqSAJQyYWl3jSAUnl5LgA11UuYD8zj0dsRbed2A=="; }; }; "@snyk/snyk-hex-plugin-1.1.4" = { @@ -7654,6 +7663,15 @@ let sha512 = "ijZ1vzRawI7QoWnTNL8KpHixd2b2XVb9I9HAqI3triPsh1EC0xH0Eg6w2O3TKbDCgiNNlJqfrof6j4T2I+l9vw=="; }; }; + "@types/ws-7.4.7" = { + name = "_at_types_slash_ws"; + packageName = "@types/ws"; + version = "7.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ws/-/ws-7.4.7.tgz"; + sha512 = "JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww=="; + }; + }; "@types/yargs-13.0.12" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; @@ -7708,13 +7726,13 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@typescript-eslint/eslint-plugin-4.28.3" = { + "@typescript-eslint/eslint-plugin-4.28.4" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.28.3"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.3.tgz"; - sha512 = "jW8sEFu1ZeaV8xzwsfi6Vgtty2jf7/lJmQmDkDruBjYAbx5DA8JtbcMnP0rNPUG+oH5GoQBTSp+9613BzuIpYg=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.4.tgz"; + sha512 = "s1oY4RmYDlWMlcV0kKPBaADn46JirZzvvH7c2CtAqxCY96S538JRBAzt83RrfkDheV/+G/vWNK0zek+8TB3Gmw=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -7726,13 +7744,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.28.3" = { + "@typescript-eslint/experimental-utils-4.28.4" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.28.3"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.3.tgz"; - sha512 = "zZYl9TnrxwEPi3FbyeX0ZnE8Hp7j3OCR+ELoUfbwGHGxWnHg9+OqSmkw2MoCVpZksPCZYpQzC559Ee9pJNHTQw=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.4.tgz"; + sha512 = "OglKWOQRWTCoqMSy6pm/kpinEIgdcXYceIcH3EKWUl4S8xhFtN34GQRaAvTIZB9DD94rW7d/U7tUg3SYeDFNHA=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -7744,22 +7762,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.28.3" = { + "@typescript-eslint/parser-4.28.4" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.28.3"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.3.tgz"; - sha512 = "ZyWEn34bJexn/JNYvLQab0Mo5e+qqQNhknxmc8azgNd4XqspVYR5oHq9O11fLwdZMRcj4by15ghSlIEq+H5ltQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.4.tgz"; + sha512 = "4i0jq3C6n+og7/uCHiE6q5ssw87zVdpUj1k6VlVYMonE3ILdFApEzTWgppSRG4kVNB/5jxnH+gTeKLMNfUelQA=="; }; }; - "@typescript-eslint/scope-manager-4.28.3" = { + "@typescript-eslint/scope-manager-4.28.4" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.28.3"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.3.tgz"; - sha512 = "/8lMisZ5NGIzGtJB+QizQ5eX4Xd8uxedFfMBXOKuJGP0oaBBVEMbJVddQKDXyyB0bPlmt8i6bHV89KbwOelJiQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.4.tgz"; + sha512 = "ZJBNs4usViOmlyFMt9X9l+X0WAFcDH7EdSArGqpldXu7aeZxDAuAzHiMAeI+JpSefY2INHrXeqnha39FVqXb8w=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -7771,13 +7789,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.28.3" = { + "@typescript-eslint/types-4.28.4" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.28.3"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.3.tgz"; - sha512 = "kQFaEsQBQVtA9VGVyciyTbIg7S3WoKHNuOp/UF5RG40900KtGqfoiETWD/v0lzRXc+euVE9NXmfer9dLkUJrkA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.4.tgz"; + sha512 = "3eap4QWxGqkYuEmVebUGULMskR6Cuoc/Wii0oSOddleP4EGx1tjLnZQ0ZP33YRoMDCs5O3j56RBV4g14T4jvww=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -7789,13 +7807,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.28.3" = { + "@typescript-eslint/typescript-estree-4.28.4" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.28.3"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.3.tgz"; - sha512 = "YAb1JED41kJsqCQt1NcnX5ZdTA93vKFCMP4lQYG6CFxd0VzDJcKttRlMrlG+1qiWAw8+zowmHU1H0OzjWJzR2w=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.4.tgz"; + sha512 = "z7d8HK8XvCRyN2SNp+OXC2iZaF+O2BTquGhEYLKLx5k6p0r05ureUtgEfo5f6anLkhCxdHtCf6rPM1p4efHYDQ=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -7807,13 +7825,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.28.3" = { + "@typescript-eslint/visitor-keys-4.28.4" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.28.3"; + version = "4.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.3.tgz"; - sha512 = "ri1OzcLnk1HH4gORmr1dllxDzzrN6goUIz/P4MHFV0YZJDCADPR3RvYNp0PW2SetKTThar6wlbFTL00hV2Q+fg=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.4.tgz"; + sha512 = "NIAXAdbz1XdOuzqkJHjNKXKj8QQ4cv5cxR/g0uQhCYf/6//XrmfpaYsM7PnBcNbfvTDLUkqQ5TPNm1sozDdTWg=="; }; }; "@uifabric/foundation-7.9.26" = { @@ -8941,6 +8959,15 @@ let sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; }; }; + "acorn-walk-8.1.1" = { + name = "acorn-walk"; + packageName = "acorn-walk"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.1.tgz"; + sha512 = "FbJdceMlPHEAWJOILDk1fXD8lnTlEIWFkqtfk+MvmL5q/qlHfN7GEHcsFZWt/Tea9jRNPWUZG4G976nqAAmU9w=="; + }; + }; "adbkit-2.11.1" = { name = "adbkit"; packageName = "adbkit"; @@ -11227,13 +11254,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.948.0" = { + "aws-sdk-2.949.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.948.0"; + version = "2.949.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.948.0.tgz"; - sha512 = "UJaCwccNaNNFtbhlvg+BmcaVWNI7RPonZA16nca0s3O+UnHm5y5H/nN6XpuJp+NUrxrLgTFaztPvjmBp5q6p+g=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.949.0.tgz"; + sha512 = "n9vqtsLPmSvJcvYvBLBbI1n4GZokwc/5zgHZD7VxdioLNXo1nHQ3VUi4MiW+3kIN40NUNf+Gc5vpc82yNYCvsw=="; }; }; "aws-sign2-0.6.0" = { @@ -12136,22 +12163,13 @@ let sha512 = "BR2vwQZwu24aRm588XHOnPVjjQtbK8sF0RopRFgMuke63/REJMWnePTa2YHKDBefuBYiVdgkowuB1/e4K7Ue3g=="; }; }; - "bcrypt-3.0.6" = { + "bcrypt-5.0.1" = { name = "bcrypt"; packageName = "bcrypt"; - version = "3.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt/-/bcrypt-3.0.6.tgz"; - sha512 = "taA5bCTfXe7FUjKroKky9EXpdhkVvhE5owfxfLYodbrAR1Ul3juLmIQmIQBK4L9a5BuUcE6cqmwT+Da20lF9tg=="; - }; - }; - "bcrypt-3.0.8" = { - name = "bcrypt"; - packageName = "bcrypt"; - version = "3.0.8"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt/-/bcrypt-3.0.8.tgz"; - sha512 = "jKV6RvLhI36TQnPDvUFqBEnGX9c8dRRygKxCZu7E+MgLfKZbmmXL8a7/SFFOyHoPNX9nV81cKRC5tbQfvEQtpw=="; + url = "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.1.tgz"; + sha512 = "9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw=="; }; }; "bcrypt-nodejs-0.0.3" = { @@ -14458,15 +14476,6 @@ let sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b"; }; }; - "callback-stream-1.1.0" = { - name = "callback-stream"; - packageName = "callback-stream"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz"; - sha1 = "4701a51266f06e06eaa71fc17233822d875f4908"; - }; - }; "caller-0.0.1" = { name = "caller"; packageName = "caller"; @@ -15187,15 +15196,6 @@ let sha1 = "5c710f2bab95653272842ba01c6ea61b3545ec35"; }; }; - "cheerio-0.22.0" = { - name = "cheerio"; - packageName = "cheerio"; - version = "0.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz"; - sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e"; - }; - }; "cheerio-1.0.0-rc.10" = { name = "cheerio"; packageName = "cheerio"; @@ -16420,13 +16420,13 @@ let sha512 = "vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg=="; }; }; - "color-3.2.0" = { + "color-3.2.1" = { name = "color"; packageName = "color"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-3.2.0.tgz"; - sha512 = "4ximSqKXLTQmYLJuvrRHtpOqniR+ASoaVK+Rxdy6ZpfsLvUqtIM7oGGgopRG+O4p9NRv/AfuVD3jsvdxyXqozQ=="; + url = "https://registry.npmjs.org/color/-/color-3.2.1.tgz"; + sha512 = "aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA=="; }; }; "color-convert-1.9.3" = { @@ -17365,13 +17365,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.97" = { + "constructs-3.3.98" = { name = "constructs"; packageName = "constructs"; - version = "3.3.97"; + version = "3.3.98"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.97.tgz"; - sha512 = "KDemmmUBgTDd2OKVOZkVEJM1LwP/bzm+cs2l/v1UYctIUl2X4LW+MrK7Ajd8blKkS5Vp6edkQSTSHUJnR/413w=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.98.tgz"; + sha512 = "VvDuJMqDUb16jB4EsCHthVb74yJcnD/5XWkybYgK5Ieee5o54eyxEzM9jFbZEasysPX4zR05Z/ygEzdlj+QZPg=="; }; }; "consume-http-header-1.0.0" = { @@ -18194,15 +18194,6 @@ let sha512 = "Pb3XjZNKdCs0Nk46yFKb82y+a3xRQeMvGi1AlJfIV40y/iwkgBqzS5EfqdnakEOvh2jzTOx3v8QxZpkz4hPzyw=="; }; }; - "cron-1.7.2" = { - name = "cron"; - packageName = "cron"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cron/-/cron-1.7.2.tgz"; - sha512 = "+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ=="; - }; - }; "cron-1.8.2" = { name = "cron"; packageName = "cron"; @@ -18212,6 +18203,15 @@ let sha512 = "Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg=="; }; }; + "cronosjs-1.7.1" = { + name = "cronosjs"; + packageName = "cronosjs"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cronosjs/-/cronosjs-1.7.1.tgz"; + sha512 = "d6S6+ep7dJxsAG8OQQCdKuByI/S/AV64d9OF5mtmcykOyPu92cAkAnF3Tbc9s5oOaLQBYYQmTNvjqYRkPJ/u5Q=="; + }; + }; "cross-env-5.2.1" = { name = "cross-env"; packageName = "cross-env"; @@ -18302,6 +18302,15 @@ let sha1 = "845ff0c0834a3ded9d160daca6d390906bb288cc"; }; }; + "cross-spawn-windows-exe-1.2.0" = { + name = "cross-spawn-windows-exe"; + packageName = "cross-spawn-windows-exe"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn-windows-exe/-/cross-spawn-windows-exe-1.2.0.tgz"; + sha512 = "mkLtJJcYbDCxEG7Js6eUnUNndWjyUZwJ3H7bErmmtOYU/Zb99DyUkpamuIZE0b3bhmJyZ7D90uS6f+CGxRRjOw=="; + }; + }; "crossroads-0.12.2" = { name = "crossroads"; packageName = "crossroads"; @@ -20813,6 +20822,15 @@ let sha512 = "y/Ev98AleGvl43YKTNcA2Q+lyFmsmCfTTNWy4cjEJxoLkbobcXtRS0Kvx06daCgr2GdtlwLfNzL553BkktfJoA=="; }; }; + "devtools-protocol-0.0.869402" = { + name = "devtools-protocol"; + packageName = "devtools-protocol"; + version = "0.0.869402"; + src = fetchurl { + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz"; + sha512 = "VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA=="; + }; + }; "devtools-protocol-0.0.883894" = { name = "devtools-protocol"; packageName = "devtools-protocol"; @@ -22019,13 +22037,13 @@ let sha512 = "icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ=="; }; }; - "electron-packager-15.2.0" = { + "electron-packager-15.3.0" = { name = "electron-packager"; packageName = "electron-packager"; - version = "15.2.0"; + version = "15.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/electron-packager/-/electron-packager-15.2.0.tgz"; - sha512 = "BaklTBRQy1JTijR3hi8XxHf/uo76rHbDCNM/eQHSblzE9C0NoNfOe86nPxB7y1u2jwlqoEJ4zFiHpTFioKGGRA=="; + url = "https://registry.npmjs.org/electron-packager/-/electron-packager-15.3.0.tgz"; + sha512 = "PHcykXinmjPyJcYoNGbOWNsOU25nIbMLHBAfg4caazWzYELFL14FshDZEqqrvVOMEUnqjx/Ktc1NmMIN5ZRomQ=="; }; }; "electron-rebuild-2.3.5" = { @@ -22037,13 +22055,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.779" = { + "electron-to-chromium-1.3.780" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.779"; + version = "1.3.780"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.779.tgz"; - sha512 = "nreave0y/1Qhmo8XtO6C/LpawNyC6U26+q7d814/e+tIqUK073pM+4xW7WUXyqCRa5K4wdxHmNMBAi8ap9nEew=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.780.tgz"; + sha512 = "2KQ9OYm9WMUNpAPA/4aerURl3hwRc9tNlpsiEj3Y8Gf7LVf26NzyLIX2v0hSagQwrS9+cWab+28A2GPKDoVNRA=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -23074,15 +23092,6 @@ let sha512 = "UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g=="; }; }; - "eslint-7.30.0" = { - name = "eslint"; - packageName = "eslint"; - version = "7.30.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.30.0.tgz"; - sha512 = "VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg=="; - }; - }; "eslint-7.31.0" = { name = "eslint"; packageName = "eslint"; @@ -23128,13 +23137,13 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.13.0" = { + "eslint-plugin-vue-7.14.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.13.0"; + version = "7.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.13.0.tgz"; - sha512 = "u0+jL8h2MshRuMTCLslktxRsPTjlENNcNufhgHu01N982DmHVdeFniyMPoVLLRjACQOwdz3FdlsgYGBMBG+AKg=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.14.0.tgz"; + sha512 = "IW5A2Td0wEWjFGaGVEO24JNXa8cVFzAQTXrYv/Vu3zyDVS9sjwOpZY0iqub7FOkT2AK3Imtw4U4wg48pP9oWww=="; }; }; "eslint-scope-3.7.3" = { @@ -24127,15 +24136,6 @@ let sha512 = "94JMAXcBkBHYazc8y85akJQvq/7PFdBHOWc5B421liyQXdDzvq49ct4tbTHRnpOZ3aPlsufLGVQdhJIuGUNiTQ=="; }; }; - "express-session-1.17.1" = { - name = "express-session"; - packageName = "express-session"; - version = "1.17.1"; - src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.17.1.tgz"; - sha512 = "UbHwgqjxQZJiWRTMyhvWGvjBQduGCSBDhhZXYenziMFjxst5rMV+aJZ6hKPHZnPyHGsrqRICxtX8jtEbm/z36Q=="; - }; - }; "express-session-1.17.2" = { name = "express-session"; packageName = "express-session"; @@ -24352,15 +24352,6 @@ let sha512 = "AEo4zm+TenK7zQorGK1f9mJ8L14hnTDi2ZQPR+Mub1NX8zimka1mXpV5LpH8x9HoUmFSHZCfLHqWvp0Y4FxxzQ=="; }; }; - "extract-zip-1.7.0" = { - name = "extract-zip"; - packageName = "extract-zip"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz"; - sha512 = "xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA=="; - }; - }; "extract-zip-2.0.1" = { name = "extract-zip"; packageName = "extract-zip"; @@ -26260,15 +26251,6 @@ let sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15"; }; }; - "fs-extra-1.0.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz"; - sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; - }; - }; "fs-extra-10.0.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -27358,13 +27340,13 @@ let sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; }; }; - "glob-parent-6.0.0" = { + "glob-parent-6.0.1" = { name = "glob-parent"; packageName = "glob-parent"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.0.tgz"; - sha512 = "Hdd4287VEJcZXUwv1l8a+vXC1GjOQqXe+VS30w/ypihpcnu9M1n3xeYeJu5CBpeEQj2nAab2xxz28GuA3vp4Ww=="; + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.1.tgz"; + sha512 = "kEVjS71mQazDBHKcsq4E9u/vUzaLcw1A8EtUeydawvIWQCJM0qQ08G1H7/XTjFUulla6XQiDOG6MXSaG0HDKog=="; }; }; "glob-slash-1.0.0" = { @@ -28682,15 +28664,6 @@ let sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; }; }; - "hasha-2.2.0" = { - name = "hasha"; - packageName = "hasha"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz"; - sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1"; - }; - }; "hasha-5.2.2" = { name = "hasha"; packageName = "hasha"; @@ -28925,13 +28898,13 @@ let sha512 = "n8aSFscI9r3gfhOcAECAtXFaQ1uy4QSke6bnaL+iymYZ/dWs9cqDqHM+rALfsHUwukUbxsdlECZ0pKmJdQ/4OA=="; }; }; - "help-me-1.1.0" = { + "help-me-3.0.0" = { name = "help-me"; packageName = "help-me"; - version = "1.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/help-me/-/help-me-1.1.0.tgz"; - sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; + url = "https://registry.npmjs.org/help-me/-/help-me-3.0.0.tgz"; + sha512 = "hx73jClhyk910sidBB7ERlnhMlFsJJIBqSVMFDwPN8o2v9nmp5KgLq1Xz1Bf1fCMMZ6mPrX159iG0VLy/fPMtQ=="; }; }; "here-0.0.2" = { @@ -29186,6 +29159,15 @@ let sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2"; }; }; + "hpagent-0.1.2" = { + name = "hpagent"; + packageName = "hpagent"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hpagent/-/hpagent-0.1.2.tgz"; + sha512 = "ePqFXHtSQWAFXYmj+JtOTHr84iNrII4/QRlAAPPE+zqnKy4xJo7Ie1Y4kC7AdB+LxLxSTTzBMASsEcy0q8YyvQ=="; + }; + }; "hrpc-2.2.0" = { name = "hrpc"; packageName = "hrpc"; @@ -29997,13 +29979,13 @@ let sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d"; }; }; - "i18next-15.1.2" = { + "i18next-20.3.2" = { name = "i18next"; packageName = "i18next"; - version = "15.1.2"; + version = "20.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/i18next/-/i18next-15.1.2.tgz"; - sha512 = "98ELn/dqep00DQ/v1E1gpM21HNN6nqU3mS85mYKd9P7lXrhfUcuysPaa3HviKSFb3WPdjf7avuAST3P0dhNp/A=="; + url = "https://registry.npmjs.org/i18next/-/i18next-20.3.2.tgz"; + sha512 = "e8CML2R9Ng2sSQOM80wb/PrM2j8mDm84o/T4Amzn9ArVyNX5/ENWxxAXkRpZdTQNDaxKImF93Wep4mAoozFrKw=="; }; }; "iconv-lite-0.4.23" = { @@ -30033,15 +30015,6 @@ let sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }; }; - "iconv-lite-0.6.2" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz"; - sha512 = "2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ=="; - }; - }; "iconv-lite-0.6.3" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -30582,13 +30555,13 @@ let sha512 = "s7lJuQDJEdjqtaIWhp3KYHl6WV3J04U9zoQ6wVc+Xoa06XM27SXUY57qC5DO46xkF0CfgXMKkKNcgvSu/SAEpA=="; }; }; - "ink-3.0.8" = { + "ink-3.0.9" = { name = "ink"; packageName = "ink"; - version = "3.0.8"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/ink/-/ink-3.0.8.tgz"; - sha512 = "ubMFylXYaG4IkXQVhPautbhV/p6Lo0GlvAMI/jh8cGJQ39yeznJbaTTJP2CqZXezA4GOHzalpwCWqux/NEY38w=="; + url = "https://registry.npmjs.org/ink/-/ink-3.0.9.tgz"; + sha512 = "BN+SyJ1rLbKzGPxGYkk22dYB0b58OtyMI4uN0dYucQ8MlIu5TpXJzaP6Bt8Mgqi1dkNZT55bjGyZ2iVLTkJ70w=="; }; }; "ink-spinner-4.0.2" = { @@ -33462,13 +33435,13 @@ let sha512 = "Heu6D+yI5mmUklLQdX3PdDvHUQm14618Fj4PQM9seKa4cohxzJ7EHopfRObKYHMko9awopx4Qr7Gtu6u/QPqfw=="; }; }; - "jsii-srcmak-0.1.300" = { + "jsii-srcmak-0.1.301" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.300"; + version = "0.1.301"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.300.tgz"; - sha512 = "yTB5QIeh1RkiixLzoP3BJ49yiVXnjTGh4O7Ywsn4oxH0IK6e6uDdqn6woFwbBpRwbShixo4PIytpsE2X6hDGgw=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.301.tgz"; + sha512 = "RmUimAPVkk1QflCGjJVUsQsv+W+lD6yZMLpHEHkNEdUvlYSUkZIM2VXjF7LUw7HnS9gFFBftUd6W02OVGbd9Bg=="; }; }; "json-bigint-0.2.3" = { @@ -33777,13 +33750,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.267" = { + "json2jsii-0.1.270" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.267"; + version = "0.1.270"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.267.tgz"; - sha512 = "mo/Vagk6g+O5olk+K7AwukyrmNFuj/OyBNswmhbGUCmiNN/ddEIVcmCMx481FmYoewTKl0Axyt33iapt5IcxCg=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.270.tgz"; + sha512 = "blBOb7+GDWTLv6jxye684joWzQyuFM6HT+NsPQPuASkT7pABBt3Xx2wsVm/qMJeg7ITufgSfeh1TnNrFROicMg=="; }; }; "json3-3.2.6" = { @@ -34354,15 +34327,6 @@ let sha512 = "5AsrYCiCHIUxuw/G2r7xcoTW/NTf5IFwAe1fkwf2ifM/KZzEojaTylh1Pppu60oEixww1rfcWJaRGLi3eAJsrQ=="; }; }; - "kew-0.7.0" = { - name = "kew"; - packageName = "kew"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz"; - sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; - }; - }; "keyboardevent-key-polyfill-1.1.0" = { name = "keyboardevent-key-polyfill"; packageName = "keyboardevent-key-polyfill"; @@ -36037,15 +36001,6 @@ let sha1 = "5d19fa005c8c4d236faf4742c7b7a1fcabe29267"; }; }; - "lodash.bind-4.2.1" = { - name = "lodash.bind"; - packageName = "lodash.bind"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz"; - sha1 = "7ae3017e939622ac31b7d7d7dcb1b34db1690d35"; - }; - }; "lodash.camelcase-4.3.0" = { name = "lodash.camelcase"; packageName = "lodash.camelcase"; @@ -36649,15 +36604,6 @@ let sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"; }; }; - "lodash.pick-4.4.0" = { - name = "lodash.pick"; - packageName = "lodash.pick"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz"; - sha1 = "52f05610fff9ded422611441ed1fc123a03001b3"; - }; - }; "lodash.reduce-4.6.0" = { name = "lodash.reduce"; packageName = "lodash.reduce"; @@ -36667,15 +36613,6 @@ let sha1 = "f1ab6b839299ad48f784abbf476596f03b914d3b"; }; }; - "lodash.reject-4.6.0" = { - name = "lodash.reject"; - packageName = "lodash.reject"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz"; - sha1 = "80d6492dc1470864bbf583533b651f42a9f52415"; - }; - }; "lodash.repeat-4.1.0" = { name = "lodash.repeat"; packageName = "lodash.repeat"; @@ -39790,15 +39727,6 @@ let sha512 = "sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw=="; }; }; - "mkpath-1.0.0" = { - name = "mkpath"; - packageName = "mkpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mkpath/-/mkpath-1.0.0.tgz"; - sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; - }; - }; "mobx-6.3.2" = { name = "mobx"; packageName = "mobx"; @@ -40096,13 +40024,13 @@ let sha512 = "NOeCoW6AYc3hLi30npe7uzbD9b4FQZKH40YKABUCCvaKKL5agj6YzvHoNx8jQpDMNPgIa5bvSZQbQpWBAVD0Kw=="; }; }; - "mqtt-4.2.6" = { + "mqtt-4.2.8" = { name = "mqtt"; packageName = "mqtt"; - version = "4.2.6"; + version = "4.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.6.tgz"; - sha512 = "GpxVObyOzL0CGPBqo6B04GinN8JLk12NRYAIkYvARd9ZCoJKevvOyCaWK6bdK/kFSDj3LPDnCsJbezzNlsi87Q=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.8.tgz"; + sha512 = "DJYjlXODVXtSDecN8jnNzi6ItX3+ufGsEs9OB3YV24HtkRrh7kpx8L5M1LuyF0KzaiGtWr2PzDcMGAY60KGOSA=="; }; }; "mqtt-packet-6.10.0" = { @@ -40591,24 +40519,6 @@ let sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d"; }; }; - "nan-2.13.2" = { - name = "nan"; - packageName = "nan"; - version = "2.13.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz"; - sha512 = "TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="; - }; - }; - "nan-2.14.0" = { - name = "nan"; - packageName = "nan"; - version = "2.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; - sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; - }; - }; "nan-2.14.2" = { name = "nan"; packageName = "nan"; @@ -41727,15 +41637,6 @@ let sha1 = "e652bbf3885a04dad6a353d74176177c83914707"; }; }; - "node-phantom-simple-2.2.4" = { - name = "node-phantom-simple"; - packageName = "node-phantom-simple"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/node-phantom-simple/-/node-phantom-simple-2.2.4.tgz"; - sha1 = "4fc4effbb02f241fb5082bd4fbab398e4aecb64d"; - }; - }; "node-polyglot-1.0.0" = { name = "node-polyglot"; packageName = "node-polyglot"; @@ -41754,24 +41655,6 @@ let sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q=="; }; }; - "node-pre-gyp-0.12.0" = { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz"; - sha512 = "4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A=="; - }; - }; - "node-pre-gyp-0.14.0" = { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz"; - sha512 = "+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA=="; - }; - }; "node-pre-gyp-0.6.39" = { name = "node-pre-gyp"; packageName = "node-pre-gyp"; @@ -41790,31 +41673,13 @@ let sha1 = "dbbd4af12134e2e635c245ef93ffcf6f60673a5d"; }; }; - "node-red-admin-0.2.7" = { + "node-red-admin-2.2.0" = { name = "node-red-admin"; packageName = "node-red-admin"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-0.2.7.tgz"; - sha512 = "bsFbC7KFfGY37+SuYfmM9Er00cM92anqp6xCj8x7Y+4qZHOXnLi9XDFoWtvvsC1uQyaMqas1ALCfqcOxLlWngw=="; - }; - }; - "node-red-node-rbe-0.5.0" = { - name = "node-red-node-rbe"; - packageName = "node-red-node-rbe"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.5.0.tgz"; - sha512 = "88zuty5SiLW2/0vK8ZpMCoEBq2JbR4GEEIoJp3YWhQQytQRRvzHgOodzOkuH4AQoMFZXuVxF1lVswL6yiDCQiQ=="; - }; - }; - "node-red-node-tail-0.3.1" = { - name = "node-red-node-tail"; - packageName = "node-red-node-tail"; - version = "0.3.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-tail/-/node-red-node-tail-0.3.1.tgz"; - sha512 = "d/CbPGJMSNekJHOQu4WMNwjXRFnZ4c2+D3nlSdRH6wdUVVc++4nat8TuhcXKUe9W9+nqMrmVhReGnf8UwKsfBw=="; + url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-2.2.0.tgz"; + sha512 = "dBljNubVsolJkgfXUAF3KrCAO+hi5AXz+cftGjfHT76PyVB9pFUbAgTrkjZmKciC/B/14kEV5Ds+SwonqyTMfg=="; }; }; "node-releases-1.1.73" = { @@ -43852,22 +43717,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.0.11" = { + "ot-builder-1.1.0" = { name = "ot-builder"; packageName = "ot-builder"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.11.tgz"; - sha512 = "bexZrUc8L6R5N47kgD52vMP6mU4y+09VTc2ZqZD/0uktzY4ksXCEjLcRkHe9uEocmq2jtuPFtpoSTaO9mTxrhA=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.1.0.tgz"; + sha512 = "IvQqHq33yHRKQuBzlzE6N3tXR2IktvBXeTvdASzib5Lqz84MJ1raGQrDNMimYxpRjcXZFJVfDgATYy5+gLhJIQ=="; }; }; - "otb-ttc-bundle-1.0.11" = { + "otb-ttc-bundle-1.1.0" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "1.0.11"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.11.tgz"; - sha512 = "Wx/WXWyvWnlyTBBZBxOJsEWbBxf8MdOXNmggISi+0l4o63jobEe3ZB5oCOMbNyJPynqv+JyyrroVDTOuzP3HAQ=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.1.0.tgz"; + sha512 = "tn3jkqHfaVIQsecQyAUTNf/VAAfE5EQiDH3AyIb1OFXjcdp0P9pBZUd0E4iP+rQjVoN8eMy1uCgvde5M5ZqVrg=="; }; }; "ow-0.21.0" = { @@ -45463,13 +45328,13 @@ let sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; }; }; - "perfect-scrollbar-1.5.1" = { + "perfect-scrollbar-1.5.2" = { name = "perfect-scrollbar"; packageName = "perfect-scrollbar"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.1.tgz"; - sha512 = "MrSImINnIh3Tm1hdPT6bji6fmIeRorVEegQvyUnhqko2hDGTHhmjPefHXfxG/Jb8xVbfCwgmUIlIajERGXjVXQ=="; + url = "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.2.tgz"; + sha512 = "McHAinFkyzKbBZrFtb4MT2mxkehp15KvOX/UrjB8C5EZZXHTHgyETo5IGFYtHRTI2Pb2bsV0OE0YnkjT9Cw3aw=="; }; }; "performance-now-0.2.0" = { @@ -45553,15 +45418,6 @@ let sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w=="; }; }; - "phantomjs-prebuilt-2.1.16" = { - name = "phantomjs-prebuilt"; - packageName = "phantomjs-prebuilt"; - version = "2.1.16"; - src = fetchurl { - url = "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz"; - sha1 = "efd212a4a3966d3647684ea8ba788549be2aefef"; - }; - }; "phin-2.9.3" = { name = "phin"; packageName = "phin"; @@ -47525,15 +47381,6 @@ let sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; }; }; - "promise-phantom-3.1.6" = { - name = "promise-phantom"; - packageName = "promise-phantom"; - version = "3.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-phantom/-/promise-phantom-3.1.6.tgz"; - sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931"; - }; - }; "promise-queue-2.2.5" = { name = "promise-queue"; packageName = "promise-queue"; @@ -48776,6 +48623,15 @@ let sha512 = "bsyDHbFBvbofZ63xqF7hMhuKBX1h4WsqFIAoh1GuHr/Y9cewh+EFNAOdqWSkQRHLiBU/MY6M+8PUnXXjAPtuSg=="; }; }; + "puppeteer-9.1.1" = { + name = "puppeteer"; + packageName = "puppeteer"; + version = "9.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-9.1.1.tgz"; + sha512 = "W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw=="; + }; + }; "purgecss-2.3.0" = { name = "purgecss"; packageName = "purgecss"; @@ -49532,13 +49388,13 @@ let sha1 = "08c6e04a0168f6eb621c22ab6cb1151bd9f4a64d"; }; }; - "rcedit-2.3.0" = { + "rcedit-3.0.1" = { name = "rcedit"; packageName = "rcedit"; - version = "2.3.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/rcedit/-/rcedit-2.3.0.tgz"; - sha512 = "h1gNEl9Oai1oijwyJ1WYqYSXTStHnOcv1KYljg/8WM4NAg3H1KBK3azIaKkQ1WQl+d7PoJpcBMscPfLXVKgCLQ=="; + url = "https://registry.npmjs.org/rcedit/-/rcedit-3.0.1.tgz"; + sha512 = "XM0Jv40/y4hVAqj/MO70o/IWs4uOsaSoo2mLyk3klFDW+SStLnCtzuQu+1OBTIMGlM8CvaK9ftlYCp6DJ+cMsw=="; }; }; "re-emitter-1.1.4" = { @@ -50180,13 +50036,13 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; - "rechoir-0.7.0" = { + "rechoir-0.7.1" = { name = "rechoir"; packageName = "rechoir"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz"; - sha512 = "ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q=="; + url = "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz"; + sha512 = "/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg=="; }; }; "record-cache-1.1.1" = { @@ -52340,13 +52196,13 @@ let sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; }; }; - "schema-utils-3.1.0" = { + "schema-utils-3.1.1" = { name = "schema-utils"; packageName = "schema-utils"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz"; - sha512 = "tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w=="; + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz"; + sha512 = "Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw=="; }; }; "scoped-regex-2.1.0" = { @@ -53852,13 +53708,13 @@ let sha512 = "NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ=="; }; }; - "snyk-docker-plugin-4.21.3" = { + "snyk-docker-plugin-4.22.1" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "4.21.3"; + version = "4.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.21.3.tgz"; - sha512 = "u54T2ooQatEWeeFRgzpEl6PpyzEHjNU78VkMg2FarNzuNPdmVsE/Wb6rs8JsB8shTLS6jWp9XCY2zmkpr9Zgag=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.22.1.tgz"; + sha512 = "fpXGkBu69Vb5meSrq0KjSKr0nlibA8z18fuH/O8HuDh1b5XyqKNz412njybpJtW07JPpA9rKX9gewRBZWch6fQ=="; }; }; "snyk-go-parser-1.4.1" = { @@ -55346,13 +55202,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.20" = { + "sscaff-1.2.21" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.20"; + version = "1.2.21"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.20.tgz"; - sha512 = "D5a+kU//hvpNbXUxIdKmEkzdmdByB8AB2PVVWUrkh08bZPGSZfbTALrBclQDVuxtKbrCa5X6d7SqwM69OltT2Q=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.21.tgz"; + sha512 = "X9Ei1liwS+LljdRsWz/QbgYK2sByLbDpvLTwVlL8+fGSz9Oh1D85WU3TR8kCCuPKLvfdGWIRimSQWvJ8zh5riw=="; }; }; "ssh-config-1.1.6" = { @@ -56624,13 +56480,13 @@ let sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; }; }; - "strtok3-6.2.0" = { + "strtok3-6.2.2" = { name = "strtok3"; packageName = "strtok3"; - version = "6.2.0"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.2.0.tgz"; - sha512 = "hBbPN4+f9fypbfTs0NImALgzYcb6k/blFr2mJVX6bUOmJCbXe/trDHdIC+Ir5XUXRMGFvq487ecwLitDoHVoew=="; + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.2.2.tgz"; + sha512 = "iUzLl3UhF2RfqQah80JngnfltQFLEidGyTX8+hHFMQFjzUj3UpIpOx824FtFmRI9bwyywReENpdHGDkFJwJlGQ=="; }; }; "structured-source-3.0.2" = { @@ -58479,15 +58335,6 @@ let sha1 = "f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"; }; }; - "tmp-0.0.31" = { - name = "tmp"; - packageName = "tmp"; - version = "0.0.31"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz"; - sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; - }; - }; "tmp-0.0.33" = { name = "tmp"; packageName = "tmp"; @@ -59955,15 +59802,6 @@ let sha512 = "57H3ACYFXeo1IaZ1w02sfA71wI60MGco/IQFjOqK+WtKoprh7Go2/yvd2HPtoJILO2Or84ncLccI4xoHMTSbGg=="; }; }; - "uglify-js-3.13.3" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "3.13.3"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.3.tgz"; - sha512 = "otIc7O9LyxpUcQoXzj2hL4LPWKklO6LJWoJUzNa8A17Xgi4fOeDC8FBDOLHnC/Slo1CQgsZMcM6as0M76BZaig=="; - }; - }; "uglify-js-3.4.10" = { name = "uglify-js"; packageName = "uglify-js"; @@ -63115,13 +62953,13 @@ let sha512 = "8FdXi0gieEwh1IprIBafpiJWcApwrU+l2FEj8c1HtHFdNXMd0+2jUSjBVmcQYohf/E72irwAXEXLga6TQcB3FA=="; }; }; - "vue-eslint-parser-7.8.0" = { + "vue-eslint-parser-7.9.0" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; - version = "7.8.0"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.8.0.tgz"; - sha512 = "ehmmrLZNYLUoKayvVW8l8HyPQIfuYZHiJoQLRP3dapDlTU7bGs4tqIKVGdAEpMuXS/b4R/PImCt7Tkj4UhX1SQ=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.9.0.tgz"; + sha512 = "QBlhZ5LteDRVy2dISfQhNEmmcqph+GTaD4SH41bYzXcVHFPJ9p34zCG6QAqOZVa8PKaVgbomFnoZpGJRZi14vg=="; }; }; "vue-onsenui-helper-json-1.0.2" = { @@ -63583,13 +63421,13 @@ let sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; }; - "webpack-sources-2.3.0" = { + "webpack-sources-2.3.1" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.0.tgz"; - sha512 = "WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ=="; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz"; + sha512 = "y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA=="; }; }; "webpack-stream-6.1.0" = { @@ -63637,13 +63475,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-1.2.4" = { + "webtorrent-1.2.5" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.2.4.tgz"; - sha512 = "oQf2HYtylJSHlPX8FDqn79JEO2Og856X78oZHH3So7zJK0RlQVdDolH82MvjbrVxDv6Mfa7s1rIjPKcy+hQEFw=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.2.5.tgz"; + sha512 = "EvtAQ3rK4c7Kf4ZGxYOGvi8Jih8qsZka1IgNB8T5Vxw5UzSNG1nxTVNNTXL0jFhQUMsyRwIOkTgd7ZkJY6bqsw=="; }; }; "well-known-symbols-2.0.0" = { @@ -64573,15 +64411,6 @@ let sha512 = "eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA=="; }; }; - "ws-6.2.1" = { - name = "ws"; - packageName = "ws"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz"; - sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; - }; - }; "ws-6.2.2" = { name = "ws"; packageName = "ws"; @@ -64618,6 +64447,15 @@ let sha512 = "6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw=="; }; }; + "ws-7.5.1" = { + name = "ws"; + packageName = "ws"; + version = "7.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.5.1.tgz"; + sha512 = "2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow=="; + }; + }; "ws-7.5.3" = { name = "ws"; packageName = "ws"; @@ -65708,15 +65546,6 @@ let sha512 = "7tDlwhrBG+oYFdXNOjILSurpfQyuVgkRe3hB2q8TEssamDHB7BbLWYkYO98nTn0FibfdFroFKDjndbgufAgS/Q=="; }; }; - "zen-observable-0.5.2" = { - name = "zen-observable"; - packageName = "zen-observable"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.5.2.tgz"; - sha512 = "Dhp/R0pqSHj3vPs5O1gVd9kZx5Iew2lqVcfJQOBHx3llM/dLea8vl9wSa9FK8wLdSBQJ6mmgKi9+Rk2DRH3i9Q=="; - }; - }; "zen-observable-0.8.15" = { name = "zen-observable"; packageName = "zen-observable"; @@ -67196,7 +67025,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.780" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -67371,7 +67200,7 @@ in dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" - sources."schema-utils-3.1.0" + sources."schema-utils-3.1.1" sources."source-map-0.6.1" ]; }) @@ -67397,12 +67226,12 @@ in dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" - sources."schema-utils-3.1.0" + sources."schema-utils-3.1.1" sources."tapable-2.2.0" ]; }) sources."webpack-node-externals-3.0.0" - (sources."webpack-sources-2.3.0" // { + (sources."webpack-sources-2.3.1" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -67611,7 +67440,7 @@ in sources."@types/range-parser-1.2.4" sources."@types/serve-static-1.13.10" sources."@types/through-0.0.30" - sources."@types/ws-7.4.6" + sources."@types/ws-7.4.7" sources."@vue/cli-shared-utils-4.5.13" (sources."@vue/cli-ui-4.5.13" // { dependencies = [ @@ -67876,7 +67705,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.780" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -68897,7 +68726,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.780" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -69028,7 +68857,7 @@ in sources."browserslist-4.16.6" sources."caniuse-lite-1.0.30001245" sources."colorette-1.2.2" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.780" sources."escalade-3.1.1" sources."fraction.js-4.1.1" sources."node-releases-1.1.73" @@ -69062,7 +68891,7 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.948.0" // { + (sources."aws-sdk-2.949.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -71411,7 +71240,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.97" + sources."constructs-3.3.98" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -71484,13 +71313,13 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.300" // { + (sources."jsii-srcmak-0.1.301" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.267" + sources."json2jsii-0.1.270" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -71526,7 +71355,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.20" + sources."sscaff-1.2.21" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -71594,7 +71423,7 @@ in sources."type-fest-0.21.3" ]; }) - sources."ansi-regex-4.1.0" + sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."archiver-5.3.0" (sources."archiver-utils-2.1.0" // { @@ -71641,7 +71470,7 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.1.1" sources."concat-map-0.0.1" - sources."constructs-3.3.97" + sources."constructs-3.3.98" sources."convert-to-spaces-1.0.2" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" @@ -71696,7 +71525,7 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."ink-3.0.8" // { + (sources."ink-3.0.9" // { dependencies = [ sources."type-fest-0.12.0" ]; @@ -71760,7 +71589,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.300" // { + (sources."jsii-srcmak-0.1.301" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -71843,7 +71672,7 @@ in sources."slice-ansi-3.0.0" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.20" + sources."sscaff-1.2.21" sources."stack-utils-2.0.3" sources."stream-buffers-3.0.2" (sources."streamroller-2.2.4" // { @@ -71851,22 +71680,12 @@ in sources."date-format-2.1.0" ]; }) - (sources."string-length-3.1.0" // { - dependencies = [ - sources."astral-regex-1.0.0" - sources."strip-ansi-5.2.0" - ]; - }) sources."string-width-4.2.2" sources."string.prototype.repeat-0.2.0" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.1.1" - (sources."strip-ansi-6.0.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - ]; - }) + sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" sources."tar-stream-2.2.0" sources."type-fest-0.15.1" @@ -72144,10 +71963,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.18.8"; + version = "0.18.11"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.8.tgz"; - sha512 = "CjSVxlpHutTkycvsJyebL+7Om+okMCkffn6V2LC9/Ix68/RVTjhmvwmbZhVe8zg5G9uyjdNUW+UpDBQy/GAm9Q=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.11.tgz"; + sha512 = "L16wPMe5iDrprv5JNlTBtTd3WmRM+kLN9u+lQTDFpj0t6WxE16WzCm2Ktl1jzgpGY+xcdGakbZAL2y9bLXaJqg=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -72230,10 +72049,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.4.0.tgz"; - sha512 = "I2DcWVp/meb44yLAHrKvkLU869MLcwK1Tz87hk1W8+naD+9oMNvWBYjxQR7AU5l0WUB5SeCMuay63MFELhyPfA=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.4.1.tgz"; + sha512 = "CgBUD5qPMvbdTUKTIaeKPxmJSieVJNK3JS1PPgr4ivIXqXYZ4ECP4DM7jmnkA+BnK9Xvz1FnlebUTxTv3z/IFQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -72661,7 +72480,7 @@ in sources."escape-string-regexp-1.0.5" ]; }) - sources."@eslint/eslintrc-0.4.2" + sources."@eslint/eslintrc-0.4.3" sources."@humanwhocodes/config-array-0.5.0" sources."@humanwhocodes/object-schema-1.2.0" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -72831,14 +72650,14 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.780" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."entities-1.1.2" sources."error-ex-1.3.2" sources."escape-string-regexp-4.0.0" - (sources."eslint-7.30.0" // { + (sources."eslint-7.31.0" // { dependencies = [ sources."eslint-visitor-keys-2.1.0" ]; @@ -73630,10 +73449,10 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.156"; + version = "1.1.157"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.156.tgz"; - sha512 = "lPtMmvdxFMVKm7KYKWVDmYyQo1KpG7oOwre4WlKj4+TeWxhOfkxz2q1HtsoYeideu0X9Y6GCGNlBpeZbFMhP4g=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.157.tgz"; + sha512 = "GyjrMQFSqrAnBB0SlZC93JV9E8VAcsDhfCBHZ6DIRDCH9qsSI3g0Y0RGJp7v+JHDDZTrEPJiiPOu1e/6PFA90A=="; }; dependencies = [ sources."pyright-1.1.157" @@ -73880,7 +73699,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.780" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -74289,7 +74108,7 @@ in sources."escape-string-regexp-1.0.5" ]; }) - sources."@eslint/eslintrc-0.4.2" + sources."@eslint/eslintrc-0.4.3" sources."@humanwhocodes/config-array-0.5.0" sources."@humanwhocodes/object-schema-1.2.0" sources."acorn-7.4.1" @@ -74325,8 +74144,12 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" - sources."eslint-7.30.0" - sources."eslint-plugin-vue-7.13.0" + sources."eslint-7.31.0" + (sources."eslint-plugin-vue-7.14.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -74443,7 +74266,7 @@ in sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."vls-0.7.4" - (sources."vue-eslint-parser-7.8.0" // { + (sources."vue-eslint-parser-7.9.0" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" @@ -74656,10 +74479,10 @@ in configurable-http-proxy = nodeEnv.buildNodePackage { name = "configurable-http-proxy"; packageName = "configurable-http-proxy"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.4.0.tgz"; - sha512 = "8tSSnS8pjuw6Wtu/3Ufd2elV/3DnE3AUu3L+IYyukLoQNrRY9iS+Qfg3e1APokk7OzSghDkxW7yRZFiAoHF6FQ=="; + url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.5.0.tgz"; + sha512 = "iuaG85EDWIp02Dm1LZsi7vRE4CH5cRwo2+GaEEAi6fgX3dRLpt/jhQc7ylwXibi4kUjMvpV/xbMwjRRmGcg4NQ=="; }; dependencies = [ sources."@dabh/diagnostics-2.0.2" @@ -74671,7 +74494,7 @@ in sources."color-string-1.6.0" sources."colors-1.4.0" sources."colorspace-1.1.2" - sources."commander-7.2.0" + sources."commander-8.0.0" sources."core-util-is-1.0.2" sources."enabled-2.0.0" sources."eventemitter3-4.0.7" @@ -76971,30 +76794,30 @@ in "@electron-forge/cli" = nodeEnv.buildNodePackage { name = "_at_electron-forge_slash_cli"; packageName = "@electron-forge/cli"; - version = "6.0.0-beta.57"; + version = "6.0.0-beta.58"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.57.tgz"; - sha512 = "ouIL3FI6C0W3iLwwwQzKufjoP/OZagUDMCDjGLN/dqeg+lZ+cR40bdfaNTFha9ajz+zSe2SmhCOMVUVNNkJ5Sg=="; + url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.58.tgz"; + sha512 = "dlGj8lrtUGOwoNaU/zEhbJMOEAqiZUcn9AJrX80saSplkkWEkOpoo4UkLJ256BLyK8nA1+k89pT/KMtFrUFcPg=="; }; dependencies = [ - sources."@electron-forge/async-ora-6.0.0-beta.57" - sources."@electron-forge/core-6.0.0-beta.57" - sources."@electron-forge/installer-base-6.0.0-beta.57" - sources."@electron-forge/installer-darwin-6.0.0-beta.57" - sources."@electron-forge/installer-deb-6.0.0-beta.57" - sources."@electron-forge/installer-dmg-6.0.0-beta.57" - sources."@electron-forge/installer-exe-6.0.0-beta.57" - sources."@electron-forge/installer-linux-6.0.0-beta.57" - sources."@electron-forge/installer-rpm-6.0.0-beta.57" - sources."@electron-forge/installer-zip-6.0.0-beta.57" - sources."@electron-forge/maker-base-6.0.0-beta.57" - sources."@electron-forge/plugin-base-6.0.0-beta.57" - sources."@electron-forge/publisher-base-6.0.0-beta.57" - sources."@electron-forge/shared-types-6.0.0-beta.57" - sources."@electron-forge/template-base-6.0.0-beta.57" - sources."@electron-forge/template-typescript-6.0.0-beta.57" - sources."@electron-forge/template-typescript-webpack-6.0.0-beta.57" - sources."@electron-forge/template-webpack-6.0.0-beta.57" + sources."@electron-forge/async-ora-6.0.0-beta.58" + sources."@electron-forge/core-6.0.0-beta.58" + sources."@electron-forge/installer-base-6.0.0-beta.58" + sources."@electron-forge/installer-darwin-6.0.0-beta.58" + sources."@electron-forge/installer-deb-6.0.0-beta.58" + sources."@electron-forge/installer-dmg-6.0.0-beta.58" + sources."@electron-forge/installer-exe-6.0.0-beta.58" + sources."@electron-forge/installer-linux-6.0.0-beta.58" + sources."@electron-forge/installer-rpm-6.0.0-beta.58" + sources."@electron-forge/installer-zip-6.0.0-beta.58" + sources."@electron-forge/maker-base-6.0.0-beta.58" + sources."@electron-forge/plugin-base-6.0.0-beta.58" + sources."@electron-forge/publisher-base-6.0.0-beta.58" + sources."@electron-forge/shared-types-6.0.0-beta.58" + sources."@electron-forge/template-base-6.0.0-beta.58" + sources."@electron-forge/template-typescript-6.0.0-beta.58" + sources."@electron-forge/template-typescript-webpack-6.0.0-beta.58" + sources."@electron-forge/template-webpack-6.0.0-beta.58" (sources."@electron/get-1.12.4" // { dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -77021,7 +76844,7 @@ in sources."universalify-0.1.2" ]; }) - sources."@malept/cross-spawn-promise-1.1.1" + sources."@malept/cross-spawn-promise-2.0.0" sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" @@ -77108,6 +76931,11 @@ in sources."core-js-3.15.2" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" + (sources."cross-spawn-windows-exe-1.2.0" // { + dependencies = [ + sources."@malept/cross-spawn-promise-1.1.1" + ]; + }) sources."currently-unhandled-0.4.1" sources."dashdash-1.14.1" (sources."debug-4.3.2" // { @@ -77146,13 +76974,14 @@ in sources."debug-2.6.9" ]; }) - (sources."electron-packager-15.2.0" // { + (sources."electron-packager-15.3.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) (sources."electron-rebuild-2.3.5" // { dependencies = [ + sources."@malept/cross-spawn-promise-1.1.1" sources."fs-extra-9.1.0" ]; }) @@ -77449,7 +77278,7 @@ in sources."qs-6.5.2" sources."quick-lru-5.1.1" sources."rc-1.2.8" - sources."rcedit-2.3.0" + sources."rcedit-3.0.1" sources."read-pkg-2.0.0" (sources."read-pkg-up-2.0.0" // { dependencies = [ @@ -77733,7 +77562,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.780" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -77763,7 +77592,7 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."ink-3.0.8" // { + (sources."ink-3.0.9" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -77916,13 +77745,6 @@ in sources."escape-string-regexp-2.0.0" ]; }) - (sources."string-length-3.1.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."astral-regex-1.0.0" - sources."strip-ansi-5.2.0" - ]; - }) sources."string-width-4.2.2" sources."strip-ansi-6.0.0" sources."strip-eof-1.0.0" @@ -79678,10 +79500,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.30.0"; + version = "7.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.30.0.tgz"; - sha512 = "VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.31.0.tgz"; + sha512 = "vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -79888,7 +79710,7 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" - sources."eslint-7.30.0" + sources."eslint-7.31.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -80649,12 +80471,7 @@ in }) sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" - (sources."color-3.2.0" // { - dependencies = [ - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) + sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.6.0" @@ -80851,7 +80668,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.780" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -82259,7 +82076,7 @@ in sources."url-join-4.0.0" (sources."url-loader-4.1.1" // { dependencies = [ - sources."schema-utils-3.1.0" + sources."schema-utils-3.1.1" ]; }) sources."url-parse-1.5.1" @@ -82562,184 +82379,274 @@ in bypassCache = true; reconstructLock = true; }; - "fast-cli-1.x" = nodeEnv.buildNodePackage { + fast-cli = nodeEnv.buildNodePackage { name = "fast-cli"; packageName = "fast-cli"; - version = "1.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-cli/-/fast-cli-1.0.0.tgz"; - sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; + url = "https://registry.npmjs.org/fast-cli/-/fast-cli-3.0.1.tgz"; + sha512 = "QT3uBdxjHiXEz8iSAUJezETjKgTEP0PicHk36ga2veZHmIpqU5k+M0z1bmZ5G+EJHCN84o4w++fngJIgcj1Nqw=="; }; dependencies = [ - sources."ajv-6.12.6" - sources."ansi-escapes-1.4.0" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."array-find-index-1.0.2" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" - sources."bcrypt-pbkdf-1.0.2" + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.14.7" + sources."@babel/core-7.14.6" + sources."@babel/generator-7.14.5" + sources."@babel/helper-annotate-as-pure-7.14.5" + sources."@babel/helper-compilation-targets-7.14.5" + sources."@babel/helper-function-name-7.14.5" + sources."@babel/helper-get-function-arity-7.14.5" + sources."@babel/helper-hoist-variables-7.14.5" + sources."@babel/helper-member-expression-to-functions-7.14.7" + sources."@babel/helper-module-imports-7.14.5" + sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-optimise-call-expression-7.14.5" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-replace-supers-7.14.5" + sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-split-export-declaration-7.14.5" + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helpers-7.14.6" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.14.7" + sources."@babel/plugin-proposal-object-rest-spread-7.14.7" + sources."@babel/plugin-syntax-jsx-7.14.5" + sources."@babel/plugin-syntax-object-rest-spread-7.8.3" + sources."@babel/plugin-transform-destructuring-7.14.7" + sources."@babel/plugin-transform-parameters-7.14.5" + sources."@babel/plugin-transform-react-jsx-7.14.5" + sources."@babel/template-7.14.5" + sources."@babel/traverse-7.14.7" + sources."@babel/types-7.14.5" + sources."@types/minimist-1.2.2" + sources."@types/node-16.3.3" + sources."@types/normalize-package-data-2.4.1" + sources."@types/yauzl-2.9.2" + sources."@types/yoga-layout-1.9.2" + sources."agent-base-6.0.2" + (sources."ansi-escapes-4.3.2" // { + dependencies = [ + sources."type-fest-0.21.3" + ]; + }) + sources."ansi-regex-5.0.0" + sources."ansi-styles-3.2.1" + sources."arrify-1.0.1" + sources."astral-regex-2.0.0" + sources."auto-bind-4.0.0" + sources."balanced-match-1.0.2" + sources."base64-js-1.5.1" + sources."bl-4.1.0" + sources."brace-expansion-1.1.11" + sources."browserslist-4.16.6" + sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" - sources."buffer-from-1.1.1" - sources."camelcase-2.1.1" - sources."camelcase-keys-2.1.0" - sources."caseless-0.12.0" - sources."chalk-1.1.3" - sources."cli-cursor-1.0.2" - sources."cli-spinners-1.3.1" - sources."co-4.6.0" + sources."caller-callsite-2.0.0" + sources."caller-path-2.0.0" + sources."callsites-2.0.0" + sources."camelcase-5.3.1" + sources."camelcase-keys-6.2.2" + sources."caniuse-lite-1.0.30001245" + sources."chalk-2.4.2" + sources."chownr-1.1.4" + sources."ci-info-2.0.0" + sources."cli-boxes-2.2.1" + sources."cli-cursor-3.1.0" + sources."cli-spinners-2.6.0" + sources."cli-truncate-2.1.0" + sources."code-excerpt-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."combined-stream-1.0.8" - sources."concat-stream-1.6.2" - sources."core-util-is-1.0.2" - sources."currently-unhandled-0.4.1" - sources."dashdash-1.14.1" - sources."debug-2.6.9" + sources."colorette-1.2.2" + sources."commondir-1.0.1" + sources."concat-map-0.0.1" + sources."convert-source-map-1.8.0" + sources."convert-to-spaces-1.0.2" + sources."debug-4.3.2" sources."decamelize-1.2.0" - sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.2" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) + sources."delay-5.0.0" + sources."devtools-protocol-0.0.869402" + sources."electron-to-chromium-1.3.780" + sources."emoji-regex-8.0.0" + sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es6-promise-4.2.8" + sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" - sources."exit-hook-1.1.1" - sources."extend-3.0.2" - sources."extract-zip-1.7.0" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" + sources."extract-zip-2.0.1" sources."fd-slicer-1.1.0" - sources."find-up-1.1.2" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."fs-extra-1.0.0" + sources."find-cache-dir-3.3.1" + sources."find-up-4.1.0" + sources."fs-constants-1.0.0" + sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-stdin-4.0.1" - sources."getpass-0.1.7" - sources."graceful-fs-4.2.6" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" + sources."gensync-1.0.0-beta.2" + sources."get-stream-5.2.0" + sources."glob-7.1.7" + sources."globals-11.12.0" + sources."hard-rejection-2.1.0" sources."has-1.0.3" - sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."hasha-2.2.0" - sources."hosted-git-info-2.8.9" - sources."http-signature-1.2.0" - sources."indent-string-2.1.0" + sources."hosted-git-info-4.0.2" + sources."https-proxy-agent-5.0.0" + sources."ieee754-1.2.1" + sources."import-jsx-4.0.0" + sources."indent-string-4.0.0" + sources."inflight-1.0.6" sources."inherits-2.0.4" + (sources."ink-3.0.9" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."ink-spinner-4.0.2" sources."is-arrayish-0.2.1" + sources."is-ci-2.0.0" sources."is-core-module-2.5.0" - sources."is-finite-1.1.0" - sources."is-stream-1.1.0" - sources."is-typedarray-1.0.0" - sources."is-utf8-0.2.1" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsonfile-2.4.0" - sources."jsprim-1.4.1" - sources."kew-0.7.0" - sources."klaw-1.3.1" - sources."load-json-file-1.1.0" - (sources."log-symbols-2.2.0" // { + sources."is-fullwidth-code-point-3.0.0" + sources."is-plain-obj-1.1.0" + sources."js-tokens-4.0.0" + sources."jsesc-2.5.2" + sources."json-parse-even-better-errors-2.3.1" + sources."json5-2.2.0" + sources."kind-of-6.0.3" + sources."lines-and-columns-1.1.6" + sources."locate-path-5.0.0" + sources."lodash-4.17.21" + sources."loose-envify-1.4.0" + sources."lru-cache-6.0.0" + sources."make-dir-3.1.0" + sources."map-obj-4.2.1" + (sources."meow-9.0.0" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."supports-color-5.5.0" + sources."type-fest-0.18.1" ]; }) - sources."log-update-1.0.2" - sources."loud-rejection-1.6.0" - sources."map-obj-1.0.1" - sources."meow-3.7.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" - sources."mimic-fn-1.2.0" + sources."mimic-fn-2.1.0" + sources."min-indent-1.0.1" + sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.5" - sources."mkpath-1.0.0" - sources."ms-2.0.0" - sources."node-phantom-simple-2.2.4" - sources."normalize-package-data-2.5.0" - sources."oauth-sign-0.9.0" - sources."object-assign-4.1.1" - sources."onetime-1.1.0" - (sources."ora-1.4.0" // { + sources."minimist-options-4.1.0" + sources."mkdirp-classic-0.5.3" + sources."ms-2.1.2" + sources."node-fetch-2.6.1" + sources."node-releases-1.1.73" + (sources."normalize-package-data-3.0.2" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."cli-cursor-2.1.0" - sources."onetime-2.0.1" - sources."restore-cursor-2.0.0" - sources."supports-color-5.5.0" + sources."semver-7.3.5" ]; }) - sources."os-tmpdir-1.0.2" - sources."parse-json-2.2.0" - sources."path-exists-2.1.0" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."onetime-5.1.2" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."parse-json-5.2.0" + sources."patch-console-1.0.0" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" - sources."path-type-1.1.0" sources."pend-1.2.0" - sources."performance-now-2.1.0" - sources."phantomjs-prebuilt-2.1.16" - sources."pify-2.3.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."process-nextick-args-2.0.1" - sources."progress-1.1.8" - sources."promise-phantom-3.1.6" - sources."psl-1.8.0" - sources."punycode-2.1.1" - sources."qs-6.5.2" - sources."read-pkg-1.1.0" - sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.7" - sources."redent-1.0.0" - sources."repeating-2.0.1" - sources."request-2.88.2" - sources."request-progress-2.0.1" + sources."pkg-dir-4.2.0" + sources."progress-2.0.3" + sources."prop-types-15.7.2" + sources."proxy-from-env-1.1.0" + sources."pump-3.0.0" + sources."puppeteer-9.1.1" + sources."quick-lru-4.0.1" + sources."react-16.14.0" + sources."react-devtools-core-4.14.0" + sources."react-is-16.13.1" + sources."react-reconciler-0.24.0" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."hosted-git-info-2.8.9" + sources."normalize-package-data-2.5.0" + sources."semver-5.7.1" + sources."type-fest-0.6.0" + ]; + }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) + sources."readable-stream-3.6.0" + sources."redent-3.0.0" sources."resolve-1.20.0" - sources."restore-cursor-1.0.1" + sources."resolve-from-3.0.0" + sources."restore-cursor-3.1.0" + sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."semver-5.7.1" + sources."scheduler-0.18.0" + sources."semver-6.3.0" + sources."shell-quote-1.7.2" sources."signal-exit-3.0.3" + (sources."slice-ansi-3.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) + sources."source-map-0.5.7" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.9" - sources."sshpk-1.16.1" - sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - sources."strip-bom-2.0.0" - sources."strip-indent-1.0.1" - sources."supports-color-2.0.0" - sources."throttleit-1.0.0" - sources."tmp-0.0.31" - sources."tough-cookie-2.5.0" - sources."trim-newlines-1.0.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."typedarray-0.0.6" - sources."uri-js-4.4.1" + (sources."stack-utils-2.0.3" // { + dependencies = [ + sources."escape-string-regexp-2.0.0" + ]; + }) + sources."string-width-4.2.2" + (sources."string_decoder-1.3.0" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) + sources."strip-ansi-6.0.0" + sources."strip-indent-3.0.0" + sources."supports-color-5.5.0" + sources."tar-fs-2.1.1" + sources."tar-stream-2.2.0" + sources."through-2.3.8" + sources."to-fast-properties-2.0.0" + sources."trim-newlines-3.0.1" + sources."type-fest-0.12.0" + sources."unbzip2-stream-1.4.3" sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" - sources."verror-1.10.0" - sources."which-1.3.1" + sources."widest-line-3.1.0" + (sources."wrap-ansi-6.2.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) + sources."wrappy-1.0.2" + sources."ws-7.5.3" + sources."yallist-4.0.0" + sources."yargs-parser-20.2.9" sources."yauzl-2.10.0" - sources."zen-observable-0.5.2" + sources."yoga-layout-prebuilt-1.10.0" + sources."zen-observable-0.8.15" ]; buildInputs = globalBuildInputs; meta = { - description = "Test your download speed using fast.com"; + description = "Test your download and upload speed using fast.com"; homepage = "https://github.com/sindresorhus/fast-cli#readme"; license = "MIT"; }; @@ -83390,7 +83297,7 @@ in sources."google-auth-library-7.3.0" ]; }) - sources."@grpc/grpc-js-1.3.5" + sources."@grpc/grpc-js-1.3.6" sources."@grpc/proto-loader-0.6.4" sources."@jsdevtools/ono-7.1.3" (sources."@npmcli/move-file-1.1.2" // { @@ -85473,7 +85380,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.780" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -85884,7 +85791,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" - sources."strtok3-6.2.0" + sources."strtok3-6.2.2" sources."style-to-object-0.3.0" sources."supports-color-5.5.0" sources."term-size-2.2.1" @@ -87215,7 +87122,7 @@ in sources."path-root-0.1.1" sources."path-root-regex-0.1.2" sources."picomatch-2.3.0" - sources."rechoir-0.7.0" + sources."rechoir-0.7.1" sources."resolve-1.20.0" sources."resolve-dir-1.0.1" sources."to-regex-range-5.0.1" @@ -89387,9 +89294,9 @@ in dependencies = [ sources."@iarna/toml-2.2.5" sources."@msgpack/msgpack-2.7.0" - sources."@ot-builder/bin-composite-types-1.0.11" - sources."@ot-builder/bin-util-1.0.11" - (sources."@ot-builder/cli-help-shower-1.0.11" // { + sources."@ot-builder/bin-composite-types-1.1.0" + sources."@ot-builder/bin-util-1.1.0" + (sources."@ot-builder/cli-help-shower-1.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -89399,37 +89306,37 @@ in sources."supports-color-7.2.0" ]; }) - sources."@ot-builder/cli-proc-1.0.11" - sources."@ot-builder/cli-shared-1.0.11" - sources."@ot-builder/common-impl-1.0.11" - sources."@ot-builder/errors-1.0.11" - sources."@ot-builder/io-bin-cff-1.0.11" - sources."@ot-builder/io-bin-encoding-1.0.11" - sources."@ot-builder/io-bin-ext-private-1.0.11" - sources."@ot-builder/io-bin-font-1.0.11" - sources."@ot-builder/io-bin-glyph-store-1.0.11" - sources."@ot-builder/io-bin-layout-1.0.11" - sources."@ot-builder/io-bin-metadata-1.0.11" - sources."@ot-builder/io-bin-metric-1.0.11" - sources."@ot-builder/io-bin-name-1.0.11" - sources."@ot-builder/io-bin-sfnt-1.0.11" - sources."@ot-builder/io-bin-ttf-1.0.11" - sources."@ot-builder/ot-1.0.11" - sources."@ot-builder/ot-encoding-1.0.11" - sources."@ot-builder/ot-ext-private-1.0.11" - sources."@ot-builder/ot-glyphs-1.0.11" - sources."@ot-builder/ot-layout-1.0.11" - sources."@ot-builder/ot-metadata-1.0.11" - sources."@ot-builder/ot-name-1.0.11" - sources."@ot-builder/ot-sfnt-1.0.11" - sources."@ot-builder/ot-standard-glyph-namer-1.0.11" - sources."@ot-builder/prelude-1.0.11" - sources."@ot-builder/primitive-1.0.11" - sources."@ot-builder/rectify-1.0.11" - sources."@ot-builder/stat-glyphs-1.0.11" - sources."@ot-builder/trace-1.0.11" - sources."@ot-builder/var-store-1.0.11" - sources."@ot-builder/variance-1.0.11" + sources."@ot-builder/cli-proc-1.1.0" + sources."@ot-builder/cli-shared-1.1.0" + sources."@ot-builder/common-impl-1.1.0" + sources."@ot-builder/errors-1.1.0" + sources."@ot-builder/io-bin-cff-1.1.0" + sources."@ot-builder/io-bin-encoding-1.1.0" + sources."@ot-builder/io-bin-ext-private-1.1.0" + sources."@ot-builder/io-bin-font-1.1.0" + sources."@ot-builder/io-bin-glyph-store-1.1.0" + sources."@ot-builder/io-bin-layout-1.1.0" + sources."@ot-builder/io-bin-metadata-1.1.0" + sources."@ot-builder/io-bin-metric-1.1.0" + sources."@ot-builder/io-bin-name-1.1.0" + sources."@ot-builder/io-bin-sfnt-1.1.0" + sources."@ot-builder/io-bin-ttf-1.1.0" + sources."@ot-builder/ot-1.1.0" + sources."@ot-builder/ot-encoding-1.1.0" + sources."@ot-builder/ot-ext-private-1.1.0" + sources."@ot-builder/ot-glyphs-1.1.0" + sources."@ot-builder/ot-layout-1.1.0" + sources."@ot-builder/ot-metadata-1.1.0" + sources."@ot-builder/ot-name-1.1.0" + sources."@ot-builder/ot-sfnt-1.1.0" + sources."@ot-builder/ot-standard-glyph-namer-1.1.0" + sources."@ot-builder/prelude-1.1.0" + sources."@ot-builder/primitive-1.1.0" + sources."@ot-builder/rectify-1.1.0" + sources."@ot-builder/stat-glyphs-1.1.0" + sources."@ot-builder/trace-1.1.0" + sources."@ot-builder/var-store-1.1.0" + sources."@ot-builder/variance-1.1.0" sources."@unicode/unicode-13.0.0-1.1.0" sources."aglfn-1.0.2" sources."amdefine-1.0.1" @@ -89511,8 +89418,8 @@ in sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.8.3" - sources."ot-builder-1.0.11" - sources."otb-ttc-bundle-1.0.11" + sources."ot-builder-1.1.0" + sources."otb-ttc-bundle-1.1.0" sources."passerror-1.1.1" sources."patel-0.34.0" sources."path-is-absolute-1.0.1" @@ -89786,7 +89693,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.948.0" // { + (sources."aws-sdk-2.949.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -90272,9 +90179,7 @@ in sources."seventh-0.7.40" (sources."sharp-0.26.3" // { dependencies = [ - sources."color-3.2.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" + sources."color-3.2.1" sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" sources."simple-get-4.0.0" @@ -94921,7 +94826,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.780" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -96827,10 +96732,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "4.4.2"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.4.2.tgz"; - sha512 = "VR0FrWp5wRUxTSTq/RDv6Lybhi/KL8UCf1pQN6xyUDBamysfPneunOB/TNa29cazM+AXslVYxe8VnDJxMjBaiA=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.4.4.tgz"; + sha512 = "vDyRF0MxUCccnk/nttQtWSE+KrcHgqjT0s/SyK7Hw06dAKg9X5kDyvDXjHQl2Dmc8Nc68050xc9ql36xUid2dQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -97016,7 +96921,7 @@ in ]; }) sources."@netlify/open-api-2.5.0" - (sources."@netlify/plugin-edge-handlers-1.11.21" // { + (sources."@netlify/plugin-edge-handlers-1.11.22" // { dependencies = [ sources."@types/node-14.17.5" ]; @@ -97211,8 +97116,8 @@ in sources."@types/semver-7.3.7" sources."@types/yargs-13.0.12" sources."@types/yargs-parser-20.2.1" - sources."@typescript-eslint/types-4.28.3" - (sources."@typescript-eslint/typescript-estree-4.28.3" // { + sources."@typescript-eslint/types-4.28.4" + (sources."@typescript-eslint/typescript-estree-4.28.4" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" @@ -97229,7 +97134,7 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@typescript-eslint/visitor-keys-4.28.3" + sources."@typescript-eslint/visitor-keys-4.28.4" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" sources."acorn-8.4.1" @@ -97628,7 +97533,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.780" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -99326,20 +99231,20 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.3.5"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.3.5.tgz"; - sha512 = "P/EmWwzuY/0mQFlrklSUrVANdv9xQsbrpKrpfA8tuhhxu1OEiSgzYdo87Zj13Hi38K4f1rNPQj4rw2vEBcYS/g=="; + url = "https://registry.npmjs.org/node-red/-/node-red-2.0.1.tgz"; + sha512 = "r+wpPLWySuj/toc1mMkR8++mpFoTm9RZwsqe6guFc/IwEpQdDpmYkT11OGmTqjUqr8WdteOP+MNvdgNgtTzyxQ=="; }; dependencies = [ sources."@babel/runtime-7.14.6" - sources."@node-red/editor-api-1.3.5" - sources."@node-red/editor-client-1.3.5" - (sources."@node-red/nodes-1.3.5" // { + sources."@mapbox/node-pre-gyp-1.0.5" + sources."@node-red/editor-api-2.0.1" + sources."@node-red/editor-client-2.0.1" + (sources."@node-red/nodes-2.0.1" // { dependencies = [ - sources."cookie-0.4.1" sources."http-errors-1.7.3" - sources."iconv-lite-0.6.2" + sources."iconv-lite-0.6.3" sources."inherits-2.0.4" sources."media-typer-1.1.0" (sources."raw-body-2.4.1" // { @@ -99349,18 +99254,28 @@ in }) ]; }) - sources."@node-red/registry-1.3.5" - sources."@node-red/runtime-1.3.5" - sources."@node-red/util-1.3.5" + sources."@node-red/registry-2.0.1" + sources."@node-red/runtime-2.0.1" + sources."@node-red/util-2.0.1" + sources."@sindresorhus/is-4.0.1" + sources."@szmarczak/http-timer-4.0.6" + sources."@types/cacheable-request-6.0.2" + sources."@types/http-cache-semantics-4.0.1" + sources."@types/keyv-3.1.2" + sources."@types/node-16.3.3" + sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" + sources."acorn-8.4.1" + sources."acorn-walk-8.1.1" (sources."agent-base-6.0.2" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" ]; }) - sources."ajv-6.12.6" + sources."ajv-8.6.0" + sources."ansi-colors-4.1.1" sources."ansi-regex-2.1.1" sources."append-field-1.0.0" sources."aproba-1.2.0" @@ -99374,14 +99289,9 @@ in }) sources."argparse-1.0.10" sources."array-flatten-1.1.1" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" sources."async-0.1.22" - sources."async-limiter-1.0.1" sources."async-mutex-0.3.1" sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" sources."axios-0.21.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -99390,21 +99300,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."bcrypt-3.0.6" // { - dependencies = [ - sources."chownr-1.1.4" - sources."fs-minipass-1.2.7" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" - sources."nan-2.13.2" - sources."node-pre-gyp-0.12.0" - sources."nopt-4.0.3" - sources."semver-5.7.1" - sources."tar-4.4.13" - sources."yallist-3.1.1" - ]; - }) - sources."bcrypt-pbkdf-1.0.2" + sources."bcrypt-5.0.1" sources."bcryptjs-2.4.3" (sources."bl-4.1.0" // { dependencies = [ @@ -99420,12 +99316,14 @@ in sources."buffer-from-1.1.1" sources."busboy-0.2.14" sources."bytes-3.1.0" - sources."callback-stream-1.1.0" - sources."caseless-0.12.0" - sources."cheerio-0.22.0" + sources."cacheable-lookup-5.0.4" + sources."cacheable-request-7.0.2" + sources."cheerio-1.0.0-rc.10" + sources."cheerio-select-1.5.0" sources."chownr-2.0.0" sources."cli-table-0.3.6" sources."clone-2.1.2" + sources."clone-response-1.0.2" sources."code-point-at-1.1.0" sources."colors-1.0.3" sources."combined-stream-1.0.8" @@ -99446,17 +99344,25 @@ in ]; }) sources."content-type-1.0.4" - sources."cookie-0.4.0" - sources."cookie-parser-1.4.5" + sources."cookie-0.4.1" + (sources."cookie-parser-1.4.5" // { + dependencies = [ + sources."cookie-0.4.0" + ]; + }) sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" sources."cors-2.8.5" - sources."cron-1.7.2" - sources."css-select-1.2.0" - sources."css-what-2.1.3" - sources."dashdash-1.14.1" + sources."cronosjs-1.7.1" + sources."css-select-4.1.3" + sources."css-what-5.0.1" sources."debug-2.6.9" - sources."deep-extend-0.6.0" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) + sources."defer-to-connect-2.0.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."denque-1.5.0" @@ -99464,126 +99370,102 @@ in sources."destroy-1.0.4" sources."detect-libc-1.0.3" sources."dicer-0.2.5" - sources."dom-serializer-0.1.1" - sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" - sources."domutils-1.5.1" - (sources."duplexify-3.7.1" // { + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domhandler-4.2.0" + sources."domutils-2.7.0" + (sources."duplexify-4.1.1" // { dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" + sources."readable-stream-3.6.0" + sources."string_decoder-1.3.0" ]; }) - sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."entities-1.1.2" + sources."enquirer-2.3.6" + sources."entities-2.2.0" sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" (sources."express-4.17.1" // { dependencies = [ + sources."cookie-0.4.0" sources."safe-buffer-5.1.2" ]; }) - (sources."express-session-1.17.1" // { + (sources."express-session-1.17.2" // { dependencies = [ sources."depd-2.0.0" ]; }) - sources."extend-3.0.2" - sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" sources."finalhandler-1.1.2" sources."follow-redirects-1.14.1" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" + sources."form-data-4.0.0" sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."fs-extra-8.1.0" + (sources."fs-extra-10.0.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) sources."fs-minipass-2.1.0" sources."fs.notify-0.0.4" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" - sources."getpass-0.1.7" + sources."get-stream-5.2.0" sources."glob-7.1.7" - sources."glob-parent-3.1.0" - (sources."glob-stream-6.1.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."got-11.8.2" sources."graceful-fs-4.2.6" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" sources."has-unicode-2.0.1" sources."hash-sum-2.0.0" - sources."help-me-1.1.0" - (sources."htmlparser2-3.10.1" // { + (sources."help-me-3.0.0" // { dependencies = [ sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" ]; }) + sources."hpagent-0.1.2" + sources."htmlparser2-6.1.0" + sources."http-cache-semantics-4.1.0" sources."http-errors-1.7.2" - sources."http-signature-1.2.0" + sources."http2-wrapper-1.0.3" (sources."https-proxy-agent-5.0.0" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" ]; }) - sources."i18next-15.1.2" + sources."i18next-20.3.2" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-walk-3.0.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."ini-1.3.8" sources."ipaddr.js-1.9.1" - sources."is-absolute-1.0.0" - sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" - sources."is-glob-3.1.0" - sources."is-negated-glob-1.0.0" - sources."is-relative-1.0.0" - sources."is-typedarray-1.0.0" - sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" - sources."is-windows-1.0.2" sources."isarray-0.0.1" - sources."isstream-0.1.2" - sources."js-yaml-3.14.0" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-without-jsonify-1.0.1" + sources."js-yaml-3.14.1" + sources."json-buffer-3.0.1" + sources."json-schema-traverse-1.0.0" sources."json-stringify-safe-5.0.1" sources."jsonata-1.8.4" - sources."jsonfile-4.0.0" - sources."jsprim-1.4.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) + sources."keyv-4.0.3" sources."leven-2.1.0" - sources."lodash.assignin-4.2.0" - sources."lodash.bind-4.2.1" sources."lodash.clonedeep-4.5.0" - sources."lodash.defaults-4.2.0" - sources."lodash.filter-4.6.0" - sources."lodash.flatten-4.4.0" - sources."lodash.foreach-4.5.0" - sources."lodash.map-4.6.0" - sources."lodash.merge-4.6.2" - sources."lodash.pick-4.4.0" - sources."lodash.reduce-4.6.0" - sources."lodash.reject-4.6.0" - sources."lodash.some-4.6.0" + sources."lowercase-keys-2.0.0" sources."lru-cache-4.1.5" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."media-typer-0.3.0" (sources."memorystore-1.6.6" // { dependencies = [ @@ -99596,6 +99478,7 @@ in sources."mime-2.5.2" sources."mime-db-1.48.0" sources."mime-types-2.1.31" + sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" (sources."minipass-3.1.3" // { @@ -99611,14 +99494,13 @@ in sources."mkdirp-0.5.5" sources."moment-2.29.1" sources."moment-timezone-0.5.33" - (sources."mqtt-4.2.6" // { + (sources."mqtt-4.2.8" // { dependencies = [ sources."concat-stream-2.0.0" sources."debug-4.3.2" sources."ms-2.1.2" sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" - sources."ws-7.5.3" ]; }) (sources."mqtt-packet-6.10.0" // { @@ -99631,99 +99513,60 @@ in sources."multer-1.4.2" sources."mustache-4.2.0" sources."mute-stream-0.0.8" - sources."nan-2.14.0" - (sources."needle-2.8.0" // { - dependencies = [ - sources."debug-3.2.7" - sources."ms-2.1.3" - ]; - }) sources."negotiator-0.6.2" - (sources."node-pre-gyp-0.14.0" // { - dependencies = [ - sources."chownr-1.1.4" - sources."fs-minipass-1.2.7" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" - sources."nopt-4.0.3" - sources."semver-5.7.1" - sources."tar-4.4.13" - sources."yallist-3.1.1" - ]; - }) - (sources."node-red-admin-0.2.7" // { - dependencies = [ - sources."bcrypt-3.0.8" - ]; - }) - sources."node-red-node-rbe-0.5.0" - sources."node-red-node-tail-0.3.1" + sources."node-addon-api-3.2.1" + sources."node-fetch-2.6.1" + sources."node-red-admin-2.2.0" sources."nopt-5.0.0" - sources."npm-bundled-1.1.2" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-packlist-1.4.8" + sources."normalize-url-6.1.0" sources."npmlog-4.1.2" - sources."nth-check-1.0.2" + sources."nth-check-2.0.0" sources."number-is-nan-1.0.1" - sources."oauth-sign-0.9.0" sources."oauth2orize-1.11.0" sources."object-assign-4.1.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - (sources."ordered-read-streams-1.0.1" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" + sources."p-cancelable-2.1.1" + sources."parse5-6.0.1" + sources."parse5-htmlparser2-tree-adapter-6.0.1" sources."parseurl-1.3.3" sources."passport-0.4.1" sources."passport-http-bearer-1.0.1" sources."passport-oauth2-client-password-0.1.2" sources."passport-strategy-1.0.0" - sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."pause-0.0.1" - sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."pseudomap-1.0.2" sources."psl-1.8.0" sources."pump-3.0.0" - (sources."pumpify-1.5.1" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) sources."punycode-2.1.1" sources."qs-6.7.0" + sources."quick-lru-5.1.1" sources."random-bytes-1.0.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" - sources."rc-1.2.8" sources."read-1.0.7" sources."readable-stream-1.1.14" sources."regenerator-runtime-0.13.8" sources."reinterval-1.1.0" - sources."remove-trailing-separator-1.1.0" - (sources."request-2.88.0" // { - dependencies = [ - sources."qs-6.5.2" - ]; - }) + sources."require-from-string-2.0.2" + sources."resolve-alpn-1.1.2" + sources."responselike-2.0.0" sources."retry-0.6.1" - sources."rimraf-2.7.1" - sources."safe-buffer-5.2.0" + sources."rimraf-3.0.2" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-6.3.0" + (sources."semver-7.3.5" // { + dependencies = [ + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" + ]; + }) (sources."send-0.17.1" // { dependencies = [ sources."mime-1.6.0" @@ -99741,58 +99584,36 @@ in ]; }) sources."sprintf-js-1.0.3" - sources."sshpk-1.16.1" sources."statuses-1.5.0" sources."stream-shift-1.0.1" sources."streamsearch-0.1.2" sources."string-width-1.0.2" sources."string_decoder-0.10.31" sources."strip-ansi-3.0.1" - sources."strip-json-comments-2.0.1" - sources."tail-2.2.3" (sources."tar-6.1.0" // { dependencies = [ sources."mkdirp-1.0.4" sources."yallist-4.0.0" ]; }) - (sources."through2-2.0.5" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."through2-filter-3.0.0" - sources."to-absolute-glob-2.0.2" sources."toidentifier-1.0.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-4.0.0" sources."tslib-2.3.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.13.3" + sources."uglify-js-3.13.10" sources."uid-safe-2.1.5" sources."uid2-0.0.3" - sources."unc-path-regex-0.1.2" - sources."unique-stream-2.3.1" sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.4.0" + sources."uuid-8.3.2" sources."vary-1.1.2" - sources."verror-1.10.0" sources."wide-align-1.1.3" sources."wrappy-1.0.2" - sources."ws-6.2.1" + sources."ws-7.5.1" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xtend-4.0.2" @@ -101560,12 +101381,7 @@ in sources."clone-2.1.2" sources."coa-2.0.2" sources."collection-visit-1.0.0" - (sources."color-3.2.0" // { - dependencies = [ - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) + sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.6.0" @@ -101692,7 +101508,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.780" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -103769,10 +103585,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.10.2"; + version = "6.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.10.2.tgz"; - sha512 = "o/CAEMtqjalEJyS9MgID3iZVx46LsqZ8MlwYGmWHNHD7Q0nOqtuYj+BKmgCXRiIWANA/JuC0Y6usNKhU8P3haw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.10.3.tgz"; + sha512 = "GdxerBN3hhe9x9W0mAMmiWoDELy7KekrmHbYdo7WeHC1MthP/gI7MGVYIgcKj9Vy4zWLO9v1hVYOgKUrewkDVg=="; }; buildInputs = globalBuildInputs; meta = { @@ -105069,12 +104885,7 @@ in sources."clone-response-1.0.2" sources."coa-2.0.2" sources."collection-visit-1.0.0" - (sources."color-3.2.0" // { - dependencies = [ - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) + sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.6.0" @@ -105249,7 +105060,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.780" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -106636,7 +106447,7 @@ in sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.3" sources."@redocly/ajv-8.6.2" - (sources."@redocly/openapi-core-1.0.0-beta.53" // { + (sources."@redocly/openapi-core-1.0.0-beta.54" // { dependencies = [ sources."@types/node-14.17.5" ]; @@ -106813,7 +106624,7 @@ in sources."parse-asn1-5.1.6" sources."path-browserify-0.0.1" sources."pbkdf2-3.1.2" - sources."perfect-scrollbar-1.5.1" + sources."perfect-scrollbar-1.5.2" sources."picomatch-2.3.0" sources."polished-4.1.3" sources."postcss-value-parser-4.1.0" @@ -107178,13 +106989,13 @@ in sources."@types/node-fetch-2.5.11" sources."@types/resolve-1.17.1" sources."@types/vscode-1.58.1" - sources."@typescript-eslint/eslint-plugin-4.28.3" - sources."@typescript-eslint/experimental-utils-4.28.3" - sources."@typescript-eslint/parser-4.28.3" - sources."@typescript-eslint/scope-manager-4.28.3" - sources."@typescript-eslint/types-4.28.3" - sources."@typescript-eslint/typescript-estree-4.28.3" - sources."@typescript-eslint/visitor-keys-4.28.3" + sources."@typescript-eslint/eslint-plugin-4.28.4" + sources."@typescript-eslint/experimental-utils-4.28.4" + sources."@typescript-eslint/parser-4.28.4" + sources."@typescript-eslint/scope-manager-4.28.4" + sources."@typescript-eslint/types-4.28.4" + sources."@typescript-eslint/typescript-estree-4.28.4" + sources."@typescript-eslint/visitor-keys-4.28.4" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -107266,7 +107077,7 @@ in sources."entities-2.2.0" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-7.30.0" // { + (sources."eslint-7.31.0" // { dependencies = [ (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -107984,7 +107795,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.948.0" // { + (sources."aws-sdk-2.949.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -108570,7 +108381,7 @@ in sources."strip-dirs-2.1.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.2.0" + sources."strtok3-6.2.2" (sources."superagent-3.8.3" // { dependencies = [ sources."debug-3.2.7" @@ -109339,10 +109150,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.662.0"; + version = "1.664.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.662.0.tgz"; - sha512 = "sVSFIZ5cxhKoe2Gr3KD3LHKuTlCzVgA0KPa/2NhwyHFVQoSmoVirqntUt4V3taiEOFAk+F++cQ9jAcx2Qlc8nA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.664.0.tgz"; + sha512 = "4YPqDdPPZsn3BBN82UiN6+Jy4zdKbBvw4MKClvh2QQgUJy6R9nEm/Q8IbdsM0jOqPByDRWVMwsCPQu3ZpqG3KA=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -109409,7 +109220,7 @@ in sources."tslib-2.3.0" ]; }) - (sources."@snyk/snyk-docker-pull-3.6.2" // { + (sources."@snyk/snyk-docker-pull-3.6.3" // { dependencies = [ sources."rimraf-3.0.2" sources."tmp-0.2.1" @@ -109878,7 +109689,7 @@ in sources."tslib-2.3.0" ]; }) - (sources."snyk-docker-plugin-4.21.3" // { + (sources."snyk-docker-plugin-4.22.1" // { dependencies = [ sources."argparse-2.0.1" sources."js-yaml-4.1.0" @@ -111366,7 +111177,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.948.0" // { + (sources."aws-sdk-2.949.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -112242,7 +112053,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.780" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -115027,7 +114838,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.2.0" + sources."strtok3-6.2.2" sources."supports-color-7.2.0" sources."tar-4.4.13" sources."tlds-1.208.0" @@ -116224,7 +116035,11 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.31.0" - sources."eslint-plugin-vue-7.13.0" + (sources."eslint-plugin-vue-7.14.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -116340,7 +116155,7 @@ in sources."typescript-4.3.5" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" - (sources."vue-eslint-parser-7.8.0" // { + (sources."vue-eslint-parser-7.9.0" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" @@ -116616,7 +116431,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.780" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -116756,13 +116571,13 @@ in sources."read-1.0.7" sources."readable-stream-1.0.34" sources."readdirp-3.5.0" - sources."rechoir-0.7.0" + sources."rechoir-0.7.1" sources."require-directory-2.1.1" sources."resolve-1.20.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."safe-buffer-5.2.1" - sources."schema-utils-3.1.0" + sources."schema-utils-3.1.1" sources."semver-5.7.1" sources."serialize-javascript-5.0.1" sources."shallow-clone-3.0.1" @@ -116833,7 +116648,7 @@ in ]; }) sources."webpack-merge-5.8.0" - sources."webpack-sources-2.3.0" + sources."webpack-sources-2.3.1" sources."which-2.0.2" sources."wide-align-1.1.3" sources."wildcard-2.0.0" @@ -117383,7 +117198,7 @@ in sources."eslint-scope-5.1.1" sources."espree-6.2.1" sources."ms-2.1.2" - (sources."vue-eslint-parser-7.8.0" // { + (sources."vue-eslint-parser-7.9.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -118945,7 +118760,7 @@ in sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.779" + sources."electron-to-chromium-1.3.780" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -118975,7 +118790,7 @@ in sources."punycode-2.1.1" sources."randombytes-2.1.0" sources."safe-buffer-5.2.1" - sources."schema-utils-3.1.0" + sources."schema-utils-3.1.1" sources."serialize-javascript-6.0.0" sources."source-list-map-2.0.1" sources."source-map-0.6.1" @@ -118990,7 +118805,7 @@ in sources."terser-webpack-plugin-5.1.4" sources."uri-js-4.4.1" sources."watchpack-2.2.0" - sources."webpack-sources-2.3.0" + sources."webpack-sources-2.3.1" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -119048,7 +118863,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."pkg-dir-4.2.0" - sources."rechoir-0.7.0" + sources."rechoir-0.7.1" sources."resolve-1.20.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" @@ -119680,7 +119495,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.11.1" sources."fill-range-7.0.1" - sources."glob-parent-6.0.0" + sources."glob-parent-6.0.1" sources."globby-11.0.4" sources."ignore-5.1.8" sources."is-extglob-2.1.1" @@ -119699,7 +119514,7 @@ in sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" - sources."schema-utils-3.1.0" + sources."schema-utils-3.1.1" sources."serialize-javascript-6.0.0" sources."slash-3.0.0" sources."to-regex-range-5.0.1" @@ -119719,10 +119534,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.5.2.tgz"; - sha512 = "czMFGRzxT2IsgZoMkmHwGASBSx/pLGQOZV3oAD/c5qCw4+YVBMYP2/FehaQ/CF3dMKBnIH4jIevK2KT6pdRC2A=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.5.3.tgz"; + sha512 = "Av+6PnflFJueTj19z6Pv/ai9KzOV8r7nClBiQCBbO55eqNL6pNBV47N/KwxDIPx8OeATTFEA/joCohi5AD/8TQ=="; }; dependencies = [ sources."@leichtgewicht/ip-codec-2.0.3" @@ -120027,7 +119842,7 @@ in sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.2.4" // { + (sources."webtorrent-1.2.5" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index c09f1586fd6..dcede9506e3 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -37,9 +37,9 @@ in buildPythonPackage rec { pkg-config ]; checkInputs = [ - numpy ncurses + gdb numpy ncurses ]; - buildInputs = [ glibcLocales gdb ]; + buildInputs = [ glibcLocales ]; LC_ALL = "en_US.UTF-8"; patches = [ diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 890f44b4ad3..68f166b3c7c 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -22,6 +22,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ agate sqlalchemy ]; + # crate is broken in nixpkgs, with SQLAlchemy > 1.3 + # Skip tests for now as they rely on it. + doCheck = false; + checkInputs = [ crate nose geojson ]; checkPhase = '' diff --git a/pkgs/development/python-modules/ansible/base.nix b/pkgs/development/python-modules/ansible/base.nix index 0a5cc01d929..0c88c378516 100644 --- a/pkgs/development/python-modules/ansible/base.nix +++ b/pkgs/development/python-modules/ansible/base.nix @@ -28,11 +28,11 @@ let in buildPythonPackage rec { pname = "ansible-base"; - version = "2.10.11"; + version = "2.10.12"; src = fetchPypi { inherit pname version; - sha256 = "0jr3cxqiami9k07g2kmvfp54iafbcnd1d66l8fdnaqka5bc19wdw"; + sha256 = "sha256-qWVW4tI5+Sg+FWVNQMGqhmgqTntD9Qtf8CK8jkK2mHg="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 4dd606c9adb..8584ba7166a 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -23,17 +23,17 @@ let ansible-collections = callPackage ./collections.nix { - version = "4.1.0"; - sha256 = "0rrivq1g0vizah8zmf012lzig2xxfk5x1371k16s3nn4zfkwqqgm"; + version = "4.2.0"; + sha256 = "1l30j97q24klylchvbskdmp1xllswn9xskjvg4l0ra6pzfgq2zbk"; }; in buildPythonPackage rec { pname = "ansible-core"; - version = "2.11.2"; + version = "2.11.3"; src = fetchPypi { inherit pname version; - sha256 = "1syadgzn5ww5bhq9s2py4h1hkh11h7aac5b37zi8rw2xfvdc7r2s"; + sha256 = "sha256-DO0bT2cZftsntQk0yV1MtkTG1jXXLH+CbEQl3+RTdnQ="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/ansible/legacy.nix b/pkgs/development/python-modules/ansible/legacy.nix index 12eed6bdb29..95b127a0db3 100644 --- a/pkgs/development/python-modules/ansible/legacy.nix +++ b/pkgs/development/python-modules/ansible/legacy.nix @@ -1,5 +1,5 @@ { lib -, fetchFromGitHub +, fetchPypi , buildPythonPackage , pycrypto , paramiko @@ -18,13 +18,11 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.23"; + version = "2.9.24"; - src = fetchFromGitHub { - owner = "ansible"; - repo = "ansible"; - rev = "v${version}"; - sha256 = "0mikykpzyqpmaiczz53f71mcyc4qvahi9ckn7wgfx7sw7s2z3skk"; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-DC9Tt75z3cNCPZZY/NGQeYl9Wx/FM8StVQ21ixea64o="; }; prePatch = '' diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index cebe542de26..49acee691cf 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -5,24 +5,45 @@ , zope_interface , transaction , zope_testrunner +, python }: buildPythonPackage rec { pname = "BTrees"; version = "4.9.2"; - buildInputs = [ transaction ]; - propagatedBuildInputs = [ persistent zope_interface ]; - checkInputs = [ zope_testrunner ]; - src = fetchPypi { inherit pname version; sha256 = "d33323655924192c4ac998d9ee3002e787915d19c1e17a6baf47c9a63d9556e3"; }; + propagatedBuildInputs = [ + persistent + zope_interface + ]; + + checkInputs = [ + transaction + zope_testrunner + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m zope.testrunner --test-path=src --auto-color --auto-progress + runHook postCheck + ''; + + pythonImportsCheck = [ + "BTrees.OOBTree" + "BTrees.IOBTree" + "BTrees.IIBTree" + "BTrees.IFBTree" + ]; + meta = with lib; { description = "Scalable persistent components"; homepage = "http://packages.python.org/BTrees"; license = licenses.zpl21; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index 07b9652e775..c4a698c5250 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -39,5 +39,11 @@ buildPythonPackage rec { description = "A Python client library for CrateDB"; license = licenses.asl20; maintainers = with maintainers; [ doronbehar ]; + # 2021-07-12 (@layus): Please unbreak when an update fixes compatibility + # with the version of SQLAlchemy in nixpkgs + # And also re-enable tests in pythonPackages.agate-sql. + # The version string below is intentionally split, so nixpkgs-update does + # not change it. That would make this warning pretty useless. + broken = assert version == "0.2"+"6.0"; true; }; } diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 196c7e47b39..ae47989141e 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -6,16 +6,18 @@ , freezegun , pytestCheckHook , ukpostcodeparser +, pillow , validators }: buildPythonPackage rec { - pname = "Faker"; - version = "6.6.3"; + pname = "faker"; + version = "8.8.2"; src = fetchPypi { - inherit pname version; - sha256 = "c2852cadc99a4ebdbf06934e4c15e30f2307d414ead21d15605759602645f152"; + pname = "Faker"; + inherit version; + sha256 = "sha256-IlNMOqbS7584QDojTcm3G1y4ePt2XHKZS+Xce06vCGU="; }; propagatedBuildInputs = [ @@ -25,6 +27,7 @@ buildPythonPackage rec { checkInputs = [ freezegun + pillow pytestCheckHook ukpostcodeparser validators diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index 661b7c71c33..41e9680937d 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -1,4 +1,12 @@ -{ lib, isPy27, isPy38, fetchFromGitHub, buildPythonPackage, pythonOlder, fetchpatch, flake8, importlib-metadata, six }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonAtLeast +, isPy27 +, flake8 +, six +, python +}: buildPythonPackage rec { pname = "flake8-future-import"; @@ -12,16 +20,22 @@ buildPythonPackage rec { sha256 = "00q8n15xdnvqj454arn7xxksyrzh0dw996kjyy7g9rdk0rf8x82z"; }; - propagatedBuildInputs = [ flake8 six ] - ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; + patches = lib.optionals (pythonAtLeast "3.8") [ + ./fix-annotations-version.patch + ] ++ lib.optionals isPy27 [ + # Upstream disables this test case naturally on python 3, but it also fails + # inside NixPkgs for python 2. Since it's going to be deleted, we just skip it + # on py2 as well. + ./skip-test.patch + ]; - # Upstream disables this test case naturally on python 3, but it also fails - # inside NixPkgs for python 2. Since it's going to be deleted, we just skip it - # on py2 as well. - patches = lib.optionals isPy38 [ ./fix-annotations-version.patch ] - ++ lib.optionals isPy27 [ ./skip-test.patch ]; + propagatedBuildInputs = [ flake8 ]; + + checkInputs = [ six ]; + + checkPhase = '' + ${python.interpreter} -m test_flake8_future_import + ''; meta = with lib; { description = "A flake8 extension to check for the imported __future__ modules to make it easier to have a consistent code base"; diff --git a/pkgs/development/python-modules/fontmath/default.nix b/pkgs/development/python-modules/fontmath/default.nix index 7a23abdd037..a6982037c1e 100644 --- a/pkgs/development/python-modules/fontmath/default.nix +++ b/pkgs/development/python-modules/fontmath/default.nix @@ -1,18 +1,21 @@ -{ lib, buildPythonPackage, fetchPypi -, fonttools +{ lib, buildPythonPackage, fetchPypi, isPy27 +, fonttools, setuptools-scm , pytest, pytestrunner }: buildPythonPackage rec { pname = "fontMath"; - version = "0.6.0"; + version = "0.8.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "09xdqdjyjlx5k9ymi36d7hkgvn55zzjzd65l2yqidkfazlmh14ss"; + sha256 = "0m2z2wwbxwljfcrg8hx4xq538adzcjpc352yqbfw0czbgs5ixmrr"; extension = "zip"; }; + nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ fonttools ]; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/google-i18n-address/default.nix b/pkgs/development/python-modules/google-i18n-address/default.nix index 53ce654e41b..e2724ac123c 100644 --- a/pkgs/development/python-modules/google-i18n-address/default.nix +++ b/pkgs/development/python-modules/google-i18n-address/default.nix @@ -1,18 +1,26 @@ -{ buildPythonPackage, fetchPypi, pythonAtLeast, lib, requests, pytestCheckHook, mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, pytestCheckHook +}: buildPythonPackage rec { pname = "google-i18n-address"; - version = "2.4.0"; - disabled = pythonAtLeast "3.9"; + version = "2.5.0"; - src = fetchPypi { - inherit pname version; - sha256 = "8454a58f254a29988b8d1ca9ab663fd28a1f392a3d29b844d8824807db6333d7"; + src = fetchFromGitHub { + owner = "mirumee"; + repo = "google-i18n-address"; + rev = version; + sha256 = "0fn5sph6fq68zrjssgvnnvrkavs8arshjwgxng5dr5fsn6qii3mq"; }; propagatedBuildInputs = [ requests ]; - checkInputs = [ pytestCheckHook mock ]; + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "i18naddress" ]; meta = with lib; { description = "Google's i18n address data packaged for Python"; diff --git a/pkgs/development/python-modules/gprof2dot/default.nix b/pkgs/development/python-modules/gprof2dot/default.nix index 28609919098..3170d199cf5 100644 --- a/pkgs/development/python-modules/gprof2dot/default.nix +++ b/pkgs/development/python-modules/gprof2dot/default.nix @@ -1,12 +1,13 @@ { lib, fetchFromGitHub, buildPythonApplication, python, graphviz }: -buildPythonApplication { - name = "gprof2dot-2019-11-30"; +buildPythonApplication rec { + pname = "gprof2dot"; + version = "2019.11.30"; src = fetchFromGitHub { owner = "jrfonseca"; repo = "gprof2dot"; - rev = "2019.11.30"; + rev = version; sha256 = "1nw4cfwimd0djarw4wc756q095xir78js8flmycg6g7sl3l6p27s"; }; diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix index c2776e20e2b..30947c14303 100644 --- a/pkgs/development/python-modules/graphene/default.nix +++ b/pkgs/development/python-modules/graphene/default.nix @@ -50,7 +50,8 @@ buildPythonPackage rec { pytestFlagsArray = [ "--benchmark-disable" ]; disabledTests = [ - # TypeError: Failed: DID NOT RAISE <class... + # Expects different Exeception classes, but receives none of them + # https://github.com/graphql-python/graphene/issues/1346 "test_unexpected_error" ]; diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 8762d62e59b..4d829f3d647 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -3,6 +3,7 @@ , fetchPypi , six , isPyPy +, python }: @@ -16,11 +17,18 @@ buildPythonPackage rec { sha256 = "c87df8ae3f01ffb4483c796fe1b15232ce2b219f0b18126948616224d3f658ee"; }; - propagatedBuildInputs = [ six ]; + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover -v greenlet.tests + runHook postCheck + ''; - meta = { - homepage = "https://pypi.python.org/pypi/greenlet"; + meta = with lib; { + homepage = "https://github.com/python-greenlet/greenlet"; description = "Module for lightweight in-process concurrent programming"; - license = lib.licenses.lgpl2; + license = with licenses; [ + psfl # src/greenlet/slp_platformselect.h & files in src/greenlet/platform/ directory + mit + ]; }; } diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 40bfe4d3e88..756d3e4ddcc 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , isPy27 , mock , pyparsing @@ -24,6 +25,14 @@ buildPythonPackage rec { sha256 = "sha256-e0Mq9AVJEWQ9GEtYFXk2fMIs7GtAUsyJN6XheqAnD3I="; }; + patches = [ + # fix test_inject_space + (fetchpatch { + url = "https://github.com/httplib2/httplib2/commit/08d6993b69256fbc6c0b1c615c24910803c4d610.patch"; + sha256 = "0kbd1skn58m20kfkh4qzd66g9bvj31xlkbhsg435dkk4qz6l3yn3"; + }) + ]; + postPatch = '' sed -i "/--cov/d" setup.cfg ''; diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index 8146f8b183e..3134d956af7 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -6,15 +6,14 @@ , isPy27 , colorama , pytestCheckHook -, pythonAtLeast }: buildPythonPackage rec { pname = "loguru"; version = "0.5.3"; - # python3.9 compatibility should be in the next release after 0.5.3 - disabled = isPy27 || pythonAtLeast "3.9"; + disabled = isPy27; + src = fetchPypi { inherit pname version; sha256 = "b28e72ac7a98be3d28ad28570299a393dfcd32e5e3f6a353dec94675767b6319"; @@ -26,6 +25,11 @@ buildPythonPackage rec { url = "https://github.com/Delgan/loguru/commit/31cf758ee9d22dbfa125f38153782fe20ac9dce5.patch"; sha256 = "1lzbs8akg1s7s6xjl3samf4c4bpssqvwg5fn3mwlm4ysr7jd5y67"; }) + # fix tests with Python 3.9 + (fetchpatch { + url = "https://github.com/Delgan/loguru/commit/19f518c5f1f355703ffc4ee62f0e1e397605863e.patch"; + sha256 = "0yn6smik58wdffr4svqsy2n212fwdlcfcwpgqhl9hq2zlivmsdc6"; + }) ]; checkInputs = [ pytestCheckHook colorama ]; diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index d48359af0fc..12845da7e37 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -6,12 +6,13 @@ }: buildPythonPackage rec { - pname = "MarkupSafe"; + pname = "markupsafe"; version = "2.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; + pname = "MarkupSafe"; + inherit version; sha256 = "02k2ynmqvvd0z0gakkf8s4idyb606r7zgga41jrkhqmigy06fk2r"; }; @@ -19,11 +20,12 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ "markupsafe" ]; + meta = with lib; { description = "Implements a XML/HTML/XHTML Markup safe string"; - homepage = "http://dev.pocoo.org"; + homepage = "https://palletsprojects.com/p/markupsafe/"; license = licenses.bsd3; maintainers = with maintainers; [ domenkozar ]; }; - } diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index e4af2ddadb5..74f7d4003dc 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -14,8 +14,7 @@ buildPythonPackage rec { version = "0.53.1"; pname = "numba"; - # uses f-strings, python 3.9 is not yet supported - disabled = pythonOlder "3.6" || pythonAtLeast "3.9"; + disabled = pythonOlder "3.6" || pythonAtLeast "3.10"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/parameterizedtestcase/default.nix b/pkgs/development/python-modules/parameterizedtestcase/default.nix new file mode 100644 index 00000000000..20e662cd66d --- /dev/null +++ b/pkgs/development/python-modules/parameterizedtestcase/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, isPy27 +}: + +buildPythonPackage rec { + pname = "parameterizedtestcase"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "4ccc1d15d7e7ef153619a6a9cd45b170268cf82c67fdd336794c75139aae127e"; + }; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m parameterizedtestcase.tests + runHook postCheck + ''; + + doCheck = isPy27; + + meta = with lib; { + description = "Parameterized tests for Python's unittest module"; + homepage = "https://github.com/msabramo/python_unittest_parameterized_test_case"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index 2ca29ffd8e3..af728d414c1 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -5,6 +5,7 @@ , pyyaml , matplotlib , h5py +, scipy , spglib , pytestCheckHook }: @@ -18,9 +19,18 @@ buildPythonPackage rec { sha256 = "58485042ab7d88fc8b83744d18b2aefd677adb071c8a717ac3710458192743d7"; }; - propagatedBuildInputs = [ numpy pyyaml matplotlib h5py spglib ]; + propagatedBuildInputs = [ + h5py + matplotlib + numpy + pyyaml + scipy + spglib + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; # prevent pytest from importing local directory preCheck = '' diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 0f747a8d73e..af6c3d80dea 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -1,17 +1,17 @@ { lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k -, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 +, defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 , libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook }@args: import ./generic.nix (rec { pname = "Pillow"; - version = "8.2.0"; + version = "8.3.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1qf3bz1sfz58ff6hclg8phgqyy210x3aqdk5yzjr8m5vsw8ap1x7"; + sha256 = "2cac53839bfc5cece8fdbe7f084d5e3ee61e1303cccc86511d351adcb9e2c792"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix index 64ae9189559..3e33f1a8aa0 100644 --- a/pkgs/development/python-modules/pillow/generic.nix +++ b/pkgs/development/python-modules/pillow/generic.nix @@ -31,7 +31,8 @@ buildPythonPackage rec { "test_custom_metadata" ]; - propagatedBuildInputs = [ olefile ]; + propagatedBuildInputs = [ olefile ] + ++ lib.optionals (lib.versionAtLeast version "8.2.0") [ defusedxml ]; checkInputs = [ pytestCheckHook pyroma numpy ]; diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix new file mode 100644 index 00000000000..a7d13bb32a2 --- /dev/null +++ b/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, mypy +, pytestCheckHook +, python-lsp-server +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pylsp-mypy"; + version = "0.5.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Richardk2n"; + repo = "pylsp-mypy"; + rev = version; + sha256 = "1d119csj1k5m9j0f7wdvpvnd02h548css6ybxqah92nk2v0rjscr"; + }; + + checkInputs = [ pytestCheckHook mock ]; + + propagatedBuildInputs = [ mypy python-lsp-server ]; + + meta = with lib; { + homepage = "https://github.com/Richardk2n/pylsp-mypy"; + description = "Mypy plugin for the Python LSP Server"; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index fd2b9d46185..54a136d5dcd 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -1,26 +1,57 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, scipy , numpy -, pyopengl , pyqt5 -, scipy +, pyopengl +, qt5 +, python +, pytestCheckHook +, freefont_ttf +, makeFontsConf +, fetchpatch }: +let + fontsConf = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; +in buildPythonPackage rec { pname = "pyqtgraph"; - version = "0.12.1"; + version = "0.12.2"; - src = fetchPypi { - inherit pname version; - sha256 = "d2ef3b5289184fb48dfe5f44ccb58d9d64ffb5452fc524a2bd7a640a36b3874d"; + src = fetchFromGitHub { + owner = "pyqtgraph"; + repo = "pyqtgraph"; + rev = "pyqtgraph-${version}"; + sha256 = "093kkxwj75nb508vz7px4x7lxrwpaff10pl15m4h74hjwyvbsg3d"; }; - propagatedBuildInputs = [ numpy pyopengl pyqt5 scipy ]; + # TODO: remove when updating to 0.12.3 + patches = [ + (fetchpatch { + url = "https://github.com/pyqtgraph/pyqtgraph/commit/2de5cd78da92b48e48255be2f41ae332cf8bb675.patch"; + sha256 = "1hy86psqyl6ipvbg23zvackkd6f7ajs6qll0mbs0x2zmrj92hk00"; + }) + ]; + + propagatedBuildInputs = [ + numpy + pyqt5 + scipy + pyopengl + ]; - doCheck = false; # tries to create windows (QApps) on collection, which fails (probably due to no display) + checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "pyqtgraph" ]; + preCheck = '' + export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}" + export QT_QPA_PLATFORM=offscreen + export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks + export FONTCONFIG_FILE=${fontsConf} + ''; meta = with lib; { description = "Scientific Graphics and GUI Library for Python"; diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix index 93cfad78d50..10073176aeb 100644 --- a/pkgs/development/python-modules/pyyaml/default.nix +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -1,18 +1,37 @@ -{ lib, buildPythonPackage, fetchPypi, cython, libyaml, buildPackages }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, libyaml +, isPy27 +, python +}: buildPythonPackage rec { pname = "PyYAML"; - version = "5.4.1"; + version = "5.4.1.1"; - src = fetchPypi { - inherit pname version; - sha256 = "607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"; + src = fetchFromGitHub { + owner = "yaml"; + repo = "pyyaml"; + rev = version; + sha256 = "1v386gzdvsjg0mgix6v03rd0cgs9dl81qvn3m547849jm8r41dx8"; }; - nativeBuildInputs = [ cython buildPackages.stdenv.cc ]; + nativeBuildInputs = [ cython ]; buildInputs = [ libyaml ]; + checkPhase = let + testdir = if isPy27 then "tests/lib" else "tests/lib3"; + in '' + runHook preCheck + PYTHONPATH="${testdir}:$PYTHONPATH" ${python.interpreter} -m test_all + runHook postCheck + ''; + + pythonImportsCheck = [ "yaml" ]; + meta = with lib; { description = "The next generation YAML parser and emitter for Python"; homepage = "https://github.com/yaml/pyyaml"; diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index 051d6c97397..d4ad901fb9b 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -1,39 +1,75 @@ { lib , buildPythonPackage -, fetchPypi , pythonOlder -, boto +, fetchFromGitHub +, azure-common +, azure-core +, azure-storage-blob , boto3 -, bz2file -, mock -, moto +, google-cloud-storage , requests -, responses +, moto +, parameterizedtestcase +, pytestCheckHook }: buildPythonPackage rec { pname = "smart-open"; - version = "4.2.0"; + version = "5.1.0"; + disabled = pythonOlder "3.5"; - src = fetchPypi { - pname = "smart_open"; - inherit version; - sha256 = "d9f5a0f173ccb9bbae528db5a3804f57145815774f77ef755b9b0f3b4b2a9dcb"; + src = fetchFromGitHub { + owner = "RaRe-Technologies"; + repo = "smart_open"; + rev = "v${version}"; + sha256 = "0gv3vxpglnhh6d80wsqigxi7psn6s7ylz20kx5ahblcx5rqyhjmi"; }; - # moto>=1.0.0 is backwards-incompatible and some tests fail with it, - # so disable tests for now - doCheck = false; + propagatedBuildInputs = [ + azure-common + azure-core + azure-storage-blob + boto3 + google-cloud-storage + requests + ]; + + checkInputs = [ + moto + parameterizedtestcase + pytestCheckHook + ]; + + pytestFlagsArray = [ "smart_open" ]; + + disabledTestPaths = [ + "smart_open/tests/test_http.py" + "smart_open/tests/test_s3.py" + "smart_open/tests/test_s3_version.py" + "smart_open/tests/test_sanity.py" + ]; - checkInputs = [ mock moto responses ]; + disabledTests = [ + "test_compression_invalid" + "test_gs_uri_contains_question_mark" + "test_gzip_compress_sanity" + "test_http" + "test_ignore_ext" + "test_initialize_write" + "test_read_explicit" + "test_s3_handles_querystring" + "test_s3_uri_contains_question_mark" + "test_webhdfs" + "test_write" + ]; - # upstream code requires both boto and boto3 - propagatedBuildInputs = [ boto boto3 bz2file requests ]; + pythonImportsCheck = [ "smart_open" ]; - meta = { - license = lib.licenses.mit; + meta = with lib; { description = "Library for efficient streaming of very large file"; - maintainers = with lib.maintainers; [ jyp ]; + homepage = "https://github.com/RaRe-Technologies/smart_open"; + license = licenses.mit; + maintainers = with maintainers; [ jyp ]; }; } diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 605334adf0c..6c576f0b85e 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.18"; + version = "1.4.20"; src = fetchPypi { inherit pname version; - sha256 = "0k3yfarfa0hcc0bza6nccy685gnmq6gikynqayrvddx6y7si0lnj"; + sha256 = "1l5miq1nzvg51yqw3pnaq17dgibhgx2m0il2ha79gwpyd8k3mviq"; }; propagatedBuildInputs = [ @@ -36,8 +36,6 @@ buildPythonPackage rec { sed -e 's:--max-worker-restart=5::g' -i setup.cfg ''; - dontUseSetuptoolsCheck = true; - # disable mem-usage tests on mac, has trouble serializing pickle files disabledTests = lib.optionals stdenv.isDarwin [ "MemUsageWBackendTest" diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 6d73357e3bc..1c25612a16d 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.26.5"; + version = "1.26.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-p6zQl3ElMl9Ra9qXNfpxQrkJqNAeiy5MgQjQmE5uAJg="; + sha256 = "sha256-9XtMFsYvonYLfj2Xw1slVRL7a1miWXMPNroyzp+ONC8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix index a4bbee43d01..8da1cf55b54 100644 --- a/pkgs/development/python-modules/warrant/default.nix +++ b/pkgs/development/python-modules/warrant/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { patches = [ (fetchpatch { name = "fix-pip10-compat.patch"; - url = " https://github.com/capless/warrant/commit/ae17d17d9888b9218a8facf6f6ad0bf4adae9a12.patch"; + url = "https://github.com/capless/warrant/commit/ae17d17d9888b9218a8facf6f6ad0bf4adae9a12.patch"; sha256 = "1lvqi2qfa3kxdz05ab2lc7xnd3piyvvnz9kla2jl4pchi876z17c"; }) ]; diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index e5d742bef28..921ed5af4aa 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "watchdog"; - version = "2.1.2"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AjfbTZAkhZvqJ9DvtZ/nXu8pCDP9mIuOrXqHmwMIwts="; + sha256 = "sha256-5SNqjoYCq220uHNmTC01bDZas8rJb73sSXCtYWQV3UU="; }; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index 59cad86606f..aec8b13a122 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "xdis"; - version = "5.0.9"; + version = "5.0.10"; disabled = isPy27; src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; rev = version; - sha256 = "sha256-joKPTEq0UabXMyld0DHrhC1D/Om2B5st0qa2F9r0muA="; + sha256 = "sha256-/3qyMgliua7W4Va1HdRbHyiR/eBQzHK+GrZVAMvMhLA="; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix index a1e88d8ebfb..43970497bb4 100644 --- a/pkgs/development/tools/analysis/emma/default.nix +++ b/pkgs/development/tools/analysis/emma/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, unzip}: -stdenv.mkDerivation { - name = "emma-2.0.5312"; +stdenv.mkDerivation rec { + pname = "emma"; + version = "2.0.5312"; src = fetchurl { - url = "mirror://sourceforge/emma/emma-2.0.5312.zip"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.zip"; sha256 = "0xxy39s2lvgs56vicjzpcz936l1vjaplliwa0dm7v3iyvw6jn7vj"; }; diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix index 265f6290453..e07d98998ef 100644 --- a/pkgs/development/tools/analysis/findbugs/default.nix +++ b/pkgs/development/tools/analysis/findbugs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "findbugs-3.0.1"; + pname = "findbugs"; + version = "3.0.1"; src = fetchurl { - url = "mirror://sourceforge/findbugs/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "06b46fz4nid7qvm36r66zw01fr87y4jyz21ixw27b8hkqah0s3p8"; }; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 8ac0958ffdd..f602f1b1813 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.155.0"; + version = "0.155.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "sha256-NMqglKpVrGgkxnrxSKKUeQ9RZ3eamlO6CDlaHjwKA3I="; + sha256 = "sha256-tlnABN/mcUsR8tgqgrQT+t6joo6wJMeGKtcbjyiVbbE="; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix index 8984a395818..f7f5e84c012 100644 --- a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix +++ b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix @@ -2,7 +2,8 @@ stdenv.mkDerivation rec { - name = "tracefilegen-2017-05-13"; + pname = "tracefilegen"; + version = "unstable-2017-05-13"; src = fetchFromGitHub { owner = "GarCoSim"; @@ -17,8 +18,8 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm755 TraceFileGen $out/bin/TraceFileGen - mkdir -p $out/share/doc/${name}/ - cp -ar $src/Documentation/html $out/share/doc/${name}/. + mkdir -p $out/share/doc/${pname}-${version}/ + cp -ar $src/Documentation/html $out/share/doc/${pname}-${version}/. ''; meta = with lib; { diff --git a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix index 3f97485cbfa..a76b6b9239e 100644 --- a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix +++ b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "tracefilesim-2015-11-07"; + pname = "tracefilesim"; + version = "unstable-2015-11-07"; - src = fetchgit { - url = "https://github.com/GarCoSim/TraceFileSim.git"; + src = fetchFromGitHub { + owner = "GarCoSim"; + repo = "TraceFileSim"; rev = "368aa6b1d6560e7ecbd16fca47000c8f528f3da2"; sha256 = "156m92k38ap4bzidbr8dzl065rni8lrib71ih88myk9z5y1x5nxm"; }; diff --git a/pkgs/development/tools/analysis/makefile2graph/default.nix b/pkgs/development/tools/analysis/makefile2graph/default.nix index 1f9e2ba3c56..5c286e62954 100644 --- a/pkgs/development/tools/analysis/makefile2graph/default.nix +++ b/pkgs/development/tools/analysis/makefile2graph/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, bash, gnumake }: -stdenv.mkDerivation { - name = "makefile2graph-2018-01-03"; +stdenv.mkDerivation rec { + pname = "makefile2graph"; + version = "unstable-2018-01-03"; src = fetchFromGitHub { owner = "lindenb"; diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index 2780c8552fc..82a32504d73 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -4,12 +4,12 @@ , llvm, libxml2 }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "smatch"; version = "20120924"; src = fetchgit { - url = "git://repo.or.cz/smatch.git"; + url = "git://repo.or.cz/${pname}.git"; rev = "23656e3e578b700cbf96d043f039e6341a3ba5b9"; sha256 = "0r43qi6vryqg450fj73yjwbb7gzcgx64rhrhb3r1m6a252srijiy"; }; diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix index e0d9840472b..66b457f9902 100644 --- a/pkgs/development/tools/analysis/sparse/default.nix +++ b/pkgs/development/tools/analysis/sparse/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, pkg-config, libxml2, llvm }: stdenv.mkDerivation rec { - name = "sparse-0.5.0"; + pname = "sparse"; + version = "0.5.0"; src = fetchurl { - url = "mirror://kernel/software/devel/sparse/dist/${name}.tar.xz"; + url = "mirror://kernel/software/devel/sparse/dist/${pname}-${version}.tar.xz"; sha256 = "1mc86jc5xdrdmv17nqj2cam2yqygnj6ar1iqkwsx2y37ij8wy7wj"; }; diff --git a/pkgs/development/tools/analysis/splint/default.nix b/pkgs/development/tools/analysis/splint/default.nix index 581ff56bb61..954342550ea 100644 --- a/pkgs/development/tools/analysis/splint/default.nix +++ b/pkgs/development/tools/analysis/splint/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, flex }: stdenv.mkDerivation rec { - name = "splint-3.1.2"; + pname = "splint"; + version = "3.1.2"; src = fetchurl { - url = "http://www.splint.org/downloads/${name}.src.tgz"; + url = "https://www.splint.org/downloads/${pname}-${version}.src.tgz"; sha256 = "02pv8kscsrkrzip9r08pfs9xs98q74c52mlxzbii6cv6vx1vd3f7"; }; diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix index e4ebb85f27f..cc67ce8123c 100644 --- a/pkgs/development/tools/analysis/swarm/default.nix +++ b/pkgs/development/tools/analysis/swarm/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation { - name = "swarm-2019-03-11"; +stdenv.mkDerivation rec { + pname = "swarm"; + version = "unstable-2019-03-11"; src = fetchFromGitHub { owner = "nimble-code"; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index d99bbe1cae4..5a787d9c3f8 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perl, gdb, cctools, xnu, bootstrap_cmds }: stdenv.mkDerivation rec { - name = "valgrind-3.16.1"; + pname = "valgrind"; + version = "3.16.1"; src = fetchurl { - url = "https://sourceware.org/pub/valgrind/${name}.tar.bz2"; + url = "https://sourceware.org/pub/${pname}/${pname}-${version}.tar.bz2"; sha256 = "1jik19rcd34ip8a5c9nv5wfj8k8maqb8cyclr4xhznq2gcpkl7y9"; }; diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix index 10b9f7291a2..fd24362bab1 100644 --- a/pkgs/development/tools/analysis/valkyrie/default.nix +++ b/pkgs/development/tools/analysis/valkyrie/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, qt4, qmake4Hook }: stdenv.mkDerivation rec { - name = "valkyrie-2.0.0"; + pname = "valkyrie"; + version = "2.0.0"; src = fetchurl { - url = "http://valgrind.org/downloads/${name}.tar.bz2"; + url = "https://valgrind.org/downloads/${pname}-${version}.tar.bz2"; sha256 = "0hwvsncf62mdkahwj9c8hpmm94c1wr5jn89370k6rj894kxry2x7"; }; diff --git a/pkgs/development/tools/build-managers/gnumake/0001-No-impure-bin-sh.patch b/pkgs/development/tools/build-managers/gnumake/0001-No-impure-bin-sh.patch new file mode 100644 index 00000000000..58ee2d6fe09 --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/0001-No-impure-bin-sh.patch @@ -0,0 +1,35 @@ +From e00a5257a6ca5fedbf68b09eee7df3502971a057 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Sat, 24 Apr 2021 10:11:40 +0200 +Subject: [PATCH 1/2] No impure bin sh + +default_shell is used to populuate default shell used to execute jobs. +Unless SHELL is set to a different value this would be /bin/sh. +Our stdenv provides sh in form of bash anyway. Having this value not +hard-coded has some advantages: + +- It would ensure that on all systems it uses sh from its PATH rather + than /bin/sh, which helps as different systems might have different + shells there (bash vs. dash) +- In the past I had issues with LD_PRELOAD with BEAR, where /bin/sh + used a different glibc than BEAR which came from my development shell. +--- + src/job.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/job.c b/src/job.c +index ae1f18b..6b4ddb3 100644 +--- a/src/job.c ++++ b/src/job.c +@@ -77,7 +77,7 @@ char * vms_strsignal (int status); + + #else + +-const char *default_shell = "/bin/sh"; ++const char *default_shell = "sh"; + int batch_mode_shell = 0; + + #endif +-- +2.31.1 + diff --git a/pkgs/development/tools/build-managers/gnumake/0002-remove-impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/0002-remove-impure-dirs.patch new file mode 100644 index 00000000000..e62aee7d999 --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/0002-remove-impure-dirs.patch @@ -0,0 +1,40 @@ +From 795d63d3c8b5c0dbb7e544954f75507b371b7228 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Sat, 24 Apr 2021 10:20:16 +0200 +Subject: [PATCH 2/2] remove impure dirs + +--- + src/read.c | 3 --- + src/remake.c | 2 -- + 2 files changed, 5 deletions(-) + +diff --git a/src/read.c b/src/read.c +index fa197fb..defacfb 100644 +--- a/src/read.c ++++ b/src/read.c +@@ -109,9 +109,6 @@ static const char *default_include_directories[] = + #endif + INCLUDEDIR, + #ifndef _AMIGA +- "/usr/gnu/include", +- "/usr/local/include", +- "/usr/include", + #endif + 0 + }; +diff --git a/src/remake.c b/src/remake.c +index fb237c5..94bff7d 100644 +--- a/src/remake.c ++++ b/src/remake.c +@@ -1601,8 +1601,6 @@ library_search (const char *lib, FILE_TIMESTAMP *mtime_ptr) + static const char *dirs[] = + { + #ifndef _AMIGA +- "/lib", +- "/usr/lib", + #endif + #if defined(WINDOWS32) && !defined(LIBDIR) + /* +-- +2.31.1 + diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 5d0a9127331..7d56e55ebdb 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { ./pselect.patch # Fix support for glibc 2.27's glob, inspired by http://www.linuxfromscratch.org/lfs/view/8.2/chapter05/make.html ./glibc-2.27-glob.patch + ./glibc-2.33-glob.patch ]; nativeBuildInputs = lib.optionals guileSupport [ pkg-config ]; diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch b/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch new file mode 100644 index 00000000000..d3e424d1c49 --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch @@ -0,0 +1,17 @@ +diff --git glob/glob.c glob/glob.c +index 924f2b3..d4ef0c5 100644 +--- glob/glob.c ++++ glob/glob.c +@@ -212,8 +212,8 @@ my_realloc (p, n) + # define __alloca alloca + + +-#ifndef __GNU_LIBRARY__ + # define __stat stat ++#ifndef __GNU_LIBRARY__ + # ifdef STAT_MACROS_BROKEN + # undef S_ISDIR + # endif +-- +2.31.1 + diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index b6d5d8e1548..3b9f0add879 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -9,11 +9,14 @@ stdenv.mkDerivation rec { sha256 = "06cfqzpqsvdnsxbysl5p2fgdgxgl9y4p7scpnrfa8z2zgkjdspz0"; }; + # to update apply these patches with `git am *.patch` to https://git.savannah.gnu.org/git/make.git patches = [ + # Replaces /bin/sh with sh, see patch file for reasoning + ./0001-No-impure-bin-sh.patch # Purity: don't look for library dependencies (of the form `-lfoo') in /lib # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for # included Makefiles, don't look in /usr/include and friends. - ./impure-dirs.patch + ./0002-remove-impure-dirs.patch ]; nativeBuildInputs = lib.optionals guileSupport [ pkg-config ]; diff --git a/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch deleted file mode 100644 index 6c7d9d2463c..00000000000 --- a/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur a/src/read.c b/src/read.c ---- a/src/read.c -+++ b/src/read.c -@@ -109,9 +109,6 @@ - #endif - INCLUDEDIR, - #ifndef _AMIGA -- "/usr/gnu/include", -- "/usr/local/include", -- "/usr/include", - #endif - 0 - }; -diff -Naur a/src/remake.c b/src/remake.c ---- a/src/remake.c -+++ b/src/remake.c -@@ -1601,8 +1601,6 @@ - static const char *dirs[] = - { - #ifndef _AMIGA -- "/lib", -- "/usr/lib", - #endif - #if defined(WINDOWS32) && !defined(LIBDIR) - /* diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index 859497345ff..8db882711fc 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, bison }: stdenv.mkDerivation rec { - name = "jam-2.6.1"; + pname = "jam"; + version = "2.6.1"; src = fetchurl { - url = "https://swarm.workshop.perforce.com/projects/perforce_software-jam/download/main/${name}.tar"; + url = "https://swarm.workshop.perforce.com/projects/perforce_software-jam/download/main/${pname}-${version}.tar"; sha256 = "19xkvkpycxfsncxvin6yqrql3x3z9ypc1j8kzls5k659q4kv5rmc"; }; diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 4682fab41db..27a21619c1d 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.9.8"; + version = "0.9.9"; src = fetchurl { - url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "sha256-vWCzjit7MPrKqEYgJfQHAkam9J9NgMObOQ/A+OQr24o="; + url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; + sha256 = "sha256-HIT7bxMEz7jpSsYvohN9+zYuyCf/ARE7hd48YMTo9/4="; }; nativeBuildInputs = [ makeWrapper ]; @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { dontConfigure = true; dontBuild = true; + # this is mostly downloading a pre-built artifact + preferLocal = true; + installPhase = '' runHook preInstall install -Dm555 "$src" "$out/bin/.mill-wrapped" @@ -25,6 +28,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; + doInstallCheck = true; + # The default release is a script which will do an impure download + # just ensure that the application can run without network + installCheckPhase = '' + $out/bin/mill --help > /dev/null + ''; + meta = with lib; { homepage = "https://www.lihaoyi.com/mill"; license = licenses.mit; diff --git a/pkgs/development/tools/build-managers/mk/default.nix b/pkgs/development/tools/build-managers/mk/default.nix index 1eaa51a5de0..afc0b6f1ec0 100644 --- a/pkgs/development/tools/build-managers/mk/default.nix +++ b/pkgs/development/tools/build-managers/mk/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "mk-2006-01-31"; +stdenv.mkDerivation rec { + pname = "mk"; + version = "unstable-2006-01-31"; src = fetchurl { - url = "http://tarballs.nixos.org/mk-20060131.tar.gz"; + url = "http://tarballs.nixos.org/${pname}-20060131.tar.gz"; sha256 = "0za8dp1211bdp4584xb59liqpww7w1ql0cmlv34p9y928nibcxsr"; }; builder = ./builder.sh; diff --git a/pkgs/development/tools/build-managers/redo/default.nix b/pkgs/development/tools/build-managers/redo/default.nix index 48fbffc3940..f16e91d3bfb 100644 --- a/pkgs/development/tools/build-managers/redo/default.nix +++ b/pkgs/development/tools/build-managers/redo/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "redo-1.4"; + pname = "redo"; + version = "1.4"; src = fetchurl { - url = "https://jdebp.eu./Repository/freebsd/${name}.tar.gz"; + url = "https://jdebp.eu./Repository/freebsd/${pname}-${version}.tar.gz"; sha256 = "1c8gr5h77v4fw78zkhbm9z9adqs3kd7xvxwnmci2zvlf4bqqk4jv"; }; diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix index bc44741cffe..7eefc4fc92d 100644 --- a/pkgs/development/tools/cdecl/default.nix +++ b/pkgs/development/tools/cdecl/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, bison, flex, readline, ncurses, gnused}: -stdenv.mkDerivation { - name = "cdecl-2.5"; +stdenv.mkDerivation rec { + pname = "cdecl"; + version = "2.5"; src = fetchurl { - url = "https://www.cdecl.org/files/cdecl-blocks-2.5.tar.gz"; + url = "https://www.cdecl.org/files/${pname}-blocks-${version}.tar.gz"; sha256 = "1b7k0ra30hh8mg8fqv0f0yzkaac6lfg6n376drgbpxg4wwml1rly"; }; diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index 6a1470e1074..9e0e40b69f4 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -1,7 +1,8 @@ { lib, bundlerEnv, bundlerUpdateScript, ruby, perl, autoconf }: bundlerEnv { - name = "chef-dk-4.13.3"; + pname = "chef-dk"; + version = "4.13.3"; inherit ruby; gemdir = ./.; diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 12e5c8c14ab..6578bf8bf71 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.6.0"; + version = "0.6.1"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-RW3+NpKZns3Jo1b3GfTymUE74pVoJi9f0zi4j4mUGiY="; + sha256 = "0p5vjpfmy52hbq6mz8svvxrg9757cvgj0cbvaa0340309953ilvj"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index b46a97df20a..e806b502de8 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.5.17"; + version = "0.5.18"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-SuHHeO2KFjB3HbLv1ODBGaXzNaDi/FNPOGg/lX8JLJE="; + sha256 = "sha256-YY4scGRMuvyEpeEgvoJJsTtROl11hMyGr7vYBYvJY/w="; }; - vendorSha256 = "sha256-D62fG+T3G1W7xteSGlTtEkXbQfGAmBTYJeATH2CVtwY="; + vendorSha256 = "sha256-aDkaOycQ/wPybSH5fnJIGtCOh+KV0wEF+qinRQQIdm4="; buildFlagsArray = '' -ldflags= diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index 0b1e8d16b65..c20993fbea9 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.5"; + version = "3.14.6"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Er9V6mSe4Pt/RzFAPa3ci3J7FQh5GLbh9CjYHx/HnYM="; + sha256 = "sha256-MtQz/9+e2l4FQ1E299KtRzFpX67FynHdsvcMA4CqKUo="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-9M6SSxMQ8JMJ7ZNl8cjQuid/B0xc28/BuPozxftthe0="; + vendorSha256 = "sha256-Y7lh+U4FKiht2PgACWSXwGTx+y8aJi22KEhqxHPooCw="; meta = with lib; { description = "Thrift improved"; diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/development/tools/ko/default.nix new file mode 100644 index 00000000000..4754a32db82 --- /dev/null +++ b/pkgs/development/tools/ko/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, git +}: + +buildGoModule rec { + pname = "ko"; + version = "0.8.3"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-LoOXZY4uF7GSS3Dh/ozCsLJTxgmPmZZuEisJ4ShjCBc="; + }; + + vendorSha256 = null; + excludedPackages = "test"; + checkInputs = [ git ]; + preCheck = '' + git init + ''; + + meta = with lib; { + description = "A simple, fast container image builder for Go applications."; + homepage = "https://github.com/google/ko"; + license = licenses.asl20; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/development/tools/lattice-diamond/default.nix b/pkgs/development/tools/lattice-diamond/default.nix index 4c94ff1e6e2..ce352542061 100644 --- a/pkgs/development/tools/lattice-diamond/default.nix +++ b/pkgs/development/tools/lattice-diamond/default.nix @@ -1,8 +1,9 @@ -{ lib, stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, +{ lib, stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, freetype, fontconfig, xorg, libusb-compat-0_1 }: stdenv.mkDerivation { - name = "diamond-3.10"; + pname = "diamond"; + version = "3.10"; nativeBuildInputs = [ rpmextract patchelf makeWrapper file ]; @@ -15,17 +16,17 @@ stdenv.mkDerivation { buildCommand = '' origprefix=usr/local/diamond/3.10_x64 prefix=diamond - + echo "Unpacking $src..." rpmextract $src - + # Move $pwd/usr/local/diamond/VERS to $out/diamond, cd. mkdir -p $out/$prefix rmdir $out/$prefix mv $origprefix $out/$prefix - + cd $out - + # Extract all tarballs. for tb in \ cae_library/cae_library.tar.gz \ @@ -36,13 +37,13 @@ stdenv.mkDerivation { bin/bin.tar.gz \ examples/examples.tar.gz \ data/data.tar.gz ; do - + echo "Extracting tarball $prefix/$tb" cd $out/$prefix/$(dirname $tb) tar xf $(basename $tb) rm $(basename $tb) done - + # Patch shebangs in start scripts . cd $out/$prefix/bin/lin64 for tool in \ @@ -60,11 +61,11 @@ stdenv.mkDerivation { ipexpress \ fileutility \ diamond ; do - + echo "Patching script $prefix/bin/lin64/$tool..." patchShebangs $tool done - + # Patch executable ELFs. for path in bin/lin64 ispfpga/bin/lin64; do cd $out/$prefix/$path @@ -82,10 +83,10 @@ stdenv.mkDerivation { $f done done - + # Remove 32-bit libz. rm $out/$prefix/bin/lin64/libz.{so,so.1} - + # Make wrappers (should these target more than the 'diamond' tool?). # The purpose of these is just to call the target program using its # absolute path - otherwise, it will crash. diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index cb3b3040596..7c8ad17c5a0 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib, python3, libsigrok, check }: stdenv.mkDerivation rec { - name = "libsigrokdecode-0.5.3"; + pname = "libsigrokdecode"; + version = "0.5.3"; src = fetchurl { - url = "https://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz"; + url = "https://sigrok.org/download/source/${pname}/${pname}-${version}.tar.gz"; sha256 = "1h1zi1kpsgf6j2z8j8hjpv1q7n49i3fhqjn8i178rka3cym18265"; }; diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix index 6db4395a14f..df55c44f564 100644 --- a/pkgs/development/tools/mdk/default.nix +++ b/pkgs/development/tools/mdk/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, intltool, pkg-config, glib }: -stdenv.mkDerivation { - name = "gnu-mdk-1.3.0"; +stdenv.mkDerivation rec { + pname = "gnu-mdk"; + version = "1.3.0"; src = fetchurl { - url = "https://ftp.gnu.org/gnu/mdk/v1.3.0/mdk-1.3.0.tar.gz"; + url = "mirror://ftp.gnu.org/gnu/mdk/v${version}/mdk-${version}.tar.gz"; sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix index 186608cde3f..b6970beb873 100644 --- a/pkgs/development/tools/misc/autobuild/default.nix +++ b/pkgs/development/tools/misc/autobuild/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, makeWrapper, perl, openssh, rsync }: stdenv.mkDerivation rec { - name = "autobuild-5.3"; + pname = "autobuild"; + version = "5.3"; src = fetchurl { - url = "http://savannah.spinellicreations.com/autobuild/${name}.tar.gz"; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; sha256 = "0gv7g61ja9q9zg1m30k4snqwwy1kq7b4df6sb7d2qra7kbdq8af1"; }; diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index 9cfd9380010..db2ffce50ce 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -6,10 +6,11 @@ assert docSupport -> texLive != null && texinfo != null && texi2html != null; stdenv.mkDerivation rec { - name = "avrdude-6.3"; + pname = "avrdude"; + version = "6.3"; src = fetchurl { - url = "mirror://savannah/avrdude/${name}.tar.gz"; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; sha256 = "15m1w1qad3dj7r8n5ng1qqcaiyx1gyd6hnc3p2apgjllccdp77qg"; }; diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index 26c484017d2..3dc424f106b 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib, libuuid, popt, elfutils }: stdenv.mkDerivation rec { - name = "babeltrace-1.5.8"; + pname = "babeltrace"; + version = "1.5.8"; src = fetchurl { - url = "https://www.efficios.com/files/babeltrace/${name}.tar.bz2"; + url = "https://www.efficios.com/files/babeltrace/${pname}-${version}.tar.bz2"; sha256 = "1hkg3phnamxfrhwzmiiirbhdgckzfkqwhajl0lmr1wfps7j47wcz"; }; diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix index 74073722857..4e35ff35f66 100644 --- a/pkgs/development/tools/misc/bossa/default.nix +++ b/pkgs/development/tools/misc/bossa/default.nix @@ -14,7 +14,8 @@ let in stdenv.mkDerivation { - name = "bossa-1.8"; + pname = "bossa"; + version = "1.8"; src = fetchgit { url = "https://github.com/shumatech/BOSSA"; diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix index 62aa0ab5dec..a8f6e32f1e0 100644 --- a/pkgs/development/tools/misc/cbrowser/default.nix +++ b/pkgs/development/tools/misc/cbrowser/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, tk, makeWrapper }: stdenv.mkDerivation rec { - name = "cbrowser-0.8"; + pname = "cbrowser"; + version = "0.8"; src = fetchurl { - url = "mirror://sourceforge/cbrowser/cbrowser-0.8.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "1050mirjab23qsnq3lp3a9vwcbavmh9kznzjm7dr5vkx8b7ffcji"; }; @@ -14,10 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [ tk ]; installPhase = '' - mkdir -p $out/bin $out/share/${name} - cp -R * $out/share/${name}/ + mkdir -p $out/bin $out/share/${pname}-${version} + cp -R * $out/share/${pname}-${version}/ - makeWrapper $out/share/${name}/cbrowser $out/bin/cbrowser \ + makeWrapper $out/share/${pname}-${version}/cbrowser $out/bin/cbrowser \ --prefix PATH : ${tk}/bin ''; diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index b9e75d7cb2a..92a812d5a21 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gettext, emacs }: stdenv.mkDerivation rec { - name = "cflow-1.6"; + pname = "cflow"; + version = "1.6"; src = fetchurl { - url = "mirror://gnu/cflow/${name}.tar.bz2"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.bz2"; sha256 = "1mzd3yf0dfv8h2av5vsxxlhpk21nw064h91b2kgfrdz92r0pnj1l"; }; diff --git a/pkgs/development/tools/misc/chrpath/default.nix b/pkgs/development/tools/misc/chrpath/default.nix index ff804f897d1..97da80cc733 100644 --- a/pkgs/development/tools/misc/chrpath/default.nix +++ b/pkgs/development/tools/misc/chrpath/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "chrpath-0.16"; +stdenv.mkDerivation rec { + pname = "chrpath"; + version = "0.16"; src = fetchurl { - url = "https://alioth-archive.debian.org/releases/chrpath/chrpath/0.16/chrpath-0.16.tar.gz"; + url = "https://alioth-archive.debian.org/releases/${pname}/${pname}/${version}/${pname}-${version}.tar.gz"; sha256 = "0yvfq891mcdkf8g18gjjkn2m5rvs8z4z4cl1vwdhx6f2p9a4q3dv"; }; diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix index 9fe5ed96672..b0dcfc6aa5c 100644 --- a/pkgs/development/tools/misc/cppi/default.nix +++ b/pkgs/development/tools/misc/cppi/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "cppi-1.18"; + pname = "cppi"; + version = "1.18"; src = fetchurl { - url = "mirror://gnu/cppi/${name}.tar.xz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; sha256 = "1jk42cjaggk71rimjnx3qpmb6hivps0917vl3z7wbxk3i2whb98j"; }; diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index 7eb38e385e8..c79a2d25201 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -3,10 +3,11 @@ }: stdenv.mkDerivation rec { - name = "cscope-15.9"; + pname = "cscope"; + version = "15.9"; src = fetchurl { - url = "mirror://sourceforge/cscope/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "0ngiv4aj3rr35k3q3wjx0y19gh7i1ydqa0cqip6sjwd8fph5ll65"; }; diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/development/tools/misc/dbench/default.nix index 9565eaa3626..78b743ef9f1 100644 --- a/pkgs/development/tools/misc/dbench/default.nix +++ b/pkgs/development/tools/misc/dbench/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchgit, autoconf, popt, zlib, rpcsvc-proto, libtirpc }: -stdenv.mkDerivation { - name = "dbench-2013-01-01"; +stdenv.mkDerivation rec { + pname = "dbench"; + version = "2013-01-01"; src = fetchgit { - url = "git://git.samba.org/sahlberg/dbench.git"; + url = "git://git.samba.org/sahlberg/${pname}.git"; rev = "65b19870ed8d25bff14cafa1c30beb33f1fb6597"; sha256 = "16lcbwmmx8z5i73k3dnf54yffrpx7ql3y9k3cpkss9dcyxb1p83i"; }; diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index 74eb9fcb293..ca50deb504d 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, motif, ncurses, libX11, libXt}: stdenv.mkDerivation rec { - name = "ddd-3.3.12"; + pname = "ddd"; + version = "3.3.12"; src = fetchurl { - url = "mirror://gnu/ddd/${name}.tar.gz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; sha256 = "0p5nx387857w3v2jbgvps2p6mlm0chajcdw5sfrddcglsxkwvmis"; }; buildInputs = [motif ncurses libX11 libXt]; diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 61251434578..d335916bfe6 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, expect, makeWrapper }: stdenv.mkDerivation rec { - name = "dejagnu-1.6.2"; + pname = "dejagnu"; + version = "1.6.2"; src = fetchurl { - url = "mirror://gnu/dejagnu/${name}.tar.gz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; sha256 = "0qfj2wd4qk1yn9yzam6g8nmyxfazcc0knjyyibycb2ainkhp21hd"; }; diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix index 0692d84b454..22de87b95c3 100644 --- a/pkgs/development/tools/misc/doclifter/default.nix +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, python3}: -stdenv.mkDerivation { - name = "doclifter-2.19"; +stdenv.mkDerivation rec { + pname = "doclifter"; + version = "2.19"; src = fetchurl { - url = "http://www.catb.org/~esr/doclifter/doclifter-2.19.tar.gz"; + url = "http://www.catb.org/~esr/${pname}/${pname}-${version}.tar.gz"; sha256 = "1as6z7mdjrrkw2kism41q5ybvyzvwcmj9qzla2fz98v9f4jbj2s2"; }; buildInputs = [ python3 ]; diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix index 70e7f42c5c2..9a521bfd274 100644 --- a/pkgs/development/tools/misc/drush/default.nix +++ b/pkgs/development/tools/misc/drush/default.nix @@ -1,7 +1,8 @@ -{ lib, stdenv, fetchurl, php, which, makeWrapper, bash, coreutils, ncurses }: +{ lib, stdenv, fetchurl, fetchFromGitHub, php, which, makeWrapper, bash, coreutils, ncurses }: stdenv.mkDerivation rec { - name = "drush-6.1.0"; + pname = "drush"; + version = "6.1.0"; meta = with lib; { description = "Command-line shell and Unix scripting interface for Drupal"; @@ -11,8 +12,10 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; - src = fetchurl { - url = "https://github.com/drush-ops/drush/archive/6.1.0.tar.gz"; + src = fetchFromGitHub { + owner = "drush-ops"; + repo = pname; + rev = version; sha256 = "1jgnc4jjyapyn04iczvcz92ic0vq8d1w8xi55ismqyy5cxhqj6bp"; }; diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index 5a5267510d7..c5ede848851 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib, dbus, dbus-glib }: stdenv.mkDerivation rec { - name = "eggdbus-0.6"; + pname = "eggdbus"; + version = "0.6"; src = fetchurl { - url = "https://hal.freedesktop.org/releases/${name}.tar.gz"; + url = "https://hal.freedesktop.org/releases/${pname}-${version}.tar.gz"; sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4"; }; diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 512989a1446..d0b5911b71d 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -5,11 +5,12 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -stdenv.mkDerivation { - name = "gnum4-1.4.18"; +stdenv.mkDerivation rec { + pname = "gnum4"; + version = "1.4.18"; src = fetchurl { - url = "mirror://gnu/m4/m4-1.4.18.tar.bz2"; + url = "mirror://gnu/m4/m4-${version}.tar.bz2"; sha256 = "1xkwwq0sgv05cla0g0a01yzhk0wpsn9y40w9kh9miiiv0imxfh36"; }; diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix index e998f09683a..71b0bbd0b0d 100644 --- a/pkgs/development/tools/misc/gperf/default.nix +++ b/pkgs/development/tools/misc/gperf/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "gperf-3.1"; + pname = "gperf"; + version = "3.1"; src = fetchurl { - url = "mirror://gnu/gperf/${name}.tar.gz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; sha256 = "1qispg6i508rq8pkajh26cznwimbnj06wq9sd85vg95v8nwld1aq"; }; diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index 6651bbb0384..9e6d846e80a 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, gtk2, pkg-config }: -stdenv.mkDerivation { - name = "gtkdialog-0.8.3"; +stdenv.mkDerivation rec { + pname = "gtkdialog"; + version = "0.8.3"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gtkdialog/gtkdialog-0.8.3.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${pname}/${pname}-${version}.tar.gz"; sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e"; }; diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix index 4b7f7985a67..ff5fe7bcba4 100644 --- a/pkgs/development/tools/misc/gtkperf/default.nix +++ b/pkgs/development/tools/misc/gtkperf/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, gtk2, pkg-config, libintl }: -stdenv.mkDerivation { - name = "gtkperf-0.40.0"; +stdenv.mkDerivation rec { + pname = "gtkperf"; + version = "0.40.0"; src = fetchurl { - url = "mirror://sourceforge//gtkperf/gtkperf_0.40.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}_${lib.versions.majorMinor version}.tar.gz"; sha256 = "0yxj3ap3yfi76vqg6xjvgc16nfi9arm9kp87s35ywf10fd73814p"; }; diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 4a205268c26..d4d6dc41657 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -6,10 +6,11 @@ # files. stdenv.mkDerivation rec { - name = "help2man-1.48.1"; + pname = "help2man"; + version = "1.48.1"; src = fetchurl { - url = "mirror://gnu/help2man/${name}.tar.xz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; sha256 = "sha256-3op0dAvQWGRlZ7kqtOzeudqfGgfMfE9gejwU3TjRB5k="; }; diff --git a/pkgs/development/tools/misc/icon-naming-utils/default.nix b/pkgs/development/tools/misc/icon-naming-utils/default.nix index 478c0a61f86..930327a880d 100644 --- a/pkgs/development/tools/misc/icon-naming-utils/default.nix +++ b/pkgs/development/tools/misc/icon-naming-utils/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, perl, librsvg}: stdenv.mkDerivation rec { - name = "icon-naming-utils-0.8.90"; + pname = "icon-naming-utils"; + version = "0.8.90"; src = fetchurl { - url = "http://tango.freedesktop.org/releases/${name}.tar.gz"; + url = "http://tango.freedesktop.org/releases/${pname}-${version}.tar.gz"; sha256 = "071fj2jm5kydlz02ic5sylhmw6h2p3cgrm3gwdfabinqkqcv4jh4"; }; diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix index 8c5ec6af1c7..1f5236456db 100644 --- a/pkgs/development/tools/misc/indent/default.nix +++ b/pkgs/development/tools/misc/indent/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, texinfo }: stdenv.mkDerivation rec { - name = "indent-2.2.12"; + pname = "indent"; + version = "2.2.12"; src = fetchurl { - url = "mirror://gnu/indent/${name}.tar.gz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; sha256 = "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7"; }; diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix index 55e62a2dcae..01a0fab369e 100644 --- a/pkgs/development/tools/misc/itstool/default.nix +++ b/pkgs/development/tools/misc/itstool/default.nix @@ -1,10 +1,11 @@ { stdenv, lib, fetchurl, python3 }: stdenv.mkDerivation rec { - name = "itstool-2.0.6"; + pname = "itstool"; + version = "2.0.6"; src = fetchurl { - url = "http://files.itstool.org/itstool/${name}.tar.bz2"; + url = "http://files.itstool.org/${pname}/${pname}-${version}.tar.bz2"; sha256 = "1acjgf8zlyk7qckdk19iqaca4jcmywd7vxjbcs1mm6kaf8icqcv2"; }; diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix index dbcb8d52f1b..83dbfb93c86 100644 --- a/pkgs/development/tools/misc/jscoverage/default.nix +++ b/pkgs/development/tools/misc/jscoverage/default.nix @@ -1,10 +1,11 @@ { autoconf, fetchurl, makedepend, perl, python3, lib, stdenv, zip }: stdenv.mkDerivation rec { - name = "jscoverage-0.5.1"; + pname = "jscoverage"; + version = "0.5.1"; src = fetchurl { - url = "https://siliconforks.com/jscoverage/download/${name}.tar.bz2"; + url = "https://siliconforks.com/${pname}/download/${pname}-${version}.tar.bz2"; sha256 = "c45f051cec18c10352f15f9844f47e37e8d121d5fd16680e2dd0f3b4420eb7f4"; }; diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index 2b0089e89f6..1cd195a3132 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -6,10 +6,11 @@ # files. stdenv.mkDerivation rec { - name = "libtool-1.5.26"; + pname = "libtool"; + version = "1.5.26"; src = fetchurl { - url = "mirror://gnu/libtool/${name}.tar.gz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; sha256 = "029ggq5kri1gjn6nfqmgw4w920gyfzscjjxbsxxidal5zqsawd8w"; }; diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index e1d9ae6b551..ce176aac4a6 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, elfutils, libunwind }: -stdenv.mkDerivation { - name = "ltrace-0.7.3"; +stdenv.mkDerivation rec { + pname = "ltrace"; + version = "0.7.3"; src = fetchurl { - url = "mirror://debian/pool/main/l/ltrace/ltrace_0.7.3.orig.tar.bz2"; + url = "mirror://debian/pool/main/l/${pname}/${pname}_${version}.orig.tar.bz2"; sha256 = "00wmbdghqbz6x95m1mcdd3wd46l6hgcr4wggdp049dbifh3qqvqf"; }; diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix index a196c5f4528..1e89be8a0c2 100644 --- a/pkgs/development/tools/misc/lttv/default.nix +++ b/pkgs/development/tools/misc/lttv/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib, gtk2, popt, babeltrace }: stdenv.mkDerivation rec { - name = "lttv-1.5"; + pname = "lttv"; + version = "1.5"; src = fetchurl { - url = "https://lttng.org/files/packages/${name}.tar.bz2"; + url = "https://lttng.org/files/packages/${pname}-${version}.tar.bz2"; sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1"; }; diff --git a/pkgs/development/tools/misc/rman/default.nix b/pkgs/development/tools/misc/rman/default.nix index bf71b619e5a..99f3d8c13e7 100644 --- a/pkgs/development/tools/misc/rman/default.nix +++ b/pkgs/development/tools/misc/rman/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "rman-3.2"; +stdenv.mkDerivation rec { + pname = "rman"; + version = "3.2"; src = fetchurl { - url = "mirror://sourceforge/polyglotman/3.2/rman-3.2.tar.gz"; + url = "mirror://sourceforge/polyglotman/${version}/${pname}-${version}.tar.gz"; sha256 = "0prdld6nbkdlkcgc2r1zp13h2fh8r0mlwxx423dnc695ddlk18b8"; }; diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 2fd98490287..fc619612a48 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, perl, makeWrapper }: stdenv.mkDerivation rec { - name = "sloccount-2.26"; + pname = "sloccount"; + version = "2.26"; src = fetchurl { - url = "https://www.dwheeler.com/sloccount/${name}.tar.gz"; + url = "https://www.dwheeler.com/${pname}/${pname}-${version}.tar.gz"; sha256 = "0ayiwfjdh1946asah861ah9269s5xkc8p5fv1wnxs9znyaxs4zzs"; }; diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix index a18dcd85255..d986ef05243 100644 --- a/pkgs/development/tools/misc/srecord/default.nix +++ b/pkgs/development/tools/misc/srecord/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, boost, libtool, groff, ghostscript, libgcrypt ? null }: stdenv.mkDerivation rec { - name = "srecord-1.64"; + pname = "srecord"; + version = "1.64"; src = fetchurl { - url = "mirror://sourceforge/srecord/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "1qk75q0k5vzmm3932q9hqz2gp8n9rrdfjacsswxc02656f3l3929"; }; diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index 8b9646713e8..bc33d417f88 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "stm32flash-0.5"; + pname = "stm32flash"; + version = "0.5"; src = fetchurl { - url = "mirror://sourceforge/stm32flash/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "01p396daqw3zh6nijffbfbwyqza33bi2k4q3m5yjzs02xwi99alp"; }; diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 4da1a2cba09..b3722965fdc 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "5.12"; + version = "5.13"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KRce350lL4nJiKTDQN/exmL0WMuMY9hUMdZLq1kR58Q="; + sha256 = "sha256-Wsw0iIudUQrWrJFdSo3wj1HPGukg6iRkn2pLuYTQtlY="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix index 1fb255073ed..986a560ff6e 100644 --- a/pkgs/development/tools/misc/uisp/default.nix +++ b/pkgs/development/tools/misc/uisp/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "uisp-20050207"; +stdenv.mkDerivation rec { + pname = "uisp"; + version = "20050207"; src = fetchurl { - url = "http://mirror.switch.ch/mirror/gentoo/distfiles/uisp-20050207.tar.gz"; + url = "https://savannah.nongnu.org/download/uisp/uisp-${version}.tar.gz"; sha256 = "1bncxp5yxh9r1yrp04vvhfiva8livi1pwic7v8xj99q09zrwahvw"; }; diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix index 63452728b91..0fcb121e460 100644 --- a/pkgs/development/tools/neoload/default.nix +++ b/pkgs/development/tools/neoload/default.nix @@ -30,15 +30,16 @@ let dotInstall4j = path: writeTextFile { name = "dot-install4j"; text = '' sys.symlinkDir=INSTALLDIR/bin ''; }; -in stdenv.mkDerivation { - name = "neoload-4.1.4"; +in stdenv.mkDerivation rec { + pname = "neoload"; + version = "4.1.4"; src = fetchurl ( if stdenv.hostPlatform.system == "x86_64-linux" then - { url = "http://neoload.installers.neotys.com/documents/download/neoload/v4.1/neoload_4_1_4_linux_x64.sh"; + { url = "http://neoload.installers.neotys.com/documents/download/${pname}/v${lib.versions.majorMinor version}/${pname}_${lib.replaceStrings ["."] ["_"] version}_linux_x64.sh"; sha256 = "199jcf5a0nwfm8wfld2rcjgq64g91vvz2bkmki8dxfzf1yasifcd"; } else - { url = "http://neoload.installers.neotys.com/documents/download/neoload/v4.1/neoload_4_1_4_linux_x86.sh"; + { url = "http://neoload.installers.neotys.com/documents/download/${pname}/v${lib.versions.majorMinor version}/${pname}_${lib.replaceStrings ["."] ["_"] version}_linux_x86.sh"; sha256 = "1z66jiwcxixsqqwa0f4q8m2p5kna4knq6lic8y8l74dgv25mw912"; } ); nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index fc79cafdc42..e94e98d8f72 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -1,15 +1,18 @@ -{ lib, stdenv, fetchzip, ocaml, perl }: +{ lib, stdenv, fetchFromGitHub, ocaml, perl }: if lib.versionOlder ocaml.version "4.02" then throw "camlp5 is not available for OCaml ${ocaml.version}" else -stdenv.mkDerivation { +stdenv.mkDerivation rec { - name = "camlp5-7.14"; + pname = "camlp5"; + version = "7.14"; - src = fetchzip { - url = "https://github.com/camlp5/camlp5/archive/rel714.tar.gz"; + src = fetchFromGitHub { + owner = "camlp5"; + repo = "camlp5"; + rev = "rel${builtins.replaceStrings [ "." ] [ "" ] version}"; sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w"; }; diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix index a43903c34d3..b40c8b42546 100644 --- a/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: -stdenv.mkDerivation { - name = "ocamlify-0.0.2"; +stdenv.mkDerivation rec { + pname = "ocamlify"; + version = "0.0.2"; src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/1209/ocamlify-0.0.2.tar.gz"; + url = "https://forge.ocamlcore.org/frs/download.php/1209/${pname}-${version}.tar.gz"; sha256 = "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii"; }; diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix index 4518e7a22e4..82a495b733b 100644 --- a/pkgs/development/tools/ocaml/ocamlscript/default.nix +++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix @@ -1,8 +1,9 @@ {lib, stdenv, fetchurl, ocaml, findlib, camlp4}: -stdenv.mkDerivation { - name = "ocamlscript-2.0.3"; +stdenv.mkDerivation rec { + pname = "ocamlscript"; + version = "2.0.3"; src = fetchurl { - url = "http://mjambon.com/releases/ocamlscript/ocamlscript-2.0.3.tar.gz"; + url = "https://mjambon.com/releases/${pname}/${pname}-${version}.tar.gz"; sha256 = "1v1i24gijxwris8w4hi95r9swld6dm7jbry0zp72767a3g5ivlrd"; }; diff --git a/pkgs/development/tools/parsing/peg/default.nix b/pkgs/development/tools/parsing/peg/default.nix index a7ffeb69745..d53eec12e80 100644 --- a/pkgs/development/tools/parsing/peg/default.nix +++ b/pkgs/development/tools/parsing/peg/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "peg-0.1.18"; + pname = "peg"; + version = "0.1.18"; src = fetchurl { - url = "${meta.homepage}/${name}.tar.gz"; + url = "${meta.homepage}/${pname}-${version}.tar.gz"; sha256 = "114h1y4k8fwcq9m0hfk33dsp7ah8zxzjjzlk71x4iirzczfkn690"; }; diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index 4cd49b884ce..5b7e77ee0b5 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation rec { - name = "phantomjs-1.9.8"; + pname = "phantomjs"; + version = "1.9.8"; # I chose to use the binary build for now. # The source version is quite nasty to compile @@ -14,18 +15,18 @@ stdenv.mkDerivation rec { src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-i686.tar.bz2"; + url = "https://bitbucket.org/ariya/phantomjs/downloads/${pname}-${version}-linux-i686.tar.bz2"; sha256 = "11fzmssz9pqf3arh4f36w06sl2nyz8l9h8iyxyd7w5aqnq5la0j1"; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-x86_64.tar.bz2"; + url = "https://bitbucket.org/ariya/phantomjs/downloads/${pname}-${version}-linux-x86_64.tar.bz2"; sha256 = "0fhnqxxsxhy125fmif1lwgnlhfx908spy7fx9mng4w72320n5nd1"; } else # x86_64-darwin fetchurl { - url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-macosx.zip"; + url = "https://bitbucket.org/ariya/phantomjs/downloads/${pname}-${version}-macosx.zip"; sha256 = "0j0aq8dgzmb210xdrh0v3d4nblskl3zsckl8bzf1a603wcx085cg"; }; diff --git a/pkgs/development/tools/postiats-utilities/default.nix b/pkgs/development/tools/postiats-utilities/default.nix index b9ca9ae5781..6d4db28f37e 100644 --- a/pkgs/development/tools/postiats-utilities/default.nix +++ b/pkgs/development/tools/postiats-utilities/default.nix @@ -1,10 +1,13 @@ -{ lib, stdenv, fetchurl, python3, python3Packages }: - -stdenv.mkDerivation { - name = "postiats-utilities-2.0.1"; - src = fetchurl { - url = "https://github.com/Hibou57/PostiATS-Utilities/archive/v2.0.1.tar.gz"; - sha256 = "12jlzqigmaa9m37x0nq5v3gq8v61m73i5kzdnsm06chf0przpaix"; +{ lib, stdenv, fetchFromGitHub, python3, python3Packages }: + +stdenv.mkDerivation rec { + pname = "postiats-utilities"; + version = "2.0.1"; + src = fetchFromGitHub { + owner = "Hibou57"; + repo = "PostiATS-Utilities"; + rev = "v${version}"; + sha256 = "1238zp6sh60rdqbzff0w5c36w2z1jr44qnv43qidmcp19zvr7jd5"; }; meta = with lib; { diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index 6cd3ea80027..08f89d482dd 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -8,10 +8,11 @@ assert withGUI -> qt4 != null; stdenv.mkDerivation rec { - name = "oprofile-1.4.0"; + pname = "oprofile"; + version = "1.4.0"; src = fetchurl { - url = "mirror://sourceforge/oprofile/${name}.tar.gz"; + url = "mirror://sourceforge/oprofile/${pname}-${version}.tar.gz"; sha256 = "04m46ni0ryk4sqmzd6mahwzp7iwhwqzfbmfi42fki261sycnz83v"; }; diff --git a/pkgs/development/tools/pydb/default.nix b/pkgs/development/tools/pydb/default.nix index eaaa057dc0a..5380bb68608 100644 --- a/pkgs/development/tools/pydb/default.nix +++ b/pkgs/development/tools/pydb/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, python2, emacs }: -stdenv.mkDerivation { - name = "pydb-1.26"; +stdenv.mkDerivation rec { + pname = "pydb"; + version = "1.26"; src = fetchurl { - url = "mirror://sourceforge/sourceforge/bashdb/pydb-1.26.tar.bz2"; + url = "mirror://sourceforge/sourceforge/bashdb/${pname}-${version}.tar.bz2"; sha256 = "1wlkz1hd5d4gkzhkjkzcm650c1lchj28hj36jx96mklglm41h4q1"; }; diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix index 94b5e5a6dcc..8dafe88005d 100644 --- a/pkgs/development/tools/quilt/default.nix +++ b/pkgs/development/tools/quilt/default.nix @@ -2,10 +2,11 @@ stdenv.mkDerivation rec { - name = "quilt-0.66"; + pname = "quilt"; + version = "0.66"; src = fetchurl { - url = "mirror://savannah/quilt/${name}.tar.gz"; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; sha256 = "01vfvk4pqigahx82fhaaffg921ivd3k7rylz1yfvy4zbdyd32jri"; }; diff --git a/pkgs/development/tools/shellcheck/default.nix b/pkgs/development/tools/shellcheck/default.nix index 568b9e1e1dd..284ce6d817a 100644 --- a/pkgs/development/tools/shellcheck/default.nix +++ b/pkgs/development/tools/shellcheck/default.nix @@ -27,8 +27,6 @@ let outputs = [ "bin" "man" "doc" "out" ]; - phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; - buildPhase = '' pandoc -s -f markdown-smart -t man shellcheck.1.md -o shellcheck.1 ''; diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix index b4173c7aebb..7935d10effc 100644 --- a/pkgs/development/tools/sigrok-cli/default.nix +++ b/pkgs/development/tools/sigrok-cli/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib, libsigrok, libsigrokdecode }: stdenv.mkDerivation rec { - name = "sigrok-cli-0.7.1"; + pname = "sigrok-cli"; + version = "0.7.1"; src = fetchurl { - url = "https://sigrok.org/download/source/sigrok-cli/${name}.tar.gz"; + url = "https://sigrok.org/download/source/${pname}/${pname}-${version}.tar.gz"; sha256 = "15vpn1psriadcbl6v9swwgws7dva85ld03yv6g1mgm27kx11697m"; }; diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix index ef04725e562..ede6364fa06 100644 --- a/pkgs/development/tools/sslmate/default.nix +++ b/pkgs/development/tools/sslmate/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perlPackages, makeWrapper, openssl }: stdenv.mkDerivation rec { - name = "sslmate-1.7.1"; + pname = "sslmate"; + version = "1.7.1"; src = fetchurl { - url = "https://packages.sslmate.com/other/${name}.tar.gz"; + url = "https://packages.sslmate.com/other/${pname}-${version}.tar.gz"; sha256 = "1i56za41cfqlml9g787xqqs0r8jifd3y7ks9nf4k2dhhi4rijkj5"; }; diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix index ae9c7c83392..422969d2c66 100644 --- a/pkgs/development/tools/sunxi-tools/default.nix +++ b/pkgs/development/tools/sunxi-tools/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libusb1, zlib }: -stdenv.mkDerivation { - name = "sunxi-tools-20181113"; +stdenv.mkDerivation rec { + pname = "sunxi-tools"; + version = "unstable-2018-11-13"; src = fetchFromGitHub { owner = "linux-sunxi"; diff --git a/pkgs/development/tools/tradcpp/default.nix b/pkgs/development/tools/tradcpp/default.nix index dc7156febe9..c184cee91ca 100644 --- a/pkgs/development/tools/tradcpp/default.nix +++ b/pkgs/development/tools/tradcpp/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, autoconf }: -stdenv.mkDerivation { - name = "tradcpp-0.5.2"; +stdenv.mkDerivation rec { + pname = "tradcpp"; + version = "0.5.2"; src = fetchurl { - url = "https://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-0.5.2.tar.gz"; + url = "https://ftp.netbsd.org/pub/NetBSD/misc/dholland/${pname}-${version}.tar.gz"; sha256 = "1h2bwxwc13rz3g2236l89hm47f72hn3m4h7wjir3j532kq0m68bc"; }; diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix index 6d1622c5b86..2da789fdc60 100644 --- a/pkgs/development/tools/wiggle/default.nix +++ b/pkgs/development/tools/wiggle/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses, groff }: stdenv.mkDerivation rec { - name = "wiggle"; + pname = "wiggle"; version = "1.3"; src = fetchFromGitHub { owner = "neilbrown"; repo = "wiggle"; rev = "v${version}"; - sha256 = "sha256-rlHhYzP81lfblZvtZ1lhiq4iQ6WRpBYukoGqpVP+NKI="; + sha256 = "18ilzr9sbal1j8p1d94ilm1j5blac5cngvcvjpdmgmpw6diy2ldf"; }; buildInputs = [ ncurses groff ]; diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix index b5e0701c136..352dc83f9ab 100644 --- a/pkgs/development/tools/winpdb/default.nix +++ b/pkgs/development/tools/winpdb/default.nix @@ -1,11 +1,12 @@ { lib, fetchurl, pythonPackages, makeDesktopItem }: pythonPackages.buildPythonApplication rec { - name = "winpdb-1.4.8"; + pname = "winpdb"; + version = "1.4.8"; namePrefix = ""; src = fetchurl { - url = "https://winpdb.googlecode.com/files/${name}.tar.gz"; + url = "https://winpdb.googlecode.com/files/${pname}-${version}.tar.gz"; sha256 = "0vkpd24r40j928vc04c721innv0168sbllg97v4zw10adm24d8fs"; }; diff --git a/pkgs/development/tools/xib2nib/default.nix b/pkgs/development/tools/xib2nib/default.nix index 67900dda140..b579e367433 100644 --- a/pkgs/development/tools/xib2nib/default.nix +++ b/pkgs/development/tools/xib2nib/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, pugixml, boost, PlistCpp }: stdenv.mkDerivation { - name = "xib2nib-730e177"; + pname = "xib2nib"; + version = "unstable-2017-04-12"; src = fetchFromGitHub { owner = "matthewbauer"; diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 811a63b0cef..ff673658272 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "7.7.0"; + version = "8.0.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "1mr46raha5aqi8ba0cqvyil5z4vcr46hnxqqmpk3fkrr8awd2897"; + sha256 = "144mz37xhk7gkwhmf67q1h07f2biy5nnw78yb2syc7w28v48ng0z"; }; # don't remove runtime deps diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 09f92b0f848..26b29b9228e 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -43,6 +43,14 @@ if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // { exec ${unpacked}/bin/anki ''; + extraInstallCommands = '' + mkdir -p $out/share + cp -R ${unpacked}/share/applications \ + ${unpacked}/share/man \ + ${unpacked}/share/pixmaps \ + $out/share/ + ''; + inherit meta; }) else stdenv.mkDerivation { inherit pname version; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index d4ae6046f1c..55f9bfb75c3 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.707.0"; + version = "2021.720.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "UdsN/kvpqZrOiigxGttwrExlOkEFa2xWqDQS/d7y/0k="; + sha256 = "I7UkbyH2i218d5RCq4al9Gr1C0MX339jFOeyKrKQ3b0="; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 4684d79d95c..d2c19b08d03 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -26,8 +26,8 @@ }) (fetchNuGet { name = "Fody"; - version = "6.5.1"; - sha256 = "08zpyrniajjba5isjb09spggfh0af2z6x4h2zy5ilk3y5bb9vdch"; + version = "6.5.2"; + sha256 = "0vq97mkfk5ijinwnhpkm212y69ik6cd5x0n61ssyxmz50q1vp84f"; }) (fetchNuGet { name = "HidSharpCore"; @@ -781,13 +781,13 @@ }) (fetchNuGet { name = "ppy.LocalisationAnalyser"; - version = "2021.706.0"; - sha256 = "087x61vi1rv1slzr8hhcslngdd41p2d5r8yhpqm1kmls24csv556"; + version = "2021.716.0"; + sha256 = "0w45af0mlh4bkjxxhk5p4kb6z0na8fmm6xz10dfzs3b4i61h5x3z"; }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2021.707.0"; - sha256 = "1ai8yam6v67y9z8yipqjn578bk2qzqm05ncyqfgig3in6baxwpna"; + version = "2021.714.0"; + sha256 = "175i0hcbl01xy633zvij8185nj4g7ja1rsv2lmfz8qdykqj6g9kl"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -816,13 +816,13 @@ }) (fetchNuGet { name = "Realm"; - version = "10.2.1"; - sha256 = "14pi7vz7nl8ag0bmlbyds52z5nx9wbg154qkm6jai10rm02ws86l"; + version = "10.3.0"; + sha256 = "12zmp43cf2kilzq1yi9x2hy1jdh51c0kbnddw5s960k1kvyx2s2v"; }) (fetchNuGet { name = "Realm.Fody"; - version = "10.2.1"; - sha256 = "1zv57wb7zcgyigsxqikf2yq2h7an4c3dbydl9la5xdpa76dgmxdi"; + version = "10.3.0"; + sha256 = "0mhjkahi2ldxcizv08i70mrpwgrvljxdjlr81x3dmwgpxxfji18d"; }) (fetchNuGet { name = "Remotion.Linq"; diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix index afeded792f2..246e1afc744 100644 --- a/pkgs/games/xmoto/default.nix +++ b/pkgs/games/xmoto/default.nix @@ -1,34 +1,65 @@ -{ lib, stdenv, fetchurl, chipmunk, sqlite, curl, zlib, bzip2, libjpeg -, libpng, freeglut, libGLU, libGL, SDL, SDL_mixer, SDL_image, SDL_net -, SDL_ttf, lua5, ode, libxdg_basedir, libxml2 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, gettext, makeWrapper, bzip2 +, curl, libjpeg, libxml2, xz, lua, ode, libGL, libpng, SDL, SDL_mixer, SDL_net +, SDL_ttf, sqlite, libxdg_basedir, zlib }: stdenv.mkDerivation rec { pname = "xmoto"; - version = "0.5.11"; + version = "0.6.1"; - src = fetchurl { - url = "https://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"; - sha256 = "1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "00f5ha79lfa2iiaz66wl0hl5dapa1l15qdr7m7knzi0ll7j6z66n"; }; - buildInputs = [ - chipmunk sqlite curl zlib bzip2 libjpeg libpng - freeglut libGLU libGL SDL SDL_mixer SDL_image SDL_net SDL_ttf - lua5 ode libxdg_basedir libxml2 + patches = [ + # Fix build with Nix + (fetchpatch { + url = "https://github.com/xmoto/xmoto/commit/536dcc7ec77a4c4c454b86220e85b1cb3cd1c7f7.patch"; + sha256 = "0h9lld668jrbmrqva89zqwp63jiagjj86prkxzx6372p3kk9y7g7"; + }) ]; - CXXFLAGS = [ - "-fpermissive" - # Build using the old C++ ABI to fix issue with missing text; the issue - # should be fixed in the next stable release (if that ever does happen) - "-D_GLIBCXX_USE_CXX11_ABI=0" + nativeBuildInputs = [ + cmake + gettext + makeWrapper ]; + buildInputs = [ + bzip2 + curl + libjpeg + libxml2 + xz + lua + ode + libGL + libpng + SDL + SDL_mixer + SDL_net + SDL_ttf + sqlite + libxdg_basedir + zlib + ]; + + preFixup = '' + wrapProgram "$out/bin/xmoto" \ + --prefix XDG_DATA_DIRS : "$out/share/" + ''; + meta = with lib; { - description = "Obstacled race game"; + description = "A challenging 2D motocross platform game, where physics play an important role"; + longDescription = '' + X-Moto is a challenging 2D motocross platform game, where physics plays an all important role in the gameplay. + You need to control your bike to its limits, if you want to have a chance to finish the most difficult challenges. + ''; homepage = "http://xmoto.tuxfamily.org"; maintainers = with maintainers; [ raskin pSub ]; - platforms = platforms.linux; - license = licenses.gpl2; + platforms = platforms.all; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index c8566bfc07a..f33ca502438 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -123,36 +123,35 @@ python3Packages.buildPythonApplication { {} + ''; - preConfigure = '' - export configureFlags="$configureFlags - --with-hpppddir=$out/share/cups/model/HP - --with-cupsfilterdir=$out/lib/cups/filter - --with-cupsbackenddir=$out/lib/cups/backend - --with-icondir=$out/share/applications - --with-systraydir=$out/xdg/autostart - --with-mimedir=$out/etc/cups - --enable-policykit - ${lib.optionalString withStaticPPDInstall "--enable-cups-ppd-install"} - --disable-qt4 - ${lib.optionalString withQt5 "--enable-qt5"} - " - - export makeFlags=" - halpredir=$out/share/hal/fdi/preprobe/10osvendor - rulesdir=$out/etc/udev/rules.d - policykit_dir=$out/share/polkit-1/actions - policykit_dbus_etcdir=$out/etc/dbus-1/system.d - policykit_dbus_sharedir=$out/share/dbus-1/system-services - hplip_confdir=$out/etc/hp - hplip_statedir=$out/var/lib/hp - " - - # Prevent 'ppdc: Unable to find include file "<font.defs>"' which prevent - # generation of '*.ppd' files. - # This seems to be a 'ppdc' issue when the tool is run in a hermetic sandbox. - # Could not find how to fix the problem in 'ppdc' so this is a workaround. - export CUPS_DATADIR="${cups}/share/cups" - ''; + configureFlags = let out = placeholder "out"; in [ + "--with-hpppddir=${out}/share/cups/model/HP" + "--with-cupsfilterdir=${out}/lib/cups/filter" + "--with-cupsbackenddir=${out}/lib/cups/backend" + "--with-icondir=${out}/share/applications" + "--with-systraydir=${out}/xdg/autostart" + "--with-mimedir=${out}/etc/cups" + "--enable-policykit" + "--disable-qt4" + ] + ++ lib.optional withStaticPPDInstall "--enable-cups-ppd-install" + ++ lib.optional withQt5 "--enable-qt5" + ; + + # Prevent 'ppdc: Unable to find include file "<font.defs>"' which prevent + # generation of '*.ppd' files. + # This seems to be a 'ppdc' issue when the tool is run in a hermetic sandbox. + # Could not find how to fix the problem in 'ppdc' so this is a workaround. + CUPS_DATADIR = "${cups}/share/cups"; + + makeFlags = let out = placeholder "out"; in [ + "halpredir=${out}/share/hal/fdi/preprobe/10osvendor" + "rulesdir=${out}/etc/udev/rules.d" + "policykit_dir=${out}/share/polkit-1/actions" + "policykit_dbus_etcdir=${out}/etc/dbus-1/system.d" + "policykit_dbus_sharedir=${out}/share/dbus-1/system-services" + "hplip_confdir=${out}/etc/hp" + "hplip_statedir=${out}/var/lib/hp" + ]; postConfigure = '' # don't save timestamp, in order to improve reproducibility diff --git a/pkgs/misc/vscode-extensions/terraform/default.nix b/pkgs/misc/vscode-extensions/terraform/default.nix index 658495296bf..e934f03b209 100644 --- a/pkgs/misc/vscode-extensions/terraform/default.nix +++ b/pkgs/misc/vscode-extensions/terraform/default.nix @@ -3,19 +3,19 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "terraform"; publisher = "hashicorp"; - version = "2.13.0"; + version = "2.13.2"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/${mktplcRef.name}-${mktplcRef.version}.vsix"; - sha256 = "1wc4jl4h3ja4ivynf20yxzwqssi6yd7alvqvcjrkksic98480qcz"; + sha256 = "0h7c6p2dcwsg7wlp49p2fsq0f164pzkx65929imd1m2df77aykqa"; }; patches = [ ./fix-terraform-ls.patch ]; postPatch = '' - substituteInPlace out/extension.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls + substituteInPlace out/clientHandler.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls ''; meta = with lib; { diff --git a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch index 95e8d92da33..9153276d367 100644 --- a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch +++ b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch @@ -1,17 +1,30 @@ +diff --git a/out/clientHandler.js b/out/clientHandler.js +index 7f9716d..a543d60 100644 +--- a/out/clientHandler.js ++++ b/out/clientHandler.js +@@ -33,8 +33,7 @@ class ClientHandler { + this.reporter.sendTelemetryEvent('usePathToBinary'); + } + else { +- const installPath = path.join(context.extensionPath, 'lsp'); +- this.pathToBinary = path.join(installPath, 'terraform-ls'); ++ this.pathToBinary = 'TERRAFORM-LS-PATH'; + } + } + startClients(folders) { diff --git a/out/extension.js b/out/extension.js -index e932d27..099126b 100644 +index 7a271fc..726bbf8 100644 --- a/out/extension.js +++ b/out/extension.js -@@ -143,25 +143,6 @@ function updateLanguageServer() { - return __awaiter(this, void 0, void 0, function* () { - const delay = 1000 * 60 * 60 * 24; - languageServerUpdater.timeout(updateLanguageServer, delay); // check for new updates every 24hrs -- // skip install if a language server binary path is set +@@ -149,24 +149,6 @@ function updateLanguageServer(clientHandler, installPath) { + updateLanguageServer(clientHandler, installPath); + }, 24 * hour); + // skip install if a language server binary path is set - if (!vscodeUtils_1.config('terraform').get('languageServer.pathToBinary')) { - const installer = new languageServerInstaller_1.LanguageServerInstaller(installPath, reporter); - const install = yield installer.needsInstall(); - if (install) { -- yield stopClients(); +- yield clientHandler.stopClients(); - try { - yield installer.install(); - } @@ -25,15 +38,6 @@ index e932d27..099126b 100644 - } - } - } - return startClients(); // on repeat runs with no install, this will be a no-op + return clientHandler.startClients(vscodeUtils_1.prunedFolderNames()); // on repeat runs with no install, this will be a no-op }); } -@@ -259,7 +240,7 @@ function pathToBinary() { - reporter.sendTelemetryEvent('usePathToBinary'); - } - else { -- command = path.join(installPath, 'terraform-ls'); -+ command = 'TERRAFORM-LS-PATH'; - } - _pathToBinaryPromise = Promise.resolve(command); - } diff --git a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix index 7d2615824a6..a2350271482 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "alsa-lib"; - version = "1.2.5"; + version = "1.2.5.1"; src = fetchurl { url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; - sha256 = "067ga0l6zr782kw8jdsqvbb20pcgnl0vkpnnz2n36fq8ii58k4lh"; + sha256 = "sha256-YoQh2VDOyvI03j+JnVIMCmkjMTyWStdR/6wIHfMxQ44="; }; patches = [ diff --git a/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix index d87f3eebb84..0666f3f4793 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "alsa-ucm-conf-${version}"; - version = "1.2.5"; + version = "1.2.5.1"; src = fetchurl { url = "mirror://alsa/lib/${name}.tar.bz2"; - sha256 = "sha256-CTrj2Fpeb9LNHMJ/7aQA1xkTgvuLXl4jSXKGyHwVB6U="; + sha256 = "sha256-WEGkRBZty/R523UTA9vDVW9oUIWsfgDwyed1VnYZXZc="; }; dontBuild = true; diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 6d0d49b9d39..040b8fc8478 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -52,6 +52,11 @@ in stdenv.mkDerivation rec { substituteInPlace tools/hid2hci.rules \ --replace /sbin/udevadm ${systemd}/bin/udevadm \ --replace "hid2hci " "$out/lib/udev/hid2hci " + # Disable some tests: + # - test-mesh-crypto depends on the following kernel settings: + # CONFIG_CRYPTO_[USER|USER_API|USER_API_AEAD|USER_API_HASH|AES|CCM|AEAD|CMAC] + if [[ ! -f unit/test-mesh-crypto.c ]]; then echo "unit/test-mesh-crypto.c no longer exists"; false; fi + echo 'int main() { return 77; }' > unit/test-mesh-crypto.c ''; configureFlags = [ diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index ad700c09772..e7304e19679 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "cryptsetup"; - version = "2.3.5"; + version = "2.3.6"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://kernel/linux/utils/cryptsetup/v2.3/${pname}-${version}.tar.xz"; - sha256 = "sha256-ztmUb0RNEyU22vkvyKykJ3Y4o8LZbiBUCyuuTTb9cME="; + sha256 = "sha256-spa3oh6ldsKxgGEcyxnQauyN3a7ffHBLDGqBIQwlY18="; }; # Disable 4 test cases that fail in a sandbox diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix index 5a472c73578..50124a2bf45 100644 --- a/pkgs/os-specific/linux/dmtcp/default.nix +++ b/pkgs/os-specific/linux/dmtcp/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "dmtcp"; - version = "2.6.0"; + version = "unstable-2021-03-01"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "01skyhr573w1dygvkwz66lvir2jsq443fjwkysglwxvmrdfz9kwd"; + rev = "f999adbb8e88fe452a0e57ceb43b6eed7b4409f9"; + sha256 = "sha256-codCHQui3fGfUZSNq8GuH4ad/GjD6I/S9rX83o8oFPc="; }; dontDisableStatic = true; @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { substituteInPlace configure \ --replace '#define ELF_INTERPRETER "$interp"' \ "#define ELF_INTERPRETER \"$(cat $NIX_CC/nix-support/dynamic-linker)\"" - substituteInPlace src/dmtcp_coordinator.cpp \ + substituteInPlace src/restartscript.cpp \ --replace /bin/bash ${stdenv.shell} - substituteInPlace util/gdb-add-symbol-file \ + substituteInPlace util/dmtcp_restart_wrapper.sh \ --replace /bin/bash ${stdenv.shell} substituteInPlace test/autotest.py \ --replace /bin/bash ${bash}/bin/bash \ diff --git a/pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch b/pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch index 5a81dad0cc9..118e52b8e62 100644 --- a/pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch +++ b/pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch @@ -1,11 +1,13 @@ ---- dmtcp-2.5.1-src/src/util_exec.cpp 2017-09-19 13:36:22.947587034 +0200 -+++ dmtcp-2.5.1-src/src/util_exec.cpp 2017-09-19 13:36:32.221313460 +0200 -@@ -178,7 +178,7 @@ - - static string ld_linux_so_path(int version, bool is32bitElf = false) +diff --git a/src/util_exec.cpp b/src/util_exec.cpp +index 0e8a13c1..0cc99c1e 100644 +--- a/src/util_exec.cpp ++++ b/src/util_exec.cpp +@@ -300,7 +300,7 @@ Util::elfType(const char *pathname, bool *isElf, bool *is32bitElf) + static string + ld_linux_so_path(int version, bool is32bitElf = false) { - char buf[80]; + char buf[128]; + #if (defined(__x86_64__) || defined(__aarch64__)) && !defined(CONFIG_M32) if (is32bitElf) { - sprintf(buf, "/lib/ld-linux.so.%d", version); diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 638983d6c17..ea3c4d36958 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.12.0"; + version = "5.13.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-nSaNuYo27ioOP/O5Ky7/9m/BE4pR5Am972qzz+FfMm8="; + sha256 = "sha256-cqLlN3TKyeZfe2F97rsgWfh+iWDW6XE+TXiM6pZvGzY="; }; preConfigure = '' diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index eac71ee36aa..5ff1221e3bd 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,20 +13,20 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.50-hardened1.patch", - "sha256": "0z57cdvyaarl5p0b6sj93pag34wvf128s30ymkc4m50a60kp7cr8", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.50-hardened1/linux-hardened-5.10.50-hardened1.patch" + "name": "linux-hardened-5.10.51-hardened1.patch", + "sha256": "0s9q7vlhnsd484kzg9mnqc7zab09ch3i3w654wvhkxk9zy4kgzhr", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.51-hardened1/linux-hardened-5.10.51-hardened1.patch" }, "5.12": { "extra": "-hardened1", - "name": "linux-hardened-5.12.17-hardened1.patch", - "sha256": "09vh04a1sa80shm0z5if31j5r8s4syrqv4i22q5pnnfnlzhbqk59", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.17-hardened1/linux-hardened-5.12.17-hardened1.patch" + "name": "linux-hardened-5.12.18-hardened1.patch", + "sha256": "0mlff4ylnx1pvswamhsms9366jw618ic8w42rnzrwqhasfnwkqjb", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.18-hardened1/linux-hardened-5.12.18-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.132-hardened1.patch", - "sha256": "0a4n8ss16qqbrbxajlad4j7nc10ipdnl70yz6ppryyw94i5lf5pb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.132-hardened1/linux-hardened-5.4.132-hardened1.patch" + "name": "linux-hardened-5.4.133-hardened1.patch", + "sha256": "0nnsyl2fxv7nnj7c47nnr753yh5x3wbny7ml8x23f5zdvjz43yfj", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.133-hardened1/linux-hardened-5.4.133-hardened1.patch" } } diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 988de97e03b..23e4099438b 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.50"; + version = "5.10.51"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0dmlpy9k7am99495bxcm46i4y6g34d1fzdkzz3wgzb4mgmx35nlb"; + sha256 = "1qkssvqk29svn10ws3lrnzfbmlvzrixkf7r7lslc7k3lqa9yiflm"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 82218dc1cef..fe180d95563 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.17"; + version = "5.12.18"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1ghyqxfxslxzr7273vj2yn14pkdnkja3wk50xxhavpvf87i8c40j"; + sha256 = "12sjscf53z6fc1jah3i2578r3a0i7rkw2jmqi0w328a22i0paakg"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix index da90ee69de8..4bb0f5deef1 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.13.2"; + version = "5.13.3"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0dx9khk7fh003xyb3xix0kc0rmjncg7ric5p830zhadnrw4hv563"; + sha256 = "1ir80wn019kslv6ysiqxdvarrjlr8b3skk1s43cwki3x2cjnxskq"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 003f1e96e4f..318d0887fb9 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.132"; + version = "5.4.133"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1vq0dmrn7gl2vprm08l8by5ja3xjgggrcd38vqg7b7jpnfzssrl4"; + sha256 = "0c08jp5k5h4c2s4pbpyvnvzczr79jh833wy9jv15nkvqp3xnd8w9"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 0da84ab1cef..842a525353d 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -1,5 +1,6 @@ { lib, fetchFromGitHub, python3 , libsepol, libselinux, checkpolicy +, fetchpatch , withGraphics ? false }: @@ -17,6 +18,13 @@ buildPythonApplication rec { sha256 = "0vr20bi8w147z5lclqz1l0j1b34137zg2r04pkafkgqqk7qbyjk6"; }; + patches = [ + (fetchpatch { # included in 4.4.0 + url = "https://github.com/SELinuxProject/setools/commit/f1b4a5d375be05fbccedb258c940d771bff8e524.diff"; + sha256 = "1r38s6i4i6bdr2zdp5wcg1yifpf3pd018c73a511mgynyg7d11xy"; + }) + ]; + nativeBuildInputs = [ cython ]; buildInputs = [ libsepol ]; propagatedBuildInputs = [ enum34 libselinux networkx ] diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 34cfd58ab4b..4ebc4ed7663 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -45,13 +45,11 @@ stdenv.mkDerivation rec { xorgserver ]; - preConfigure = '' - mkdir -p $out/share/X11/xorg.conf.d - configureFlags="--with-xorg-module-dir=$out/lib/xorg/modules - --with-sdkdir=$out/include/xorg --with-xorg-conf-dir=$out/share/X11/xorg.conf.d" - ''; - - CFLAGS = "-I${pixman}/include/pixman-1"; + configureFlags = [ + "--with-xorg-module-dir=${placeholder "out"}/lib/xorg/modules" + "--with-sdkdir=${placeholder "out"}/include/xorg" + "--with-xorg-conf-dir=${placeholder "out"}/share/X11/xorg.conf.d" + ]; meta = with lib; { maintainers = with maintainers; [ goibhniu fortuneteller2k ]; diff --git a/pkgs/servers/althttpd/default.nix b/pkgs/servers/althttpd/default.nix index dfb073aa11f..4f1a128dd38 100644 --- a/pkgs/servers/althttpd/default.nix +++ b/pkgs/servers/althttpd/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "althttpd"; - version = "unstable-2021-05-07"; + version = "unstable-2021-06-09"; src = fetchfossil { url = "https://sqlite.org/althttpd/"; - rev = "2c5e3f9f7051a578"; - sha256 = "sha256-+RuogtQAc+zjCWTOiOunu1pXf3LxfdWYQX+24ysJ7uY="; + rev = "0d3b5e232c57e188"; + sha256 = "sha256-vZwpjYYMdP/FgPTAQ9Kdh2RRMovpONqu2v73cCoYyxE="; }; installPhase = '' diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index cb5fafd17cf..f3238cc4bda 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -4,8 +4,8 @@ , withPython3 ? true, python3, ncurses , withPHP74 ? false, php74 , withPHP80 ? true, php80 -, withPerl530 ? false, perl530 -, withPerl532 ? true, perl532 +, withPerl532 ? false, perl532 +, withPerl534 ? true, perl534 , withPerldevel ? false, perldevel , withRuby_2_6 ? true, ruby_2_6 , withRuby_2_7 ? false, ruby_2_7 @@ -47,8 +47,8 @@ in stdenv.mkDerivation rec { ++ optionals withPython3 [ python3 ncurses ] ++ optional withPHP74 php74-unit ++ optional withPHP80 php80-unit - ++ optional withPerl530 perl530 ++ optional withPerl532 perl532 + ++ optional withPerl534 perl534 ++ optional withPerldevel perldevel ++ optional withRuby_2_6 ruby_2_6 ++ optional withRuby_2_7 ruby_2_7 @@ -72,8 +72,8 @@ in stdenv.mkDerivation rec { ${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"} ${optionalString withPHP74 "./configure php --module=php74 --config=${php74-unit.unwrapped.dev}/bin/php-config --lib-path=${php74-unit}/lib"} ${optionalString withPHP80 "./configure php --module=php80 --config=${php80-unit.unwrapped.dev}/bin/php-config --lib-path=${php80-unit}/lib"} - ${optionalString withPerl530 "./configure perl --module=perl530 --perl=${perl530}/bin/perl"} ${optionalString withPerl532 "./configure perl --module=perl532 --perl=${perl532}/bin/perl"} + ${optionalString withPerl534 "./configure perl --module=perl534 --perl=${perl534}/bin/perl"} ${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"} ${optionalString withRuby_2_6 "./configure ruby --module=ruby26 --ruby=${ruby_2_6}/bin/ruby"} ${optionalString withRuby_2_7 "./configure ruby --module=ruby27 --ruby=${ruby_2_7}/bin/ruby"} diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 5bb43ae316c..341c9130481 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.18.364"; + version = "0.18.372"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-QcwrgW07tP0PxA6UWqMf7VT0Y8uBZFJY9Uz7seorEfs="; + sha256 = "sha256-GkAKYxa5F0N9jg9TZrwt3hjkhybZTKU2Ia/gIxBRGuo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix new file mode 100644 index 00000000000..8112feb75fe --- /dev/null +++ b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, fetchpatch +}: +buildGoModule rec { + pname = "buildkite-agent-metrics"; + version = "5.2.1"; + + outputs = [ "out" "lambda" ]; + + src = fetchFromGitHub { + owner = "buildkite"; + repo = "buildkite-agent-metrics"; + rev = "v${version}"; + sha256 = "XZYVCSJ/DIwoLrz37aQ3yW3RUhOhorY8L1AsAWxywcg="; + }; + + vendorSha256 = "UIkU3i45IEXWHdiakTj7f4W9kR49k4A93msfkqeXmQQ="; + + patches = [ + # Necessary to support passing the agent token in an env var, rather than on + # the command line. Should be removed upon the next release. + (fetchpatch { + name = "BUILDKITE_AGENT_TOKEN-env-var.patch"; + url = "https://github.com/buildkite/buildkite-agent-metrics/commit/6c40b478b95f0e05fc12b87158222a9ff68169e0.patch"; + sha256 = "Y4m9qGyPIROSqOY6G6xRQfFENEG4bFF3q5dZcHI4XiY="; + }) + ]; + + postInstall = '' + mkdir -p $lambda/bin + mv $out/bin/lambda $lambda/bin + ''; + + meta = with lib; { + description = "A command-line tool (and Lambda) for collecting Buildkite agent metrics"; + homepage = "https://github.com/buildkite/buildkite-agent-metrics"; + license = licenses.mit; + maintainers = teams.determinatesystems.members; + }; +} diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 75afedaa2dd..0b0b5a0f829 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { cp -r * $out/ ln -sf /etc/roundcube/config.inc.php $out/config/config.inc.php rm -rf $out/installer + # shut up updater + rm $out/composer.json-dist ''; passthru.withPlugins = f: buildEnv { diff --git a/pkgs/servers/sql/mariadb/connector-c/3_1.nix b/pkgs/servers/sql/mariadb/connector-c/3_1.nix index 477d6113b7a..40a00313639 100644 --- a/pkgs/servers/sql/mariadb/connector-c/3_1.nix +++ b/pkgs/servers/sql/mariadb/connector-c/3_1.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./. (args // { - version = "3.1.12"; - sha256 = "0qzyahr8x9l1xz0l79wz3iahxz7648n1azc5yr7kx0dl113y2nig"; + version = "3.1.13"; + sha256 = "0xb8fiissblxb319y5ifqqp86zblwis789ipb753pcb4zpnsaw82"; }) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index b7205f93026..fa9b5c414ed 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -22,14 +22,14 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.5.10"; + version = "10.5.11"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "1fxsq2xgcb8j81z043bifpmxblj6nb3wqjm9rgsnpwmazkwk5zx5"; + sha256 = "0yn4bhqciy6jyig31rmkjc588l03k4bj3194yf9y6373bxh5643n"; name = "mariadb-${version}.tar.gz"; }; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index e13c23ddeee..5d0a9cfa857 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -33,6 +33,8 @@ let inherit sha256; }; + hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; + outputs = [ "out" "lib" "doc" "man" ]; setOutputFlags = false; # $out retains configureFlags :-/ diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 65ed6d5000c..b7fa5453d87 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -12,7 +12,7 @@ , Security , nghttp2 , libgit2 -, withStableFeatures ? true +, withExtraFeatures ? true }: rustPlatform.buildRustPackage rec { @@ -29,14 +29,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-Ly59mdUzSI2pIPbckWn1WBz/o2zVzpAzaCDROLdjG7Y="; nativeBuildInputs = [ pkg-config ] - ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; + ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ] - ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ xorg.libX11 ] - ++ lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ]; + ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ xorg.libX11 ] + ++ lib.optionals (withExtraFeatures && stdenv.isDarwin) [ AppKit nghttp2 libgit2 ]; - cargoBuildFlags = lib.optional withStableFeatures "--features stable"; + cargoBuildFlags = lib.optional withExtraFeatures "--features=extra"; # TODO investigate why tests are broken on darwin # failures show that tests try to write to paths diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index d6624a493aa..b5a9f0cc5cb 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -23,16 +23,16 @@ else let fetch = { file, sha256, executable ? true }: import <nix/fetchurl.nix> { - url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/5ab5783e4f46c373c6de84deac9ad59b608bb2e6/${file}"; + url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/05ef940b94fe76e7ac06ea45a625adc8e4be96f9/${file}"; inherit (localSystem) system; inherit sha256 executable; }; in { - sh = fetch { file = "sh"; sha256 = "sha256-nbb4XEk3go7ttiWrQyKQMLzPr+qUnwnHkWMtVCZsMCs="; }; - bzip2 = fetch { file = "bzip2"; sha256 = "sha256-ybnA+JWrKhXSfn20+GVKXkHFTp2Zt79hat8hAVmsUOc="; }; - mkdir = fetch { file = "mkdir"; sha256 = "sha256-nmvMxmfcY41/60Z/E8L9u0vgePW5l30Dqw1z+Nr02Hk="; }; - cpio = fetch { file = "cpio"; sha256 = "sha256-cB36rN3NLj19Tk37Kc5bodMFMO+mCpEQkKKo0AEMkaU="; }; - tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "sha256-kh2vKmjCr/HvR06czZbxUxV5KDRxSF27M6nN3cyofRI="; executable = false; }; + sh = fetch { file = "sh"; sha256 = "sha256-igMAVEfumFv/LUNTGfNi2nSehgTNIP4Sg+f3L7u6SMA="; }; + bzip2 = fetch { file = "bzip2"; sha256 = "sha256-K3rhkJZipudT1Jgh+l41Y/fNsMkrPtiAsNRDha/lpZI="; }; + mkdir = fetch { file = "mkdir"; sha256 = "sha256-VddFELwLDJGNADKB1fWwWPBtIAlEUgJv2hXRmC4NEeM="; }; + cpio = fetch { file = "cpio"; sha256 = "sha256-SWkwvLaFyV44kLKL2nx720SvcL4ej/p2V/bX3uqAGO0="; }; + tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "sha256-b65dXbIm6o6s6U8tAiGpR6SMfvfn/VFcZgTHBetJZis="; executable = false; }; } }: diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 63a37d54547..1fbd3cba27e 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -258,6 +258,25 @@ in # Rewrap the binutils with the new glibc, so both the next # stage's wrappers use it. libc = getLibc self; + + # Unfortunately, when building gcc in the next stage, its LTO plugin + # would use the final libc but `ld` would use the bootstrap one, + # and that can fail to load. Therefore we upgrade `ld` to use newer libc; + # apparently the interpreter needs to match libc, too. + bintools = self.stdenvNoCC.mkDerivation { + inherit (prevStage.bintools.bintools) name; + dontUnpack = true; + dontBuild = true; + # We wouldn't need to *copy* all, but it's easier and the result is temporary anyway. + installPhase = '' + mkdir -p "$out"/bin + cp -a '${prevStage.bintools.bintools}'/bin/* "$out"/bin/ + chmod +w "$out"/bin/ld.bfd + patchelf --set-interpreter '${getLibc self}'/lib/ld*.so.? \ + --set-rpath "${getLibc self}/lib:$(patchelf --print-rpath "$out"/bin/ld.bfd)" \ + "$out"/bin/ld.bfd + ''; + }; }; }; }) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 4db40a2e516..0eee6e692fd 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -183,7 +183,7 @@ in with pkgs; rec { nuke-refs $out/lib/* nuke-refs $out/libexec/gcc/*/*/* nuke-refs $out/lib/gcc/*/*/* - nuke-refs $out/lib/gcc/*/*/include-fixed/*/* + nuke-refs $out/lib/gcc/*/*/include-fixed/*{,/*} mkdir $out/.pack mv $out/* $out/.pack diff --git a/pkgs/tools/X11/xgeometry-select/default.nix b/pkgs/tools/X11/xgeometry-select/default.nix index b954205990b..87c643af483 100644 --- a/pkgs/tools/X11/xgeometry-select/default.nix +++ b/pkgs/tools/X11/xgeometry-select/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0s7kirgh5iz91m3qy8xiq0j4gljy8zrcnylf4szl5h0lrsaqj7ya"; }; - phases = [ "buildPhase" "installPhase" ]; + dontUnpack = true; buildInputs = [ libX11 ]; diff --git a/pkgs/tools/X11/xob/default.nix b/pkgs/tools/X11/xob/default.nix index 2c1ae4bdf61..754904449ef 100644 --- a/pkgs/tools/X11/xob/default.nix +++ b/pkgs/tools/X11/xob/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index b37f3ce465e..4fb11de26c3 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.36.0"; + version = "1.37.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-2pkSwr/8pmRedcsvl55wHskv0aSAjlIbmHFUoTXCTE0="; + sha256 = "sha256-ETj14xwCQJv3xNYXFY/Z0FsxjxLrlpcVkap2sRsLzVU="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/pkgs/tools/admin/fastlane/default.nix b/pkgs/tools/admin/fastlane/default.nix index 245c1dfef8c..dc8dd1fd7a6 100644 --- a/pkgs/tools/admin/fastlane/default.nix +++ b/pkgs/tools/admin/fastlane/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = let env = bundlerEnv { diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 20d17b77741..1ef584ec977 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub , xorg, xkeyboard_config, zlib , libjpeg_turbo, pixman, fltk -, fontDirectories , cmake, gettext, libtool , libGLU , gnutls, pam, nettle , xterm, openssh, perl , makeWrapper +, nixosTests }: with lib; @@ -22,17 +22,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-IX39oEhTyk7NV+9dD9mFtes22fBdMTAVIv5XkqFK560="; }; - inherit fontDirectories; postPatch = '' sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver/vncserver.in fontPath= - for i in $fontDirectories; do - for j in $(find $i -name fonts.dir); do - addToSearchPathWithCustomDelimiter "," fontPath $(dirname $j) - done - done - sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -fp '"$fontPath"'";' unix/vncserver/vncserver.in substituteInPlace vncviewer/vncviewer.cxx \ --replace '"/usr/bin/ssh' '"${openssh}/bin/ssh' ''; @@ -98,6 +91,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs; + passthru.tests.tigervnc = nixosTests.vnc.testTigerVNC; + meta = { homepage = "https://tigervnc.org/"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index d80ad9b0dc0..7906c92ba88 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -1,7 +1,6 @@ { lib -, python3Packages +, python38 , fetchFromGitHub -, python3 , fetchpatch }: @@ -17,10 +16,15 @@ # For now, for deployment check the systemd unit in the pull request: # https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136 -python3Packages.buildPythonApplication rec { +let + python3 = python38; +in python3.pkgs.buildPythonApplication rec { pname = "tts"; version = "0.1.2"; + # https://github.com/coqui-ai/TTS/issues/570 + disabled = python3.pythonAtLeast "3.9"; + src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; @@ -35,11 +39,11 @@ python3Packages.buildPythonApplication rec { sed -i -e 's!umap-learn==[^"]*!umap-learn!' requirements.txt ''; - nativeBuildInputs = with python3Packages; [ + nativeBuildInputs = with python3.pkgs; [ cython ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3.pkgs; [ anyascii coqpit flask @@ -69,11 +73,11 @@ python3Packages.buildPythonApplication rec { # cython modules are not installed for some reasons ( cd TTS/tts/layers/glow_tts/monotonic_align - ${python3Packages.python.interpreter} setup.py install --prefix=$out + ${python3.interpreter} setup.py install --prefix=$out ) ''; - checkInputs = with python3Packages; [ + checkInputs = with python3.pkgs; [ pytest-sugar pytestCheckHook ]; diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 74b80a51524..ab6b7d81221 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitLab , fetchpatch -, pythonPackages +, python38 , librsync , ncftp , gnupg @@ -13,6 +13,7 @@ , gettext }: let + pythonPackages = python38.pkgs; inherit (lib.versions) majorMinor splitVersion; majorMinorPatch = v: builtins.concatStringsSep "." (lib.take 3 (splitVersion v)); in diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index a89453b55f4..5253d7faa40 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { (name: value: "-DZSTD_${name}:BOOL=${if value then "ON" else "OFF"}") { BUILD_SHARED = !static; BUILD_STATIC = static; + BUILD_CONTRIB = true; PROGRAMS_LINK_SHARED = !static; LEGACY_SUPPORT = legacySupport; BUILD_TESTS = doCheck; @@ -62,12 +63,16 @@ stdenv.mkDerivation rec { ''; preInstall = '' + mkdir -p $bin/bin + cp contrib/pzstd/pzstd $bin/bin/pzstd substituteInPlace ../programs/zstdgrep \ --replace ":-grep" ":-${gnugrep}/bin/grep" \ --replace ":-zstdcat" ":-$bin/bin/zstdcat" substituteInPlace ../programs/zstdless \ --replace "zstdcat" "$bin/bin/zstdcat" + '' + lib.optionalString stdenv.isDarwin '' + install_name_tool -change @rpath/libzstd.1.dylib $out/lib/libzstd.1.dylib $bin/bin/pzstd ''; outputs = [ "bin" "dev" ] diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index 4618a9b3b79..f82b008e41d 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mtools"; - version = "4.0.31"; + version = "4.0.33"; src = fetchurl { url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2"; - sha256 = "11nm5mhsq700f3dzvzjpcik89cfcn38mb249yc0sjbwggwkrk2ak"; + sha256 = "0m5rx8djvg4jfvdgs4dxjkfd2na55wkdpid9xa32yc103s70zc8w"; }; patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index 8661740d807..cb4f3820bcc 100644 --- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "07c8vpzgwvqr9ycww1769ya40cf077c6igdg1b4akwszz2nw0bxq"; + sha256 = "0hlrbiy8xmccczi11ml0lzmg3946l9ck5wpfyw03wn5zgvx29zja"; }; nativeBuildInputs = [ doxygen graphviz pkg-config perl ]; diff --git a/pkgs/tools/filesystems/ubidump/default.nix b/pkgs/tools/filesystems/ubidump/default.nix index 6a6409ad325..bf141c8d94d 100644 --- a/pkgs/tools/filesystems/ubidump/default.nix +++ b/pkgs/tools/filesystems/ubidump/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ crcmod python-lzo ]; - phases = [ "unpackPhase" "patchPhase" "installPhase" "installCheckPhase" ]; + dontBuild = true; patchPhase = '' sed -i '1s;^;#!${python3.interpreter}\n;' ubidump.py diff --git a/pkgs/tools/graphics/ditaa/default.nix b/pkgs/tools/graphics/ditaa/default.nix index 79a24ed3841..a22f402b5d1 100644 --- a/pkgs/tools/graphics/ditaa/default.nix +++ b/pkgs/tools/graphics/ditaa/default.nix @@ -1,18 +1,18 @@ { lib, stdenv, fetchurl, jre }: stdenv.mkDerivation rec { - name = "ditaa-0.11.0"; + pname = "ditaa"; + version = "0.11.0"; src = fetchurl { - url = "https://github.com/stathissideris/ditaa/releases/download/v0.11.0/ditaa-0.11.0-standalone.jar"; + url = "https://github.com/stathissideris/ditaa/releases/download/v${version}/ditaa-${version}-standalone.jar"; sha256 = "1acnl7khz8aasg230nbsx9dyf8716scgb5l3679cb2bdzxisl64l"; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' - mkdir -p "$out/bin" - mkdir -p "$out/lib" + mkdir -p $out/bin $out/lib cp ${src} "$out/lib/ditaa.jar" diff --git a/pkgs/tools/graphics/lsix/default.nix b/pkgs/tools/graphics/lsix/default.nix new file mode 100644 index 00000000000..ba07e2886b5 --- /dev/null +++ b/pkgs/tools/graphics/lsix/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper, imagemagick }: + +stdenvNoCC.mkDerivation rec { + pname = "lsix"; + version = "1.7.4"; + + src = fetchFromGitHub { + owner = "hackerb9"; + repo = pname; + rev = version; + sha256 = "sha256-mOueSNhf1ywG4k1kRODBaWRjy0L162BAO1HRPaMMbFM="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -Dm755 lsix -t $out/bin + + runHook postInstall + ''; + + postFixup = '' + wrapProgram $out/bin/lsix \ + --prefix PATH : ${lib.makeBinPath [ imagemagick ]} + ''; + + meta = with lib; { + description = "Shows thumbnails in terminal using sixel graphics"; + homepage = "https://github.com/hackerb9/lsix"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ kidonng ]; + }; +} diff --git a/pkgs/tools/misc/bitwise/default.nix b/pkgs/tools/misc/bitwise/default.nix new file mode 100644 index 00000000000..a7ae6243f45 --- /dev/null +++ b/pkgs/tools/misc/bitwise/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, ncurses, readline, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "bitwise"; + version = "0.42"; + + src = fetchFromGitHub { + owner = "mellowcandle"; + repo = "bitwise"; + rev = "v${version}"; + sha256 = "154y0sn3z64z56k84ghsazkyihbkaz40hfwxcxdymnhvhh6m9f3g"; + }; + + buildInputs = [ ncurses readline ]; + nativeBuildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "Terminal based bitwise calculator in curses"; + homepage = "https://github.com/mellowcandle/bitwise"; + license = licenses.gpl3Only; + maintainers = [ maintainers.whonore ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index a0aed739c2a..fd289f9cfb8 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-dxNZk1pd6kfWgwbUmV5dqjTnhpHqYWGivupN8D+eBMU="; + sha256 = "sha256-EStR/tmbu95tptB7h3rHxoro87jlhu3i0XwRQNbIBvA="; }; vendorSha256 = "sha256-Geeo/tqF+VJamIzgU1qz0iEjTKE8jwFQLGXPBuN9eN8="; diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 20288bf3f5e..d097beca911 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.13.1"; + version = "2.14.1"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-6xSRsLM1DD1xMjOGzHMDVLibrJlu9lN9OoSV7B/WMT0="; + sha256 = "sha256-46azJ7q0Ix/8wdg01hYQ2V2E4tBD/NDdHpexnFBD5so="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-udz1EtPchEHxkvvVFnkwSOpFz4XEBGOXRz8qWREyzvc="; + cargoSha256 = "sha256-hCf6Ih2bJrMX2ntWbIrX3Dk8wI5tio+OcN4WNWuU7j4="; doCheck = false; diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index 97b98eea4f9..85055ccba5e 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "du-dust"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "sha256-15n8CpyyC41oJRrFlNHYXF5UjOyYPX93Zrq7jcU2DVM="; + sha256 = "sha256-SgTEawxuz9gRxSZ9edNz2NwfJWSAwxKXxDJVpU6oTBg="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-rqNj3EwszSIn2cMmslO6T3K5NxQJ9u56m37TU1GwtVI="; + cargoSha256 = "sha256-/kDF1ZOzu32Dwd5fWZGhMlEf65TAKLMPFu+ZnZxOAms="; doCheck = false; diff --git a/pkgs/tools/misc/elfcat/Cargo.lock b/pkgs/tools/misc/elfcat/Cargo.lock index e6c694bffb3..c5b48135993 100644 --- a/pkgs/tools/misc/elfcat/Cargo.lock +++ b/pkgs/tools/misc/elfcat/Cargo.lock @@ -4,4 +4,4 @@ version = 3 [[package]] name = "elfcat" -version = "0.1.3" +version = "0.1.4" diff --git a/pkgs/tools/misc/elfcat/default.nix b/pkgs/tools/misc/elfcat/default.nix index 38b1cc9b64f..a9691e43c6a 100644 --- a/pkgs/tools/misc/elfcat/default.nix +++ b/pkgs/tools/misc/elfcat/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "elfcat"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "ruslashev"; repo = pname; rev = version; - sha256 = "sha256-s56FyRoD2IhgdwEV63jMaB265CodHUlvmrWzmXAmonY="; + sha256 = "sha256-gh5JO3vO2FpHiZfaHOODPhRSB9HqZe1ir4g7UEkSUHY="; }; cargoLock.lockFile = ./Cargo.lock; diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/tools/misc/emv/default.nix index 1dbb5199f75..3e5a348c582 100644 --- a/pkgs/tools/misc/emv/default.nix +++ b/pkgs/tools/misc/emv/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "7e0e12afa45ef5ed8025e5f2c6deea0ff5f512644a721f7b1b95b63406a8f7ce"; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -pv $out/bin diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 7c7f91621b8..3fc6e96e228 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "esptool"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - sha256 = "1y022qlcdgdx5a88lkc3sqavklz494afbfyh100lp7xfk3f2mjln"; + sha256 = "sha256-GaGrV8L//pU4kt4HJmY88l5BNtT0IcZox7b24AFjPCI="; }; checkInputs = with python3.pkgs; @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "ESP8266 and ESP32 serial bootloader utility"; homepage = "https://github.com/espressif/esptool"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ dezgeg dotlambda ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/gibo/default.nix b/pkgs/tools/misc/gibo/default.nix index 70d0eb19ca8..6ee4698d750 100644 --- a/pkgs/tools/misc/gibo/default.nix +++ b/pkgs/tools/misc/gibo/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { sha256 = "07j3sv9ar9l074krajw8nfmsfmdp836irsbd053dbqk2v880gfm6"; }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - installPhase = '' mkdir -p $out/bin $out/share/bash-completion/completions cp gibo $out/bin diff --git a/pkgs/tools/misc/ix/default.nix b/pkgs/tools/misc/ix/default.nix index 83d8a770419..95b53c3b6cc 100644 --- a/pkgs/tools/misc/ix/default.nix +++ b/pkgs/tools/misc/ix/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; installPhase = '' install -Dm +x $src $out/bin/ix diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 8208459bc89..062b49e8bbd 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -34,8 +34,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_PROTOZERO=ON" ] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; - NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; - meta = with lib; { description = "OpenStreetMap data to PostgreSQL converter"; homepage = "https://osm2pgsql.org"; diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index 2cfbf5ae91a..1d15db02040 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + dontBuild = true; installPhase = '' make PREFIX="$out" install diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index 113c2b05ff5..b27aa32481c 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -1,20 +1,21 @@ -{ lib, stdenv, fetchurl, python3, texinfo, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, python3, texinfo, makeWrapper }: -stdenv.mkDerivation { - name = "ponysay-3.0.3"; +stdenv.mkDerivation rec { + name = "ponysay"; + version = "3.0.3"; - src = fetchurl { - url = "https://github.com/erkin/ponysay/archive/3.0.3.tar.gz"; - sha256 = "12mjabf5cpp5dgg63s19rlyq3dhhpzzy2sa439yncqzsk7rdg0n3"; + src = fetchFromGitHub { + owner = "erkin"; + repo = "ponysay"; + rev = version; + sha256 = "sha256-R2B0TU3ZSEncGsijKgvhaHIbcZa5Dx/jVPxrILBaoVw="; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ python3 texinfo ]; + buildInputs = [ python3 texinfo ]; inherit python3; - phases = "unpackPhase installPhase fixupPhase"; - installPhase = '' find -type f -name "*.py" | xargs sed -i "s@/usr/bin/env python3@$python3/bin/python3@g" substituteInPlace setup.py --replace \ @@ -25,11 +26,11 @@ stdenv.mkDerivation { --with-bash ''; - meta = { + meta = with lib; { description = "Cowsay reimplemention for ponies"; homepage = "https://github.com/erkin/ponysay"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ bodil ]; - platforms = with lib.platforms; unix; + license = licenses.gpl3; + maintainers = with maintainers; [ bodil ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 2f6ff216dc8..004bebaebbe 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "powerline-go"; - version = "1.21.0"; + version = "unstable-2021-07-15"; src = fetchFromGitHub { owner = "justjanne"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-IO3I5lvPdN73EF+S5Xo+TMEYaBtd1pOGMs+aQtRnHjE="; + rev = "f27435b26b5001c52ffb1aee454572c59494c81b"; + sha256 = "sha256-YB/WMprjXA5ZN6baT5nWahNj0xwbP8kzS7X/1tCwWiE="; }; vendorSha256 = "sha256-HYF6aKz+P241EKmupEoretadlrh9FBRx6nIER66jofg="; diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix index e98323b75ee..783bb9b5a38 100644 --- a/pkgs/tools/misc/pws/default.nix +++ b/pkgs/tools/misc/pws/default.nix @@ -1,15 +1,16 @@ { stdenv, lib, bundlerEnv, ruby, bundlerUpdateScript, xsel, makeWrapper }: stdenv.mkDerivation rec { - name = "pws-${(import ./gemset.nix).pws.version}"; + pname = "pws"; + version = (import ./gemset.nix).pws.version; nativeBuildInputs = [ makeWrapper ]; - phases = ["installPhase"]; + dontUnpack = true; installPhase = let env = bundlerEnv { - name = "${name}-gems"; + name = "${pname}-gems"; inherit ruby; diff --git a/pkgs/tools/misc/tfk8s/default.nix b/pkgs/tools/misc/tfk8s/default.nix index e6fc7bf3f7f..d9c9ad0451b 100644 --- a/pkgs/tools/misc/tfk8s/default.nix +++ b/pkgs/tools/misc/tfk8s/default.nix @@ -1,18 +1,18 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, callPackage }: buildGoModule rec { pname = "tfk8s"; - version = "0.1.4"; + version = "0.1.5"; tag = "v${version}"; src = fetchFromGitHub { owner = "jrhouston"; repo = "tfk8s"; rev = tag; - sha256 = "sha256-Ha/F8rCGZqFYqJzfemmKRyEBI5khaSIerJxvf2Pf2ao="; + sha256 = "sha256-T0zM2JOmzk8YyS3+De6yGwiwLgyb6Rwy6hT9b44wNxQ="; }; - vendorSha256 = "sha256-wS5diDQFkt8IAp13d8Yeh8ihLvKWdR0Mbw0fMZpqqKE="; + vendorSha256 = "sha256-eLPmghs05pMMtys97Ja7YGdVMZmMmiaFeMwzaWNxW0I="; runVend = true; buildFlagsArray = [ @@ -30,6 +30,10 @@ buildGoModule rec { $out/bin/tfk8s --version | grep ${tag} > /dev/null ''; + passthru.tests = { + sample1 = callPackage ./tests/sample1 { }; + }; + meta = with lib; { description = "An utility to convert Kubernetes YAML manifests to Terraform's HCL format"; license = licenses.mit; diff --git a/pkgs/tools/misc/tfk8s/tests/sample1/default.nix b/pkgs/tools/misc/tfk8s/tests/sample1/default.nix new file mode 100644 index 00000000000..6b06dbf3234 --- /dev/null +++ b/pkgs/tools/misc/tfk8s/tests/sample1/default.nix @@ -0,0 +1,11 @@ +{ runCommandCC, tfk8s }: + +runCommandCC "tfk8s-test-sample1" { + buildInputs = [ + tfk8s + ]; + meta.timeout = 60; + } + '' + cmp <(${tfk8s}/bin/tfk8s -f ${./input.yaml}) ${./output.tf} > $out + '' diff --git a/pkgs/tools/misc/tfk8s/tests/sample1/input.yaml b/pkgs/tools/misc/tfk8s/tests/sample1/input.yaml new file mode 100644 index 00000000000..58ed0eb11d7 --- /dev/null +++ b/pkgs/tools/misc/tfk8s/tests/sample1/input.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: test +data: + TEST: test diff --git a/pkgs/tools/misc/tfk8s/tests/sample1/output.tf b/pkgs/tools/misc/tfk8s/tests/sample1/output.tf new file mode 100644 index 00000000000..51d564400b5 --- /dev/null +++ b/pkgs/tools/misc/tfk8s/tests/sample1/output.tf @@ -0,0 +1,12 @@ +resource "kubernetes_manifest" "configmap_test" { + manifest = { + "apiVersion" = "v1" + "data" = { + "TEST" = "test" + } + "kind" = "ConfigMap" + "metadata" = { + "name" = "test" + } + } +} diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix index f69955020c7..d5dd47e0f66 100644 --- a/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/pkgs/tools/misc/ultrastar-manager/default.nix @@ -27,7 +27,8 @@ let in mkDerivation { name = "${src.name}-patched"; inherit src; - phases = [ "unpackPhase" "patchPhase" ]; + + dontInstall = true; patchPhase = with lib; '' # we don’t want prebuild binaries checked into version control! diff --git a/pkgs/tools/misc/yafetch/default.nix b/pkgs/tools/misc/yafetch/default.nix index 8dad93d0deb..5a082184400 100644 --- a/pkgs/tools/misc/yafetch/default.nix +++ b/pkgs/tools/misc/yafetch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "yafetch"; - version = "unstable-2021-06-15"; + version = "unstable-2021-07-18"; src = fetchFromGitLab { owner = "cyberkitty"; repo = pname; - rev = "423a7d1f1ef8f0e4caf586710828620d3cb593e3"; - sha256 = "184yy7i8ca2fh6d1rxyhxi9gqb57fpz7ia0i56dl1zhg769m8b99"; + rev = "f3efbca54df1ffea22cc40034114af141ccff9c1"; + sha256 = "1cxhrjy9vzq87rzql4dcknkwca7nydysp1p1x4fh1qfw79dfdmxw"; }; # Use the provided NixOS logo automatically diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index d55353682fd..c7889b15873 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-1GG3Bvw3P77dLhvJKwq48TUWMwg+bDgzWmtrw2JixLg="; + sha256 = "sha256-IcpCE9mqR7H1+gRhHyscvXhYHOynJFtOyrSr1FiMxFc="; }; - cargoSha256 = "sha256-cqm4QCGy6eTKtEBlE2ihmh93eO7d47zlCrLY8Gp0dxM="; + cargoSha256 = "sha256-22ggPs4iVOI1LKHtW5skfSO7J/FLF8EinvcyHVO14Dw="; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 184ba0862c5..5d539cc5697 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.13.3"; + version = "3.13.4"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "sha256-uIqnylq99P9M8nOuqkKl7fGIVfYO6cO0DAQ4eaC2qyY="; + sha256 = "0zlkr0r06w3y34nx174wyfwk69i2q0bcq88kfvb0j3d28fdh5p31"; }; - vendorSha256 = "sha256-LOnnvidUdDDhNPWM+o0Ef4NqRboi89s0DzDwuxi0nl8="; + vendorSha256 = "065n1vhj5003ay4pflp418w32s84jvza52lghj6cpcdzs0rwgc45"; outputs = [ "out" "wordlists" ]; diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 341e1c13335..8ba8109f266 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "corerad"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "1avbd0ldmzzkfay2pm6b88aln388cj8z7dzyw6i8m5k0lmmmmz9y"; + sha256 = "1xfqjxygf6r5wbf3brilx4d4hm0h518zaadmmzvkmbbz6w0fyl0k"; }; - vendorSha256 = "0cd6h5d4yjn86q296qp6lgxcykci1233s4s2fp8m0l3ywss69fck"; + vendorSha256 = "0ydyfdx9syrv719knwv64srfx4d1m9pzkivfc3q188bx5qx67pjw"; doCheck = false; diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/tools/networking/maphosts/default.nix index 8e3d0cf9160..6632485b709 100644 --- a/pkgs/tools/networking/maphosts/default.nix +++ b/pkgs/tools/networking/maphosts/default.nix @@ -7,9 +7,10 @@ let gemdir = ./.; }; in stdenv.mkDerivation { - name = "maphosts-${env.gems.maphosts.version}"; + pname = "maphosts"; + version = env.gems.maphosts.version; - phases = ["installPhase"]; + dontUnpack = true; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index b195c655c93..34d2c22fb24 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -15,7 +15,7 @@ let this = stdenv.mkDerivation rec { sha256 = "06dvy4pwgpyf209n0b27qwkjj7zlgadg2czwxapy94fd1wpq9yb2"; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' runHook preInstall diff --git a/pkgs/tools/networking/openapi-generator-cli/unstable.nix b/pkgs/tools/networking/openapi-generator-cli/unstable.nix index 306654f05d9..33eb33e10b0 100644 --- a/pkgs/tools/networking/openapi-generator-cli/unstable.nix +++ b/pkgs/tools/networking/openapi-generator-cli/unstable.nix @@ -15,7 +15,7 @@ let this = stdenv.mkDerivation rec { sha256 = "1ji3yw9dp4srlgqxvb21vrcp2bzj4himxsmp8l8zid9nxsc1m71x"; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' runHook preInstall diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 0c0bc370526..8d8069bec29 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -17,15 +17,13 @@ stdenv.mkDerivation rec { pname = "gtk-gnutella"; - # NOTE: Please remove hardeningDisable on the next release, see: - # https://sourceforge.net/p/gtk-gnutella/bugs/555/#5c19 - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "gtk-gnutella"; repo = "gtk-gnutella"; rev = "v${version}"; - sha256 = "0j596dpajk68bkry0gmpqawsi61rphfciy4vji1dh890jyhkhdgy"; + sha256 = "sha256-Hk5KPXSJ2s0J/stW3Qgvu6p6RG5VCvuWx1UlMR+3JO4="; }; nativeBuildInputs = [ @@ -54,8 +52,6 @@ stdenv.mkDerivation rec { ++ lib.optionals (!enableGui) [ "--topless" ] ; - hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ]; - enableParallelBuilding = true; postInstall = '' diff --git a/pkgs/tools/networking/stevenblack-blocklist/default.nix b/pkgs/tools/networking/stevenblack-blocklist/default.nix index ebbaaa73fce..ddccc9ac635 100644 --- a/pkgs/tools/networking/stevenblack-blocklist/default.nix +++ b/pkgs/tools/networking/stevenblack-blocklist/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "3.7.13"; + version = "3.8.2"; in fetchFromGitHub { name = "stevenblack-blocklist-${version}"; @@ -9,7 +9,7 @@ fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; rev = version; - sha256 = "sha256-nSajiRDpcFp3MwnQPnoBVB/OWnhVqkeSmS7OBrfhMnw="; + sha256 = "sha256-rkyAF1/kPI34nZ57Hqg8QivK0YERZ54jZ1HQ5oXYgxc="; meta = with lib; { description = "Unified hosts file with base extensions"; diff --git a/pkgs/tools/networking/userhosts/default.nix b/pkgs/tools/networking/userhosts/default.nix new file mode 100644 index 00000000000..6cec402638a --- /dev/null +++ b/pkgs/tools/networking/userhosts/default.nix @@ -0,0 +1,23 @@ +{lib, stdenv, fetchFromGitHub, pkg-config, ncurses, libnl }: + +stdenv.mkDerivation rec { + pname = "userhosts"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "figiel"; + repo = "hosts"; + rev = "v${version}"; + hash = "sha256-9uF0fYl4Zz/Ia2UKx7CBi8ZU8jfWoBfy2QSgTSwXo5A"; + }; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "A libc wrapper providing per-user hosts file"; + homepage = "https://github.com/figiel/hosts"; + maintainers = [ maintainers.bobvanderlinden ]; + license = licenses.cc0; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/nix/nar-serve/default.nix b/pkgs/tools/nix/nar-serve/default.nix index 146165d880d..1d7fd6beb4a 100644 --- a/pkgs/tools/nix/nar-serve/default.nix +++ b/pkgs/tools/nix/nar-serve/default.nix @@ -1,24 +1,19 @@ { buildGoModule , fetchFromGitHub , lib - }: -let - pname = "nar-serve"; - version = "0.3.0"; - -in buildGoModule rec { - inherit pname version; + pname = "nar-serve"; + version = "0.4.0"; src = fetchFromGitHub { owner = "numtide"; repo = "nar-serve"; rev = "v${version}"; - sha256 = "000xxrar5ngrqqfi7ynx84i6wi27mirgm26brhyg0y4pygc9ykhz"; + hash = "sha256-h/pzKRXgcGTpr1YUKppDa+iTLKak/PGhbYa8ZczWj1U="; }; - vendorSha256 = "0qkzbr85wkx3r7qgnzg9pdl7vsli10bzcdbj2gqd1kdzwb8khszs"; + vendorSha256 = "sha256-eW+cul/5qJocpKV/6azxj7HTmkezDw6dNubPtAOP5HU="; doCheck = false; diff --git a/pkgs/tools/nix/nix-script/default.nix b/pkgs/tools/nix/nix-script/default.nix index a755d933219..f9077ef1387 100644 --- a/pkgs/tools/nix/nix-script/default.nix +++ b/pkgs/tools/nix/nix-script/default.nix @@ -15,13 +15,20 @@ stdenv.mkDerivation { (haskellPackages.ghcWithPackages (hs: with hs; [ posix-escape ])) ]; - phases = [ "buildPhase" "installPhase" "fixupPhase" ]; buildPhase = '' + runHook preBuild + mkdir -p $out/bin ghc -O2 $src/nix-script.hs -o $out/bin/nix-script -odir . -hidir . + + runHook postBuild ''; installPhase = '' + runHook preInstall + ln -s $out/bin/nix-script $out/bin/nix-scripti + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix index 662be6a0978..5936429c7a4 100644 --- a/pkgs/tools/package-management/nix-prefetch/default.nix +++ b/pkgs/tools/package-management/nix-prefetch/default.nix @@ -2,10 +2,7 @@ , docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk , gnugrep, gnused, jq, nix }: -let - binPath = lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ]; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "nix-prefetch"; version = "0.4.1"; @@ -55,7 +52,7 @@ in stdenv.mkDerivation rec { install -Dm555 -t $lib src/*.sh install -Dm444 -t $lib lib/* makeWrapper $lib/main.sh $out/bin/${pname} \ - --prefix PATH : ${binPath} + --prefix PATH : ${lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ]} installManPage doc/nix-prefetch.? @@ -69,7 +66,7 @@ in stdenv.mkDerivation rec { description = "Prefetch any fetcher function call, e.g. package sources"; license = licenses.mit; maintainers = with maintainers; [ msteen ]; - inherit (src.meta) homepage; + homepage = "https://github.com/msteen/nix-prefetch"; platforms = platforms.all; }; } diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix index f56222f403a..13c254cbee2 100644 --- a/pkgs/tools/package-management/nix-template/default.nix +++ b/pkgs/tools/package-management/nix-template/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, rustPlatform, fetchFromGitHub +, installShellFiles , makeWrapper , nix , openssl @@ -8,18 +9,24 @@ rustPlatform.buildRustPackage rec { pname = "nix-template"; - version = "0.1.1"; + version = "0.1.4"; src = fetchFromGitHub { + name = "${pname}-${version}-src"; owner = "jonringer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A1b/fgSr27sfMDnTi4R3PUZfhAdLA5wUOd4yh9/4Bnk="; + sha256 = "sha256-kNFhSfHUYBUOCXoD6m7thMho4tOIpRHfHGcsW8FTgkc="; }; - cargoSha256 = "sha256-resyY/moqLo4KWOKUvFJiOWealCmcEsLFgkN12slKN0="; + cargoSha256 = "sha256-7PthFLCEt+E/Gx5//aulHYYBKZqapNEWKtKfRlDr3Pw="; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + pkg-config + ]; - nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; @@ -27,6 +34,11 @@ rustPlatform.buildRustPackage rec { postInstall = '' wrapProgram $out/bin/nix-template \ --prefix PATH : ${lib.makeBinPath [ nix ]} + + installShellCompletion --cmd nix-template \ + --bash <($out/bin/nix-template completions bash) \ + --fish <($out/bin/nix-template completions fish) \ + --zsh <($out/bin/nix-template completions zsh) ''; meta = with lib; { diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 6ba5135fdd6..e60cf580426 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -193,38 +193,57 @@ common = preBuild = "unset NIX_INDENT_MAKE"; }); + inherit boehmgc; }; }; in nix; + boehmgc_nix = boehmgc.override { + enableLargeConfig = true; + }; + + boehmgc_nixUnstable = boehmgc_nix.overrideAttrs (drv: { + patches = (drv.patches or []) ++ [ + # Part of the GC solution in https://github.com/NixOS/nix/pull/4944 + (fetchpatch { + url = https://github.com/hercules-ci/nix/raw/5c58d84a76d96f269e3ff1e72c9c9ba5f68576af/boehmgc-coroutine-sp-fallback.diff; + sha256 = "sha256-JvnWVTlkltmQUs/0qApv/LPZ690UX1/2hEP+LYRwKbI="; + }) + ]; + }); + in rec { nix = nixStable; nixStable = callPackage common (rec { pname = "nix"; - version = "2.3.12"; + version = "2.3.14"; src = fetchurl { url = "https://nixos.org/releases/nix/${pname}-${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ITp9ScRhB5syNh5NAI0kjX9o400syTR/Oo/5Ap+a+10="; + sha256 = "sha256-cToMnZU3+UpjeiiXnG3clz9zn8Xk+TbB7UbqmLMrlFk="; }; - inherit storeDir stateDir confDir boehmgc; + boehmgc = boehmgc_nix; + + inherit storeDir stateDir confDir; }); nixUnstable = lib.lowPrio (callPackage common rec { pname = "nix"; version = "2.4${suffix}"; - suffix = "pre20210601_5985b8b"; + suffix = "pre20210707_02dd6bb"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "5985b8b5275605ddd5e92e2f0a7a9f494ac6e35d"; - sha256 = "sha256-2So7ZsD8QJlOXCYqdoj8naNgBw6O4Vw1MM2ORsaqlXc="; + rev = "02dd6bb610e55a009cd7a4c83639698d3a7acaa2"; + sha256 = "sha256-ARRiLrDOK+JQtvVXsYegspENYimQzilvdTfO7eiBuaA="; }; - inherit storeDir stateDir confDir boehmgc; + boehmgc = boehmgc_nixUnstable; + + inherit storeDir stateDir confDir; }); diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index ba4844d9ed1..bd3057896f6 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-07-17"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-33Jv6sGJDguXOn2iiq3KpEPe4+LexDwwcY6P8AWbpVg="; + sha256 = "sha256-WjCayhpWeZ19DygKNLfwE5OGi4sQI+I+j3BMLuce9Z4="; }; installPhase = '' diff --git a/pkgs/tools/security/ossec/default.nix b/pkgs/tools/security/ossec/default.nix index 22374e1d302..b86cb57bbde 100644 --- a/pkgs/tools/security/ossec/default.nix +++ b/pkgs/tools/security/ossec/default.nix @@ -1,18 +1,16 @@ { lib, stdenv, fetchurl, which }: -stdenv.mkDerivation { - name = "ossec-client-2.6"; +stdenv.mkDerivation rec { + pname = "ossec-client"; + version = "2.6"; src = fetchurl { - url = "https://www.ossec.net/files/ossec-hids-2.6.tar.gz"; - + url = "https://www.ossec.net/files/ossec-hids-${version}.tar.gz"; sha256 = "0k1b59wdv9h50gbyy88qw3cnpdm8hv0nrl0znm92h9a11i5b39ip"; }; buildInputs = [ which ]; - phases = [ "unpackPhase" "patchPhase" "buildPhase" ]; - patches = [ ./no-root.patch ]; buildPhase = '' @@ -30,11 +28,12 @@ yes " | ./install.sh ''; - meta = { + meta = with lib; { description = "Open source host-based instrusion detection system"; homepage = "https://www.ossec.net"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/quill/default.nix b/pkgs/tools/security/quill/default.nix new file mode 100644 index 00000000000..74c7996a896 --- /dev/null +++ b/pkgs/tools/security/quill/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub, openssl, Security, libiconv, pkg-config, protobuf, which, buildPackages }: + +rustPlatform.buildRustPackage rec { + pname = "quill"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "dfinity"; + repo = "quill"; + rev = "v${version}"; + sha256 = "02ga2xkdxs36mfr4lv43cy6wkf27c28bdkzfkp3az5jvyk17mkfr"; + }; + + ic = fetchFromGitHub { + owner = "dfinity"; + repo = "ic"; + rev = "779549eccfcf61ac702dfc2ee6d76ffdc2db1f7f"; + sha256 = "1r31d5hab7k1n60a7y8fw79fjgfq04cgj9krwa6r9z4isi3919v6"; + }; + + registry = "file://local-registry"; + + preBuild = '' + export REGISTRY_TRANSPORT_PROTO_INCLUDES=${ic}/rs/registry/transport/proto + export IC_BASE_TYPES_PROTO_INCLUDES=${ic}/rs/types/base_types/proto + export IC_PROTOBUF_PROTO_INCLUDES=${ic}/rs/protobuf/def + export IC_NNS_COMMON_PROTO_INCLUDES=${ic}/rs/nns/common/proto + export PROTOC=${buildPackages.protobuf}/bin/protoc + export OPENSSL_DIR=${openssl.dev} + export OPENSSL_LIB_DIR=${openssl.out}/lib + ''; + + cargoSha256 = "142pzhyi73ljlqas5vbhjhn4vmp9w9ps1mv8q7s3kzg0h7jcvm1k"; + + nativeBuildInputs = [ pkg-config protobuf ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; + + meta = with lib; { + homepage = "https://github.com/dfinity/quill"; + changelog = "https://github.com/dfinity/quill/releases/tag/v${version}"; + description = "Minimalistic ledger and governance toolkit for cold wallets on the Internet Computer."; + license = licenses.asl20; + maintainers = with maintainers; [ imalison ]; + }; +} diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index eec82712c8c..959712488a2 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -11,11 +11,11 @@ python3Packages.buildPythonApplication rec { pname = "sshuttle"; - version = "1.0.3"; + version = "1.0.5"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0fff1c88669a20bb6a4e7331960673a3a02a2e04ff163e4c9299496646edcf61"; + sha256 = "fd8c691aac2cb80933aae7f94d9d9e271a820efc5c48e73408f1a90da426a1bd"; }; patches = [ ./sudo.patch ]; @@ -27,6 +27,8 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper python3Packages.setuptools-scm ]; + propagatedBuildInputs = [ python3Packages.psutil ]; + checkInputs = with python3Packages; [ mock pytestCheckHook flake8 ]; postInstall = '' @@ -42,7 +44,7 @@ python3Packages.buildPythonApplication rec { target network (though it does require Python 2.7, Python 3.5 or later at both ends). Works with Linux and Mac OS and supports DNS tunneling. ''; - license = licenses.gpl2; + license = licenses.lgpl21; maintainers = with maintainers; [ domenkozar carlosdagos ]; }; } diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index a13eec71eb8..c91a83c0a0d 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -5,20 +5,27 @@ buildGoModule rec { pname = "step-cli"; - version = "0.15.16"; + version = "0.16.1"; src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-/HqCG3LscwogLXvZlL2CVo2Pj1hVRnOMPCmG1hxrG/I="; + sha256 = "sha256-gMXvHPqWvaZmzWiWrxlknaMkUraS64yrKl+RzAF7c4I="; }; + ldflags = [ + "-w" + "-s" + "-X main.Version=${version}" + ]; + preCheck = '' # Tries to connect to smallstep.com rm command/certificate/remote_test.go ''; - vendorSha256 = "sha256-plQgIqs6QUbzndn8C0ByKceGtz/JxZ1Rx0fXWHNJ0kM="; + + vendorSha256 = "sha256-WF2UD0LwzCMkoW1EfcjV+9ZboPp1oWhmsSEryj13Kg0="; meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; diff --git a/pkgs/tools/system/collectd/data.nix b/pkgs/tools/system/collectd/data.nix index 378eb62d6cc..3867bd6bb3d 100644 --- a/pkgs/tools/system/collectd/data.nix +++ b/pkgs/tools/system/collectd/data.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "collectd-data"; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/share/collectd diff --git a/pkgs/tools/system/fakechroot/default.nix b/pkgs/tools/system/fakechroot/default.nix index fb56350aa72..382a47039ba 100644 --- a/pkgs/tools/system/fakechroot/default.nix +++ b/pkgs/tools/system/fakechroot/default.nix @@ -21,6 +21,24 @@ stdenv.mkDerivation rec { # and are uninteresting as well as unimportant for our purposes (since NEWS never leaves the build env). excludes = [ "NEWS.md" ]; }) + + # glibc 2.33 compat (https://github.com/dex4er/fakechroot/pull/85/) + (fetchpatch { + url = "https://github.com/dex4er/fakechroot/commit/534e6d555736b97211523970d378dfb0db2608e9.patch"; + sha256 = "sha256-bUlGJZvOSrATPt8bxGqU1UETTUD9V/HhJyA5ZxsOLQU="; + }) + (fetchpatch { + url = "https://github.com/dex4er/fakechroot/commit/75d7e6fa191c11a791faff06a0de86eaa7801d05.patch"; + sha256 = "sha256-vWN7zFkKlBd/F+h/66z21RiZqkSCn3UIzy9NHV7TYDg="; + }) + (fetchpatch { + url = "https://github.com/dex4er/fakechroot/commit/693a3597ea7fccfb62f357503ff177bd3e3d5a89.patch"; + sha256 = "sha256-bFXsT0hWocJFbtS1cpzo7oIy/x66iUw6QE1/cEoZ+3k="; + }) + (fetchpatch { + url = "https://github.com/dex4er/fakechroot/commit/e7c1f3a446e594a4d0cce5f5d499c9439ce1d5c5.patch"; + sha256 = "sha256-eX6kB4U1ZlXoRtkSVEIBTRjO/cTS/7z5a9S366DiRMg="; + }) ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index 0e4f51c7ea6..bf42e987c4d 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -9,7 +9,23 @@ stdenv.mkDerivation rec { sha256 = "1xpl0s2yjyjwlf832b6kbkaa5921liybaar13k7n45ckd9lxd700"; }; - patches = lib.optional stdenv.isLinux ./einval.patch + patches = lib.optionals stdenv.isLinux [ + ./einval.patch + + # glibc 2.33 patches from ArchLinux + (fetchpatch { + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-1.patch"; + sha256 = "sha256-F6BcxYInSLu7Fxg6OmMZDhTWoLqsc//yYPlTZqQQl68="; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-2.patch"; + sha256 = "sha256-ifpJxhk6MyQpFolC1hIAAUjcHmOHVU1D25tRwpu2S/k="; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-3.patch"; + sha256 = "sha256-o2Xm4C64Ny9TL8fjsZltjO1CdJ4VGwqZ+LnufVL5Sq8="; + }) + ] # patchset from brew ++ lib.optionals stdenv.isDarwin [ (fetchpatch { diff --git a/pkgs/tools/text/ledger2beancount/default.nix b/pkgs/tools/text/ledger2beancount/default.nix index b3f48085d1d..12fe3a9c9e0 100644 --- a/pkgs/tools/text/ledger2beancount/default.nix +++ b/pkgs/tools/text/ledger2beancount/default.nix @@ -26,11 +26,7 @@ in stdenv.mkDerivation rec { sha256 = "0kimp8l9ax37grfv5r5iw0g0xnrpkak022fl10y3i7kc4nyi1s99"; }; - phases = [ - "unpackPhase" - "installPhase" - "fixupPhase" - ]; + dontBuild = true; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perlPackages.perl beancount ] ++ perlDeps; diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix index 57e79b08fda..c3d005a97e0 100644 --- a/pkgs/tools/text/papertrail/default.nix +++ b/pkgs/tools/text/papertrail/default.nix @@ -11,7 +11,7 @@ let in stdenv.mkDerivation { name = "papertrail-${(import ./gemset.nix).papertrail.version}"; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix index b37928fc7c5..3af64e39ed1 100644 --- a/pkgs/tools/text/reckon/default.nix +++ b/pkgs/tools/text/reckon/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "reckon"; version = (import ./gemset.nix).reckon.version; - phases = [ "installPhase" ]; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/wayland/wayland-utils/default.nix b/pkgs/tools/wayland/wayland-utils/default.nix index 5c07081099c..16bce1723aa 100644 --- a/pkgs/tools/wayland/wayland-utils/default.nix +++ b/pkgs/tools/wayland/wayland-utils/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, meson, pkg-config, ninja +, meson, pkg-config, ninja, wayland-scanner , wayland, wayland-protocols }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1h38l850ww6hxjb1l8iwa33nkbz8q88bw6lh0aryjyp8b16crzk4"; }; - nativeBuildInputs = [ meson pkg-config ninja wayland ]; + nativeBuildInputs = [ meson pkg-config ninja wayland-scanner ]; buildInputs = [ wayland wayland-protocols ]; meta = with lib; { diff --git a/pkgs/tools/wayland/wev/default.nix b/pkgs/tools/wayland/wev/default.nix index 69288a1bc8c..d04cee342b7 100644 --- a/pkgs/tools/wayland/wev/default.nix +++ b/pkgs/tools/wayland/wev/default.nix @@ -3,6 +3,7 @@ , fetchFromSourcehut , pkg-config , scdoc +, wayland-scanner , wayland , wayland-protocols , libxkbcommon @@ -19,8 +20,8 @@ stdenv.mkDerivation rec { sha256 = "0l71v3fzgiiv6xkk365q1l08qvaymxd4kpaya6r2g8yzkr7i2hms"; }; - nativeBuildInputs = [ pkg-config scdoc wayland ]; - buildInputs = [ wayland-protocols libxkbcommon ]; + nativeBuildInputs = [ pkg-config scdoc wayland-scanner ]; + buildInputs = [ wayland wayland-protocols libxkbcommon ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/wayland/wlsunset/default.nix b/pkgs/tools/wayland/wlsunset/default.nix index 3572f63f57e..7ced81616f6 100644 --- a/pkgs/tools/wayland/wlsunset/default.nix +++ b/pkgs/tools/wayland/wlsunset/default.nix @@ -1,5 +1,6 @@ -{ lib, stdenv, fetchFromSourcehut, meson, pkg-config, ninja, wayland, scdoc -, wayland-protocols +{ lib, stdenv, fetchFromSourcehut +, meson, pkg-config, ninja, wayland-scanner, scdoc +, wayland, wayland-protocols }: stdenv.mkDerivation rec { @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0hhsddh3rs066rbsjksr8kcwg8lvglbvs67dq0r5wx5c1xcwb51w"; }; - nativeBuildInputs = [ meson pkg-config ninja wayland scdoc ]; + nativeBuildInputs = [ meson pkg-config ninja wayland-scanner scdoc ]; buildInputs = [ wayland wayland-protocols ]; meta = with lib; { diff --git a/pkgs/tools/wayland/wob/default.nix b/pkgs/tools/wayland/wob/default.nix index 3567ed6eea4..07fd6f433d7 100644 --- a/pkgs/tools/wayland/wob/default.nix +++ b/pkgs/tools/wayland/wob/default.nix @@ -5,9 +5,10 @@ , ninja , pkg-config , scdoc -, libseccomp -, wayland # wayland-scanner +, wayland-scanner +, wayland , wayland-protocols +, libseccomp }: stdenv.mkDerivation rec { @@ -21,8 +22,8 @@ stdenv.mkDerivation rec { sha256 = "13mx6nzab6msp57s9mv9ambz53a4zkafms9v97xv5zvd6xarnrya"; }; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland ]; - buildInputs = [ wayland-protocols ] + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; + buildInputs = [ wayland wayland-protocols ] ++ lib.optional stdenv.isLinux libseccomp; mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled"; diff --git a/pkgs/tools/wayland/wshowkeys/default.nix b/pkgs/tools/wayland/wshowkeys/default.nix index d46678dbc9f..00dc1d74910 100644 --- a/pkgs/tools/wayland/wshowkeys/default.nix +++ b/pkgs/tools/wayland/wshowkeys/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromSourcehut -, meson, pkg-config, wayland, ninja -, cairo, libinput, pango, wayland-protocols, libxkbcommon +, meson, pkg-config, wayland-scanner, ninja +, cairo, libinput, pango, wayland, wayland-protocols, libxkbcommon }: let @@ -17,8 +17,8 @@ in stdenv.mkDerivation rec { sha256 = "10kafdja5cwbypspwhvaxjz3hvf51vqjzbgdasl977193cvxgmbs"; }; - nativeBuildInputs = [ meson pkg-config wayland ninja ]; - buildInputs = [ cairo libinput pango wayland-protocols libxkbcommon ]; + nativeBuildInputs = [ meson pkg-config wayland-scanner ninja ]; + buildInputs = [ cairo libinput pango wayland wayland-protocols libxkbcommon ]; meta = with lib; { description = "Displays keys being pressed on a Wayland session"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5024a4d8d3..44319d78c81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1253,6 +1253,8 @@ in betterdiscord-installer = callPackage ../tools/misc/betterdiscord-installer { }; + bitwise = callPackage ../tools/misc/bitwise { }; + brakeman = callPackage ../development/tools/analysis/brakeman { }; brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ; @@ -1644,6 +1646,8 @@ in lesspass-cli = callPackage ../tools/security/lesspass-cli { }; + lsix = callPackage ../tools/graphics/lsix { }; + mpdevil = callPackage ../applications/audio/mpdevil { }; pacparser = callPackage ../tools/networking/pacparser { }; @@ -3218,6 +3222,8 @@ in rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { }; + rm-improved = callPackage ../applications/misc/rm-improved { }; + remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { }; restream = callPackage ../applications/misc/remarkable/restream { }; @@ -4319,9 +4325,7 @@ in duplicati = callPackage ../tools/backup/duplicati { }; - duplicity = callPackage ../tools/backup/duplicity { - pythonPackages = python3Packages; - }; + duplicity = callPackage ../tools/backup/duplicity { }; duply = callPackage ../tools/backup/duply { }; @@ -4819,10 +4823,6 @@ in flamerobin = callPackage ../applications/misc/flamerobin { }; - flashtool = pkgsi686Linux.callPackage ../development/mobile/flashtool { - inherit (androidenv.androidPkgs_9_0) platform-tools; - }; - flashrom = callPackage ../tools/misc/flashrom { }; flent = python3Packages.callPackage ../applications/networking/flent { }; @@ -9246,6 +9246,8 @@ in teler = callPackage ../tools/security/teler { }; + telescope = callPackage ../applications/networking/browsers/telescope { }; + termius = callPackage ../applications/networking/termius { }; termplay = callPackage ../tools/misc/termplay { }; @@ -9580,7 +9582,7 @@ in unrtf = callPackage ../tools/text/unrtf { }; - unrpa = with python3Packages; toPythonApplication unrpa; + unrpa = with python38Packages; toPythonApplication unrpa; untex = callPackage ../tools/text/untex { }; @@ -9882,9 +9884,7 @@ in tftp-hpa = callPackage ../tools/networking/tftp-hpa {}; - tigervnc = callPackage ../tools/admin/tigervnc { - fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ]; - }; + tigervnc = callPackage ../tools/admin/tigervnc {}; tightvnc = callPackage ../tools/admin/tightvnc { fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc @@ -12585,7 +12585,7 @@ in # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md python = python2; python2 = python27; - python3 = python38; + python3 = python39; pypy = pypy2; pypy2 = pypy27; pypy3 = pypy37; @@ -12809,8 +12809,6 @@ in wasm3 = callPackage ../development/interpreters/wasm3 { }; - proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { }; - ### DEVELOPMENT / MISC @@ -13206,6 +13204,8 @@ in buildkite-agent2 = throw "pkgs.buildkite-agent2 has been discontinued. Please use pkgs.buildkite-agent (v3.x)"; buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent { }; + buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { }; + buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { }; bump = callPackage ../development/tools/github/bump { }; @@ -13791,6 +13791,8 @@ in khronos-ocl-icd-loader = callPackage ../development/libraries/khronos-ocl-icd-loader { }; + ko = callPackage ../development/tools/ko { }; + krankerl = callPackage ../development/tools/krankerl { }; krew = callPackage ../development/tools/krew { }; @@ -17096,7 +17098,9 @@ in libtifiles2 = callPackage ../development/libraries/libtifiles2 { }; - libtiff = callPackage ../development/libraries/libtiff { }; + libtiff = if stdenv.isDarwin && stdenv.isAarch64 + then callPackage ../development/libraries/libtiff/aarch64-darwin.nix { } + else callPackage ../development/libraries/libtiff { }; libtiger = callPackage ../development/libraries/libtiger { }; @@ -18100,6 +18104,10 @@ in quicksynergy = callPackage ../applications/misc/quicksynergy { }; + quill = callPackage ../tools/security/quill { + inherit (darwin.apple_sdk.frameworks) Security; + }; + qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray {}; qwt = callPackage ../development/libraries/qwt {}; @@ -19222,14 +19230,14 @@ in ### DEVELOPMENT / PERL MODULES perlInterpreters = callPackages ../development/interpreters/perl {}; - inherit (perlInterpreters) perl530 perl532 perldevel; + inherit (perlInterpreters) perl532 perl534 perldevel; - perl530Packages = recurseIntoAttrs perl530.pkgs; perl532Packages = recurseIntoAttrs perl532.pkgs; + perl534Packages = recurseIntoAttrs perl534.pkgs; perldevelPackages = perldevel.pkgs; - perl = perl532; - perlPackages = perl532Packages; + perl = perl534; + perlPackages = perl534Packages; ack = perlPackages.ack; @@ -21941,6 +21949,8 @@ in usbutils = callPackage ../os-specific/linux/usbutils { }; + userhosts = callPackage ../tools/networking/userhosts { }; + usermount = callPackage ../os-specific/linux/usermount { }; util-linux = if stdenv.isLinux then callPackage ../os-specific/linux/util-linux { } @@ -23439,7 +23449,7 @@ in confclerk = callPackage ../applications/misc/confclerk { }; - copyq = libsForQt514.callPackage ../applications/misc/copyq { }; + copyq = libsForQt5.callPackage ../applications/misc/copyq { }; corectrl = libsForQt5.callPackage ../applications/misc/corectrl { }; @@ -24840,6 +24850,8 @@ in cairo = cairo.override { xcbSupport = true; }; }; + i3lock-blur = callPackage ../applications/window-managers/i3/lock-blur.nix { }; + i3lock-color = callPackage ../applications/window-managers/i3/lock-color.nix { }; i3lock-fancy = callPackage ../applications/window-managers/i3/lock-fancy.nix { }; @@ -28523,6 +28535,8 @@ in dogecoin = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; }; dogecoind = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = false; }; + eclair = callPackage ../applications/blockchains/eclair.nix { }; + electrs = callPackage ../applications/blockchains/electrs.nix { }; elements = libsForQt5.callPackage ../applications/blockchains/elements.nix { miniupnpc = miniupnpc_2; withGui = true; }; @@ -31157,7 +31171,6 @@ in inherit (callPackage ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; - boehmgc = boehmgc.override { enableLargeConfig = true; }; inherit (darwin.apple_sdk.frameworks) Security; }) nix diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 6a189c0005a..06d7693006b 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -296,7 +296,10 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz"; }; - phases = [ "unpackPhase" "installPhase" ]; + # configurePhase breaks the binary and results in + # `File does not contain a valid CIL image.` + dontConfigure = true; + dontBuild = true; outputFiles = [ "*" ]; dllFiles = [ "NuGet*.dll" ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ff35e523146..6124fc5859e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1328,12 +1328,12 @@ let propagatedBuildInputs = [ CarpClan ]; }; - BKeywords = buildPerlPackage { + BKeywords = buildPerlPackage rec { pname = "B-Keywords"; - version = "1.21"; + version = "1.22"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.21.tar.gz"; - sha256 = "12481z1z1nyrjlkizzqn4cdmcrfjkc3hvxppqipsf6r5gnffh9as"; + url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-${version}.tar.gz"; + sha256 = "0i2ksp0w9wv1qc22hrdl3k48cww64syhmv8zf6x0kgyd4081hr56"; }; meta = { description = "Lists of reserved barewords and symbol names"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7a21ad59ce4..8eeeca1c66b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5267,6 +5267,8 @@ in { openapi-core = callPackage ../development/python-modules/openapi-core { }; + parameterizedtestcase = callPackage ../development/python-modules/parameterizedtestcase { }; + pdunehd = callPackage ../development/python-modules/pdunehd { }; phonopy = callPackage ../development/python-modules/phonopy { }; @@ -6180,6 +6182,8 @@ in { pyls-spyder = callPackage ../development/python-modules/pyls-spyder { }; + pylsp-mypy = callPackage ../development/python-modules/pylsp-mypy { }; + PyLTI = callPackage ../development/python-modules/pylti { }; pylutron = callPackage ../development/python-modules/pylutron { }; |