diff options
412 files changed, 9819 insertions, 3183 deletions
diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md index 5dd415852c100..b6525490c85e7 100644 --- a/doc/languages-frameworks/qt.section.md +++ b/doc/languages-frameworks/qt.section.md @@ -1,77 +1,88 @@ # Qt {#sec-language-qt} -This section describes the differences between Nix expressions for Qt libraries and applications and Nix expressions for other C++ software. Some knowledge of the latter is assumed. +Writing Nix expressions for Qt libraries and applications is largely similar as for other C++ software. +This section assumes some knowledge of the latter. +There are two problems that the Nixpkgs Qt infrastructure addresses, +which are not shared by other C++ software: -There are primarily two problems which the Qt infrastructure is designed to address: ensuring consistent versioning of all dependencies and finding dependencies at runtime. +1. There are usually multiple supported versions of Qt in Nixpkgs. + All of a package's dependencies must be built with the same version of Qt. + This is similar to the version constraints imposed on interpreted languages like Python. +2. Qt makes extensive use of runtime dependency detection. + Runtime dependencies are made into build dependencies through wrappers. ## Nix expression for a Qt package (default.nix) {#qt-default-nix} ```{=docbook} <programlisting> -{ mkDerivation, qtbase }: <co xml:id='qt-default-nix-co-1' /> +{ stdenv, lib, qtbase, wrapQtAppsHook }: <co xml:id='qt-default-nix-co-1' /> -mkDerivation { <co xml:id='qt-default-nix-co-2' /> +stdenv.mkDerivation { pname = "myapp"; version = "1.0"; - buildInputs = [ qtbase ]; <co xml:id='qt-default-nix-co-3' /> + buildInputs = [ qtbase ]; + nativeBuildInputs = [ wrapQtAppsHook ]; <co xml:id='qt-default-nix-co-2' /> } </programlisting> <calloutlist> <callout arearefs='qt-default-nix-co-1'> <para> - Import <literal>mkDerivation</literal> and Qt (such as <literal>qtbase</literal> modules directly. <emphasis>Do not</emphasis> import Qt package sets; the Qt versions of dependencies may not be coherent, causing build and runtime failures. + Import Qt modules directly, that is: <literal>qtbase</literal>, <literal>qtdeclarative</literal>, etc. + <emphasis>Do not</emphasis> import Qt package sets such as <literal>qt5</literal> + because the Qt versions of dependencies may not be coherent, causing build and runtime failures. </para> </callout> <callout arearefs='qt-default-nix-co-2'> - <para> - Use <literal>mkDerivation</literal> instead of <literal>stdenv.mkDerivation</literal>. <literal>mkDerivation</literal> is a wrapper around <literal>stdenv.mkDerivation</literal> which applies some Qt-specific settings. This deriver accepts the same arguments as <literal>stdenv.mkDerivation</literal>; refer to <xref linkend='chap-stdenv' /> for details. - </para> - <para> - To use another deriver instead of <literal>stdenv.mkDerivation</literal>, use <literal>mkDerivationWith</literal>: -<programlisting> -mkDerivationWith myDeriver { - # ... -} -</programlisting> - If you cannot use <literal>mkDerivationWith</literal>, please refer to <xref linkend='qt-runtime-dependencies' />. - </para> - </callout> - <callout arearefs='qt-default-nix-co-3'> - <para> - <literal>mkDerivation</literal> accepts the same arguments as <literal>stdenv.mkDerivation</literal>, such as <literal>buildInputs</literal>. - </para> + <para> + All Qt packages must include <literal>wrapQtAppsHook</literal> in + <literal>nativeBuildInputs</literal>, or you must explicitly set + <literal>dontWrapQtApps</literal>. + </para> </callout> </calloutlist> ``` ## Locating runtime dependencies {#qt-runtime-dependencies} -Qt applications need to be wrapped to find runtime dependencies. If you cannot use `mkDerivation` or `mkDerivationWith` above, include `wrapQtAppsHook` in `nativeBuildInputs`: + +Qt applications must be wrapped to find runtime dependencies. +Include `wrapQtAppsHook` in `nativeBuildInputs`: ```nix +{ stdenv, wrapQtAppsHook }: + stdenv.mkDerivation { # ... - nativeBuildInputs = [ wrapQtAppsHook ]; } ``` -Entries added to `qtWrapperArgs` are used to modify the wrappers created by `wrapQtAppsHook`. The entries are passed as arguments to [wrapProgram executable makeWrapperArgs](#fun-wrapProgram). + +Add entries to `qtWrapperArgs` are to modify the wrappers created by +`wrapQtAppsHook`: ```nix -mkDerivation { - # ... +{ stdenv, wrapQtAppsHook }: +stdenv.mkDerivation { + # ... + nativeBuildInputs = [ wrapQtAppsHook ]; qtWrapperArgs = [ ''--prefix PATH : /path/to/bin'' ]; } ``` -Set `dontWrapQtApps` to stop applications from being wrapped automatically. It is required to wrap applications manually with `wrapQtApp`, using the syntax of [wrapProgram executable makeWrapperArgs](#fun-wrapProgram): +The entries are passed as arguments to [wrapProgram](#fun-wrapProgram). + +Set `dontWrapQtApps` to stop applications from being wrapped automatically. +Wrap programs manually with `wrapQtApp`, using the syntax of +[wrapProgram](#fun-wrapProgram): ```nix -mkDerivation { - # ... +{ stdenv, lib, wrapQtAppsHook }: +stdenv.mkDerivation { + # ... + nativeBuildInputs = [ wrapQtAppsHook ]; dontWrapQtApps = true; preFixup = '' wrapQtApp "$out/bin/myapp" --prefix PATH : /path/to/bin @@ -79,21 +90,16 @@ mkDerivation { } ``` -> Note: `wrapQtAppsHook` ignores files that are non-ELF executables. This means that scripts won't be automatically wrapped so you'll need to manually wrap them as previously mentioned. An example of when you'd always need to do this is with Python applications that use PyQT. +::: note +`wrapQtAppsHook` ignores files that are non-ELF executables. +This means that scripts won't be automatically wrapped so you'll need to manually wrap them as previously mentioned. +An example of when you'd always need to do this is with Python applications that use PyQt. +::: -Libraries are built with every available version of Qt. Use the `meta.broken` attribute to disable the package for unsupported Qt versions: - -```nix -mkDerivation { - # ... - - # Disable this library with Qt < 5.9.0 - meta.broken = builtins.compareVersions qtbase.version "5.9.0" < 0; -} -``` ## Adding a library to Nixpkgs -Qt libraries are added to `qt5-packages.nix` and are made available for every Qt -version supported. +Add Qt libraries to `qt5-packages.nix` to make them available for every +supported Qt version. + ### Example adding a Qt library {#qt-library-all-packages-nix} The following represents the contents of `qt5-packages.nix`. @@ -106,9 +112,23 @@ The following represents the contents of `qt5-packages.nix`. # ... } ``` + +Libraries are built with every available version of Qt. +Use the `meta.broken` attribute to disable the package for unsupported Qt versions: + +```nix +{ stdenv, lib, qtbase }: + +stdenv.mkDerivation { + # ... + # Disable this library with Qt < 5.9.0 + meta.broken = lib.versionOlder qtbase.version "5.9.0"; +} +``` + ## Adding an application to Nixpkgs -Applications that use Qt are also added to `qt5-packages.nix`. An alias is added -in the top-level `all-packages.nix` pointing to the package with the desired Qt5 version. +Add Qt applications to `qt5-packages.nix`. Add an alias to `all-packages.nix` +to select the Qt 5 version used for the application. ### Example adding a Qt application {#qt-application-all-packages-nix} diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b166e7bf01fe8..da8fdd1a64a2d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5866,6 +5866,12 @@ githubId = 35892750; name = "Maxine Aubrey"; }; + maxhbr = { + email = "nixos@maxhbr.dev"; + github = "maxhbr"; + githubId = 1187050; + name = "Maximilian Huber"; + }; maxxk = { email = "maxim.krivchikov@gmail.com"; github = "maxxk"; diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index da36ae68b3fc4..08ad90126b1d2 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -104,7 +104,7 @@ in # will in fact load the configuration file at /etc/bluetooth/main.conf # so force it here to avoid any ambiguity and things suddenly breaking # if/when the bluez derivation is changed. - args = [ "-f /etc/bluetooth/main.conf" ] + args = [ "-f" "/etc/bluetooth/main.conf" ] ++ optional hasDisabledPlugins "--noplugin=${concatStringsSep "," cfg.disabledPlugins}"; in diff --git a/nixos/modules/services/web-apps/moinmoin.nix b/nixos/modules/services/web-apps/moinmoin.nix index 3a876f75f4a48..7a54255a46efc 100644 --- a/nixos/modules/services/web-apps/moinmoin.nix +++ b/nixos/modules/services/web-apps/moinmoin.nix @@ -211,7 +211,7 @@ in environment = let penv = python.buildEnv.override { # setuptools: https://github.com/benoitc/gunicorn/issues/1716 - extraLibs = [ python.pkgs.gevent python.pkgs.setuptools pkg ]; + extraLibs = [ python.pkgs.eventlet python.pkgs.setuptools pkg ]; }; in { PYTHONPATH = "${dataDir}/${wikiIdent}/config:${penv}/${python.sitePackages}"; @@ -233,7 +233,7 @@ in ExecStart = ''${python.pkgs.gunicorn}/bin/gunicorn moin_wsgi \ --name gunicorn-${wikiIdent} \ --workers ${toString cfg.gunicorn.workers} \ - --worker-class gevent \ + --worker-class eventlet \ --bind unix:/run/moin/${wikiIdent}/gunicorn.sock ''; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ac0d25ac2eea2..c31a20e540883 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -81,6 +81,7 @@ in corerad = handleTest ./corerad.nix {}; couchdb = handleTest ./couchdb.nix {}; cri-o = handleTestOn ["x86_64-linux"] ./cri-o.nix {}; + custom-ca = handleTest ./custom-ca.nix {}; deluge = handleTest ./deluge.nix {}; dhparams = handleTest ./dhparams.nix {}; dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {}; diff --git a/nixos/tests/custom-ca.nix b/nixos/tests/custom-ca.nix new file mode 100644 index 0000000000000..67f7b3ff1f161 --- /dev/null +++ b/nixos/tests/custom-ca.nix @@ -0,0 +1,161 @@ +# Checks that `security.pki` options are working in curl and the main browser +# engines: Gecko (via Firefox), Chromium, QtWebEngine (Falkon) and WebKitGTK +# (via Midori). The test checks that certificates issued by a custom trusted +# CA are accepted but those from an unknown CA are rejected. + +import ./make-test-python.nix ({ pkgs, lib, ... }: + +let + makeCert = { caName, domain }: pkgs.runCommand "example-cert" + { buildInputs = [ pkgs.gnutls ]; } + '' + mkdir $out + + # CA cert template + cat >ca.template <<EOF + organization = "${caName}" + cn = "${caName}" + expiration_days = 365 + ca + cert_signing_key + crl_signing_key + EOF + + # server cert template + cat >server.template <<EOF + organization = "An example company" + cn = "${domain}" + expiration_days = 30 + dns_name = "${domain}" + encryption_key + signing_key + EOF + + # generate CA keypair + certtool \ + --generate-privkey \ + --key-type rsa \ + --sec-param High \ + --outfile $out/ca.key + certtool \ + --generate-self-signed \ + --load-privkey $out/ca.key \ + --template ca.template \ + --outfile $out/ca.crt + + # generate server keypair + certtool \ + --generate-privkey \ + --key-type rsa \ + --sec-param High \ + --outfile $out/server.key + certtool \ + --generate-certificate \ + --load-privkey $out/server.key \ + --load-ca-privkey $out/ca.key \ + --load-ca-certificate $out/ca.crt \ + --template server.template \ + --outfile $out/server.crt + ''; + + example-good-cert = makeCert + { caName = "Example good CA"; + domain = "good.example.com"; + }; + + example-bad-cert = makeCert + { caName = "Unknown CA"; + domain = "bad.example.com"; + }; + +in + +{ + name = "custom-ca"; + meta.maintainers = with lib.maintainers; [ rnhmjoj ]; + + enableOCR = true; + + machine = { pkgs, ... }: + { imports = [ ./common/user-account.nix ./common/x11.nix ]; + + # chromium-based browsers refuse to run as root + test-support.displayManager.auto.user = "alice"; + # browsers may hang with the default memory + virtualisation.memorySize = "500"; + + networking.hosts."127.0.0.1" = [ "good.example.com" "bad.example.com" ]; + security.pki.certificateFiles = [ "${example-good-cert}/ca.crt" ]; + + services.nginx.enable = true; + services.nginx.virtualHosts."good.example.com" = + { onlySSL = true; + sslCertificate = "${example-good-cert}/server.crt"; + sslCertificateKey = "${example-good-cert}/server.key"; + locations."/".extraConfig = "return 200 'It works!';"; + }; + services.nginx.virtualHosts."bad.example.com" = + { onlySSL = true; + sslCertificate = "${example-bad-cert}/server.crt"; + sslCertificateKey = "${example-bad-cert}/server.key"; + locations."/".extraConfig = "return 200 'It does not work!';"; + }; + + environment.systemPackages = with pkgs; + [ xdotool firefox chromium falkon midori ]; + }; + + testScript = '' + def execute_as(user: str, cmd: str) -> Tuple[int, str]: + """ + Run a shell command as a specific user. + """ + return machine.execute(f"sudo -u {user} {cmd}") + + + def wait_for_window_as(user: str, cls: str) -> None: + """ + Wait until a X11 window of a given user appears. + """ + + def window_is_visible(last_try: bool) -> bool: + ret, stdout = execute_as(user, f"xdotool search --onlyvisible --class {cls}") + if last_try: + machine.log(f"Last chance to match {cls} on the window list") + return ret == 0 + + with machine.nested("Waiting for a window to appear"): + retry(window_is_visible) + + + machine.start() + + with subtest("Good certificate is trusted in curl"): + machine.wait_for_unit("nginx") + machine.wait_for_open_port(443) + machine.succeed("curl -fv https://good.example.com") + + with subtest("Unknown CA is untrusted in curl"): + machine.fail("curl -fv https://bad.example.com") + + browsers = ["firefox", "chromium", "falkon", "midori"] + errors = ["Security Risk", "not private", "Certificate Error", "Security"] + + machine.wait_for_x() + for browser, error in zip(browsers, errors): + with subtest("Good certificate is trusted in " + browser): + execute_as( + "alice", f"env P11_KIT_DEBUG=trust {browser} https://good.example.com & >&2" + ) + wait_for_window_as("alice", browser) + machine.wait_for_text("It works!") + machine.screenshot("good" + browser) + execute_as("alice", "xdotool key ctrl+w") # close tab + + with subtest("Unknown CA is untrusted in " + browser): + execute_as("alice", f"{browser} https://bad.example.com & >&2") + machine.wait_for_text(error) + machine.screenshot("bad" + browser) + machine.succeed("pkill " + browser) + ''; +}) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 789add331b793..904ec17229e1c 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -325,10 +325,13 @@ let curl ] ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub - ++ optionals (bootLoader == "grub" && grubVersion == 2) [ - (pkgs.grub2.override { zfsSupport = true; }) - (pkgs.grub2_efi.override { zfsSupport = true; }) - ]; + ++ optionals (bootLoader == "grub" && grubVersion == 2) (let + zfsSupport = lib.any (x: x == "zfs") + (extraInstallerConfig.boot.supportedFilesystems or []); + in [ + (pkgs.grub2.override { inherit zfsSupport; }) + (pkgs.grub2_efi.override { inherit zfsSupport; }) + ]); nix.binaryCaches = mkForce [ ]; nix.extraOptions = '' @@ -398,9 +401,9 @@ let createPartitions = '' machine.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel gpt" - + " mkpart ESP fat32 1M 50MiB" # /boot + + " mkpart ESP fat32 1M 100MiB" # /boot + " set 1 boot on" - + " mkpart primary linux-swap 50MiB 1024MiB" + + " mkpart primary linux-swap 100MiB 1024MiB" + " mkpart primary ext2 1024MiB -1MiB", # / "udevadm settle", "mkswap /dev/vda2 -L swap", diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix index 392fae243467b..f1a39ad7dde2f 100644 --- a/nixos/tests/openldap.nix +++ b/nixos/tests/openldap.nix @@ -1,4 +1,9 @@ -{ pkgs, system ? builtins.currentSystem, ... }: let +{ pkgs ? (import ../.. { inherit system; config = { }; }) +, system ? builtins.currentSystem +, ... +}: + +let dbContents = '' dn: dc=example objectClass: domain @@ -16,7 +21,7 @@ ''; in { # New-style configuration - current = import ./make-test-python.nix { + current = import ./make-test-python.nix ({ pkgs, ... }: { inherit testScript; name = "openldap"; @@ -53,10 +58,10 @@ in { declarativeContents."dc=example" = dbContents; }; }; - }; + }) { inherit pkgs system; }; # Old-style configuration - oldOptions = import ./make-test-python.nix { + oldOptions = import ./make-test-python.nix ({ pkgs, ... }: { inherit testScript; name = "openldap"; @@ -72,10 +77,10 @@ in { declarativeContents."dc=example" = dbContents; }; }; - }; + }) { inherit system pkgs; }; # Manually managed configDir, for example if dynamic config is essential - manualConfigDir = import ./make-test-python.nix { + manualConfigDir = import ./make-test-python.nix ({ pkgs, ... }: { name = "openldap"; machine = { pkgs, ... }: { @@ -121,5 +126,5 @@ in { "systemctl restart openldap", ) '' + testScript; - }; + }) { inherit system pkgs; }; } diff --git a/pkgs/applications/audio/ashuffle/default.nix b/pkgs/applications/audio/ashuffle/default.nix index cf3321e241f06..e445132ee3c07 100644 --- a/pkgs/applications/audio/ashuffle/default.nix +++ b/pkgs/applications/audio/ashuffle/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ashuffle"; - version = "3.4.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "joshkunz"; repo = "ashuffle"; rev = "v${version}"; - sha256 = "09q6lwgc1dc8bg1mb9js9qz3xcsxph3548nxzvyb4v8111gixrp7"; + sha256 = "103jhajqwryiaf52qqgshajcnsxsz4l8gn3sz6bxs7k0yq5x1knr"; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix index ba9df9039f6cf..953a919d0c702 100644 --- a/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/pkgs/applications/audio/csound/csound-qt/default.nix @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { "SHARE_DIR=${placeholder "out"}/share" ]; + dontWrapQtApps = true; + meta = with lib; { description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features"; homepage = "https://csoundqt.github.io/"; diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index 80cd8f4d9a0fe..c3667ee57a5d5 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -20,6 +20,8 @@ mkDerivation rec { --replace "\$\$[QT_INSTALL_PREFIX]" "$out" ''; + dontWrapQtApps = true; + meta = with lib; { description = "Musical key detection for digital audio (graphical UI)"; longDescription = '' diff --git a/pkgs/applications/audio/kmetronome/default.nix b/pkgs/applications/audio/kmetronome/default.nix index ca8df45e459e8..02353fcf4f51c 100644 --- a/pkgs/applications/audio/kmetronome/default.nix +++ b/pkgs/applications/audio/kmetronome/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib drumstick qtbase qtsvg ]; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://kmetronome.sourceforge.io/"; description = "ALSA MIDI metronome with Qt interface"; diff --git a/pkgs/applications/audio/mopidy/somafm.nix b/pkgs/applications/audio/mopidy/somafm.nix index 0637731dcb576..81c689a343de4 100644 --- a/pkgs/applications/audio/mopidy/somafm.nix +++ b/pkgs/applications/audio/mopidy/somafm.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with lib; { - homepage = https://www.mopidy.com/; + homepage = "https://www.mopidy.com/"; description = "Mopidy extension for playing music from SomaFM"; license = licenses.mit; maintainers = [ maintainers.nickhu ]; diff --git a/pkgs/applications/audio/netease-music-tui/default.nix b/pkgs/applications/audio/netease-music-tui/default.nix index 0322459685f2f..957c7b3c7fb12 100644 --- a/pkgs/applications/audio/netease-music-tui/default.nix +++ b/pkgs/applications/audio/netease-music-tui/default.nix @@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ alsaLib openssl ]; cargoSha256 = "1kfbnwy3lkbhz0ggxwr5n6qd1plipkr1ycr3z2r7c0amrzzbkc7l"; - verifyCargoDeps = true; meta = with lib; { homepage = "https://github.com/betta-cyber/netease-music-tui"; diff --git a/pkgs/applications/audio/nootka/default.nix b/pkgs/applications/audio/nootka/default.nix index b1b60540b8c27..11424c0be1814 100644 --- a/pkgs/applications/audio/nootka/default.nix +++ b/pkgs/applications/audio/nootka/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { "-DENABLE_PULSEAUDIO=ON" ]; + dontWrapQtApps = true; + meta = with lib; { description = "Application for practicing playing musical scores and ear training"; homepage = "https://nootka.sourceforge.io/"; diff --git a/pkgs/applications/audio/nootka/unstable.nix b/pkgs/applications/audio/nootka/unstable.nix index 1fb70c195dc0f..aa49daaa1e71f 100644 --- a/pkgs/applications/audio/nootka/unstable.nix +++ b/pkgs/applications/audio/nootka/unstable.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { qtbase qtdeclarative qtquickcontrols2 ]; + dontWrapQtApps = true; + cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${libjack2}/include/jack;${libpulseaudio.dev}/include/pulse" "-DENABLE_JACK=ON" diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index c3ab0ffcebd12..2fd1aeccd7a2f 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { dontUnpack = true; dontBuild = true; dontStrip = true; + dontWrapQtApps = true; installPhase = '' mkdir -p $out diff --git a/pkgs/applications/audio/playbar2/default.nix b/pkgs/applications/audio/playbar2/default.nix index 7545c17131f95..dfbfb43e625c5 100644 --- a/pkgs/applications/audio/playbar2/default.nix +++ b/pkgs/applications/audio/playbar2/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { kwindowsystem ]; + dontWrapQtApps = true; + meta = with lib; { description = "Mpris2 Client for Plasma5"; homepage = "https://github.com/audoban/PlayBar2"; diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/applications/audio/seq66/default.nix index 93f9e9503b95e..71d70c2dd5802 100644 --- a/pkgs/applications/audio/seq66/default.nix +++ b/pkgs/applications/audio/seq66/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://github.com/ahlstromcj/seq66"; description = "Loop based midi sequencer with Qt GUI derived from seq24 and sequencer64"; diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix index a368d62ce7d00..6292d771a512d 100644 --- a/pkgs/applications/audio/spectmorph/default.nix +++ b/pkgs/applications/audio/spectmorph/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; + dontWrapQtApps = true; + meta = with lib; { description = "Allows to analyze samples of musical instruments, and to combine them (morphing) to construct hybrid sounds"; homepage = "http://spectmorph.org"; diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index a1b5944a51e1e..690a25d6b4d4a 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "vorta"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "1amq0fz3xrnxplzd6ih2azx6b4k1w496kcr7f8agfp617f5rkwa5"; + sha256 = "sha256-nnnGqkT4sAunaT7GPysYQGeV34ZrRFaHK/gJRafvR3U="; }; postPatch = '' diff --git a/pkgs/applications/blockchains/bitcoin-classic.nix b/pkgs/applications/blockchains/bitcoin-classic.nix index bd1c9611d5610..f578313323c0e 100644 --- a/pkgs/applications/blockchains/bitcoin-classic.nix +++ b/pkgs/applications/blockchains/bitcoin-classic.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + dontWrapQtApps = true; + meta = { description = "Peer-to-peer electronic cash system (Classic client)"; longDescription= '' diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index 8ad7c8fdd6c97..5dc35e996bec4 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -37,8 +37,14 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features final" ]; - # test result: FAILED. 88 passed; 13 failed; 0 ignored; 0 measured; 0 filtered out - doCheck = false; + # Fix tests by preventing them from writing to /homeless-shelter. + preCheck = '' + export HOME=$(mktemp -d) + ''; + + # Exclude some tests that don't work in the sandbox + # - Nat test requires network access + checkFlags = "--skip configuration::tests::should_resolve_external_nat_hosts"; meta = with lib; { description = "Fast, light, robust Ethereum implementation"; diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 6a96f560ddcb1..be9ba0f75616d 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -101,6 +101,8 @@ stdenv.mkDerivation rec { }) ]; + dontWrapQtApps = true; + preConfigure = "NOCONFIGURE=1 ./autogen.sh"; configureFlags = [ diff --git a/pkgs/applications/editors/code-browser/default.nix b/pkgs/applications/editors/code-browser/default.nix index a4ae4a811bfd1..ea4398cc4a5ce 100644 --- a/pkgs/applications/editors/code-browser/default.nix +++ b/pkgs/applications/editors/code-browser/default.nix @@ -39,6 +39,9 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withQt [ "UI=qt" ] ++ lib.optionals withGtk [ "UI=gtk" ]; + + dontWrapQtApps = true; + meta = with lib; { description = "Folding text editor, designed to hierarchically structure any kind of text file and especially source code"; homepage = "https://tibleiz.net/code-browser/"; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 000129f74dfff..2f97e36132272 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -413,6 +413,22 @@ rec { }; }; + freemarker = buildEclipseUpdateSite rec { + name = "freemarker-${version}"; + version = "1.5.305"; + + src = fetchzip { + url = "https://github.com/ddekany/jbosstools-freemarker/releases/download/v${version}/freemarker.site-${version}.zip"; + sha256 = "1qrhi300vk07gi14r445wvy0bvghbjd6c4k7q09pqpaxv6raiczn"; + stripRoot = false; + }; + + meta = with lib; { + homepage = "https://github.com/ddekany/jbosstools-freemarker"; + description = "Plugin that provides an editor for Apache FreeMarker files"; + }; + }; + gnuarmeclipse = buildEclipseUpdateSite rec { name = "gnuarmeclipse-${version}"; version = "3.1.1-201606210758"; diff --git a/pkgs/applications/editors/formiko/default.nix b/pkgs/applications/editors/formiko/default.nix new file mode 100644 index 0000000000000..53fee165f5e5a --- /dev/null +++ b/pkgs/applications/editors/formiko/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, wrapGAppsHook +, gobject-introspection +, gtk3 +, docutils +, gtksourceview +, gtkspell3 +, librsvg +, pygobject3 +, webkitgtk +}: + +buildPythonApplication rec { + pname = "formiko"; + version = "1.4.3"; + + src = fetchFromGitHub { + owner = "ondratu"; + repo = "formiko"; + rev = version; + sha256 = "0n7w585gbrpn2xcd5n04hivrjarpr2wj260y2kpxpgh93vn52sdi"; + }; + + nativeBuildInputs = [ + wrapGAppsHook + gobject-introspection + gtk3 + ]; + propagatedBuildInputs = [ + docutils + gobject-introspection + gtk3 + gtksourceview + gtkspell3 + librsvg + pygobject3 + webkitgtk + ]; + + # Needs a display + doCheck = false; + + meta = with lib; { + description = "reStructuredText editor and live previewer"; + homepage = "https://github.com/ondratu/formiko"; + license = licenses.bsd3; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 7d030c8445fb1..31551f1b7248c 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -270,12 +270,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2020.3.1"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1jfvwir79s0kcqmlx6bbkmc42bplgl7814mnqfcsdzni1qv62pws"; /* updated by script */ + sha256 = "10120y9ccdlhjrpvfnspfj4s7940b3v3yic78r372wj5ns4bsjax"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -283,12 +283,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2020.3.1"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0jk7ywxk983ld5x71a59dh1hvlnli3sbvg7fbicahas5ml8clxfv"; /* updated by script */ + sha256 = "1wjaavgslwpz4jniszswdy10rk3622i1w3awdwhgjlcc6mwkwz1f"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -296,12 +296,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2020.3.1"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "Up and Coming Go IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "12gi1a2bmafmy7qgqwv3a7b5b46dlhw4ahmkm5pkq6pmxl4y6dmk"; /* updated by script */ + sha256 = "00wbl4g1wgb9c287z6i7a48bm5zyb1gkmyqmhasmj0n2vamaq6sz"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -335,12 +335,12 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2020.3"; /* updated by script */ + version = "2020.3.1"; /* updated by script */ description = "Create your own domain-specific language"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/mps/2020.3/MPS-${version}.tar.gz"; - sha256 = "0dr1z2sxarz1xif4swxx28hpzsyjd86m0c3xdaw5lmpqwqlzvc5h"; /* updated by script */ + sha256 = "0qvl724mm53rxfhafl6561rhpwppcadmwr9sh0hpsfgsprh2xznv"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -348,12 +348,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2020.3.1"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1c5j3mbg8scsl4c90cjahdk5gs5q72y5a8fhkqa9zmy6di42k99x"; /* updated by script */ + sha256 = "1dmymlv71syjv8byb9ap9c13fimjl6c3r94dwr9kghdlj3jh7p0k"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -361,12 +361,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.3.2"; /* updated by script */ + version = "2020.3.3"; /* updated by script */ description = "PyCharm Community Edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1z3w6aah635fdrhrzp5af6sgj269jk7mv8vgdd83gxillkx9vq9k"; /* updated by script */ + sha256 = "0p05pgfmr9515sqbqbjiksg7qzvqxcs119lxfc6dsirdvc1qhnli"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -374,12 +374,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.3.2"; /* updated by script */ + version = "2020.3.3"; /* updated by script */ description = "PyCharm Professional Edition"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1fbb8v40q7vgn5v5dyxb211abr8swnxa3gw18kh3vlk6yc2crzfw"; /* updated by script */ + sha256 = "1yzv1pxpw6pvsjljqvbnf8qgdx34rs5j232zaq4vb5x2ahswf9mm"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -400,12 +400,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2020.3.1"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0drxzz6k0cmhir4szg8nwmsi9qh380vrryghmpvx9w83yrcain4c"; /* updated by script */ + sha256 = "17x3sz4jkz2px25gj813xqrrb2cm7mdl6m5a22zg086phym66g3c"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix index 23c8f0698cf07..44b4fd7bc19f7 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ kdevelop-pg-qt threadweaver ktexteditor kdevelop-unwrapped ]; + dontWrapQtApps = true; + meta = with lib; { maintainers = [ maintainers.aanderse ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index 041c25f1728c0..0567ee39d7dd2 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ threadweaver ktexteditor kdevelop-unwrapped ]; + dontWrapQtApps = true; + meta = with lib; { maintainers = [ maintainers.aanderse ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix index cb1265735f98c..e1478ef6a03c7 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase ]; + dontWrapQtApps = true; + meta = with lib; { maintainers = [ maintainers.ambrop72 ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix index fa4e73a376828..d2aea1344da84 100644 --- a/pkgs/applications/editors/qxmledit/default.nix +++ b/pkgs/applications/editors/qxmledit/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { export QXMLEDIT_INST_DOC_DIR="$doc" ''; + dontWrapQtApps = true; + meta = with lib; { description = "Simple XML editor based on qt libraries" ; homepage = "https://sourceforge.net/projects/qxmledit"; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index db3bd494b6b12..307866c377ad5 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -81,6 +81,29 @@ in }; }; + farbfeld = pluginDerivation rec { + pname = "farbfeld"; + version = "unstable-2019-08-12"; + + src = fetchFromGitHub { + owner = "ids1024"; + repo = "gimp-farbfeld"; + rev = "5feacebf61448bd3c550dda03cd08130fddc5af4"; + sha256 = "1vmw7k773vrndmfffj0m503digdjmkpcqy2r3p3i5x0qw9vkkkc6"; + }; + + installPhase = '' + installPlugin farbfeld + ''; + + meta = { + description = "Gimp plug-in for the farbfeld image format"; + homepage = "https://github.com/ids1024/gimp-farbfeld"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sikmir ]; + }; + }; + fourier = pluginDerivation rec { /* menu: Filters/Generic/FFT Forward diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index ba6af5d781f24..11340fa74686b 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -7,6 +7,7 @@ , fetchurl , gettext , gdl +, ghostscript , glib , glib-networking , glibmm @@ -74,6 +75,12 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs share/extensions + substituteInPlace share/extensions/eps_input.inx \ + --replace "location=\"path\">ps2pdf" "location=\"absolute\">${ghostscript}/bin/ps2pdf" + substituteInPlace share/extensions/ps_input.inx \ + --replace "location=\"path\">ps2pdf" "location=\"absolute\">${ghostscript}/bin/ps2pdf" + substituteInPlace share/extensions/ps_input.py \ + --replace "call('ps2pdf'" "call('${ghostscript}/bin/ps2pdf'" patchShebangs share/templates patchShebangs man/fix-roff-punct ''; diff --git a/pkgs/applications/misc/authy/default.nix b/pkgs/applications/misc/authy/default.nix new file mode 100644 index 0000000000000..65200d8517700 --- /dev/null +++ b/pkgs/applications/misc/authy/default.nix @@ -0,0 +1,110 @@ +{ alsaLib, at-spi2-atk, at-spi2-core, atk, autoPatchelfHook, cairo, cups +, dbus, electron_9, expat, fetchurl, gdk-pixbuf, glib, gtk3, lib +, libappindicator-gtk3, libdbusmenu-gtk3, libuuid, makeWrapper +, nspr, nss, pango, squashfsTools, stdenv, systemd, xorg +}: + +let + # Currently only works with electron 9 + electron = electron_9; +in + +stdenv.mkDerivation rec { + pname = "authy"; + version = "1.8.3"; + rev = "5"; + + buildInputs = [ + alsaLib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + libappindicator-gtk3 + libdbusmenu-gtk3 + libuuid + nspr + nss + pango + stdenv.cc.cc + systemd + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libxcb + ]; + + src = fetchurl { + url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap"; + sha256 = "1yfvkmy34mc1dan9am11yka88jv7a4dslsszy4kcc8vap4cjmgpn"; + }; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ]; + + unpackPhase = '' + runHook preUnpack + unsquashfs "$src" + cd squashfs-root + if ! grep -q '${version}' meta/snap.yaml; then + echo "Package version differs from version found in snap metadata:" + grep 'version: ' meta/snap.yaml + echo "While the nix package specifies: ${version}." + echo "You probably chose the wrong revision or forgot to update the nix version." + exit 1 + fi + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/ + + cp -r ./* $out/ + rm -R ./* + + # The snap package has the `ffmpeg.so` file which is copied over with other .so files + mv $out/*.so $out/lib/ + + # Replace icon name in Desktop file + sed -i 's|''${SNAP}/meta/gui/icon.png|authy|g' "$out/meta/gui/authy.desktop" + + # Move the desktop file, icon, binary to their appropriate locations + mkdir -p $out/bin $out/share/applications $out/share/pixmaps/apps + cp $out/meta/gui/authy.desktop $out/share/applications/ + cp $out/meta/gui/icon.png $out/share/pixmaps/authy.png + cp $out/${pname} $out/bin/${pname} + + # Cleanup + rm -r $out/{data-dir,gnome-platform,meta,scripts,usr,*.sh,*.so} + + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + --add-flags $out/resources/app.asar + ''; + + meta = with lib; { + homepage = "https://www.authy.com"; + description = "Twilio Authy two factor authentication desktop application"; + license = licenses.unfree; + maintainers = with maintainers; [ iammrinal0 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index f043aa66947f6..85c7fbae789f5 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + dontWrapQtApps = true; + doCheck = true; preCheck = '' patchShebangs testo diff --git a/pkgs/applications/misc/gpsbabel/gui.nix b/pkgs/applications/misc/gpsbabel/gui.nix index 4025b313128b5..8501b7c0875b9 100644 --- a/pkgs/applications/misc/gpsbabel/gui.nix +++ b/pkgs/applications/misc/gpsbabel/gui.nix @@ -10,6 +10,8 @@ mkDerivation { nativeBuildInputs = [ qmake qttools ]; buildInputs = [ qtwebkit ]; + dontWrapQtApps = true; + postPatch = '' substituteInPlace mainwindow.cc \ --replace "QApplication::applicationDirPath() + \"/" "\"" \ diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index ad001eb304570..ae82a324df567 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4600"; + version = "4601"; src = fetchurl { url = "http://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; - sha256 = "1xnqbyrf5cbxmggkk1pjcj5d1767kbp15v12zy2fpbbn3yf0k3sh"; + sha256 = "TQ2Ee0sy9q4PUvY3TD6zaQ9oy1xgsw5OAw4RQ7ecCUM="; }; patches = [ diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/applications/misc/nwg-launchers/default.nix index c4c54ba7c53b5..2dbcef8779f50 100644 --- a/pkgs/applications/misc/nwg-launchers/default.nix +++ b/pkgs/applications/misc/nwg-launchers/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "nwg-launchers"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vuvYL9N9xdg27uhiTe2OqxZ3/n/9EjlqPxtNMXpqpE8="; + sha256 = "sha256-krhFtFQZSwfKPHmVxPGNySPL2Y9+kA0fxjZ/D+mNks4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix index 57ec820a0902c..bb365ecfefd89 100644 --- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix +++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ plasma-framework kwindowsystem plasma-pa ]; + dontWrapQtApps = true; + meta = with lib; { description = "A fork of the default volume plasmoid with a Windows 7 theme (vertical sliders)"; homepage = "https://github.com/Zren/plasma-applet-volumewin7mixer"; diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix index fae4948d8baf0..86208c484a0ed 100644 --- a/pkgs/applications/misc/reddsaver/default.nix +++ b/pkgs/applications/misc/reddsaver/default.nix @@ -7,27 +7,27 @@ }: rustPlatform.buildRustPackage rec { - version = "0.2.3"; pname = "reddsaver"; + version = "0.3.0"; src = fetchFromGitHub { owner = "manojkarthick"; repo = "reddsaver"; rev = "v${version}"; - sha256 = "sha256-K6SyfYx8VG0t6yogHwd80AxQuj3TXofHLEqZcDsRs1s="; + sha256 = "0wiyzbl9vqx5aq3lpaaqkm3ivj77lqd8bmh8ipgshdflgm1z6yvp"; }; - cargoSha256 = "sha256-VDr7fcE13Wy7KoGG3U1GSbWqF5Oad4EobgzOL7dtJDo="; + cargoSha256 = "0kw5gk7pf4xkmjffs2jxm6sc4chybns88cii2wlgpyvgn4c3cwaa"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - # package does not contain tests as of v0.2.3 + # package does not contain tests as of v0.3.0 docCheck = false; meta = with lib; { - description = "CLI tool to download saved images from Reddit"; + description = "CLI tool to download saved media from Reddit"; homepage = "https://github.com/manojkarthick/reddsaver"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = [ maintainers.manojkarthick ]; diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index 844fd19e22cc2..8c4fa2efb2278 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, fetchFromGitiles, pkg-config, libssh2 -, qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols +{ mkDerivation, lib, fetchFromGitHub, fetchFromGitiles, pkg-config, libssh2 +, qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols2 , qtsvg, qttools, qtquick1, qtcharts , qmake }: @@ -13,7 +13,7 @@ let in -stdenv.mkDerivation rec { +mkDerivation rec { pname = "redis-desktop-manager"; version = "0.9.1"; @@ -28,10 +28,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats - qtquick1 qtquickcontrols qtsvg qttools qtcharts + qtquick1 qtquickcontrols2 qtsvg qttools qtcharts ]; dontUseQmakeConfigure = true; + dontWrapQtApps = true; NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated" ]; @@ -76,7 +77,7 @@ EOF meta = with lib; { description = "Cross-platform open source Redis DB management tool"; homepage = "https://redisdesktop.com/"; - license = licenses.lgpl21; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; }; diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix index fa5ee0c753aac..b8d25f0db1dea 100644 --- a/pkgs/applications/misc/redshift-plasma-applet/default.nix +++ b/pkgs/applications/misc/redshift-plasma-applet/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation { kwindowsystem ]; + dontWrapQtApps = true; + meta = with lib; { description = "KDE Plasma 5 widget for controlling Redshift"; homepage = "https://github.com/kotelnik/plasma-applet-redshift-control"; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 51d015c6e4104..98392ae27f246 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -52,6 +52,8 @@ let buildInputs = [ qtbase qtlocation libXcomposite ]; + dontWrapQtApps = true; + pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins"; installPhase = '' diff --git a/pkgs/applications/misc/swappy/default.nix b/pkgs/applications/misc/swappy/default.nix index bf1fdf63fed5d..58dede64894ee 100644 --- a/pkgs/applications/misc/swappy/default.nix +++ b/pkgs/applications/misc/swappy/default.nix @@ -6,25 +6,23 @@ , pango , gtk , pkg-config -, cmake , scdoc , libnotify -, gio-sharp , glib }: stdenv.mkDerivation rec { - name = "swappy-${version}"; - version = "1.2.1"; + pname = "swappy"; + version = "1.3.0"; src = fetchFromGitHub { owner = "jtheoof"; - repo = "swappy"; + repo = pname; rev = "v${version}"; - sha256 = "14ac2jmnak7avcz0jhqjm30vk7pv3gq5aq5rdyh84k8c613kkicf"; + sha256 = "1bm184fbzylymh4kr7n8gy9plsdxif8xahc1zmkgdg1a0kwgws2x"; }; - nativeBuildInputs = [ glib meson ninja pkg-config cmake scdoc ]; + nativeBuildInputs = [ glib meson ninja pkg-config scdoc ]; buildInputs = [ cairo pango gtk libnotify wayland glib ]; @@ -37,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/jtheoof/swappy"; - description = "A Wayland native snapshot editing tool, inspired by Snappy on macOS "; + description = "A Wayland native snapshot editing tool, inspired by Snappy on macOS"; license = licenses.mit; maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix new file mode 100644 index 0000000000000..f5c35d530e041 --- /dev/null +++ b/pkgs/applications/misc/ticker/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ticker"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "achannarasappa"; + repo = "ticker"; + rev = "v${version}"; + sha256 = "sha256-k4ahoaEI2HBoEcRQscpitp2tWsiWmSYaErnth99xOqw="; + }; + + vendorSha256 = "sha256-8Ew+K/uTFoBAhPQwebtjl6bJPiSEE3PaZCYZsQLOMkw="; + + # Tests require internet + doCheck = false; + + meta = with lib; { + description = "Terminal stock ticker with live updates and position tracking"; + homepage = "https://github.com/achannarasappa/ticker"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix index b9fd02650a67d..1215a7b9a48fd 100644 --- a/pkgs/applications/misc/tickrs/default.nix +++ b/pkgs/applications/misc/tickrs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tickrs"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "tarkah"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Hx/9WW94rDAjlSZoUz5/43MQ6830OELLogRvHTbmWv0="; + sha256 = "sha256-F9PyJ2uvnKPcjHS4VeuVJuK48HiqqCG8kFzphGW4QyA="; }; - cargoSha256 = "sha256-TYDNx1TNGcREaeHXaejTeMDEITTTUrHCrExZYa+MSHg="; + cargoSha256 = "sha256-0JSsCtAsqukFuwtbVS1L2jgLNBjquFBInjsJ1XVocjc="; nativeBuildInputs = [ perl ]; diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index cdcb54cbc6c4e..f7ca72594159a 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -1,65 +1,51 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, dpkg, atk, at-spi2-atk, glib, pango, gdk-pixbuf -, gtk3, cairo, freetype, fontconfig, dbus, xorg, nss, nspr, alsaLib, cups, expat -, udev, libpulseaudio, util-linux, makeWrapper }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron, libsecret }: stdenv.mkDerivation rec { pname = "todoist-electron"; - version = "1.24.0"; + version = "0.2.4"; src = fetchurl { - url = "https://github.com/KryDos/todoist-linux/releases/download/${version}/Todoist_${version}_amd64.deb"; - sha256 = "0g35518z6nf6pnfyx4ax75rq8b8br72mi6wv6jzgac9ric1q4h2s"; + url = "https://electron-dl.todoist.com/linux/Todoist-${version}.AppImage"; + sha256 = "1xrf2qjhq116z18qx7n1zd7mhvkb2dccaq7az4w6fs216l8q5zf2"; }; - desktopItem = makeDesktopItem { - name = "Todoist"; - exec = "todoist %U"; - icon = "todoist"; - comment = "Todoist for Linux"; - desktopName = "Todoist"; - categories = "Utility"; + appimageContents = appimageTools.extractType2 { + name = "${pname}-${version}"; + inherit src; }; - nativeBuildInputs = [ makeWrapper dpkg ]; - unpackPhase = '' - mkdir pkg - dpkg-deb -x $src pkg - sourceRoot=pkg - ''; - installPhase = let - libPath = lib.makeLibraryPath ([ - stdenv.cc.cc gtk3 atk at-spi2-atk glib pango gdk-pixbuf cairo freetype fontconfig dbus - nss nspr alsaLib libpulseaudio cups expat udev util-linux - ] ++ (with xorg; [ - libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb - libXrender libX11 libXtst libXScrnSaver - ])); - in '' - mkdir -p "$out/bin" - mv opt "$out/" - mv usr/share "$out/share" + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall - # Patch binary - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}:\$ORIGIN" \ - $out/opt/Todoist/todoist + mkdir -p $out/bin $out/share/${pname} $out/share/applications $out/share/icons/hicolor/512x512 - # Hacky workaround for RPATH problems - makeWrapper $out/opt/Todoist/todoist $out/bin/todoist \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio udev ]} + cp -a ${appimageContents}/{locales,resources} $out/share/${pname} + cp -a ${appimageContents}/todoist.desktop $out/share/applications/${pname}.desktop + cp -a ${appimageContents}/usr/share/icons/hicolor/0x0/apps $out/share/icons/hicolor/512x512 + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + + runHook postInstall + ''; - # Desktop item - mkdir -p "$out/share" - rm -r "$out/share/applications" - cp -r "${desktopItem}/share/applications" "$out/share/applications" + postFixup = '' + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/resources/app.asar \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" ''; meta = with lib; { - homepage = "https://github.com/KryDos/todoist-linux"; - description = "The Linux wrapper for Todoist web version"; + homepage = "https://todoist.com"; + description = "The official Todoist electron app"; platforms = [ "x86_64-linux" ]; - license = licenses.mit; - maintainers = with maintainers; [ i077 ]; + license = licenses.unfree; + maintainers = with maintainers; [ i077 kylesferrazza ]; }; } diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 36fd4047761c8..9b8821b5115ed 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook, writeShellScript +{ lib, stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook , alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "upwork"; - version = "5.4.9.6"; + version = "5.5.0.1"; src = fetchurl { - url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_4_9_6_2565cdd0547940a2/${pname}_${version}_amd64.deb"; - sha256 = "ff6246b3b4a1ed79cc9bca2934652fefb40bdac4b7e95997f3a46e354ce52456"; + url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_5_0_1_291c031686ed44ff/${pname}_${version}_amd64.deb"; + sha256 = "49192ecfb10929b5b51cf8899186059649c894109ec172695cd7cfaa50923f6a"; }; dontWrapGApps = true; @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall mv usr $out mv opt $out sed -e "s|/opt/Upwork|$out/bin|g" -i $out/share/applications/upwork.desktop @@ -44,6 +45,7 @@ stdenv.mkDerivation rec { $out/bin/upwork \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : ${libPath} + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 3d762d9ab2a71..4b9627a843bd2 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -1,13 +1,15 @@ -{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas}: +{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas +, texlive, pandoc, pandoc-citeproc +}: # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "1.7.5"; + version = "1.8.7"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "040lx01ywdpla34d4abkmh51kchr11s17la6fk6yq77y8zb87xzi"; + sha256 = "0zbmlk5qk92b3zycs0bmdwgc8fn4a4dv1yvq9q8q2wxz4ammx6c0"; }; appimageContents = appimageTools.extractType2 { inherit name src; @@ -20,11 +22,11 @@ in appimageTools.wrapType2 rec { ''; multiPkgs = null; # no 32bit needed - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc pandoc-citeproc ]; extraInstallCommands = '' mv $out/bin/{${name},${pname}} - install -m 444 -D ${appimageContents}/zettlr.desktop $out/share/applications/zettlr.desktop - install -m 444 -D ${appimageContents}/zettlr.png $out/share/icons/hicolor/512x512/apps/zettlr.png + install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/zettlr.desktop + install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/zettlr.png substituteInPlace $out/share/applications/zettlr.desktop --replace 'Exec=AppRun' 'Exec=${pname}' ''; diff --git a/pkgs/applications/networking/browsers/amfora/default.nix b/pkgs/applications/networking/browsers/amfora/default.nix index e951f4c53c0f0..59612550eadd8 100644 --- a/pkgs/applications/networking/browsers/amfora/default.nix +++ b/pkgs/applications/networking/browsers/amfora/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "amfora"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "makeworld-the-better-one"; repo = "amfora"; rev = "v${version}"; - sha256 = "KAOIx401G/kB/TclhidOnUja1P+mLo/mUwAqGJfVfyg="; + sha256 = "sha256-q83fKs27vkrUs3+AoKZ2342llj6u3bvbLsdnT9DnVUs="; }; - vendorSha256 = "rOEM7iEkm42g8yJxY7qdTCSbkPMDHqlAsK7/ud8IDLY="; + vendorSha256 = "sha256-0blHwZwOcgC4LcmZSJPRvyQzArCsaMGgIw+cesO+qOo="; postInstall = lib.optionalString (!stdenv.isDarwin) '' sed -i "s:amfora:$out/bin/amfora:" amfora.desktop diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 4a408ad208b08..1445219c1b252 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": "89.0.4389.47", - "sha256": "022fq3mbd3j9a7lf02936ks0yvf73bwz1ws6m6zmnn9v8waardj2", - "sha256bin64": "09gjbg8678xfh22r3gzjvrkhgda77pr8an4j5ka5672jvhj4hbq9", + "version": "89.0.4389.58", + "sha256": "1ppjkilfn84hq55wsb33xswlp1x8v34np5hq2wbh62ny6j8dbvwz", + "sha256bin64": "1k4f380h2rghn81agdw8bkifpb690sr0ykjgbnis3kl68hbkp8a5", "deps": { "gn": { "version": "2021-01-07", diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index c3e9a774fa903..e369fec213a4c 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "argocd"; - version = "1.8.3"; - commit = "ef5010c3a0b5e027fd642732d03c5b0391b1e574"; + version = "1.8.4"; + commit = "28aea3dfdede00443b52cc584814d80e8f896200"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-do5DAxaQ1gBdvNN/YGKAkmkFcJ+j/ojBaWPwrXXQko0="; + sha256 = "sha256:155396rnihha31jxy0zk1jykiirpv4dhc69w45y6nx3nx4k0gwhk"; }; vendorSha256 = "sha256-6DOay+aeXz7EQKe5SzQSmg/5KyUI0g6wzPgx/+F2RW4="; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index a45f3553b9212..767ac70c56f59 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxcd"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "1k7zcn8l60qfgiixkjcmp94w87w88n475mmhf58vl5pfz21p9vky"; + sha256 = "1xxw6zk0lk4is220lydcx57mrsw6pk2rirsp4wjzvawjlv7wdv25"; }; - vendorSha256 = "16yixz47zrzjkb2k4n03zfivpc2cavcrrv4fz8s5a4xzfrcp4nvx"; + vendorSha256 = "0acxbmc4j1fcdja0s9g04f0kd34x54yfqismibfi40m2gzbg6ljr"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 4a8f42e3cc7e8..e0ae7636f6042 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.21.1"; + version = "1.21.2"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "sha256-/go8V1EjY/iL3csoNpPyeWORvWCf0WnnaSOgiZ8UFQ8="; + sha256 = "sha256-pI/LGAjTWFXiDKSV+dZl0wXK/TZmN9DuWf5Nu8EYNYc="; }; - vendorSha256 = "sha256-GEU0Q2Elhiel20xvup+i1DSXCjQdA9s7cWykcbKR5KA="; + vendorSha256 = "sha256-Q8gIhJSZqdjBXrIcJfCd25BniDScwVzUwZ9Vc8p/z3c="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/kubectl-example/default.nix b/pkgs/applications/networking/cluster/kubectl-example/default.nix new file mode 100644 index 0000000000000..04677cb4277f9 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubectl-example/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubectl-example"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "seredot"; + repo = pname; + rev = "v${version}"; + sha256 = "18vp53cda93qjssxygwqp55yc80a93781839gf3138awngf731yq"; + }; + + vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + + meta = with lib; { + description = "kubectl plugin for retrieving resource example YAMLs"; + homepage = "https://github.com/seredot/kubectl-example"; + changelog = "https://github.com/seredot/kubectl-example/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = [ maintainers.bryanasdev000 ]; + }; +} diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 3885278f1f13c..6515885fd8e2f 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -2,7 +2,6 @@ , poetry2nix , lib , overrides ? (self: super: {}) -, stdenv }: let diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 317666a2c7cdd..59a7039fb2804 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -157,8 +157,8 @@ in rec { }); terraform_0_14 = pluggable (generic { - version = "0.14.6"; - sha256 = "0ba3vd6lswy4pd0qywdbx8cf71j5z3p8p8kdjs9m4qbyrzsbq0fk"; + version = "0.14.7"; + sha256 = "0lnq65ibdxrw2rlyipk469a5hh16vgym1698nmfn62ak8fdrd8la"; vendorSha256 = "0pk5mgj19a8by7wbn5xd6kgr1kxrazhvg851fvs8mq3j0ayb32nb"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 21777252f3b11..4004402475d56 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.28.5"; + version = "0.28.6"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LSUWEgCajIBgRPiuvGJ9I3tJLXk1JrVDDsgS7lpbVYk="; + sha256 = "sha256-DzC/HNwFNNEJhic/8KpHchrBmsSbrn7xf1DjY0JTH08="; }; vendorSha256 = "sha256-lRJerUYafpkXAGf8MEM8SeG3aB86mlMo7iLpeHFAnd4="; diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index 3d62a1dcf29b2..b97b5869960ea 100644 --- a/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "waypoint"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bCvi5xIL6xAtQ9mgf4feh076sAmog/3eGBlgvcLXJyc="; + sha256 = "sha256-JeuVrlm6JB8MgSUmgMLQPuPmlKSScSdsVga9jUwLWHM="; }; deleteVendor = true; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 19e48bf88d688..03ef4abc2d0f5 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.39.6"; # Please backport all updates to the stable channel. + version = "1.40.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "04fd81vc0dxk0b47crm5zacf4x79pdn483xicygnc1z6v7mnrmgk"; + sha256 = "1xd38a9mi23c4r873k37rzip68hfk3a4bk9j4j24v2kb3yvixrpp"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 693a01f5d89ae..7cbcc2392c6d4 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -22,12 +22,12 @@ let in mkDerivation rec { pname = "telegram-desktop"; - version = "2.5.8"; + version = "2.5.9"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "0zj1g24fi4m84p6zj9yk55v8sbhn0jdpdhp33y12d2msz0qwp2cw"; + sha256 = "1311dab9cil8hl1qlh01ynrczyjbldcsq1l6ibh818wb5lsgvvl2"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index b5a6579db57cf..7efac01c55ad4 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm , libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio, protobuf +, xorg, libXtst }: let - rev = "be23804afce3bb2e80a1d57a7c1318c71b82b7de"; - sha256 = "0avdxkig8z1ainzyxkm9vmlvkyqbjalwb4h9s9kcail82mnldnhc"; + rev = "a19877363082da634a3c851a4698376504d2eaee"; + sha256 = "03m6fkc3m2wbh821mr3ybsmd7sjllky44mizny96k4b249dkvzx7"; in stdenv.mkDerivation { pname = "tg_owt"; @@ -23,6 +24,7 @@ in stdenv.mkDerivation { buildInputs = [ libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf + xorg.libX11 libXtst ]; cmakeFlags = [ diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 030737848a96e..0d0144fbf9156 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + dontWrapQtApps = true; + preConfigure = '' export QMAKEFEATURES=${libcommuni}/features ''; diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix index 07e759035460d..1042c2d1dee31 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -1,8 +1,12 @@ -{ callPackage, luaPackages, python3Packages }: +{ callPackage, luaPackages, perlPackages, python3Packages }: { colorize_nicks = callPackage ./colorize_nicks { }; + multiline = callPackage ./multiline { + inherit (perlPackages) PodParser; + }; + weechat-matrix-bridge = callPackage ./weechat-matrix-bridge { inherit (luaPackages) cjson luaffi; }; diff --git a/pkgs/applications/networking/irc/weechat/scripts/multiline/default.nix b/pkgs/applications/networking/irc/weechat/scripts/multiline/default.nix new file mode 100644 index 0000000000000..447d415c163c7 --- /dev/null +++ b/pkgs/applications/networking/irc/weechat/scripts/multiline/default.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, fetchurl, substituteAll, PodParser }: + +stdenv.mkDerivation { + pname = "multiline"; + version = "0.6.3"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/weechat/scripts/945315bed4bc2beaf1e47f9b946ffe8f638f77fe/perl/multiline.pl"; + sha256 = "1smialb21ny7brhij4sbw46xvsmrdv6ig2da0ip63ga2afngwsy4"; + }; + + dontUnpack = true; + prePatch = '' + cp $src multiline.pl + ''; + + patches = [ + # The script requires a special Perl environment. + (substituteAll { + src = ./libpath.patch; + env = PodParser; + }) + ]; + + passthru.scripts = [ "multiline.pl" ]; + + installPhase = '' + runHook preInstall + + install -D multiline.pl $out/share/multiline.pl + + runHook postInstall + ''; + + meta = with lib; { + description = "Multi-line edit box"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/pkgs/applications/networking/irc/weechat/scripts/multiline/libpath.patch b/pkgs/applications/networking/irc/weechat/scripts/multiline/libpath.patch new file mode 100644 index 0000000000000..34299f20d8c29 --- /dev/null +++ b/pkgs/applications/networking/irc/weechat/scripts/multiline/libpath.patch @@ -0,0 +1,9 @@ +diff --git a/multiline.pl b/multiline.pl +index 54474d4..42fbef8 100644 +--- a/multiline.pl ++++ b/multiline.pl +@@ -1,3 +1,4 @@ ++use lib '@env@/lib/perl5/site_perl'; + use strict; use warnings; + $INC{'Encode/ConfigLocal.pm'}=1; + require Encode; diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index b568775481c14..0929c745b2122 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -6,18 +6,17 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.3.1"; + version = "1.4.2"; disabled = python3.pkgs.pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "v${version}"; - sha256 = "sha256-2S2sa2/HVt3IRsE98PT2XwpONjaYENBzYW+ezBFrJYI="; + sha256 = "sha256-cPH0wD7RL3OifDTD48x58I4qeaLALOMFnfWXjE2/lUQ="; }; propagatedBuildInputs = with python3.pkgs; [ - bugsnag click markdown2 maestral diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index ddffe07470624..6919e31342e41 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with lib; stdenv.mkDerivation rec { - version = "0.31.3"; + version = "0.31.4"; pname = "notmuch"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.notmuchmail.org/git/notmuch"; - sha256 = "1wm1myzacz1dcg7vdfd3akia3xan7ssfspf1fflrwm18hdalss5v"; + sha256 = "sha256-M+LEf257OcDlHOCYYxzEVQpop+i2gzO/QJPdajz/CRM="; rev = version; }; diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 82140f2d77d81..9267d8d231cd9 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -41,11 +41,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2021.1"; + version = "2021.2"; src = fetchurl { - url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; - sha256 = "1ksa327zaiwmcmzv4n4ycfzc4sqhj2492c5ir0mqlx7x2nnhx6q7"; + url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb"; + sha256 = "sha256-nNZK11MckiQ+z8NDgDc7aJ6yrXWI1hPOvMZkrGwDDgU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index e57d490f05c14..b0a0fded80aeb 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { runHook postConfigure ''; + dontWrapQtApps = true; + meta = with lib; { description = "Rapidly extract unformatted, or unstandardized bibliographic references from email alerts, journal Web pages and PDF files"; homepage = "http://www.molspaces.com/d_cb2bib-overview.php"; diff --git a/pkgs/applications/radio/cqrlog/default.nix b/pkgs/applications/radio/cqrlog/default.nix new file mode 100644 index 0000000000000..d86a08f3a1b07 --- /dev/null +++ b/pkgs/applications/radio/cqrlog/default.nix @@ -0,0 +1,101 @@ +{ lib +, stdenv +, fetchFromGitHub +, fpc +, lazarus +, atk +, cairo +, gdk-pixbuf +, glib +, gtk2-x11 +, libX11 +, pango +, hamlib +, mysql57 +, tqsl +, xdg-utils +, xplanet +, autoPatchelfHook +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "cqrlog"; + version = "2.5.2"; + + src = fetchFromGitHub { + owner = "ok2cqr"; + repo = "cqrlog"; + rev = "v${version}"; + sha256 = "0zzcg0bl6mq4wfifj998x9x09w8sigbh46synpqx034fpr0swyhb"; + }; + + # Adds the possiblity to change the lazarus directory, + # otherwise, we would get error : "directory lcl not found" + patches = [ ./fix-makefile-lazarusdir.patch ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace @Lazarusdir@ "${lazarus}/share/lazarus" \ + --replace /usr "" + substituteInPlace src/fTRXControl.pas \ + --replace "/usr/bin/rigctld" "${hamlib}/bin/rigctld" + substituteInPlace src/fCallAttachment.pas \ + --replace "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open" + substituteInPlace src/fRotControl.pas \ + --replace "/usr/bin/rotctld" "${hamlib}/bin/rotctld" + substituteInPlace src/fPreferences.pas \ + --replace "/usr/bin/rigctld" "${hamlib}/bin/rigctld" \ + --replace "/usr/bin/rotctld" "${hamlib}/bin/rotctld" \ + --replace "/usr/bin/xplanet" "${xplanet}/bin/xplanet" + substituteInPlace src/fLoTWExport.pas \ + --replace "/usr/bin/tqsl" "${tqsl}/bin/tqsl" + substituteInPlace src/dUtils.pas \ + --replace "/usr/bin/xplanet" "${xplanet}/bin/xplanet" \ + --replace "/usr/bin/rigctld" "${hamlib}/bin/rigctld" + # Order is important + substituteInPlace src/dData.pas \ + --replace "/usr/bin/mysqld_safe" "${mysql57}/bin/mysqld_safe" \ + --replace "/usr/bin/mysqld" "${mysql57}/bin/mysqld" + + # To be fail when I need to patch a new hardcoded binary + ! grep -C src -RC0 "/usr" + ''; + + nativeBuildInputs = [ lazarus fpc autoPatchelfHook wrapGAppsHook ]; + buildInputs = [ + atk + cairo + gdk-pixbuf + glib + gtk2-x11 + libX11 + pango + ]; + propagatedBuildInputs = [ + hamlib + mysql57 + tqsl + xdg-utils + xplanet + ]; + + makeFlags = [ + "FPC=fpc" + "PP=fpc" + "DESTDIR=$(out)" + ]; + + postFixup = '' + libmysqlclient=$(find "${mysql57}/lib" -name "libmysqlclient.so.*" | tail -n1) + patchelf --add-needed "$libmysqlclient" "$out/bin/.cqrlog-wrapped" + ''; + + meta = with lib; { + description = "Linux logging program for amateur radio operators"; + homepage = "https://www.cqrlog.com/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/radio/cqrlog/fix-makefile-lazarusdir.patch b/pkgs/applications/radio/cqrlog/fix-makefile-lazarusdir.patch new file mode 100644 index 0000000000000..9170387966acd --- /dev/null +++ b/pkgs/applications/radio/cqrlog/fix-makefile-lazarusdir.patch @@ -0,0 +1,13 @@ +Seulement dans b: logs +diff --color -ur a/Makefile b/Makefile +--- a/Makefile 2021-02-15 17:07:14.333810200 +0100 ++++ b/Makefile 2021-02-15 17:19:18.599426984 +0100 +@@ -6,7 +6,7 @@ + tmpdir = /tmp + + cqrlog: src/cqrlog.lpi +- $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi ++ $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus --lazarusdir=@Lazarusdir@ src/cqrlog.lpi + $(ST) src/cqrlog + gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz + diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 9223f160db301..9bc1511968be9 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -218,6 +218,7 @@ let passthru doCheck dontWrapPythonPrograms + dontWrapQtApps meta ; cmakeFlags = shared.cmakeFlags @@ -283,6 +284,7 @@ stdenv.mkDerivation rec { passthru doCheck dontWrapPythonPrograms + dontWrapQtApps meta ; } diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index 1d5d84f46495d..9b354d5b960c2 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -109,6 +109,7 @@ rec { }; # Wrapping is done with an external wrapper dontWrapPythonPrograms = true; + dontWrapQtApps = true; # Tests should succeed, but it's hard to get LD_LIBRARY_PATH right in order # for it to happen. doCheck = false; diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/applications/radio/unixcw/default.nix index 5e299cc598430..cdb84670c616f 100644 --- a/pkgs/applications/radio/unixcw/default.nix +++ b/pkgs/applications/radio/unixcw/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [libpulseaudio alsaLib pkg-config qt5.qtbase]; CFLAGS ="-lasound -lpulse-simple"; + dontWrapQtApps = true; + meta = with lib; { description = "sound characters as Morse code on the soundcard or console speaker"; longDescription = '' diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index 3a36a2194a134..e0790b8b1a32d 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1170"; + version = "1178"; src = fetchurl { url = "http://last.cbrc.jp/last-${version}.zip"; - sha256 = "sha256-hBuG6QGXtBrvNrtaZU+i8gxu2ZQw+srFRkbuWoL5JHc="; + sha256 = "sha256-LihTYXiYCHAFZaWDb2MqN+RvHayGSyZd3vJf4TVCu3A="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index 56898f163b99c..da9231efb813e 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU libGL qt5.qtbase boost ]; + dontWrapQtApps = true; + meta = with lib; { description = "A toolset for model-checking concurrent systems and protocols"; longDescription = '' diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 81b7487bd27bf..c5449171fff73 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "calc"; - version = "2.12.7.6"; + version = "2.12.8.1"; src = fetchurl { urls = [ "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-Pg8nvW+RDy1Vb+Xg+5tnDxZEVkD80VcQGyZVayq8zsk="; + sha256 = "sha256-TwVcuGaWIgzEc34DFEGFcmckXrwZ4ruRqselJClz15o="; }; patchPhase = '' diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 703048118f62a..51389d20b7d17 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.32"; + version = "1.8.34"; src = fetchPypi { inherit pname version; - sha256 = "f89ba880fe7351a13c68ba3f4c56acd6e246790b103f3ec79d9a527b5767b8f0"; + sha256 = "b922c9b6cf4719667e195a02d8364ccebbe7966a9c18666f8ac22eae9d9e7a2c"; }; postPatch = '' diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index 61ea5a9ddd4d6..d90de1a526f46 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { dontBuild = true; dontConfigure = true; + dontWrapQtApps = true; meta = with lib; { description = "GUI application that allows to quickly and easily compare files and folders"; diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 38413f990a014..a4080fbdacbbf 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "1.5.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "1f23b8bn867b4zihz8m91xmkclcw1jnqkwi06klhm5576akahigq"; + sha256 = "03bsramq75i5sw08gdmjh94n1xh743mq6h4dzaix78i531x7y34i"; }; - vendorSha256 = "00adc0xjrkjrjh0gxk55vhpgxb5x0j5ialzrdvhlrvhpnb44qrcq"; + vendorSha256 = "0nk5axyr3nd9cbk8wswfhqf25dks22mky3rdn6ba9s0fpxhhkr5g"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix index 8c73c00f00c28..a40e959a50a41 100644 --- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-lsvn_fs-1"; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://github.com/svn-all-fast-export/svn2git"; description = "A fast-import based converter for an svn repo to git repos"; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 9ea6d241060f6..e0312cddd40d1 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.7.4", - "repo_hash": "1ggx76k6941rhccsd585p4h5k4zb87yvg0pmpzhwhh2q4ma2sywm", + "version": "13.8.4", + "repo_hash": "1q8q5v7c6g7yss26d6wg29h28fq1azy1smai97yk80cr0kirab8v", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.7.4-ee", + "rev": "v13.8.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.7.4", + "GITALY_SERVER_VERSION": "13.8.4", "GITLAB_PAGES_VERSION": "1.34.0", - "GITLAB_SHELL_VERSION": "13.14.0", - "GITLAB_WORKHORSE_VERSION": "8.58.2" + "GITLAB_SHELL_VERSION": "13.15.1", + "GITLAB_WORKHORSE_VERSION": "8.59.0" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 0a7fcd7c260d7..1a9f3ea8fd6b0 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' -gem 'activesupport', '~> 6.0.3.3' +gem 'activesupport', '~> 6.0.3.4' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index eb5c86946d7a7..acfc05c8747bb 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -2,20 +2,20 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - actionpack (6.0.3.3) - actionview (= 6.0.3.3) - activesupport (= 6.0.3.3) + actionpack (6.0.3.4) + actionview (= 6.0.3.4) + activesupport (= 6.0.3.4) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.0.3.3) - activesupport (= 6.0.3.3) + actionview (6.0.3.4) + activesupport (= 6.0.3.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.0.3.3) + activesupport (6.0.3.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -86,7 +86,7 @@ GEM json (2.3.1) licensee (8.9.2) rugged (~> 0.24) - loofah (2.7.0) + loofah (2.8.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -96,12 +96,13 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2020.0512) mini_mime (1.0.2) - mini_portile2 (2.4.0) + mini_portile2 (2.5.0) minitest (5.14.2) msgpack (1.3.3) multipart-post (2.1.1) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) nokogumbo (1.5.0) nokogiri opentracing (0.5.0) @@ -117,6 +118,7 @@ GEM pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) + racc (1.5.2) rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -177,7 +179,7 @@ GEM thread_safe (0.3.6) thrift (0.11.0.0) timecop (0.9.1) - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) unicode-display_width (1.7.0) unparser (0.4.7) @@ -188,13 +190,13 @@ GEM equalizer (~> 0.0.9) parser (>= 2.6.5) procto (~> 0.0.2) - zeitwerk (2.4.0) + zeitwerk (2.4.2) PLATFORMS ruby DEPENDENCIES - activesupport (~> 6.0.3.3) + activesupport (~> 6.0.3.4) factory_bot faraday (~> 1.0) github-linguist (~> 7.12) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 1b96307457c22..af879bc127e4d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -33,17 +33,17 @@ let }; }; in buildGoModule rec { - version = "13.7.4"; + version = "13.8.4"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1inb7xlv8admzy9q1bgxccbrhks0mmc8lng356h39crj5sgaqkmg"; + sha256 = "sha256-y8uy70ccQPba+JJmWace4LgLJkJNzVdFhrvq0AB8G5w="; }; - vendorSha256 = "15i1ajvrff1bfpv3kmb1wm1mmriswwfw2v4cml0nv0zp6a5n5187"; + vendorSha256 = "sha256-oVw6vXI3CyOn4l02PkYx3HVpZfzQPi3yBuf9tRvoWoM="; passthru = { inherit rubyEnv; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index b4a6b0e78eb9e..9159b62c8df71 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -13,10 +13,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p873nqwmpsvmkb5n86d70wndx1qhy15pc9mbcd1mc8sj174578b"; + sha256 = "0fbjpnh5hrihc9l35q9why6ip0hcdj42axzbp6b4j1xcy1v1bicj"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -24,10 +24,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08pvmjddlw01q5r9zdfgddwp4csndpf5i2w47677z5r36jznz36q"; + sha256 = "0gdz31cq08nrqq6bxqim2qcbzv0fr34z6ycl73dmawpafj33wdkj"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dmkqbvndbz011a1byg6f990936vfadbnwjwjw9vjzr4kd8bxk96"; + sha256 = "1axidc4mikgi4yxs0ynw2c54jyrs5lxprxmzv6m3aayi9rg6rk5j"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -360,10 +360,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq"; + sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; memoizable = { dependencies = ["thread_safe"]; @@ -414,12 +414,14 @@ version = "1.0.2"; }; mini_portile2 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; minitest = { groups = ["default" "development" "test"]; @@ -452,15 +454,15 @@ version = "2.1.1"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; + sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; type = "gem"; }; - version = "1.10.10"; + version = "1.11.1"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -538,6 +540,16 @@ }; version = "0.12.2"; }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; rack = { groups = ["default"]; platforms = []; @@ -819,10 +831,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.9"; }; unicode-display_width = { groups = ["default" "development" "test"]; @@ -850,9 +862,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k"; + sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.2"; }; } diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index a1a9df57f044c..dcd24bab3cf6f 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "13.14.0"; + version = "13.15.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "171c4rfffb73198fhlwk8rq7xy4b4zrnssi8c1wd0x82kqv6csb0"; + sha256 = "sha256-wDZLcCBbWjG6wIcEj02eqwWVfAYy1TuAo/xvJB8tt+0="; }; buildInputs = [ ruby ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 3e292632d4c4a..8f0043414403b 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "gitlab-workhorse"; - version = "8.58.2"; + version = "8.59.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1ks8rla6hm618dxhr41x1ckzk3jxv0f7vl2547f7f1fl3zqna1zp"; + sha256 = "sha256-6JVt5hNWvnUm64SFqns1f1+xMP/KyPQ8H93jqXNT8n8="; }; vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5"; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 49d0841be3cd8..c7ed1cd4d71e2 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -4,9 +4,6 @@ gem 'rails', '~> 6.0.3.1' gem 'bootsnap', '~> 1.4.6' -# Improves copy-on-write performance for MRI -gem 'nakayoshi_fork', '~> 0.0.4' - # Responders respond_to and respond_with gem 'responders', '~> 3.0' @@ -19,10 +16,10 @@ gem 'default_value_for', '~> 3.3.0' gem 'pg', '~> 1.1' gem 'rugged', '~> 0.28' -gem 'grape-path-helpers', '~> 1.5' +gem 'grape-path-helpers', '~> 1.6.1' gem 'faraday', '~> 1.0' -gem 'marginalia', '~> 1.9.0' +gem 'marginalia', '~> 1.10.0' # Authentication libraries gem 'devise', '~> 4.7.2' @@ -57,7 +54,7 @@ gem 'gssapi', group: :kerberos # Spam and anti-bot protection gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' gem 'akismet', '~> 3.0' -gem 'invisible_captcha', '~> 0.12.1' +gem 'invisible_captcha', '~> 1.1.0' # Two-factor authentication gem 'devise-two-factor', '~> 3.1.0' @@ -81,12 +78,10 @@ gem 'gpgme', '~> 2.0.19' # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' -gem 'net-ldap' +gem 'net-ldap', '~> 0.16.3' # API -# Locked at Grape v1.4.0 until https://github.com/ruby-grape/grape/pull/2088 is merged -# Remove config/initializers/grape_patch.rb -gem 'grape', '= 1.4.0' +gem 'grape', '~> 1.5.1' gem 'grape-entity', '~> 0.7.1' gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' @@ -115,7 +110,7 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick', '~> 4.10.1' # for backups -gem 'fog-aws', '~> 3.7' +gem 'fog-aws', '~> 3.8' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' @@ -145,7 +140,7 @@ gem 'aws-sdk-s3', '~> 1' gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # Markdown and HTML processing -gem 'html-pipeline', '~> 2.12' +gem 'html-pipeline', '~> 2.13.2' gem 'deckar01-task_list', '2.3.1' gem 'gitlab-markup', '~> 1.7.1' gem 'github-markup', '~> 1.7.0', require: 'github/markup' @@ -163,7 +158,7 @@ gem 'asciidoctor-kroki', '~> 0.2.2', require: false gem 'rouge', '~> 3.26.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.10.9' +gem 'nokogiri', '~> 1.11.1' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -184,15 +179,15 @@ group :unicorn do end group :puma do - gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false - gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false + gem 'puma', '~> 5.1.1', require: false + gem 'puma_worker_killer', '~> 0.3.1', require: false end # State machine -gem 'state_machines-activerecord', '~> 0.6.0' +gem 'state_machines-activerecord', '~> 0.8.0' # Issue tags -gem 'acts-as-taggable-on', '~> 6.0' +gem 'acts-as-taggable-on', '~> 7.0' # Background jobs gem 'sidekiq', '~> 5.2.7' @@ -242,7 +237,7 @@ gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false gem 'hipchat', '~> 1.5.0' # Jira integration -gem 'jira-ruby', '~> 2.0.0' +gem 'jira-ruby', '~> 2.1.4' gem 'atlassian-jwt', '~> 0.2.0' # Flowdock integration @@ -255,7 +250,7 @@ gem 'slack-messenger', '~> 2.3.4' gem 'hangouts-chat', '~> 0.0.5' # Asana integration -gem 'asana', '0.10.2' +gem 'asana', '~> 0.10.3' # FogBugz integration gem 'ruby-fogbugz', '~> 0.2.1' @@ -306,12 +301,12 @@ gem 'rack-attack', '~> 6.3.0' gem 'sentry-raven', '~> 3.0' # PostgreSQL query parsing -gem 'gitlab-pg_query', '~> 1.3', require: 'pg_query' +gem 'pg_query', '~> 1.3.0' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '0.13.3' +gem 'gitlab-labkit', '0.14.0' # I18n gem 'ruby_parser', '~> 3.15', require: false @@ -331,6 +326,7 @@ gem 'snowplow-tracker', '~> 0.6.1' # Metrics group :metrics do gem 'method_source', '~> 1.0', require: false + gem 'webrick', '~> 1.6.1', require: false # Prometheus gem 'prometheus-client-mmap', '~> 0.12.0' @@ -353,14 +349,15 @@ end group :development, :test do gem 'deprecation_toolkit', '~> 1.5.1', require: false gem 'bullet', '~> 6.1.0' - gem 'pry-byebug', '~> 3.9.0', platform: :mri + gem 'gitlab-pry-byebug', platform: :mri, require: ['pry-byebug', 'pry-byebug/pry_remote_ext'] gem 'pry-rails', '~> 0.3.9' + gem 'pry-remote' gem 'awesome_print', require: false gem 'database_cleaner', '~> 1.7.0' - gem 'factory_bot_rails', '~> 5.1.0' - gem 'rspec-rails', '~> 4.0.0' + gem 'factory_bot_rails', '~> 6.1.0' + gem 'rspec-rails', '~> 4.0.1' # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.11.0' @@ -371,7 +368,7 @@ group :development, :test do gem 'spring', '~> 2.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 5.3.0', require: false + gem 'gitlab-styles', '~> 6.0.0', require: false gem 'scss_lint', '~> 0.59.0', require: false gem 'haml_lint', '~> 0.36.0', require: false @@ -409,7 +406,7 @@ group :test do gem 'rspec_profiling', '~> 0.0.6' gem 'rspec-parameterized', require: false - gem 'capybara', '~> 3.33.0' + gem 'capybara', '~> 3.34.0' gem 'capybara-screenshot', '~> 1.0.22' gem 'selenium-webdriver', '~> 3.142' @@ -465,7 +462,7 @@ group :ed25519 do end # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 13.7.0.pre.rc1' +gem 'gitaly', '~> 13.8.0.pre.rc2' gem 'grpc', '~> 1.30.2' @@ -478,7 +475,7 @@ gem 'flipper', '~> 0.17.1' gem 'flipper-active_record', '~> 0.17.1' gem 'flipper-active_support_cache_store', '~> 0.17.1' gem 'unleash', '~> 0.1.5' -gem 'gitlab-experiment', '~> 0.4.4' +gem 'gitlab-experiment', '~> 0.4.5' # Structured logging gem 'lograge', '~> 0.5' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 1cd90080fd878..b370024b95b0b 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -5,66 +5,66 @@ GEM abstract_type (0.0.7) acme-client (2.0.6) faraday (>= 0.17, < 2.0.0) - actioncable (6.0.3.3) - actionpack (= 6.0.3.3) + actioncable (6.0.3.4) + actionpack (= 6.0.3.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.3) - actionpack (= 6.0.3.3) - activejob (= 6.0.3.3) - activerecord (= 6.0.3.3) - activestorage (= 6.0.3.3) - activesupport (= 6.0.3.3) + actionmailbox (6.0.3.4) + actionpack (= 6.0.3.4) + activejob (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) mail (>= 2.7.1) - actionmailer (6.0.3.3) - actionpack (= 6.0.3.3) - actionview (= 6.0.3.3) - activejob (= 6.0.3.3) + actionmailer (6.0.3.4) + actionpack (= 6.0.3.4) + actionview (= 6.0.3.4) + activejob (= 6.0.3.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.3) - actionview (= 6.0.3.3) - activesupport (= 6.0.3.3) + actionpack (6.0.3.4) + actionview (= 6.0.3.4) + activesupport (= 6.0.3.4) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.3) - actionpack (= 6.0.3.3) - activerecord (= 6.0.3.3) - activestorage (= 6.0.3.3) - activesupport (= 6.0.3.3) + actiontext (6.0.3.4) + actionpack (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) nokogiri (>= 1.8.5) - actionview (6.0.3.3) - activesupport (= 6.0.3.3) + actionview (6.0.3.4) + activesupport (= 6.0.3.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.3.3) - activesupport (= 6.0.3.3) + activejob (6.0.3.4) + activesupport (= 6.0.3.4) globalid (>= 0.3.6) - activemodel (6.0.3.3) - activesupport (= 6.0.3.3) - activerecord (6.0.3.3) - activemodel (= 6.0.3.3) - activesupport (= 6.0.3.3) + activemodel (6.0.3.4) + activesupport (= 6.0.3.4) + activerecord (6.0.3.4) + activemodel (= 6.0.3.4) + activesupport (= 6.0.3.4) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (6.0.3.3) - actionpack (= 6.0.3.3) - activejob (= 6.0.3.3) - activerecord (= 6.0.3.3) + activestorage (6.0.3.4) + actionpack (= 6.0.3.4) + activejob (= 6.0.3.4) + activerecord (= 6.0.3.4) marcel (~> 0.3.1) - activesupport (6.0.3.3) + activesupport (6.0.3.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - acts-as-taggable-on (6.5.0) - activerecord (>= 5.0, < 6.1) + acts-as-taggable-on (7.0.0) + activerecord (>= 5.0, < 6.2) adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) @@ -76,7 +76,7 @@ GEM apollo_upload_server (2.0.2) graphql (>= 1.8) rails (>= 4.2) - asana (0.10.2) + asana (0.10.3) faraday (~> 1.0) faraday_middleware (~> 1.0) faraday_middleware-multi_json (~> 0.0) @@ -115,13 +115,14 @@ GEM aws-sigv4 (~> 1.1) aws-sigv4 (1.2.1) aws-eventstream (~> 1, >= 1.0.2) - azure-storage-blob (2.0.0) + azure-storage-blob (2.0.1) azure-storage-common (~> 2.0) - nokogiri (~> 1.10.4) - azure-storage-common (2.0.1) + nokogiri (~> 1.11.0.rc2) + azure-storage-common (2.0.2) faraday (~> 1.0) faraday_middleware (~> 1.0.0.rc1) - nokogiri (~> 1.10.4) + net-http-persistent (~> 4.0) + nokogiri (~> 1.11.0.rc2) babosa (1.0.2) base32 (0.3.2) batch-loader (1.4.0) @@ -151,7 +152,7 @@ GEM bundler (>= 1.2.0, < 3) thor (~> 0.18) byebug (11.1.3) - capybara (3.33.0) + capybara (3.34.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -228,17 +229,16 @@ GEM activerecord (>= 3.2.0, < 6.1) deprecation_toolkit (1.5.1) activesupport (>= 4.2) - derailed_benchmarks (1.7.0) + derailed_benchmarks (1.8.1) benchmark-ips (~> 2) get_process_mem (~> 0) heapy (~> 0) memory_profiler (~> 0) - mini_histogram (~> 0) + mini_histogram (>= 0.2.1) rack (>= 1) rake (> 10, < 14) ruby-statistics (>= 2.1) thor (>= 0.19, < 2) - unicode_plot (>= 0.0.4, < 1.0.0) device_detector (1.0.0) devise (4.7.3) bcrypt (~> 3.0) @@ -252,7 +252,7 @@ GEM devise (~> 4.0) railties (< 6.1) rotp (~> 2.0) - diff-lcs (1.3) + diff-lcs (1.4.4) diff_match_patch (0.1.0) diffy (3.3.0) discordrb-webhooks-blackst0ne (3.3.0) @@ -265,21 +265,19 @@ GEM doorkeeper-openid_connect (1.7.4) doorkeeper (>= 5.2, < 5.5) json-jwt (>= 1.11.0) - dry-configurable (0.11.5) + dry-configurable (0.12.0) concurrent-ruby (~> 1.0) - dry-core (~> 0.4, >= 0.4.7) - dry-equalizer (~> 0.2) + dry-core (~> 0.5, >= 0.5.0) dry-container (0.7.2) concurrent-ruby (~> 1.0) dry-configurable (~> 0.1, >= 0.1.3) - dry-core (0.4.9) + dry-core (0.5.0) concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) dry-inflector (0.2.0) - dry-logic (1.0.6) + dry-logic (1.1.0) concurrent-ruby (~> 1.0) - dry-core (~> 0.2) - dry-equalizer (~> 0.2) + dry-core (~> 0.5, >= 0.5) dry-types (1.4.0) concurrent-ruby (~> 1.0) dry-container (~> 0.3) @@ -309,7 +307,6 @@ GEM launchy (~> 2.1) mail (~> 2.7) encryptor (3.0.0) - enumerable-statistics (2.0.1) equalizer (0.0.11) erubi (1.9.0) escape_utils (1.2.1) @@ -321,11 +318,11 @@ GEM expression_parser (0.9.0) extended-markdown-filter (0.6.0) html-pipeline (~> 2.0) - factory_bot (5.1.0) - activesupport (>= 4.2.0) - factory_bot_rails (5.1.0) - factory_bot (~> 5.1.0) - railties (>= 4.2.0) + factory_bot (6.1.0) + activesupport (>= 5.0.0) + factory_bot_rails (6.1.0) + factory_bot (~> 6.1.0) + railties (>= 5.0.0) faraday (1.0.1) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.7) @@ -363,7 +360,7 @@ GEM fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.7.0) + fog-aws (3.8.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -420,12 +417,12 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (13.7.0.pre.rc1) + gitaly (13.8.0.pre.rc2) grpc (~> 1.0) github-markup (1.7.0) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-experiment (0.4.4) + gitlab-experiment (0.4.5) activesupport (>= 3.0) scientist (~> 1.5, >= 1.5.0) gitlab-fog-azure-rm (1.0.0) @@ -435,9 +432,9 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.13.3) - actionpack (>= 5.0.0, < 6.1.0) - activesupport (>= 5.0.0, < 6.1.0) + gitlab-labkit (0.14.0) + actionpack (>= 5.0.0, < 7.0.0) + activesupport (>= 5.0.0, < 7.0.0) gitlab-pg_query (~> 1.3) grpc (~> 1.19) jaeger-client (~> 1.1) @@ -447,19 +444,17 @@ GEM gitlab-mail_room (0.0.8) gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) - gitlab-pg_query (1.3.0) - gitlab-puma (4.3.5.gitlab.3) - nio4r (~> 2.0) - gitlab-puma_worker_killer (0.1.1.gitlab.1) - get_process_mem (~> 0.2) - gitlab-puma (>= 2.7, < 5) + gitlab-pg_query (1.3.1) + gitlab-pry-byebug (3.9.0) + byebug (~> 11.0) + pry (~> 0.13.0) gitlab-sidekiq-fetcher (0.5.2) sidekiq (~> 5) - gitlab-styles (5.3.0) - rubocop (~> 0.89.1) - rubocop-gitlab-security (~> 0.1.0) - rubocop-performance (~> 1.8.1) - rubocop-rails (~> 2.8) + gitlab-styles (6.0.0) + rubocop (~> 0.91.1) + rubocop-gitlab-security (~> 0.1.1) + rubocop-performance (~> 1.9.2) + rubocop-rails (~> 2.9) rubocop-rspec (~> 1.44) gitlab_chronic_duration (0.10.6.2) numerizer (~> 0.2) @@ -497,7 +492,7 @@ GEM signet (~> 0.14) gpgme (2.0.20) mini_portile2 (~> 2.3) - grape (1.4.0) + grape (1.5.1) activesupport builder dry-types (>= 1.1) @@ -507,10 +502,11 @@ GEM grape-entity (0.7.1) activesupport (>= 4.0) multi_json (>= 1.3.2) - grape-path-helpers (1.5.0) + grape-path-helpers (1.6.1) activesupport grape (~> 1.3) rake (> 12) + ruby2_keywords (~> 0.0.2) grape_logging (1.8.3) grape rack @@ -573,11 +569,12 @@ GEM hashie (>= 3.0) health_check (3.0.0) railties (>= 5.0) - heapy (0.1.4) + heapy (0.2.0) + thor hipchat (1.5.2) httparty mimemagic - html-pipeline (2.12.2) + html-pipeline (2.13.2) activesupport (>= 2) nokogiri (>= 1.4) html2text (0.2.0) @@ -598,18 +595,18 @@ GEM mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.8.5) + i18n (1.8.7) concurrent-ruby (~> 1.0) i18n_data (0.8.0) icalendar (2.4.1) ice_nine (0.11.2) - invisible_captcha (0.12.1) - rails (>= 3.2.0) + invisible_captcha (1.1.0) + rails (>= 4.2) ipaddress (0.8.3) jaeger-client (1.1.0) opentracing (~> 0.3) thrift - jira-ruby (2.0.0) + jira-ruby (2.1.4) activesupport atlassian-jwt multipart-post @@ -686,7 +683,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.7.0) + loofah (2.8.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) @@ -695,7 +692,7 @@ GEM mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) - marginalia (1.9.0) + marginalia (1.10.0) actionpack (>= 2.3) activerecord (>= 2.3) memoist (0.16.2) @@ -707,10 +704,10 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2020.0512) mimemagic (0.3.5) - mini_histogram (0.1.3) + mini_histogram (0.3.1) mini_magick (4.10.1) mini_mime (1.0.2) - mini_portile2 (2.4.0) + mini_portile2 (2.5.0) minitest (5.11.3) ms_rest (0.7.6) concurrent-ruby (~> 1.0) @@ -730,17 +727,19 @@ GEM ruby2_keywords (~> 0.0.1) mustermann-grape (1.0.1) mustermann (>= 1.0.0) - nakayoshi_fork (0.0.4) nap (1.1.0) nenv (0.3.0) - net-ldap (0.16.2) + net-http-persistent (4.0.0) + connection_pool (~> 2.2) + net-ldap (0.16.3) net-ntp (2.1.3) net-ssh (6.0.0) netrc (0.11.0) nio4r (2.5.4) no_proxy_fix (0.1.2) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) nokogumbo (2.0.2) nokogiri (~> 1.8, >= 1.8.4) notiffany (0.1.3) @@ -840,13 +839,14 @@ GEM rubypants (~> 0.2) orm_adapter (0.5.0) os (1.1.1) - parallel (1.19.2) - parser (2.7.2.0) + parallel (1.20.1) + parser (3.0.0.0) ast (~> 2.4.1) parslet (1.8.2) peek (1.1.0) railties (>= 4.0.0) pg (1.2.3) + pg_query (1.3.0) png_quantizator (0.2.1) po_to_json (1.0.1) json (>= 1.6.0) @@ -866,14 +866,20 @@ GEM pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) - pry-byebug (3.9.0) - byebug (~> 11.0) - pry (~> 0.13.0) pry-rails (0.3.9) pry (>= 0.10.4) + pry-remote (0.1.8) + pry (~> 0.9) + slop (~> 3.0) public_suffix (4.0.6) + puma (5.1.1) + nio4r (~> 2.0) + puma_worker_killer (0.3.1) + get_process_mem (~> 0.2) + puma (>= 2.7) pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) + racc (1.5.2) rack (2.2.3) rack-accept (0.4.5) rack (>= 0.4) @@ -894,20 +900,20 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.5.2) - rails (6.0.3.3) - actioncable (= 6.0.3.3) - actionmailbox (= 6.0.3.3) - actionmailer (= 6.0.3.3) - actionpack (= 6.0.3.3) - actiontext (= 6.0.3.3) - actionview (= 6.0.3.3) - activejob (= 6.0.3.3) - activemodel (= 6.0.3.3) - activerecord (= 6.0.3.3) - activestorage (= 6.0.3.3) - activesupport (= 6.0.3.3) + rails (6.0.3.4) + actioncable (= 6.0.3.4) + actionmailbox (= 6.0.3.4) + actionmailer (= 6.0.3.4) + actionpack (= 6.0.3.4) + actiontext (= 6.0.3.4) + actionview (= 6.0.3.4) + activejob (= 6.0.3.4) + activemodel (= 6.0.3.4) + activerecord (= 6.0.3.4) + activestorage (= 6.0.3.4) + activesupport (= 6.0.3.4) bundler (>= 1.3.0) - railties (= 6.0.3.3) + railties (= 6.0.3.4) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -921,15 +927,15 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.0.3.3) - actionpack (= 6.0.3.3) - activesupport (= 6.0.3.3) + railties (6.0.3.4) + actionpack (= 6.0.3.4) + activesupport (= 6.0.3.4) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.0.0) raindrops (0.19.1) - rake (13.0.1) + rake (13.0.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -989,25 +995,25 @@ GEM chunky_png rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.1) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.0) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) + rspec-support (~> 3.10.0) rspec-parameterized (0.4.2) binding_ninja (>= 0.2.3) parser proc_to_ast rspec (>= 2.13, < 4) unparser - rspec-rails (4.0.0) + rspec-rails (4.0.1) actionpack (>= 4.2) activesupport (>= 4.2) railties (>= 4.2) @@ -1017,7 +1023,7 @@ GEM rspec-support (~> 3.9) rspec-retry (0.6.1) rspec-core (> 3.3) - rspec-support (3.9.2) + rspec-support (3.10.0) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) rspec_profiling (0.0.6) @@ -1025,26 +1031,26 @@ GEM pg rails sqlite3 - rubocop (0.89.1) + rubocop (0.91.1) parallel (~> 1.10) parser (>= 2.7.1.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.7) rexml - rubocop-ast (>= 0.3.0, < 1.0) + rubocop-ast (>= 0.4.0, < 1.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) rubocop-ast (0.8.0) parser (>= 2.7.1.5) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-performance (1.8.1) - rubocop (>= 0.87.0) + rubocop-performance (1.9.2) + rubocop (>= 0.90.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.8.1) + rubocop-rails (2.9.1) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.87.0) + rubocop (>= 0.90.0, < 2.0) rubocop-rspec (1.44.1) rubocop (~> 0.87) rubocop-ast (>= 0.7.1) @@ -1053,7 +1059,7 @@ GEM ruby-fogbugz (0.2.1) crack (~> 0.4) ruby-prof (1.3.1) - ruby-progressbar (1.10.1) + ruby-progressbar (1.11.0) ruby-saml (1.7.2) nokogiri (>= 1.5.10) ruby-statistics (2.1.2) @@ -1127,6 +1133,7 @@ GEM simplecov-html (0.12.2) sixarm_ruby_unaccent (1.2.0) slack-messenger (2.3.4) + slop (3.6.0) snowplow-tracker (0.6.1) contracts (~> 0.7, <= 0.11) spring (2.1.1) @@ -1143,12 +1150,12 @@ GEM sshkey (2.0.0) stackprof (0.2.15) state_machines (0.5.0) - state_machines-activemodel (0.7.1) - activemodel (>= 4.1) + state_machines-activemodel (0.8.0) + activemodel (>= 5.1) state_machines (>= 0.5.0) - state_machines-activerecord (0.6.0) - activerecord (>= 4.1) - state_machines-activemodel (>= 0.5.0) + state_machines-activerecord (0.8.0) + activerecord (>= 5.1) + state_machines-activemodel (>= 0.8.0) swd (1.1.2) activesupport (>= 3) attr_required (>= 0.0.5) @@ -1185,7 +1192,7 @@ GEM truncato (0.7.11) htmlentities (~> 4.3.1) nokogiri (>= 1.7.0, <= 2.0) - tzinfo (1.2.8) + tzinfo (1.2.9) thread_safe (~> 0.1) u2f (0.2.1) uber (0.1.0) @@ -1193,8 +1200,6 @@ GEM unf_ext unf_ext (0.0.7.7) unicode-display_width (1.7.0) - unicode_plot (0.0.4) - enumerable-statistics (>= 2.0.1) unicode_utils (1.4.0) unicorn (5.5.5) kgio (~> 2.6) @@ -1247,6 +1252,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.6.1) websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -1259,7 +1265,7 @@ GEM xpath (3.2.0) nokogiri (~> 1.8) yajl-ruby (1.4.1) - zeitwerk (2.4.1) + zeitwerk (2.4.2) PLATFORMS ruby @@ -1268,11 +1274,11 @@ DEPENDENCIES RedCloth (~> 4.3.2) acme-client (~> 2.0, >= 2.0.6) activerecord-explain-analyze (~> 0.1) - acts-as-taggable-on (~> 6.0) + acts-as-taggable-on (~> 7.0) addressable (~> 2.7) akismet (~> 3.0) apollo_upload_server (~> 2.0.2) - asana (= 0.10.2) + asana (~> 0.10.3) asciidoctor (~> 2.0.10) asciidoctor-include-ext (~> 0.3.1) asciidoctor-kroki (~> 0.2.2) @@ -1297,7 +1303,7 @@ DEPENDENCIES browser (~> 4.2) bullet (~> 6.1.0) bundler-audit (~> 0.6.1) - capybara (~> 3.33.0) + capybara (~> 3.34.0) capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) @@ -1329,7 +1335,7 @@ DEPENDENCIES email_spec (~> 2.2.0) erubi (~> 1.9.0) escape_utils (~> 1.1) - factory_bot_rails (~> 5.1.0) + factory_bot_rails (~> 6.1.0) faraday (~> 1.0) faraday_middleware-aws-sigv4 (~> 0.3.0) fast_blank @@ -1339,7 +1345,7 @@ DEPENDENCIES flipper-active_support_cache_store (~> 0.17.1) flowdock (~> 0.7) fog-aliyun (~> 0.3) - fog-aws (~> 3.7) + fog-aws (~> 3.8) fog-core (= 2.1.0) fog-google (~> 1.12) fog-local (~> 0.6) @@ -1351,30 +1357,28 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 13.7.0.pre.rc1) + gitaly (~> 13.8.0.pre.rc2) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-experiment (~> 0.4.4) + gitlab-experiment (~> 0.4.5) gitlab-fog-azure-rm (~> 1.0) - gitlab-labkit (= 0.13.3) + gitlab-labkit (= 0.14.0) gitlab-license (~> 1.0) gitlab-mail_room (~> 0.0.8) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) - gitlab-pg_query (~> 1.3) - gitlab-puma (~> 4.3.3.gitlab.2) - gitlab-puma_worker_killer (~> 0.1.1.gitlab.1) + gitlab-pry-byebug gitlab-sidekiq-fetcher (= 0.5.2) - gitlab-styles (~> 5.3.0) + gitlab-styles (~> 6.0.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) google-api-client (~> 0.33) google-protobuf (~> 3.12) gpgme (~> 2.0.19) - grape (= 1.4.0) + grape (~> 1.5.1) grape-entity (~> 0.7.1) - grape-path-helpers (~> 1.5) + grape-path-helpers (~> 1.6.1) grape_logging (~> 1.7) graphiql-rails (~> 1.4.10) graphlient (~> 0.4.0) @@ -1390,13 +1394,13 @@ DEPENDENCIES hashie-forbidden_attributes health_check (~> 3.0) hipchat (~> 1.5.0) - html-pipeline (~> 2.12) + html-pipeline (~> 2.13.2) html2text httparty (~> 0.16.4) icalendar - invisible_captcha (~> 0.12.1) + invisible_captcha (~> 1.1.0) ipaddress (~> 0.8.3) - jira-ruby (~> 2.0.0) + jira-ruby (~> 2.1.4) js_regex (~> 3.4) json (~> 2.3.0) json-schema (~> 2.8.0) @@ -1414,18 +1418,17 @@ DEPENDENCIES loofah (~> 2.2) lru_redux mail (= 2.7.1) - marginalia (~> 1.9.0) + marginalia (~> 1.10.0) memory_profiler (~> 0.9) method_source (~> 1.0) mimemagic (~> 0.3.2) mini_magick (~> 4.10.1) minitest (~> 5.11.0) multi_json (~> 1.14.1) - nakayoshi_fork (~> 0.0.4) - net-ldap + net-ldap (~> 0.16.3) net-ntp net-ssh (~> 6.0) - nokogiri (~> 1.10.9) + nokogiri (~> 1.11.1) oauth2 (~> 1.4) octokit (~> 4.15) oj (~> 3.10.6) @@ -1451,11 +1454,14 @@ DEPENDENCIES parallel (~> 1.19) peek (~> 1.1) pg (~> 1.1) + pg_query (~> 1.3.0) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.12.0) - pry-byebug (~> 3.9.0) pry-rails (~> 0.3.9) + pry-remote + puma (~> 5.1.1) + puma_worker_killer (~> 0.3.1) rack (~> 2.2.3) rack-attack (~> 6.3.0) rack-cors (~> 1.0.6) @@ -1481,7 +1487,7 @@ DEPENDENCIES rouge (~> 3.26.0) rqrcode-rails3 (~> 0.1.7) rspec-parameterized - rspec-rails (~> 4.0.0) + rspec-rails (~> 4.0.1) rspec-retry (~> 0.6.1) rspec_junit_formatter rspec_profiling (~> 0.0.6) @@ -1511,7 +1517,7 @@ DEPENDENCIES sprockets (~> 3.7.0) sshkey (~> 2.0) stackprof (~> 0.2.15) - state_machines-activerecord (~> 0.6.0) + state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.1.6) terser (= 1.0.2) test-prof (~> 0.12.0) @@ -1530,6 +1536,7 @@ DEPENDENCIES vmstat (~> 2.3.0) webauthn (~> 2.3) webmock (~> 3.9.1) + webrick (~> 1.6.1) wikicloth (= 0.8.1) yajl-ruby (~> 1.4.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index a4758f7418ed8..20857db26660d 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -26,10 +26,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wpmxbprsqclna9xpa6b7sspjb89p6jqfxalasa9f984hx77dx27"; + sha256 = "0y3aa0965cdsqamxk8ac6brcvijl1zv4pvqils6xy3pbcrv0ljid"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0smcxpn3glnmid3v2pk04sb3bdifbw7ad1c7fq6wfijkrpih8jiw"; + sha256 = "10vb9s4frq22h5j6gyw2598k1jc29lg2czm95hf284l3mi4qly6a"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; @@ -48,10 +48,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1spq0dbfn0qkqg9sq0rsjn360b4j36zly8hawaivkrwr3rsvyz75"; + sha256 = "1ykn5qkwdlcv5aa1gjhhmrxpjccwa7df6n4amvkmvxv5lggyma52"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -59,10 +59,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p873nqwmpsvmkb5n86d70wndx1qhy15pc9mbcd1mc8sj174578b"; + sha256 = "0fbjpnh5hrihc9l35q9why6ip0hcdj42axzbp6b4j1xcy1v1bicj"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -70,10 +70,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05ysfz9dwnncdx0g452by7jdr35yryz6lmcrbb4r5wgjm57b4n25"; + sha256 = "0r0j0m76ynjspmvj5qbzl06kl9i920v269iz62y62009xydv6rqz"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -81,10 +81,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08pvmjddlw01q5r9zdfgddwp4csndpf5i2w47677z5r36jznz36q"; + sha256 = "0gdz31cq08nrqq6bxqim2qcbzv0fr34z6ycl73dmawpafj33wdkj"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -92,10 +92,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w54ckvc229iaax879hkhyc93j7z8p0v7acp6mk3h8xjfvmwy5jp"; + sha256 = "0d0p8gjplrgym38dmchyzhv7lrrxngz0yrxl6xyvwxfxm1hgdk2k"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; activemodel = { dependencies = ["activesupport"]; @@ -103,10 +103,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "166jlx6kbby01vr37srh081a9fykgsz873yg5i9gl2ar3vw9gs56"; + sha256 = "00jj8namy5niq7grl5lrsr4y351rxpj1b69k1i9gvb1hnpghl099"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y2a4ss6ld6yrhpcbcb3kjn5gj6zk9qklp2aq5rl1awl8vbdbdb7"; + sha256 = "06qvvp73z8kq9sd2mhw6p9124q5pfkswjga2fidz4c73zbr79r3g"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -136,10 +136,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nvfjkq979m1h4mk1ys7m4irwpswn4l9arb9yi06ffqpi1lpfl31"; + sha256 = "0q734331wb7cfsh4jahj3lphpxvglzb17yvibwss1ml4g01xxm52"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -147,10 +147,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dmkqbvndbz011a1byg6f990936vfadbnwjwjw9vjzr4kd8bxk96"; + sha256 = "1axidc4mikgi4yxs0ynw2c54jyrs5lxprxmzv6m3aayi9rg6rk5j"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -158,10 +158,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nvhd986xa6llyjnhikq4h1nrcf5b9r9s11if25qsj8358inrpga"; + sha256 = "09m7lvm6id8mm8y9qycjr54l9gyqfb43x6yjz23cggisjg0px1fv"; type = "gem"; }; - version = "6.5.0"; + version = "7.0.0"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -232,10 +232,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c8n8i3jb2q09l6rgcw0lb4sq85jzz6vywqlrd0ivq989zh3sq2l"; + sha256 = "14cs2k802hlvlmn0nwnx4k3g44944x0a8dsj3k14mjnbvcw1fkxh"; type = "gem"; }; - version = "0.10.2"; + version = "0.10.3"; }; asciidoctor = { groups = ["default"]; @@ -423,21 +423,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qpvjyaq8478hw4cxcf8lr303wn8g9mhrfmvihyzn3zn9hll4zvd"; + sha256 = "01psx005lkrfk3zm816z76fa2pv4hd8jk7hxrjyy4hbvgcqi6rfy"; type = "gem"; }; - version = "2.0.0"; + version = "2.0.1"; }; azure-storage-common = { - dependencies = ["faraday" "faraday_middleware" "nokogiri"]; + dependencies = ["faraday" "faraday_middleware" "net-http-persistent" "nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nhjw77r65xrkdn2h6cd76mglgx676hyr58igyfb9f7zbgvjp69s"; + sha256 = "0h5bwswc5768hblcxsschjz3y0lf9kvz3k7qqwypdhy8sr1lfxg8"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.2"; }; babosa = { groups = ["default"]; @@ -635,10 +635,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ji9kyb01dpnjbvpyb0c481cpnisd6wx6div6rywi9fihk66627w"; + sha256 = "1i1bm7r8n67cafd9p3ck7vdmng921b41n9znvlfaz7cy8a3gsrgm"; type = "gem"; }; - version = "3.33.0"; + version = "3.34.0"; }; capybara-screenshot = { dependencies = ["capybara" "launchy"]; @@ -1004,15 +1004,15 @@ version = "1.5.1"; }; derailed_benchmarks = { - dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "mini_histogram" "rack" "rake" "ruby-statistics" "thor" "unicode_plot"]; - groups = ["default"]; + dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "mini_histogram" "rack" "rake" "ruby-statistics" "thor"]; + groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03lrvzvdjy6wyrnb3nw7nqn9jbhn6lncach58pj6m4l76b2n6jpr"; + sha256 = "05nryqr18w61dyk9amajh7chn07zxardxnywayyis72kmd8f9q29"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.1"; }; device_detector = { groups = ["default"]; @@ -1051,10 +1051,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; + sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz"; type = "gem"; }; - version = "1.3"; + version = "1.4.4"; }; diff_match_patch = { groups = ["default"]; @@ -1131,15 +1131,15 @@ version = "1.7.4"; }; dry-configurable = { - dependencies = ["concurrent-ruby" "dry-core" "dry-equalizer"]; + dependencies = ["concurrent-ruby" "dry-core"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "033x4gvynfm33pchmpd5iw9n4c9q46j8vbwbcdmvb8b2r0gpzfdn"; + sha256 = "0rvwvxrvcygvgfc3xjrihvdvnr0dh2144s8x80zfgfnz0jd5gac7"; type = "gem"; }; - version = "0.11.5"; + version = "0.12.0"; }; dry-container = { dependencies = ["concurrent-ruby" "dry-configurable"]; @@ -1158,10 +1158,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k9ff2sr4ymiwzg4mchzv66mn6rdsgjlinm6s4x5x91yhd0h4vpk"; + sha256 = "14s45hxcqpp2mbvwlwzn018i8qhcjzgkirigdrv31jd741rpgy9s"; type = "gem"; }; - version = "0.4.9"; + version = "0.5.0"; }; dry-equalizer = { groups = ["default"]; @@ -1184,15 +1184,15 @@ version = "0.2.0"; }; dry-logic = { - dependencies = ["concurrent-ruby" "dry-core" "dry-equalizer"]; + dependencies = ["concurrent-ruby" "dry-core"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cqvylwv71sm9zrb0lpxmghn20zxnjswxwyhaj8y2wfniffyjgkc"; + sha256 = "17dnc3g9y2nj42rdx2bdvsvvms10vgw4qzjb2iw2gln9hj8b797c"; type = "gem"; }; - version = "1.0.6"; + version = "1.1.0"; }; dry-types = { dependencies = ["concurrent-ruby" "dry-container" "dry-core" "dry-equalizer" "dry-inflector" "dry-logic"]; @@ -1311,16 +1311,6 @@ }; version = "3.0.0"; }; - enumerable-statistics = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ac2f5g4m58l6bmap1ak6vgqykz2hy9n3c8r6dmlr2xjybdryc1f"; - type = "gem"; - }; - version = "2.0.1"; - }; equalizer = { groups = ["default" "development" "test"]; platforms = []; @@ -1419,10 +1409,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04mvwcdh1056r79vq969vlncrcy53fkhw0iixpqvp8gnx5ajbsv6"; + sha256 = "11ij9s4hasy963qjqbrrf0m8lm9m9pxkh2vf4wrnafa6gw6r9qk8"; type = "gem"; }; - version = "5.1.0"; + version = "6.1.0"; }; factory_bot_rails = { dependencies = ["factory_bot" "railties"]; @@ -1430,10 +1420,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02q7lwfdilwahza2jz0p0kc2rragv617q9r2yy72syv6lfy923sx"; + sha256 = "0hfxkq6rarg0b8xfzqg200xyj176sn1xplqqqcrz5drhkqp30m14"; type = "gem"; }; - version = "5.1.0"; + version = "6.1.0"; }; faraday = { dependencies = ["multipart-post"]; @@ -1612,10 +1602,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1764kvyzigaxwmxgfggpqq15qpplm77j2nmvhf8f0gybsm3vbrbn"; + sha256 = "1q7n8r03akjbdz3r2bgsl6wcjvdlf0k508z8bsd9zgs43qg14vc9"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.0"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -1808,10 +1798,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1al29diaj9zrkj1rxwrqd644f2winv81dmnjycvm0gsim0vvw2hq"; + sha256 = "0kns9lw8gdxm61vyvf3jin448zrl2h3qdx2ggilzxig28hdi0vha"; type = "gem"; }; - version = "13.7.0.pre.rc1"; + version = "13.8.0.pre.rc2"; }; github-markup = { groups = ["default"]; @@ -1840,10 +1830,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12ng0q49vl4k80m3hyx6bz915x1gmfmxjvgzdp3w0q77j4qv6nwi"; + sha256 = "1v8ygrc2c98rz72za59g313n1mmr18jdbzr965lkp2zv2rw7cs9n"; type = "gem"; }; - version = "0.4.4"; + version = "0.4.5"; }; gitlab-fog-azure-rm = { dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"]; @@ -1862,10 +1852,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x4d5dl60cfvvqj89b8blpsxa7lbbblqwdqy8kc1z51gira7i803"; + sha256 = "0l4sbvlk6qc0x8372rp1gc2ihmx3vp0afrm5cy55xhflq16y7sl1"; type = "gem"; }; - version = "0.13.3"; + version = "0.14.0"; }; gitlab-license = { groups = ["default"]; @@ -1912,32 +1902,25 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xvzs8gy6vbddzf9kin92lqb99vzwljikfgqvxbxqm7hzl16dilq"; + sha256 = "1rybirjyclavp641qdx27483xx0zpmc577wdzfgdnjd7753bya7g"; type = "gem"; }; - version = "1.3.0"; - }; - gitlab-puma = { - dependencies = ["nio4r"]; - groups = ["puma"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05hazn3cq079zynj0viagly6bgh4x7pb2vqki9rgf2k39ljwrmld"; - type = "gem"; - }; - version = "4.3.5.gitlab.3"; + version = "1.3.1"; }; - gitlab-puma_worker_killer = { - dependencies = ["get_process_mem" "gitlab-puma"]; - groups = ["puma"]; - platforms = []; + gitlab-pry-byebug = { + dependencies = ["byebug" "pry"]; + groups = ["development" "test"]; + platforms = [{ + engine = "maglev"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iagbqh4djbxfd18srvfg9qcxn845ibs3kf0q1sd57k27lxj0har"; + sha256 = "0sp33vzzw8b7q9d8kb4pw8cl5fzlbffdpwz125x1g3kdiwz8xp3j"; type = "gem"; }; - version = "0.1.1.gitlab.1"; + version = "3.9.0"; }; gitlab-sidekiq-fetcher = { dependencies = ["sidekiq"]; @@ -1956,10 +1939,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14zg4mxj780ssk6lg8mvy4br3327cdlq17k5sds8zk2glng9vmsh"; + sha256 = "17d238cy031gnjmrk6wl3qyk5kqhqjxrb68813n4y9ia817xmwyp"; type = "gem"; }; - version = "5.3.0"; + version = "6.0.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -2076,10 +2059,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03ylzpn9mng9kwk472xbsfnqcbnm0qcjjlscp17hijvpvafd8a09"; + sha256 = "0lizcma35sygkd3q7zjv13mrr905ncn80f1ym6n305s75kc0pk9n"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.1"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -2093,15 +2076,15 @@ version = "0.7.1"; }; grape-path-helpers = { - dependencies = ["activesupport" "grape" "rake"]; + dependencies = ["activesupport" "grape" "rake" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "131s6a0xa0fj7w5d6xb2p2z3404w6rxbc33v7fcg50jrjgqphrjz"; + sha256 = "1xdp7b5fnvm89szy8ghpl6wm125iq7f0qnhibj5bxqrvg3xyhc2m"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.1"; }; grape_logging = { dependencies = ["grape" "rack"]; @@ -2318,14 +2301,15 @@ version = "3.0.0"; }; heapy = { - groups = ["default"]; + dependencies = ["thor"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r9f38fpgjgaxskkwvsliijj6vfmgsff9pnranvvvzkdl67hk1hw"; + sha256 = "1sl56ma851i82g3ax08igbn48igriiy152xzx30wgzv1bn21w53l"; type = "gem"; }; - version = "0.1.4"; + version = "0.2.0"; }; hipchat = { dependencies = ["httparty" "mimemagic"]; @@ -2344,10 +2328,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19hc7njr029pzqljpfhzhdi0p2rgn8ihn3bdnai2apy6nj1g1sg2"; + sha256 = "00xqmlny1b4ixff8sk0rkl4wcgwqc6v93qv8l3rn8d1dppvq7pm1"; type = "gem"; }; - version = "2.12.2"; + version = "2.13.2"; }; html2text = { dependencies = ["nokogiri"]; @@ -2450,10 +2434,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + sha256 = "1kr0bx9323fv5ys6nlhsy05kmwcbs94h6ac7ka9qqywy0vbdvrrv"; type = "gem"; }; - version = "1.8.5"; + version = "1.8.7"; }; i18n_data = { groups = ["default"]; @@ -2491,10 +2475,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15510dh1vh7l2xs2a4956nhxpnf10168r62i497nmcbyqpp1df88"; + sha256 = "1lmlx3g4z894vwsgbpxhpmkn63n74mynklbwy07l7ccak552jw1n"; type = "gem"; }; - version = "0.12.1"; + version = "1.1.0"; }; ipaddress = { groups = ["default"]; @@ -2523,10 +2507,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bfqb5qkgbcjrspspa2lha2is0anjnby20x9gp7bfjr5j5j9my32"; + sha256 = "17nv98nz3jp7q5hbnniscavqh4xv53mnda1vxyg3ncn8raaw0rs2"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.4"; }; jmespath = { groups = ["default"]; @@ -2813,10 +2797,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq"; + sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; lru_redux = { groups = ["default"]; @@ -2866,10 +2850,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n870r50z859dkcjz6dqvbvm895rpzw047basvbbfv9gi22rlxlv"; + sha256 = "1003hf828anbd3pxwzs9ir9sclh64mgj971n4a7ilgj9xs8r0a38"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; memoist = { groups = ["default"]; @@ -2948,14 +2932,14 @@ version = "0.3.5"; }; mini_histogram = { - groups = ["default"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "127vmd85kwi85qjbb1431bi4j5gdy0pp6wrq1f88ja1pf3mlb50y"; + sha256 = "156xs8k7fqqcbk1fbf0ndz6gfw380fb2jrycfvhb06269r84n4ba"; type = "gem"; }; - version = "0.1.3"; + version = "0.3.1"; }; mini_magick = { groups = ["default"]; @@ -2982,10 +2966,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; minitest = { groups = ["development" "test"]; @@ -3091,16 +3075,6 @@ }; version = "1.0.1"; }; - nakayoshi_fork = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mj5czi7rxxmfq4v9qjz74lcqypvnjxhxqfs71zhb2rsfa97a6jg"; - type = "gem"; - }; - version = "0.0.4"; - }; nap = { groups = ["default" "development"]; platforms = []; @@ -3121,15 +3095,26 @@ }; version = "0.3.0"; }; + net-http-persistent = { + dependencies = ["connection_pool"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sbdvkn7mzl883iykz74hgp14qj041gldf2vdk9g3gyqc843l2vr"; + type = "gem"; + }; + version = "4.0.0"; + }; net-ldap = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vzfhivjfr9q65hkln7xig3qcba6fw9y4kb4384fpm7d7ww0b7xg"; + sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv"; type = "gem"; }; - version = "0.16.2"; + version = "0.16.3"; }; net-ntp = { groups = ["default"]; @@ -3182,15 +3167,15 @@ version = "0.1.2"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; + sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; type = "gem"; }; - version = "1.10.10"; + version = "1.11.1"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -3594,10 +3579,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l"; + sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; type = "gem"; }; - version = "1.19.2"; + version = "1.20.1"; }; parser = { dependencies = ["ast"]; @@ -3605,10 +3590,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z"; + sha256 = "1jixakyzmy0j5c1rb0fjrrdhgnyryvrr6vgcybs14jfw09akv5ml"; type = "gem"; }; - version = "2.7.2.0"; + version = "3.0.0.0"; }; parslet = { groups = ["default" "development" "test"]; @@ -3641,6 +3626,16 @@ }; version = "1.2.3"; }; + pg_query = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i9l3y502ddm2lq3ajhxhqq17vs9hgxkxm443yw221ccibcfh6qf"; + type = "gem"; + }; + version = "1.3.0"; + }; png_quantizator = { groups = ["development" "test"]; platforms = []; @@ -3730,31 +3725,27 @@ }; version = "0.13.1"; }; - pry-byebug = { - dependencies = ["byebug" "pry"]; + pry-rails = { + dependencies = ["pry"]; groups = ["development" "test"]; - platforms = [{ - engine = "maglev"; - } { - engine = "ruby"; - }]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "096y5vmzpyy4x9h4ky4cs4y7d19vdq9vbwwrqafbh5gagzwhifiv"; + sha256 = "1cf4ii53w2hdh7fn8vhqpzkymmchjbwij4l3m7s6fsxvb9bn51j6"; type = "gem"; }; - version = "3.9.0"; + version = "0.3.9"; }; - pry-rails = { - dependencies = ["pry"]; + pry-remote = { + dependencies = ["pry" "slop"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cf4ii53w2hdh7fn8vhqpzkymmchjbwij4l3m7s6fsxvb9bn51j6"; + sha256 = "10g1wrkcy5v5qyg9fpw1cag6g5rlcl1i66kn00r7kwqkzrdhd7nm"; type = "gem"; }; - version = "0.3.9"; + version = "0.1.8"; }; public_suffix = { groups = ["default" "development" "test"]; @@ -3766,6 +3757,28 @@ }; version = "4.0.6"; }; + puma = { + dependencies = ["nio4r"]; + groups = ["puma"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13640p5fk19705ygp8j6p07lccag3d80bx8bmjgpd5zsxxsdc50b"; + type = "gem"; + }; + version = "5.1.1"; + }; + puma_worker_killer = { + dependencies = ["get_process_mem" "puma"]; + groups = ["puma"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jk1bhmx5px8y1ip4ky80cq5cwdaybdg4y55shd2vsdmjv938mcw"; + type = "gem"; + }; + version = "0.3.1"; + }; pyu-ruby-sasl = { groups = ["default"]; platforms = []; @@ -3786,6 +3799,16 @@ }; version = "1.1.6"; }; + racc = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; + }; rack = { groups = ["default" "development" "kerberos" "test"]; platforms = []; @@ -3889,10 +3912,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qqsiwsb13sxkvxj54aybjhbxqi45fyiykaz5isc1y9frm2yyw64"; + sha256 = "0vs4kfgp5pr5032nnhdapq60ga6karann06ilq1yjx8qck87cfxg"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -3944,10 +3967,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05b79r0ms8jrs91zml1190qfxmnmks90g0sd820ks9msyr8xdp7j"; + sha256 = "0x28620cvfja8r06lk6f90pw5lvijz9qi4bjsa4z1d1rkr3v4r3w"; type = "gem"; }; - version = "6.0.3.3"; + version = "6.0.3.4"; }; rainbow = { groups = ["default" "development" "test"]; @@ -3974,10 +3997,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; + sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; type = "gem"; }; - version = "13.0.1"; + version = "13.0.3"; }; rb-fsevent = { groups = ["default" "development" "test"]; @@ -4305,10 +4328,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hzsig4pi9ybr0xl5540m1swiyxa74c8h09225y5sdh2rjkkg84h"; + sha256 = "1dwai7jnwmdmd7ajbi2q0k0lx1dh88knv5wl7c34wjmf94yv8w5q"; type = "gem"; }; - version = "3.9.0"; + version = "3.10.0"; }; rspec-core = { dependencies = ["rspec-support"]; @@ -4316,10 +4339,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qzc1wdjb1qnbimjl8i1q1r1z5hdv2lmcw7ysz7jawj4d1cvpqvd"; + sha256 = "0n2rdv8f26yw8c6asymc0mgddyr5d2b5n6mfvpd3n6lnpf1jdyv2"; type = "gem"; }; - version = "3.9.1"; + version = "3.10.0"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -4327,10 +4350,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fjbwvq7qaz6h3sh1bs9q2qiy4zwcrc8f7xwv82dx2bc09dmqzhd"; + sha256 = "0j37dvnvfbjwj8dqx27yfvz0frl7f2jc1abqg99h0ppriz9za6dc"; type = "gem"; }; - version = "3.9.1"; + version = "3.10.0"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -4338,10 +4361,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr"; + sha256 = "1pz89y1522i6f8wzrg72ykmch3318ih87nlpl0y1ghsrs5hqymw3"; type = "gem"; }; - version = "3.9.1"; + version = "3.10.0"; }; rspec-parameterized = { dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"]; @@ -4360,10 +4383,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01cyd449g4lsgrlck7nn3ynn8c8vwfhjb913y05wil56y77wsfkl"; + sha256 = "0lzik01ziaskgpdpy8knffpw0fsy9151f5lfigyhb89wq4q45hfs"; type = "gem"; }; - version = "4.0.0"; + version = "4.0.1"; }; rspec-retry = { dependencies = ["rspec-core"]; @@ -4381,10 +4404,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zwpyq1na23pvgacpxs2v9nwfbjbw6x3arca5j3l1xagigqmzhc3"; + sha256 = "0j0n28i6zci5j7gg370bdy87dy43hlwx6dw428d9kamf5a0i2klz"; type = "gem"; }; - version = "3.9.2"; + version = "3.10.0"; }; rspec_junit_formatter = { dependencies = ["rspec-core"]; @@ -4414,10 +4437,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yh71v5d7aw6jz7505d2sv0n0ldf3wh0ly3lphdanjl0n8b42y9h"; + sha256 = "19nmdwz6mc5ah0xqlj1j58ylcp9zsckb1xm7p1z51abnqhcq5c06"; type = "gem"; }; - version = "0.89.1"; + version = "0.91.1"; }; rubocop-ast = { dependencies = ["parser"]; @@ -4447,10 +4470,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13v66wi5l56bvp97nlmyxscq8ipkzfha1g7nlhcrbikvmrm3h5kf"; + sha256 = "01aahh54r9mwhdj7v2s6kmkdm1k1n1z27dlknlbgm281ny1aswrk"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.2"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; @@ -4458,10 +4481,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14g703lv0cbqw504cdjsv0yydrsnm61rwg0n0mql4zl5hw1n7lfh"; + sha256 = "0h656la1g644g54g3gidz45p6v8i1156nw6bi66cfx7078y1339d"; type = "gem"; }; - version = "2.8.1"; + version = "2.9.1"; }; rubocop-rspec = { dependencies = ["rubocop" "rubocop-ast"]; @@ -4511,10 +4534,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; + sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; type = "gem"; }; - version = "1.10.1"; + version = "1.11.0"; }; ruby-saml = { dependencies = ["nokogiri"]; @@ -4885,6 +4908,16 @@ }; version = "2.3.4"; }; + slop = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n"; + type = "gem"; + }; + version = "3.6.0"; + }; snowplow-tracker = { dependencies = ["contracts"]; groups = ["default"]; @@ -4985,10 +5018,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05c2dw3115zj3pmyyqh2iypc7afj8ibhrghisg0d61z7gzmir1rd"; + sha256 = "0b4dffzlj38adin6gm0ky72r5c507qdb1jprnm7h9gnlj2qxlcp9"; type = "gem"; }; - version = "0.7.1"; + version = "0.8.0"; }; state_machines-activerecord = { dependencies = ["activerecord" "state_machines-activemodel"]; @@ -4996,10 +5029,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12g7yqy11fpfiprzc86pwa9jjky1h3haxj37kg47467fgg43p511"; + sha256 = "1dmaf4f4cg3gamzgga3gamp0kv9lvianqzr9103dw0xbp00vfbq7"; type = "gem"; }; - version = "0.6.0"; + version = "0.8.0"; }; swd = { dependencies = ["activesupport" "attr_required" "httpclient"]; @@ -5226,10 +5259,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0skr6ih9cr3pwp8l84f0z7fy3q9kiq8hw0sg3zqw0hpbbyj05743"; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; type = "gem"; }; - version = "1.2.8"; + version = "1.2.9"; }; u2f = { groups = ["default"]; @@ -5282,17 +5315,6 @@ }; version = "1.7.0"; }; - unicode_plot = { - dependencies = ["enumerable-statistics"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09cv90pi414ns1knbi0zjbn59071qjgym974jpsgj7yjh70dpj0g"; - type = "gem"; - }; - version = "0.0.4"; - }; unicode_utils = { groups = ["default"]; platforms = []; @@ -5475,6 +5497,16 @@ }; version = "3.9.1"; }; + webrick = { + groups = ["metrics"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z6nv626lzfl7wx407l5x5688layh9qd82k97hrm6pwgj6miwk8b"; + type = "gem"; + }; + version = "1.6.1"; + }; websocket-driver = { dependencies = ["websocket-extensions"]; groups = ["default" "test"]; @@ -5553,9 +5585,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12n0hiawqayzchi0yga5n19hi63b2snd49fv3n23n2i4pp05jzrp"; + sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; type = "gem"; }; - version = "2.4.1"; + version = "2.4.2"; }; } diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index ba24888d9522b..74d4020f22de8 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -778,19 +778,27 @@ }; } { - name = "_gitlab_eslint_plugin___eslint_plugin_5.0.0.tgz"; + name = "_gitlab_eslint_plugin___eslint_plugin_6.0.0.tgz"; path = fetchurl { - name = "_gitlab_eslint_plugin___eslint_plugin_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-5.0.0.tgz"; - sha1 = "502eb2bccb55d65d6310ce9ef2da76035b6fc319"; + name = "_gitlab_eslint_plugin___eslint_plugin_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-6.0.0.tgz"; + sha1 = "deb18f63808af1cb1cc117a92558f07edb1e2256"; }; } { - name = "_gitlab_svgs___svgs_1.177.0.tgz"; + name = "_gitlab_favicon_overlay___favicon_overlay_2.0.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.177.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.177.0.tgz"; - sha1 = "e481ed327a11d3834c8b1668d7485b9eefef97f5"; + name = "_gitlab_favicon_overlay___favicon_overlay_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/favicon-overlay/-/favicon-overlay-2.0.0.tgz"; + sha1 = "2f32d0b6a4d5b8ac44e2927083d9ab478a78c984"; + }; + } + { + name = "_gitlab_svgs___svgs_1.178.0.tgz"; + path = fetchurl { + name = "_gitlab_svgs___svgs_1.178.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.178.0.tgz"; + sha1 = "069edb8abb4c7137d48f527592476655f066538b"; }; } { @@ -802,11 +810,11 @@ }; } { - name = "_gitlab_ui___ui_24.8.1.tgz"; + name = "_gitlab_ui___ui_25.11.3.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_24.8.1.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-24.8.1.tgz"; - sha1 = "eb674d19aedf9c91b9a14aa7a66397d54b199fb7"; + name = "_gitlab_ui___ui_25.11.3.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-25.11.3.tgz"; + sha1 = "54719d1276f417e66904f9f951671633f1647006"; }; } { @@ -970,19 +978,19 @@ }; } { - name = "_rails_actioncable___actioncable_6.0.3_3.tgz"; + name = "_rails_actioncable___actioncable_6.1.0.tgz"; path = fetchurl { - name = "_rails_actioncable___actioncable_6.0.3_3.tgz"; - url = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.0.3-3.tgz"; - sha1 = "fb1a46d3d353512764d5fa3cea2f492391601b7a"; + name = "_rails_actioncable___actioncable_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.1.0.tgz"; + sha1 = "f336f25450b1bc43b99bc60557a70b6e6bb1d3d2"; }; } { - name = "_rails_ujs___ujs_6.0.3_2.tgz"; + name = "_rails_ujs___ujs_6.1.0.tgz"; path = fetchurl { - name = "_rails_ujs___ujs_6.0.3_2.tgz"; - url = "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.0.3-2.tgz"; - sha1 = "e14c1f29086858215ce7ccd9ad6d8888c458b4a3"; + name = "_rails_ujs___ujs_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.0.tgz"; + sha1 = "9a48df6511cb2b472c9f596c1f37dc0af022e751"; }; } { @@ -1178,11 +1186,11 @@ }; } { - name = "_types_json_schema___json_schema_7.0.4.tgz"; + name = "_types_json_schema___json_schema_7.0.6.tgz"; path = fetchurl { - name = "_types_json_schema___json_schema_7.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz"; - sha1 = "38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"; + name = "_types_json_schema___json_schema_7.0.6.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz"; + sha1 = "f4c7ec43e81b319a9815115031709f26987891f0"; }; } { @@ -1314,11 +1322,11 @@ }; } { - name = "_vue_test_utils___test_utils_1.0.0_beta.30.tgz"; + name = "_vue_test_utils___test_utils_1.1.2.tgz"; path = fetchurl { - name = "_vue_test_utils___test_utils_1.0.0_beta.30.tgz"; - url = "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.30.tgz"; - sha1 = "d5f26d1e2411fdb7fa7fdedb61b4b4ea4194c49d"; + name = "_vue_test_utils___test_utils_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.1.2.tgz"; + sha1 = "fdb487448dceefeaf3d01d465f7c836a3d666dbc"; }; } { @@ -1538,11 +1546,11 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz"; - sha1 = "294adb71b57398b0680015f0a38c563ee1db5384"; + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; + sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b"; }; } { @@ -1610,19 +1618,19 @@ }; } { - name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; path = fetchurl { - name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; - sha1 = "ef916e271c64ac12171fd8384eaae6b2345854da"; + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; }; } { - name = "ajv___ajv_6.12.5.tgz"; + name = "ajv___ajv_6.12.6.tgz"; path = fetchurl { - name = "ajv___ajv_6.12.5.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz"; - sha1 = "19b0e8bae8f476e5ba666300387775fb1a00a4da"; + name = "ajv___ajv_6.12.6.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; + sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; }; } { @@ -4402,11 +4410,11 @@ }; } { - name = "dompurify___dompurify_2.2.4.tgz"; + name = "dompurify___dompurify_2.2.6.tgz"; path = fetchurl { - name = "dompurify___dompurify_2.2.4.tgz"; - url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.4.tgz"; - sha1 = "a98cd182b729bdd8715c3eb7a8bf8eafb2ff7410"; + name = "dompurify___dompurify_2.2.6.tgz"; + url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.6.tgz"; + sha1 = "54945dc5c0b45ce5ae228705777e8e59d7b2edc4"; }; } { @@ -4874,11 +4882,11 @@ }; } { - name = "eslint_plugin_vue___eslint_plugin_vue_6.2.2.tgz"; + name = "eslint_plugin_vue___eslint_plugin_vue_7.4.1.tgz"; path = fetchurl { - name = "eslint_plugin_vue___eslint_plugin_vue_6.2.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz"; - sha1 = "27fecd9a3a24789b0f111ecdd540a9e56198e0fe"; + name = "eslint_plugin_vue___eslint_plugin_vue_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.4.1.tgz"; + sha1 = "2526ef0c010c218824a89423dbe6ddbe76f04fd6"; }; } { @@ -4914,11 +4922,11 @@ }; } { - name = "eslint_utils___eslint_utils_2.0.0.tgz"; + name = "eslint_utils___eslint_utils_2.1.0.tgz"; path = fetchurl { - name = "eslint_utils___eslint_utils_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz"; - sha1 = "7be1cc70f27a72a76cd14aa698bcabed6890e1cd"; + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha1 = "d2de5e03424e707dc10c74068ddedae708741b27"; }; } { @@ -4938,11 +4946,11 @@ }; } { - name = "espree___espree_6.1.2.tgz"; + name = "espree___espree_6.2.1.tgz"; path = fetchurl { - name = "espree___espree_6.1.2.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz"; - sha1 = "6c272650932b4f91c3714e5e7b5f5e2ecf47262d"; + name = "espree___espree_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz"; + sha1 = "77fc72e1fd744a2052c20f38a5b575832e82734a"; }; } { @@ -5226,6 +5234,14 @@ }; } { + name = "fast_mersenne_twister___fast_mersenne_twister_1.0.2.tgz"; + path = fetchurl { + name = "fast_mersenne_twister___fast_mersenne_twister_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/fast-mersenne-twister/-/fast-mersenne-twister-1.0.2.tgz"; + sha1 = "5ead7caf3ace592a5789d11767732bd81cbaaa56"; + }; + } + { name = "fault___fault_1.0.2.tgz"; path = fetchurl { name = "fault___fault_1.0.2.tgz"; @@ -7874,11 +7890,11 @@ }; } { - name = "katex___katex_0.10.0.tgz"; + name = "katex___katex_0.10.2.tgz"; path = fetchurl { - name = "katex___katex_0.10.0.tgz"; - url = "https://registry.yarnpkg.com/katex/-/katex-0.10.0.tgz"; - sha1 = "da562e5d0d5cc3aa602e27af8a9b8710bfbce765"; + name = "katex___katex_0.10.2.tgz"; + url = "https://registry.yarnpkg.com/katex/-/katex-0.10.2.tgz"; + sha1 = "39973edbb65eda5b6f9e7f41648781e557dd4932"; }; } { @@ -8082,6 +8098,14 @@ }; } { + name = "loader_utils___loader_utils_2.0.0.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz"; + sha1 = "e4cace5b816d425a166b5f097e10cd12b36064b0"; + }; + } + { name = "locate_path___locate_path_2.0.0.tgz"; path = fetchurl { name = "locate_path___locate_path_2.0.0.tgz"; @@ -8594,6 +8618,14 @@ }; } { + name = "mathjax___mathjax_3.1.2.tgz"; + path = fetchurl { + name = "mathjax___mathjax_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/mathjax/-/mathjax-3.1.2.tgz"; + sha1 = "95c0d45ce2330ef7b6a815cebe7d61ecc26bbabd"; + }; + } + { name = "mathml_tag_names___mathml_tag_names_2.1.1.tgz"; path = fetchurl { name = "mathml_tag_names___mathml_tag_names_2.1.1.tgz"; @@ -8722,14 +8754,6 @@ }; } { - name = "mersenne_twister___mersenne_twister_1.1.0.tgz"; - path = fetchurl { - name = "mersenne_twister___mersenne_twister_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/mersenne-twister/-/mersenne-twister-1.1.0.tgz"; - sha1 = "f916618ee43d7179efcf641bec4531eb9670978a"; - }; - } - { name = "methods___methods_1.1.2.tgz"; path = fetchurl { name = "methods___methods_1.1.2.tgz"; @@ -10266,14 +10290,6 @@ }; } { - name = "prettier___prettier_1.18.2.tgz"; - path = fetchurl { - name = "prettier___prettier_1.18.2.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz"; - sha1 = "6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"; - }; - } - { name = "prettier___prettier_2.0.5.tgz"; path = fetchurl { name = "prettier___prettier_2.0.5.tgz"; @@ -10282,6 +10298,22 @@ }; } { + name = "prettier___prettier_2.2.1.tgz"; + path = fetchurl { + name = "prettier___prettier_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz"; + sha1 = "795a1a78dd52f073da0cd42b21f9c91381923ff5"; + }; + } + { + name = "prettier___prettier_1.18.2.tgz"; + path = fetchurl { + name = "prettier___prettier_1.18.2.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz"; + sha1 = "6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"; + }; + } + { name = "pretty_format___pretty_format_25.5.0.tgz"; path = fetchurl { name = "pretty_format___pretty_format_25.5.0.tgz"; @@ -11338,11 +11370,11 @@ }; } { - name = "schema_utils___schema_utils_2.6.4.tgz"; + name = "schema_utils___schema_utils_2.7.1.tgz"; path = fetchurl { - name = "schema_utils___schema_utils_2.6.4.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz"; - sha1 = "a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53"; + name = "schema_utils___schema_utils_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz"; + sha1 = "1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"; }; } { @@ -12202,11 +12234,11 @@ }; } { - name = "style_loader___style_loader_1.1.3.tgz"; + name = "style_loader___style_loader_1.3.0.tgz"; path = fetchurl { - name = "style_loader___style_loader_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/style-loader/-/style-loader-1.1.3.tgz"; - sha1 = "9e826e69c683c4d9bf9db924f85e9abb30d5e200"; + name = "style_loader___style_loader_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/style-loader/-/style-loader-1.3.0.tgz"; + sha1 = "828b4a3b3b7e7aa5847ce7bae9e874512114249e"; }; } { @@ -13442,11 +13474,11 @@ }; } { - name = "vue_eslint_parser___vue_eslint_parser_7.0.0.tgz"; + name = "vue_eslint_parser___vue_eslint_parser_7.3.0.tgz"; path = fetchurl { - name = "vue_eslint_parser___vue_eslint_parser_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.0.0.tgz"; - sha1 = "a4ed2669f87179dedd06afdd8736acbb3a3864d6"; + name = "vue_eslint_parser___vue_eslint_parser_7.3.0.tgz"; + url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.3.0.tgz"; + sha1 = "894085839d99d81296fa081d19643733f23d7559"; }; } { @@ -13474,11 +13506,11 @@ }; } { - name = "vue_loader___vue_loader_15.9.5.tgz"; + name = "vue_loader___vue_loader_15.9.6.tgz"; path = fetchurl { - name = "vue_loader___vue_loader_15.9.5.tgz"; - url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.5.tgz"; - sha1 = "7a960dc420a3439deaacdda038fdcdbf7c432706"; + name = "vue_loader___vue_loader_15.9.6.tgz"; + url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.6.tgz"; + sha1 = "f4bb9ae20c3a8370af3ecf09b8126d38ffdb6b8b"; }; } { diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix index 0e7cce4fee7fe..1c3432b911d9d 100644 --- a/pkgs/applications/video/filebot/default.nix +++ b/pkgs/applications/video/filebot/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "filebot"; - version = "4.9.2"; + version = "4.9.3"; src = fetchurl { url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; - sha256 = "0hcyam8l0fzc9fnp1dpawk0s3rwhfph78w99y7zlcv5l4l4h04lz"; + sha256 = "sha256-R1FnHgSziJ7eGL8GrUmheVZxOnUgn9TK6gObSSKe9j0="; }; unpackPhase = "tar xvf $src"; diff --git a/pkgs/applications/video/obs-studio/obs-ndi.nix b/pkgs/applications/video/obs-studio/obs-ndi.nix index d9867b1bb2d25..b35398d65b5ca 100644 --- a/pkgs/applications/video/obs-studio/obs-ndi.nix +++ b/pkgs/applications/video/obs-studio/obs-ndi.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { "-DCMAKE_CXX_FLAGS=-I${obs-studio.src}/UI/obs-frontend-api" ]; + dontWrapQtApps = true; + meta = with lib; { description = "Network A/V plugin for OBS Studio"; homepage = "https://github.com/Palakis/obs-ndi"; diff --git a/pkgs/applications/video/obs-studio/v4l2sink.nix b/pkgs/applications/video/obs-studio/v4l2sink.nix index eb8e41868822d..2716120682ea8 100644 --- a/pkgs/applications/video/obs-studio/v4l2sink.nix +++ b/pkgs/applications/video/obs-studio/v4l2sink.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase obs-studio ]; + dontWrapQtApps = true; + patches = [ # Fixes the segfault when stopping the plugin (fetchpatch { diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 2070d05d9806a..169bd33b70952 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { ++ optional stdenv.isDarwin llvmPackages.openmp ; + dontWrapQtApps = true; + LIBOPENSHOT_AUDIO_DIR = libopenshot-audio; "UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++"; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 360e6e36c1af0..6dd7fd0f953b3 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -2,7 +2,7 @@ , libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 -, alsaLib, curl, libvpx, nettools, dbus, substituteAll, fetchpatch +, alsaLib, curl, libvpx, nettools, dbus, substituteAll # If open-watcom-bin is not passed, VirtualBox will fall back to use # the shipped alternative sources (assembly). , open-watcom-bin ? null diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 0c9d4f110ada9..c4e266d6c5d13 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -770,6 +770,7 @@ rec { mkdir $out tar \ + --sort name \ --owner 0 --group 0 --mtime "@$SOURCE_DATE_EPOCH" \ --hard-dereference \ -C old_out \ diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 3cb115c5e6e6e..a2dad2f698c35 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -105,7 +105,7 @@ fi init_remote(){ local url=$1 - clean_git init + clean_git init --initial-branch=master clean_git remote add origin "$url" ( [ -n "$http_proxy" ] && clean_git config http.proxy "$http_proxy" ) || true } diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index b48b0c50f577b..04ebcd2cc64ec 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -24,10 +24,10 @@ fixupOutputHooks+=(patchShebangsAuto) patchShebangs() { local pathName - if [ "$1" = "--host" ]; then + if [[ "$1" == "--host" ]]; then pathName=HOST_PATH shift - elif [ "$1" = "--build" ]; then + elif [[ "$1" == "--build" ]]; then pathName=PATH shift fi @@ -41,7 +41,7 @@ patchShebangs() { local oldInterpreterLine local newInterpreterLine - if [ $# -eq 0 ]; then + if [[ $# -eq 0 ]]; then echo "No arguments supplied to patchShebangs" >&2 return 0 fi @@ -50,29 +50,29 @@ patchShebangs() { while IFS= read -r -d $'\0' f; do isScript "$f" || continue - oldInterpreterLine=$(head -1 "$f" | tail -c+3) - read -r oldPath arg0 args <<< "$oldInterpreterLine" + read -r oldInterpreterLine < "$f" + read -r oldPath arg0 args <<< "${oldInterpreterLine:2}" - if [ -z "$pathName" ]; then - if [ -n "$strictDeps" ] && [[ "$f" = "$NIX_STORE"* ]]; then + if [[ -z "$pathName" ]]; then + if [[ -n $strictDeps && $f == "$NIX_STORE"* ]]; then pathName=HOST_PATH else pathName=PATH fi fi - if $(echo "$oldPath" | grep -q "/bin/env$"); then + if [[ "$oldPath" == *"/bin/env" ]]; then # Check for unsupported 'env' functionality: # - options: something starting with a '-' # - environment variables: foo=bar - if $(echo "$arg0" | grep -q -- "^-.*\|.*=.*"); then + if [[ $arg0 == "-"* || $arg0 == *"="* ]]; then echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" >&2 exit 1 fi newPath="$(PATH="${!pathName}" command -v "$arg0" || true)" else - if [ "$oldPath" = "" ]; then + if [[ -z $oldPath ]]; then # If no interpreter is specified linux will use /bin/sh. Set # oldpath="/bin/sh" so that we get /nix/store/.../sh. oldPath="/bin/sh" @@ -84,19 +84,19 @@ patchShebangs() { fi # Strip trailing whitespace introduced when no arguments are present - newInterpreterLine="$(echo "$newPath $args" | sed 's/[[:space:]]*$//')" + newInterpreterLine="$newPath $args" + newInterpreterLine=${newInterpreterLine%${newInterpreterLine##*[![:space:]]}} - if [ -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then - if [ -n "$newPath" -a "$newPath" != "$oldPath" ]; then + if [[ -n "$oldPath" && "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]]; then + if [[ -n "$newPath" && "$newPath" != "$oldPath" ]]; then echo "$f: interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\"" # escape the escape chars so that sed doesn't interpret them - escapedInterpreterLine=$(echo "$newInterpreterLine" | sed 's|\\|\\\\|g') + escapedInterpreterLine=${newInterpreterLine//\\/\\\\} + # Preserve times, see: https://github.com/NixOS/nixpkgs/pull/33281 - timestamp=$(mktemp) - touch -r "$f" "$timestamp" + timestamp=$(stat --printf "%y" "$f") sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f" - touch -r "$timestamp" "$f" - rm "$timestamp" + touch --date "$timestamp" "$f" fi fi done < <(find "$@" -type f -perm -0100 -print0) @@ -105,12 +105,12 @@ patchShebangs() { } patchShebangsAuto () { - if [ -z "${dontPatchShebangs-}" -a -e "$prefix" ]; then + if [[ -z "${dontPatchShebangs-}" && -e "$prefix" ]]; then # Dev output will end up being run on the build platform. An # example case of this is sdl2-config. Otherwise, we can just # use the runtime path (--host). - if [ "$output" != out ] && [ "$output" = "$outputDev" ]; then + if [[ "$output" != out && "$output" = "$outputDev" ]]; then patchShebangs --build "$prefix" else patchShebangs --host "$prefix" diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index e9fad77e8c0af..f8afc557cb37b 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "4.5.0"; + version = "5.0.2"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 8ee3206d07057..d9d988cdfb4fc 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,24 +1,26 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1ic5w8w4v27vfq7pvx9wv2zdcsj16xi71ln2a3fb4kh93zj84kl8"; - iosevka-aile = "1qv2b4zcz172knvr39argqshjpin1lidlafilfcm569cp8rasrdd"; - iosevka-curly = "0x9pdgyiab8hibyf1yrwn6cr90aqy9ygyk1zz9nqzcndk5mk54p4"; - iosevka-curly-slab = "0mxnbf9dwq3iq5dc0cgrdqf2dlyymylv46psb83n5kra4rz1wxnb"; - iosevka-etoile = "1rz9dkpiwwfjnhiajfxg3rrnf4lyxnynx89qswg0b8wql4q6bz71"; - iosevka-slab = "17p0cf4k8k3kabqp0b1anqqj8phfw7nnxiiscnngbrxhdvhpp62n"; - iosevka-sparkle = "0ip46lcq7gcv77ar6vqz51lhf448fd0nviijfpqfg7gdywdzalm0"; - iosevka-ss01 = "1v1z2rx7r6nb45i3qcb9pvilm6yxxkl5ks7ldmm902cx67pkv7rj"; - iosevka-ss02 = "1pd4sbr1p1cf9917nnn22v1kah8jfgm9jpfvq1j51wyr8lnxqz2k"; - iosevka-ss03 = "0pdbvrzilrxxcaz9gnhnqxvk4ipfxcgys41sasl3znxzij1ary8s"; - iosevka-ss04 = "08xwdp5s3dp30qy81j3qwhhqk1bibcpnh2i00a3kyw3g6jsnsvmp"; - iosevka-ss05 = "1njf1ysd42k2rc2lvg5ilq6q2wvg8dlm04d7wygdamw0yx6sia83"; - iosevka-ss06 = "04g4m770i1b75gl1lanbs0ibmjj8vg5yfwyn6n0bidfn30z4n01l"; - iosevka-ss07 = "07f1n44f5bvifbns6572ys6zihac6yljv7frm58w7xgyl0a3prvg"; - iosevka-ss08 = "157cq5jfxvr0n7ksqln5mjmr800dbyfy8vwl0ngbf0aiq3mw2x8f"; - iosevka-ss09 = "0yib3mhb48g2vjiaviwgcl6lad4dbwwblnmv4zi880bdvz7jrwr9"; - iosevka-ss10 = "06s0s9x1fiqqmnkm42khasws40db7l68d2ycsm38mx6b62nlsbkr"; - iosevka-ss11 = "0yzy322zqas0id70i1p92x7fbim8gai0a61nf6bf33aq3qgsj2w8"; - iosevka-ss12 = "0lhmhwd4z44y4469av6na7k5w4ra47g98dxfi0mb42a4n4sq0k5j"; - iosevka-ss13 = "1cq91iqfgq4fsazi2pjh6l4n9mgci4aayqp7fiy8lydv7f1ym0z9"; - iosevka-ss14 = "0xid48yr2qfsh6kvlajlaqnb43ck351kg8r3bwpvzrdbvl809983"; + iosevka = "069qy5mnrp61da7b5yy79s9d0s3cwn5mqkqkysv8lccr91qnjgdc"; + iosevka-aile = "1b9zh017wdxlk9dlick6qwx8f2vqsrsaq5yjr79iinirc417ri67"; + iosevka-curly = "155faw2nlczp3ic2y9ck2vm21rfa1zaiswc0mfgmd3b2r6wimjrj"; + iosevka-curly-slab = "1axzan1p9slfskg8nshz4hrmw24vmbcsxf7kpz70xjs98w7wh6lh"; + iosevka-etoile = "00w4r660qaydygqvfv03i77h1q6wk8xbvrvh4wsnifl7li4xax4w"; + iosevka-slab = "0a7ndr3c0sldn902d9c50l63xrvranclsvwnj4py2m6w32s8i9nx"; + iosevka-ss01 = "0q5bh511z6qdvagk831sb1nrp9gawsjv904106clkqwak3k55v54"; + iosevka-ss02 = "1qk250yydi3ff5z3s1099xrdzpwg62lr39wxl9539a2rl0awdw3w"; + iosevka-ss03 = "02rblgk9j0bz7pyag3a8p4by76zj0z4gg8iignfff7j3yfszgfhp"; + iosevka-ss04 = "0z9aj5ll5mdgfm8brgwhwabbq31ws8qqzdyyf9s8mq30l0js2wd6"; + iosevka-ss05 = "00sclgj25vp3frk1wvlwb83z33xy45171m76jr5x9jspq5nr02fa"; + iosevka-ss06 = "1r9da69k47kiag7ba47panyj5sxgz6icpynbrnz7d7kvqwal842k"; + iosevka-ss07 = "0lvdzfha27158bs5p3njyw6gnrm53mpdacaln1bh37mwd967b689"; + iosevka-ss08 = "1l60yz475m780k6ds5h4n36p82av8ag28l1yr8z8gl7yznf2sf7b"; + iosevka-ss09 = "058ln47yv5015c4xnhmyglvdqndbdp0v8n5w73cd73nzfb4y035j"; + iosevka-ss10 = "0966wrbamjkyrjkirv2jzw86yr9l3d5vnb0azi93y0amcrkksmrw"; + iosevka-ss11 = "0y3nhjn38jvcf4ngwgir5hg4vx9fsrfxzlshmynlf7bb6krvfnaq"; + iosevka-ss12 = "09hccisb2lrakjh7fnk43znixly7qbqclmsvhp9mlbpjvlzzq03j"; + iosevka-ss13 = "117712kys0fihadpzrwqm3z25z390qjnhligr5k0wx8h0la9nwq3"; + iosevka-ss14 = "0iy4m64jnsi2b74hcmwxk0qabzgza08v9s56blg4i9mfmp8xvzlp"; + iosevka-ss15 = "0mdqfal48sfq5n3a88cgsaddcc07qwqynr662zqqpjqy98kvaz62"; + iosevka-ss16 = "0dkv3mzhl9vl7x9x0g6hc7j1mp9mnnyx7iamkvm8wcqjhwnvy0r6"; + iosevka-ss17 = "1adb1z468wfa1b707kr0ycv5d5nxpmcx44q0dizik5zyx26aq10p"; } diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix index 75c7cd58007a0..32365b70184be 100644 --- a/pkgs/data/icons/maia-icon-theme/default.nix +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation { dontDropIconThemeCache = true; + dontWrapQtApps = true; + postInstall = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index ba505586ca38e..52aee2a004a7e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, libxml2, gnome3, dconf, nautilus , gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala -, desktop-file-utils, itstool, wrapGAppsHook, glib, pcre2 +, desktop-file-utils, itstool, wrapGAppsHook, pcre2 , libxslt, docbook-xsl-nons }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index 0bdc3974d97c9..cb8ece571e71b 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -15,7 +15,6 @@ , gnome3 , gjs , nixosTests -, gsettings-desktop-schemas }: stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index e887bc2208952..b3be2bb220ca2 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchurl , lib -# Dependencies + # Dependencies , boehmgc , coreutils , git @@ -32,11 +32,10 @@ # # We need to keep around at least the latest version released with a stable # NixOS - let archs = { - x86_64-linux = "linux-x86_64"; - i686-linux = "linux-i686"; + x86_64-linux = "linux-x86_64"; + i686-linux = "linux-i686"; x86_64-darwin = "darwin-x86_64"; }; @@ -45,223 +44,231 @@ let checkInputs = [ git gmp openssl readline libxml2 libyaml ]; genericBinary = { version, sha256s, rel ? 1 }: - stdenv.mkDerivation rec { - pname = "crystal-binary"; - inherit version; - - src = fetchurl { - url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; - sha256 = sha256s.${stdenv.system}; + stdenv.mkDerivation rec { + pname = "crystal-binary"; + inherit version; + + src = fetchurl { + url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; + sha256 = sha256s.${stdenv.system}; + }; + + buildCommand = '' + mkdir -p $out + tar --strip-components=1 -C $out -xf ${src} + ''; }; - buildCommand = '' - mkdir -p $out - tar --strip-components=1 -C $out -xf ${src} - ''; - }; - commonBuildInputs = extraBuildInputs: [ - boehmgc libatomic_ops pcre libevent libyaml zlib libxml2 openssl + boehmgc + libatomic_ops + pcre + libevent + libyaml + zlib + libxml2 + openssl ] ++ extraBuildInputs - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.isDarwin [ libiconv ]; generic = ( { version , sha256 , binary , doCheck ? true - , extraBuildInputs ? [] - , buildFlags ? ["all" "docs"] + , extraBuildInputs ? [ ] + , buildFlags ? [ "all" "docs" ] }: - lib.fix (compiler: stdenv.mkDerivation { - pname = "crystal"; - inherit buildFlags doCheck version; + lib.fix (compiler: stdenv.mkDerivation { + pname = "crystal"; + inherit buildFlags doCheck version; - src = fetchFromGitHub { - owner = "crystal-lang"; - repo = "crystal"; - rev = version; - inherit sha256; - }; + src = fetchFromGitHub { + owner = "crystal-lang"; + repo = "crystal"; + rev = version; + inherit sha256; + }; - outputs = [ "out" "lib" "bin" ]; + outputs = [ "out" "lib" "bin" ]; - postPatch = '' - # Add dependency of crystal to docs to avoid issue on flag changes between releases - # https://github.com/crystal-lang/crystal/pull/8792#issuecomment-614004782 - substituteInPlace Makefile \ - --replace 'docs: ## Generate standard library documentation' 'docs: crystal ## Generate standard library documentation' + postPatch = '' + # Add dependency of crystal to docs to avoid issue on flag changes between releases + # https://github.com/crystal-lang/crystal/pull/8792#issuecomment-614004782 + substituteInPlace Makefile \ + --replace 'docs: ## Generate standard library documentation' 'docs: crystal ## Generate standard library documentation' - substituteInPlace src/crystal/system/unix/time.cr \ - --replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo + substituteInPlace src/crystal/system/unix/time.cr \ + --replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo - ln -sf spec/compiler spec/std + ln -sf spec/compiler spec/std - # Dirty fix for when no sandboxing is enabled - rm -rf /tmp/crystal - mkdir -p /tmp/crystal + # Dirty fix for when no sandboxing is enabled + rm -rf /tmp/crystal + mkdir -p /tmp/crystal - substituteInPlace spec/std/file_spec.cr \ - --replace '/bin/ls' '${coreutils}/bin/ls' \ - --replace '/usr/share' '/tmp/crystal' \ - --replace '/usr' '/tmp' + substituteInPlace spec/std/file_spec.cr \ + --replace '/bin/ls' '${coreutils}/bin/ls' \ + --replace '/usr/share' '/tmp/crystal' \ + --replace '/usr' '/tmp' - substituteInPlace spec/std/process_spec.cr \ - --replace '/bin/cat' '${coreutils}/bin/cat' \ - --replace '/bin/ls' '${coreutils}/bin/ls' \ - --replace '/usr/bin/env' '${coreutils}/bin/env' \ - --replace '"env"' '"${coreutils}/bin/env"' \ - --replace '"/usr"' '"/tmp"' + substituteInPlace spec/std/process_spec.cr \ + --replace '/bin/cat' '${coreutils}/bin/cat' \ + --replace '/bin/ls' '${coreutils}/bin/ls' \ + --replace '/usr/bin/env' '${coreutils}/bin/env' \ + --replace '"env"' '"${coreutils}/bin/env"' \ + --replace '"/usr"' '"/tmp"' - substituteInPlace spec/std/socket/tcp_server_spec.cr \ - --replace '{% if flag?(:gnu) %}"listen: "{% else %}"bind: "{% end %}' '"bind: "' + substituteInPlace spec/std/socket/tcp_server_spec.cr \ + --replace '{% if flag?(:gnu) %}"listen: "{% else %}"bind: "{% end %}' '"bind: "' - substituteInPlace spec/std/system_spec.cr \ - --replace '`hostname`' '`${hostname}/bin/hostname`' + substituteInPlace spec/std/system_spec.cr \ + --replace '`hostname`' '`${hostname}/bin/hostname`' - # See https://github.com/crystal-lang/crystal/pull/8640 - substituteInPlace spec/std/http/cookie_spec.cr \ - --replace '01 Jan 2020' '01 Jan #{Time.utc.year + 2}' + # See https://github.com/crystal-lang/crystal/pull/8640 + substituteInPlace spec/std/http/cookie_spec.cr \ + --replace '01 Jan 2020' '01 Jan #{Time.utc.year + 2}' - # See https://github.com/crystal-lang/crystal/issues/8629 - substituteInPlace spec/std/socket/udp_socket_spec.cr \ - --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"' + # See https://github.com/crystal-lang/crystal/issues/8629 + substituteInPlace spec/std/socket/udp_socket_spec.cr \ + --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"' - # See https://github.com/crystal-lang/crystal/pull/8699 - substituteInPlace spec/std/xml/xml_spec.cr \ - --replace 'it "handles errors"' 'pending "handles errors"' - ''; + # See https://github.com/crystal-lang/crystal/pull/8699 + substituteInPlace spec/std/xml/xml_spec.cr \ + --replace 'it "handles errors"' 'pending "handles errors"' + ''; - buildInputs = commonBuildInputs extraBuildInputs; + buildInputs = commonBuildInputs extraBuildInputs; - nativeBuildInputs = [ binary makeWrapper which pkg-config llvmPackages.llvm ]; + nativeBuildInputs = [ binary makeWrapper which pkg-config llvmPackages.llvm ]; - makeFlags = [ - "CRYSTAL_CONFIG_VERSION=${version}" - ]; + makeFlags = [ + "CRYSTAL_CONFIG_VERSION=${version}" + ]; - LLVM_CONFIG = "${llvmPackages.llvm}/bin/llvm-config"; + LLVM_CONFIG = "${llvmPackages.llvm}/bin/llvm-config"; - FLAGS = [ - "--release" - "--single-module" # needed for deterministic builds - ]; + FLAGS = [ + "--release" + "--single-module" # needed for deterministic builds + ]; - # This makes sure we don't keep depending on the previous version of - # crystal used to build this one. - CRYSTAL_LIBRARY_PATH = "${placeholder "lib"}/crystal"; + # This makes sure we don't keep depending on the previous version of + # crystal used to build this one. + CRYSTAL_LIBRARY_PATH = "${placeholder "lib"}/crystal"; - # We *have* to add `which` to the PATH or crystal is unable to build - # stuff later if which is not available. - installPhase = '' - runHook preInstall + # We *have* to add `which` to the PATH or crystal is unable to build + # stuff later if which is not available. + installPhase = '' + runHook preInstall - install -Dm755 .build/crystal $bin/bin/crystal - wrapProgram $bin/bin/crystal \ - --suffix PATH : ${lib.makeBinPath [ pkg-config llvmPackages.clang which ]} \ - --suffix CRYSTAL_PATH : lib:$lib/crystal \ - --suffix CRYSTAL_LIBRARY_PATH : ${ - lib.makeLibraryPath (commonBuildInputs extraBuildInputs) - } - install -dm755 $lib/crystal - cp -r src/* $lib/crystal/ + install -Dm755 .build/crystal $bin/bin/crystal + wrapProgram $bin/bin/crystal \ + --suffix PATH : ${lib.makeBinPath [ pkg-config llvmPackages.clang which ]} \ + --suffix CRYSTAL_PATH : lib:$lib/crystal \ + --suffix CRYSTAL_LIBRARY_PATH : ${ + lib.makeLibraryPath (commonBuildInputs extraBuildInputs) + } + install -dm755 $lib/crystal + cp -r src/* $lib/crystal/ - install -dm755 $out/share/doc/crystal/api - cp -r docs/* $out/share/doc/crystal/api/ - cp -r samples $out/share/doc/crystal/ + install -dm755 $out/share/doc/crystal/api + cp -r docs/* $out/share/doc/crystal/api/ + cp -r samples $out/share/doc/crystal/ - install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal - install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal + install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal + install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal - install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1 + install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1 - install -Dm644 -t $out/share/licenses/crystal LICENSE README.md + install -Dm644 -t $out/share/licenses/crystal LICENSE README.md - mkdir -p $out - ln -s $bin/bin $out/bin - ln -s $lib $out/lib + mkdir -p $out + ln -s $bin/bin $out/bin + ln -s $lib $out/lib - runHook postInstall - ''; + runHook postInstall + ''; - enableParallelBuilding = true; + enableParallelBuilding = true; - dontStrip = true; + dontStrip = true; - checkTarget = "compiler_spec"; + checkTarget = "compiler_spec"; - preCheck = '' - export HOME=/tmp - mkdir -p $HOME/test + preCheck = '' + export HOME=/tmp + mkdir -p $HOME/test - export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH - export PATH=${lib.makeBinPath checkInputs}:$PATH - ''; + export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH + export PATH=${lib.makeBinPath checkInputs}:$PATH + ''; - passthru.buildCrystalPackage = callPackage ./build-package.nix { - crystal = compiler; - }; + passthru.buildCrystalPackage = callPackage ./build-package.nix { + crystal = compiler; + }; - meta = with lib; { - description = "A compiled language with Ruby like syntax and type inference"; - homepage = "https://crystal-lang.org/"; - license = licenses.asl20; - maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ]; - platforms = builtins.attrNames archs; - }; - }) + meta = with lib; { + description = "A compiled language with Ruby like syntax and type inference"; + homepage = "https://crystal-lang.org/"; + license = licenses.asl20; + maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ]; + platforms = builtins.attrNames archs; + }; + }) ); -in rec { +in +rec { binaryCrystal_0_31 = genericBinary { version = "0.31.1"; sha256s = { - x86_64-linux = "0r8salf572xrnr4m6ll9q5hz6jj8q7ff1rljlhmqb1r26a8mi2ih"; - i686-linux = "0hridnis5vvrswflx0q67xfg5hryhz6ivlwrb9n4pryj5d1gwjrr"; + x86_64-linux = "0r8salf572xrnr4m6ll9q5hz6jj8q7ff1rljlhmqb1r26a8mi2ih"; + i686-linux = "0hridnis5vvrswflx0q67xfg5hryhz6ivlwrb9n4pryj5d1gwjrr"; x86_64-darwin = "1dgxgv0s3swkc5cwawzgpbc6bcd2nx4hjxc7iw2h907y1vgmbipz"; }; }; crystal_0_31 = generic { version = "0.31.1"; - sha256 = "1dswxa32w16gnc6yjym12xj7ibg0g6zk3ngvl76lwdjqb1h6lwz8"; + sha256 = "1dswxa32w16gnc6yjym12xj7ibg0g6zk3ngvl76lwdjqb1h6lwz8"; doCheck = false; # 5 checks are failing now binary = binaryCrystal_0_31; }; crystal_0_32 = generic { version = "0.32.1"; - sha256 = "120ndi3nhh2r52hjvhwfb49cdggr1bzdq6b8xg7irzavhjinfza6"; + sha256 = "120ndi3nhh2r52hjvhwfb49cdggr1bzdq6b8xg7irzavhjinfza6"; binary = crystal_0_31; }; crystal_0_33 = generic { version = "0.33.0"; - sha256 = "1zg0qixcws81s083wrh54hp83ng2pa8iyyafaha55mzrh8293jbi"; + sha256 = "1zg0qixcws81s083wrh54hp83ng2pa8iyyafaha55mzrh8293jbi"; binary = crystal_0_32; }; crystal_0_34 = generic { version = "0.34.0"; - sha256 = "110lfpxk9jnqyznbfnilys65ixj5sdmy8pvvnlhqhc3ccvrlnmq4"; + sha256 = "110lfpxk9jnqyznbfnilys65ixj5sdmy8pvvnlhqhc3ccvrlnmq4"; binary = crystal_0_33; }; crystal_0_35 = generic { version = "0.35.1"; - sha256 = "0p51bjl1nsvwsm64lqq421dcsxa201w7wwq8plw4r8wqarpq0g69"; + sha256 = "0p51bjl1nsvwsm64lqq421dcsxa201w7wwq8plw4r8wqarpq0g69"; binary = crystal_0_34; # Needs git to build as per https://github.com/crystal-lang/crystal/issues/9789 extraBuildInputs = [ git ]; }; crystal_0_36 = generic { - version = "0.36.0"; - sha256 = "0s7g13mrh2jrxxrrrg4hy3gi49rp7fmpn9zg9kj4nbc8w8yir20r"; + version = "0.36.1"; + sha256 = "sha256-5rjrvwZKM4lHpmxLyUVbi0Zw98xT+iJKonxwfUwS/Wk="; binary = crystal_0_35; }; crystal = crystal_0_36; - crystal2nix = callPackage ./crystal2nix.nix {}; + crystal2nix = callPackage ./crystal2nix.nix { }; } diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 18dbeaea201d0..b57671d8637b2 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -1,19 +1,23 @@ { lib, mkCoqDerivation, which, coq, version ? null }: with builtins; with lib; let - elpi = coq.ocamlPackages.elpi.override ( - optionalAttrs (coq.coq-version == "8.11") { version = "1.11.4"; } - ); + elpi = coq.ocamlPackages.elpi.override (lib.switch coq.coq-version [ + { case = "8.11"; out = { version = "1.11.4"; };} + { case = "8.12"; out = { version = "1.12.0"; };} + { case = "8.13"; out = { version = "1.13.0"; };} + ] {}); in mkCoqDerivation { pname = "elpi"; repo = "coq-elpi"; owner = "LPCIC"; inherit version; defaultVersion = lib.switch coq.coq-version [ - { case = "8.13"; out = "1.8.1"; } + { case = "8.13"; out = "1.9.3"; } { case = "8.12"; out = "1.8.0"; } { case = "8.11"; out = "1.6.0_8.11"; } ] null; + release."1.9.3".sha256 = "198irm800fx3n8n56vx1c6f626cizp1d7jfkrc6ba4iqhb62ma0z"; + release."1.9.2".sha256 = "1rr2fr8vjkc0is7vh1461aidz2iwkigdkp6bqss4hhv0c3ijnn07"; release."1.8.1".sha256 = "1fbbdccdmr8g4wwpihzp4r2xacynjznf817lhijw6kqfav75zd0r"; release."1.8.0".sha256 = "13ywjg94zkbki22hx7s4gfm9rr87r4ghsgan23xyl3l9z8q0idd1"; release."1.7.0".sha256 = "1ws5cqr0xawv69prgygbl3q6dgglbaw0vc397h9flh90kxaqgyh8"; diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix index 530763c9439d7..dabcc44261b56 100644 --- a/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -12,6 +12,8 @@ with lib; mkCoqDerivation { release."0.10.0".sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h"; releaseRev = v: "v${v}"; + nativeBuildInputs = [ which ]; + propagatedBuildInputs = [ coq-elpi ]; extraInstallFlags = [ "VFILES=structures.v" ]; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index e3f196440cab1..76f6971917f93 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -45,7 +45,7 @@ self: super: { # Take the 3.4.x release candidate. cabal-install = assert super.cabal-install.version == "3.2.0.0"; - overrideCabal super.cabal-install (drv: { + overrideCabal (doJailbreak super.cabal-install) (drv: { postUnpack = "sourceRoot+=/cabal-install; echo source root reset to $sourceRoot"; version = "cabal-install-3.4.0.0-rc4"; editedCabalFile = null; @@ -54,6 +54,7 @@ self: super: { rev = "cabal-install-3.4.0.0-rc4"; sha256 = "049hllk1d8jid9yg70hmcsdgb0n7hm24p39vavllaahfb0qfimrk"; }; + executableHaskellDepends = drv.executableHaskellDepends ++ [ self.regex-base self.regex-posix ]; }); # Jailbreaks & Version Updates @@ -62,8 +63,10 @@ self: super: { data-fix = doJailbreak super.data-fix; dec = doJailbreak super.dec; ed25519 = doJailbreak super.ed25519; + hackage-security = doJailbreak super.hackage-security; hashable = overrideCabal (doJailbreak (dontCheck super.hashable)) (drv: { postPatch = "sed -i -e 's,integer-gmp .*<1.1,integer-gmp < 2,' hashable.cabal"; }); hashable-time = doJailbreak super.hashable-time; + HTTP = overrideCabal (doJailbreak super.HTTP) (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }); integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; }); lukko = doJailbreak super.lukko; parallel = doJailbreak super.parallel; diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh index c2079fa84f901..85811a374755d 100644 --- a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh @@ -37,12 +37,12 @@ function pytestCheckPhase() { disabledTestsString=$(_pytestComputeDisabledTestsString "${disabledTests[@]}") args+=" -k \""$disabledTestsString"\"" fi - for file in "${disabledTestFiles[@]}"; do + for file in ${disabledTestFiles[@]}; do if [ ! -f "$file" ]; then echo "Disabled test file \"$file\" does not exist. Aborting" exit 1 fi - args+=" --ignore=$file" + args+=" --ignore=\"$file\"" done args+=" ${pytestFlagsArray[@]}" eval "@pythonCheckInterpreter@ $args" diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index f80e18c7bb96d..a1612680b2563 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { ++ optional (!stdenv.isDarwin) alsaLib ++ optional useSCEL emacs; + dontWrapQtApps = true; + meta = with lib; { description = "Programming language for real time audio synthesis"; homepage = "https://supercollider.github.io"; diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index d240e7e3a9dc7..073ad3254a0b8 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -57,6 +57,8 @@ in stdenv.mkDerivation rec { buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls openssl libgcrypt libgpgerror ]; + dontWrapQtApps = true; + meta = with lib; { description = "OS abstraction functions used by aqbanking and related tools"; homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1"; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 0f4dd0f62c470..56008ae8dd6a1 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { ++ (lib.optionals withQt4 [ qt4 ]) ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ])); + dontWrapQtApps = true; + meta = with lib; { homepage = "http://drobilla.net/software/suil"; description = "A lightweight C library for loading and wrapping LV2 plugin UIs"; diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix index b2cd97398c619..09f2ad3ccad68 100644 --- a/pkgs/development/libraries/dxflib/default.nix +++ b/pkgs/development/libraries/dxflib/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; + dontWrapQtApps = true; preConfigure = '' sed -i 's/CONFIG += staticlib/CONFIG += shared/' dxflib.pro ''; diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix index 675d994cf0e6b..b967a89568d25 100644 --- a/pkgs/development/libraries/g2o/default.nix +++ b/pkgs/development/libraries/g2o/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, eigen, suitesparse, libGLU -, qtbase, libqglviewer, makeWrapper }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, eigen, suitesparse, blas +, lapack, libGLU, qtbase, libqglviewer, makeWrapper }: mkDerivation rec { pname = "g2o"; - version = "20200410"; + version = "20201223"; src = fetchFromGitHub { owner = "RainerKuemmerle"; repo = pname; rev = "${version}_git"; - sha256 = "11rgj2g9mmwajlr69pjkjvxjyn88afa0r4bchjyvmxswjccizlg2"; + sha256 = "sha256-Ik6uBz4Z4rc5+mPNdT8vlNZSBom4Tvt8Y6myBC/s0m8="; }; # Removes a reference to gcc that is only used in a debug message @@ -18,11 +18,13 @@ mkDerivation rec { separateDebugInfo = true; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ eigen suitesparse libGLU qtbase libqglviewer ]; + buildInputs = [ eigen suitesparse blas lapack libGLU qtbase libqglviewer ]; # Silence noisy warning CXXFLAGS = "-Wno-deprecated-copy"; + dontWrapQtApps = true; + cmakeFlags = [ # Detection script is broken "-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer" diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 8add81e27969b..92c0ec293cb25 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gcr"; - version = "3.38.0"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1q97pba4bzjndm1vlvicyv8mrl0n589qsw71dp8jrz2payvcfk56"; + sha256 = "F/yvnEqTpl+xxyuCZDuxAsEzRAhGh9WIbqZjE4aNnsk="; }; postPatch = '' diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix index 46b13e6e37f53..fc9835d85db5d 100644 --- a/pkgs/development/libraries/gecode/default.nix +++ b/pkgs/development/libraries/gecode/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; + dontWrapQtApps = true; nativeBuildInputs = [ bison flex ]; buildInputs = [ perl gmp mpfr ] ++ lib.optional enableGist qtbase; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 63806b31e251d..f96707b549f74 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "geos-3.8.1"; + name = "geos-3.9.0"; src = fetchurl { url = "https://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "1xqpmr10xi0n9sj47fbwc89qb0yr9imh4ybk0jsxpffy111syn22"; + sha256 = "sha256-vYCCzxL0XydjAZPHi9taPLqEe4HnKyAmg1bCpPwGUmk="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 2cd1e783ea924..57acec4860a7e 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkg-config, lzip -, perl, gmp, autoconf, autogen, automake, libidn, p11-kit, libiconv +, perl, gmp, autoconf, automake, libidn, p11-kit, libiconv , unbound, dns-root-data, gettext, cacert, util-linux , guileBindings ? config.gnutls.guile or false, guile , tpmSupport ? false, trousers, which, nettools, libunistring @@ -71,7 +71,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp autogen libunistring unbound gettext libiconv ] + buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp libunistring unbound gettext libiconv ] ++ lib.optional (isDarwin && withSecurity) Security ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ lib.optional guileBindings guile; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 51b259a3ca810..326e5da0812c9 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -49,6 +49,8 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; + dontWrapQtApps = true; + configureFlags = [ "--enable-fixed-path=${gnupg}/bin" "--with-libgpg-error-prefix=${libgpgerror.dev}" diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 48ee0ddd4a510..9b6562b9891fd 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -1,11 +1,11 @@ { fetchurl, lib, stdenv, libidn, kerberos }: stdenv.mkDerivation rec { - name = "gsasl-1.8.0"; + name = "gsasl-1.10.0"; src = fetchurl { url = "mirror://gnu/gsasl/${name}.tar.gz"; - sha256 = "1rci64cxvcfr8xcjpqc4inpfq7aw4snnsbf5xz7d30nhvv8n40ii"; + sha256 = "sha256-hby9juYJWt54cCY6KOvLiDL1Qepzk5dUlJJgFcB1aNM="; }; buildInputs = [ libidn kerberos ]; diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 666fcab989b7a..23550bbc8072f 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "imlib2"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.bz2"; - sha256 = "0zdk4afdrrr1539f2q15zja19j4wwfmpswzws2ffgflcnhywlxhr"; + sha256 = "sha256-AzpqY53LyOA/Zf8F5XBo5zRtUO4vL/8wS7kJWhsrxAc="; }; buildInputs = [ diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 5c6ea732b6909..01d6a7ba2b1e1 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.76/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.78/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/pkgs/development/libraries/kde-frameworks/kcompletion.nix index fdfe28db6c04c..26e5a83dc21bd 100644 --- a/pkgs/development/libraries/kde-frameworks/kcompletion.nix +++ b/pkgs/development/libraries/kde-frameworks/kcompletion.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, kconfig, kwidgetsaddons, qtbase, qttools }: @@ -7,6 +7,13 @@ mkDerivation { name = "kcompletion"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + patches = [ + # https://mail.kde.org/pipermail/distributions/2021-January/000928.html + (fetchpatch { + url = "https://invent.kde.org/frameworks/kcompletion/commit/7acda936f06193e9fc85ae5cf9ccc8d65971f657.patch"; + sha256 = "150ff506rhr5pin5363ks222vhv8qd77y5s5nyylcbdjry3ljd3n"; + }) + ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kwidgetsaddons qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index 66cd8ddf64f64..a9b3c416624d0 100644 --- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, - qtbase, qtx11extras, + qtbase, qtx11extras, wayland, }: mkDerivation { @@ -11,7 +11,7 @@ mkDerivation { broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; + buildInputs = [ qtx11extras wayland ]; propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 434496c7b9a94..642151913db3b 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, kdoctools, qttools, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications, @@ -24,5 +24,10 @@ mkDerivation { patches = [ ./samba-search-path.patch ./kio-debug-module-loader.patch + # https://mail.kde.org/pipermail/distributions/2021-February/000938.html + (fetchpatch { + url = "https://invent.kde.org/frameworks/kio/commit/a183dd0d1ee0659e5341c7cb4117df27edd6f125.patch"; + sha256 = "1msnzi93zggxgarx962gnlz1slx13nc3l54wib3rdlj0xnnlfdnd"; + }) ]; } diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index dbc74b831125e..8701a43b4d77d 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -1,670 +1,670 @@ # DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks/ +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks { fetchurl, mirror }: { attica = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/attica-5.76.0.tar.xz"; - sha256 = "64b262f61935653b91a83f4d1c659e7dcaf575b12aa955fe16d8392adb256e22"; - name = "attica-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/attica-5.78.0.tar.xz"; + sha256 = "0xlnsh9py1v7di305qic0kzpwbq0yw41rilkq1f8p9zsixl99w8m"; + name = "attica-5.78.0.tar.xz"; }; }; baloo = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/baloo-5.76.0.tar.xz"; - sha256 = "8ae9e6dd51c84150f7fc581ebf04617f3ee9e1f96e08df79d6f15ee29f5f95f9"; - name = "baloo-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/baloo-5.78.0.tar.xz"; + sha256 = "1p8s0lgbqajpzbrc2pb1vzga0bsfwqjb4pzvvgqdlb419ijcjlpi"; + name = "baloo-5.78.0.tar.xz"; }; }; bluez-qt = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/bluez-qt-5.76.0.tar.xz"; - sha256 = "a3f99a10e5f018bac91b4bd88be23a6ea9399aa1ab29d16840d5ee2c20537835"; - name = "bluez-qt-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/bluez-qt-5.78.0.tar.xz"; + sha256 = "1g83sfvl8zmyc9l5kr2bb9pdfis01m1ib9pz6qq1k5zv5aq3cyz9"; + name = "bluez-qt-5.78.0.tar.xz"; }; }; breeze-icons = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/breeze-icons-5.76.0.tar.xz"; - sha256 = "d0211f0e6fa9137dbb42bcad1ac352bbfe793b6a3e6483adc2051b5c24a7851b"; - name = "breeze-icons-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/breeze-icons-5.78.0.tar.xz"; + sha256 = "1fa9lirik0ic03nb56xmiirpbcg57l1b3q7dkn9r5h6scc0nsps2"; + name = "breeze-icons-5.78.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/extra-cmake-modules-5.76.0.tar.xz"; - sha256 = "4845e9e0a43ba15158c0cfdc7ab594e7d02692fab9083201715270a096704a32"; - name = "extra-cmake-modules-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/extra-cmake-modules-5.78.0.tar.xz"; + sha256 = "1y8js21adfzl6g5q46gj7dl8q2jhfvx0ba3ipmbclkpj4461zppf"; + name = "extra-cmake-modules-5.78.0.tar.xz"; }; }; frameworkintegration = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/frameworkintegration-5.76.0.tar.xz"; - sha256 = "7ac6c070190ab4c0c2ac15a921886ed7f3b70d6a0b7c41766d21a913e9f086fb"; - name = "frameworkintegration-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/frameworkintegration-5.78.0.tar.xz"; + sha256 = "0rvi82fqck8jaxnrh5fd8m581civ174hpczanmw6n7birxvmk2wh"; + name = "frameworkintegration-5.78.0.tar.xz"; }; }; kactivities = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kactivities-5.76.0.tar.xz"; - sha256 = "efba13d0d720502bf8bee161b688ba21704f7c213c8b95da65b77b76c9cb3422"; - name = "kactivities-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kactivities-5.78.0.tar.xz"; + sha256 = "11v7rcw6lk4xd28i9al5p7bxklw5hdm97hvszhh1qd7kfrzblkhi"; + name = "kactivities-5.78.0.tar.xz"; }; }; kactivities-stats = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kactivities-stats-5.76.0.tar.xz"; - sha256 = "85bb432a10a48af505a457c7ccacffad7914835f94042472083e878cabcd2c14"; - name = "kactivities-stats-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kactivities-stats-5.78.0.tar.xz"; + sha256 = "0afnwswng85jfkpbmbmprkqfngjxv2qpds3s2xlb5nzrpl43hc7s"; + name = "kactivities-stats-5.78.0.tar.xz"; }; }; kapidox = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kapidox-5.76.0.tar.xz"; - sha256 = "8c6c9401059d34fa2d7f052e21387d803a1131a60fcd1305ddf5d5dfe22c6d97"; - name = "kapidox-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kapidox-5.78.0.tar.xz"; + sha256 = "1d8ia33nrsvg8gf9mna0r2f0sdi4c37p8mxl59hcfqdimy7inkvp"; + name = "kapidox-5.78.0.tar.xz"; }; }; karchive = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/karchive-5.76.0.tar.xz"; - sha256 = "503d33b247ae24260c73aac2c48601eb4f8be3f10c9149549ea5dd2d22082a2a"; - name = "karchive-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/karchive-5.78.0.tar.xz"; + sha256 = "1lqjy040c5wb76fvnvdaxsgqm63bcx9bmjinvia1caqkh11a5rw2"; + name = "karchive-5.78.0.tar.xz"; }; }; kauth = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kauth-5.76.0.tar.xz"; - sha256 = "c277a7ab750158a56381d8f74b8ebed5205b785eca2444c65cbf59d429958a89"; - name = "kauth-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kauth-5.78.0.tar.xz"; + sha256 = "1c0xyv54g8gcxaaz602ai1v4jlk7xndc65qjad66qiig958b1czg"; + name = "kauth-5.78.0.tar.xz"; }; }; kbookmarks = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kbookmarks-5.76.0.tar.xz"; - sha256 = "ac5416f1ac21cb9e9fdf72a95de855a9891cea0ed7e1436a93c019b6c45af2af"; - name = "kbookmarks-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kbookmarks-5.78.0.tar.xz"; + sha256 = "0b7g0fkyyqdwpfw53kdw73jcyk8wz5k2ipmwzlpx2fr5gs2v00c3"; + name = "kbookmarks-5.78.0.tar.xz"; }; }; kcalendarcore = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kcalendarcore-5.76.0.tar.xz"; - sha256 = "e6fd390b8ba2a899e7abda3de8d9ab7e5155fede6bbee9ca2b302b931a0232ae"; - name = "kcalendarcore-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kcalendarcore-5.78.0.tar.xz"; + sha256 = "1v97swaqf9bmdvfagzif1ihsnd5d900nzv8aadic0a7ax5zqi41h"; + name = "kcalendarcore-5.78.0.tar.xz"; }; }; kcmutils = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kcmutils-5.76.0.tar.xz"; - sha256 = "0ea51ea9e46e6359c76fe099fd2cd03c20891a1cad26ea156ca921a9f0869009"; - name = "kcmutils-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kcmutils-5.78.0.tar.xz"; + sha256 = "1ly21k3lrn6fx1j4vp0km8z9sb2l0adx0rhp9c1sasr8aflmy5k8"; + name = "kcmutils-5.78.0.tar.xz"; }; }; kcodecs = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kcodecs-5.76.0.tar.xz"; - sha256 = "b4e1fe3247fdaf80f4414716f6fbcd42e8de04f64c8dd50bd13e9e9a78abf6e1"; - name = "kcodecs-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kcodecs-5.78.0.tar.xz"; + sha256 = "0ypwx29v7gbcdpkvlpk0r5v7d8rd3xnqlnk1k11c75dvy3763d1n"; + name = "kcodecs-5.78.0.tar.xz"; }; }; kcompletion = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kcompletion-5.76.0.tar.xz"; - sha256 = "014c56172040bf3aa27f81a6bb433914a5c22d2dfb1f8566be4cce678d09193a"; - name = "kcompletion-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kcompletion-5.78.0.tar.xz"; + sha256 = "1a9z252m7v2fhd71dnibczb8yjq090ylcysx5pgwhc2j3djp4fd7"; + name = "kcompletion-5.78.0.tar.xz"; }; }; kconfig = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kconfig-5.76.0.tar.xz"; - sha256 = "153d3ed114954594b0dcc00e1317483609649c064203e6eb8b110686dbaba686"; - name = "kconfig-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kconfig-5.78.0.tar.xz"; + sha256 = "1fzzrypi8pxb0vprh65bpqrpgpwlwwlspf2mz5w83s90snbiwymj"; + name = "kconfig-5.78.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kconfigwidgets-5.76.0.tar.xz"; - sha256 = "f8eed399008a041df2da9cc3f2313df11376b94c85472900b39b9d6abcabe6d4"; - name = "kconfigwidgets-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kconfigwidgets-5.78.0.tar.xz"; + sha256 = "0fgclbyxjyjid21x2059wh7dns73acjnh4qrgzhg0nsx2h8cvm47"; + name = "kconfigwidgets-5.78.0.tar.xz"; }; }; kcontacts = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kcontacts-5.76.0.tar.xz"; - sha256 = "4a9e3189b4ed1bc0231bf98cba134e78e5a692a14d202f0311f6e5c5190cfad5"; - name = "kcontacts-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kcontacts-5.78.0.tar.xz"; + sha256 = "1xjm0l8did9qmjgfvy9hsa7jbfv5mqimnwl7iiz6gxvm8sm14gcw"; + name = "kcontacts-5.78.0.tar.xz"; }; }; kcoreaddons = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kcoreaddons-5.76.0.tar.xz"; - sha256 = "fbab3e3e18f42922ecdc50138ed31f62007cafa902b959d89b1233b5557282d6"; - name = "kcoreaddons-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kcoreaddons-5.78.0.tar.xz"; + sha256 = "01rvijlb3b3s5r3213am9zyk7xhfqbnfxnq175hggq0mbm6zjpv3"; + name = "kcoreaddons-5.78.0.tar.xz"; }; }; kcrash = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kcrash-5.76.0.tar.xz"; - sha256 = "c4e32254b22f1f02db556be2ad40000cc52cac2e30a35682af3c75ac69710993"; - name = "kcrash-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kcrash-5.78.0.tar.xz"; + sha256 = "0rrxzjxwi3kib0w86gc4gkkyzvnkg6l1x81ybclvk275zi724jkj"; + name = "kcrash-5.78.0.tar.xz"; }; }; kdav = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kdav-5.76.0.tar.xz"; - sha256 = "c6b1d32d9c976585e278c2061091ee90ef2d7feb29642f236a3941cea5ffae72"; - name = "kdav-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kdav-5.78.0.tar.xz"; + sha256 = "1iqh5z5rry644mcrlppbbf72nxli607varki61m1zgvcvwvaq00j"; + name = "kdav-5.78.0.tar.xz"; }; }; kdbusaddons = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kdbusaddons-5.76.0.tar.xz"; - sha256 = "8e11b19e4a3d4ad8e4deda245eb51b7b77255cbacc07346e7074c8110b946e0a"; - name = "kdbusaddons-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kdbusaddons-5.78.0.tar.xz"; + sha256 = "16fk4jpx93q4l0wf3vgxg7vxajjqmbxd91y08khfahr2fssx14ag"; + name = "kdbusaddons-5.78.0.tar.xz"; }; }; kdeclarative = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kdeclarative-5.76.0.tar.xz"; - sha256 = "3dfaa271a97be48e72d5fff0dd3c3c1995be3b9e7d0451b197b79418d76c4ce3"; - name = "kdeclarative-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kdeclarative-5.78.0.tar.xz"; + sha256 = "15s75xfy8lvwvkd789vg6y3zcxafav46g7r97psn97ans6gk2na7"; + name = "kdeclarative-5.78.0.tar.xz"; }; }; kded = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kded-5.76.0.tar.xz"; - sha256 = "2e94a4737ffc359d3614a1dff15b9727d54cb5fe639828946e0efcdcdbff3516"; - name = "kded-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kded-5.78.0.tar.xz"; + sha256 = "0lmxqax0x2hxllzhbvwgywdg483zarhs7f2i0d1ffigr3nn6q59m"; + name = "kded-5.78.0.tar.xz"; }; }; kdelibs4support = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kdelibs4support-5.76.0.tar.xz"; - sha256 = "b581273dfaebc5697eb7aa616d858119227dd6c5b781f216abdbff1d93076f0d"; - name = "kdelibs4support-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/portingAids/kdelibs4support-5.78.0.tar.xz"; + sha256 = "1iclzch3sh0j73prm2ccjvd3z89hp4638kxdblzqqxxdyali9ycq"; + name = "kdelibs4support-5.78.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kdesignerplugin-5.76.0.tar.xz"; - sha256 = "5f9190e00761330c031310b94e195766e639115675081765050ddc55069a1b71"; - name = "kdesignerplugin-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/portingAids/kdesignerplugin-5.78.0.tar.xz"; + sha256 = "1chg3g8xc8nmlzg4niciphfrclmiqcfb6jxwajv1j8j3s3vk7wwz"; + name = "kdesignerplugin-5.78.0.tar.xz"; }; }; kdesu = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kdesu-5.76.0.tar.xz"; - sha256 = "421ef43bd47c3eb6b05806af033276c19df20fd76a06b67fada529bb9c52e642"; - name = "kdesu-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kdesu-5.78.0.tar.xz"; + sha256 = "072bnj6hxph864gn81hr24aklh7mq974fibglihwyak0zbml5yfm"; + name = "kdesu-5.78.0.tar.xz"; }; }; kdewebkit = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kdewebkit-5.76.0.tar.xz"; - sha256 = "cf7de765c5fcad0922a1bb9376b65cfb00eb3d29a0c4ed8ef43fc363abe906ba"; - name = "kdewebkit-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/portingAids/kdewebkit-5.78.0.tar.xz"; + sha256 = "0mcnlc4s372ghdjypksdjh6casradsxwa47aaac4d4yg2qk7mqb1"; + name = "kdewebkit-5.78.0.tar.xz"; }; }; kdnssd = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kdnssd-5.76.0.tar.xz"; - sha256 = "9cc2979e56915b5c4d8f8e66053a41406bff46aefd65af1ab07d2b87d8f4a753"; - name = "kdnssd-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kdnssd-5.78.0.tar.xz"; + sha256 = "1rsjbi5x05ii17xl8zvcrfjmjsq0g6vqh90qflnyys6lzhyvs0sf"; + name = "kdnssd-5.78.0.tar.xz"; }; }; kdoctools = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kdoctools-5.76.0.tar.xz"; - sha256 = "84ea7974d741e6261e8c269750367a00375c6111dbc542e917647d0267337ae4"; - name = "kdoctools-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kdoctools-5.78.0.tar.xz"; + sha256 = "0qngw9li2am0phkys45cph3qj01fjhjhvp3dsk3ymr60szryw23s"; + name = "kdoctools-5.78.0.tar.xz"; }; }; kemoticons = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kemoticons-5.76.0.tar.xz"; - sha256 = "a50f69e62b342d6f058000ff1823569ab61d3310cb0020d848a78deaf20dff99"; - name = "kemoticons-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kemoticons-5.78.0.tar.xz"; + sha256 = "14alh2n5igk3cpm1j7ms7y0xph61qy5k3n2bw8y4y5wkb8qmqg3m"; + name = "kemoticons-5.78.0.tar.xz"; }; }; kfilemetadata = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kfilemetadata-5.76.0.tar.xz"; - sha256 = "fa24758c93ce3df9f8ced4310dc0bf58e129b08e50f254daafa025afc9213d68"; - name = "kfilemetadata-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kfilemetadata-5.78.0.tar.xz"; + sha256 = "111w47f74kmn81hvjxjhp6n6kc4533a76fzvrv6wbprqiwc6bncx"; + name = "kfilemetadata-5.78.0.tar.xz"; }; }; kglobalaccel = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kglobalaccel-5.76.0.tar.xz"; - sha256 = "3a846f783ccb68da1f152fb5778612c4ed14cd79c6b5929ef729cf59e47462d4"; - name = "kglobalaccel-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kglobalaccel-5.78.0.tar.xz"; + sha256 = "08mqjdigb5lzx0kqhmw5m8gnvs01fzg3j0dan70v5203wbfnw69z"; + name = "kglobalaccel-5.78.0.tar.xz"; }; }; kguiaddons = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kguiaddons-5.76.0.tar.xz"; - sha256 = "bdaa2ed104bfa9c2ebd702f033935a83560e1d00c7302620a6ae52cb309c7125"; - name = "kguiaddons-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kguiaddons-5.78.0.tar.xz"; + sha256 = "1l3ppihibhcjajmd55dr6mcc1xd4ni2iw2rdpk2l11ran4nys2dd"; + name = "kguiaddons-5.78.0.tar.xz"; }; }; kholidays = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kholidays-5.76.0.tar.xz"; - sha256 = "2eeae5812b33b2527c27a137fee0d7ec66fe7164bd28afd0d2a8362f6114618b"; - name = "kholidays-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kholidays-5.78.0.tar.xz"; + sha256 = "147ma06mrbydf2gyrh526bjh1f0xlnxiw89xp6n3wq0qmmdvhs17"; + name = "kholidays-5.78.0.tar.xz"; }; }; khtml = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/khtml-5.76.0.tar.xz"; - sha256 = "163139cf9ed9c43bba9532e64ae6376e8ced9b19ea8bb8235ff91c91c4c5a3f4"; - name = "khtml-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/portingAids/khtml-5.78.0.tar.xz"; + sha256 = "0pai60cbl8p01xb97191nyzmsf7q00vcqvy8cdr8gfvrlx8k7dhn"; + name = "khtml-5.78.0.tar.xz"; }; }; ki18n = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/ki18n-5.76.0.tar.xz"; - sha256 = "0e87bc1136e21f7860f15daa39e8d16e5a773995fce2b87b0cef0043c4ce0e7a"; - name = "ki18n-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/ki18n-5.78.0.tar.xz"; + sha256 = "0mafvkrgmdcj869dzqmgphdwhl6a2bf2lw99w7frxh2qw4n2sd8k"; + name = "ki18n-5.78.0.tar.xz"; }; }; kiconthemes = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kiconthemes-5.76.0.tar.xz"; - sha256 = "3b3c4ab8369061418677c840963cc868dcecc2a4e57f0c73448e16a46773c7d3"; - name = "kiconthemes-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kiconthemes-5.78.0.tar.xz"; + sha256 = "0ssd1298pqm0g46m92b5d4yfrqxgmwf465lcbia41lndjd6px27v"; + name = "kiconthemes-5.78.0.tar.xz"; }; }; kidletime = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kidletime-5.76.0.tar.xz"; - sha256 = "0866fc98b5b045158742f03f5810909b24f1edf374a6014d476d67fe0466eb62"; - name = "kidletime-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kidletime-5.78.0.tar.xz"; + sha256 = "0aw6g6p3bmp32zk22fwp2f1d20vbf7921ixnyf7a0w535r58d5ma"; + name = "kidletime-5.78.0.tar.xz"; }; }; kimageformats = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kimageformats-5.76.0.tar.xz"; - sha256 = "78ced2665f8918beb617b74962d188dcbb01a92a90ba49bfd173671bdb14e68d"; - name = "kimageformats-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kimageformats-5.78.0.tar.xz"; + sha256 = "0gv2w49cdzji8h9swaazpmbn0qqzn4ncnxj7f9rqp686q17czm7c"; + name = "kimageformats-5.78.0.tar.xz"; }; }; kinit = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kinit-5.76.0.tar.xz"; - sha256 = "a5b63c10b4fc5efcbb5f92b7bce928b4a4880c0ad5d12ff12518106b09239546"; - name = "kinit-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kinit-5.78.0.tar.xz"; + sha256 = "16shlmm6q0vaf05gkrgqpmjrs5fgb8jrfgq331x7ic567hhzv4vv"; + name = "kinit-5.78.0.tar.xz"; }; }; kio = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kio-5.76.0.tar.xz"; - sha256 = "9351fc85c4020f2f77012e077f4f9d04d8f233e9b67f9b7619c9bc064714145b"; - name = "kio-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kio-5.78.0.tar.xz"; + sha256 = "086nhyjk5sjvp97fs6kkmc99jh2303sbmpfki1qvcwzdq6idn4g2"; + name = "kio-5.78.0.tar.xz"; }; }; kirigami2 = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kirigami2-5.76.0.tar.xz"; - sha256 = "90806125143807b74ee7f2fc74cd781d99b4e69ce5f15dcc28e1923f7a34a80a"; - name = "kirigami2-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kirigami2-5.78.0.tar.xz"; + sha256 = "0667wcxyhil332g6gk12bjg5y0c1zk15354wx6mg8krxl3i2nkjy"; + name = "kirigami2-5.78.0.tar.xz"; }; }; kitemmodels = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kitemmodels-5.76.0.tar.xz"; - sha256 = "53855ccdd1105aa792914f9c88f357039bf2394af8400beaaecd9729f70e9cb0"; - name = "kitemmodels-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kitemmodels-5.78.0.tar.xz"; + sha256 = "1yn8gi7dml7mxyk93fzx5id2pckw6qbbkifwzmhq5i3vzpq1qdja"; + name = "kitemmodels-5.78.0.tar.xz"; }; }; kitemviews = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kitemviews-5.76.0.tar.xz"; - sha256 = "b102cb67513d804fd7eed2ae20bb4ba679d38de4f236de6bc03709ff0c0bc001"; - name = "kitemviews-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kitemviews-5.78.0.tar.xz"; + sha256 = "10ysirhlgbzyiybb1ap111w89v3czing43ap10n5pldgh1c8ky05"; + name = "kitemviews-5.78.0.tar.xz"; }; }; kjobwidgets = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kjobwidgets-5.76.0.tar.xz"; - sha256 = "850b6af6c027476e594e6ed77ea0e531abb69ff726fce41b91e541fbee3ecedf"; - name = "kjobwidgets-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kjobwidgets-5.78.0.tar.xz"; + sha256 = "0cdy7w14wr08xf9na1jzbrwjvmiw5q2ciniafzf9cn55yxrvmhwv"; + name = "kjobwidgets-5.78.0.tar.xz"; }; }; kjs = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kjs-5.76.0.tar.xz"; - sha256 = "829eb1308b9b07cdd07b34d80eb5e3fcf5225fa4816da19bce886add600bb62a"; - name = "kjs-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/portingAids/kjs-5.78.0.tar.xz"; + sha256 = "0sjnwj6x7dgvqh333yii5vlh7pbl1kc7zrbdjkqi38cfnbcf2w4h"; + name = "kjs-5.78.0.tar.xz"; }; }; kjsembed = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kjsembed-5.76.0.tar.xz"; - sha256 = "d7fe11b69445afe372388c5ab310d38ab69e203f3995136a948c9bbf9b8b4a88"; - name = "kjsembed-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/portingAids/kjsembed-5.78.0.tar.xz"; + sha256 = "0r8hxbqn5k0wsk4swym7hi15mnhd9dyvcgz8lycqnvlrz0walvr9"; + name = "kjsembed-5.78.0.tar.xz"; }; }; kmediaplayer = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kmediaplayer-5.76.0.tar.xz"; - sha256 = "3185da877c2529c6e209cb382593bbb4778f80aee1b1a29b384b3f05ff99ed89"; - name = "kmediaplayer-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/portingAids/kmediaplayer-5.78.0.tar.xz"; + sha256 = "0yy0k2cgchj1pnk2q7gq4iihscf6rgiwdpfn6i0i8zcczkm2gyls"; + name = "kmediaplayer-5.78.0.tar.xz"; }; }; knewstuff = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/knewstuff-5.76.0.tar.xz"; - sha256 = "d6589b420204d1133997f33b598324c839ec6a0db96936e2e51b7b156cafbc6b"; - name = "knewstuff-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/knewstuff-5.78.0.tar.xz"; + sha256 = "1fb1ka7ljfw4wyf8sy0r5vy9nmji286p26wjzgsf2rzzskaspc6m"; + name = "knewstuff-5.78.0.tar.xz"; }; }; knotifications = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/knotifications-5.76.0.tar.xz"; - sha256 = "56a7daf4951b3564e244d8ba48d443e78c6d703d9d4ccc280c56d0c986de47a2"; - name = "knotifications-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/knotifications-5.78.0.tar.xz"; + sha256 = "0f93xql467jbz964lpjrsip77wf0s8qygggkjb85y8xgpcdw4zrr"; + name = "knotifications-5.78.0.tar.xz"; }; }; knotifyconfig = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/knotifyconfig-5.76.0.tar.xz"; - sha256 = "9f98834a9b8135a60a5d67e7ac45229a668a889d42a14c2ca5365885acd2370e"; - name = "knotifyconfig-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/knotifyconfig-5.78.0.tar.xz"; + sha256 = "0nzs76ii447xv3dqcg14a045xc74bnvwghfdmlb0vmh22p3a60fz"; + name = "knotifyconfig-5.78.0.tar.xz"; }; }; kpackage = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kpackage-5.76.0.tar.xz"; - sha256 = "97791ef08ca18892d6aa6a50fa0a87ae72cad10de9f17e3fb503a370de829772"; - name = "kpackage-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kpackage-5.78.0.tar.xz"; + sha256 = "0d0vfh3ifaj2xifw370rfapw2yf24h7f8xwbhmx787dr6w86m47c"; + name = "kpackage-5.78.0.tar.xz"; }; }; kparts = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kparts-5.76.0.tar.xz"; - sha256 = "c516b5c1f2bca4a109dc2d186ef6729c1ad53a242877dfe942b84f131e93412d"; - name = "kparts-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kparts-5.78.0.tar.xz"; + sha256 = "1np1vshzihh2r51gzy54yvm6h898ffw5b20c3r6jaa0837g3mlvp"; + name = "kparts-5.78.0.tar.xz"; }; }; kpeople = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kpeople-5.76.0.tar.xz"; - sha256 = "25c03e48a0951f2d17556912893f55750ffbc1333b07b9b42e2ff0bb571b6545"; - name = "kpeople-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kpeople-5.78.0.tar.xz"; + sha256 = "0ccc10qfhw69s12sfgpql988pf7pssx9k8j9xcywil4y7xidk05i"; + name = "kpeople-5.78.0.tar.xz"; }; }; kplotting = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kplotting-5.76.0.tar.xz"; - sha256 = "536e0eb7b35700ffe91fccce37386f9b97214cd9bd41bea7f2bb333a49d7ec9e"; - name = "kplotting-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kplotting-5.78.0.tar.xz"; + sha256 = "00wd3rgp4c0sngfbdz613792sidsykbnazsq05lf4pk46py4xcvc"; + name = "kplotting-5.78.0.tar.xz"; }; }; kpty = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kpty-5.76.0.tar.xz"; - sha256 = "faa143bdceb02156ba2f989128376b97161c9799952a3517240816a42abe1ac7"; - name = "kpty-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kpty-5.78.0.tar.xz"; + sha256 = "1nhijlp98bnnqj9c0i3g1xfpdhghw7241av4wzwhhxny67addlf3"; + name = "kpty-5.78.0.tar.xz"; }; }; kquickcharts = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kquickcharts-5.76.0.tar.xz"; - sha256 = "65e79e0b4a8f1bca579931d0c0f8345c58f27319bf332e05a32ec930b8e519c2"; - name = "kquickcharts-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kquickcharts-5.78.0.tar.xz"; + sha256 = "1zq5bp3w42sqvlvkc7vx6l7h142ihzgzqpa2435j9apvx0kvjqhp"; + name = "kquickcharts-5.78.0.tar.xz"; }; }; kross = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kross-5.76.0.tar.xz"; - sha256 = "15591f2a50f995bcaf17ef72662851c805d4644f13848387f056f686b77c5291"; - name = "kross-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/portingAids/kross-5.78.0.tar.xz"; + sha256 = "07ylcvkz5xf6b9n65373a8zpp5nsby5c99l912bdxf05hrjcw8b1"; + name = "kross-5.78.0.tar.xz"; }; }; krunner = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/krunner-5.76.0.tar.xz"; - sha256 = "08c8addcdd3dac87472e84bd14c6d02b99f98c5efbbda7802de92286105dcdda"; - name = "krunner-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/krunner-5.78.0.tar.xz"; + sha256 = "00hy62g9i9vdzgv9ljfqjv0m45lrsmxynmp3fyp5c3amj9r64pkm"; + name = "krunner-5.78.0.tar.xz"; }; }; kservice = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kservice-5.76.0.tar.xz"; - sha256 = "ef7715e5d3e0bf4fc2d28a7713913a1283fb9c658b3c3536a6db8da649d185bf"; - name = "kservice-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kservice-5.78.0.tar.xz"; + sha256 = "181maly1xij1jp7f0x9ajbv5q6qszqd273sdz1snkg5j4398mric"; + name = "kservice-5.78.0.tar.xz"; }; }; ktexteditor = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/ktexteditor-5.76.0.tar.xz"; - sha256 = "6f937b7af06562a238f091deef9c4332e94311a697af8466b7f091720eaab2b2"; - name = "ktexteditor-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/ktexteditor-5.78.0.tar.xz"; + sha256 = "1r148n3nx3jyw2vn4rfxdl2mkywr5fn78s5ya7vq44pw2bmwar2n"; + name = "ktexteditor-5.78.0.tar.xz"; }; }; ktextwidgets = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/ktextwidgets-5.76.0.tar.xz"; - sha256 = "a104e894cf21c245a6c22e6f2c38fdbbdb094cb7fde3d7ebff801bfd73af4c84"; - name = "ktextwidgets-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/ktextwidgets-5.78.0.tar.xz"; + sha256 = "1gpqxvlmqm5nj5kgx2dmvl8ynjqw995wnpl9ja5c82d8bczkn4z8"; + name = "ktextwidgets-5.78.0.tar.xz"; }; }; kunitconversion = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kunitconversion-5.76.0.tar.xz"; - sha256 = "31fa05b082ec3a42c831b840cbc086f97c5e49c05a71af29ab35b9727320990c"; - name = "kunitconversion-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kunitconversion-5.78.0.tar.xz"; + sha256 = "17a3lpc60qn9qd53mlrjxwg5gyqvq0vnnz9wdrak481nf2c0qycc"; + name = "kunitconversion-5.78.0.tar.xz"; }; }; kwallet = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kwallet-5.76.0.tar.xz"; - sha256 = "5addd560d3f650fbb43cd9c8c9e964c2d6893fa45ac53420b711f6bbb4e7a4fc"; - name = "kwallet-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kwallet-5.78.0.tar.xz"; + sha256 = "1a8n5d9y9qwcb4d9zbr1xhk3w390n7f6mmx52nq5akna51zrjc4p"; + name = "kwallet-5.78.0.tar.xz"; }; }; kwayland = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kwayland-5.76.0.tar.xz"; - sha256 = "eee72a5f57a2f5c6ab5f1717aa3eb5a9089240794a5e40c6d85bdc37fa3027a7"; - name = "kwayland-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kwayland-5.78.0.tar.xz"; + sha256 = "052avcafjnib55s2lp1fzhx7dk9mlyg4v143gfp9j8wvlqaa8sxb"; + name = "kwayland-5.78.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kwidgetsaddons-5.76.0.tar.xz"; - sha256 = "ab7aa94bb1f63e5bea5cf461349c1add96fd608a73c5b7c9d374e6bf035fcac6"; - name = "kwidgetsaddons-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kwidgetsaddons-5.78.0.tar.xz"; + sha256 = "0b2y9ilk2zz4zw2m1lcwrmn3hni5jh6kalclx5l9fi98686b1az4"; + name = "kwidgetsaddons-5.78.0.tar.xz"; }; }; kwindowsystem = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kwindowsystem-5.76.0.tar.xz"; - sha256 = "8dced74012bed3f33c3c51874aa9c3a57093573c1c0e263b758cefa96c26f7b7"; - name = "kwindowsystem-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kwindowsystem-5.78.0.tar.xz"; + sha256 = "003jypnib16qpm7l76zqbhhbqq2g23hm245l9dskbansxpncmfbc"; + name = "kwindowsystem-5.78.0.tar.xz"; }; }; kxmlgui = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/kxmlgui-5.76.0.tar.xz"; - sha256 = "73ae838fb79f97243bea36d438e9bc45315183bbb6b08ab5173c822cfcb4dd82"; - name = "kxmlgui-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/kxmlgui-5.78.0.tar.xz"; + sha256 = "05yxgxbvv8anl4m40jwwfx183y69fdljj4g7daip0nk7hs4vc37q"; + name = "kxmlgui-5.78.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/portingAids/kxmlrpcclient-5.76.0.tar.xz"; - sha256 = "66fe826a81cd266ee57ba814cb8c7adfa00aa9112cb55714db061a82895ee8de"; - name = "kxmlrpcclient-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/portingAids/kxmlrpcclient-5.78.0.tar.xz"; + sha256 = "0591c23sjwfhrf7d7z6bgikjal1h70vpjx7xmr1ypwck6pxj8z2x"; + name = "kxmlrpcclient-5.78.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/modemmanager-qt-5.76.0.tar.xz"; - sha256 = "5782b71f60b825244dc017989a4de515eb9eb5cc4edfe494a14ea62d3ac40cd1"; - name = "modemmanager-qt-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/modemmanager-qt-5.78.0.tar.xz"; + sha256 = "09y3pjav7dzfmplacwn0j281d59rdhlad16myaxh6hbf9zdkmnyr"; + name = "modemmanager-qt-5.78.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/networkmanager-qt-5.76.0.tar.xz"; - sha256 = "5920862a843898ed169cc61a8f27dd87cb64dd505ec300d95ab8967da89f2f90"; - name = "networkmanager-qt-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/networkmanager-qt-5.78.0.tar.xz"; + sha256 = "0wfyczlki8sb2wydyslpi111y4hfc6xvnar8cxj75bsn83pd9wya"; + name = "networkmanager-qt-5.78.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/oxygen-icons5-5.76.0.tar.xz"; - sha256 = "95ca95bada43281d09cce000c9cd645af67592205c971052b3e0c27aef9c95b1"; - name = "oxygen-icons5-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/oxygen-icons5-5.78.0.tar.xz"; + sha256 = "1xp3zg59srxfc0z5cf45x7am98rsjq3p3ms2975il03389w55kr9"; + name = "oxygen-icons5-5.78.0.tar.xz"; }; }; plasma-framework = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/plasma-framework-5.76.0.tar.xz"; - sha256 = "5bea341bc7b22ffa6a78bf7475c25b138150314c96b3d5154d8bccc532be242a"; - name = "plasma-framework-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/plasma-framework-5.78.0.tar.xz"; + sha256 = "10c4d7mvnjdpjcjzxy8r5k1h3pxw9d4h9ii8bkngb2kjfblf3bj6"; + name = "plasma-framework-5.78.0.tar.xz"; }; }; prison = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/prison-5.76.0.tar.xz"; - sha256 = "6c369efc354f8f3a0e08b0de565fd523f1480d563bec0d19382e9ab01f3efb78"; - name = "prison-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/prison-5.78.0.tar.xz"; + sha256 = "0ygsdjcxr7l7jgllf6c38rbpc4byikg7zx71dzmas7ikg4axylfk"; + name = "prison-5.78.0.tar.xz"; }; }; purpose = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/purpose-5.76.0.tar.xz"; - sha256 = "fd0edb0e7ba8b5336436848fe2452ff98c1b5bf2c49ea7744a8c0038d4e8887d"; - name = "purpose-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/purpose-5.78.0.tar.xz"; + sha256 = "13v2w4kx7ir9wqyahn6rlq7li7kxigxppffjccwpfihzpnyig029"; + name = "purpose-5.78.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/qqc2-desktop-style-5.76.0.tar.xz"; - sha256 = "76d2f85f6f99157aec26e6797889f1b99035a337e8aa12029c222f3d48288ef3"; - name = "qqc2-desktop-style-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/qqc2-desktop-style-5.78.0.tar.xz"; + sha256 = "0a9kxfrvx0qv079vd9vx4924vs5g8qbicdp1wfv3c80ilbmn1sik"; + name = "qqc2-desktop-style-5.78.0.tar.xz"; }; }; solid = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/solid-5.76.0.tar.xz"; - sha256 = "7958d047c8bd7622f91541acbe2d554c222218419ee18f395059a09fb90d264d"; - name = "solid-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/solid-5.78.0.tar.xz"; + sha256 = "1qgx9fsaxsypjfzyp3dq79skp7vhhv59ssqb1aq4168gdsai15qj"; + name = "solid-5.78.0.tar.xz"; }; }; sonnet = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/sonnet-5.76.0.tar.xz"; - sha256 = "cb6bacae27cfa3f8b3ce300b18efe16730783f143c4a7fccfa634f528262ef9b"; - name = "sonnet-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/sonnet-5.78.0.tar.xz"; + sha256 = "1jw00bkhjf029yr6qh7mkdpizcc96103fsf68ydkbykfqsb0xry2"; + name = "sonnet-5.78.0.tar.xz"; }; }; syndication = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/syndication-5.76.0.tar.xz"; - sha256 = "239ec30ff8f7ad2911ecc6b9b9c32f2b44c6cad634900105936ae56bf96d6292"; - name = "syndication-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/syndication-5.78.0.tar.xz"; + sha256 = "0sy2419xrkb5yqj70x2gakb53hqz7j5631pjkvai92gvk01bcbd1"; + name = "syndication-5.78.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/syntax-highlighting-5.76.0.tar.xz"; - sha256 = "3cb61a8c478b76f797db53ed9e8a16c6e70bb1c564f05938680db81c3062bab3"; - name = "syntax-highlighting-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/syntax-highlighting-5.78.0.tar.xz"; + sha256 = "1m6ngf6nij3p09p7dhngjr9jhmc6dl12vd2x4dkj5fs8wlfbfplb"; + name = "syntax-highlighting-5.78.0.tar.xz"; }; }; threadweaver = { - version = "5.76.0"; + version = "5.78.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.76/threadweaver-5.76.0.tar.xz"; - sha256 = "8bc0cc4507b4cd7398e18cce8519b4a65b0367e7d22c4faae034a57346297039"; - name = "threadweaver-5.76.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.78/threadweaver-5.78.0.tar.xz"; + sha256 = "1llqfmpbq0mysa1h7vx16v020zw776sqkrh85kah9478bj7ffwnr"; + name = "threadweaver-5.78.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix index 837333407b29b..315a38197a1f1 100644 --- a/pkgs/development/libraries/kpmcore/default.nix +++ b/pkgs/development/libraries/kpmcore/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules ]; + dontWrapQtApps = true; + meta = with lib; { maintainers = with lib.maintainers; [ peterhoeg ]; # The build requires at least Qt 5.14: diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index e35f83859159a..edbc61957c04e 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "libaom"; - version = "2.0.0"; + version = "2.0.1"; src = fetchgit { url = "https://aomedia.googlesource.com/aom"; rev = "v${version}"; - sha256 = "1616xjhj6770ykn82ml741h8hx44v507iky3s9h7a5lnk9d4cxzy"; + sha256 = "1vakwmcwvmmrdw7460m8hzq96y71lxqix8b2g07c6s12br0rrdhl"; }; patches = [ ./outputs.patch ]; diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix index bd8e8bd4aaf07..81b84e0f181c1 100644 --- a/pkgs/development/libraries/libcint/default.nix +++ b/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "4.0.7"; + version = "4.1.0"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - sha256 = "sha256-/S5LcaIIAXq9QiH8wGPSw8KpWC3afX9HqiHrWHmGQ6s="; + sha256 = "sha256-ZDPDJXvSAqCkhxUSzlcWBAMrCI6mjA8rXxX65Cw5nYI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index 0b0cc325a3568..532c91a0edab9 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { dontUseQmakeConfigure = true; configureFlags = [ "-config" "release" ]; + dontWrapQtApps = true; + preConfigure = '' sed -i -e 's|/bin/pwd|pwd|g' configure ''; diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix index e44f3e37d2001..75d4f76b31ffa 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation { cmakeFlags = [ "-DWITH_DOC=OFF" ]; + dontWrapQtApps = true; + meta = with lib; { description = "Provides a Qt implementation of the DBusMenu spec"; inherit homepage; diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix index 5ce811e9fea24..7219bcbdeb5ac 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_DOC=OFF" ]; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://launchpad.net/libdbusmenu-qt"; description = "Provides a Qt implementation of the DBusMenu spec"; diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/development/libraries/libetpan/default.nix index b4b48dcb777d7..572c90b27b47b 100644 --- a/pkgs/development/libraries/libetpan/default.nix +++ b/pkgs/development/libraries/libetpan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub +{ stdenv, lib, fetchFromGitHub, fetchpatch , autoconf, automake, libtool, openssl, pkg-config }: @@ -13,6 +13,28 @@ stdenv.mkDerivation rec { sha256 = "0g7an003simfdn7ihg9yjv7hl2czsmjsndjrp39i7cad8icixscn"; }; + patches = [ + # The following two patches are fixing CVE-2020-15953, as reported in the + # issue tracker: https://github.com/dinhvh/libetpan/issues/386 + # They might be removed for the next version bump. + + # CVE-2020-15953: Detect extra data after STARTTLS response and exit + # https://github.com/dinhvh/libetpan/pull/387 + (fetchpatch { + name = "cve-2020-15953-imap.patch"; + url = "https://github.com/dinhvh/libetpan/commit/1002a0121a8f5a9aee25357769807f2c519fa50b.patch"; + sha256 = "1h9ds2z4jii40a0i3z6hsnzx1ldmd2jqidsxp2y2ksyp1ijcgabn"; + }) + + # CVE-2020-15953: Detect extra data after STARTTLS responses in SMTP and POP3 and exit + # https://github.com/dinhvh/libetpan/pull/388 + (fetchpatch { + name = "cve-2020-15953-pop3-smtp.patch"; + url = "https://github.com/dinhvh/libetpan/commit/298460a2adaabd2f28f417a0f106cb3b68d27df9.patch"; + sha256 = "0lq829djar7nb3fai3vdzirmks3w2lfagzqc809lx2lln6y213a0"; + }) + ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 6c6d73740f209..081b67b166390 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -6,11 +6,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; - version = "1.8.7"; + version = "1.9.1"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; - sha256 = "0j27jxhjay78by940d64778nxwbysxynv5mq6iq1nmlrh810zdq3"; + sha256 = "1nb50bgzp83q6r5cz4v40y1mcbhpqwqyxlay87xp1lrbkf5pm9n5"; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 39d0b185660f4..da53a9916d05c 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -17,11 +17,11 @@ }; in stdenv.mkDerivation (rec { pname = "libgpg-error"; - version = "1.38"; + version = "1.41"; src = fetchurl { url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "00px79xzyc5lj8aig7i4fhk29h1lkqp4840wjfgi9mv9m9sq566q"; + sha256 = "0hi7jbcs1l9kxzhiqcs2iivsb048642mwaimgqyh1hy3bas7ic34"; }; postPatch = '' @@ -66,7 +66,8 @@ in stdenv.mkDerivation (rec { doCheck = true; # not cross meta = with lib; { - homepage = "https://www.gnupg.org/related_software/libgpg-error/index.html"; + homepage = "https://www.gnupg.org/software/libgpg-error/index.html"; + changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=NEWS;hb=refs/tags/libgpg-error-${version}"; description = "A small library that defines common error values for all GnuPG components"; longDescription = '' diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index 83a5a462ee007..1c8502da492f0 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libimagequant"; - version = "2.13.1"; + version = "2.14.0"; src = fetchFromGitHub { owner = "ImageOptim"; repo = pname; rev = version; - sha256 = "1543h1i59k2hbj2g8shcl8fvhz2silipacynwjgw412r38hkr33j"; + sha256 = "sha256-XP/GeZC8TCgBPqtScY9eneZHFter1kdWf/yko0p2VYQ="; }; preConfigure = '' diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix index 610efa7ed4f4c..825fe87fe2fe4 100644 --- a/pkgs/development/libraries/libktorrent/default.nix +++ b/pkgs/development/libraries/libktorrent/default.nix @@ -27,6 +27,8 @@ in stdenv.mkDerivation rec { inherit mainVersion; }; + dontWrapQtApps = true; + meta = with lib; { description = "A BitTorrent library used by KTorrent"; homepage = "https://www.kde.org/applications/internet/ktorrent/"; diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 10cdb3014791c..5183c47bc061a 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { buildInputs = [ fftwSinglePrec libsamplerate qtbase ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://github.com/lastfm/liblastfm"; repositories.git = "git://github.com/lastfm/liblastfm.git"; diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 025ddf8e7b1de..44f0f8d62ec73 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { - version = "1.1.8"; + version = "1.1.9"; pname = "libnftnl"; src = fetchurl { url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2"; - sha256 = "04dp797llg3cqzivwrql30wg9mfr0ngnp0v5gs7jcdmp11dzm8q4"; + sha256 = "16jbp4fs5dz2yf4c3bl1sb48x9x9wi1chv39zwmfgya1k9pimcp9"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index 4fc50f2073092..65d7a83a8384f 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase libGLU ] ++ lib.optional stdenv.isDarwin AGL; + dontWrapQtApps = true; + postPatch = '' cd QGLViewer ''; diff --git a/pkgs/development/libraries/librseq/default.nix b/pkgs/development/libraries/librseq/default.nix index 12b9b4109c70f..82e6c54bb2c8e 100644 --- a/pkgs/development/libraries/librseq/default.nix +++ b/pkgs/development/libraries/librseq/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Userspace library for the Linux Restartable Sequence API"; homepage = "https://github.com/compudj/librseq"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice ]; }; diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index c810034f84787..1e5cdb389483d 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -4,11 +4,11 @@ # need pkg-config so that libshout installs ${out}/lib/pkgconfig/shout.pc stdenv.mkDerivation rec { - name = "libshout-2.4.4"; + name = "libshout-2.4.5"; src = fetchurl { url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz"; - sha256 = "1hz670a4pfpsb89b0mymy8nw4rx8x0vmh61gq6j1vbg70mfhrscc"; + sha256 = "sha256-2eVoZopnOZTr4/HrXyvuBuMjal25K40MSH4cD4hqaJA="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index f4418ec1bc4d1..88b1f32714567 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "1.7"; + version = "1.8"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-kF4Q3ACiVlUbEjS2YqwHA42QknKMLqX9US31PmXtS/I="; + sha256 = "sha256-vkBkOE4aVX/6xKjslkqlZkh5jdYVEawvvBLpj8PpuiA="; }; nativeBuildInputs = [ pkg-config meson ninja doxygen ]; diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index c0785b34e891b..70dd9cb7bbf80 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -2,6 +2,8 @@ , xkeyboard_config, libxcb, libxml2 , python3 , libX11 +# To enable the "interactive-wayland" subcommand of xkbcli: +, withWaylandSupport ? false, wayland, wayland-protocols }: stdenv.mkDerivation rec { @@ -13,18 +15,23 @@ stdenv.mkDerivation rec { sha256 = "0lmwglj16anhpaq0h830xsl1ivknv75i4lir9bk88aq73s2jy852"; }; + patches = [ + ./fix-cross-compilation.patch + ]; + outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ meson ninja pkg-config yacc doxygen ]; - buildInputs = [ xkeyboard_config libxcb libxml2 ]; + nativeBuildInputs = [ meson ninja pkg-config yacc doxygen ] + ++ lib.optional withWaylandSupport wayland; + buildInputs = [ xkeyboard_config libxcb libxml2 ] + ++ lib.optionals withWaylandSupport [ wayland wayland-protocols ]; checkInputs = [ python3 ]; mesonFlags = [ "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb" "-Dxkb-config-extra-path=/etc/xkb" # default=$sysconfdir/xkb ($out/etc) "-Dx-locale-root=${libX11.out}/share/X11/locale" - "-Denable-wayland=false" - "-Denable-xkbregistry=false" # Optional, separate library (TODO: Install into extra output) + "-Denable-wayland=${lib.boolToString withWaylandSupport}" ]; doCheck = true; diff --git a/pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch b/pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch new file mode 100644 index 0000000000000..55730554a90f6 --- /dev/null +++ b/pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch @@ -0,0 +1,20 @@ +diff --git a/meson.build b/meson.build +index 47c436f..536c60b 100644 +--- a/meson.build ++++ b/meson.build +@@ -440,13 +440,12 @@ if build_tools + if get_option('enable-wayland') + wayland_client_dep = dependency('wayland-client', version: '>=1.2.0', required: false) + wayland_protocols_dep = dependency('wayland-protocols', version: '>=1.12', required: false) +- wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true) +- if not wayland_client_dep.found() or not wayland_protocols_dep.found() or not wayland_scanner_dep.found() ++ if not wayland_client_dep.found() or not wayland_protocols_dep.found() + error('''The Wayland xkbcli programs require wayland-client >= 1.2.0, wayland-protocols >= 1.7 which were not found. + You can disable the Wayland xkbcli programs with -Denable-wayland=false.''') + endif + +- wayland_scanner = find_program(wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner')) ++ wayland_scanner = find_program('wayland-scanner', native: true) + wayland_scanner_code_gen = generator( + wayland_scanner, + output: '@BASENAME@-protocol.c', diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index eff9f2b2b792c..650e17d3179d2 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, gettext, python, libgcrypt +{ lib, stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, gettext, python3, libgcrypt , cryptoSupport ? false , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2.dev ] ++ lib.optional stdenv.isDarwin gettext - ++ lib.optionals pythonSupport [ libxml2.py python ] + ++ lib.optionals pythonSupport [ libxml2.py python3 ] ++ lib.optionals cryptoSupport [ libgcrypt ]; propagatedBuildInputs = [ findXMLCatalogs ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "--without-debug" "--without-mem-debug" "--without-debugger" - ] ++ lib.optional pythonSupport "--with-python=${python}" + ] ++ lib.optional pythonSupport "--with-python=${python3}" ++ lib.optional (!cryptoSupport) "--without-crypto"; postFixup = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { '' + lib.optionalString pythonSupport '' mkdir -p $py/nix-support echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs - moveToOutput ${python.libPrefix} "$py" + moveToOutput ${python3.libPrefix} "$py" ''; passthru = { diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index c65a9b6f583a9..ddefa16c2c1d8 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -1,20 +1,27 @@ -{ lib, stdenv, fetchurl, cmake, perl, zlib }: +{ lib, stdenv +, cmake +, fetchpatch +, fetchurl +, perl +, zlib +}: stdenv.mkDerivation rec { pname = "libzip"; - version = "1.6.1"; + version = "1.7.3"; src = fetchurl { url = "https://www.nih.at/libzip/${pname}-${version}.tar.gz"; - sha256 = "120xgf7cgjmz9d3yp10lks6lhkgxqb4skbmbiiwf46gx868qxsq6"; + sha256 = "1k5rihiz7m1ahhjzcbq759hb9crzqkgw78pkxga118y5a32pc8hf"; }; - # Fix pkg-config file paths - postPatch = '' - sed -i CMakeLists.txt \ - -e 's#\\''${exec_prefix}/''${CMAKE_INSTALL_LIBDIR}#''${CMAKE_INSTALL_FULL_LIBDIR}#' \ - -e 's#\\''${prefix}/''${CMAKE_INSTALL_INCLUDEDIR}#''${CMAKE_INSTALL_FULL_INCLUDEDIR}#' - ''; + # Remove in next release + patches = [ + (fetchpatch { + url = "https://github.com/nih-at/libzip/commit/351201419d79b958783c0cfc7c370243165523ac.patch"; + sha256 = "0d93z98ki0yiaza93268cxkl35y1r7ll9f7l8sivx3nfxj2c1n8a"; + }) + ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 11d6cdd1b2a54..36a0b52f357de 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -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 = "20.3.3"; + version = "20.3.4"; branch = versions.major version; in @@ -46,7 +46,7 @@ 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 = "0mnic7mfv5lgnn3swj7lbif8bl8pi2czlgr01jhq5s9q90nj2kpp"; + sha256 = "1120kf280hg4h0a2505vxf6rdw8r2ydl3cg4iwkmpx0zxj3sj8fw"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 8c98d7ae9bbdb..7b02e3497f0ac 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl, nspr, perl, zlib, sqlite, darwin, fixDarwinDylibNames, buildPackages, ninja +{ lib, stdenv, fetchurl, nspr, perl, zlib +, sqlite, ninja +, darwin, fixDarwinDylibNames, buildPackages +, useP11kit ? true, p11-kit , # allow FIPS mode. Note that this makes the output non-reproducible. # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6 enableFIPS ? false @@ -139,6 +142,11 @@ in stdenv.mkDerivation rec { chmod 0755 $out/bin/nss-config ''; + postInstall = lib.optionalString useP11kit '' + # Replace built-in trust with p11-kit connection + ln -sf ${p11-kit}/lib/pkcs11/p11-kit-trust.so $out/lib/libnssckbi.so + ''; + postFixup = let isCross = stdenv.hostPlatform != stdenv.buildPlatform; nss = if isCross then buildPackages.nss.tools else "$out"; diff --git a/pkgs/development/libraries/oatpp/default.nix b/pkgs/development/libraries/oatpp/default.nix index 084f3c4a935bc..e9f92a31f2c57 100644 --- a/pkgs/development/libraries/oatpp/default.nix +++ b/pkgs/development/libraries/oatpp/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "oatpp"; - version = "1.2.0"; + version = "1.2.5"; src = fetchFromGitHub { owner = "oatpp"; repo = "oatpp"; rev = version; - sha256 = "05rm0m5zf1b5ky8prf6yni2074bz6yjjbrc2qk96fb48fc1198gw"; + sha256 = "sha256-Vtdz03scx0hvY1yeM7yfSxCVKzi84OQ1Oh9b922movE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index 2b399e9ebc299..c87fc4fca7967 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "0r50r9bz7mdhy9z9zdy5m2nhi8r6kqsn70q2rfwylm1vppmhwkfq"; + sha256 = "sha256-PZ8r1eNfz4dVxlbtQJSrxiw/Hk6E6wSDapkMy7ux9fI="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index 53adbdf414f7c..7625db9a59533 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { rmdir $out/bin || true ''; + dontWrapQtApps = true; + postFixup = lib.optionalString stdenv.isDarwin '' app=$out/Applications/opencsgexample.app/Contents/MacOS/opencsgexample install_name_tool -change \ diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index 249ce4e3629ad..3e21415b4c772 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { # on system paths being set. patches = [ ./gst-plugin-paths.patch ]; + dontWrapQtApps = true; + NIX_CFLAGS_COMPILE = let gstPluginPaths = lib.makeSearchPathOutput "lib" "/lib/gstreamer-1.0" diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 07e6ccf1f3460..b874c2e1d01d9 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { extra-cmake-modules ]; + dontWrapQtApps = true; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ]; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 88a6af658dd40..877bf973194a2 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -58,6 +58,8 @@ stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ]; + dontWrapQtApps = true; + preConfigure = '' cmakeFlags+=" -DPHONON_QT_MKSPECS_INSTALL_DIR=''${!outputDev}/mkspecs" cmakeFlags+=" -DPHONON_QT_IMPORTS_INSTALL_DIR=''${!outputBin}/$qtQmlPrefix" diff --git a/pkgs/development/libraries/polkit-qt-1/qt-5.nix b/pkgs/development/libraries/polkit-qt-1/qt-5.nix index be425b394019d..c4918d9d8e97e 100644 --- a/pkgs/development/libraries/polkit-qt-1/qt-5.nix +++ b/pkgs/development/libraries/polkit-qt-1/qt-5.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation { propagatedBuildInputs = [ polkit glib qtbase ]; + dontWrapQtApps = true; + postFixup = '' # Fix library location in CMake module sed -i "$dev/lib/cmake/PolkitQt5-1/PolkitQt5-1Config.cmake" \ diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix index a49bfad7ab314..9b89283972dd3 100644 --- a/pkgs/development/libraries/poppler/0.61.nix +++ b/pkgs/development/libraries/poppler/0.61.nix @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { (mkFlag qt5Support "QT5") ]; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://poppler.freedesktop.org/"; description = "A PDF rendering library"; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 3f2b8453d7f01..f3fae283e87c7 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; - version = "20.12.1"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "21.01.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "0dbv1y9i5ahg6namz6gw2d0njnmrigr4a80dbxvnqad4q232banh"; + sha256 = "sha256-AW3eNOX4aOqYoyypm2QzJaloIoFQCUK3ET9OyI0g4vM="; }; outputs = [ "out" "dev" ]; @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt ''; + dontWrapQtApps = true; + cmakeFlags = [ (mkFlag true "UNSTABLE_API_ABI_HEADERS") # previously "XPDF_HEADERS" (mkFlag (!minimal) "GLIB") diff --git a/pkgs/development/libraries/pyotherside/default.nix b/pkgs/development/libraries/pyotherside/default.nix index 58d38651a7607..da327ae13fac7 100644 --- a/pkgs/development/libraries/pyotherside/default.nix +++ b/pkgs/development/libraries/pyotherside/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { python3 qtbase qtquickcontrols qtsvg ncurses ]; + dontWrapQtApps = true; + patches = [ ./qml-path.patch ]; installTargets = [ "sub-src-install_subtargets" ]; diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index bd778f1a945d5..0fe0806b1ebeb 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { "PYTHON_PATH=${python}/bin" "PYTHON_LIB=${python}/lib"]; + dontWrapQtApps = true; + unpackCmd = "unzip $src"; installPhase = '' diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index d1b545884b536..e53404557fba2 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl qtbase ]; nativeBuildInputs = [ cmake pkg-config ]; + dontWrapQtApps = true; + # Without this patch cmake fails with a "No known features for CXX compiler" # error on darwin patches = lib.optional stdenv.isDarwin ./move-project.patch ; diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix index 88c945430451f..f5257ad0e8ef7 100644 --- a/pkgs/development/libraries/qmlbox2d/default.nix +++ b/pkgs/development/libraries/qmlbox2d/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation { }; enableParallelBuilding = true; + dontWrapQtApps = true; nativeBuildInputs = [ qmake ]; buildInputs = [ qtdeclarative ]; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 75f95a53800a8..7914af08df6dd 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; + dontWrapQtApps = true; + meta = { description = "A QML port of qtermwidget"; homepage = "https://github.com/Swordfish90/qmltermwidget"; diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index 8afa19c229fa2..2b0be6f0b3dd5 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-I${qca-qt5}/include/Qca-qt5/QtCrypto"; NIX_LDFLAGS = "-lqca-qt5"; + dontWrapQtApps = true; + meta = with lib; { description = "Qt library for OAuth authentication"; inherit (qtbase.meta) platforms; diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 26a3c2e36d3b6..314bdabdb558a 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -35,6 +35,7 @@ in stdenv.mkDerivation rec { ''; enableParallelBuilding = true; + dontWrapQtApps = true; postPatch = '' substituteInPlace qscintilla.pro \ diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 261374b7d93e1..b72d9070ce26b 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -136,7 +136,7 @@ let patches = patches.qtbase; inherit bison cups harfbuzz libGL; withGtk3 = true; inherit dconf gtk3; - inherit developerBuild decryptSslTraffic; + inherit debug developerBuild decryptSslTraffic; }; qtcharts = callPackage ../modules/qtcharts.nix {}; @@ -188,6 +188,7 @@ let qmake = makeSetupHook { deps = [ self.qtbase.dev ]; substitutions = { + inherit debug; fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; }; } ../hooks/qmake-hook.sh; diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index 14b99fab4e279..3563a1991c1cc 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -149,7 +149,7 @@ let patches = patches.qtbase; inherit bison cups harfbuzz libGL; withGtk3 = true; inherit dconf gtk3; - inherit developerBuild decryptSslTraffic; + inherit debug developerBuild decryptSslTraffic; }; qtcharts = callPackage ../modules/qtcharts.nix {}; @@ -199,6 +199,7 @@ let qmake = makeSetupHook { deps = [ self.qtbase.dev ]; substitutions = { + inherit debug; fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; }; } ../hooks/qmake-hook.sh; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 6333f889b684f..e72335f1d2418 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -182,6 +182,7 @@ let qmake = makeSetupHook { deps = [ self.qtbase.dev ]; substitutions = { + inherit debug; fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; }; } ../hooks/qmake-hook.sh; diff --git a/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh b/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh index 7f6ddb76ad571..741225a5aa810 100644 --- a/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh @@ -3,6 +3,9 @@ qmakeFlags=( ${qmakeFlags-} ) qmakePrePhase() { + qmakeFlags_orig=( "${qmakeFlags[@]}" ) + + # These flags must be added _before_ the flags specified in the derivation. qmakeFlags=( \ "PREFIX=$out" \ "NIX_OUTPUT_OUT=$out" \ @@ -11,8 +14,15 @@ qmakePrePhase() { "NIX_OUTPUT_DOC=${!outputDev}/${qtDocPrefix:?}" \ "NIX_OUTPUT_QML=${!outputBin}/${qtQmlPrefix:?}" \ "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}" \ - "${qmakeFlags[@]}" \ ) + + if [ -n "@debug@" ]; then + qmakeFlags+=( "CONFIG+=debug" ) + else + qmakeFlags+=( "CONFIG+=release" ) + fi + + qmakeFlags+=( "${qmakeFlags_orig[@]}" ) } prePhases+=" qmakePrePhase" diff --git a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh index 9f2a9f06f1aba..1b57d676e1fc5 100644 --- a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh @@ -1,3 +1,14 @@ +if [[ -n "${__nix_qtbase-}" ]]; then + # Throw an error if a different version of Qt was already set up. + if [[ "$__nix_qtbase" != "@dev@" ]]; then + echo >&2 "Error: detected mismatched Qt dependencies:" + echo >&2 " @dev@" + echo >&2 " $__nix_qtbase" + exit 1 + fi +else # Only set up Qt once. +__nix_qtbase="@dev@" + qtPluginPrefix=@qtPluginPrefix@ qtQmlPrefix=@qtQmlPrefix@ qtDocPrefix=@qtDocPrefix@ @@ -5,6 +16,20 @@ qtDocPrefix=@qtDocPrefix@ . @fix_qt_builtin_paths@ . @fix_qt_module_paths@ +# Disable debug symbols if qtbase was built without debugging. +# This stops -dev paths from leaking into other outputs. +if [ -z "@debug@" ]; then + NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE-}${NIX_CFLAGS_COMPILE:+ }-DQT_NO_DEBUG" +fi + +# Integration with CMake: +# Set the CMake build type corresponding to how qtbase was built. +if [ -n "@debug@" ]; then + cmakeBuildType="Debug" +else + cmakeBuildType="Release" +fi + providesQtRuntime() { [ -d "$1/$qtPluginPrefix" ] || [ -d "$1/$qtQmlPrefix" ] } @@ -19,7 +44,12 @@ export QMAKEPATH QMAKEMODULES= export QMAKEMODULES +declare -Ag qmakePathSeen=() qmakePathHook() { + # Skip this path if we have seen it before. + # MUST use 'if' because 'qmakePathSeen[$]' may be unset. + if [ -n "${qmakePathSeen[$1]-}" ]; then return; fi + qmakePathSeen[$1]=1 if [ -d "$1/mkspecs" ] then QMAKEMODULES="${QMAKEMODULES}${QMAKEMODULES:+:}/mkspecs" @@ -34,7 +64,12 @@ envBuildHostHooks+=(qmakePathHook) # package depending on the building package. (This is necessary in case # the building package does not provide runtime dependencies itself and so # would not be propagated to the user environment.) +declare -Ag qtEnvHostTargetSeen=() qtEnvHostTargetHook() { + # Skip this path if we have seen it before. + # MUST use 'if' because 'qmakePathSeen[$]' may be unset. + if [ -n "${qtEnvHostTargetSeen[$1]-}" ]; then return; fi + qtEnvHostTargetSeen[$1]=1 if providesQtRuntime "$1" && [ "z${!outputBin}" != "z${!outputDev}" ] then propagatedBuildInputs+=" $1" @@ -64,3 +99,14 @@ postPatchMkspecs() { if [ -z "${dontPatchMkspecs-}" ]; then postPhases="${postPhases-}${postPhases:+ }postPatchMkspecs" fi + +qtPreHook() { + # Check that wrapQtAppsHook is used, or it is explicitly disabled. + if [[ -z "$__nix_wrapQtAppsHook" && -z "$dontWrapQtApps" ]]; then + echo >&2 "Error: wrapQtAppsHook is not used, and dontWrapQtApps is not set." + exit 1 + fi +} +prePhases+=" qtPreHook" + +fi diff --git a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh index 7356c8ee35605..ce4d78fbb50f1 100644 --- a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh @@ -1,3 +1,6 @@ +if [[ -z "${__nix_wrapQtAppsHook-}" ]]; then +__nix_wrapQtAppsHook=1 # Don't run this hook more than once. + # Inherit arguments given in mkDerivation qtWrapperArgs=( ${qtWrapperArgs-} ) @@ -100,3 +103,5 @@ wrapQtAppsHook() { } fixupOutputHooks+=(wrapQtAppsHook) + +fi diff --git a/pkgs/development/libraries/qt-5/mkDerivation.nix b/pkgs/development/libraries/qt-5/mkDerivation.nix index 2c6333cb02045..98f9a05fac7c4 100644 --- a/pkgs/development/libraries/qt-5/mkDerivation.nix +++ b/pkgs/development/libraries/qt-5/mkDerivation.nix @@ -9,21 +9,6 @@ args: let args_ = { - qmakeFlags = [ ("CONFIG+=" + (if debug then "debug" else "release")) ] - ++ (args.qmakeFlags or []); - - NIX_CFLAGS_COMPILE = toString ( - optional (!debug) "-DQT_NO_DEBUG" - ++ lib.toList (args.NIX_CFLAGS_COMPILE or [])); - - cmakeFlags = - (args.cmakeFlags or []) - ++ [ - ("-DCMAKE_BUILD_TYPE=" + (if debug then "Debug" else "Release")) - ]; - - enableParallelBuilding = args.enableParallelBuilding or true; - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ wrapQtAppsHook ]; }; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 24f1d6f81a24b..0d0bef342b02c 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -22,6 +22,7 @@ libGL, buildExamples ? false, buildTests ? false, + debug ? false, developerBuild ? false, decryptSslTraffic ? false }: @@ -33,12 +34,14 @@ let compareVersion = v: builtins.compareVersions version v; qmakeCacheName = if compareVersion "5.12.4" < 0 then ".qmake.cache" else ".qmake.stash"; + debugSymbols = debug || developerBuild; in stdenv.mkDerivation { name = "qtbase-${version}"; inherit qtCompatVersion src version; + debug = debugSymbols; propagatedBuildInputs = [ @@ -241,6 +244,7 @@ stdenv.mkDerivation { "-I" "${icu.dev}/include" "-pch" ] + ++ lib.optional debugSymbols "-debug" ++ lib.optionals (compareVersion "5.11.0" < 0) [ "-qml-debug" @@ -397,6 +401,8 @@ stdenv.mkDerivation { -e "/^host_bins=/ c host_bins=$dev/bin" ''; + dontStrip = debugSymbols; + setupHook = ../hooks/qtbase-setup-hook.sh; meta = with lib; { diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index 0481f000c6cee..930ed9d67baa1 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -34,6 +34,8 @@ mkDerivation (args // { fixQtBuiltinPaths . '*.pr?' ''; + dontWrapQtApps = args.dontWrapQtApps or true; + postFixup = '' if [ -d "''${!outputDev}/lib/pkgconfig" ]; then find "''${!outputDev}/lib/pkgconfig" -name '*.pc' | while read pc; do diff --git a/pkgs/development/libraries/qtinstaller/default.nix b/pkgs/development/libraries/qtinstaller/default.nix index 91f8537110665..ce69c855ac23f 100644 --- a/pkgs/development/libraries/qtinstaller/default.nix +++ b/pkgs/development/libraries/qtinstaller/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { setOutputFlags = false; enableParallelBuilding = true; NIX_QT_SUBMODULE = true; + dontWrapQtApps = true; installPhase = '' mkdir -p $out/{bin,lib,share/qt-installer-framework} diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 6da4abb756e69..3da0587210d80 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1 }; + dontWrapQtApps = true; + patches = (if withQt5 then [] else [ ./0001-Fixes-build-with-Qt4.patch ]) ++ (if stdenv.isDarwin then [ ./0002-Fix-install-name-Darwin.patch ] else []); cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix index 3558201015c6b..9dbc2491ad955 100644 --- a/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase protobuf ]; + dontWrapQtApps = true; + postPatch = '' # Fix plugin dir substituteInPlace pbfplugin.pro \ diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 831c51fa234dd..f5398d92dfcc7 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase cpp-utilities ]; nativeBuildInputs = [ cmake qttools ]; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://github.com/Martchus/qtutilities"; description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities"; diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix index 652c49aa6ca25..5bc30db059e73 100644 --- a/pkgs/development/libraries/qtwebkit-plugins/default.nix +++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { buildInputs = [ qtwebkit hunspell ]; + dontWrapQtApps = true; + postPatch = '' sed -i "s,-lhunspell,-lhunspell-${lib.versions.majorMinor hunspell.version}," src/spellcheck/spellcheck.pri sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," src/src.pro diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index 3f186314d0139..a12d6cafe4ae9 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + dontWrapQtApps = true; + meta = with lib; { description = "Provides access to ZIP archives from Qt programs"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix index edfd3b4e24a3b..e5fad490f6ed3 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ]; + dontWrapQtApps = true; + meta = with lib; { description = "Qt widgets for technical applications"; homepage = "http://qwt.sourceforge.net/"; diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index 2be6c66214546..fe7901bddd582 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://github.com/coin3d/soqt"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index b606c56445ed7..f61811428ce6f 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -20,6 +20,8 @@ in stdenv.mkDerivation rec { # On 0.9.7, they do not even build with QT4 cmakeFlags = lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; + dontWrapQtApps = true; + doCheck = false; # giving up for now meta = with lib; { diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index 4e6e49d68c45d..0fa1ea8bd392c 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "tiledb"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; rev = version; - sha256 = "sha256-QYJ5dJQyVy0GLVKRcwb2WBK4IE1q/jXl1OQGau0HBSg="; + sha256 = "sha256-xzzWB20vhnneiqJqZAeSUjZouqhPPg2bGaot1IQDMEo="; }; # (bundled) blosc headers have a warning on some archs that it will be using diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 273bff8852ee0..85eaa1ae80e7d 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -57,6 +57,8 @@ in stdenv.mkDerivation rec { export LD_LIBRARY_PATH="$(pwd)/lib"; ''; + dontWrapQtApps = true; + # Shared libraries don't work, because of rpath troubles with the current # nixpkgs cmake approach. It wants to call a binary at build time, just # built and requiring one of the shared objects. diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 7ec8936267bb6..fb7d1972c0241 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -28,19 +28,14 @@ let in stdenv.mkDerivation rec { pname = "wayland"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0k995rn96xkplrapz5k648j651wc43kq817xk1x8280h16gsfxa6"; + sha256 = "05bd2vphyx8qwa1mhsj1zdaiv4m4v94wrlssrn0lad8d601dkk5s"; }; patches = [ - # Fix documentation to be reproducible. - (fetchpatch { - url = "https://gitlab.freedesktop.org/wayland/wayland/-/commit/e53e0edf0f892670f3e8c5dd527b3bb22335d32d.patch"; - sha256 = "15sbhi86m9k72lsj56p7zr20ph2b0y4svl639snsbafn2ir1zdb2"; - }) (substituteAll { src = ./0001-add-placeholder-for-nm.patch; nm = "${stdenv.cc.targetPrefix}nm"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 7e78691b20ca8..3893e3554eb18 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -88,6 +88,7 @@ , "flood" , "forever" , "fx" +, "ganache-cli" , "get-graphql-schema" , "git-run" , "git-ssb" @@ -115,7 +116,7 @@ , "indium" , "insect" , "ionic" -, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v4.5.0.tar.gz"} +, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v5.0.2.tar.gz"} , "jake" , "javascript-typescript-langserver" , "joplin" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 0e651f1c7392d..5c028dcc47f3c 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -22,22 +22,13 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.1102.0" = { + "@angular-devkit/architect-0.1102.1" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1102.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.0.tgz"; - sha512 = "d9Da6SiTiDb5N1avxWLcPHSyWCq3G62TlROXxr32WkcQRko8wtgW5VOzgSkdmY2p6UTSME89naUojfzgu2Wh6g=="; - }; - }; - "@angular-devkit/core-11.0.3" = { - name = "_at_angular-devkit_slash_core"; - packageName = "@angular-devkit/core"; - version = "11.0.3"; + version = "0.1102.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.0.3.tgz"; - sha512 = "gJRiBj0gWDR2VtIvLvwwc/GM2MZvg1xw69ZbBJ1VuUgDqPBHdC8q3UMW3B82wdhxK+RBYa7ZOJxtIVggaHkm9g=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.1.tgz"; + sha512 = "s7CxUANGssLYL0KNdNUjXKjtzPjxnAMW9s7H/wzYuFqXVq/DbHvIMAEQW4x7XD5sD8zTqcVR8QAL6ZVSYHppVw=="; }; }; "@angular-devkit/core-11.1.0" = { @@ -58,13 +49,13 @@ let sha512 = "qqYEH8m/bwpngoLDMFuth8ykvoHxQ3aHHnAWfRXz9NXydwSfathG0VSYCctB126sK39JKIn+xq16CQAExxNu+Q=="; }; }; - "@angular-devkit/schematics-11.0.3" = { - name = "_at_angular-devkit_slash_schematics"; - packageName = "@angular-devkit/schematics"; - version = "11.0.3"; + "@angular-devkit/core-11.2.1" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "11.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.0.3.tgz"; - sha512 = "VZnqgnnfyzyMluIDvGp+ZlDU2P9BnjrhacBOdqBS/jNQ7oxyE0AWrUApGXcejOJ13Z7pEf31E64P3bImcjwP+A=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.1.tgz"; + sha512 = "CPFQn+NNC4x28X/STwmwmWge127iY9dsKuXeIV8OCSTOQiY4odOTYigP19AglXyK4e9DG/0JKxej/3CeUYx6Tg=="; }; }; "@angular-devkit/schematics-11.1.0" = { @@ -85,13 +76,22 @@ let sha512 = "sMDacACJbA4pykiqgJf/RdW0damcf4mDqErGgEqs/bGG+SBUb8+wgt4cQnUwwVX5V2nMdvv7f0A84rgR6I3G2w=="; }; }; - "@angular-devkit/schematics-cli-0.1100.3" = { + "@angular-devkit/schematics-11.2.1" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "11.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.1.tgz"; + sha512 = "y2tzJq+MMwLdQ6Li+AxjozI51miN5CjK9x9jtFHi+njqJr595WTNQi39RjyHxAue1VFMr8gu1VBnKGKJ1J3vNA=="; + }; + }; + "@angular-devkit/schematics-cli-0.1102.0" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; - version = "0.1100.3"; + version = "0.1102.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-0.1100.3.tgz"; - sha512 = "dECFHCDTgWfSHosfKTeQoyTgUUqgJaftxg4DxA23sMsQtDb1U8ZsIIPpH+L4QhCDT2zlhv51ynd5RUgu28h2DQ=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-0.1102.0.tgz"; + sha512 = "BkIoRf7L+3al+QIYWrgUlpNQP01tPSynPdTNb7z13tCHVv8Ag1CR5SJn1O8IGfFz7NxfX0Me0s7zyNTZ1QaWQQ=="; }; }; "@antora/asciidoc-loader-2.3.4" = { @@ -364,6 +364,15 @@ let sha512 = "t/hHIB504wWceOeaOoONOhu+gX+hpjfeN6YRBT209X/4sibZQfSF1I0HFRRlBe97UZZosGx5XwUg1ZgNbelmNw=="; }; }; + "@babel/core-7.12.17" = { + name = "_at_babel_slash_core"; + packageName = "@babel/core"; + version = "7.12.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/core/-/core-7.12.17.tgz"; + sha512 = "V3CuX1aBywbJvV2yzJScRxeiiw0v2KZZYYE3giywxzFJL13RiyPjaaDwhDnxmgFTTS7FgvM2ijr4QmKNIu0AtQ=="; + }; + }; "@babel/core-7.9.0" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; @@ -391,6 +400,15 @@ let sha512 = "6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ=="; }; }; + "@babel/generator-7.12.17" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.12.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.17.tgz"; + sha512 = "DSA7ruZrY4WI8VxuS1jWSRezFnghEoYEFrZcw9BizQRmOZiUsiHl59+qEARGPqPikwA/GPTyRCi7isuCK/oyqg=="; + }; + }; "@babel/helper-annotate-as-pure-7.12.13" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; @@ -418,6 +436,15 @@ let sha512 = "dBHNEEaZx7F3KoUYqagIhRIeqyyuI65xMndMZ3WwGwEBI609I4TleYQHcrS627vbKyNTXqShoN+fvYD9HuQxAg=="; }; }; + "@babel/helper-compilation-targets-7.12.17" = { + name = "_at_babel_slash_helper-compilation-targets"; + packageName = "@babel/helper-compilation-targets"; + version = "7.12.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.17.tgz"; + sha512 = "5EkibqLVYOuZ89BSg2lv+GG8feywLuvMXNYgf0Im4MssE0mFWPztSpJbildNnUgw0bLI2EsIN4MpSHC2iUJkQA=="; + }; + }; "@babel/helper-create-class-features-plugin-7.12.16" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; @@ -427,6 +454,15 @@ let sha512 = "KbSEj8l9zYkMVHpQqM3wJNxS1d9h3U9vm/uE5tpjMbaj3lTp+0noe3KPsV5dSD9jxKnf9jO9Ip9FX5PKNZCKow=="; }; }; + "@babel/helper-create-class-features-plugin-7.12.17" = { + name = "_at_babel_slash_helper-create-class-features-plugin"; + packageName = "@babel/helper-create-class-features-plugin"; + version = "7.12.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.17.tgz"; + sha512 = "I/nurmTxIxHV0M+rIpfQBF1oN342+yvl2kwZUrQuOClMamHF1w5tknfZubgNOLRoA73SzBFAdFcpb4M9HwOeWQ=="; + }; + }; "@babel/helper-create-regexp-features-plugin-7.12.16" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; @@ -436,6 +472,15 @@ let sha512 = "jAcQ1biDYZBdaAxB4yg46/XirgX7jBDiMHDbwYQOgtViLBXGxJpZQ24jutmBqAIB/q+AwB6j+NbBXjKxEY8vqg=="; }; }; + "@babel/helper-create-regexp-features-plugin-7.12.17" = { + name = "_at_babel_slash_helper-create-regexp-features-plugin"; + packageName = "@babel/helper-create-regexp-features-plugin"; + version = "7.12.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz"; + sha512 = "p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg=="; + }; + }; "@babel/helper-explode-assignable-expression-7.12.13" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; @@ -481,6 +526,15 @@ let sha512 = "zYoZC1uvebBFmj1wFAlXwt35JLEgecefATtKp20xalwEK8vHAixLBXTGxNrVGEmTT+gzOThUgr8UEdgtalc1BQ=="; }; }; + "@babel/helper-member-expression-to-functions-7.12.17" = { + name = "_at_babel_slash_helper-member-expression-to-functions"; + packageName = "@babel/helper-member-expression-to-functions"; + version = "7.12.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.17.tgz"; + sha512 = "Bzv4p3ODgS/qpBE0DiJ9qf5WxSmrQ8gVTe8ClMfwwsY2x/rhykxxy3bXzG7AGTnPB2ij37zGJ/Q/6FruxHxsxg=="; + }; + }; "@babel/helper-module-imports-7.12.13" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; @@ -499,6 +553,15 @@ let sha512 = "acKF7EjqOR67ASIlDTupwkKM1eUisNAjaSduo5Cz+793ikfnpe7p4Q7B7EWU2PCoSTPWsQkR7hRUWEIZPiVLGA=="; }; }; + "@babel/helper-module-transforms-7.12.17" = { + name = "_at_babel_slash_helper-module-transforms"; + packageName = "@babel/helper-module-transforms"; + version = "7.12.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.17.tgz"; + sha512 = "sFL+p6zOCQMm9vilo06M4VHuTxUAwa6IxgL56Tq1DVtA0ziAGTH1ThmJq7xwPqdQlgAbKX3fb0oZNbtRIyA5KQ=="; + }; + }; "@babel/helper-optimise-call-expression-7.12.13" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; @@ -580,6 +643,15 @@ let sha512 = "uCgsDBPUQDvzr11ePPo4TVEocxj8RXjUVSC/Y8N1YpVAI/XDdUwGJu78xmlGhTxj2ntaWM7n9LQdRtyhOzT2YQ=="; }; }; + "@babel/helper-validator-option-7.12.17" = { + name = "_at_babel_slash_helper-validator-option"; + packageName = "@babel/helper-validator-option"; + version = "7.12.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz"; + sha512 = "TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw=="; + }; + }; "@babel/helper-wrap-function-7.12.13" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; @@ -598,6 +670,15 @@ let sha512 = "oohVzLRZ3GQEk4Cjhfs9YkJA4TdIDTObdBEZGrd6F/T0GPSnuV6l22eMcxlvcvzVIPH3VTtxbseudM1zIE+rPQ=="; }; }; + "@babel/helpers-7.12.17" = { + name = "_at_babel_slash_helpers"; + packageName = "@babel/helpers"; + version = "7.12.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.17.tgz"; + sha512 = "tEpjqSBGt/SFEsFikKds1sLNChKKGGR17flIgQKXH4fG6m9gTgl3gnOC1giHNyaBCSKuTfxaSzHi7UnvqiVKxg=="; + }; + }; "@babel/highlight-7.12.13" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; @@ -616,6 +697,15 @@ let sha512 = "c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw=="; }; }; + "@babel/parser-7.12.17" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.12.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.17.tgz"; + sha512 = "r1yKkiUTYMQ8LiEI0UcQx5ETw5dpTLn9wijn9hk6KkTtOK95FndDN10M+8/s6k/Ymlbivw0Av9q4SlgF80PtHg=="; + }; + }; "@babel/plugin-external-helpers-7.8.3" = { name = "_at_babel_slash_plugin-external-helpers"; packageName = "@babel/plugin-external-helpers"; @@ -652,6 +742,15 @@ let sha512 = "yiDkYFapVxNOCcBfLnsb/qdsliroM+vc3LHiZwS4gh7pFjo5Xq3BDhYBNn3H3ao+hWPvqeeTdU+s+FIvokov+w=="; }; }; + "@babel/plugin-proposal-dynamic-import-7.12.17" = { + name = "_at_babel_slash_plugin-proposal-dynamic-import"; + packageName = "@babel/plugin-proposal-dynamic-import"; + version = "7.12.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.17.tgz"; + sha512 = "ZNGoFZqrnuy9H2izB2jLlnNDAfVPlGl5NhFEiFe4D84ix9GQGygF+CWMGHKuE+bpyS/AOuDQCnkiRNqW2IzS1Q=="; + }; + }; "@babel/plugin-proposal-export-default-from-7.12.13" = { name = "_at_babel_slash_plugin-proposal-export-default-from"; packageName = "@babel/plugin-proposal-export-default-from"; @@ -733,6 +832,15 @@ let sha512 = "O3ohPwOhkwji5Mckb7F/PJpJVJY3DpPsrt/F0Bk40+QMk9QpAIqeGusHWqu/mYqsM8oBa6TziL/2mbERWsUZjg=="; }; }; + "@babel/plugin-proposal-optional-chaining-7.12.17" = { + name = "_at_babel_slash_plugin-proposal-optional-chaining"; + packageName = "@babel/plugin-proposal-optional-chaining"; + version = "7.12.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.17.tgz"; + sha512 = "TvxwI80pWftrGPKHNfkvX/HnoeSTR7gC4ezWnAL39PuktYUe6r8kEpOLTYnkBTsaoeazXm2jHJ22EQ81sdgfcA=="; + }; + }; "@babel/plugin-proposal-private-methods-7.12.13" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; @@ -1156,6 +1264,15 @@ let sha512 = "dNu0vAbIk8OkqJfGtYF6ADk6jagoyAl+Ks5aoltbAlfoKv8d6yooi3j+kObeSQaCj9PgN6KMZPB90wWyek5TmQ=="; }; }; + "@babel/plugin-transform-react-jsx-7.12.17" = { + name = "_at_babel_slash_plugin-transform-react-jsx"; + packageName = "@babel/plugin-transform-react-jsx"; + version = "7.12.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.17.tgz"; + sha512 = "mwaVNcXV+l6qJOuRhpdTEj8sT/Z0owAVWf9QujTZ0d2ye9X/K+MTOTSizcgKOj18PGnTc/7g1I4+cIUjsKhBcw=="; + }; + }; "@babel/plugin-transform-react-jsx-source-7.12.13" = { name = "_at_babel_slash_plugin-transform-react-jsx-source"; packageName = "@babel/plugin-transform-react-jsx-source"; @@ -1192,6 +1309,15 @@ let sha512 = "OwptMSRnRWJo+tJ9v9wgAf72ydXWfYSXWhnQjZing8nGZSDFqU1MBleKM3+DriKkcbv7RagA8gVeB0A1PNlNow=="; }; }; + "@babel/plugin-transform-runtime-7.12.17" = { + name = "_at_babel_slash_plugin-transform-runtime"; + packageName = "@babel/plugin-transform-runtime"; + version = "7.12.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.17.tgz"; + sha512 = "s+kIJxnaTj+E9Q3XxQZ5jOo+xcogSe3V78/iFQ5RmoT0jROdpcdxhfGdq/VLqW1hFSzw6VjqN8aQqTaAMixWsw=="; + }; + }; "@babel/plugin-transform-shorthand-properties-7.12.13" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; @@ -1282,6 +1408,15 @@ let sha512 = "BXCAXy8RE/TzX416pD2hsVdkWo0G+tYd16pwnRV4Sc0fRwTLRS/Ssv8G5RLXUGQv7g4FG7TXkdDJxCjQ5I+Zjg=="; }; }; + "@babel/preset-env-7.12.17" = { + name = "_at_babel_slash_preset-env"; + packageName = "@babel/preset-env"; + version = "7.12.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.17.tgz"; + sha512 = "9PMijx8zFbCwTHrd2P4PJR5nWGH3zWebx2OcpTjqQrHhCiL2ssSR2Sc9ko2BsI2VmVBfoaQmPrlMTCui4LmXQg=="; + }; + }; "@babel/preset-flow-7.12.13" = { name = "_at_babel_slash_preset-flow"; packageName = "@babel/preset-flow"; @@ -1336,6 +1471,15 @@ let sha512 = "8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw=="; }; }; + "@babel/runtime-7.12.17" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.12.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.17.tgz"; + sha512 = "nEvWif7aHm4O0lTT2p4kYCfYwsGSBiWA8XmAqovusBDKugpUy3BVggAjJL4iFWIwrFJktay2VLtAQl1/l8Xsow=="; + }; + }; "@babel/runtime-7.12.5" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; @@ -1372,6 +1516,15 @@ let sha512 = "3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA=="; }; }; + "@babel/traverse-7.12.17" = { + name = "_at_babel_slash_traverse"; + packageName = "@babel/traverse"; + version = "7.12.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.17.tgz"; + sha512 = "LGkTqDqdiwC6Q7fWSwQoas/oyiEYw6Hqjve5KOSykXkmFJFqzvGMb9niaUEag3Rlve492Mkye3gLw9FTv94fdQ=="; + }; + }; "@babel/types-7.10.4" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; @@ -1390,6 +1543,15 @@ let sha512 = "oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ=="; }; }; + "@babel/types-7.12.17" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.12.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz"; + sha512 = "tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ=="; + }; + }; "@braintree/sanitize-url-3.1.0" = { name = "_at_braintree_slash_sanitize-url"; packageName = "@braintree/sanitize-url"; @@ -1399,22 +1561,22 @@ let sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg=="; }; }; - "@bugsnag/browser-7.6.0" = { + "@bugsnag/browser-7.7.0" = { name = "_at_bugsnag_slash_browser"; packageName = "@bugsnag/browser"; - version = "7.6.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.6.0.tgz"; - sha512 = "8sth20TM8BVfebkqxqJQOCM2P2L4foOgFH2QA3ruG0iknDKZDhE7XcoWgmUP9zVSNJqkCyiIzcBOuiwZW8JaSQ=="; + url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.7.0.tgz"; + sha512 = "o3Y/8ZINTCyCiDid01xF4RwAfRCtt4Ak65sbEUjuen90Lf62LcqNIrguRotum5/5GrXl/ktm8gk6Tp8XBiS79A=="; }; }; - "@bugsnag/core-7.6.0" = { + "@bugsnag/core-7.7.0" = { name = "_at_bugsnag_slash_core"; packageName = "@bugsnag/core"; - version = "7.6.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.6.0.tgz"; - sha512 = "hBYAZJw4ScqoyM1jA1x/m2e4iS2EqYEs0I2hdzBCZFv2ls17ILmU58eRSyVdUfyzbv0J7Hi6DwwBGC4Yb6ROZA=="; + url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.7.0.tgz"; + sha512 = "y6xY/ZjHRSD3h1ADdkgH4sUJeJ9TUjNjkui+pjdmQkG4asjA8lBNmjnqirGeAxgL00lg5xvbfLSq9iHdqFW9oQ=="; }; }; "@bugsnag/cuid-3.0.0" = { @@ -1426,22 +1588,22 @@ let sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg=="; }; }; - "@bugsnag/js-7.6.0" = { + "@bugsnag/js-7.7.0" = { name = "_at_bugsnag_slash_js"; packageName = "@bugsnag/js"; - version = "7.6.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.6.0.tgz"; - sha512 = "EcI3sTpyOs94/OOjwI7fOg1iZ800o3kkOAipAnULRoP62j1vmErH2l/2xubny7g0JTOL59iZEkt+5O5MhbQJ2A=="; + url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.7.0.tgz"; + sha512 = "ENdwgPnn7hBzkK1fZLFzK4HsIoE4nrmGlJI+rxuZFeXUkawx78ijt63Szf3yFnTt4Pa0yoDkiWS7H9dHDwH3kw=="; }; }; - "@bugsnag/node-7.6.0" = { + "@bugsnag/node-7.7.0" = { name = "_at_bugsnag_slash_node"; packageName = "@bugsnag/node"; - version = "7.6.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.6.0.tgz"; - sha512 = "n3BVb04bq4z16nOM4gbWoXsi6k8R9bryWS/NAYi/jQg6tgyBkNYzmK0ojf3fYJ7uAgCjUJNMX6S9UHSJy/MMcQ=="; + url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.7.0.tgz"; + sha512 = "pzxmKFDyEs5RYt63+IvxSOgd4Diio8VHvSWEr4S4V6rxM/5xopGv36oLVKGuf6qIn4ypy8nXXOGrlPIfl4sXyQ=="; }; }; "@bugsnag/safe-json-stringify-6.0.0" = { @@ -1984,13 +2146,13 @@ let sha512 = "HLZNtkETFUuCP76Wk/oF54+tVp6aPGzsoJRsmnkh78gloC9CGp8JK+LQUYfj9dtzcHDHq64/dAA2e4j2tzjhaQ=="; }; }; - "@fluentui/react-7.160.1" = { + "@fluentui/react-7.160.3" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.160.1"; + version = "7.160.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.160.1.tgz"; - sha512 = "RvqlSffkiYS87r1fwAJMsr0UwMsgXBrc9FY+4gKg25yN33LJK7tbFIrhE0MiAL9Hp+K78mQT7mFYat6VLsvNPA=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.160.3.tgz"; + sha512 = "gkBpKZS1AUDT5bRI55MfSK8WsrbFZasQFoO3pgsiD5DqAMClQtOUlXwNpllv4gkAewLkkducvJWn/7JGRDFqWg=="; }; }; "@fluentui/react-focus-7.17.4" = { @@ -2164,13 +2326,13 @@ let sha512 = "ZY76hmcJlF1iyg3Im0sQ3ASRkiShjgv102vLTVcH22lEGJeCaCyyS/GF1eUHom418S60bS8Th6+autRUxfBiBg=="; }; }; - "@graphql-tools/url-loader-6.8.0" = { + "@graphql-tools/url-loader-6.8.1" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "6.8.0"; + version = "6.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.8.0.tgz"; - sha512 = "x4f93UnH7kNr9iHFpJHL6kYWogRFlxMEnXybHS9xNCFd08+ftMO22bUb8esnFsyNrtMMlkLtshDSyNb3LbIMQg=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.8.1.tgz"; + sha512 = "iE/y9IAu0cZYL7o9IIDdGm5WjxacN25nGgVqjZINYlisW/wyuBxng7DMJBAp6yM6gkxkCpMno1ljA/52MXzVPQ=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -2182,13 +2344,13 @@ let sha512 = "ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg=="; }; }; - "@graphql-tools/utils-7.2.5" = { + "@graphql-tools/utils-7.3.0" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "7.2.5"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.2.5.tgz"; - sha512 = "S9RUkPimq+5eEDohDjiq/JCPUsiZblKRG8ve+diUwF1f8+r6FV2xGXrOt0qhQJiMxIO+BOK3DU9c+U3tX9Jo0w=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.3.0.tgz"; + sha512 = "8MD5/jRsvbA4zSdI5bBRXvXh5pn208pSc+KGd0xjBVyY3m/tTFxl0hohDPC5hw6JcHnz8IfhpuuNfi8gm9I+5g=="; }; }; "@graphql-tools/wrap-7.0.5" = { @@ -2200,13 +2362,13 @@ let sha512 = "KCWBXsDfvG46GNUawRltJL4j9BMGoOG7oo3WEyCQP+SByWXiTe5cBF45SLDVQgdjljGNZhZ4Lq/7avIkF7/zDQ=="; }; }; - "@grpc/grpc-js-1.2.7" = { + "@grpc/grpc-js-1.2.8" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; - version = "1.2.7"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.7.tgz"; - sha512 = "hBkR/vZTodu/dA/kcKpiQtPQdjMbpfKv7RKfEByT5/7qOQNpIh2O6Sr1aldLMzstFqmGrufmR7XTc56VCMH7LA=="; + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.8.tgz"; + sha512 = "9C1xiCbnYe/3OFpSuRqz2JgFSOxv6+SlqFhXgRC1nHfXYbLnXvtmsI/NpaMs6k9ZNyV4gyaOOh5Z4McfegQGew=="; }; }; "@grpc/proto-loader-0.5.6" = { @@ -3487,31 +3649,31 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-9.1.2" = { + "@netlify/build-9.1.3" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "9.1.2"; + version = "9.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-9.1.2.tgz"; - sha512 = "GvAx6f3T8MZRHDEPNOsGdsAfW188FjKTGpA04G2QoMJdLHgzAp6gI6J6m7B9b16Sw7qs5U+JX2A9JjZRHmOAsg=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-9.1.3.tgz"; + sha512 = "UaTinHY6ysncUEaT7u0i3GGL8r+qDnvqusLw+OWSavvnHIdvW6qdkRMZhQ6dUi3vSIh6NUKvddWCYdi49R4n+w=="; }; }; - "@netlify/cache-utils-1.0.6" = { + "@netlify/cache-utils-1.0.7" = { name = "_at_netlify_slash_cache-utils"; packageName = "@netlify/cache-utils"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-1.0.6.tgz"; - sha512 = "Pz/TzLZhMUACT+X7Un6jZCXgEUwLPVNbx69DQtEOMZ6hNBE1b1ErTHFbSaHA0KfDn/yqCII5vS274DERvNuRwg=="; + url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-1.0.7.tgz"; + sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA=="; }; }; - "@netlify/config-4.0.1" = { + "@netlify/config-4.0.2" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-4.0.1.tgz"; - sha512 = "qI/PxBx5RGuQbVgYOtbEJ498+yDWqfqetDOHYzxJEFZYpZjS5Effu4jt92amnW55pzOZvTk/vQZQx8zLb4N2WQ=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-4.0.2.tgz"; + sha512 = "Rw8OFNqKQRBUZJlAvn9dGsoYhDJenz66IDQYfR5oWk3Qf8wJZFVAMy+Bv8mduj9bMMg1SqotNCnn3fkQbjGRew=="; }; }; "@netlify/framework-info-2.3.0" = { @@ -3523,22 +3685,22 @@ let sha512 = "vqy9wbBRP8qWnkzA/OQsThr1+cfqapMrORJ4hWcrjhIPRmXIJtwB6OWuLIUalMeSGCwqZjYpKfudc4BLuxxvjw=="; }; }; - "@netlify/functions-utils-1.3.12" = { + "@netlify/functions-utils-1.3.13" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.3.12"; + version = "1.3.13"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.12.tgz"; - sha512 = "u2t6AVKsg9MuXicYETMqWubOXUayNdCU0GuMl2u5T3bz9E7mVCnCB4VVkEVDqlC8GnrdbVHzEu+OPmbv+dkzJA=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.13.tgz"; + sha512 = "YhLVj9Vv9uyBrnEbg+dOgSFVRfYg1DFs1itmFR9q5ruI0pYwd2MlfmoYr436U+HFWAmZYC1F8e3Mh3bWEtsFnA=="; }; }; - "@netlify/git-utils-1.0.7" = { + "@netlify/git-utils-1.0.8" = { name = "_at_netlify_slash_git-utils"; packageName = "@netlify/git-utils"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.7.tgz"; - sha512 = "+CT/1D13Uxi3Qlnf0/F2XpmBsTYGCax0SQJhIrq6hLJXJt0Ej2FBA3Rq7XxOXibAptK1Dw2LUi1JWHQ36H/3aw=="; + url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.8.tgz"; + sha512 = "YWK2H6qjBmspTIibE/ai8YTsSnqROtubqWUuXz/RoQXYf03KWx/F9BFRm1S/TOoQM9v4fozRhVeHyH45Ki0ztA=="; }; }; "@netlify/open-api-1.3.0" = { @@ -3550,13 +3712,13 @@ let sha512 = "GcCPXIWI8VDBsLN4nPvb6sKS9tbi4lrHLhex90hT27nwTDeu4HgGE93YilcsgZ1LLODJNxC5LdfTNLtvEHMKVg=="; }; }; - "@netlify/plugin-edge-handlers-1.11.3" = { + "@netlify/plugin-edge-handlers-1.11.5" = { name = "_at_netlify_slash_plugin-edge-handlers"; packageName = "@netlify/plugin-edge-handlers"; - version = "1.11.3"; + version = "1.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.3.tgz"; - sha512 = "ewAXDU46PONZ279M1S7hrwIvdyBjwDJL+DkA1iRFKydEMAIl5Z/HyAM4bX2OoRDi2eaIKLRO06dMAjaYgzpaog=="; + url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.5.tgz"; + sha512 = "R7oEvYjLOrvO8uSy484c4TrZeD5A1M2TN4dIM7dAdd2iHgpC+i3+RhlM9XFHFOqc8lsim+A+BcKMQYZ19z+j6A=="; }; }; "@netlify/plugins-list-2.2.0" = { @@ -3568,13 +3730,13 @@ let sha512 = "8OCwatZIPsyze2KZ8fj21/+luzdTA78fxQ6p7UFLE9IRJlZqCRVXtgiIVd/HtEr6B9OacywX3fV1hVRBVlbmDA=="; }; }; - "@netlify/run-utils-1.0.5" = { + "@netlify/run-utils-1.0.6" = { name = "_at_netlify_slash_run-utils"; packageName = "@netlify/run-utils"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-1.0.5.tgz"; - sha512 = "Ovgkw9b7HSLsdhTBA+LNq3KY83gU9DP0xHbwDlg07zLpY3RtRN2IBy11w+nRPjQwfNT33OmuTvayH6amJDku5Q=="; + url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-1.0.6.tgz"; + sha512 = "/A1LgWQfhiRcUyWI7FE7N1VjhxoFKtDekk9gu3zLwDcXvFsw3wND0//wKSMstrhGZzXTf39fwRe8qvP8Brr6Cw=="; }; }; "@netlify/traffic-mesh-agent-0.27.10" = { @@ -3928,13 +4090,13 @@ let sha512 = "fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ=="; }; }; - "@octokit/openapi-types-4.0.4" = { + "@octokit/openapi-types-5.0.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "4.0.4"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-4.0.4.tgz"; - sha512 = "31zY8JIuz3h6RAFOnyA8FbOwhILILiBu1qD81RyZZWY7oMBhIdBn6MaAmnnptLhB4jk0g50nkQkUVP4kUzppcA=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-5.0.0.tgz"; + sha512 = "QXpwbGjidE+XhgCEeXpffQk/XGiexgne8czTebwU359Eoko8FJzAED4aizrQlL9t4n6tMx/1Ka1vwZbP6rayFA=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4018,13 +4180,13 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-6.8.5" = { + "@octokit/types-6.9.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.8.5"; + version = "6.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.8.5.tgz"; - sha512 = "ZsQawftZoi0kSF2pCsdgLURbOjtVcHnBOXiSxBKSNF56CRjARt5rb/g8WJgqB8vv4lgUEHrv06EdDKYQ22vA9Q=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.9.0.tgz"; + sha512 = "j4ms2ukvWciu8hSuIWtWK/LyOWMZ0ZsRcvPIVLBYyAkTKBKrMJyiyv2wawJnyphKyEOhRgIyu5Nmf4yPxp0tcg=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -4747,40 +4909,31 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@scarf/scarf-1.1.0" = { - name = "_at_scarf_slash_scarf"; - packageName = "@scarf/scarf"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@scarf/scarf/-/scarf-1.1.0.tgz"; - sha512 = "b2iE8kjjzzUo2WZ0xuE2N77kfnTds7ClrDxcz3Atz7h2XrNVoAPUoT75i7CY0st5x++70V91Y+c6RpBX9MX7Jg=="; - }; - }; - "@schematics/angular-11.2.0" = { + "@schematics/angular-11.2.1" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "11.2.0"; + version = "11.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.0.tgz"; - sha512 = "PtbyZ7TEEEae9Y5siSZYigWyk8iOSjZ10ThA7tRxm8gdcLjGimyyKr5TyjufIAvrXIYnBXNLgPkZG6s5CQIEyw=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.1.tgz"; + sha512 = "CnN4bkRwhCp7jc4HGJ9qp/xqLwmnkn/zRf/EEb5tHFC0Bz2WvoNuAoqPRSkgIis3L+Ozahmeb8JxTIdazK1Hog=="; }; }; - "@schematics/schematics-0.1100.3" = { + "@schematics/schematics-0.1102.0" = { name = "_at_schematics_slash_schematics"; packageName = "@schematics/schematics"; - version = "0.1100.3"; + version = "0.1102.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/schematics/-/schematics-0.1100.3.tgz"; - sha512 = "tzjKnjD90FQ4LgRN9ALT2qCqgJYZrAKoy1embFJRuGKA8vv1hTG4JonVDqQEUoNwTc9r/Ok2Z1eenAI9TSUd1A=="; + url = "https://registry.npmjs.org/@schematics/schematics/-/schematics-0.1102.0.tgz"; + sha512 = "0mN6qGnI31GVNYAKDdZ6ISiJMtN8Z0rekpJ/xNHK/lDNl/QkoJVBHDf68oEcNE8dvWMq86ULpznCdT1IBQ7YFA=="; }; }; - "@schematics/update-0.1102.0" = { + "@schematics/update-0.1102.1" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1102.0"; + version = "0.1102.1"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1102.0.tgz"; - sha512 = "2hFt/2iPe6LqQvzYj4HvQ8us0e0lBU75rSK2yY6VfiZWR/qo7yk99YKI7JWFTLvLsNbhNnSG/9opXJHqqUoc3g=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1102.1.tgz"; + sha512 = "BvTqw2OhKnX+VNHt613vGvjg+O1WNdeJYy79aaRCGsVZogOAjolnA7R4tzk6WelTLKo9k8wQZ9d+6IMplYQKNQ=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -4810,13 +4963,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.6.2" = { + "@serverless/components-3.7.0" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.6.2"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.6.2.tgz"; - sha512 = "JT8+t3J90WF/ZjizTbIUbmwzLJFAybP6S2T8TK9TtHl1imeeIIu69LcFAth7fFYdPn6LrACSEMZMXJ2+QlLM6w=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.7.0.tgz"; + sha512 = "ndyDPykboC5PlkSFXXVAWwiWp4d8G1uLDqoyF3TWaNpmcjvHiLbBwmgRzV1E3u9Y9RE766EJqOxEBfdvsUXD4w=="; }; }; "@serverless/core-1.1.2" = { @@ -4855,6 +5008,15 @@ let sha512 = "f5bo8P5+xAxsnOCUnyEyAmiGTs9sTG8v8t5dTDAdCqSxEEJyl3/Ro5djeW5L2MHzw1XnIMxxrtG38m7rNQSFFg=="; }; }; + "@serverless/platform-client-4.0.0" = { + name = "_at_serverless_slash_platform-client"; + packageName = "@serverless/platform-client"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.0.0.tgz"; + sha512 = "pHhzRNStl7TP/yEi5EuT5fxx5czGb1UAyKv/dWCfMY046t24UC2l6rsDAgSb55O0Mmg/N/0GUpQ6AXqRrryHXg=="; + }; + }; "@serverless/platform-client-china-2.1.4" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; @@ -4972,13 +5134,13 @@ let sha512 = "QSdIQ5keUFAZ3KLbfbsntW39ox0Ym8183RqTwBq/ZEFoN3NQAtGV+qWaNdzKpIDHgj9J2CQ2iNDRVU11Zyr7MQ=="; }; }; - "@skorfmann/terraform-cloud-1.7.1" = { + "@skorfmann/terraform-cloud-1.9.0" = { name = "_at_skorfmann_slash_terraform-cloud"; packageName = "@skorfmann/terraform-cloud"; - version = "1.7.1"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@skorfmann/terraform-cloud/-/terraform-cloud-1.7.1.tgz"; - sha512 = "uwcalR9R5/9M+UcOeKR+XgCyIlipl5dxiAryuWT8D4erW6sPnTE/B97G6F3VzzrZfcaPmljX5NVG8Dkl79ki6A=="; + url = "https://registry.npmjs.org/@skorfmann/terraform-cloud/-/terraform-cloud-1.9.0.tgz"; + sha512 = "XuDPEA8m7PxqFyRXS1ZztMWwyEU+zUHAc2z82VIqRGWxexpB7QgBSqH8xcv1TPm61751eWLkEd11PuqQs7TmNA=="; }; }; "@slack/client-3.16.0" = { @@ -5773,6 +5935,15 @@ let sha512 = "mky/O83TXmGY39P1H9YbUpjV6l6voRYlufqfFCvel8l1phuy8HRjdWc1rrPuN53ITBJlbyMSV6z3niOySO5pgQ=="; }; }; + "@types/filesize-5.0.0" = { + name = "_at_types_slash_filesize"; + packageName = "@types/filesize"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/filesize/-/filesize-5.0.0.tgz"; + sha512 = "zgn1Kmm6VfqruG9STpwpZiSnpzHjF9hlvHVw+5hhM20xRCOIgjxnXJxOoLuZ/aWS6v/M5d6fvXFbbVQfBe4cMg=="; + }; + }; "@types/fs-capacitor-2.0.0" = { name = "_at_types_slash_fs-capacitor"; packageName = "@types/fs-capacitor"; @@ -6160,13 +6331,13 @@ let sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w=="; }; }; - "@types/mocha-8.2.0" = { + "@types/mocha-8.2.1" = { name = "_at_types_slash_mocha"; packageName = "@types/mocha"; - version = "8.2.0"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.0.tgz"; - sha512 = "/Sge3BymXo4lKc31C8OINJgXLaw+7vL1/L1pGiBNpGrBiT8FQiaFpSYV0uhTaG4y78vcMBTMFsWaHDvuD+xGzQ=="; + url = "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.1.tgz"; + sha512 = "NysN+bNqj6E0Hv4CTGWSlPzMW6vTKjDpOteycDkV4IWBsO+PU48JonrPzV9ODjiI2XrjmA05KInLgF5ivZ/YGQ=="; }; }; "@types/multer-1.4.4" = { @@ -6637,15 +6808,6 @@ let sha512 = "XjFWbSPOM0EKIT2XhhYm3D3cx3nn3lshMUcWNy1eqefk+oqRuBq8unVb6BYIZqXy9lQZyeUl7eaBCOZWv+LcXQ=="; }; }; - "@types/webpack-4.41.25" = { - name = "_at_types_slash_webpack"; - packageName = "@types/webpack"; - version = "4.41.25"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.25.tgz"; - sha512 = "cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ=="; - }; - }; "@types/webpack-4.41.26" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; @@ -6736,13 +6898,13 @@ let sha512 = "HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg=="; }; }; - "@typescript-eslint/eslint-plugin-4.15.0" = { + "@typescript-eslint/eslint-plugin-4.15.1" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.15.0"; + version = "4.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.15.0.tgz"; - sha512 = "DJgdGZW+8CFUTz5C/dnn4ONcUm2h2T0itWD85Ob5/V27Ndie8hUoX5HKyGssvR8sUMkAIlUc/AMK67Lqa3kBIQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.15.1.tgz"; + sha512 = "yW2epMYZSpNJXZy22Biu+fLdTG8Mn6b22kR3TqblVk50HGNV8Zya15WAXuQCr8tKw4Qf1BL4QtI6kv6PCkLoJw=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -6754,13 +6916,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.15.0" = { + "@typescript-eslint/experimental-utils-4.15.1" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.15.0"; + version = "4.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.15.0.tgz"; - sha512 = "V4vaDWvxA2zgesg4KPgEGiomWEBpJXvY4ZX34Y3qxK8LUm5I87L+qGIOTd9tHZOARXNRt9pLbblSKiYBlGMawg=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.15.1.tgz"; + sha512 = "9LQRmOzBRI1iOdJorr4jEnQhadxK4c9R2aEAsm7WE/7dq8wkKD1suaV0S/JucTL8QlYUPU1y2yjqg+aGC0IQBQ=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -6772,22 +6934,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.15.0" = { + "@typescript-eslint/parser-4.15.1" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.15.0"; + version = "4.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.15.0.tgz"; - sha512 = "L6Dtbq8Bc7g2aZwnIBETpmUa9XDKCMzKVwAArnGp5Mn7PRNFjf3mUzq8UeBjL3K8t311hvevnyqXAMSmxO8Gpg=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.15.1.tgz"; + sha512 = "V8eXYxNJ9QmXi5ETDguB7O9diAXlIyS+e3xzLoP/oVE4WCAjssxLIa0mqCLsCGXulYJUfT+GV70Jv1vHsdKwtA=="; }; }; - "@typescript-eslint/scope-manager-4.15.0" = { + "@typescript-eslint/scope-manager-4.15.1" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.15.0"; + version = "4.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.15.0.tgz"; - sha512 = "CSNBZnCC2jEA/a+pR9Ljh8Y+5TY5qgbPz7ICEk9WCpSEgT6Pi7H2RIjxfrrbUXvotd6ta+i27sssKEH8Azm75g=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.15.1.tgz"; + sha512 = "ibQrTFcAm7yG4C1iwpIYK7vDnFg+fKaZVfvyOm3sNsGAerKfwPVFtYft5EbjzByDJ4dj1WD8/34REJfw/9wdVA=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -6799,13 +6961,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.15.0" = { + "@typescript-eslint/types-4.15.1" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.15.0"; + version = "4.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.15.0.tgz"; - sha512 = "su4RHkJhS+iFwyqyXHcS8EGPlUVoC+XREfy5daivjLur9JP8GhvTmDipuRpcujtGC4M+GYhUOJCPDE3rC5NJrg=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.15.1.tgz"; + sha512 = "iGsaUyWFyLz0mHfXhX4zO6P7O3sExQpBJ2dgXB0G5g/8PRVfBBsmQIc3r83ranEQTALLR3Vko/fnCIVqmH+mPw=="; }; }; "@typescript-eslint/typescript-estree-2.34.0" = { @@ -6826,13 +6988,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.15.0" = { + "@typescript-eslint/typescript-estree-4.15.1" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.15.0"; + version = "4.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.15.0.tgz"; - sha512 = "jG6xTmcNbi6xzZq0SdWh7wQ9cMb2pqXaUp6bUZOMsIlu5aOlxGxgE/t6L/gPybybQGvdguajXGkZKSndZJpksA=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.15.1.tgz"; + sha512 = "z8MN3CicTEumrWAEB2e2CcoZa3KP9+SMYLIA2aM49XW3cWIaiVSOAGq30ffR5XHxRirqE90fgLw3e6WmNx5uNw=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -6844,13 +7006,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.15.0" = { + "@typescript-eslint/visitor-keys-4.15.1" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.15.0"; + version = "4.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.15.0.tgz"; - sha512 = "RnDtJwOwFucWFAMjG3ghCG/ikImFJFEg20DI7mn4pHEx3vC48lIAoyjhffvfHmErRDboUPC7p9Z2il4CLb7qxA=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.15.1.tgz"; + sha512 = "tYzaTP9plooRJY8eNlpAewTOqtWW/4ff/5wBjNVaJ0S0wC4Gpq/zDVRTJa5bq2v1pCNQ08xxMCndcvR+h7lMww=="; }; }; "@uifabric/foundation-7.9.24" = { @@ -7087,6 +7249,15 @@ let sha512 = "C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA=="; }; }; + "@webassemblyjs/ast-1.9.1" = { + name = "_at_webassemblyjs_slash_ast"; + packageName = "@webassemblyjs/ast"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.1.tgz"; + sha512 = "uMu1nCWn2Wxyy126LlGqRVlhdTOsO/bsBRI4dNq3+6SiSuRKRQX6ejjKgh82LoGAPSq72lDUiQ4FWVaf0PecYw=="; + }; + }; "@webassemblyjs/floating-point-hex-parser-1.11.0" = { name = "_at_webassemblyjs_slash_floating-point-hex-parser"; packageName = "@webassemblyjs/floating-point-hex-parser"; @@ -7114,6 +7285,15 @@ let sha512 = "TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA=="; }; }; + "@webassemblyjs/floating-point-hex-parser-1.9.1" = { + name = "_at_webassemblyjs_slash_floating-point-hex-parser"; + packageName = "@webassemblyjs/floating-point-hex-parser"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.1.tgz"; + sha512 = "5VEKu024RySmLKTTBl9q1eO/2K5jk9ZS+2HXDBLA9s9p5IjkaXxWiDb/+b7wSQp6FRdLaH1IVGIfOex58Na2pg=="; + }; + }; "@webassemblyjs/helper-api-error-1.11.0" = { name = "_at_webassemblyjs_slash_helper-api-error"; packageName = "@webassemblyjs/helper-api-error"; @@ -7141,6 +7321,15 @@ let sha512 = "NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw=="; }; }; + "@webassemblyjs/helper-api-error-1.9.1" = { + name = "_at_webassemblyjs_slash_helper-api-error"; + packageName = "@webassemblyjs/helper-api-error"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.1.tgz"; + sha512 = "y1lGmfm38djrScwpeL37rRR9f1D6sM8RhMpvM7CYLzOlHVboouZokXK/G88BpzW0NQBSvCCOnW5BFhten4FPfA=="; + }; + }; "@webassemblyjs/helper-buffer-1.11.0" = { name = "_at_webassemblyjs_slash_helper-buffer"; packageName = "@webassemblyjs/helper-buffer"; @@ -7168,6 +7357,15 @@ let sha512 = "qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA=="; }; }; + "@webassemblyjs/helper-buffer-1.9.1" = { + name = "_at_webassemblyjs_slash_helper-buffer"; + packageName = "@webassemblyjs/helper-buffer"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.1.tgz"; + sha512 = "uS6VSgieHbk/m4GSkMU5cqe/5TekdCzQso4revCIEQ3vpGZgqSSExi4jWpTWwDpAHOIAb1Jfrs0gUB9AA4n71w=="; + }; + }; "@webassemblyjs/helper-code-frame-1.11.0" = { name = "_at_webassemblyjs_slash_helper-code-frame"; packageName = "@webassemblyjs/helper-code-frame"; @@ -7195,6 +7393,15 @@ let sha512 = "ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA=="; }; }; + "@webassemblyjs/helper-code-frame-1.9.1" = { + name = "_at_webassemblyjs_slash_helper-code-frame"; + packageName = "@webassemblyjs/helper-code-frame"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.1.tgz"; + sha512 = "ZQ2ZT6Evk4DPIfD+92AraGYaFIqGm4U20e7FpXwl7WUo2Pn1mZ1v8VGH8i+Y++IQpxPbQo/UyG0Khs7eInskzA=="; + }; + }; "@webassemblyjs/helper-compiler-1.11.0" = { name = "_at_webassemblyjs_slash_helper-compiler"; packageName = "@webassemblyjs/helper-compiler"; @@ -7240,6 +7447,15 @@ let sha512 = "OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw=="; }; }; + "@webassemblyjs/helper-fsm-1.9.1" = { + name = "_at_webassemblyjs_slash_helper-fsm"; + packageName = "@webassemblyjs/helper-fsm"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.1.tgz"; + sha512 = "J32HGpveEqqcKFS0YbgicB0zAlpfIxJa5MjxDxhu3i5ltPcVfY5EPvKQ1suRguFPehxiUs+/hfkwPEXom/l0lw=="; + }; + }; "@webassemblyjs/helper-module-context-1.8.1" = { name = "_at_webassemblyjs_slash_helper-module-context"; packageName = "@webassemblyjs/helper-module-context"; @@ -7258,6 +7474,15 @@ let sha512 = "MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g=="; }; }; + "@webassemblyjs/helper-module-context-1.9.1" = { + name = "_at_webassemblyjs_slash_helper-module-context"; + packageName = "@webassemblyjs/helper-module-context"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.1.tgz"; + sha512 = "IEH2cMmEQKt7fqelLWB5e/cMdZXf2rST1JIrzWmf4XBt3QTxGdnnLvV4DYoN8pJjOx0VYXsWg+yF16MmJtolZg=="; + }; + }; "@webassemblyjs/helper-numbers-1.11.0" = { name = "_at_webassemblyjs_slash_helper-numbers"; packageName = "@webassemblyjs/helper-numbers"; @@ -7294,6 +7519,15 @@ let sha512 = "R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw=="; }; }; + "@webassemblyjs/helper-wasm-bytecode-1.9.1" = { + name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; + packageName = "@webassemblyjs/helper-wasm-bytecode"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.1.tgz"; + sha512 = "i2rGTBqFUcSXxyjt2K4vm/3kkHwyzG6o427iCjcIKjOqpWH8SEem+xe82jUk1iydJO250/CvE5o7hzNAMZf0dQ=="; + }; + }; "@webassemblyjs/helper-wasm-section-1.11.0" = { name = "_at_webassemblyjs_slash_helper-wasm-section"; packageName = "@webassemblyjs/helper-wasm-section"; @@ -7321,6 +7555,15 @@ let sha512 = "XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw=="; }; }; + "@webassemblyjs/helper-wasm-section-1.9.1" = { + name = "_at_webassemblyjs_slash_helper-wasm-section"; + packageName = "@webassemblyjs/helper-wasm-section"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.1.tgz"; + sha512 = "FetqzjtXZr2d57IECK+aId3D0IcGweeM0CbAnJHkYJkcRTHP+YcMb7Wmc0j21h5UWBpwYGb9dSkK/93SRCTrGg=="; + }; + }; "@webassemblyjs/ieee754-1.11.0" = { name = "_at_webassemblyjs_slash_ieee754"; packageName = "@webassemblyjs/ieee754"; @@ -7348,6 +7591,15 @@ let sha512 = "dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg=="; }; }; + "@webassemblyjs/ieee754-1.9.1" = { + name = "_at_webassemblyjs_slash_ieee754"; + packageName = "@webassemblyjs/ieee754"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.1.tgz"; + sha512 = "EvTG9M78zP1MmkBpUjGQHZc26DzPGZSLIPxYHCjQsBMo60Qy2W34qf8z0exRDtxBbRIoiKa5dFyWer/7r1aaSQ=="; + }; + }; "@webassemblyjs/leb128-1.11.0" = { name = "_at_webassemblyjs_slash_leb128"; packageName = "@webassemblyjs/leb128"; @@ -7375,6 +7627,15 @@ let sha512 = "ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw=="; }; }; + "@webassemblyjs/leb128-1.9.1" = { + name = "_at_webassemblyjs_slash_leb128"; + packageName = "@webassemblyjs/leb128"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.1.tgz"; + sha512 = "Oc04ub0vFfLnF+2/+ki3AE+anmW4sv9uNBqb+79fgTaPv6xJsOT0dhphNfL3FrME84CbX/D1T9XT8tjFo0IIiw=="; + }; + }; "@webassemblyjs/utf8-1.11.0" = { name = "_at_webassemblyjs_slash_utf8"; packageName = "@webassemblyjs/utf8"; @@ -7402,6 +7663,15 @@ let sha512 = "GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w=="; }; }; + "@webassemblyjs/utf8-1.9.1" = { + name = "_at_webassemblyjs_slash_utf8"; + packageName = "@webassemblyjs/utf8"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.1.tgz"; + sha512 = "llkYtppagjCodFjo0alWOUhAkfOiQPQDIc5oA6C9sFAXz7vC9QhZf/f8ijQIX+A9ToM3c9Pq85X0EX7nx9gVhg=="; + }; + }; "@webassemblyjs/validation-1.11.0" = { name = "_at_webassemblyjs_slash_validation"; packageName = "@webassemblyjs/validation"; @@ -7429,6 +7699,15 @@ let sha512 = "FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw=="; }; }; + "@webassemblyjs/wasm-edit-1.9.1" = { + name = "_at_webassemblyjs_slash_wasm-edit"; + packageName = "@webassemblyjs/wasm-edit"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.1.tgz"; + sha512 = "S2IaD6+x9B2Xi8BCT0eGsrXXd8UxAh2LVJpg1ZMtHXnrDcsTtIX2bDjHi40Hio6Lc62dWHmKdvksI+MClCYbbw=="; + }; + }; "@webassemblyjs/wasm-gen-1.11.0" = { name = "_at_webassemblyjs_slash_wasm-gen"; packageName = "@webassemblyjs/wasm-gen"; @@ -7456,6 +7735,15 @@ let sha512 = "cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA=="; }; }; + "@webassemblyjs/wasm-gen-1.9.1" = { + name = "_at_webassemblyjs_slash_wasm-gen"; + packageName = "@webassemblyjs/wasm-gen"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.1.tgz"; + sha512 = "bqWI0S4lBQsEN5FTZ35vYzfKUJvtjNnBobB1agCALH30xNk1LToZ7Z8eiaR/Z5iVECTlBndoRQV3F6mbEqE/fg=="; + }; + }; "@webassemblyjs/wasm-opt-1.11.0" = { name = "_at_webassemblyjs_slash_wasm-opt"; packageName = "@webassemblyjs/wasm-opt"; @@ -7474,6 +7762,15 @@ let sha512 = "Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A=="; }; }; + "@webassemblyjs/wasm-opt-1.9.1" = { + name = "_at_webassemblyjs_slash_wasm-opt"; + packageName = "@webassemblyjs/wasm-opt"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.1.tgz"; + sha512 = "gSf7I7YWVXZ5c6XqTEqkZjVs8K1kc1k57vsB6KBQscSagDNbAdxt6MwuJoMjsE1yWY1tsuL+pga268A6u+Fdkg=="; + }; + }; "@webassemblyjs/wasm-parser-1.11.0" = { name = "_at_webassemblyjs_slash_wasm-parser"; packageName = "@webassemblyjs/wasm-parser"; @@ -7501,6 +7798,15 @@ let sha512 = "9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA=="; }; }; + "@webassemblyjs/wasm-parser-1.9.1" = { + name = "_at_webassemblyjs_slash_wasm-parser"; + packageName = "@webassemblyjs/wasm-parser"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.1.tgz"; + sha512 = "ImM4N2T1MEIond0MyE3rXvStVxEmivQrDKf/ggfh5pP6EHu3lL/YTAoSrR7shrbKNPpeKpGesW1LIK/L4kqduw=="; + }; + }; "@webassemblyjs/wast-parser-1.11.0" = { name = "_at_webassemblyjs_slash_wast-parser"; packageName = "@webassemblyjs/wast-parser"; @@ -7528,6 +7834,15 @@ let sha512 = "qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw=="; }; }; + "@webassemblyjs/wast-parser-1.9.1" = { + name = "_at_webassemblyjs_slash_wast-parser"; + packageName = "@webassemblyjs/wast-parser"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.1.tgz"; + sha512 = "2xVxejXSvj3ls/o2TR/zI6p28qsGupjHhnHL6URULQRcXmryn3w7G83jQMcT7PHqUfyle65fZtWLukfdLdE7qw=="; + }; + }; "@webassemblyjs/wast-printer-1.11.0" = { name = "_at_webassemblyjs_slash_wast-printer"; packageName = "@webassemblyjs/wast-printer"; @@ -7555,6 +7870,15 @@ let sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA=="; }; }; + "@webassemblyjs/wast-printer-1.9.1" = { + name = "_at_webassemblyjs_slash_wast-printer"; + packageName = "@webassemblyjs/wast-printer"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.1.tgz"; + sha512 = "tDV8V15wm7mmbAH6XvQRU1X+oPGmeOzYsd6h7hlRLz6QpV4Ec/KKxM8OpLtFmQPLCreGxTp+HuxtH4pRIZyL9w=="; + }; + }; "@webpack-cli/configtest-1.0.1" = { name = "_at_webpack-cli_slash_configtest"; packageName = "@webpack-cli/configtest"; @@ -8068,13 +8392,13 @@ let sha512 = "TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg=="; }; }; - "adm-zip-0.5.2" = { + "adm-zip-0.5.3" = { name = "adm-zip"; packageName = "adm-zip"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.2.tgz"; - sha512 = "lUI3ZSNsfQXNYNzGjt68MdxzCs0eW29lgL74y/Y2h4nARgHmH3poFWuK3LonvFbNHFt4dTb2X/QQ4c1ZUWWsJw=="; + url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.3.tgz"; + sha512 = "zsoTXEwRNCxBzRHLENFLuecCcwzzXiEhWo1r3GP68iwi8Q/hW2RrqgeY1nfJ/AhNQNWnZq/4v0TbfMsUkI+TYw=="; }; }; "adverb-where-0.0.9" = { @@ -8257,13 +8581,13 @@ let sha512 = "LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg=="; }; }; - "ajv-7.1.0" = { + "ajv-7.1.1" = { name = "ajv"; packageName = "ajv"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-7.1.0.tgz"; - sha512 = "svS9uILze/cXbH0z2myCK2Brqprx/+JJYK5pHicT/GQiBfzzhUVAIT6MwqJg8y4xV/zoGsUeuPuwtoiKSGE15g=="; + url = "https://registry.npmjs.org/ajv/-/ajv-7.1.1.tgz"; + sha512 = "ga/aqDYnUy/o7vbsRTFhhTsNeXiYb5JWDIcRIeZfwRNCefwjNTVYCGdGSUrEmiu3yDK3vFvNbgJxvrQW4JXrYQ=="; }; }; "ajv-errors-1.0.1" = { @@ -10102,13 +10426,13 @@ let sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="; }; }; - "async-append-only-log-3.0.3" = { + "async-append-only-log-3.0.4" = { name = "async-append-only-log"; packageName = "async-append-only-log"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/async-append-only-log/-/async-append-only-log-3.0.3.tgz"; - sha512 = "w6F/oWReK4qyNBnCFe/cfYZHXMs07BZjS0LmpHQ5JByK5yEVzvvWGdNMStFPVbQhVJnT1PdmP+/LwEzmoe33qA=="; + url = "https://registry.npmjs.org/async-append-only-log/-/async-append-only-log-3.0.4.tgz"; + sha512 = "sr6Q6MILUhg1xHaNOLJLsrzbKrRDpedGyw9PjeZMSvib9q3gIj+jvgpUawZEfdvwfFTS8tpGixVWcooCTFhS5Q=="; }; }; "async-done-1.3.2" = { @@ -10408,13 +10732,13 @@ let sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; }; }; - "aws-sdk-2.843.0" = { + "aws-sdk-2.846.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.843.0"; + version = "2.846.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.843.0.tgz"; - sha512 = "wTHKHDzblaNjWsdCuKTnfAr2zSLgN+Nc2yGpqPxnr7emEQG4V3B0gYEfV9rvv9dVq5Jw8Y1q6VNWS6k8oclnSw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.846.0.tgz"; + sha512 = "r/VUmo7Ri4yxVonFARzb9reZgcURbddfKur5HlAG55Xd4ku3u7akMe/rZYFuhQbUTef6p6J19oUg/W+fnEY2Tw=="; }; }; "aws-sign2-0.6.0" = { @@ -14089,15 +14413,6 @@ let sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; }; }; - "chokidar-3.4.3" = { - name = "chokidar"; - packageName = "chokidar"; - version = "3.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz"; - sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ=="; - }; - }; "chokidar-3.5.1" = { name = "chokidar"; packageName = "chokidar"; @@ -14260,6 +14575,15 @@ let sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; }; }; + "ci-info-3.1.1" = { + name = "ci-info"; + packageName = "ci-info"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ci-info/-/ci-info-3.1.1.tgz"; + sha512 = "kdRWLBIJwdsYJWYJFtAFFYxybguqeF91qpZaggjG5Nf8QKdizFG2hjqvaTXbxFIcYbSaD74KpAXv6BSm17DHEQ=="; + }; + }; "cint-8.2.1" = { name = "cint"; packageName = "cint"; @@ -14368,13 +14692,13 @@ let sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; }; }; - "clean-css-5.0.1" = { + "clean-css-5.1.0" = { name = "clean-css"; packageName = "clean-css"; - version = "5.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-5.0.1.tgz"; - sha512 = "F1zAGOowUCg8yxT0O4UR+nmbMauf3YwbiUS60CPxpzJU7ulpamGzQomFrJSK4w/HqHtMmQKSHJUNue+dQQYQdg=="; + url = "https://registry.npmjs.org/clean-css/-/clean-css-5.1.0.tgz"; + sha512 = "98ALLW4NOhZpvUEoSc2dJO23xE4S4SXc4mLieCVFGo8DNLTFQ3gzi7msW1lqSYJeGZSF5r5+W3KF6cEnkILnFQ=="; }; }; "clean-deep-3.4.0" = { @@ -16132,13 +16456,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.21" = { + "constructs-3.3.27" = { name = "constructs"; packageName = "constructs"; - version = "3.3.21"; + version = "3.3.27"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.21.tgz"; - sha512 = "FsdsSAJlmlWSiWWuKTTP/a0SpEtRMM2w0P5lsJxvP4/42AOJOSmqckDyrr9WkESiaX94WnnK9khoVWGlBzkvNA=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.27.tgz"; + sha512 = "MB+Ec8hCChUNduQCaYuFvda1uK4Z9q3BsVzUyHiTZVwcIGaIK9SImnz9X6wipll6/E8IHpt5MLhiieYswf1VTg=="; }; }; "constructs-3.3.5" = { @@ -16331,13 +16655,13 @@ let sha512 = "ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA=="; }; }; - "conventional-commits-parser-3.2.0" = { + "conventional-commits-parser-3.2.1" = { name = "conventional-commits-parser"; packageName = "conventional-commits-parser"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.0.tgz"; - sha512 = "XmJiXPxsF0JhAKyfA2Nn+rZwYKJ60nanlbSWwwkGwLQFbugsc0gv1rzc7VbbUWAzJfR1qR87/pNgv9NgmxtBMQ=="; + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.1.tgz"; + sha512 = "OG9kQtmMZBJD/32NEw5IhN5+HnBqVjy03eC+I71I0oQRFA5rOgA4OtPOYG7mz1GkCfCNxn3gKIX8EiHJYuf1cA=="; }; }; "conventional-recommended-bump-5.0.1" = { @@ -17411,13 +17735,13 @@ let sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; }; }; - "csstype-2.6.14" = { + "csstype-2.6.15" = { name = "csstype"; packageName = "csstype"; - version = "2.6.14"; + version = "2.6.15"; src = fetchurl { - url = "https://registry.npmjs.org/csstype/-/csstype-2.6.14.tgz"; - sha512 = "2mSc+VEpGPblzAxyeR+vZhJKgYg0Og0nnRi7pmRXFYYxSfnOnW8A5wwQb4n4cE2nIOzqKOAzLCaEX6aBmNEv8A=="; + url = "https://registry.npmjs.org/csstype/-/csstype-2.6.15.tgz"; + sha512 = "FNeiVKudquehtR3t9TRRnsHL+lJhuHF5Zn9dt01jpojlurLEPDhhEtUkWmAUJ7/fOLaLG4dCDEnUsR0N1rZSsg=="; }; }; "csurf-1.11.0" = { @@ -20552,13 +20876,13 @@ let sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; }; - "electron-to-chromium-1.3.664" = { + "electron-to-chromium-1.3.667" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.664"; + version = "1.3.667"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.664.tgz"; - sha512 = "yb8LrTQXQnh9yhnaIHLk6CYugF/An50T20+X0h++hjjhVfgSp1DGoMSYycF8/aD5eiqS4QwaNhiduFvK8rifRg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.667.tgz"; + sha512 = "Ot1pPtAVb5nd7jeVF651zmfLFilRVFomlDzwXmdlWe5jyzOGa6mVsQ06XnAurT7wWfg5VEIY+LopbAdD/bpo5w=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -21418,13 +21742,13 @@ let sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA=="; }; }; - "esbuild-0.8.46" = { + "esbuild-0.8.48" = { name = "esbuild"; packageName = "esbuild"; - version = "0.8.46"; + version = "0.8.48"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.8.46.tgz"; - sha512 = "xck9sXNCNmjDHCCfxTCyhKTiFuEBweh+IDAhMLOJI990v1Fzii6MyIkT1LbkvjgoVgPX2SK1kpi5eZVGNrl8yg=="; + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.8.48.tgz"; + sha512 = "lrH8lA8wWQ6Lpe1z6C7ZZaFSmRsUlcQAqe16nf7ITySQ7MV4+vI7qAqQlT/u+c3+9AL3VXmT4MXTxV2e63pO4A=="; }; }; "esc-exit-2.0.2" = { @@ -23956,13 +24280,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.144.0" = { + "flow-parser-0.145.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.144.0"; + version = "0.145.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.144.0.tgz"; - sha512 = "si2lCamPs0N1QcTiQY8p9RxvVsVGbx4rpkX6dcfUQ2OOvEg6Cya7LItlPqcx54Gtakdx1St6TseQlV8nafYW5g=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.145.0.tgz"; + sha512 = "dqpYiE0rZopmex5FR6pi/HTia8i+q/euc9WUWH6fTLt6sQgXjnAcsOwgMMLHCxwCSqPrvi/XFmBiicKitLNrKA=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -24244,13 +24568,13 @@ let sha512 = "DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw=="; }; }; - "fork-ts-checker-webpack-plugin-6.0.5" = { + "fork-ts-checker-webpack-plugin-6.1.0" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; - version = "6.0.5"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.0.5.tgz"; - sha512 = "2jIHv2RhXzSxWtvRQX/ZtOxd5joo+FQYzn+sJ/hyLqApKGgvjMEMF951GnvuSNPheGsqiVzIDjvSZo1qRtry1Q=="; + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.1.0.tgz"; + sha512 = "xLNufWQ1dfQUdZe48TGQlER/0OkcMnUB6lfbN9Tt13wsYyo+2DwcCbnOaPBo1PoFow/WL8pJPktGIdbJaHxAnw=="; }; }; "form-data-1.0.0-rc3" = { @@ -24298,13 +24622,22 @@ let sha512 = "m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA=="; }; }; - "form-data-3.0.0" = { + "form-data-3.0.1" = { name = "form-data"; packageName = "form-data"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz"; - sha512 = "CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg=="; + url = "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz"; + sha512 = "RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg=="; + }; + }; + "form-data-4.0.0" = { + name = "form-data"; + packageName = "form-data"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz"; + sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; }; }; "form-urlencoded-4.2.1" = { @@ -26396,13 +26729,13 @@ let sha512 = "zsrDtu5gCbQFDWsNa5bMB4nf1LpKX9KDgh+f8oL1288ijV4RxeckhVozAjqjXAfRpxOHD1xOESsh6zq8SjdgjA=="; }; }; - "graphql-ws-4.1.0" = { + "graphql-ws-4.1.5" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "4.1.0"; + version = "4.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.1.0.tgz"; - sha512 = "DxJP1y2YzCqVLy7DrQN0iuR2l48vMOBWukX2d/J9aN2o5x9un5psIIq/2UFRh91UGARmfvPH86y1p4qbC1dITg=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.1.5.tgz"; + sha512 = "yUQ1AjegD1Y9jDS699kyw7Mw+9H+rILm2HoS8N5a5B5YTH93xy3yifFhAJpKGc2wb/8yGdlVy8gTcud0TPqi6Q=="; }; }; "gray-matter-2.1.1" = { @@ -30672,15 +31005,6 @@ let sha1 = "611ae1acf14f5e81f729507472819fe9733558a9"; }; }; - "isomorphic-form-data-2.0.0" = { - name = "isomorphic-form-data"; - packageName = "isomorphic-form-data"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isomorphic-form-data/-/isomorphic-form-data-2.0.0.tgz"; - sha512 = "TYgVnXWeESVmQSg4GLVbalmQ+B4NPi/H4eWxqALKj63KsUrcu301YDjBqaOw3h+cbak7Na4Xyps3BiptHtxTfg=="; - }; - }; "isomorphic-git-0.78.5" = { name = "isomorphic-git"; packageName = "isomorphic-git"; @@ -30969,13 +31293,13 @@ let sha512 = "0soPJif+yjmzmOF+4cF2hyhxUWWpXpQntsm2joJXFFoRcQiPzsG4dbLKYqYPT3Fc6PjZ8MaLtCkDqqckVSfmRw=="; }; }; - "jitdb-2.0.7" = { + "jitdb-2.1.0" = { name = "jitdb"; packageName = "jitdb"; - version = "2.0.7"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jitdb/-/jitdb-2.0.7.tgz"; - sha512 = "Ymkv6cQg6NUPXu6890NY4/xWgn08+YYz4gy9VMerzgC1jx5L38ggzfz6m2ylm0COoHE4Ni5QlxO43+lJoTGPuw=="; + url = "https://registry.npmjs.org/jitdb/-/jitdb-2.1.0.tgz"; + sha512 = "7r9ZiBHWbjG/VHE+LXcQTOC244yXg0XVrU2n7pm1k5HBYB4UK1zr71zbSqO/OdR546KAyAihAjm41D0Yh2Fo5g=="; }; }; "jju-1.4.0" = { @@ -32013,13 +32337,13 @@ let sha512 = "pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ=="; }; }; - "just-debounce-1.0.0" = { + "just-debounce-1.1.0" = { name = "just-debounce"; packageName = "just-debounce"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz"; - sha1 = "87fccfaeffc0b68cd19d55f6722943f929ea35ea"; + url = "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz"; + sha512 = "qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ=="; }; }; "just-detect-adblock-1.1.0" = { @@ -32293,13 +32617,13 @@ let sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77"; }; }; - "keytar-7.3.0" = { + "keytar-7.4.0" = { name = "keytar"; packageName = "keytar"; - version = "7.3.0"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/keytar/-/keytar-7.3.0.tgz"; - sha512 = "t8YD0ETO5AeRxCaaN4N/hzj3JusIH0ugjVooE724+ozaVG9+l16Mau62T+U8tEhCv7SozY/g69BWF1U+o47qJg=="; + url = "https://registry.npmjs.org/keytar/-/keytar-7.4.0.tgz"; + sha512 = "nELmc35YjSE4ZNSFaID/743CgDt/MdV4JLX7rRewAh9mKvU72RtF3uJMY0MdMpwdDYZhmD8FSdRCD1J97lEyVg=="; }; }; "keyv-3.0.0" = { @@ -36649,13 +36973,13 @@ let sha512 = "dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA=="; }; }; - "mime-2.5.0" = { + "mime-2.5.2" = { name = "mime"; packageName = "mime"; - version = "2.5.0"; + version = "2.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz"; - sha512 = "ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag=="; + url = "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz"; + sha512 = "tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg=="; }; }; "mime-db-1.33.0" = { @@ -36676,15 +37000,6 @@ let sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; }; }; - "mime-db-1.45.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.45.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz"; - sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w=="; - }; - }; "mime-db-1.46.0" = { name = "mime-db"; packageName = "mime-db"; @@ -36712,13 +37027,13 @@ let sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; }; }; - "mime-types-2.1.28" = { + "mime-types-2.1.29" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.28"; + version = "2.1.29"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz"; - sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz"; + sha512 = "Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ=="; }; }; "mimic-fn-1.2.0" = { @@ -37180,13 +37495,13 @@ let sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; }; }; - "mobx-6.1.6" = { + "mobx-6.1.7" = { name = "mobx"; packageName = "mobx"; - version = "6.1.6"; + version = "6.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-6.1.6.tgz"; - sha512 = "3by0Avodad/3cdPAuJuj8jWXhe1YByHKaEkonD9yOdcMoMuot2jrjlSXmQPhR1bJpNHfSsOx122tM9Pv3IzFWA=="; + url = "https://registry.npmjs.org/mobx/-/mobx-6.1.7.tgz"; + sha512 = "2iIgg2o0jd/bWAK/9KHJ1uwKHGowKyaTUM4qarJ0qGdLskYcB3sJevjjV7t7jW0WVjItz6BBlPNiZ14oHTpvMg=="; }; }; "mobx-react-7.1.0" = { @@ -38414,13 +38729,13 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; - "netlify-6.1.8" = { + "netlify-6.1.9" = { name = "netlify"; packageName = "netlify"; - version = "6.1.8"; + version = "6.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-6.1.8.tgz"; - sha512 = "x1PmAlf41NebEq1k8JP36pkUImq1a7pedCTOQngLqtWXwaKFsHLWxkKBJZsYiCxWI+vu8ZoIeopsm7hYiArC0g=="; + url = "https://registry.npmjs.org/netlify/-/netlify-6.1.9.tgz"; + sha512 = "+t/yyPusR0/bwB/IQPT5mcwe3erlS+x8rBy006f1Gu2WsbUHpI20/Qyz0h3SJ4m7sSqeDVTVidFqQjbxMLKb0w=="; }; }; "netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16" = { @@ -40144,13 +40459,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.160.1" = { + "office-ui-fabric-react-7.160.3" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.160.1"; + version = "7.160.3"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.160.1.tgz"; - sha512 = "yfwYBXZscIJgL8r/SRSiAhgLzp9QvbA7UtWsDxEleJH1YG2FG7fbUe/JkO/76WkUJjytilXGgAS9ZbL5NLdBXA=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.160.3.tgz"; + sha512 = "+fkrfBG7+ZfNS+RvqHcTZpzud86FOqqWAxUUEcSoEnanXdZ6XXQnSYpMDjygJJsYAmrcZr8+kk4ykaCQo+lGWQ=="; }; }; "omggif-1.0.10" = { @@ -40405,13 +40720,13 @@ let sha512 = "PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA=="; }; }; - "open-7.4.1" = { + "open-7.4.2" = { name = "open"; packageName = "open"; - version = "7.4.1"; + version = "7.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-7.4.1.tgz"; - sha512 = "Pxv+fKRsd/Ozflgn2Gjev1HZveJJeKR6hKKmdaImJMuEZ6htAvCTbcMABJo+qevlAelTLCrEK3YTKZ9fVTcSPw=="; + url = "https://registry.npmjs.org/open/-/open-7.4.2.tgz"; + sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="; }; }; "openapi-default-setter-2.1.0" = { @@ -43258,13 +43573,13 @@ let sha512 = "7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg=="; }; }; - "polished-3.7.0" = { + "polished-3.7.1" = { name = "polished"; packageName = "polished"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/polished/-/polished-3.7.0.tgz"; - sha512 = "1tnvQ2wsxfR/DyPE2Xu9sRbnLAwXAarCWiZJ8Hfirw59bTigqjbzEWSAmzYizT6ocQW995V8n7RP48jq50DjJA=="; + url = "https://registry.npmjs.org/polished/-/polished-3.7.1.tgz"; + sha512 = "/QgHrNGYwIA4mwxJ/7FSvalUJsm7KNfnXiScVSEG2Xa5qxDeBn4nmdjN2pW00mkM2Tts64ktc47U8F7Ed1BRAA=="; }; }; "polyraf-1.1.0" = { @@ -44123,13 +44438,13 @@ let sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA=="; }; }; - "prettier-plugin-svelte-2.1.4" = { + "prettier-plugin-svelte-2.1.6" = { name = "prettier-plugin-svelte"; packageName = "prettier-plugin-svelte"; - version = "2.1.4"; + version = "2.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.1.4.tgz"; - sha512 = "fQfcIyl04VNWI3+JeseT+gLljs2bJJifbKmrTe8yMnTCdv0unfM1jnY2p4etzCfOj6skC1FPFaqBayYk3+7ZZg=="; + url = "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.1.6.tgz"; + sha512 = "eg6MhH394IYsljIcLMgCx/wozObkUFZJ1GkH+Nj8sZQilnNCFTeSBcEohBaNa9hr5RExvlJQJ8a2CEjMMrwL8g=="; }; }; "prettier-stylelint-0.4.2" = { @@ -45842,6 +46157,15 @@ let sha1 = "b209849203bb25df820da756e747005878521620"; }; }; + "querystring-0.2.1" = { + name = "querystring"; + packageName = "querystring"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz"; + sha512 = "wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg=="; + }; + }; "querystring-es3-0.2.1" = { name = "querystring-es3"; packageName = "querystring-es3"; @@ -46904,13 +47228,13 @@ let sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b"; }; }; - "redoc-2.0.0-rc.49" = { + "redoc-2.0.0-rc.48" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.49"; + version = "2.0.0-rc.48"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.49.tgz"; - sha512 = "mCdO0kHnnmwieCq56R5LDJ5eIEhLCoq/le1m0AlMFkIkxMJWZfmq9y3QYq6Fe4Uec73kZgG7gN3qYSGBMHtgQQ=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.48.tgz"; + sha512 = "shArJWhNG2gQ0XKxW8WcfG8peNOtxbZ86CqxgrR9P7MnE5ESAo559CH/PSlezePeVLpcC0C9tcimOfSN5MaAvA=="; }; }; "reduce-component-1.0.1" = { @@ -49865,13 +50189,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.34.2" = { + "simple-git-2.35.0" = { name = "simple-git"; packageName = "simple-git"; - version = "2.34.2"; + version = "2.35.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.34.2.tgz"; - sha512 = "/EX4FtcpAj5L/Bs5zgaBGYDrnkrKflFVNppNLH9VXpIjZBLHx5cZ6/mOYJCoKXKlLRuk3iTvzrIsHo7v42zWHg=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.35.0.tgz"; + sha512 = "VuXs2/HyZmZm43Z5IjvU+ahTmURh/Hmb/egmgNdFZuu8OEnW2emCalnL/4jRQkXeJvfzCTnev6wo5jtDmWw0Dw=="; }; }; "simple-markdown-0.4.4" = { @@ -50378,13 +50702,13 @@ let sha512 = "IQcdsQBqqXVRY5DatlI7ASy4flbhtU2V7cr4P2rK9rkFnVHO6LHcitwKXVZa9ocdOmpZDzk7U6iwHJkVFcR6OA=="; }; }; - "snyk-poetry-lockfile-parser-1.1.5" = { + "snyk-poetry-lockfile-parser-1.1.6" = { name = "snyk-poetry-lockfile-parser"; packageName = "snyk-poetry-lockfile-parser"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.5.tgz"; - sha512 = "HR5XjWyueRZc0mWlcXD+OidyDnZ83tgAqJN+n7DGxqTv1z00eogkTxsW2DwNvXevF7ItoBaN80t14oicNQ8GlA=="; + url = "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.6.tgz"; + sha512 = "MoekbWOZPj9umfukjk2bd2o3eRj0OyO+58sxq9crMtHmTlze4h0/Uj4+fb0JFPBOtBO3c2zwbA+dvFQmpKoOTA=="; }; }; "snyk-policy-1.14.1" = { @@ -51350,13 +51674,13 @@ let sha512 = "rjvqHFUaSGnzxDy2AHCwhHy6Zp6MNJzCPGYju4kD8yi6bze4d1/zMTg6C7JI49b7/EM7jKMTvyfN/4ylBKdwfw=="; }; }; - "sqlite3-5.0.1" = { + "sqlite3-5.0.2" = { name = "sqlite3"; packageName = "sqlite3"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.1.tgz"; - sha512 = "kh2lTIcYNfmVcvhVJihsYuPj9U0xzBbh6bmqILO2hkryWSC9RRhzYmkIDtJkJ+d8Kg4wZRJ0T1reyHUEspICfg=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.2.tgz"; + sha512 = "1SdTNo+BVU211Xj1csWa8lV6KM0CtucDwRyA0VHl91wEH1Mgh7RxUpI4rVvG7OhHrzCSGaVyW5g8vKvlrk9DJA=="; }; }; "sqlstring-2.3.1" = { @@ -51449,13 +51773,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-1.12.0" = { + "ssb-db2-1.16.2" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "1.12.0"; + version = "1.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-1.12.0.tgz"; - sha512 = "NrbXiqcG1XCgQbEyMtf4zJr1JIqvbnAGYMIILIk5KQCBrVXcFPixD73cEYrVRN6JJaWyvdFcLWLJFCGRj/daTw=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-1.16.2.tgz"; + sha512 = "pmNFsFsRfixnubcghPKnc97Hf3TzkXfVPOeWLC+MbSORYJmREC1gUzrlylGXupX2qfjZsABAwMpiL2a7pKpEYg=="; }; }; "ssb-ebt-5.6.7" = { @@ -51467,13 +51791,13 @@ let sha512 = "ifPgPNmDE8EKuuoqtXibwgYNtDZNry7sJL1epSUb3XgQr62bUV31N9R5LHKDsI2kx96OgWRwWY2PfZ7vf/hU8Q=="; }; }; - "ssb-friends-4.4.3" = { + "ssb-friends-4.4.4" = { name = "ssb-friends"; packageName = "ssb-friends"; - version = "4.4.3"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.4.3.tgz"; - sha512 = "9LY+XH05epjsJD7MPyuz1OHnErfNI4DJbAqMgees3DtEOfb2wYjeTzfsR3xUnayCgHJQ0p3SVmUhQVyKAy0xkg=="; + url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.4.4.tgz"; + sha512 = "Gny8HraAVnii45tn9baWr27DjEqJndLsBRgV2fqhFLHZm3sGagiv0baJR4W2UgRikADKmrLulvRGI1xaOGxaeg=="; }; }; "ssb-git-0.5.0" = { @@ -52025,13 +52349,13 @@ let sha1 = "161c7dac177659fd9811f43771fa99381478628c"; }; }; - "std-env-2.2.1" = { + "std-env-2.3.0" = { name = "std-env"; packageName = "std-env"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/std-env/-/std-env-2.2.1.tgz"; - sha512 = "IjYQUinA3lg5re/YMlwlfhqNRTzMZMqE+pezevdcTaHceqx8ngEi1alX9nNCk9Sc81fy1fLDeQoaCzeiW1yBOQ=="; + url = "https://registry.npmjs.org/std-env/-/std-env-2.3.0.tgz"; + sha512 = "4qT5B45+Kjef2Z6pE0BkskzsH0GO7GrND0wGlTM1ioUe3v0dGYx9ZJH0Aro/YyA8fqQ5EyIKDRjZojJYMFTflw=="; }; }; "stealthy-require-1.1.1" = { @@ -53348,13 +53672,13 @@ let sha512 = "SROWH0rB0DJ+0Ii264cprmNu/NJyZacs5wFD71ya93Cg/oA2lKHgQm4F6j0EWA4ktFMzeuJJm/eX6fka39hEHA=="; }; }; - "svelte2tsx-0.1.169" = { + "svelte2tsx-0.1.171" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.1.169"; + version = "0.1.171"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.169.tgz"; - sha512 = "E4AM2WGMdsYWe8z3BQXbvKQ9dWrOPDrO9xx5V7e+5MHFhyof1a5ZupY6LprJlwQYmWm0Vj9HUGkm8fdVFCfnhA=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.171.tgz"; + sha512 = "PSE5gf//f6JNooJHm25LGuGUt2vP92aWrLNMhMVe5xDA/D2dEjWhxfrCOGgHxgrV7FcnYhW85OTn0DOIkd7DCg=="; }; }; "sver-compat-1.5.0" = { @@ -53609,13 +53933,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.34.11" = { + "systeminformation-4.34.13" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.34.11"; + version = "4.34.13"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.11.tgz"; - sha512 = "YsO1aButenX+ZnkfDUYCF89ZmAQEw2CVPV3kCmtXaGLrPrJ6GQLANLZ7a/FP0h5hJDTZfrMel0LHV5RyIp3RvA=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.13.tgz"; + sha512 = "K3h3ofFOvXgsGAoACcGEG+T+X9Kq1xRk1bJS+p6JOd2U4mDFkIOW03u2wSCcVMuCq/NsM/piALNt1u3DrQftlw=="; }; }; "table-3.8.3" = { @@ -54078,13 +54402,13 @@ let sha512 = "wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="; }; }; - "terminal-kit-1.47.0" = { + "terminal-kit-1.48.1" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.47.0"; + version = "1.48.1"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.47.0.tgz"; - sha512 = "wyfslVEOJrB2kmZyUEkTKtd4jlNTVR9G1ogkrs7a1VMk55t83+m8sMDJTNuEqfwYXvWbRyGD8pyhv9vyl9xc5w=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.48.1.tgz"; + sha512 = "rUdKfN3gv2osW+M+PrWHSDQ6jOcCdSzunsFz78NmdOelQolUFkoAfM6AJUlzWENp4+jIRV89wLp4/viyRhZ5Kw=="; }; }; "terminal-link-2.1.1" = { @@ -55743,13 +56067,13 @@ let sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; }; }; - "type-2.2.0" = { + "type-2.3.0" = { name = "type"; packageName = "type"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-2.2.0.tgz"; - sha512 = "M/u37b4oSGlusaU8ZB96BfFPWQ8MbsZYXB+kXGMiDj6IKinkcNaQvmirBuWj8mAXqP6LYn1rQvbTYum3yPhaOA=="; + url = "https://registry.npmjs.org/type/-/type-2.3.0.tgz"; + sha512 = "rgPIqOdfK/4J9FhiVrZ3cveAjRRo5rsQBAIhnylX874y1DX/kEKSVdLsnuHB6l1KTjHyU01VjiMBHgU2adejyg=="; }; }; "type-check-0.3.2" = { @@ -56004,15 +56328,6 @@ let sha512 = "tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg=="; }; }; - "typescript-4.0.5" = { - name = "typescript"; - packageName = "typescript"; - version = "4.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz"; - sha512 = "ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ=="; - }; - }; "typescript-4.1.5" = { name = "typescript"; packageName = "typescript"; @@ -56067,13 +56382,13 @@ let sha1 = "5c080e5d661cbbe38259d2e70a3c7253e873881d"; }; }; - "typo-geom-0.11.1" = { + "typo-geom-0.11.2" = { name = "typo-geom"; packageName = "typo-geom"; - version = "0.11.1"; + version = "0.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.11.1.tgz"; - sha512 = "DqAx/eGYLJprgRHEV2cMQBzRJo2N9UdBJ2eN54OeZ9chHbq+9U059lLY2DUxeGMff5rtTyG966CuL9aO4csxbQ=="; + url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.11.2.tgz"; + sha512 = "ouK6sY+LNGDDQra+MEZb2ZYDaEkCUeutr6x8BZAGGGB0fCsR0wt6YIuz9DJoc8idQS8mnqY8npGmXcMsTZAXPA=="; }; }; "ua-parser-js-0.7.21" = { @@ -57318,13 +57633,13 @@ let sha512 = "3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA=="; }; }; - "url-parse-1.4.7" = { + "url-parse-1.5.1" = { name = "url-parse"; packageName = "url-parse"; - version = "1.4.7"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz"; - sha512 = "d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg=="; + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz"; + sha512 = "HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q=="; }; }; "url-parse-lax-1.0.0" = { @@ -58750,13 +59065,13 @@ let sha512 = "dKQXRYNUY6BHALQJBJlyZyv9oWlYpbJ2vVoQNNVNPLAYQ3hzNp4zy+iSo7zGx1BPXByArJQDWTKLQh8dz3dnNw=="; }; }; - "vscode-jsonrpc-6.1.0-next.1" = { + "vscode-jsonrpc-6.1.0-next.2" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "6.1.0-next.1"; + version = "6.1.0-next.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.1.0-next.1.tgz"; - sha512 = "2s1qEg8N97p8pooHnA8xgR4vnslCTJuE3rQqSQeJuSDklFcQSn9yW8gOinH/1vKeWiPuzHTG9FFty91v4v9Pag=="; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.1.0-next.2.tgz"; + sha512 = "nkiNDGI+Ytp7uj1lxHXddXCoEunhcry1D+KmVHBfUUgWT9jMF8ZJyH5KQObdF+OGAh7bXZxD/SV4uGwSCeHHWA=="; }; }; "vscode-languageclient-4.0.1" = { @@ -58768,13 +59083,13 @@ let sha512 = "0fuBZj9pMkeJ8OMyIvSGeRaRVhUaJt+yeFxi7a3sz/AbrngQdcxOovMXPgKuieoBSBKS05gXPS88BsWpJZfBkA=="; }; }; - "vscode-languageclient-7.1.0-next.1" = { + "vscode-languageclient-7.1.0-next.4" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; - version = "7.1.0-next.1"; + version = "7.1.0-next.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.1.0-next.1.tgz"; - sha512 = "pMdMyJ5e3CfdyvtDsj6ytTO+WcmrvtrFJWvBk4rZnIKmA3aCjrqTYI0XSWN/Cf4kcaV1J2+fTZf/2RcP2SzDiQ=="; + url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.1.0-next.4.tgz"; + sha512 = "Gal+DvbI1KIwO1z90MvSnghMCVBCGlwdpOVIS0Hhmep7rjHUOwuC5Df7YlVkpzfPm+RCRyZQnUSJ19VNrnxxhA=="; }; }; "vscode-languageserver-3.5.1" = { @@ -58903,13 +59218,13 @@ let sha512 = "6GmPUp2MhJy2H1CTWp2B40Pa9BeC9glrXWmQWVG6A/0V9UbcAjVC9m56znm2GL32iyLDIprTBe8gBvvvcjbpaQ=="; }; }; - "vscode-languageserver-protocol-3.17.0-next.1" = { + "vscode-languageserver-protocol-3.17.0-next.5" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.17.0-next.1"; + version = "3.17.0-next.5"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.1.tgz"; - sha512 = "cbFKGk+Q7HQ5RDdf6qiQrRv9qxR/87hBm/GrfLcQ5rmHPJOXg//ZYCXEQF+wSJNmcc6IrnET2cHJUxlZYHUEXA=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.5.tgz"; + sha512 = "LFZ6WMB3iPezQAU9OnGoERzcIVKhcs0OLfD/NHcqSj3g1wgxuLUL5kSlZbbjFySQCmhzm6b0yb3hjTSeBtq1+w=="; }; }; "vscode-languageserver-protocol-3.5.1" = { @@ -59047,13 +59362,13 @@ let sha512 = "u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA=="; }; }; - "vscode-test-1.5.0" = { + "vscode-test-1.5.1" = { name = "vscode-test"; packageName = "vscode-test"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-test/-/vscode-test-1.5.0.tgz"; - sha512 = "svwE/mhBBqrB77C1U7pkUKfUmxnkzg0dLGi1vEmitsleu88oNsqZEhG3ANZrL/Ia4m0CW0oYEKRw2EojpFxLlQ=="; + url = "https://registry.npmjs.org/vscode-test/-/vscode-test-1.5.1.tgz"; + sha512 = "tDloz6euDne+GeUSglhufL0c2xhuYAPAT74hjsuGxfflALfXF9bYnJ7ehZEeVkr/ZnQEh/T8EBrfPL+m0h5qEQ=="; }; }; "vscode-textbuffer-1.0.0" = { @@ -59452,13 +59767,13 @@ let sha512 = "6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q=="; }; }; - "webpack-5.9.0" = { + "webpack-5.11.0" = { name = "webpack"; packageName = "webpack"; - version = "5.9.0"; + version = "5.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.9.0.tgz"; - sha512 = "YnnqIV/uAS5ZrNpctSv378qV7HmbJ74DL+XfvMxzbX1bV9e7eeT6eEWU4wuUw33CNr/HspBh7R/xQlVjTEyAeA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.11.0.tgz"; + sha512 = "ubWv7iP54RqAC/VjixgpnLLogCFbAfSOREcSWnnOlZEU8GICC5eKmJSu6YEnph2N2amKqY9rvxSwgyHxVqpaRw=="; }; }; "webpack-cli-3.3.12" = { @@ -59632,13 +59947,13 @@ let sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; }; }; - "whatwg-fetch-3.5.0" = { + "whatwg-fetch-3.6.0" = { name = "whatwg-fetch"; packageName = "whatwg-fetch"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz"; - sha512 = "jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A=="; + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.0.tgz"; + sha512 = "ZgtzIak+vJhRBRdz/64QikloqIyeOufspzwd7ch/TSNdK4e/kC5PqL7W4uwj0l/SyagqRkRJii5JEsufbniLgw=="; }; }; "whatwg-mimetype-2.3.0" = { @@ -61610,15 +61925,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "11.2.0"; + version = "11.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-11.2.0.tgz"; - sha512 = "waIR5Nqc2wcYXZh/Mgm+4Iyvu0nzKAhvmKiJjcJ+f2UuPRMLdNAInTvhdpfgKaNdmiArxNa6UntRIu+EavGc9Q=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-11.2.1.tgz"; + sha512 = "FVwJQyPTMTTikrsKYqaP44/23UqTQ6txNt6xGoWPyI/v8VQ1afyjswcw4Z/zHWIoscmltjPuV00IYJ+NZLYPBQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1102.0" - sources."@angular-devkit/core-11.2.0" - sources."@angular-devkit/schematics-11.2.0" + sources."@angular-devkit/architect-0.1102.1" + sources."@angular-devkit/core-11.2.1" + sources."@angular-devkit/schematics-11.2.1" sources."@npmcli/ci-detect-1.3.0" (sources."@npmcli/git-2.0.6" // { dependencies = [ @@ -61634,8 +61949,8 @@ in sources."read-package-json-fast-2.0.1" ]; }) - sources."@schematics/angular-11.2.0" - sources."@schematics/update-0.1102.0" + sources."@schematics/angular-11.2.1" + sources."@schematics/update-0.1102.1" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -61771,8 +62086,8 @@ in sources."promise-retry-2.0.1" ]; }) - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minipass-3.1.3" @@ -62125,8 +62440,8 @@ in sources."map-obj-4.1.0" sources."marky-1.2.1" sources."matcher-2.1.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimatch-all-1.1.0" @@ -62341,8 +62656,8 @@ in sources."lodash.sortby-4.7.0" sources."lowdb-1.0.0" sources."lunr-2.3.3" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-1.2.0" sources."ms-2.1.2" sources."mute-stream-0.0.7" @@ -62422,15 +62737,15 @@ in "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; - version = "7.5.4"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.5.4.tgz"; - sha512 = "qKdniSA7NXO/5HqSxGaalMS7roIJXeT4yXTadBQ47Qv68DHh/0jfCcTzH6hqCuyRV7DV2k0bxob+rq4peMaZBw=="; + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.5.5.tgz"; + sha512 = "j45givEQQxMwZA4z78XQyYwNrLoe3PHtTRZsneRIWmgSNJ6t0Lfv9MGbNTot0hQ6LYLiEPnvWTpgg2tkKrwUmA=="; }; dependencies = [ - sources."@angular-devkit/core-11.0.3" - sources."@angular-devkit/schematics-11.0.3" - sources."@angular-devkit/schematics-cli-0.1100.3" + sources."@angular-devkit/core-11.2.0" + sources."@angular-devkit/schematics-11.2.0" + sources."@angular-devkit/schematics-cli-0.1102.0" sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" (sources."@babel/highlight-7.12.13" // { @@ -62451,7 +62766,7 @@ in sources."ora-5.2.0" ]; }) - sources."@schematics/schematics-0.1100.3" + sources."@schematics/schematics-0.1102.0" sources."@types/anymatch-1.3.1" sources."@types/eslint-7.2.6" sources."@types/eslint-scope-3.7.0" @@ -62467,30 +62782,30 @@ in sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.25" // { + (sources."@types/webpack-4.41.26" // { dependencies = [ sources."source-map-0.6.1" ]; }) sources."@types/webpack-sources-2.1.0" - sources."@webassemblyjs/ast-1.9.0" - sources."@webassemblyjs/floating-point-hex-parser-1.9.0" - sources."@webassemblyjs/helper-api-error-1.9.0" - sources."@webassemblyjs/helper-buffer-1.9.0" - sources."@webassemblyjs/helper-code-frame-1.9.0" - sources."@webassemblyjs/helper-fsm-1.9.0" - sources."@webassemblyjs/helper-module-context-1.9.0" - sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" - sources."@webassemblyjs/helper-wasm-section-1.9.0" - sources."@webassemblyjs/ieee754-1.9.0" - sources."@webassemblyjs/leb128-1.9.0" - sources."@webassemblyjs/utf8-1.9.0" - sources."@webassemblyjs/wasm-edit-1.9.0" - sources."@webassemblyjs/wasm-gen-1.9.0" - sources."@webassemblyjs/wasm-opt-1.9.0" - sources."@webassemblyjs/wasm-parser-1.9.0" - sources."@webassemblyjs/wast-parser-1.9.0" - sources."@webassemblyjs/wast-printer-1.9.0" + sources."@webassemblyjs/ast-1.9.1" + sources."@webassemblyjs/floating-point-hex-parser-1.9.1" + sources."@webassemblyjs/helper-api-error-1.9.1" + sources."@webassemblyjs/helper-buffer-1.9.1" + sources."@webassemblyjs/helper-code-frame-1.9.1" + sources."@webassemblyjs/helper-fsm-1.9.1" + sources."@webassemblyjs/helper-module-context-1.9.1" + sources."@webassemblyjs/helper-wasm-bytecode-1.9.1" + sources."@webassemblyjs/helper-wasm-section-1.9.1" + sources."@webassemblyjs/ieee754-1.9.1" + sources."@webassemblyjs/leb128-1.9.1" + sources."@webassemblyjs/utf8-1.9.1" + sources."@webassemblyjs/wasm-edit-1.9.1" + sources."@webassemblyjs/wasm-gen-1.9.1" + sources."@webassemblyjs/wasm-opt-1.9.1" + sources."@webassemblyjs/wasm-parser-1.9.1" + sources."@webassemblyjs/wast-parser-1.9.1" + sources."@webassemblyjs/wast-printer-1.9.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-8.0.5" @@ -62515,7 +62830,7 @@ in sources."caniuse-lite-1.0.30001187" sources."chalk-3.0.0" sources."chardet-0.7.0" - sources."chokidar-3.4.3" + sources."chokidar-3.5.1" sources."chrome-trace-event-1.0.2" sources."cli-cursor-3.1.0" sources."cli-spinners-2.5.0" @@ -62533,7 +62848,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.664" + sources."electron-to-chromium-1.3.667" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-4.5.0" @@ -62555,8 +62870,8 @@ in sources."fast-json-stable-stringify-2.1.0" sources."figures-3.2.0" sources."fill-range-7.0.1" - sources."find-up-4.1.0" - (sources."fork-ts-checker-webpack-plugin-6.0.5" // { + sources."find-up-5.0.0" + (sources."fork-ts-checker-webpack-plugin-6.1.0" // { dependencies = [ sources."chalk-4.1.0" ]; @@ -62564,7 +62879,7 @@ in sources."fs-extra-9.1.0" sources."fs-monkey-1.0.1" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."get-stream-5.2.0" sources."glob-7.1.6" @@ -62607,7 +62922,7 @@ in sources."jsonfile-6.1.0" sources."lines-and-columns-1.1.6" sources."loader-runner-4.2.0" - sources."locate-path-5.0.0" + sources."locate-path-6.0.0" sources."lodash-4.17.20" sources."lodash.toarray-4.4.0" (sources."log-symbols-4.0.0" // { @@ -62627,8 +62942,8 @@ in ]; }) sources."merge-stream-2.0.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -62641,16 +62956,15 @@ in sources."object-assign-4.1.1" sources."once-1.4.0" sources."onetime-5.1.2" - (sources."ora-5.1.0" // { + (sources."ora-5.3.0" // { dependencies = [ sources."chalk-4.1.0" ]; }) sources."os-name-4.0.0" sources."os-tmpdir-1.0.2" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" sources."parent-module-1.0.1" sources."parse-json-5.2.0" sources."path-exists-4.0.0" @@ -62659,7 +62973,7 @@ in sources."path-parse-1.0.6" sources."path-type-4.0.0" sources."picomatch-2.2.2" - sources."pkg-dir-4.2.0" + sources."pkg-dir-5.0.0" sources."pluralize-8.0.0" sources."process-nextick-args-2.0.1" sources."prr-1.0.1" @@ -62703,7 +63017,7 @@ in sources."strip-bom-3.0.0" sources."strip-final-newline-2.0.0" sources."supports-color-7.2.0" - sources."symbol-observable-2.0.3" + sources."symbol-observable-3.0.0" sources."tapable-1.1.3" (sources."terser-5.6.0" // { dependencies = [ @@ -62712,7 +63026,6 @@ in }) (sources."terser-webpack-plugin-5.1.1" // { dependencies = [ - sources."p-limit-3.1.0" sources."schema-utils-3.0.0" sources."source-map-0.6.1" ]; @@ -62734,13 +63047,13 @@ in }) sources."tslib-1.14.1" sources."type-fest-0.11.0" - sources."typescript-4.0.5" + sources."typescript-4.1.5" sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."watchpack-2.1.1" sources."wcwidth-1.0.1" - (sources."webpack-5.9.0" // { + (sources."webpack-5.11.0" // { dependencies = [ sources."enhanced-resolve-5.7.0" sources."schema-utils-3.0.0" @@ -63157,7 +63470,7 @@ in sources."@types/node-14.14.28" (sources."@types/node-fetch-2.5.7" // { dependencies = [ - sources."form-data-3.0.0" + sources."form-data-3.0.1" ]; }) sources."@types/normalize-package-data-2.4.0" @@ -63564,7 +63877,7 @@ in sources."crypto-random-string-1.0.0" sources."cssesc-3.0.0" sources."cssfilter-0.0.10" - sources."csstype-2.6.14" + sources."csstype-2.6.15" sources."csv-parser-1.12.1" sources."dashdash-1.14.1" sources."date-fns-1.30.1" @@ -63639,7 +63952,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.664" + sources."electron-to-chromium-1.3.667" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -63732,7 +64045,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.144.0" + sources."flow-parser-0.145.0" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -64099,8 +64412,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.2" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -65216,8 +65529,8 @@ in sources."levn-0.3.0" sources."lodash-4.17.20" sources."lodash.sortby-4.7.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimatch-3.0.4" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" @@ -65908,8 +66221,8 @@ in sources."merkle-lib-2.0.10" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" @@ -66314,8 +66627,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -66737,7 +67050,7 @@ in }; dependencies = [ sources."@jsii/spec-1.21.0" - sources."@skorfmann/terraform-cloud-1.7.1" + sources."@skorfmann/terraform-cloud-1.9.0" sources."@types/archiver-5.1.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" @@ -66794,7 +67107,7 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.0.2" sources."concat-map-0.0.1" - sources."constructs-3.3.21" + sources."constructs-3.3.27" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" sources."crc32-stream-4.0.2" @@ -66975,7 +67288,7 @@ in sources."once-1.4.0" sources."onetime-5.1.2" sources."oo-ascii-tree-1.21.0" - sources."open-7.4.1" + sources."open-7.4.2" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -67076,15 +67389,15 @@ in clean-css-cli = nodeEnv.buildNodePackage { name = "clean-css-cli"; packageName = "clean-css-cli"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.1.0.tgz"; - sha512 = "aIN3BzIYl53O6iyR1CliCcgCw0A8y5a/1U4K4KlFMtGlrP04cHFZWPbU8g93ACSGP4lgfI+FBqA0jo0PsSDGoQ=="; + url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.2.0.tgz"; + sha512 = "c7TQ+Lq8azYtThXtWlf0m9Iw66wBLQ0LPUJIEKHWTn8HB2tQlbqY6BMoKdgW4NJVZOYquwQrrRszTqH8NjHgTg=="; }; dependencies = [ sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."clean-css-5.0.1" + sources."clean-css-5.1.0" sources."commander-7.1.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" @@ -67172,7 +67485,7 @@ in sources."universal-url-2.0.0" sources."utile-0.3.0" sources."webidl-conversions-4.0.2" - sources."whatwg-fetch-3.5.0" + sources."whatwg-fetch-3.6.0" sources."whatwg-url-7.1.0" (sources."winston-2.4.5" // { dependencies = [ @@ -67440,10 +67753,10 @@ in coc-markdownlint = nodeEnv.buildNodePackage { name = "coc-markdownlint"; packageName = "coc-markdownlint"; - version = "1.10.1"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.10.1.tgz"; - sha512 = "nYuGmxppC3+16kN7128HxrzDWAPGrC5KdP4XQQHoKeOAApLTphF9rH/gfWjUale+Roq8YDe0rEJBLc3DUdIebg=="; + url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.11.1.tgz"; + sha512 = "9tUMyH60l/jD8ebENGZfqlfkLrdZvavEc9UhX9E1c7+rwH5oaiCODYYh8Ffz1FyV+ZYQS2StQO1zmgDrqZhV7g=="; }; buildInputs = globalBuildInputs; meta = { @@ -67833,7 +68146,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.664" + sources."electron-to-chromium-1.3.667" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -68674,10 +68987,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.32.0"; + version = "0.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.32.0.tgz"; - sha512 = "AwUqoPFeetwDcCe6BpCRMsW+/VtPJ/I/wJA/3ycArSx2mYy+P2IBfBW62NERmw9RNopUbHQKjr6JBTXbl9T/uA=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.33.0.tgz"; + sha512 = "0KXO4O25iL5Cl+E5Tn7QCDh4FbeyGtQKP4VpKp6tP3gQyO8X4W5AN3RSj5RHHeV8TIT0EMoI26FRVQ2MiALmGg=="; }; buildInputs = globalBuildInputs; meta = { @@ -68783,7 +69096,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.3" - sources."ajv-7.1.0" + sources."ajv-7.1.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -68836,7 +69149,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.664" + sources."electron-to-chromium-1.3.667" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -69353,7 +69666,7 @@ in sources."supports-color-5.5.0" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.1.0" + sources."ajv-7.1.1" sources."json-schema-traverse-1.0.0" ]; }) @@ -70013,8 +70326,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.2" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -70062,7 +70375,7 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-7.4.1" + sources."open-7.4.2" sources."os-homedir-1.0.2" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -70187,7 +70500,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."systeminformation-4.34.11" + sources."systeminformation-4.34.13" sources."tar-6.1.0" sources."term-size-2.2.1" sources."through-2.3.8" @@ -70693,7 +71006,7 @@ in sources."event-emitter-0.3.5" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.2.0" + sources."type-2.3.0" ]; }) sources."extend-3.0.2" @@ -70726,8 +71039,8 @@ in sources."lru-cache-4.1.5" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-1.2.0" sources."minimist-1.2.5" sources."ms-2.1.3" @@ -71277,9 +71590,9 @@ in sources."menu-string-1.3.0" sources."merkle-tree-stream-3.0.3" sources."micromatch-3.1.10" - sources."mime-2.5.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-2.5.2" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-response-2.1.0" sources."min-document-2.19.0" sources."minimatch-3.0.4" @@ -71798,8 +72111,8 @@ in sources."lodash.uniq-4.5.0" sources."lossless-json-1.0.4" sources."method-missing-1.2.4" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimist-1.2.5" sources."oauth-sign-0.9.0" sources."p-finally-1.0.0" @@ -72253,7 +72566,7 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.13" - sources."@fluentui/react-7.160.1" + sources."@fluentui/react-7.160.3" sources."@fluentui/react-focus-7.17.4" sources."@fluentui/react-window-provider-1.0.1" sources."@fluentui/theme-1.7.3" @@ -72777,7 +73090,7 @@ in sources."express-openapi-7.0.1" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.2.0" + sources."type-2.3.0" ]; }) sources."extend-3.0.2" @@ -73041,7 +73354,7 @@ in ]; }) sources."jsprim-1.4.1" - sources."just-debounce-1.0.0" + sources."just-debounce-1.1.0" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."last-run-1.1.1" @@ -73124,8 +73437,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -73290,7 +73603,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.160.1" + sources."office-ui-fabric-react-7.160.3" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -74053,7 +74366,7 @@ in sources."supports-color-5.5.0" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.1.0" + sources."ajv-7.1.1" sources."json-schema-traverse-1.0.0" ]; }) @@ -74213,7 +74526,7 @@ in sources."supports-color-8.1.1" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.1.0" + sources."ajv-7.1.1" sources."json-schema-traverse-1.0.0" ]; }) @@ -74846,7 +75159,7 @@ in sources."chokidar-3.5.1" sources."chownr-2.0.0" sources."chrome-trace-event-1.0.2" - sources."ci-info-1.6.0" + sources."ci-info-3.1.1" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ @@ -75110,7 +75423,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.664" + sources."electron-to-chromium-1.3.667" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" @@ -75621,9 +75934,9 @@ in sources."bn.js-4.11.9" ]; }) - sources."mime-2.5.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-2.5.2" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."min-document-2.19.0" @@ -76075,7 +76388,7 @@ in sources."q-1.5.1" sources."qrcode-terminal-0.11.0" sources."qs-6.5.2" - sources."querystring-0.2.0" + sources."querystring-0.2.1" sources."querystring-es3-0.2.1" sources."querystringify-2.2.0" sources."queue-microtask-1.2.2" @@ -76107,7 +76420,7 @@ in sources."is-wsl-2.2.0" sources."loader-utils-2.0.0" sources."locate-path-5.0.0" - sources."open-7.4.1" + sources."open-7.4.2" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."path-key-3.1.1" @@ -76358,7 +76671,7 @@ in ]; }) sources."statuses-1.4.0" - sources."std-env-2.2.1" + sources."std-env-2.3.0" sources."stream-browserify-2.0.2" sources."stream-buffers-2.2.0" sources."stream-each-1.2.3" @@ -76530,6 +76843,7 @@ in (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" + sources."querystring-0.2.0" ]; }) sources."url-join-4.0.0" @@ -76542,7 +76856,7 @@ in sources."schema-utils-3.0.0" ]; }) - sources."url-parse-1.4.7" + sources."url-parse-1.5.1" (sources."url-parse-lax-3.0.0" // { dependencies = [ sources."prepend-http-2.0.0" @@ -76919,8 +77233,8 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-1.2.0" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -77354,8 +77668,8 @@ in sources."map-visit-1.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.2" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" (sources."mixin-deep-1.3.2" // { @@ -77571,10 +77885,10 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "9.3.0"; + version = "9.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.3.0.tgz"; - sha512 = "tLg1GKpf8Jxlgqq3JttWTOHsOKIyNpro0Ic5sOabmxd1XSeXdK0XW3r3INASoSpy1SYPQn5EEyR1Vs/a0gCu2w=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.4.0.tgz"; + sha512 = "qqiNUiMb60GNIz/d8lv4eCSzBU/0AjcdnwWfGsOlGgeWRks9SeuWXvXt6JF7bn/7t15+z41Q7S4avsIRhAHD1Q=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-9.0.7" @@ -77588,7 +77902,7 @@ in sources."google-auth-library-7.0.2" ]; }) - (sources."@grpc/grpc-js-1.2.7" // { + (sources."@grpc/grpc-js-1.2.8" // { dependencies = [ sources."semver-6.3.0" ]; @@ -77618,8 +77932,12 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" + sources."@types/archiver-5.1.0" sources."@types/duplexify-3.6.0" + sources."@types/filesize-5.0.0" + sources."@types/glob-7.1.3" sources."@types/long-4.0.1" + sources."@types/minimatch-3.0.3" sources."@types/node-14.14.28" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" @@ -77642,7 +77960,7 @@ in sources."ansicolors-0.3.2" sources."anymatch-3.1.1" sources."aproba-1.2.0" - sources."archiver-3.1.1" + sources."archiver-5.2.0" (sources."archiver-utils-2.1.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -77664,7 +77982,7 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."ast-types-0.13.4" - sources."async-2.6.3" + sources."async-3.2.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" @@ -77743,13 +78061,7 @@ in sources."combined-stream-1.0.8" sources."commander-4.1.1" sources."compare-semver-1.1.0" - (sources."compress-commons-2.1.1" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."compress-commons-4.0.2" sources."compressible-2.0.18" (sources."compression-1.7.4" // { dependencies = [ @@ -77777,8 +78089,8 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" - sources."crc-3.8.0" - sources."crc32-stream-3.0.1" + sources."crc-32-1.2.0" + sources."crc32-stream-4.0.2" (sources."cross-env-5.2.1" // { dependencies = [ sources."cross-spawn-6.0.5" @@ -77850,6 +78162,7 @@ in }) sources."exegesis-express-2.0.0" sources."exit-code-1.0.2" + sources."exit-on-epipe-1.0.1" (sources."express-4.17.1" // { dependencies = [ sources."debug-2.6.9" @@ -77859,7 +78172,7 @@ in }) (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.2.0" + sources."type-2.3.0" ]; }) sources."extend-3.0.2" @@ -77878,7 +78191,7 @@ in sources."fecha-4.2.0" sources."figures-2.0.0" sources."file-uri-to-path-2.0.0" - sources."filesize-3.6.1" + sources."filesize-6.1.0" sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { dependencies = [ @@ -78100,8 +78413,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -78179,11 +78492,13 @@ in sources."plist-3.0.1" (sources."portfinder-1.0.28" // { dependencies = [ + sources."async-2.6.3" sources."debug-3.2.7" ]; }) sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" + sources."printj-1.1.2" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-breaker-5.0.0" @@ -78210,6 +78525,7 @@ in sources."rc-1.2.8" sources."re2-1.15.9" sources."readable-stream-3.6.0" + sources."readdir-glob-1.1.1" sources."readdirp-3.5.0" sources."redeyed-2.1.1" sources."registry-auth-token-4.2.1" @@ -78392,11 +78708,7 @@ in ]; }) sources."widest-line-3.1.0" - (sources."winston-3.3.3" // { - dependencies = [ - sources."async-3.2.0" - ]; - }) + sources."winston-3.3.3" (sources."winston-transport-4.4.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -78414,7 +78726,7 @@ in sources."xregexp-2.0.0" sources."xtend-4.0.2" sources."yallist-4.0.0" - sources."zip-stream-2.1.3" + sources."zip-stream-4.0.4" ]; buildInputs = globalBuildInputs; meta = { @@ -79092,6 +79404,24 @@ in bypassCache = true; reconstructLock = true; }; + ganache-cli = nodeEnv.buildNodePackage { + name = "ganache-cli"; + packageName = "ganache-cli"; + version = "6.12.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ganache-cli/-/ganache-cli-6.12.2.tgz"; + sha512 = "bnmwnJDBDsOWBUP8E/BExWf85TsdDEFelQSzihSJm9VChVO1SHp94YXLP5BlA4j/OTxp0wR4R1Tje9OHOuAJVw=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "<p align=\"center\"> <em>NOTICE</em>: <code>testrpc</code> is now <code>ganache-cli</code>. Use it just as you would <code>testrpc</code>. </p> <hr/>"; + homepage = "https://github.com/trufflesuite/ganache-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; get-graphql-schema = nodeEnv.buildNodePackage { name = "get-graphql-schema"; packageName = "get-graphql-schema"; @@ -79197,8 +79527,8 @@ in sources."lodash.get-4.4.2" sources."looper-4.0.0" sources."lrucache-1.0.3" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."moment-2.29.1" @@ -79670,7 +80000,7 @@ in sources."@graphql-cli/init-4.1.0" (sources."@graphql-tools/batch-execute-7.0.0" // { dependencies = [ - (sources."@graphql-tools/utils-7.2.5" // { + (sources."@graphql-tools/utils-7.3.0" // { dependencies = [ sources."tslib-2.1.0" ]; @@ -79679,13 +80009,13 @@ in }) (sources."@graphql-tools/delegate-7.0.10" // { dependencies = [ - sources."@graphql-tools/utils-7.2.5" + sources."@graphql-tools/utils-7.3.0" sources."tslib-2.1.0" ]; }) (sources."@graphql-tools/graphql-file-loader-6.2.7" // { dependencies = [ - sources."@graphql-tools/utils-7.2.5" + sources."@graphql-tools/utils-7.3.0" sources."tslib-2.1.0" ]; }) @@ -79696,7 +80026,7 @@ in }) (sources."@graphql-tools/json-file-loader-6.2.6" // { dependencies = [ - (sources."@graphql-tools/utils-7.2.5" // { + (sources."@graphql-tools/utils-7.3.0" // { dependencies = [ sources."tslib-2.1.0" ]; @@ -79706,19 +80036,20 @@ in sources."@graphql-tools/load-6.2.4" (sources."@graphql-tools/merge-6.2.7" // { dependencies = [ - sources."@graphql-tools/utils-7.2.5" + sources."@graphql-tools/utils-7.3.0" sources."tslib-2.1.0" ]; }) (sources."@graphql-tools/schema-7.1.3" // { dependencies = [ - sources."@graphql-tools/utils-7.2.5" + sources."@graphql-tools/utils-7.3.0" sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/url-loader-6.8.0" // { + (sources."@graphql-tools/url-loader-6.8.1" // { dependencies = [ - sources."@graphql-tools/utils-7.2.5" + sources."@graphql-tools/utils-7.3.0" + sources."form-data-4.0.0" sources."tslib-2.1.0" ]; }) @@ -79733,7 +80064,7 @@ in }) (sources."@graphql-tools/wrap-7.0.5" // { dependencies = [ - (sources."@graphql-tools/utils-7.2.5" // { + (sources."@graphql-tools/utils-7.3.0" // { dependencies = [ sources."tslib-2.1.0" ]; @@ -79901,7 +80232,7 @@ in sources."graphql-subscriptions-1.2.0" sources."graphql-type-json-0.3.2" sources."graphql-upload-11.0.0" - sources."graphql-ws-4.1.0" + sources."graphql-ws-4.1.5" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -79963,7 +80294,6 @@ in sources."isarray-2.0.5" sources."isexe-2.0.0" sources."isobject-4.0.0" - sources."isomorphic-form-data-2.0.0" sources."isomorphic-ws-4.0.1" sources."isstream-0.1.2" sources."iterall-1.3.0" @@ -80012,8 +80342,8 @@ in }) sources."merge2-1.4.1" sources."micromatch-4.0.2" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -80178,7 +80508,7 @@ in sources."universalify-1.0.0" sources."unixify-1.0.0" sources."uri-js-4.4.1" - sources."url-parse-1.4.7" + sources."url-parse-1.5.1" sources."url-parse-lax-3.0.0" sources."uuid-3.4.0" sources."valid-url-1.0.9" @@ -80195,7 +80525,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."y18n-5.0.5" sources."yallist-4.0.0" sources."yaml-1.10.0" @@ -80536,8 +80866,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimist-1.2.5" sources."ms-2.0.0" sources."negotiator-0.6.2" @@ -80709,7 +81039,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.34.11" + sources."systeminformation-4.34.13" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -80871,7 +81201,7 @@ in sources."expand-tilde-2.0.2" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.2.0" + sources."type-2.3.0" ]; }) sources."extend-3.0.2" @@ -80966,7 +81296,7 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."just-debounce-1.0.0" + sources."just-debounce-1.1.0" sources."kind-of-6.0.3" sources."last-run-1.1.1" sources."lazystream-1.0.0" @@ -81277,7 +81607,7 @@ in sources."expand-tilde-2.0.2" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.2.0" + sources."type-2.3.0" ]; }) sources."extend-3.0.2" @@ -81657,8 +81987,8 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimatch-3.0.4" sources."oauth-sign-0.9.0" sources."once-1.4.0" @@ -82119,8 +82449,8 @@ in sources."longest-1.0.1" sources."lowercase-keys-1.0.1" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.0.0" @@ -82534,9 +82864,9 @@ in sources."lru-cache-5.1.1" sources."macos-release-2.4.1" sources."methods-1.1.2" - sources."mime-2.5.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-2.5.2" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -82554,7 +82884,7 @@ in }) sources."once-1.4.0" sources."onetime-2.0.1" - sources."open-7.4.1" + sources."open-7.4.2" sources."optionator-0.8.3" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -82667,14 +82997,14 @@ in bypassCache = true; reconstructLock = true; }; - "iosevka-https://github.com/be5invis/Iosevka/archive/v4.5.0.tar.gz" = nodeEnv.buildNodePackage { + "iosevka-https://github.com/be5invis/Iosevka/archive/v5.0.2.tar.gz" = nodeEnv.buildNodePackage { name = "iosevka"; packageName = "iosevka"; - version = "4.5.0"; + version = "5.0.2"; src = fetchurl { - name = "iosevka-4.5.0.tar.gz"; - url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/v4.5.0"; - sha256 = "f6dc0160e927241c7a63f5278d6e19b1da93f23defa02486b9a3ac7bdd3bde74"; + name = "iosevka-5.0.2.tar.gz"; + url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/v5.0.2"; + sha256 = "93aada519e3014b472b3ae1e33a139bcc588618239393735ff88d9d0822d7ced"; }; dependencies = [ sources."@iarna/toml-2.2.5" @@ -82825,7 +83155,6 @@ in sources."minimatch-3.0.4" sources."mkdirp-1.0.4" sources."ms-2.0.0" - sources."object-assign-4.1.1" sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.8.3" @@ -82895,7 +83224,7 @@ in sources."ts-process-promises-1.0.2" sources."tslib-2.1.0" sources."type-check-0.3.2" - sources."typo-geom-0.11.1" + sources."typo-geom-0.11.2" sources."unicoderegexp-0.4.1" sources."universalify-2.0.0" sources."urix-0.1.0" @@ -83122,7 +83451,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.843.0" // { + (sources."aws-sdk-2.846.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -83421,7 +83750,7 @@ in sources."commander-2.20.3" ]; }) - sources."keytar-7.3.0" + sources."keytar-7.4.0" sources."khroma-1.2.0" sources."klaw-1.3.1" sources."lazyness-1.2.0" @@ -83471,8 +83800,8 @@ in sources."md5-file-4.0.0" sources."mdurl-1.0.1" sources."mermaid-8.9.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-response-2.1.0" (sources."minify-4.1.3" // { dependencies = [ @@ -83552,7 +83881,7 @@ in }) sources."omggif-1.0.10" sources."once-1.4.0" - sources."open-7.4.1" + sources."open-7.4.2" sources."optionator-0.8.3" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -83652,7 +83981,7 @@ in sources."source-map-url-0.4.1" sources."split-skip-0.0.2" sources."sprintf-js-1.1.2" - sources."sqlite3-5.0.1" + sources."sqlite3-5.0.2" sources."sshpk-1.16.1" sources."statuses-1.5.0" sources."stealthy-require-1.1.1" @@ -83703,7 +84032,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.47.0" + sources."terminal-kit-1.48.1" (sources."terser-4.8.0" // { dependencies = [ sources."commander-2.20.3" @@ -83752,7 +84081,7 @@ in sources."punycode-1.3.2" ]; }) - sources."url-parse-1.4.7" + sources."url-parse-1.5.1" sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -83868,7 +84197,7 @@ in sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; }; dependencies = [ - sources."@babel/parser-7.12.16" + sources."@babel/parser-7.12.17" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -84026,8 +84355,8 @@ in sources."lodash-4.17.20" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."ms-2.1.3" sources."native-promise-only-0.8.1" sources."path-loader-1.0.10" @@ -84185,8 +84514,8 @@ in }) sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-response-1.0.1" sources."minimist-1.2.5" (sources."morgan-1.10.0" // { @@ -84410,9 +84739,9 @@ in ]; }) sources."media-typer-0.3.0" - sources."mime-2.5.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-2.5.2" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimatch-3.0.4" sources."ms-2.0.0" sources."negotiator-0.6.2" @@ -84699,8 +85028,8 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -84952,7 +85281,7 @@ in sources."universal-user-agent-6.0.0" ]; }) - sources."@octokit/openapi-types-4.0.4" + sources."@octokit/openapi-types-5.0.0" sources."@octokit/plugin-enterprise-rest-6.0.1" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ @@ -84978,7 +85307,7 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-6.8.5" + sources."@octokit/types-6.9.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" @@ -85109,7 +85438,7 @@ in ]; }) sources."conventional-commits-filter-2.0.7" - (sources."conventional-commits-parser-3.2.0" // { + (sources."conventional-commits-parser-3.2.1" // { dependencies = [ sources."readable-stream-3.6.0" sources."through2-4.0.2" @@ -85301,6 +85630,7 @@ in sources."minimist-options-3.0.2" sources."quick-lru-1.1.0" sources."redent-2.0.0" + sources."split2-2.2.0" sources."strip-indent-2.0.0" sources."trim-newlines-2.0.0" ]; @@ -85492,8 +85822,8 @@ in }) sources."merge2-1.4.1" sources."micromatch-3.1.10" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-1.2.0" sources."min-indent-1.0.1" sources."minimatch-3.0.4" @@ -85739,7 +86069,11 @@ in sources."split-1.0.1" sources."split-on-first-1.1.0" sources."split-string-3.1.0" - sources."split2-2.2.0" + (sources."split2-3.2.2" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."ssri-6.0.1" @@ -86112,8 +86446,8 @@ in sources."map-visit-1.0.0" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mixin-deep-1.3.2" sources."morgan-1.10.0" sources."ms-2.0.0" @@ -86509,8 +86843,8 @@ in sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -86785,20 +87119,20 @@ in dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/compat-data-7.12.13" - sources."@babel/core-7.12.16" - sources."@babel/generator-7.12.15" + sources."@babel/core-7.12.17" + sources."@babel/generator-7.12.17" sources."@babel/helper-annotate-as-pure-7.12.13" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - sources."@babel/helper-compilation-targets-7.12.16" - sources."@babel/helper-create-class-features-plugin-7.12.16" - sources."@babel/helper-create-regexp-features-plugin-7.12.16" + sources."@babel/helper-compilation-targets-7.12.17" + sources."@babel/helper-create-class-features-plugin-7.12.17" + sources."@babel/helper-create-regexp-features-plugin-7.12.17" sources."@babel/helper-explode-assignable-expression-7.12.13" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" sources."@babel/helper-hoist-variables-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-member-expression-to-functions-7.12.17" sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-module-transforms-7.12.17" sources."@babel/helper-optimise-call-expression-7.12.13" sources."@babel/helper-plugin-utils-7.12.13" sources."@babel/helper-remap-async-to-generator-7.12.13" @@ -86807,19 +87141,19 @@ in sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helper-validator-option-7.12.16" + sources."@babel/helper-validator-option-7.12.17" sources."@babel/helper-wrap-function-7.12.13" - sources."@babel/helpers-7.12.13" + sources."@babel/helpers-7.12.17" (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.16" + sources."@babel/parser-7.12.17" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.12.13" sources."@babel/plugin-proposal-class-properties-7.12.13" - sources."@babel/plugin-proposal-dynamic-import-7.12.16" + sources."@babel/plugin-proposal-dynamic-import-7.12.17" sources."@babel/plugin-proposal-export-namespace-from-7.12.13" sources."@babel/plugin-proposal-json-strings-7.12.13" sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" @@ -86827,7 +87161,7 @@ in sources."@babel/plugin-proposal-numeric-separator-7.12.13" sources."@babel/plugin-proposal-object-rest-spread-7.12.13" sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" - sources."@babel/plugin-proposal-optional-chaining-7.12.16" + sources."@babel/plugin-proposal-optional-chaining-7.12.17" sources."@babel/plugin-proposal-private-methods-7.12.13" sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -86869,7 +87203,7 @@ in sources."@babel/plugin-transform-property-literals-7.12.13" sources."@babel/plugin-transform-regenerator-7.12.13" sources."@babel/plugin-transform-reserved-words-7.12.13" - sources."@babel/plugin-transform-runtime-7.12.15" + sources."@babel/plugin-transform-runtime-7.12.17" sources."@babel/plugin-transform-shorthand-properties-7.12.13" sources."@babel/plugin-transform-spread-7.12.13" sources."@babel/plugin-transform-sticky-regex-7.12.13" @@ -86877,13 +87211,13 @@ in sources."@babel/plugin-transform-typeof-symbol-7.12.13" sources."@babel/plugin-transform-unicode-escapes-7.12.13" sources."@babel/plugin-transform-unicode-regex-7.12.13" - sources."@babel/preset-env-7.12.16" + sources."@babel/preset-env-7.12.17" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.12.13" + sources."@babel/runtime-7.12.17" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.12.13" - sources."@babel/types-7.12.13" + sources."@babel/traverse-7.12.17" + sources."@babel/types-7.12.17" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -87197,7 +87531,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.664" + sources."electron-to-chromium-1.3.667" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" @@ -87466,8 +87800,8 @@ in sources."bn.js-4.11.9" ]; }) - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" @@ -88005,8 +88339,8 @@ in sources."lodash-4.17.20" sources."markdown-link-extractor-1.2.6" sources."marked-1.2.9" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."ms-2.1.3" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" @@ -88139,7 +88473,7 @@ in sources."exit-hook-1.1.1" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.2.0" + sources."type-2.3.0" ]; }) sources."extend-3.0.2" @@ -88225,8 +88559,8 @@ in sources."lodash.templatesettings-3.1.1" sources."mastodon-api-1.3.0" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -88554,7 +88888,7 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.13" - sources."@fluentui/react-7.160.1" + sources."@fluentui/react-7.160.3" sources."@fluentui/react-focus-7.17.4" sources."@fluentui/react-window-provider-1.0.1" sources."@fluentui/theme-1.7.3" @@ -88676,8 +89010,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -88694,7 +89028,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.160.1" + sources."office-ui-fabric-react-7.160.3" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -88974,8 +89308,8 @@ in sources."lodash-4.17.20" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."ms-2.1.3" sources."native-promise-only-0.8.1" sources."path-loader-1.0.10" @@ -89069,36 +89403,36 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "3.8.1"; + version = "3.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.8.1.tgz"; - sha512 = "Y55QvMXcqby71qilaB2+DDZWC8Q9EK47tngQBgXHcQguSwKogzCazI8cujCzDRx3YqkGqli5AxjcKZ8o9kA8TQ=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.8.4.tgz"; + sha512 = "LHuNVJ11NtTgDSzlFJc+AGrZTbRd61RgzXRk+LulKIYZOB20x6tYPLCfwMsHlvNUXJIhA6Mve+QEu4hB7M41Bw=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/compat-data-7.12.13" - (sources."@babel/core-7.12.16" // { + (sources."@babel/core-7.12.17" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.12.15" + sources."@babel/generator-7.12.17" sources."@babel/helper-annotate-as-pure-7.12.13" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - (sources."@babel/helper-compilation-targets-7.12.16" // { + (sources."@babel/helper-compilation-targets-7.12.17" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/helper-create-class-features-plugin-7.12.16" - sources."@babel/helper-create-regexp-features-plugin-7.12.16" + sources."@babel/helper-create-class-features-plugin-7.12.17" + sources."@babel/helper-create-regexp-features-plugin-7.12.17" sources."@babel/helper-explode-assignable-expression-7.12.13" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" sources."@babel/helper-hoist-variables-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-member-expression-to-functions-7.12.17" sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-module-transforms-7.12.17" sources."@babel/helper-optimise-call-expression-7.12.13" sources."@babel/helper-plugin-utils-7.12.13" sources."@babel/helper-remap-async-to-generator-7.12.13" @@ -89107,14 +89441,14 @@ in sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helper-validator-option-7.12.16" + sources."@babel/helper-validator-option-7.12.17" sources."@babel/helper-wrap-function-7.12.13" - sources."@babel/helpers-7.12.13" + sources."@babel/helpers-7.12.17" sources."@babel/highlight-7.12.13" - sources."@babel/parser-7.12.16" + sources."@babel/parser-7.12.17" sources."@babel/plugin-proposal-async-generator-functions-7.12.13" sources."@babel/plugin-proposal-class-properties-7.12.13" - sources."@babel/plugin-proposal-dynamic-import-7.12.16" + sources."@babel/plugin-proposal-dynamic-import-7.12.17" sources."@babel/plugin-proposal-export-namespace-from-7.12.13" sources."@babel/plugin-proposal-json-strings-7.12.13" sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" @@ -89122,7 +89456,7 @@ in sources."@babel/plugin-proposal-numeric-separator-7.12.13" sources."@babel/plugin-proposal-object-rest-spread-7.12.13" sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" - sources."@babel/plugin-proposal-optional-chaining-7.12.16" + sources."@babel/plugin-proposal-optional-chaining-7.12.17" sources."@babel/plugin-proposal-private-methods-7.12.13" sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -89169,26 +89503,26 @@ in sources."@babel/plugin-transform-typeof-symbol-7.12.13" sources."@babel/plugin-transform-unicode-escapes-7.12.13" sources."@babel/plugin-transform-unicode-regex-7.12.13" - (sources."@babel/preset-env-7.12.16" // { + (sources."@babel/preset-env-7.12.17" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.12.13" + sources."@babel/runtime-7.12.17" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.12.13" - sources."@babel/types-7.12.13" - sources."@bugsnag/browser-7.6.0" - sources."@bugsnag/core-7.6.0" + sources."@babel/traverse-7.12.17" + sources."@babel/types-7.12.17" + sources."@bugsnag/browser-7.7.0" + sources."@bugsnag/core-7.7.0" sources."@bugsnag/cuid-3.0.0" - sources."@bugsnag/js-7.6.0" - sources."@bugsnag/node-7.6.0" + sources."@bugsnag/js-7.7.0" + sources."@bugsnag/node-7.7.0" sources."@bugsnag/safe-json-stringify-6.0.0" sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-9.1.2" // { + (sources."@netlify/build-9.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -89197,12 +89531,12 @@ in sources."resolve-2.0.0-next.3" ]; }) - (sources."@netlify/cache-utils-1.0.6" // { + (sources."@netlify/cache-utils-1.0.7" // { dependencies = [ sources."locate-path-5.0.0" ]; }) - (sources."@netlify/config-4.0.1" // { + (sources."@netlify/config-4.0.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -89214,8 +89548,8 @@ in sources."locate-path-5.0.0" ]; }) - sources."@netlify/functions-utils-1.3.12" - (sources."@netlify/git-utils-1.0.7" // { + sources."@netlify/functions-utils-1.3.13" + (sources."@netlify/git-utils-1.0.8" // { dependencies = [ sources."braces-3.0.2" sources."execa-3.4.0" @@ -89226,7 +89560,7 @@ in ]; }) sources."@netlify/open-api-1.3.0" - (sources."@netlify/plugin-edge-handlers-1.11.3" // { + (sources."@netlify/plugin-edge-handlers-1.11.5" // { dependencies = [ sources."@nodelib/fs.stat-2.0.4" sources."array-union-2.1.0" @@ -89246,7 +89580,7 @@ in ]; }) sources."@netlify/plugins-list-2.2.0" - (sources."@netlify/run-utils-1.0.5" // { + (sources."@netlify/run-utils-1.0.6" // { dependencies = [ sources."execa-3.4.0" ]; @@ -89389,7 +89723,7 @@ in sources."universal-user-agent-6.0.0" ]; }) - sources."@octokit/openapi-types-4.0.4" + sources."@octokit/openapi-types-5.0.0" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ sources."@octokit/types-2.16.2" @@ -89414,7 +89748,7 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-6.8.5" + sources."@octokit/types-6.9.0" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-17.1.0" // { dependencies = [ @@ -89464,7 +89798,7 @@ in sources."accepts-1.3.7" sources."agent-base-6.0.2" sources."aggregate-error-3.1.0" - sources."ajv-7.1.0" + sources."ajv-7.1.1" (sources."ansi-align-3.0.0" // { dependencies = [ sources."emoji-regex-7.0.3" @@ -89509,7 +89843,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.843.0" // { + (sources."aws-sdk-2.846.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -89792,7 +90126,11 @@ in sources."detective-sass-3.0.1" sources."detective-scss-2.0.1" sources."detective-stylus-1.0.0" - sources."detective-typescript-5.8.0" + (sources."detective-typescript-5.8.0" // { + dependencies = [ + sources."typescript-3.9.9" + ]; + }) (sources."dir-glob-2.2.2" // { dependencies = [ sources."path-type-3.0.0" @@ -89823,7 +90161,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.664" + sources."electron-to-chromium-1.3.667" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -89834,7 +90172,7 @@ in sources."envinfo-7.7.4" sources."error-ex-1.3.2" sources."error-stack-parser-2.0.6" - sources."esbuild-0.8.46" + sources."esbuild-0.8.48" sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" @@ -89942,7 +90280,7 @@ in sources."folder-walker-3.2.0" sources."follow-redirects-1.13.2" sources."for-in-1.0.2" - sources."form-data-3.0.0" + sources."form-data-3.0.1" sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" @@ -90302,8 +90640,8 @@ in sources."micro-memoize-4.0.9" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -90339,7 +90677,7 @@ in sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" - (sources."netlify-6.1.8" // { + (sources."netlify-6.1.9" // { dependencies = [ sources."qs-6.9.6" ]; @@ -90392,7 +90730,7 @@ in sources."once-1.4.0" sources."one-time-1.0.0" sources."onetime-5.1.2" - sources."open-7.4.1" + sources."open-7.4.2" (sources."opn-5.5.0" // { dependencies = [ sources."is-wsl-1.1.0" @@ -90794,7 +91132,7 @@ in sources."type-fest-0.8.1" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-3.9.9" + sources."typescript-4.1.5" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -91009,8 +91347,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."lru-cache-6.0.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimatch-3.0.4" sources."minipass-3.1.3" sources."minizlib-2.1.2" @@ -91220,8 +91558,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -91472,7 +91810,7 @@ in sha512 = "1BXFaT7oDd5VM80O+1Lf72P9wCkYjg3CODROPRIPvcSEke6ubMo1M5GFsgh5EwGPLlTTlkuSgI+a4T3UhjAzbQ=="; }; dependencies = [ - sources."@babel/runtime-7.12.13" + sources."@babel/runtime-7.12.17" sources."@node-red/editor-api-1.2.9" sources."@node-red/editor-client-1.2.9" (sources."@node-red/nodes-1.2.9" // { @@ -91747,8 +92085,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-2.4.7" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimatch-3.0.4" sources."minimist-1.2.5" (sources."minipass-3.1.3" // { @@ -92055,8 +92393,8 @@ in sources."jsonfile-1.0.1" sources."jsprim-1.4.1" sources."lru-cache-6.0.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-3.1.3" @@ -92676,7 +93014,7 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."open-7.4.1" + sources."open-7.4.2" sources."org-regex-1.0.0" sources."os-tmpdir-1.0.2" (sources."ow-0.21.0" // { @@ -93095,8 +93433,8 @@ in sources."mem-8.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.2" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-3.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -93325,8 +93663,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.3.5" @@ -93466,29 +93804,29 @@ in dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/compat-data-7.12.13" - (sources."@babel/core-7.12.16" // { + (sources."@babel/core-7.12.17" // { dependencies = [ sources."json5-2.2.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.12.15" // { + (sources."@babel/generator-7.12.17" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-annotate-as-pure-7.12.13" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - sources."@babel/helper-compilation-targets-7.12.16" - sources."@babel/helper-create-class-features-plugin-7.12.16" - sources."@babel/helper-create-regexp-features-plugin-7.12.16" + sources."@babel/helper-compilation-targets-7.12.17" + sources."@babel/helper-create-class-features-plugin-7.12.17" + sources."@babel/helper-create-regexp-features-plugin-7.12.17" sources."@babel/helper-explode-assignable-expression-7.12.13" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" sources."@babel/helper-hoist-variables-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-member-expression-to-functions-7.12.17" sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-module-transforms-7.12.17" sources."@babel/helper-optimise-call-expression-7.12.13" sources."@babel/helper-plugin-utils-7.12.13" sources."@babel/helper-remap-async-to-generator-7.12.13" @@ -93497,14 +93835,14 @@ in sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helper-validator-option-7.12.16" + sources."@babel/helper-validator-option-7.12.17" sources."@babel/helper-wrap-function-7.12.13" - sources."@babel/helpers-7.12.13" + sources."@babel/helpers-7.12.17" sources."@babel/highlight-7.12.13" - sources."@babel/parser-7.12.16" + sources."@babel/parser-7.12.17" sources."@babel/plugin-proposal-async-generator-functions-7.12.13" sources."@babel/plugin-proposal-class-properties-7.12.13" - sources."@babel/plugin-proposal-dynamic-import-7.12.16" + sources."@babel/plugin-proposal-dynamic-import-7.12.17" sources."@babel/plugin-proposal-export-namespace-from-7.12.13" sources."@babel/plugin-proposal-json-strings-7.12.13" sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" @@ -93512,7 +93850,7 @@ in sources."@babel/plugin-proposal-numeric-separator-7.12.13" sources."@babel/plugin-proposal-object-rest-spread-7.12.13" sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" - sources."@babel/plugin-proposal-optional-chaining-7.12.16" + sources."@babel/plugin-proposal-optional-chaining-7.12.17" sources."@babel/plugin-proposal-private-methods-7.12.13" sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -93553,7 +93891,7 @@ in sources."@babel/plugin-transform-object-super-7.12.13" sources."@babel/plugin-transform-parameters-7.12.13" sources."@babel/plugin-transform-property-literals-7.12.13" - sources."@babel/plugin-transform-react-jsx-7.12.16" + sources."@babel/plugin-transform-react-jsx-7.12.17" sources."@babel/plugin-transform-regenerator-7.12.13" sources."@babel/plugin-transform-reserved-words-7.12.13" sources."@babel/plugin-transform-shorthand-properties-7.12.13" @@ -93563,12 +93901,12 @@ in sources."@babel/plugin-transform-typeof-symbol-7.12.13" sources."@babel/plugin-transform-unicode-escapes-7.12.13" sources."@babel/plugin-transform-unicode-regex-7.12.13" - sources."@babel/preset-env-7.12.16" + sources."@babel/preset-env-7.12.17" sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.12.13" + sources."@babel/runtime-7.12.17" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.12.13" - sources."@babel/types-7.12.13" + sources."@babel/traverse-7.12.17" + sources."@babel/types-7.12.17" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -93818,7 +94156,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.664" + sources."electron-to-chromium-1.3.667" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" @@ -94042,8 +94380,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-1.2.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -94584,8 +94922,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -95138,7 +95476,7 @@ in sources."magnet-uri-5.4.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-2.5.0" + sources."mime-2.5.2" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -95492,8 +95830,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -95926,7 +96264,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-4.34.11" + sources."systeminformation-4.34.13" sources."thunkify-2.1.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" @@ -96513,10 +96851,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.110"; + version = "1.1.112"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.110.tgz"; - sha512 = "zvGmwq98wRKdt7gggxkO9BfB1S5Azduefoh2IWzqsdr095ZQz0psH9wU0+VccGxLWbI4EGHNzKugw/0nLmTm2Q=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.112.tgz"; + sha512 = "/pwzJWmGo3s7gETYq9CUcPP5F4ZxFBe9u8sQpEJDHD//YFi97EQjhBkOT4M6sNEKpG8u/nyoVRK9ZlGFBHZtcQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -96719,7 +97057,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."vlq-0.2.3" - sources."whatwg-fetch-3.5.0" + sources."whatwg-fetch-3.6.0" sources."which-1.3.1" sources."which-module-2.0.0" sources."word-wrap-1.2.3" @@ -96987,8 +97325,8 @@ in sources."levn-0.3.0" sources."lodash-4.17.20" sources."lodash.sortby-4.7.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" sources."optionator-0.8.3" @@ -97054,14 +97392,14 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.10.3"; + version = "0.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.10.3.tgz"; - sha512 = "j4dwDetXrQT5sz1wl6/ZckQ0Ynl9Z+Q/De+e4Qz29dqAq0itimml55DcGRDMyIfEcyYkFgdzpusvWIAi1t/OUw=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.10.2.tgz"; + sha512 = "AQHx67+fJ+7PZUGf0Vl24XO02isSLHU7fh/OXu6wreFm6B1+xrVhcehV9um2nk63Zq9GFenjnv2GoXEyMSGc7Q=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" - (sources."@babel/generator-7.12.15" // { + (sources."@babel/generator-7.12.17" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -97073,18 +97411,17 @@ in sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/highlight-7.12.13" - sources."@babel/parser-7.12.16" - sources."@babel/runtime-7.12.13" + sources."@babel/parser-7.12.17" + sources."@babel/runtime-7.12.17" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.12.13" - sources."@babel/types-7.12.13" + sources."@babel/traverse-7.12.17" + sources."@babel/types-7.12.17" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.3" sources."@redocly/react-dropdown-aria-2.0.11" - sources."@scarf/scarf-1.1.0" sources."@types/node-13.13.42" sources."ajv-5.5.2" sources."ansi-regex-5.0.0" @@ -97245,7 +97582,7 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mobx-6.1.6" + sources."mobx-6.1.7" sources."mobx-react-7.1.0" sources."mobx-react-lite-3.2.0" sources."ms-2.1.2" @@ -97277,7 +97614,7 @@ in sources."pbkdf2-3.1.1" sources."perfect-scrollbar-1.5.0" sources."picomatch-2.2.2" - sources."polished-3.7.0" + sources."polished-3.7.1" sources."postcss-value-parser-4.1.0" sources."prismjs-1.23.0" sources."process-0.11.10" @@ -97306,7 +97643,7 @@ in ]; }) sources."readdirp-3.5.0" - sources."redoc-2.0.0-rc.49" + sources."redoc-2.0.0-rc.48" sources."reftools-1.1.8" sources."regenerator-runtime-0.13.7" sources."require-directory-2.1.1" @@ -97466,18 +97803,18 @@ in sources."@types/glob-7.1.3" sources."@types/json-schema-7.0.7" sources."@types/minimatch-3.0.3" - sources."@types/mocha-8.2.0" + sources."@types/mocha-8.2.1" sources."@types/node-12.12.70" sources."@types/node-fetch-2.5.8" sources."@types/resolve-1.17.1" sources."@types/vscode-1.53.0" - sources."@typescript-eslint/eslint-plugin-4.15.0" - sources."@typescript-eslint/experimental-utils-4.15.0" - sources."@typescript-eslint/parser-4.15.0" - sources."@typescript-eslint/scope-manager-4.15.0" - sources."@typescript-eslint/types-4.15.0" - sources."@typescript-eslint/typescript-estree-4.15.0" - sources."@typescript-eslint/visitor-keys-4.15.0" + sources."@typescript-eslint/eslint-plugin-4.15.1" + sources."@typescript-eslint/experimental-utils-4.15.1" + sources."@typescript-eslint/parser-4.15.1" + sources."@typescript-eslint/scope-manager-4.15.1" + sources."@typescript-eslint/types-4.15.1" + sources."@typescript-eslint/typescript-estree-4.15.1" + sources."@typescript-eslint/visitor-keys-4.15.1" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -97601,7 +97938,7 @@ in sources."flat-5.0.2" sources."flat-cache-3.0.4" sources."flatted-3.1.1" - sources."form-data-3.0.0" + sources."form-data-3.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" (sources."fstream-1.0.12" // { @@ -97662,8 +97999,8 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.2" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -97763,7 +98100,7 @@ in sources."supports-color-5.5.0" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.1.0" + sources."ajv-7.1.1" sources."json-schema-traverse-1.0.0" ]; }) @@ -97797,11 +98134,11 @@ in sources."semver-5.7.1" ]; }) - sources."vscode-jsonrpc-6.1.0-next.1" - sources."vscode-languageclient-7.1.0-next.1" - sources."vscode-languageserver-protocol-3.17.0-next.1" + sources."vscode-jsonrpc-6.1.0-next.2" + sources."vscode-languageclient-7.1.0-next.4" + sources."vscode-languageserver-protocol-3.17.0-next.5" sources."vscode-languageserver-types-3.17.0-next.1" - sources."vscode-test-1.5.0" + sources."vscode-test-1.5.1" sources."which-2.0.2" (sources."wide-align-1.1.3" // { dependencies = [ @@ -97917,8 +98254,8 @@ in sources."keypress-0.1.0" sources."methods-0.1.0" sources."mime-1.2.11" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mkdirp-0.3.5" sources."ms-2.1.2" sources."multiparty-2.2.0" @@ -98081,8 +98418,8 @@ in sources."isexe-2.0.0" sources."json-schema-traverse-0.4.1" sources."lru-cache-4.1.5" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."ms-2.0.0" @@ -98135,10 +98472,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.23.0"; + version = "2.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.23.0.tgz"; - sha512 = "D5RN0ywVPxL4EFfIzREx9K7vgkHlXBQQn9zTfDzlfz2WHkmKX0kW3LG89J51UYNdeKlBN1YXPIphybzZH3ujOw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.25.2.tgz"; + sha512 = "TjFQLW2Nfx3C323rIkHhuFcDyfGwe+z2TGpOYIyNWHGG8uZ1Q4AJs8jJGEhvuXzWSvXcANX8tSztloNuIaaY3Q=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -98170,7 +98507,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.6.2" // { + (sources."@serverless/components-3.7.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."js-yaml-3.14.1" @@ -98187,18 +98524,19 @@ in }) (sources."@serverless/enterprise-plugin-4.4.3" // { dependencies = [ + sources."@serverless/platform-client-3.11.1" sources."js-yaml-3.14.1" ]; }) sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-3.11.1" // { + (sources."@serverless/platform-client-4.0.0" // { dependencies = [ sources."js-yaml-3.14.1" ]; }) (sources."@serverless/platform-client-china-2.1.4" // { dependencies = [ - sources."adm-zip-0.5.2" + sources."adm-zip-0.5.3" sources."js-yaml-3.14.1" ]; }) @@ -98288,10 +98626,11 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.843.0" // { + (sources."aws-sdk-2.846.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" + sources."querystring-0.2.0" sources."uuid-3.3.2" ]; }) @@ -98717,8 +99056,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.2" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -98755,7 +99094,7 @@ in sources."once-1.4.0" sources."one-time-0.0.4" sources."onetime-5.1.2" - sources."open-7.4.1" + sources."open-7.4.2" (sources."opn-5.5.0" // { dependencies = [ sources."is-wsl-1.1.0" @@ -98811,7 +99150,7 @@ in sources."qrcode-terminal-0.12.0" sources."qs-6.5.2" sources."query-string-5.1.1" - sources."querystring-0.2.0" + sources."querystring-0.2.1" sources."queue-microtask-1.2.2" sources."quick-lru-5.1.1" sources."ramda-0.26.1" @@ -98853,7 +99192,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.34.2" // { + (sources."simple-git-2.35.0" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -98964,7 +99303,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-2.2.0" + sources."type-2.3.0" sources."type-fest-0.11.0" sources."typedarray-to-buffer-3.1.5" sources."unbzip2-stream-1.4.3" @@ -98974,6 +99313,7 @@ in (sources."url-0.10.3" // { dependencies = [ sources."punycode-1.3.2" + sources."querystring-0.2.0" ]; }) sources."url-parse-lax-3.0.0" @@ -99022,7 +99362,6 @@ in sources."yallist-4.0.0" sources."yaml-ast-parser-0.0.43" sources."yamljs-0.3.0" - sources."yargs-parser-20.2.5" sources."yauzl-2.10.0" sources."yeast-0.1.2" sources."yocto-queue-0.1.0" @@ -99163,8 +99502,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."moment-2.7.0" @@ -99676,10 +100015,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.454.0"; + version = "1.456.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.454.0.tgz"; - sha512 = "dL4jkXSSqIpTNd7O7eB8Yc0KAZMCAFUI7MpDGt+pzajuwiE/5ygW45LDxImeWXMdtJvVayLbvhyBNNMWkiY2zA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.456.0.tgz"; + sha512 = "ZcZP86DNEfny34eW626lB9FikIUmiynQuJkydf4C7Kzx1szrmQhSGaXkRohBGXBhapzildNauhVX7327aTGk8Q=="; }; dependencies = [ sources."@open-policy-agent/opa-wasm-1.2.0" @@ -100008,7 +100347,7 @@ in sources."object-hash-2.1.1" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-7.4.1" + sources."open-7.4.2" sources."optionator-0.8.3" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -100140,7 +100479,7 @@ in sources."tslib-1.11.1" ]; }) - (sources."snyk-poetry-lockfile-parser-1.1.5" // { + (sources."snyk-poetry-lockfile-parser-1.1.6" // { dependencies = [ sources."tslib-2.1.0" ]; @@ -100309,8 +100648,8 @@ in sources."debug-4.3.2" sources."engine.io-4.1.1" sources."engine.io-parser-4.0.2" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."ms-2.1.2" sources."negotiator-0.6.2" sources."object-assign-4.1.1" @@ -100537,7 +100876,7 @@ in sources."array-unique-0.2.1" sources."arrify-1.0.1" sources."assign-symbols-1.0.0" - (sources."async-append-only-log-3.0.3" // { + (sources."async-append-only-log-3.0.4" // { dependencies = [ sources."push-stream-11.0.0" ]; @@ -100860,7 +101199,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - (sources."jitdb-2.0.7" // { + (sources."jitdb-2.1.0" // { dependencies = [ sources."mkdirp-1.0.4" sources."push-stream-11.0.0" @@ -101283,12 +101622,15 @@ in sources."ssb-client-4.9.0" sources."ssb-config-3.4.5" sources."ssb-db-19.2.0" - (sources."ssb-db2-1.12.0" // { + (sources."ssb-db2-1.16.2" // { dependencies = [ sources."abstract-leveldown-6.2.3" - sources."flumecodec-0.0.1" + (sources."flumecodec-0.0.1" // { + dependencies = [ + sources."level-codec-6.2.0" + ]; + }) sources."level-6.0.1" - sources."level-codec-6.2.0" sources."level-js-5.0.2" sources."mkdirp-1.0.4" sources."push-stream-11.0.0" @@ -101301,7 +101643,7 @@ in ]; }) sources."ssb-ebt-5.6.7" - (sources."ssb-friends-4.4.3" // { + (sources."ssb-friends-4.4.4" // { dependencies = [ sources."flumecodec-0.0.1" sources."level-codec-6.2.0" @@ -101541,7 +101883,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.843.0" // { + (sources."aws-sdk-2.846.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -101897,8 +102239,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-2.1.0" sources."minicap-prebuilt-2.3.0" sources."minimatch-3.0.4" @@ -102316,28 +102658,28 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/core-7.12.16" - sources."@babel/generator-7.12.15" + sources."@babel/core-7.12.17" + sources."@babel/generator-7.12.17" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-member-expression-to-functions-7.12.17" sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-module-transforms-7.12.17" sources."@babel/helper-optimise-call-expression-7.12.13" sources."@babel/helper-replace-supers-7.12.13" sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helpers-7.12.13" + sources."@babel/helpers-7.12.17" (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.16" + sources."@babel/parser-7.12.17" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.12.13" - sources."@babel/types-7.12.13" + sources."@babel/traverse-7.12.17" + sources."@babel/types-7.12.17" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" @@ -102348,7 +102690,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.3" - sources."ajv-7.1.0" + sources."ajv-7.1.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -102401,7 +102743,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.664" + sources."electron-to-chromium-1.3.667" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -102632,10 +102974,10 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.12.9"; + version = "0.12.11"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.9.tgz"; - sha512 = "a1J4BTiP2uJ4LLk3/iuw4G9t2FbmTel0V8wyeuSVBPk+aZVAvt9sQ19Um0OFyUdwXWQVJn/jRTcrFYVXqE4Bgg=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.11.tgz"; + sha512 = "H+oXtowkBJj1HaCeES6aauwABXyMvDKGHxUyGA2y1mRqhqUkUzzmFnHfiKSB27nSpejB8M0xDgon0ZdUo427Kg=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" @@ -102689,7 +103031,7 @@ in sources."path-type-4.0.0" sources."picomatch-2.2.2" sources."prettier-2.2.1" - sources."prettier-plugin-svelte-2.1.4" + sources."prettier-plugin-svelte-2.1.6" sources."readdirp-3.5.0" sources."resolve-from-4.0.0" sources."source-map-0.7.3" @@ -102697,7 +103039,7 @@ in sources."supports-color-5.5.0" sources."svelte-3.32.3" sources."svelte-preprocess-4.6.9" - sources."svelte2tsx-0.1.169" + sources."svelte2tsx-0.1.171" sources."to-regex-range-5.0.1" sources."tslib-2.1.0" sources."typescript-4.1.5" @@ -102726,78 +103068,35 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "1.3.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz"; - sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="; + url = "https://registry.npmjs.org/svgo/-/svgo-2.0.1.tgz"; + sha512 = "v5Tzv3WPayd0XVnpmnRHqWqSHAabQFFjiTuA/KrBAOwMIyn6odBk1bCmygJJbw/6IJLwGznSvaNDKqNQeWJOtA=="; }; dependencies = [ - sources."@types/q-1.5.4" - sources."ansi-styles-3.2.1" - sources."argparse-1.0.10" + sources."ansi-styles-4.3.0" sources."boolbase-1.0.0" - sources."call-bind-1.0.2" - sources."chalk-2.4.2" - sources."coa-2.0.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."css-select-2.1.0" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."commander-7.1.0" + sources."css-select-3.1.2" sources."css-select-base-adapter-0.1.1" - sources."css-tree-1.0.0-alpha.37" - sources."css-what-3.4.2" - (sources."csso-4.2.0" // { - dependencies = [ - sources."css-tree-1.1.2" - sources."mdn-data-2.0.14" - ]; - }) - sources."define-properties-1.1.3" - (sources."dom-serializer-0.2.2" // { - dependencies = [ - sources."domelementtype-2.1.0" - ]; - }) - sources."domelementtype-1.3.1" - sources."domutils-1.7.0" + sources."css-tree-1.1.2" + sources."css-what-4.0.0" + sources."csso-4.2.0" + sources."dom-serializer-1.2.0" + sources."domelementtype-2.1.0" + sources."domhandler-4.0.0" + sources."domutils-2.4.4" sources."entities-2.2.0" - sources."es-abstract-1.18.0-next.2" - sources."es-to-primitive-1.2.1" - sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.1" - sources."has-1.0.3" - sources."has-flag-3.0.0" - sources."has-symbols-1.0.1" - sources."is-callable-1.2.3" - sources."is-date-object-1.0.2" - sources."is-negative-zero-2.0.1" - sources."is-regex-1.1.2" - sources."is-symbol-1.0.3" - sources."js-yaml-3.14.1" - sources."mdn-data-2.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" - sources."nth-check-1.0.2" - sources."object-inspect-1.9.0" - sources."object-keys-1.1.1" - sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.1" - sources."object.values-1.1.2" - sources."q-1.5.1" + sources."has-flag-4.0.0" + sources."mdn-data-2.0.14" + sources."nth-check-2.0.0" sources."sax-1.2.4" sources."source-map-0.6.1" - sources."sprintf-js-1.0.3" sources."stable-0.1.8" - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" - sources."supports-color-5.5.0" - sources."unquote-1.1.1" - (sources."util.promisify-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."supports-color-7.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -103137,8 +103436,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mixin-deep-1.3.2" @@ -103501,9 +103800,9 @@ in sources."jsprim-1.4.1" sources."locate-path-3.0.0" sources."long-4.0.0" - sources."mime-2.5.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-2.5.2" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimist-1.2.5" sources."module-alias-2.2.2" sources."moment-2.29.1" @@ -105218,8 +105517,8 @@ in sources."keypress-0.2.1" sources."lodash-4.17.20" sources."lru-cache-6.0.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimatch-3.0.4" (sources."node-appc-1.1.2" // { dependencies = [ @@ -105790,8 +106089,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -107298,8 +107597,8 @@ in sources."supports-color-2.0.0" ]; }) - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -108890,8 +109189,8 @@ in sources."to-regex-range-2.1.1" ]; }) - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -109324,7 +109623,7 @@ in sources."chrome-trace-event-1.0.2" sources."colorette-1.2.1" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.664" + sources."electron-to-chromium-1.3.667" sources."enhanced-resolve-5.7.0" sources."es-module-lexer-0.3.26" sources."escalade-3.1.1" @@ -109346,8 +109645,8 @@ in sources."json-schema-traverse-0.4.1" sources."loader-runner-4.2.0" sources."merge-stream-2.0.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."neo-async-2.6.2" sources."node-releases-1.1.70" sources."p-limit-3.1.0" @@ -109746,8 +110045,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -109996,7 +110295,7 @@ in sources."punycode-1.3.2" ]; }) - sources."url-parse-1.4.7" + sources."url-parse-1.5.1" sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" @@ -110005,7 +110304,7 @@ in sources."wbuf-1.7.3" (sources."webpack-dev-middleware-3.7.3" // { dependencies = [ - sources."mime-2.5.0" + sources."mime-2.5.2" ]; }) sources."webpack-log-2.0.0" @@ -110260,7 +110559,7 @@ in sources."mdns-js-packet-0.2.0" sources."mediasource-2.4.0" sources."memory-chunk-store-1.3.2" - sources."mime-2.5.0" + sources."mime-2.5.2" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -110284,7 +110583,7 @@ in sources."nodebmc-0.0.7" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."open-7.4.1" + sources."open-7.4.2" sources."package-json-versionify-1.0.4" (sources."parse-torrent-7.1.3" // { dependencies = [ @@ -110437,10 +110736,10 @@ in write-good = nodeEnv.buildNodePackage { name = "write-good"; packageName = "write-good"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/write-good/-/write-good-1.0.7.tgz"; - sha512 = "zhU9kVR9i6UBWYeYmSLa91WZYjtg8V94x8EMpByL/gTn6mW5QrD8yYTkWJC8Azx32Slq6A6NwA74R1m6Q+n9cg=="; + url = "https://registry.npmjs.org/write-good/-/write-good-1.0.8.tgz"; + sha512 = "P1Ct7+DNrOcr2JAxDZ3Q5i5sx2LSveu7iLaoUL0A+YiG0GKf0l5+9j3rwMeyh6JeTL1+HfQV1rnwEvzhNIvpFw=="; }; dependencies = [ sources."adverb-where-0.2.2" @@ -110546,7 +110845,7 @@ in sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/highlight-7.12.13" - sources."@babel/runtime-7.12.13" + sources."@babel/runtime-7.12.17" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" @@ -110988,8 +111287,8 @@ in sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-3.1.10" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index e2d2a2c5dc9f5..5c93c111040b7 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -1,10 +1,11 @@ { stdenv, lib, fetchzip, buildDunePackage, camlp5 , ppxlib, ppx_deriving, re, perl, ncurses -, version ? "1.12.0" +, version ? "1.13.0" }: with lib; let fetched = import ../../../build-support/coq/meta-fetch/default.nix {inherit lib stdenv fetchzip; } ({ + release."1.13.0".sha256 = "0dmzy058m1mkndv90byjaik6lzzfk3aaac7v84mpmkv6my23bygr"; release."1.12.0".sha256 = "1agisdnaq9wrw3r73xz14yrq3wx742i6j8i5icjagqk0ypmly2is"; release."1.11.4".sha256 = "1m0jk9swcs3jcrw5yyw5343v8mgax238cjb03s8gc4wipw1fn9f5"; releaseRev = v: "v${v}"; diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index f8124e43d7f5c..559b55fae3415 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "phpstan"; - version = "0.12.74"; + version = "0.12.76"; in mkDerivation { inherit pname version; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-zEDqswyldyXha836ye+FmE4yYxH+7AzEvlKJYOje0xQ="; + sha256 = "sha256-UYQvzWAnbaD77yDXVTui+fQEwOfOFXKLf5Bt/81mQI4="; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index eeab02fcb75e1..648cd9c203fba 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , isPy3k , fetchPypi @@ -72,5 +73,7 @@ buildPythonPackage rec { description = "A modular, fast, simple, static website and blog generator"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jluttine ]; + # all tests fail + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/PyRMVtransport/default.nix b/pkgs/development/python-modules/PyRMVtransport/default.nix index 62ea5546ed162..ca44e5a80f92f 100644 --- a/pkgs/development/python-modules/PyRMVtransport/default.nix +++ b/pkgs/development/python-modules/PyRMVtransport/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "PyRMVtransport"; - version = "0.2.10"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "cgtobi"; repo = pname; rev = "v${version}"; - sha256 = "03qrylidb1d6zw6a22d1drdf73cvfxqcqaa8qi8x4pli1axcfh5w"; + sha256 = "1y412xmdskf13673igzsqsglpdc3d5r6pbm8j85csax0blv7rn1m"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioasuswrt/default.nix b/pkgs/development/python-modules/aioasuswrt/default.nix new file mode 100644 index 0000000000000..0e25ab3581a02 --- /dev/null +++ b/pkgs/development/python-modules/aioasuswrt/default.nix @@ -0,0 +1,52 @@ +{ lib +, asyncssh +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pytest-asyncio +, pytest-mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aioasuswrt"; + version = "1.3.2"; + + src = fetchFromGitHub { + owner = "kennedyshead"; + repo = pname; + rev = "V${version}"; + sha256 = "0bzl11224vny4p9vhi1n5s9p04kfavdzs9xkq5qimbisz9sg4ysj"; + }; + + patches = [ + (fetchpatch { + # Remove pytest-runner, https://github.com/kennedyshead/aioasuswrt/pull/63 + url = "https://github.com/kennedyshead/aioasuswrt/pull/63/commits/e7923927648d5d8daccac1716db86db2a45fcb34.patch"; + sha256 = "09xzs3hjr3133li6b7lr58n090r00kaxi9hx1fms2zn0ai4xwp9d"; + }) + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-report html" "" \ + --replace "--cov-report term-missing" "" + ''; + + propagatedBuildInputs = [ asyncssh ]; + + checkInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "aioasuswrt" ]; + + meta = with lib; { + description = "Python module for Asuswrt"; + homepage = "https://github.com/kennedyshead/aioasuswrt"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index 705b7b721f8fd..82d7a8cc32af8 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , buildPythonPackage -, fetchPypi , fetchFromGitHub , fetchpatch , alembic @@ -47,10 +46,7 @@ , tzlocal , unicodecsv , zope_deprecation -, enum34 -, typing , nose -, python , pythonOlder , pythonAtLeast }: diff --git a/pkgs/development/python-modules/cozy/default.nix b/pkgs/development/python-modules/cozy/default.nix index 39f2d1227e7ca..fcd002f762d75 100644 --- a/pkgs/development/python-modules/cozy/default.nix +++ b/pkgs/development/python-modules/cozy/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, isPy3k, fetchFromGitHub, lib, - z3, ply, python-igraph, oset, ordered-set, dictionaries }: + z3, ply, python-igraph, oset, ordered-set, dictionaries, setuptools }: buildPythonPackage { pname = "cozy"; @@ -7,7 +7,7 @@ buildPythonPackage { disabled = !isPy3k; propagatedBuildInputs = [ - z3 ply python-igraph oset ordered-set dictionaries + setuptools z3 ply python-igraph oset ordered-set dictionaries ]; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/cryptography/3.3.nix b/pkgs/development/python-modules/cryptography/3.3.nix index b6972e6d56bbc..0497185207532 100644 --- a/pkgs/development/python-modules/cryptography/3.3.nix +++ b/pkgs/development/python-modules/cryptography/3.3.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "cryptography"; - version = "3.3.1"; # Also update the hash in vectors-3.3.nix + version = "3.3.2"; # Also update the hash in vectors-3.3.nix src = fetchPypi { inherit pname version; - sha256 = "1ribd1vxq9wwz564mg60dzcy699gng54admihjjkgs9dx95pw5vy"; + sha256 = "1vcvw4lkw1spiq322pm1256kail8nck6bbgpdxx3pqa905wd6q2s"; }; patches = [ ./cryptography-py27-warning.patch ]; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index ad402efd75935..eb4eba0f5879e 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "cryptography"; - version = "3.3.1"; # Also update the hash in vectors.nix + version = "3.3.2"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "1ribd1vxq9wwz564mg60dzcy699gng54admihjjkgs9dx95pw5vy"; + sha256 = "1vcvw4lkw1spiq322pm1256kail8nck6bbgpdxx3pqa905wd6q2s"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/cryptography/vectors-3.3.nix b/pkgs/development/python-modules/cryptography/vectors-3.3.nix index 94526c8268ef5..f9b7c525237ab 100644 --- a/pkgs/development/python-modules/cryptography/vectors-3.3.nix +++ b/pkgs/development/python-modules/cryptography/vectors-3.3.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "192wix3sr678x21brav5hgc6j93l7ab1kh69p2scr3fsblq9qy03"; + sha256 = "1yhaps0f3h2yjb6lmz953z1l1d84y9swk4k3gj9nqyk4vbx5m7cc"; }; # No tests included diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 94526c8268ef5..f9b7c525237ab 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "192wix3sr678x21brav5hgc6j93l7ab1kh69p2scr3fsblq9qy03"; + sha256 = "1yhaps0f3h2yjb6lmz953z1l1d84y9swk4k3gj9nqyk4vbx5m7cc"; }; # No tests included diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 1f5a2edc98954..9fdee6dacaf5a 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -4,40 +4,35 @@ , fetchPypi , cvxopt , ecos -, multiprocess , numpy , osqp , scipy , scs -, six # Check inputs , pytestCheckHook -, nose }: buildPythonPackage rec { pname = "cvxpy"; - version = "1.1.8"; + version = "1.1.10"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "444068d4eda9ffcd43578895174489d4cef36b28ba7ae8a96ab9ef9571d2b4ff"; + hash = "sha256-7NCouJ95nOolSSjeqHktnGnDfbC9gwtM2mKbKyvlInA="; }; propagatedBuildInputs = [ cvxopt ecos - multiprocess numpy osqp scipy scs - six ]; - checkInputs = [ pytestCheckHook nose ]; + checkInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "./cvxpy" ]; # Disable the slowest benchmarking tests, cuts test time in half disabledTests = [ @@ -46,7 +41,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A domain-specific language for modeling convex optimization problems in Python."; + description = "A domain-specific language for modeling convex optimization problems in Python"; homepage = "https://www.cvxpy.org/"; downloadPage = "https://github.com/cvxgrp/cvxpy/releases"; changelog = "https://github.com/cvxgrp/cvxpy/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/ddt/default.nix b/pkgs/development/python-modules/ddt/default.nix index f993c3844b850..4766d04c1f38e 100644 --- a/pkgs/development/python-modules/ddt/default.nix +++ b/pkgs/development/python-modules/ddt/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , six, pyyaml, mock , pytestCheckHook , enum34 @@ -16,6 +17,14 @@ buildPythonPackage rec { sha256 = "0595e70d074e5777771a45709e99e9d215552fb1076443a25fad6b23d8bf38da"; }; + patches = [ + # fix tests with recent PyYAML, https://github.com/datadriventests/ddt/pull/96 + (fetchpatch { + url = "https://github.com/datadriventests/ddt/commit/97f0a2315736e50f1b34a015447cd751da66ecb6.patch"; + sha256 = "1g7l5h7m7s4yqfxlygrg7nnhb9xhz1drjld64ssi3fbsmn7klf0a"; + }) + ]; + checkInputs = [ six pyyaml mock pytestCheckHook ]; propagatedBuildInputs = lib.optionals (!isPy3k) [ diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix new file mode 100644 index 0000000000000..83deaed67a083 --- /dev/null +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, stdenv +, packaging +, importlib-resources +, dbus-next +}: + +buildPythonPackage rec { + pname = "desktop-notifier"; + version = "3.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-D8/amC6SwXkm8Ao8G2Vn9FNpbqyFJFBUVcngkW5g8k0="; + }; + + propagatedBuildInputs = [ + packaging + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources + ] ++ lib.optionals stdenv.isLinux [ + dbus-next + ]; + + # no tests available, do the imports check instead + doCheck = false; + pythonImportsCheck = [ "desktop_notifier" ]; + + meta = with lib; { + homepage = "https://github.com/samschott/desktop-notifier"; + description = "A Python library for cross-platform desktop notifications"; + license = licenses.mit; + maintainers = with maintainers; [ sfrijters ]; + }; +} diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index 03b1f4fa28ee1..91832bc88ff34 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -6,7 +6,6 @@ , six # test dependencies , coverage -, flake8 , mock , nose , pycodestyle diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index 1e133df2b2bb0..06c91670f4498 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "1.8.0"; + version = "1.9.0"; pname = "Flask-Compress"; src = fetchPypi { inherit pname version; - sha256 = "c132590e7c948877a96d675c13cbfa64edec0faafa2381678dea6f36aa49a552"; + sha256 = "d93edd8fc02ae74b73c3df10a8e7ee26dee489c65dedce0b3a1d2ce05ac3d1be"; }; propagatedBuildInputs = [ flask brotli ]; diff --git a/pkgs/development/python-modules/freezegun/0.3.nix b/pkgs/development/python-modules/freezegun/0.3.nix index 09ce8bbd11b14..a83a432d89dc5 100644 --- a/pkgs/development/python-modules/freezegun/0.3.nix +++ b/pkgs/development/python-modules/freezegun/0.3.nix @@ -11,17 +11,15 @@ buildPythonPackage rec { pname = "freezegun"; - version = "0.3.5"; + version = "0.3.15"; src = fetchPypi { inherit pname version; - sha256 = "02ly89wwn0plcw8clkkzvxaw6zlpm8qyqpm9x2mfw4a0vppb4ngf"; + sha256 = "e2062f2c7f95cc276a834c22f1a17179467176b624cc6f936e8bc3be5535ad1b"; }; propagatedBuildInputs = [ dateutil six ]; checkInputs = [ mock nose pytest ]; - # contains python3 specific code - doCheck = !isPy27; meta = with lib; { description = "FreezeGun: Let your Python tests travel through time"; diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index 4c5a87e8266b2..00d03435de9df 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -2,28 +2,22 @@ , buildPythonPackage , pythonOlder , fetchPypi -, isPy27 , dateutil -, six -, mock -, nose -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "freezegun"; - version = "1.0.0"; + version = "1.1.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1cf08e441f913ff5e59b19cc065a8faa9dd1ddc442eaf0375294f344581a0643"; + sha256 = "177f9dd59861d871e27a484c3332f35a6e3f5d14626f2bf91be37891f18927f3"; }; - propagatedBuildInputs = [ dateutil six ]; - checkInputs = [ mock nose pytest ]; - # contains python3 specific code - doCheck = !isPy27; + propagatedBuildInputs = [ dateutil ]; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "FreezeGun: Let your Python tests travel through time"; diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index f3f8c96a6f447..32a56c3e95d73 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -24,7 +24,6 @@ buildPythonPackage rec { pname = "intake"; version = "0.6.0"; - disabled = pythonOlder "3.6"; src = fetchPypi { @@ -73,7 +72,7 @@ buildPythonPackage rec { "http" # broken test - "test_read_pattern_with" + "test_read_pattern" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 85f07b182d8bc..108d11853f053 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , pythonOlder , fetchPypi @@ -155,5 +156,7 @@ buildPythonPackage rec { homepage = "https://jupyter.org/"; license = licenses.bsd3; maintainers = with maintainers; [ ixxie cstrahan ]; + # E OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/python-modules/kivy-garden/default.nix b/pkgs/development/python-modules/kivy-garden/default.nix new file mode 100644 index 0000000000000..edfad0c9b91dc --- /dev/null +++ b/pkgs/development/python-modules/kivy-garden/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "kivy-garden"; + version = "0.1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wkcpr2zc1q5jb0bi7v2dgc0vs5h1y7j42mviyh764j2i0kz8mn2"; + }; + + propagatedBuildInputs = [ requests ]; + + pythonImportsCheck = [ "garden" ]; + + # There are no tests in the Pypi archive and building from source is not + # easily feasible because the build is done using buildozer and multiple + # repositories. + doCheck = false; + + meta = with lib; { + description = "The kivy garden installation script, split into its own package for convenient use in buildozer."; + homepage = "https://pypi.python.org/pypi/kivy-garden"; + license = licenses.mit; + maintainers = with maintainers; [ risson ]; + }; +} diff --git a/pkgs/development/python-modules/kivy/default.nix b/pkgs/development/python-modules/kivy/default.nix new file mode 100644 index 0000000000000..d4fa39c0c3631 --- /dev/null +++ b/pkgs/development/python-modules/kivy/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage, fetchPypi +, pkg-config, cython, docutils +, kivy-garden +, mesa, mtdev, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, gst_all_1 +, pillow, requests, pygments +}: + +buildPythonPackage rec { + pname = "Kivy"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1n0j9046vgjncy50v06r3wcg3q2l37jp8n0cznr64dz48kml8pnj"; + }; + + nativeBuildInputs = [ + pkg-config + cython + docutils + ]; + + buildInputs = [ + mesa + mtdev + SDL2 + SDL2_image + SDL2_ttf + SDL2_mixer + + # NOTE: The degree to which gstreamer actually works is unclear + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + ]; + + propagatedBuildInputs = [ + kivy-garden + pillow + pygments + requests + ]; + + KIVY_NO_CONFIG = 1; + KIVY_NO_ARGS = 1; + KIVY_NO_FILELOG = 1; + + postPatch = '' + substituteInPlace kivy/lib/mtdev.py \ + --replace "LoadLibrary('libmtdev.so.1')" "LoadLibrary('${mtdev}/lib/libmtdev.so.1')" + ''; + + /* + We cannot run tests as Kivy tries to import itself before being fully + installed. + */ + doCheck = false; + pythonImportsCheck = [ "kivy" ]; + + meta = with lib; { + description = "Library for rapid development of hardware-accelerated multitouch applications."; + homepage = "https://pypi.python.org/pypi/kivy"; + license = licenses.mit; + maintainers = with maintainers; [ risson ]; + }; +} diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 1efe01092124a..85e0fbe71397c 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "labelbox"; - version = "2.4.9"; + version = "2.4.10"; src = fetchPypi { inherit pname version; - sha256 = "488fb0b2233738c3bba3d3bf67b941f105553b7286cca3099ac0120dd247bd84"; + sha256 = "b58604ee50c54a35994e54741d9071ecfebb6d6b9b2737604a95f29c4f23d6ec"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/librouteros/default.nix b/pkgs/development/python-modules/librouteros/default.nix new file mode 100644 index 0000000000000..32c9889681ca3 --- /dev/null +++ b/pkgs/development/python-modules/librouteros/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, pytestCheckHook +, pytest-xdist +}: + +buildPythonPackage rec { + pname = "librouteros"; + version = "3.1.0"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "luqasz"; + repo = pname; + rev = version; + sha256 = "1skjwnqa3vcpq9gzgpw93wdmisq15fp0q07kzyq3fgx4yg7b6sql"; + }; + + checkInputs = [ + pytest-xdist + pytestCheckHook + ]; + + disabledTests = [ + # Disable tests which require QEMU to run + "test_login" + "test_long_word" + "test_query" + "test_add_then_remove" + "test_add_then_update" + "test_generator_ditch" + ]; + + pythonImportsCheck = [ "librouteros" ]; + + meta = with lib; { + description = "Python implementation of the MikroTik RouterOS API"; + homepage = "https://librouteros.readthedocs.io/"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index 7df182d94fed8..48d5a1e80802f 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -1,41 +1,38 @@ -{ - buildPythonPackage, - fetchFromGitHub, - pythonOlder, - lib, - requests, - future, - enum34, - mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +, pytestCheckHook +, mock +}: buildPythonPackage rec { pname = "linode-api"; - version = "4.1.8b1"; # NOTE: this is a beta, and the API may change in future versions. - - disabled = (pythonOlder "2.7"); - - propagatedBuildInputs = [ requests future ] - ++ lib.optionals (pythonOlder "3.4") [ enum34 ]; - - postPatch = (lib.optionalString (!pythonOlder "3.4") '' - sed -i -e '/"enum34",/d' setup.py - ''); - - doCheck = true; - checkInputs = [ mock ]; + version = "5.0.0"; + disabled = pythonOlder "3.6"; # Sources from Pypi exclude test fixtures src = fetchFromGitHub { - rev = "v${version}"; owner = "linode"; repo = "python-linode-api"; - sha256 = "0qfqn92fr876dncwbkf2vhm90hnf7lwpg80hzwyzyzwz1hcngvjg"; + rev = version; + sha256 = "0lqi15vks4fxbki1l7n1bfzygjy3w17d9wchjxvp22ijmas44yai"; }; - meta = { + propagatedBuildInputs = [ requests ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "linode_api4" ]; + + meta = with lib; { + description = "Python library for the Linode API v4"; homepage = "https://github.com/linode/python-linode-api"; - description = "The official python library for the Linode API v4 in python."; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ glenns ]; + license = licenses.bsd3; + maintainers = with maintainers; [ glenns ]; }; } diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 990545e41736d..cc9c35bcb920f 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -1,30 +1,29 @@ -{ lib, stdenv +{ lib , buildPythonPackage , fetchFromGitHub , pythonOlder , python -, alembic, bugsnag, click, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, sqlalchemy, survey, watchdog +, alembic, click, desktop-notifier, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, sqlalchemy, survey, watchdog , importlib-metadata , importlib-resources -, dbus-next }: buildPythonPackage rec { pname = "maestral"; - version = "1.3.1"; + version = "1.4.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "v${version}"; - sha256 = "sha256-SspyTdmAbbmWN3AqVp9bj/QfAKLVgU2bLiiHjZO0aCM="; + sha256 = "sha256-ibAYuaPSty275/aQ0DibyWe2LjPoEpdWgElTnR+MEs8="; }; propagatedBuildInputs = [ alembic - bugsnag click + desktop-notifier dropbox fasteners keyring @@ -42,8 +41,6 @@ buildPythonPackage rec { importlib-metadata ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources - ] ++ lib.optionals stdenv.isLinux [ - dbus-next ]; makeWrapperArgs = [ diff --git a/pkgs/development/python-modules/moinmoin/default.nix b/pkgs/development/python-modules/moinmoin/default.nix index cc00643b71ae0..b4ecf28724a46 100644 --- a/pkgs/development/python-modules/moinmoin/default.nix +++ b/pkgs/development/python-modules/moinmoin/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "moinmoin"; - version = "1.9.10"; + version = "1.9.11"; # SyntaxError in setup.py disabled = isPy3k; src = fetchurl { url = "http://static.moinmo.in/files/moin-${version}.tar.gz"; - sha256 = "0g05lnl1s8v61phi3z1g3b6lfj4g98grj9kw8nyjl246x0c489ja"; + sha256 = "sha256-Ar4x1V851P4MYlPfi0ngG3bQlWNMvRtW0YX2bh4MPPU="; }; patches = [ diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 299cfc87024ce..1c1e52b5a79d9 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { "test_filter_cmd_invalid_filter" "test_inline_merge" "test_interrogate_filter_no_repo" - "test_merge_input_strategy_inline_source_conflict" + "test_merge" ]; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index 3bd119179a452..a3143780e1c79 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.0.8"; + version = "5.1.2"; src = fetchPypi { inherit pname version; - sha256 = "f545b22138865bfbcc6b1ffe89ed5a2b8e2dc5d4fe876f2ca60d8e6f702a30f8"; + sha256 = "sha256-HSI+ZKGL+nzfLbLpuoqBgxL8KgcB0ukQtY32aAk4WlY="; }; LC_ALL="en_US.utf8"; diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 56536de8446bd..0311e783d3970 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "papermill"; - version = "2.2.2"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "1c452b1c5a9ab52b94c99d8b7705ae7173f6aa88a3d28a5d30cffba48a46f5b6"; + sha256 = "sha256-ptwZXypS9b7Y1CkszqOa8PMzgyS+r9VikPlhbJUDNiM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pillow-simd/default.nix b/pkgs/development/python-modules/pillow-simd/default.nix new file mode 100644 index 0000000000000..3aed634dfb1a1 --- /dev/null +++ b/pkgs/development/python-modules/pillow-simd/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k +, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2 +, tk, libX11, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook +}@args: + +import ../pillow/generic.nix (rec { + pname = "Pillow-SIMD"; + version = "7.0.0.post3"; + + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "uploadcare"; + repo = "pillow-simd"; + rev = "v${version}"; + sha256 = "1h832xp1bzf951hr4dmjmxqfsv28sx9lr2cq96qdz1c72k40zj1h"; + }; + + meta = with lib; { + homepage = "https://python-pillow.github.io/pillow-perf/"; + description = "The friendly PIL fork - SIMD version"; + longDescription = '' + Pillow-SIMD is "following" Pillow. Pillow-SIMD versions are 100% compatible drop-in replacements for Pillow of the same version. + + SIMD stands for "single instruction, multiple data" and its essence is in performing the same operation on multiple data points simultaneously by using multiple processing elements. Common CPU SIMD instruction sets are MMX, SSE-SSE4, AVX, AVX2, AVX512, NEON. + + Currently, Pillow-SIMD can be compiled with SSE4 (default) or AVX2 support. + ''; + license = "http://www.pythonware.com/products/pil/license.htm"; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} // args ) diff --git a/pkgs/development/python-modules/pillow/6.nix b/pkgs/development/python-modules/pillow/6.nix index 0e3fabf1fbcaa..51833edfd0b0a 100644 --- a/pkgs/development/python-modules/pillow/6.nix +++ b/pkgs/development/python-modules/pillow/6.nix @@ -1,75 +1,22 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy -, olefile -, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 -, openjpeg, libimagequant -, pytest, pytestrunner, pyroma, numpy -}: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k +, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 +, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook +}@args: -buildPythonPackage rec { +import ./generic.nix (rec { pname = "Pillow"; version = "6.2.2"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "0l5rv8jkdrb5q846v60v03mcq64yrhklidjkgwv6s1pda71g17yv"; }; - # Disable imagefont tests, because they don't work well with infinality: - # https://github.com/python-pillow/Pillow/issues/1259 - postPatch = '' - rm Tests/test_imagefont.py - ''; - - checkPhase = '' - runHook preCheck - python -m pytest -v -x -W always${lib.optionalString stdenv.isDarwin " --deselect=Tests/test_file_icns.py::TestFileIcns::test_save --deselect=Tests/test_imagegrab.py::TestImageGrab::test_grab"} - runHook postCheck - ''; - - propagatedBuildInputs = [ olefile ]; - - checkInputs = [ pytest pytestrunner pyroma numpy ]; - - buildInputs = [ - freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ] - ++ lib.optionals (isPyPy) [ tk libX11 ]; - - # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. - # NOTE: The Pillow install script will, by default, add paths like /usr/lib - # and /usr/include to the search paths. This can break things when building - # on a non-NixOS system that has some libraries installed that are not - # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't - # build Pillow with this support). We patch the `disable_platform_guessing` - # setting here, instead of passing the `--disable-platform-guessing` - # command-line option, since the command-line option doesn't work when we run - # tests. - preConfigure = let - libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; - libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; - in '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; - s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; - s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; - s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; - s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; - s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ; - s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;' - export LDFLAGS="-L${libwebp}/lib" - export CFLAGS="-I${libwebp}/include" - '' - # Remove impurities - + lib.optionalString stdenv.isDarwin '' - substituteInPlace setup.py \ - --replace '"/Library/Frameworks",' "" \ - --replace '"/System/Library/Frameworks"' "" - ''; - meta = with lib; { - homepage = "https://python-pillow.github.io/"; - description = "Fork of The Python Imaging Library (PIL)"; + homepage = "https://python-pillow.org/"; + description = "The friendly PIL fork (Python Imaging Library)"; longDescription = '' The Python Imaging Library (PIL) adds image processing capabilities to your Python interpreter. This library @@ -77,6 +24,6 @@ buildPythonPackage rec { processing and graphics capabilities. ''; license = "http://www.pythonware.com/products/pil/license.htm"; - maintainers = with maintainers; [ goibhniu prikhi ]; + maintainers = with maintainers; [ goibhniu prikhi SuperSandro2000 ]; }; -} +} // args ) diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 4084df19404b9..051e6ab8c6fd9 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -1,12 +1,9 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy -, olefile -, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 -, openjpeg, libimagequant -, pyroma, numpy, pytestCheckHook -, isPy3k -}: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k +, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 +, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook +}@args: -buildPythonPackage rec { +import ./generic.nix (rec { pname = "Pillow"; version = "8.0.1"; @@ -17,56 +14,6 @@ buildPythonPackage rec { sha256 = "11c5c6e9b02c9dac08af04f093eb5a2f84857df70a7d4a6a6ad461aca803fb9e"; }; - # Disable imagefont tests, because they don't work well with infinality: - # https://github.com/python-pillow/Pillow/issues/1259 - postPatch = '' - rm Tests/test_imagefont.py - ''; - - # Disable darwin tests which require executables: `iconutil` and `screencapture` - disabledTests = lib.optionals stdenv.isDarwin [ "test_save" "test_grab" "test_grabclipboard" ]; - - propagatedBuildInputs = [ olefile ]; - - checkInputs = [ pytestCheckHook pyroma numpy ]; - - buildInputs = [ - freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ] - ++ lib.optionals (isPyPy) [ tk libX11 ]; - - # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. - # NOTE: The Pillow install script will, by default, add paths like /usr/lib - # and /usr/include to the search paths. This can break things when building - # on a non-NixOS system that has some libraries installed that are not - # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't - # build Pillow with this support). We patch the `disable_platform_guessing` - # setting here, instead of passing the `--disable-platform-guessing` - # command-line option, since the command-line option doesn't work when we run - # tests. - preConfigure = let - libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; - libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; - in '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; - s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; - s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; - s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; - s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; - s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ; - s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;' - export LDFLAGS="-L${libwebp}/lib" - export CFLAGS="-I${libwebp}/include" - '' - # Remove impurities - + lib.optionalString stdenv.isDarwin '' - substituteInPlace setup.py \ - --replace '"/Library/Frameworks",' "" \ - --replace '"/System/Library/Frameworks"' "" - ''; - meta = with lib; { homepage = "https://python-pillow.org/"; description = "The friendly PIL fork (Python Imaging Library)"; @@ -77,6 +24,6 @@ buildPythonPackage rec { processing and graphics capabilities. ''; license = "http://www.pythonware.com/products/pil/license.htm"; - maintainers = with maintainers; [ goibhniu prikhi ]; + maintainers = with maintainers; [ goibhniu prikhi SuperSandro2000 ]; }; -} +} // args ) diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix new file mode 100644 index 0000000000000..dbf27febeb9d6 --- /dev/null +++ b/pkgs/development/python-modules/pillow/generic.nix @@ -0,0 +1,73 @@ +{ pname +, version +, disabled +, src +, meta +, ... +}@args: + +with args; + +buildPythonPackage rec { + inherit pname version src meta; + + # Disable imagefont tests, because they don't work well with infinality: + # https://github.com/python-pillow/Pillow/issues/1259 + postPatch = '' + rm Tests/test_imagefont.py + ''; + + # Disable darwin tests which require executables: `iconutil` and `screencapture` + disabledTests = lib.optionals stdenv.isDarwin [ + "test_grab" + "test_grabclipboard" + "test_save" + + # pillow-simd + "test_roundtrip" + "test_basic" + ]; + + propagatedBuildInputs = [ olefile ]; + + checkInputs = [ pytestCheckHook pyroma numpy ]; + + buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ] + ++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ] + ++ lib.optionals (isPyPy) [ tk libX11 ]; + + # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. + # NOTE: The Pillow install script will, by default, add paths like /usr/lib + # and /usr/include to the search paths. This can break things when building + # on a non-NixOS system that has some libraries installed that are not + # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't + # build Pillow with this support). We patch the `disable_platform_guessing` + # setting here, instead of passing the `--disable-platform-guessing` + # command-line option, since the command-line option doesn't work when we run + # tests. + preConfigure = let + libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; + libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; + in '' + sed -i "setup.py" \ + -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; + s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; + s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; + s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; + s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; + s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; + s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; + s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ; + s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;' + export LDFLAGS="$LDFLAGS -L${libwebp}/lib" + export CFLAGS="$CFLAGS -I${libwebp}/include" + '' + lib.optionalString (lib.versionAtLeast version "7.1.0") '' + export LDFLAGS="$LDFLAGS -L${libxcb}/lib" + export CFLAGS="$CFLAGS -I${libxcb.dev}/include" + '' + lib.optionalString stdenv.isDarwin '' + # Remove impurities + substituteInPlace setup.py \ + --replace '"/Library/Frameworks",' "" \ + --replace '"/System/Library/Frameworks"' "" + ''; +} diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 312c87ae54443..c51f8cb54e005 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -29,8 +29,7 @@ buildPythonPackage rec { ]; dontUseQmakeConfigure = true; - dontUseCmakeConfigure = true; - + dontWrapQtApps =true; doCheck = false; postPatch = '' diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index e94a234dc1a36..345f092a80fa3 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -34,6 +34,8 @@ buildPythonPackage rec { # no tests, just bindings for `poppler_qt5` doCheck = false; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://github.com/wbsoft/python-poppler-qt5"; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index 68d151336706a..4e9f07e2ccb8e 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -2,7 +2,7 @@ , fonttools , lxml, fs # for fonttools extras , setuptools_scm -, pytestCheckHook, pytest_5, pytestcov, pytest_xdist +, pytestCheckHook, pytestcov, pytest_xdist }: buildPythonPackage rec { @@ -30,14 +30,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ fonttools lxml fs ]; checkInputs = [ - # Override pytestCheckHook to use pytest v5, because some tests fail on pytest >= v6 - # https://github.com/adobe-type-tools/psautohint/issues/284#issuecomment-742800965 - # Override might be able to be removed in future, check package dependency pins (coverage.yml) - (pytestCheckHook.override{ pytest = pytest_5; }) + pytestCheckHook pytestcov pytest_xdist ]; disabledTests = [ + # Test that fails on pytest >= v6 + # https://github.com/adobe-type-tools/psautohint/issues/284#issuecomment-742800965 + "test_hashmap_old_version" # Slow tests, reduces test time from ~5 mins to ~30s "test_mmufo" "test_flex_ufo" diff --git a/pkgs/development/python-modules/pyeight/default.nix b/pkgs/development/python-modules/pyeight/default.nix new file mode 100644 index 0000000000000..b3a2de5ed4040 --- /dev/null +++ b/pkgs/development/python-modules/pyeight/default.nix @@ -0,0 +1,36 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, isPy3k +}: + +buildPythonPackage rec { + pname = "pyeight"; + version = "0.1.5"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "mezz64"; + repo = "pyEight"; + rev = version; + sha256 = "1wzmjqs8zx611b71ip7a0phyas96vxpq8xpnhrirfi9l09kdjgsw"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pyeight" ]; + + meta = with lib; { + description = "Python library to interface with the Eight Sleep API"; + homepage = "https://github.com/mezz64/pyEight"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/pkgs/development/python-modules/pyls-mypy/default.nix index b9cf9738ed425..eaf069c8ccb45 100644 --- a/pkgs/development/python-modules/pyls-mypy/default.nix +++ b/pkgs/development/python-modules/pyls-mypy/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 , future, python-language-server, mypy, configparser -, pytestCheckHook, mock, isPy3k, pytestcov, coverage +, pytestCheckHook, mock, pytestcov, coverage , fetchpatch }: diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 26bf5dc1c4b86..6e4b4d37f2893 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -57,6 +57,8 @@ in buildPythonPackage rec { outputs = [ "out" "dev" ]; + dontWrapQtApps = true; + nativeBuildInputs = [ pkg-config qmake diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index 42019e5a00227..367c258b5f7df 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -45,6 +45,8 @@ in buildPythonPackage rec { propagatedBuildInputs = [ pyqt5 ] ++ lib.optional (!isPy3k) enum34; + dontWrapQtApps = true; + configurePhase = '' runHook preConfigure diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index 08fd8cbfa862a..f880791eeec04 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { makeFlags = [ "QT_PLUGIN_PATH=${pysideShiboken}/lib/generatorrunner" ]; + dontWrapQtApps = true; + meta = { description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; license = lib.licenses.lgpl21; diff --git a/pkgs/development/python-modules/pyside2-tools/default.nix b/pkgs/development/python-modules/pyside2-tools/default.nix index 095a10c1047dc..20f1a572f1b49 100644 --- a/pkgs/development/python-modules/pyside2-tools/default.nix +++ b/pkgs/development/python-modules/pyside2-tools/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation { "-DBUILD_TESTS=OFF" ]; + dontWrapQtApps = true; + # The upstream build system consists of a `setup.py` whichs builds three # different python libraries and calls cmake as a subprocess. We call cmake # directly because that's easier to get working. However, the `setup.py` diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index 6986c8e5384bf..c2786b647d624 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ shiboken2 ]; + dontWrapQtApps = true; + meta = with lib; { description = "LGPL-licensed Python bindings for Qt"; license = licenses.lgpl21; diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index 89200f519e76a..855e1fb470c2d 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -2,7 +2,9 @@ , buildPythonPackage , fetchPypi , setuptools_scm +, py , pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -14,19 +16,16 @@ buildPythonPackage rec { sha256 = "6aa9ac7e00ad1a539c41bec6d21011332de671e938c7637378ec9710204e37ca"; }; - buildInputs = [ pytest setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm ]; - # Do not function - doCheck = false; + propagatedBuildInputs = [ py pytest ]; - checkPhase = '' - py.test testing - ''; + checkInputs = [ pytestCheckHook ]; meta = { description = "Run tests in isolated forked subprocesses"; homepage = "https://github.com/pytest-dev/pytest-forked"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; }; - } diff --git a/pkgs/development/python-modules/pytest-freezegun/default.nix b/pkgs/development/python-modules/pytest-freezegun/default.nix index 424d8fde23267..e5fbb6bb07078 100644 --- a/pkgs/development/python-modules/pytest-freezegun/default.nix +++ b/pkgs/development/python-modules/pytest-freezegun/default.nix @@ -1,18 +1,21 @@ { lib , buildPythonPackage -, fetchPypi +, isPy27 +, fetchFromGitHub , freezegun , pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "pytest-freezegun"; version = "0.4.2"; - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "19c82d5633751bf3ec92caa481fb5cffaac1787bd485f0df6436fd6242176949"; + src = fetchFromGitHub { + owner = "ktosiek"; + repo = "pytest-freezegun"; + rev = version; + sha256 = "10c4pbh03b4s1q8cjd75lr0fvyf9id0zmdk29566qqsmaz28npas"; }; propagatedBuildInputs = [ @@ -20,6 +23,10 @@ buildPythonPackage rec { pytest ]; + checkInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Wrap tests with fixtures in freeze_time"; homepage = "https://github.com/ktosiek/pytest-freezegun"; diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index 30e43c17c9195..94feb1029945d 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -1,28 +1,39 @@ -{ lib, fetchPypi, buildPythonPackage, execnet, pytest_6 -, setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, setuptools_scm +, pytestCheckHook +, filelock +, execnet +, pytest +, pytest-forked +, psutil +}: buildPythonPackage rec { pname = "pytest-xdist"; - version = "2.1.0"; - disabled = !isPy3k; + version = "2.2.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0wh6pn66nncfs6ay0n863bgyriwsgppn8flx5l7551j1lbqkinc2"; + sha256 = "1d8edbb1a45e8e1f8e44b1260583107fc23f8bc8da6d18cb331ff61d41258ecf"; }; - nativeBuildInputs = [ setuptools_scm pytest_6 ]; - checkInputs = [ pytest_6 filelock ]; - propagatedBuildInputs = [ execnet pytest-forked psutil six ]; + nativeBuildInputs = [ setuptools_scm ]; + checkInputs = [ pytestCheckHook filelock ]; + propagatedBuildInputs = [ execnet pytest pytest-forked psutil ]; - # pytest6 doesn't allow for new lines - # capture_deprecated not compatible with latest pytest6 - checkPhase = '' - # Excluded tests access file system - export HOME=$TMPDIR - pytest -n $NIX_BUILD_CORES \ - -k "not (distribution_rsyncdirs_example or rsync or warning_captured_deprecated_in_pytest_6)" - ''; + # access file system + disabledTests = [ + "test_distribution_rsyncdirs_example" + "test_rsync_popen_with_path" + "test_popen_rsync_subdir" + "test_rsync_report" + "test_init_rsync_roots" + "test_rsyncignore" + ]; meta = with lib; { description = "py.test xdist plugin for distributed testing and loop-on-failing modes"; diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix index 771ae4d13281e..226fdbc715e6b 100644 --- a/pkgs/development/python-modules/pytile/default.nix +++ b/pkgs/development/python-modules/pytile/default.nix @@ -1,6 +1,5 @@ { lib , aiohttp -, async-timeout , aresponses , buildPythonPackage , fetchFromGitHub diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index 0351840b3e0bf..dab8f479c04e3 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytz"; - version = "2020.4"; + version = "2020.5"; src = fetchPypi { inherit pname version; - sha256 = "3e6b7dd2d1e0a59084bcee14a17af60c5c562cdc16d828e8eba2e683d3a7e268"; + sha256 = "180befebb1927b16f6b57101720075a984c019ac16b1b7575673bea42c6c3da5"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix index 95ceeab3a04b9..93cfad78d50e8 100644 --- a/pkgs/development/python-modules/pyyaml/default.nix +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -2,18 +2,13 @@ buildPythonPackage rec { pname = "PyYAML"; - version = "5.3.1"; + version = "5.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0pb4zvkfxfijkpgd1b86xjsqql97ssf1knbd1v53wkg1qm9cgsmq"; + sha256 = "607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"; }; - # force regeneration using Cython - postPatch = '' - rm ext/_yaml.c - ''; - nativeBuildInputs = [ cython buildPackages.stdenv.cc ]; buildInputs = [ libyaml ]; diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix index 2ee9c82f08db7..dcbe213966f95 100644 --- a/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -14,6 +14,8 @@ buildPythonPackage { buildInputs = [ qscintilla ]; propagatedBuildInputs = [ pyqt5 ]; + dontWrapQtApps = true; + postPatch = '' substituteInPlace Python/configure.py \ --replace \ diff --git a/pkgs/development/python-modules/roboschool/default.nix b/pkgs/development/python-modules/roboschool/default.nix index 3e15f18a3dd1e..97eee2155a5e1 100644 --- a/pkgs/development/python-modules/roboschool/default.nix +++ b/pkgs/development/python-modules/roboschool/default.nix @@ -44,6 +44,8 @@ buildPythonPackage rec { boost ]; + dontWrapQtApps = true; + NIX_CFLAGS_COMPILE="-I ${python}/include/${python.libPrefix}"; patches = [ diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index b7508a8f6447f..23836addd0ca9 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation { "-DBUILD_TESTS=OFF" ]; + dontWrapQtApps = true; + postInstall = '' rm $out/bin/shiboken_tool.py ''; diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 1c49e1f4a0269..3ec4246cd02cf 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.4.1"; + version = "3.5"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LJuvUTbsL2anQENEuW1oaSUsMEiXnSgLEAhZ6EP5bNs="; + sha256 = "sha256-i9SnT+DcQOcujV25bD/SNV1uRA2IgfiSWhEWlQC5TiA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/survey/default.nix b/pkgs/development/python-modules/survey/default.nix index 436127fae9c45..99a2d85aaa2b3 100644 --- a/pkgs/development/python-modules/survey/default.nix +++ b/pkgs/development/python-modules/survey/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "survey"; - version = "3.1.1"; + version = "3.4.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-R/PfXW/CnqYiOWbCxPAYwneg6j6CLvdIpITZ2eIXn+M="; + sha256 = "sha256-aF7ZS5oxeIOb7mJsrusdc3HefcPE+3OTXcJB/pjJxFY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 233101728f850..8b64bddc5a4fe 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -1,18 +1,25 @@ { buildPythonPackage -, fetchPypi -, lib -, stdenv -, pythonOlder -, isPy27 , appdirs , contextlib2 +, cython , distlib +, fetchPypi , filelock +, fish +, flaky , importlib-metadata , importlib-resources +, isPy27 +, lib , pathlib2 +, pytest-freezegun +, pytest-mock +, pytest-timeout +, pytestCheckHook +, pythonOlder , setuptools_scm , six +, stdenv }: buildPythonPackage rec { @@ -47,10 +54,37 @@ buildPythonPackage rec { ./0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch ]; - meta = { + checkInputs = [ + cython + fish + flaky + pytest-freezegun + pytest-mock + pytest-timeout + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + # Ignore tests which require network access + disabledTestFiles = [ + "tests/unit/create/test_creator.py" + "tests/unit/seed/embed/test_bootstrap_link_via_app_data.py" + ]; + + disabledTests = [ + "test_can_build_c_extensions" + "test_xonsh" # imports xonsh, which is not in pythonPackages + ]; + + pythonImportsCheck = [ "virtualenv" ]; + + meta = with lib; { description = "A tool to create isolated Python environments"; homepage = "http://www.virtualenv.org"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ goibhniu ]; + license = licenses.mit; + maintainers = with maintainers; [ goibhniu ]; }; } diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index 62c8a2a06b71a..ff4fffc821fb2 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , maturin , buildPythonPackage -, isPy38 , python }: let diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 693cfcce92603..6930be7d65a95 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "watchdog"; - version = "1.0.2"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-N2y8KjXAOSsP5/8W+8GzA/2Z1N2ZEatVge6daa3IiYI="; + sha256 = "sha256-/UtWz74NDZxPxDGs7KdXAKfxLTc33C6csuwrpkloBCU="; }; buildInputs = lib.optionals stdenv.isDarwin diff --git a/pkgs/development/python-modules/wrapio/default.nix b/pkgs/development/python-modules/wrapio/default.nix index bbbc1917f541a..3e6a4372a6424 100644 --- a/pkgs/development/python-modules/wrapio/default.nix +++ b/pkgs/development/python-modules/wrapio/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "wrapio"; - version = "0.3.8"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jGupLh+xzwil+VBtAjIG+ZYT+dy+QaZOTIfipTQeyWo"; + sha256 = "sha256-JWcPsqZy1wM6/mbU3H0W3EkpLg0wrEUUg3pT/QrL+rE="; }; doCheck = false; diff --git a/pkgs/development/python-modules/yapsy/default.nix b/pkgs/development/python-modules/yapsy/default.nix index e60b0a114731d..a6471d8f07efc 100644 --- a/pkgs/development/python-modules/yapsy/default.nix +++ b/pkgs/development/python-modules/yapsy/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi }: @@ -16,6 +17,7 @@ buildPythonPackage rec { homepage = "http://yapsy.sourceforge.net/"; description = "Yet another plugin system"; license = licenses.bsd0; + # tests fail and are not using pytest to easily disable them + broken = stdenv.isDarwin; }; - } diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 00c6fb73214bf..791ae3d0d31d8 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -201,13 +201,23 @@ in gitlab-markup = attrs: { meta.priority = 1; }; - gitlab-pg_query = attrs: lib.optionalAttrs (attrs.version == "1.3.0") { + gitlab-pg_query = attrs: lib.optionalAttrs (attrs.version == "1.3.1") { dontBuild = false; postPatch = '' - sed -i 's;"https://gitlab.com.*";"${fetchurl { - url = "https://gitlab.com/gitlab-org/libpg_query/-/archive/gitlab-10-1.0.3/libpg_query-gitlab-10-1.0.3.tar.gz"; - sha256 = "1519x4v6wrk189mjg4hlfah0f7hjy3syg8kk8b6g644gdspzs26j"; - }}";' ext/pg_query/extconf.rb + sed -i "s;'https://codeload.github.com.*';'${fetchurl { + url = "https://codeload.github.com/lfittl/libpg_query/tar.gz/10-1.0.3"; + sha256 = "0jfij8apzxsdabl70j42xgd5f3ka1gdcrk764nccp66164gpcchk"; + }}';" ext/pg_query/extconf.rb + ''; + }; + + pg_query = attrs: lib.optionalAttrs (attrs.version == "1.3.0") { + dontBuild = false; + postPatch = '' + sed -i "s;'https://codeload.github.com.*';'${fetchurl { + url = "https://codeload.github.com/lfittl/libpg_query/tar.gz/10-1.0.4"; + sha256 = "0f0kshhai0pnkqj0w4kgz3fssnvwidllc31n1fysxjjzdqlr1k48"; + }}';" ext/pg_query/extconf.rb ''; }; diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index 0ef33270e92bf..91f3f24d6f1fe 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -23,6 +23,8 @@ rustPlatform.buildRustPackage rec { git ]; + dontWrapQtApps = true; + cargoSha256 = "1hdsn011y9invfy7can8c02zwa7birj9y1rxhrj7wyv4gh3659i0"; doCheck = false; diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index a75445c363b0a..3aa37d650cb20 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.29.0"; + version = "6.30.0"; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "08iibpf9jhkk7ihsmlm85wpjwy1bvznbvggvqyw6109f9gzlrvvq"; + sha256 = "sha256-LgQmoUdsG5sAyHs9YyiaOFonMFaVtHKdp/KvSAWSy8w="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 0145e51ee2628..5e321db01aa4b 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -12,6 +12,8 @@ in stdenv.mkDerivation { nativeBuildInputs = [ qmake ]; + dontWrapQtApps = true; + postInstall = '' mkdir -p $out/bin cp -p converters/dprof2calltree $out/bin/dprof2calltree diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 5e5875cc36c47..5de894bd1b420 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -14,7 +14,7 @@ assert withQt5 -> useQt4 == false; assert useQt4 -> withQt5 == false; -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { pname = "cmake" + lib.optionalString isBootstrap "-boot" + lib.optionalString useNcurses "-cursesUI" @@ -130,4 +130,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ttuegel lnl7 ]; license = licenses.bsd3; }; -} +} // (if withQt5 then { dontWrapQtApps = true; } else {}) +) diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 3bf7623ed04c5..73c23b88752e2 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; + dontWrapQtApps = true; + qmakeFlags = [ "QBS_INSTALL_PREFIX=$(out)" "qbs.pro" ]; buildInputs = [ qtbase qtscript ]; diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix index 8cab1667b2188..5c852f215570b 100644 --- a/pkgs/development/tools/build-managers/shards/default.nix +++ b/pkgs/development/tools/build-managers/shards/default.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , crystal_0_34 -, crystal_0_35 +, crystal_0_36 }: let generic = @@ -36,17 +36,18 @@ let in rec { + # needed for anything that requires the old v1 shards format shards_0_11 = generic { version = "0.11.1"; sha256 = "05qnhc23xbmicdl4fwyxfpcvd8jq4inzh6v7jsjjw4n76vzb1f71"; crystal = crystal_0_34; }; - shards_0_12 = generic { + shards_0_13 = generic { version = "0.12.0"; sha256 = "0dginczw1gc5qlb9k4b6ldxzqz8n97jrrnjvj3mm9wcdbc9j6h3c"; - crystal = crystal_0_35; + crystal = crystal_0_36; }; - shards = shards_0_12; + shards = shards_0_13; } diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index da9261741515c..3b0a0f4022772 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "6.7.5"; + version = "7.0.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-pL8h/hsaiVveZ32ee0bUepzcS7igJGVtGuHocrC21pY="; + sha256 = "sha256-WpwMx8mPedunBKlRUDdcVA1sLWkZvuoaw6DEtvGSyAg="; }; - vendorSha256 = "sha256-IcIUYFmiVuRrZQisjWX5grOZPqovibgF5NmbG96FISI="; + vendorSha256 = "sha256-OxU+Hb8bX71SFuyAw583Z7bEu+b/j2i/fOGE5S9C91M="; doCheck = false; diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index dd9282c689612..75aa8a00f00c7 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -46,13 +46,13 @@ let installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder"; in stdenv.mkDerivation rec { pname = "flatpak-builder"; - version = "1.0.11"; + version = "1.0.12"; outputs = [ "out" "doc" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "EYNLdrvSs8S/GCYy0jGsnP1+C988y1j7WzcLfczM1Ew="; + sha256 = "sha256-R4DBuOCDj/tk6WOb14AUF5ZP2BjHxtXpr8pNVRHe0sg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index 52ccc3d915090..4425071cb1408 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.0.5"; + version = "2.0.6"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "19xf79rbilslpibi1mi31jplrgf8anpm06s6sxqh8v1qs84vkxdm"; + sha256 = "sha256-HoDV8Z024+WnECw1ZVwA3dEfbKtuTd4he40UwQnpiGQ="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index 0683b9e1265c9..a1ce9d0a69606 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/development/tools/minizinc/ide.nix @@ -20,6 +20,7 @@ mkDerivation { sourceRoot = "source/MiniZincIDE"; enableParallelBuilding = true; + dontWrapQtApps = true; postInstall = '' wrapProgram $out/bin/MiniZincIDE --prefix PATH ":" ${lib.makeBinPath [ minizinc ]} diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 4ad7f83006651..72c8c2fab91a9 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -1,47 +1,95 @@ -{ lib, stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs, argp-standalone }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, musl-fts +, musl-obstack, m4, zlib, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs +, argp-standalone }: # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { pname = "elfutils"; - version = "0.180"; + version = "0.182"; src = fetchurl { url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2"; - sha256 = "17an1f67bfzxin482nbcxdl5qvywm27i9kypjyx8ilarbkivc9xq"; + sha256 = "7MQGkU7fM18Lf8CE6+bEYMTW1Rdb/dZojBx42RRriFg="; }; - patches = [ ./debug-info-from-env.patch ]; + patches = [ + ./debug-info-from-env.patch + ./musl-cdefs_h.patch + (fetchpatch { + name = "fix-aarch64_fregs.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/elfutils/fix-aarch64_fregs.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; + sha256 = "zvncoRkQx3AwPx52ehjA2vcFroF+yDC2MQR5uS6DATs="; + }) + (fetchpatch { + name = "musl-asm-ptrace-h.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-asm-ptrace-h.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; + sha256 = "8D1wPcdgAkE/TNBOgsHaeTZYhd9l+9TrZg8d5C7kG6k="; + }) + (fetchpatch { + name = "musl-fts-obstack.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-fts-obstack.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; + sha256 = "3lbC0UtscTIJgT7kOXnnjWrpPAVt2PYMbW+uJK6K350="; + }) + (fetchpatch { + name = "musl-macros.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-macros.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; + sha256 = "tp6O1TRsTAMsFe8vw3LMENT/vAu6OmyA8+pzgThHeA8="; + }) + (fetchpatch { + name = "musl-qsort_r.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-qsort_r.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; + sha256 = "FPWCkdtFT3zw8aNnz0Jz5Vmu8B/mRfNgfhbM/ej7d8M="; + }) + (fetchpatch { + name = "musl-strerror_r.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strerror_r.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; + sha256 = "QF6YwWkcT12dZHKzfqFgxy/1fkIllo0AAosbV0sM5PU="; + }) + (fetchpatch { + name = "musl-strndupa.patch"; + url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; + sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0="; + }) + ] ++ lib.optional stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ]; hardeningDisable = [ "format" ]; # We need bzip2 in NativeInputs because otherwise we can't unpack the src, # as the host-bzip2 will be in the path. - nativeBuildInputs = [ m4 bison flex gettext bzip2 ]; + nativeBuildInputs = [ m4 bison flex gettext bzip2 ] + ++ lib.optional stdenv.hostPlatform.isMusl [ pkg-config autoreconfHook ]; buildInputs = [ zlib bzip2 xz ] - ++ lib.optional stdenv.hostPlatform.isMusl argp-standalone; + ++ lib.optional stdenv.hostPlatform.isMusl [ + argp-standalone + musl-fts + musl-obstack + ]; propagatedNativeBuildInputs = [ setupDebugInfoDirs ]; preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' - NIX_CFLAGS_COMPILE+=" -fgnu89-inline" + NIX_CFLAGS_COMPILE+=" -Wno-null-dereference" ''; - configureFlags = - [ "--program-prefix=eu-" # prevent collisions with binutils - "--enable-deterministic-archives" - "--disable-debuginfod" - ]; + configureFlags = [ + "--program-prefix=eu-" # prevent collisions with binutils + "--enable-deterministic-archives" + "--disable-libdebuginfod" + "--disable-debuginfod" + ]; enableParallelBuilding = true; doCheck = false; # fails 3 out of 174 tests doInstallCheck = false; # fails 70 out of 174 tests - meta = { + meta = with lib; { homepage = "https://sourceware.org/elfutils/"; description = "A set of utilities to handle ELF objects"; - platforms = lib.platforms.linux; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.eelco ]; + platforms = platforms.linux; + # licenses are GPL2 or LGPL3+ for libraries, GPL3+ for bins, + # but since this package isn't split that way, all three are listed. + license = with licenses; [ gpl2Only lgpl3Plus gpl3Plus ]; + maintainers = [ maintainers.eelco ]; }; } diff --git a/pkgs/development/tools/misc/elfutils/musl-cdefs_h.patch b/pkgs/development/tools/misc/elfutils/musl-cdefs_h.patch new file mode 100644 index 0000000000000..1b5bf466217b4 --- /dev/null +++ b/pkgs/development/tools/misc/elfutils/musl-cdefs_h.patch @@ -0,0 +1,15 @@ +# avoids a warning about including an internal header when +# compiling with musl-libc +diff -crb --new-file a/lib/fixedsizehash.h b/lib/fixedsizehash.h +*** a/lib/fixedsizehash.h 2020-06-11 11:37:46.000000000 -0400 +--- b/lib/fixedsizehash.h 2021-01-21 05:52:59.000000000 -0500 +*************** +*** 30,36 **** + #include <errno.h> + #include <stdlib.h> + #include <string.h> +- #include <sys/cdefs.h> + + #include <system.h> + +--- 30,35 ---- diff --git a/pkgs/development/tools/misc/elfutils/musl-error_h.patch b/pkgs/development/tools/misc/elfutils/musl-error_h.patch new file mode 100644 index 0000000000000..711928078d357 --- /dev/null +++ b/pkgs/development/tools/misc/elfutils/musl-error_h.patch @@ -0,0 +1,66 @@ +diff -crb --new-file a/lib/error.h b/lib/error.h +*** a/lib/error.h 1969-12-31 19:00:00.000000000 -0500 +--- b/lib/error.h 2021-01-21 04:38:25.000000000 -0500 +*************** +*** 0 **** +--- 1,27 ---- ++ #ifndef _ERROR_H_ ++ #define _ERROR_H_ ++ ++ #include <stdarg.h> ++ #include <stdio.h> ++ #include <stdlib.h> ++ #include <string.h> ++ #include <errno.h> ++ ++ static unsigned int error_message_count = 0; ++ ++ static inline void error(int status, int errnum, const char* format, ...) ++ { ++ va_list ap; ++ fprintf(stderr, "%s: ", program_invocation_name); ++ va_start(ap, format); ++ vfprintf(stderr, format, ap); ++ va_end(ap); ++ if (errnum) ++ fprintf(stderr, ": %s", strerror(errnum)); ++ fprintf(stderr, "\n"); ++ error_message_count++; ++ if (status) ++ exit(status); ++ } ++ ++ #endif /* _ERROR_H_ */ +diff -crb --new-file a/src/error.h b/src/error.h +*** a/src/error.h 1969-12-31 19:00:00.000000000 -0500 +--- b/src/error.h 2021-01-21 04:38:29.000000000 -0500 +*************** +*** 0 **** +--- 1,27 ---- ++ #ifndef _ERROR_H_ ++ #define _ERROR_H_ ++ ++ #include <stdarg.h> ++ #include <stdio.h> ++ #include <stdlib.h> ++ #include <string.h> ++ #include <errno.h> ++ ++ static unsigned int error_message_count = 0; ++ ++ static inline void error(int status, int errnum, const char* format, ...) ++ { ++ va_list ap; ++ fprintf(stderr, "%s: ", program_invocation_name); ++ va_start(ap, format); ++ vfprintf(stderr, format, ap); ++ va_end(ap); ++ if (errnum) ++ fprintf(stderr, ": %s", strerror(errnum)); ++ fprintf(stderr, "\n"); ++ error_message_count++; ++ if (status) ++ exit(status); ++ } ++ ++ #endif /* _ERROR_H_ */ diff --git a/pkgs/development/tools/misc/kdbg/default.nix b/pkgs/development/tools/misc/kdbg/default.nix index dad7d41c1f686..35e0a52865fae 100644 --- a/pkgs/development/tools/misc/kdbg/default.nix +++ b/pkgs/development/tools/misc/kdbg/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/kdbg --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix} ''; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://www.kdbg.org/"; description = '' diff --git a/pkgs/development/tools/misc/micronucleus/default.nix b/pkgs/development/tools/misc/micronucleus/default.nix index 2999b741888a9..2d4dba61b8726 100644 --- a/pkgs/development/tools/misc/micronucleus/default.nix +++ b/pkgs/development/tools/misc/micronucleus/default.nix @@ -1,38 +1,35 @@ -{ - pkgs -, stdenv +{ stdenv , libusb-compat-0_1 , fetchFromGitHub , lib }: stdenv.mkDerivation rec { - pname = "micronucleus"; - version = "2.04"; + pname = "micronucleus"; + version = "2.04"; - sourceRoot = "source/commandline"; + sourceRoot = "source/commandline"; - src = fetchFromGitHub { - owner = "micronucleus"; - repo = "micronucleus"; - rev = version; - sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in"; - }; + src = fetchFromGitHub { + owner = "micronucleus"; + repo = "micronucleus"; + rev = version; + sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in"; + }; - buildInputs = [ libusb-compat-0_1 ]; - makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ]; + buildInputs = [ libusb-compat-0_1 ]; + makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ]; - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/lib/udev - cp micronucleus $out/bin - cp 49-micronucleus.rules $out/lib/udev - ''; - - meta = with lib; { - description = "Upload tool for micronucleus"; - homepage = "https://github.com/micronucleus/micronucleus"; - license = licenses.gpl3; - maintainers = [ maintainers.cab404 ]; - }; + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/lib/udev + cp micronucleus $out/bin + cp 49-micronucleus.rules $out/lib/udev + ''; + meta = with lib; { + description = "Upload tool for micronucleus"; + homepage = "https://github.com/micronucleus/micronucleus"; + license = licenses.gpl3; + maintainers = [ maintainers.cab404 ]; + }; } diff --git a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix index 74309a33f22f1..a35cc57b82572 100644 --- a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix +++ b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "nxpmicro-mfgtools"; - version = "1.4.43"; + version = "1.4.72"; src = fetchFromGitHub { owner = "NXPmicro"; repo = "mfgtools"; rev = "uuu_${version}"; - sha256 = "1i1mvr6j0mc33axf6cmmsi83apr5rgq0z0sn23qav9r0izpnnh0w"; + sha256 = "1s3wlz4yb2p8by5p66vr0z72n84mxkrmda63x9yr6pinqinsyrvv"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 004e1527d352a..d1496bcdf4558 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.10"; + version = "5.11"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-/jmC6kzZrrO0ujX2J58LV3o3F10ygr4kuaVTe1a48Bw="; + sha256 = "sha256-/+NAsQwUWg+Fc0Jx6czlZFfSPyGn6lkxqzL4z055OHk="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/tools/misc/unifdef/default.nix b/pkgs/development/tools/misc/unifdef/default.nix index 53e2b2762d313..ebb034a92e72c 100644 --- a/pkgs/development/tools/misc/unifdef/default.nix +++ b/pkgs/development/tools/misc/unifdef/default.nix @@ -1,31 +1,24 @@ -{ fetchurl, lib, stdenv }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "unifdef-2.6"; + pname = "unifdef"; + version = "2.12"; src = fetchurl { - url = "https://github.com/fanf2/unifdef/archive/${name}.tar.gz"; - sha256 = "1p5wr5ms9w8kijy9h7qs1mz36dlavdj6ngz2bks588w7a20kcqxj"; + url = "https://dotat.at/prog/unifdef/unifdef-${version}.tar.xz"; + sha256 = "00647bp3m9n01ck6ilw6r24fk4mivmimamvm4hxp5p6wxh10zkj3"; }; - postUnpack = '' - substituteInPlace $sourceRoot/unifdef.c \ - --replace '#include "version.h"' "" - - substituteInPlace $sourceRoot/Makefile \ - --replace "unifdef.c: version.h" "unifdef.c:" - ''; - - preBuild = '' - unset HOME - export DESTDIR=$out - ''; + makeFlags = [ + "prefix=$(out)" + "DESTDIR=" + ]; meta = with lib; { - homepage = "http://dotat.at/prog/unifdef/"; + homepage = "https://dotat.at/prog/unifdef/"; description = "Selectively remove C preprocessor conditionals"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = [ maintainers.vrthra ]; + maintainers = with maintainers; [ orivej vrthra ]; }; } diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index bd362e8d1a45a..eea1e78d4032a 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, perl, pythonPackages, libiconv, jansson }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, coreutils, pkg-config, perl, python3Packages, libiconv, jansson }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "universal-ctags"; - version = "unstable-2019-07-30"; + version = "5.9.20201206.0"; src = fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; - rev = "920e7910146915e5cae367bc9f135ffd8b042042"; - sha256 = "14n3ix77rkhq6vq6kspmgjrmm0kg0f8cxikyqdq281sbnfq8bajn"; + rev = "p${version}"; + sha256 = "0w10zjyz46sjm6ypxmq550dkr84hvc4phm4vm9j53jp5s19x5q19"; }; - nativeBuildInputs = [ autoreconfHook pkg-config pythonPackages.docutils ]; + nativeBuildInputs = [ autoreconfHook coreutils pkg-config python3Packages.docutils ]; buildInputs = [ jansson ] ++ lib.optional stdenv.isDarwin libiconv; # to generate makefile.in @@ -25,6 +25,9 @@ stdenv.mkDerivation { # Remove source of non-determinism substituteInPlace main/options.c \ --replace "printf (\" Compiled: %s, %s\n\", __DATE__, __TIME__);" "" + + substituteInPlace Tmain/utils.sh \ + --replace /bin/echo ${coreutils}/bin/echo ''; postConfigure = '' diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index 34d6abb7273dd..2cc46d018ec97 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KxYGXwK6wF5MDY+zrSdcQqBYkSdnxOCYudTh+TwTkm8="; + sha256 = "sha256-sdTDBEdBl+IM2HB4hIrAijG4dF3OU7+CjPpGWD8HQm8="; }; vendorSha256 = "sha256-GRw0u6zox2gseQhrx7n0M3WVu4+yCKZ7D/QHVcBRb30="; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 7dc50d6246a59..a39e29983cfc5 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "packer"; - version = "1.6.6"; + version = "1.7.0"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "sha256-kFDy8Zlx+D5JDyNlAmB/ICTe4K9s6KDbALP5pom5OQg="; + sha256 = "sha256-x62C44vTIysk9Lx9HZeTBf8k1+P5hfMIijvTWu3cZrA="; }; buildFlagsArray = [ "-ldflags=-s -w" ]; diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index 594deeb1c7305..3d0db49aedcd5 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -77,6 +77,8 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; + dontWrapQtApps = true; + installPhase = '' mkdir -p $out/share/doc/phantomjs cp -a bin $out diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 47c3e26fa6ad4..c23b50b8403ae 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -71,7 +71,7 @@ in lib.makeScope pkgs.newScope (self: { # Poetry2nix version - version = "1.15.4"; + version = "1.15.5"; /* Returns a package of editable sources whose changes will be available without needing to restart the nix-shell. diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 9ee690815faf0..7a5233fecdf1e 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -46,6 +46,12 @@ self: super: } ); + anyio = super.anyio.overridePythonAttrs (old: { + postPatch = '' + substituteInPlace setup.py --replace 'setup()' 'setup(version="${old.version}")' + ''; + }); + astroid = super.astroid.overridePythonAttrs ( old: rec { buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; @@ -82,7 +88,7 @@ self: super: ); celery = super.celery.overridePythonAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ]; + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; }); cssselect2 = super.cssselect2.overridePythonAttrs ( @@ -283,7 +289,7 @@ self: super: patchPhase = '' substituteInPlace setup.py \ --replace "/usr/include/openjpeg-2.3" \ - "${pkgs.openjpeg.dev}/include/openjpeg-2.3" + "${pkgs.openjpeg.dev}/include/${pkgs.openjpeg.dev.incDir} substituteInPlace setup.py \ --replace "/usr/include/jxrlib" \ "$out/include/libjxr" @@ -379,8 +385,8 @@ self: super: ); jsonslicer = super.jsonslicer.overridePythonAttrs (old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - buildInputs = old.buildInputs ++ [ pkgs.yajl ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkgconfig ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.yajl ]; }); jupyter = super.jupyter.overridePythonAttrs ( @@ -847,6 +853,11 @@ self: super: } ); + pyfuse3 = super.pyfuse3.overridePythonAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.fuse3 ]; + }); + pygame = super.pygame.overridePythonAttrs ( old: rec { nativeBuildInputs = [ @@ -1157,6 +1168,11 @@ self: super: ''; }; + + rmfuse = super.rmfuse.overridePythonAttrs (old: { + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; + }); + scipy = super.scipy.overridePythonAttrs ( old: if old.format != "wheel" then { diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix index 8beeccfa2fd1e..3cfd608e22586 100644 --- a/pkgs/development/tools/rgp/default.nix +++ b/pkgs/development/tools/rgp/default.nix @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { "${placeholder "out"}/opt/rgp/qt" ]; + dontWrapQtApps = true; + installPhase = '' mkdir -p $out/opt/rgp $out/bin cp -r . $out/opt/rgp/ diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index c468ad0f4e181..15ec7518e8a58 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.7.2"; + version = "0.7.3"; src = stdenv.mkDerivation rec { name = "${pname}-source-${version}"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "lu-zero"; repo = pname; rev = "v${version}"; - sha256 = "1rgwj3kf31n4rz0b7jw67wsgyapdycfic7plm5gm4n9rlslp5ax5"; + sha256 = "0df87kx8dfq2fvz00k6advwg2iw9djkflhrbsjw0xhac78623c56"; }; cargoLock = fetchurl { url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; - sha256 = "0jnawnkf4m7cqcq9iahnxa53l61a5riax400n96vxrqf3fa752c6"; + sha256 = "18l54jf9q5xb908bwyyil1sblxxa9mkrgr33gm0r6nxicw6kf8in"; }; installPhase = '' @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "0svmhq64aqw1vidq8jmw7w4xhhnyp04vcs9yzhjyz25c4cn9grsf"; + cargoSha256 = "0z7sjfnnmld5bijn14c7v7arh0vzqmbkjk7bf9ky67acq2r2cv2f"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 52993b3790d82..a4a8870aa10b4 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-0HD/wtHCbaJ0J+TC6k2xvWsCMnpdJbvivW/UM3g+Gss="; + hash = "sha256-3Tir9jvpSgjyF5tEn3xpPcpSATEnn9yaWIKE8hZIdsM="; }; - cargoHash = "sha256-bH9NQg7wJUe0MHkbt4DbjZEEVYZiVCwSbL4A/H+6WDs="; + cargoHash = "sha256-o0+ZlGnnVUJiTqIdioj+geiP6PWz/AKCXhx+/TgKmqs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index 23d7f29dff1ca..4f0fad54c1b62 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tracy"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "wolfpld"; repo = "tracy"; rev = "v${version}"; - sha256 = "0qfb30k6a8vi8vn65vv927wd9nynwwvc9crbmi7a55kp20hzg06r"; + sha256 = "sha256-Fk/Kuc7DwmdoyLx/YjdEHQ7S0M+ksAXl9QqeSPH2vJ8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index 22ac7a8f2c108..c36a13bd97f7a 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zt12LUKcsu/t2wNunIQhrNOqOABjyfL0MkSEPOQswFM="; + sha256 = "sha256-FXOwLYxUMkE+wDY30vjnSZ7zPWZWuWmIH4Uuc0CC7lU="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 878661e74ce0b..0a300ca82e210 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yq-go"; - version = "4.4.1"; + version = "4.5.0"; src = fetchFromGitHub { owner = "mikefarah"; rev = "v${version}"; repo = "yq"; - sha256 = "sha256-U1nMSwWKzPvyvxUx8J50AMB251ET4s9xcSrjGGjkYus="; + sha256 = "sha256-ehr9mCUbwQQSLR0iYoiJ3Xvgu+7Ue9Xvru9kAUkPCuQ="; }; vendorSha256 = "sha256-CUELy6ajaoVzomY5lMen24DFJke3IyFzqWYyF7sws5g="; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 83e181c85e654..bd8825582c43a 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { cp -r DwarfTherapist.app $out/Applications '' else null; + dontWrapQtApps = true; + meta = with lib; { description = "Tool to manage dwarves in a running game of Dwarf Fortress"; maintainers = with maintainers; [ abbradar bendlas numinit jonringer ]; diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 647a87d571b50..dea159f53bf7b 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -38,6 +38,8 @@ in stdenv.mkDerivation rec { ++ optional server readline ++ optional enableSqlite sqlite; + dontWrapQtApps = true; + configureFlags = [ "--enable-shared" ] ++ optional sdlClient "--enable-client=sdl" ++ optionals qtClient [ diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/games/leela-zero/default.nix index 4a71fc25c0f24..13b423832e679 100644 --- a/pkgs/games/leela-zero/default.nix +++ b/pkgs/games/leela-zero/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + dontWrapQtApps = true; + meta = with lib; { description = "Go engine modeled after AlphaGo Zero"; homepage = "https://github.com/gcp/leela-zero"; diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 7c8f4990a6190..3357bf15f8689 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { "-DDESIRED_QT_VERSION:INT=5" ]; + dontWrapQtApps = true; + meta = with lib; { description = "An unofficial open source engine reimplementation of the game Morrowind"; homepage = "http://openmw.org"; diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 47b383a82bd9d..95659e5a088e1 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -61,6 +61,8 @@ in openmw.overrideAttrs (oldAttrs: rec { "-DRakNet_LIBRARY_DEBUG=${rakNetLibrary}/lib/libRakNetLibStatic.a" ]; + dontWrapQtApps = true; + # https://github.com/TES3MP/openmw-tes3mp/issues/552 patches = [ ./tes3mp.patch diff --git a/pkgs/games/uchess/default.nix b/pkgs/games/uchess/default.nix new file mode 100644 index 0000000000000..bc2524466ccb3 --- /dev/null +++ b/pkgs/games/uchess/default.nix @@ -0,0 +1,32 @@ +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, stockfish }: + +buildGoModule rec { + pname = "uchess"; + version = "0.2.1"; + + subPackages = [ "cmd/uchess" ]; + + src = fetchFromGitHub { + owner = "tmountain"; + repo = "uchess"; + rev = "v${version}"; + sha256 = "1njl3f41gshdpj431zkvpv2b7zmh4m2m5q6xsijb0c0058dk46mz"; + }; + + vendorSha256 = "0dkq240ch1z3gihn8yc5d723nnvfxirk2nhw12r1c2hj1ga088g3"; + + # package does not contain any tests as of v0.2.1 + doCheck = false; + + buildInputs = [ makeWrapper ]; + postInstall = '' + wrapProgram $out/bin/uchess --suffix PATH : ${stockfish}/bin + ''; + + meta = with lib; { + description = "Play chess against UCI engines in your terminal."; + homepage = "https://tmountain.github.io/uchess/"; + maintainers = with maintainers; [ tmountain ]; + license = licenses.mit; + }; +} diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix index ce11f4a0551b8..baf7e3c15062d 100644 --- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation { pname = "cnijfilter2"; - version = "5.70"; + version = "5.90"; src = fetchzip { - url = "http://gdlp01.c-wss.com/gds/0/0100009930/01/cnijfilter2-source-5.70-1.tar.gz"; - sha256 = "045zjsmaidn1m44ki6m1018gjzbj77gm234n5i2lshxpbzpyh0is"; + url = "https://gdlp01.c-wss.com/gds/4/0100010484/01/cnijfilter2-source-5.90-1.tar.gz"; + sha256 = "1bwyv9s6xv18xxp3m04a5fyh628nzcjdjvsgmgqndnk7832h5ani"; }; buildInputs = [ @@ -115,9 +115,9 @@ stdenv.mkDerivation { meta = with lib; { description = "Canon InkJet printer drivers for the MG7500, MG6700, MG6600, MG5600, MG2900, MB2000, MB2300, iB4000, MB5000, MB5300, iP110, E450, MX490, E480, MG7700, MG6900, MG6800, MG5700, MG3600, and G3000 series"; - homepage = "http://support-th.canon-asia.com/contents/TH/EN/0100712901.html"; + homepage = "https://hk.canon/en/support/0101048401/1"; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index e1a31d208e483..ae7228c224600 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -14,6 +14,8 @@ mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 qtbase qtmultimedia boost ]; + dontWrapQtApps = true; + preConfigure = '' # Trick configure system. sed -n 's,^ *path = \(.*\),\1,p' .gitmodules | while read path; do diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index ef20bbaf66ecc..333830f0143ef 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -129,12 +129,12 @@ in rec { dracula = mkDerivation rec { pluginName = "dracula"; - version = "unstable-2021-02-09"; + version = "unstable-2021-02-18"; src = fetchFromGitHub { owner = "dracula"; repo = "tmux"; - rev = "d1678a5834679d98ffac1dd7a0eaecff7868ab8e"; - sha256 = "rdy5NFkh5Yl2YOTnuMKZQGRqVb2Pk8Bpq3nbJp2rCtE="; + rev = "8d1a7fa41b773d4f7b53dfff2d9fc5166d34f104"; + sha256 = "DG+oKbTkYO4hwoOlOqW5IuCLdVEttlvLM2en4DUHyMY="; }; meta = with lib; { homepage = "https://draculatheme.com/tmux"; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index d2faa00db9e31..12561880c6415 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-02-14"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "88d052b5a9ee3a41364497e1b98f01305d01df35"; - sha256 = "05d4dv9sqvnz0cqiyzkiyv5i7vrdw0niipdv9plm1zkf5arpd2d4"; + rev = "1ee7f6c97bb73bb6e12f00e527b664c5ea0df167"; + sha256 = "1z05wvbrsjlqxaw1p4c3d16jj3g43ril56w51ld78wzkc9xh5hh9"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -101,12 +101,12 @@ let ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2020-10-15"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "7abb04c115742ec9a5f90b86170f0118680cf8ec"; - sha256 = "185b4dari7y05p99756bqld4kk3d124ry4m4j7an8qm0zmpq648m"; + rev = "70c97fab3ba6be835aa502642bdd8621b8595713"; + sha256 = "00kmjnr7sbkidcy66b60k409ggwn4rwnyx2lc4bp2cwg4d0f9rcb"; }; meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; @@ -257,12 +257,12 @@ let barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-02-12"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "130b5bc9de263d89c003bf88190e29ac7ad53978"; - sha256 = "1ihc25yw53hnflqycl7brjc9xyhrp5ci641vjqh4j7naf60ffapb"; + rev = "42d7112d78839ef9bd2b283ec0d9d82134e94b4f"; + sha256 = "0i2vx60h27sal1crl8di4rq6dp4c8zjarknjl9z09l1s798l5i62"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -389,12 +389,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-02-14"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "c93c385a7c3e43edca1fd9c4e24fbdfb860886cf"; - sha256 = "1jxmkskr6x1610jjswivvaqi8mqslq797z4bxyd1byqbrrcz3vvy"; + rev = "0663608e29fda10526af83152840ca549c80e053"; + sha256 = "1h1ghwmqyss2bvz99c6cyjzi7xf8lhqlqnwxdd84d74zj2d446gv"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -497,12 +497,12 @@ let coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2021-02-14"; + version = "2021-02-15"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "a3272d19bce58f921ed9d112cc8128877307daac"; - sha256 = "1qg8awk5v6kfdb6livknx3y0v1ww3ashyn1pv1iwj3s0cms91mzr"; + rev = "633cf6e4564a31f970dc924338e393ca79149209"; + sha256 = "10yvw128zibyp9z49p1mpf3sbj9qgzw3831hh254f6sr9ri69vz1"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -618,12 +618,12 @@ let compe-tabnine = buildVimPluginFrom2Nix { pname = "compe-tabnine"; - version = "2021-02-14"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "tzachar"; repo = "compe-tabnine"; - rev = "e16e1661574a8bd56e27c67aa6dffa91efdc76b2"; - sha256 = "1ydcws12xx4prqmhri9pld5j3lz08p15s1j97018fp3vs7aq2wky"; + rev = "481cfc3bb7fa66a8fdcf4a8a2e8e226634b5f2dc"; + sha256 = "152z0ixvz89n7wfhr41fipx7mmhjkwx8r50r1mf6ik36gicw0szf"; }; meta.homepage = "https://github.com/tzachar/compe-tabnine/"; }; @@ -726,12 +726,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-02-09"; + version = "2021-02-16"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "f1deefb084b28197eaf988bbebff70dd86a99e03"; - sha256 = "1461h9qlfvvcvig4zrbylm4j11xkxmbnha1nk5829xm50pjkmca2"; + rev = "309b5ca4386e0a191168c2a4a7e6a0e8ddcb0317"; + sha256 = "07fhi1wsa8p3hqrkr56is4ijpc879npqfnhkv6cfi01aagp8kz9h"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -774,12 +774,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2020-10-07"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "350af4840991142230103e4f4fc58581d9c07812"; - sha256 = "1ibmrz1h51iy5ffvwalfydgjvdsfjvbpz1s1zmsalpv8mlswrhij"; + rev = "73c8eeca4c89768e4c53bb7a83cc3741bdcb5c7d"; + sha256 = "0hdcq8acylp8i3gh0agxjr3v34q6c4qmdwnpx1v31y3cy0j8k7v3"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; @@ -918,12 +918,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-02-11"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "2ea80dfe51974a21a7ec695c23fe86be3a8b10ac"; - sha256 = "0ilqw2jfrjq1h0camgqzf3h0p78gz5k4v8sgsixfbijv0syim2y0"; + rev = "972ba554fea50378b34a6711f6d0a0e2904c6a0b"; + sha256 = "0rmknirs5a0rkcpprd7wrf5fq85590aj5wdnrmr5vp59wg8677gm"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1511,12 +1511,12 @@ let galaxyline-nvim = buildVimPluginFrom2Nix { pname = "galaxyline-nvim"; - version = "2021-02-09"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "glepnir"; repo = "galaxyline.nvim"; - rev = "e30c355aaf6d2ca9aaa3a246eb87c7ceb4c42855"; - sha256 = "09w6gvy9hg0cgrs6661g8kfyjd4waz0ajx983p5jqr6l9a96111k"; + rev = "daf37458d9bf02783f0a0246a7d76247d60e9aac"; + sha256 = "1d53274h7465w4dxjgqmdj9c60m5yzvf92gw7h9w6hnfchin2bd4"; }; meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; }; @@ -1571,12 +1571,12 @@ let git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger-vim"; - version = "2021-02-14"; + version = "2021-02-16"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "be97d5efca0326f826003d0ca3437e4c20a0ccb2"; - sha256 = "07ijvgh21nl39f948f5pdlw38ysk5dswximaczmgghngnzk2yqgs"; + rev = "aae5f492786aba161138fa1bce9ba42964363ad9"; + sha256 = "063j3h6jy5hi1mj9bjkg627gmk1f6x2axbj07gjg3kal2d1iy90s"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; @@ -1595,12 +1595,12 @@ let gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-02-13"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "fb6327c80aa41490fb14df9f270fd68508460374"; - sha256 = "1sr63ch37fcjhdhxksx4mmxjbza8b4zaswvxrixr3qdnkq1bf5bl"; + rev = "a0f08c700313947e554a1933a9e7d06c0e3d2f42"; + sha256 = "0zfzh1nhxmrfxa97kfyl1cdx3c186ig3p61sfxm4w1phz0r44lch"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2016,12 +2016,12 @@ let kotlin-vim = buildVimPluginFrom2Nix { pname = "kotlin-vim"; - version = "2020-11-02"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "udalov"; repo = "kotlin-vim"; - rev = "f338707b2aa658aef4c0d98fd9748240859cf2a9"; - sha256 = "0wm9bkykvm89f966a8wxm5vvg9kjayy5iziahnch35hrmscs5x4b"; + rev = "7f967873c8a3e566bdf10715569319a632f3de93"; + sha256 = "1db6i2w93pfgw1nkhgw9m75crbx62rh5cvw7pbjs69xmbfd2zlld"; }; meta.homepage = "https://github.com/udalov/kotlin-vim/"; }; @@ -2136,12 +2136,12 @@ let lf-vim = buildVimPluginFrom2Nix { pname = "lf-vim"; - version = "2021-02-14"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "ptzz"; repo = "lf.vim"; - rev = "c80801760eeacb6fa9fa231408a8723d6a183262"; - sha256 = "1bs2f9j28hcd977x0dz40g9p33863l3riyp7qlwzllbas2w3k7bs"; + rev = "73fb502c6d1470243b1f4d8afa81e289d9edd94b"; + sha256 = "1whrzpavv46r64l3b7vax4sj23kjdfjiwmhfpssb6bprhc9c4j97"; }; meta.homepage = "https://github.com/ptzz/lf.vim/"; }; @@ -2232,24 +2232,24 @@ let lsp-status-nvim = buildVimPluginFrom2Nix { pname = "lsp-status-nvim"; - version = "2021-02-07"; + version = "2021-02-14"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "lsp-status.nvim"; - rev = "187c492c492f8b57c1a66b82904785141b01d5ac"; - sha256 = "0i8j37i2lkrsjlya9g5i8wr3gjlfkb9g9sqzq6a0132s6rpqdhmz"; + rev = "925acdab0886fe5f0752561ea49e95b9f02e09c7"; + sha256 = "0rd3gqgz573ll11wnw1r182siamc3cxqqf3cyhqznkiq7bw2g9xh"; }; meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/"; }; lsp_extensions-nvim = buildVimPluginFrom2Nix { pname = "lsp_extensions-nvim"; - version = "2020-11-30"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "lsp_extensions.nvim"; - rev = "25951aca067b3a22f303f59d8eac2101d861850a"; - sha256 = "0bl7y9xpvlmisizyyykjskxmrg01s6p7nkgdfskx14dv2f8dmv8q"; + rev = "ce5d03822fda9ddbdeb2461e5b4c06c1641fe7ea"; + sha256 = "1gybxaxgbq1s1ijvrl9h9nq443cyrdnhgi1yjqxzrr64wz7nr8v0"; }; meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; }; @@ -2268,24 +2268,24 @@ let lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga-nvim"; - version = "2021-02-14"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "ee3b0e75811432d7e6f6e8cfbbd8799394cd315f"; - sha256 = "00fgcsf77csjyfjj82pyrbxb4v9k1mprp58zpascm6jibs74v6jc"; + rev = "ef1997dea263b7043d424034e9c4f5150105b911"; + sha256 = "113y7mbvcqc13ffxcaj468ldfrxq6p3jifv5cjgf33wkjjd1hclf"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-02-13"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "55c0f0fe9a01389df4671bd1bf9286f869a4d216"; - sha256 = "0f502gg56kzf811nzmjif3n5a73lpsf7l7jfbz2cmfp9ci3bg9z8"; + rev = "0dd0a23cac1adeaa4dbfc15b4a5cabe44ed59401"; + sha256 = "11bl6gs63wkvb0pjxpx03ls8s27z1rn9llbrrcaf3fbkff2qbrsy"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; @@ -2628,12 +2628,12 @@ let neocomplete-vim = buildVimPluginFrom2Nix { pname = "neocomplete-vim"; - version = "2020-08-12"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "neocomplete.vim"; - rev = "f80bbf8f2f1717a127e5fbe885729daa862def81"; - sha256 = "0cks5fvr05k0lp2mwflqzx0mq6a3881c1304hdyci57j5bkkyvkj"; + rev = "fc2d22c23962290cc0b32f50bf18add6a4573bdf"; + sha256 = "04sxri3anr5d8zdqw11fn8nqf86wxin4lza78dp2x52kgrjawpla"; }; meta.homepage = "https://github.com/Shougo/neocomplete.vim/"; }; @@ -2796,12 +2796,12 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2021-02-02"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "b83e9cdf835161b398e04e4c462103fd21801ee3"; - sha256 = "15x4qw0l9j228rrfqnwzg13j7cr0k69xd46rcsa4886lw8nmpsak"; + rev = "1c7b57608e653b55731d5971ba11c4c691b14c8c"; + sha256 = "0ax3f1gyg0gqc2wmv11icsc5ykjq7b3cgk49hxla8zyf84rhdnn2"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -2916,12 +2916,12 @@ let nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-02-14"; + version = "2021-02-15"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "fa13fecd577f90c4fa8a1bd539f405989a8df7f0"; - sha256 = "06vnavw203k76d7nsn08kp1g9xvl8aijmffy89jfgq3918dd6892"; + rev = "3ce7f98158e604d4578f44ed4181b6f9a4d37900"; + sha256 = "0plkpb1rk82q5plsjnqkwwpdp4knbn93ai6b2c83kwbfiqrka31i"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -2964,12 +2964,12 @@ let nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2021-01-24"; + version = "2021-02-15"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "531a575d1768be4531246950e55a784739b5d0a7"; - sha256 = "03hd7bq09gz23619b19cz29hafhia5r28xm8bqnj03d2m6b2xlyh"; + rev = "53fc0cee121ef05e719b1df1beacfe0dc07c4520"; + sha256 = "0ldyr1s5zr67viywkwzmjvrb8fi4il00w6ps4kddw2g4fp8ilk8n"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -2988,12 +2988,12 @@ let nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-02-11"; + version = "2021-02-14"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "90ac936055ba8432b532392835e0fbbd82e60836"; - sha256 = "1hfda95gwdglycs00a9rwvfar9w579234zn3sz4pngi5crdamr38"; + rev = "1e06ce52015d0578cd24c5b01fcae1a2e2abbdc2"; + sha256 = "1c6crqc3yfi3h8mh55555sjrlif7j2q0j9wvajiagjfhggkhdggb"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3024,24 +3024,24 @@ let nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; - version = "2021-02-05"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "9198402f3417b0dbf26e73cac8cb53e074c163f1"; - sha256 = "17gqdrskr744b1z26fjf01a9nvfasd4fhaa9dmmi4g4br8556cyj"; + rev = "37d427ae1635da7800f7f09f831b35df1185ac38"; + sha256 = "012hd5xpcmmvgxrk6m7m28q288v485w7nzvnayfl4s3dk4jzq8rp"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-02-12"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "d3c178ac78f8930d4ca094685744f5c705b56b55"; - sha256 = "1mj761vxq3dd7m384ig6dhipg43qw1w3cpkkvq9aymnlsvfi5b1d"; + rev = "443d7552aca03c03a59e2c084c2e851c281e51de"; + sha256 = "0rh3c52wpgqsvhnsfmp8764d92lckz2c9bzi7kgpjmya4ynr5gzj"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3060,12 +3060,12 @@ let nvim-peekup = buildVimPluginFrom2Nix { pname = "nvim-peekup"; - version = "2021-02-13"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-peekup"; - rev = "94e7279851fdd3da00c3178e64fb448b05fbba7e"; - sha256 = "1h0n6wfzrlya717571qfgr9zjs1yi2a08k4rppz509jdbkv1mnz9"; + rev = "a89aed9833e71d9065ba80c4237a8e4dec2034b1"; + sha256 = "1jsphd9ghwzfzl8plxjvra2b5q3zxlv1679r9mxsp9nz33h1jblr"; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/"; }; @@ -3096,36 +3096,36 @@ let nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-02-11"; + version = "2021-02-16"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "c59831a5d11a35594dc4e379a89d276d5ac83cdf"; - sha256 = "0wf36dlg4hq2hfvyvm1i7z83ky1x4rr7vv249sk01clsy84nylql"; + rev = "58a5e4ab48f201a80d58af965cbaa8468ad64144"; + sha256 = "12dz1x36dwr0wfilb5va42mmqvdar4ibgzanqf80myv0zjg1wc03"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-02-13"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "34fdacc0e971eccb958c3ce0c88198bcfed8f9cc"; - sha256 = "1r6q36ri17zrv06qgclidd58dn62kz4yivjyp4qzcyf77x18s9c6"; + rev = "5757f8a50d5d26b8c184b3a51713db763cdd9702"; + sha256 = "077h9j4rk4fckr3zw61hvyp0b22z0wlpdysjl8dc7f69cfxa42ix"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2020-12-31"; + version = "2021-02-16"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "a7773cc3c581fa43cf0b59693ecdc6fc4e79e748"; - sha256 = "1mxm6b00jmnci4yvd3bs9njf73bjbdwcn10l5bw9180a511aggv1"; + rev = "0dda360a8f841550ca565564c5a409746353e94e"; + sha256 = "058hfybqhcwvmhjm7k9iww2baz2fpww7nq6m9xngj3wdwfkylcfy"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; @@ -3144,12 +3144,12 @@ let nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2021-01-01"; + version = "2021-02-14"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "065b342db053810ac7a5ee9740b891cfa05c380f"; - sha256 = "07yl5iin11snw2637860r9zva9yfn7qkljkv0sjfldm73afflds7"; + rev = "b0f6d2c91b46faecee8b44f426de4b40d8ec8494"; + sha256 = "1r93lbh6yzq59nzkj8sdmdy4pjris5cjlh7w491xkahyizfja1ln"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -3168,12 +3168,12 @@ let nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2021-02-12"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "cc7771275822c951767c056a14830d713023247f"; - sha256 = "1qk2h8cwcb0v12lxayjdxka6wh5r1phn9cz5xkm5hvm1vcwrvlln"; + rev = "b840a1f0fc35019998e6f09dfdd8dbb241764458"; + sha256 = "1q3a5ivlvk7ni5b9jxhymdrdssnxhisb6cq07rdwrh1kmfzv90yz"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -3228,12 +3228,12 @@ let one-nvim = buildVimPluginFrom2Nix { pname = "one-nvim"; - version = "2021-01-30"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "Th3Whit3Wolf"; repo = "one-nvim"; - rev = "88916fbb81530a25f9a3f8bc02e1b4c91ff7be10"; - sha256 = "0glp8z6v53sff7vff6h6cxix40zwp1m305jsd50ji1i4913m08lw"; + rev = "60970d279f5f2a82b1857601c63e6a51f9fd04de"; + sha256 = "1kmjq4kjlflhagasr3n2l47mmv739rwz9bqbzyyv5skxdkkp95lw"; }; meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/"; }; @@ -3288,12 +3288,12 @@ let packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-02-12"; + version = "2021-02-15"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "75a254198770baffe11ed748338c82f4d2d71e9d"; - sha256 = "1vvkcpfvkkf14y7zxlp43ridx075y2hf14kc285mzwdhhb1ygcdi"; + rev = "19d24934cf6f132e84a03e722eb20458c4061870"; + sha256 = "0gq2xznchnb2wqqz79qdvv2cfn1adrgy8n8drq5p7cxs067nx4bl"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -3372,12 +3372,12 @@ let playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2021-01-21"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "7e373e5706a2df71fd3a96b50d1f7b0c3e7a0b36"; - sha256 = "1vrfjv22whdmwna4xlvpsajx69fs8dkfwk0ji1jnvbyxmhki8mik"; + rev = "444eab728ecaf337629a45a733535e94a3efc04a"; + sha256 = "0r10fmk90wdc9hj3kdfkb93vvw1kdxwkl20f9zs3rfs5vs7p9i97"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; @@ -3661,12 +3661,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2020-09-18"; + version = "2021-02-15"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "96e79e397126be1a64fb53d8e3656842fe1a4532"; - sha256 = "0siml7vqiq5nvymyw8az48rv5dsf9dad8y8hy22j57lknd67b8h3"; + rev = "87c745d8d506fc1eecc1d81df15d5bde1658a2fc"; + sha256 = "0v0ip731lclh9aqrmlqwnnz4skgawaq3invghh1c7lh0zdq22lzb"; }; meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; @@ -3815,6 +3815,18 @@ let meta.homepage = "https://github.com/gorkunov/smartpairs.vim/"; }; + sonokai = buildVimPluginFrom2Nix { + pname = "sonokai"; + version = "2021-02-14"; + src = fetchFromGitHub { + owner = "sainnhe"; + repo = "sonokai"; + rev = "522571a37d78afe13538a22cfecb8ed9cccb21a3"; + sha256 = "14jhx428lk4q0s6qgj97q4s03msqhnli8l71rw6541m7gcdhjvjj"; + }; + meta.homepage = "https://github.com/sainnhe/sonokai/"; + }; + sourcemap-vim = buildVimPluginFrom2Nix { pname = "sourcemap-vim"; version = "2012-09-19"; @@ -4046,12 +4058,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-02-12"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "2fb3171ed7549df1c27840452b7815a108bd1a27"; - sha256 = "15djvax4nyxki2kbkmryds4b5zli1v18js90aah9m9ipvpnwrp91"; + rev = "51ff7a05404e2f5c83799dd6c38134ed4aaca85c"; + sha256 = "0i7qzn3vlvjjd5qvf230r7aaqz84rn30zkn643fdvpni7pxfywdv"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -4636,12 +4648,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-02-05"; + version = "2021-02-15"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "c01977d027de854c6a85ed5c57915a7e8848f4b9"; - sha256 = "0xvv1dymvgazs57phxbxljihz92zd4aa5yjqqf4g9xvl59vxc798"; + rev = "cb1bc19064d3762e4e08103afb37a246b797d902"; + sha256 = "1mw62q54cybybbmlvw7f0yzwr41dv4rsgqvk7psazb5zwjrsqn0z"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4672,12 +4684,12 @@ let vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2020-11-04"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "5007343968e21bba30d85af982689d1c1f9145e1"; - sha256 = "17c3yhnn016k03f2g3cjfwnazg2525pgwy4zqcv0vrgq2g4dil82"; + rev = "1731cd3865669ebec84e6f32a87ccf16a00690fd"; + sha256 = "0k6ch5kg8jlqa04apjdi7xr5s85ibdvg4gq4iyxh78xffw1xzafl"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -4912,12 +4924,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-02-13"; + version = "2021-02-16"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "2f16948ca63ee37b27bf9b2a3a6c505204cac1cd"; - sha256 = "12axglcxxmsyin8wycm5gh72mskjzajv3lf9xdqdg0d8xi4qnq81"; + rev = "3985754b78d05858ec24538a708a6fcaed0ea2ad"; + sha256 = "1zsh1h6abrcry32hcrkxys182g098vrs4k74wisk5mcwd3wvgarx"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -5548,12 +5560,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-02-13"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "a892836203b8ce003bee88e9a9da8aefaa08a2ca"; - sha256 = "0gpqfgfayyqsgvipc65j7xzdbf2kjbygp1va1sqzxqii01yi7m37"; + rev = "c831ca0d8918fc7dcee78c9d3cce60ed926b88e9"; + sha256 = "0gd3qsfdmamvd7arlg8b364hzyhph8ci7n9vf3rl4g70lyk7zlm1"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -5596,12 +5608,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-02-12"; + version = "2021-02-16"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "d4bcc75ef6449c0e5592513fb1e0a42b017db9ca"; - sha256 = "12621ai3wx43m146cfjpcdz6main3rq6ira6gb2m06zsk1am1fjn"; + rev = "c63bc47c44f4ad259300549fc02939ab2401ba79"; + sha256 = "1kmxm6spwzgyskdk8s32k93v8k0njfka3gq28wxnbswydnzszgrz"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -5668,12 +5680,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2021-02-11"; + version = "2021-02-16"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "2e3cd54ed696500bb3722226f2103d4b279272c0"; - sha256 = "1cv9lapq6xb0fq5i1mfbhv5qlab868mvby60yhwzafni5b2p9l37"; + rev = "b90aad666aa7163b08d744d4585eefa4eaabb6ad"; + sha256 = "1jz9rvkyd05jw6mwcp96j0wscxnkm95g55pvzkidfn2fcjnl9ab6"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -5716,12 +5728,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-02-10"; + version = "2021-02-14"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "cb4c622c97a39652151748c4dec70a46e93a9117"; - sha256 = "0pfd6vizjrynz4azx3fkz5nwm7k08jjhvy6ypkjzhhw2ql37l7i9"; + rev = "08615366d82d0ceaee73a995e8dab75df63e2897"; + sha256 = "0fn0hi0irmb4ri4skdandahzl6zn916fxi31f8mhcrws72izqxzj"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -5762,6 +5774,18 @@ let meta.homepage = "https://github.com/mhinz/vim-grepper/"; }; + vim-gruvbox8 = buildVimPluginFrom2Nix { + pname = "vim-gruvbox8"; + version = "2021-02-06"; + src = fetchFromGitHub { + owner = "lifepillar"; + repo = "vim-gruvbox8"; + rev = "a03834cdaa686ef2758f670924fc048148dfd297"; + sha256 = "1yh5p8s17kd1z4jqk6gd6vmap7f5jwqwhfbq2yi2xi3lb6xpvjc3"; + }; + meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/"; + }; + vim-gui-position = buildVimPluginFrom2Nix { pname = "vim-gui-position"; version = "2019-06-06"; @@ -5824,12 +5848,12 @@ let vim-hcl = buildVimPluginFrom2Nix { pname = "vim-hcl"; - version = "2020-09-07"; + version = "2021-02-16"; src = fetchFromGitHub { owner = "jvirtanen"; repo = "vim-hcl"; - rev = "94fbd199c8a947ede62f98509f91d637d7967454"; - sha256 = "0n2dmgfajji8nxxirb9q9jmqnzc1mjqnic5igs84pxmbc6r57zqq"; + rev = "047a8643ce346d819ffbd1686fe3ac1a54e42a1e"; + sha256 = "1brwjgxxh8f1q2859lqgdn9jk8h3iip989yirii350kwqvv1wjk6"; }; meta.homepage = "https://github.com/jvirtanen/vim-hcl/"; }; @@ -6847,12 +6871,12 @@ let vim-pandoc-syntax = buildVimPluginFrom2Nix { pname = "vim-pandoc-syntax"; - version = "2020-10-24"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "2521e2e9b99a3550e1a20f24e09fa46679cbbbc7"; - sha256 = "02023bnvc9m98m45krld1b7gy13z335jv88fx4ybz019wc0mv35g"; + rev = "36509e99779746866f34dadc8df64449aaca9c27"; + sha256 = "1ir7nymhz613w5bfmk927w892lpz92b71by0j2jfnb7flh9ad6f4"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; @@ -7135,12 +7159,12 @@ let vim-racer = buildVimPluginFrom2Nix { pname = "vim-racer"; - version = "2020-12-07"; + version = "2021-02-15"; src = fetchFromGitHub { owner = "racer-rust"; repo = "vim-racer"; - rev = "83ba638104f6a56def3354c6c9b1df04d12f1d3d"; - sha256 = "1qpxdam0qn7lyvgzyip30bs6k99c0qnpd5qgkkps6mcyzd1rqlqv"; + rev = "c7f5ec42af992a090be35301847548064e8fc806"; + sha256 = "0vqjxcnw9cklnqyc1c39wnwirk4hhmsnyqgq4rl7ph084xqnnmrr"; }; meta.homepage = "https://github.com/racer-rust/vim-racer/"; }; @@ -7159,12 +7183,12 @@ let vim-ragtag = buildVimPluginFrom2Nix { pname = "vim-ragtag"; - version = "2020-01-26"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-ragtag"; - rev = "6f1af76cd669c4fb07f0c4e20fdee3077620e3d8"; - sha256 = "1q5klbnwsg26zxhs3knhamk3srg7dmq46n83sa5rw2kmikb2idg2"; + rev = "703965fde904fbf29defed3b230e51ef60e9dc90"; + sha256 = "0vj2kqjr03hpgkmnkj1c2icsgli04993vjf56ncwhjg0p707v8v7"; }; meta.homepage = "https://github.com/tpope/vim-ragtag/"; }; @@ -7447,12 +7471,12 @@ let vim-smt2 = buildVimPluginFrom2Nix { pname = "vim-smt2"; - version = "2020-12-14"; + version = "2021-02-16"; src = fetchFromGitHub { owner = "bohlender"; repo = "vim-smt2"; - rev = "aea240223698b4bb424d29805fe6750bb30872cb"; - sha256 = "15yxd4zxs738h51g10hx8xcki7r2hkb83prydk6g7sznsy3k70ia"; + rev = "196d05f7152fb95c4613476368ebae9dd842d470"; + sha256 = "0lk9clnvrkjbxgszg52zdl28d313vk2fiyh86aa6xx5pr0nr9iw3"; }; meta.homepage = "https://github.com/bohlender/vim-smt2/"; }; @@ -7519,12 +7543,12 @@ let vim-sourcetrail = buildVimPluginFrom2Nix { pname = "vim-sourcetrail"; - version = "2020-12-21"; + version = "2021-02-16"; src = fetchFromGitHub { owner = "CoatiSoftware"; repo = "vim-sourcetrail"; - rev = "b603ee7cf5c751918efc40014b9cfb40bf19ec32"; - sha256 = "1yssa2yll5q61mffwxiq8swpzq80xxypyzr7svn8acwrakn0dx5r"; + rev = "c9c621a7ab81c52a661457ccf33a64fd7c56fd9d"; + sha256 = "192f69yz1hh2k0b2kcvfvv1jirjcvnbxvjkagmlkkqcg8w32nmlg"; }; meta.homepage = "https://github.com/CoatiSoftware/vim-sourcetrail/"; }; @@ -7565,6 +7589,18 @@ let meta.homepage = "https://github.com/mhinz/vim-startify/"; }; + vim-startuptime = buildVimPluginFrom2Nix { + pname = "vim-startuptime"; + version = "2021-01-11"; + src = fetchFromGitHub { + owner = "dstein64"; + repo = "vim-startuptime"; + rev = "37ab78eb837e3004e3cfb3a8e5ed8f8740f27f13"; + sha256 = "0x3h47hdbg2gp0ahf0ixkj3nks7qbnm25bmd7hq9k3c7b6912b5a"; + }; + meta.homepage = "https://github.com/dstein64/vim-startuptime/"; + }; + vim-stylish-haskell = buildVimPluginFrom2Nix { pname = "vim-stylish-haskell"; version = "2019-11-28"; @@ -7700,12 +7736,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2021-01-28"; + version = "2021-02-15"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "77d0b89fe5648d0881e8506d1949a9412201772b"; - sha256 = "14ny5gap1bij5fdwnxgwjpmjnw0xpydnjvvsf6525hbipxp258fr"; + rev = "5a1cfbbd2b34a64852760497945dd3a5c5df349a"; + sha256 = "164i8kzqyald74ibqimn6871ma02wwnx82d4rz9g21x2qgwyy6gr"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -7964,12 +8000,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2021-02-12"; + version = "2021-02-16"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "88f934f572efdbc73c7b4b23a9b96f710524a94d"; - sha256 = "0pk0vqns7269gi9jd8bdcg1qxlgdm55w9mf3nsrzc9z3d3j3vpw0"; + rev = "4c99296b8f29d8936de8c33d98f0acdafcdbd388"; + sha256 = "1w936x8zz0f6v77bhixd48q09naqglq3ar4y26kpr9vscfmsbc00"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -8252,12 +8288,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-02-10"; + version = "2021-02-16"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "e99ac0d65867f4d97e7b891ac21cd341de1ff53f"; - sha256 = "1jxl33svlymcwc3dsalabpy7px91rgfpalpb2bhxkqd4vgxwcjql"; + rev = "85ca867cc25ab5e9ef9353158e8b786806ba005b"; + sha256 = "0zmy4dkc23i1lvdgjd4ras85q01pahfynajzf5v9lifn1dmyfrl3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -8277,12 +8313,12 @@ let vimux = buildVimPluginFrom2Nix { pname = "vimux"; - version = "2021-02-14"; + version = "2021-02-18"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "3693ec6f129fa10b1f3435829645c4607584c3ab"; - sha256 = "1pmcablswp2q32xc1njzfh5vxbani4a8n95k0jzhq0cz8w4ssxpw"; + rev = "9214bf95784d330fe7e076e26aee9e3048f99253"; + sha256 = "1hl8zlqvlxjv671ih7q0gvxsa3r1yq4c3zaizja2lbf7l57as071"; }; meta.homepage = "https://github.com/preservim/vimux/"; }; @@ -8313,12 +8349,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2021-02-12"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "05d1fb2e333caa2bf2717d4e8ff5ae8c2a1f971d"; - sha256 = "0zyq4fgi6i4gdn25ykpxsy7bpyzysny5qkg40r3493yqnp3rvnfw"; + rev = "30bf0bdaf33d942d35a0e767cf2387ced755d0e0"; + sha256 = "1bs4v3ym6mhczmzg7z6np7myziyp3n40xz2xdhcalbzwkdz5k43j"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -8433,12 +8469,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2021-01-21"; + version = "2021-02-15"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "6104b30b32732e367266f06ecf6e817df32ac1b9"; - sha256 = "0r8asbc387mmdiignr862gz4xd590c6rhp3ff78v7z7rn94dnamd"; + rev = "11112853180a933574f431cf78cd5a462ee3f473"; + sha256 = "0bnq02dbsqwsizhlldb2pj92gjybr5aaa7a5m786xvb7ljvd82vi"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 80a047bc23db7..df687f6ccbec9 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -729,7 +729,7 @@ self: super: { libiconv ]; - cargoSha256 = "0r3ldipdfzhdivgc43bv31c1g9hl458yznabmfzxr2phpyvq2dnn"; + cargoSha256 = "042dbg80mx0khm8xahm4l490s7bfbav362r0mz5bfhq4fy2s9nsi"; }; in '' diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c52f278847503..c52fc140c97ad 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -93,6 +93,7 @@ dracula/vim as dracula-vim drewtempelmeyer/palenight.vim drmingdrmer/xptemplate dstein64/nvim-scrollview@main +dstein64/vim-startuptime dylanaraps/wal.vim eagletmt/ghcmod-vim eagletmt/neco-ghc @@ -286,6 +287,7 @@ lepture/vim-jinja lervag/vimtex lewis6991/gitsigns.nvim@main lfilho/cosco.vim +lifepillar/vim-gruvbox8 lifepillar/vim-mucomplete lighttiger2505/deoplete-vim-lsp lilydjwg/colorizer @@ -503,6 +505,7 @@ rstacruz/vim-closer rust-lang/rust.vim ryanoasis/vim-devicons ryvnf/readline.vim +sainnhe/sonokai sakhnik/nvim-gdb saltstack/salt-vim samoshkin/vim-mergetool diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 60048e16192d2..8c8e646964d7a 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -357,6 +357,8 @@ let }; }; + hashicorp.terraform = callPackage ./terraform {}; + hookyqr.beautify = buildVscodeMarketplaceExtension { mktplcRef = { name = "beautify"; diff --git a/pkgs/misc/vscode-extensions/terraform/default.nix b/pkgs/misc/vscode-extensions/terraform/default.nix new file mode 100644 index 0000000000000..16a3c7477cdc6 --- /dev/null +++ b/pkgs/misc/vscode-extensions/terraform/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchurl, vscode-utils, terraform-ls }: +vscode-utils.buildVscodeMarketplaceExtension rec { + mktplcRef = { + name = "terraform"; + publisher = "hashicorp"; + version = "2.6.0"; + }; + + vsix = fetchurl { + name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; + url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix"; + sha256 = "1zg90x2asl6gakd2w8fn4imllqgrzdb1dn3728s63blmml42a1xp"; + }; + + patches = [ ./fix-terraform-ls.patch ]; + + postPatch = '' + substituteInPlace out/extension.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls + ''; + + meta = with lib; { + license = licenses.mit; + maintainers = with maintainers; [ rhoriguchi ]; + }; +} diff --git a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch new file mode 100644 index 0000000000000..84a626b17deb3 --- /dev/null +++ b/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch @@ -0,0 +1,25 @@ +diff --git a/out/extension.js b/out/extension.js +index 1de8aab..e2b3a3e 100644 +--- a/out/extension.js ++++ b/out/extension.js +@@ -204,19 +204,7 @@ function pathToBinary() { + if (!_pathToBinaryPromise) { + let command = vscodeUtils_1.config('terraform').get('languageServer.pathToBinary'); + if (!command) { // Skip install/upgrade if user has set custom binary path +- const installDir = `${extensionPath}/lsp`; +- const installer = new languageServerInstaller_1.LanguageServerInstaller(); +- try { +- yield installer.install(installDir); +- } +- catch (err) { +- vscode.window.showErrorMessage(err); +- throw err; +- } +- finally { +- yield installer.cleanupZips(installDir); +- } +- command = `${installDir}/terraform-ls`; ++ command = 'TERRAFORM-LS-PATH'; + } + _pathToBinaryPromise = Promise.resolve(command); + } diff --git a/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix index 609cd579f9f63..476a77c59d7f8 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix @@ -6,6 +6,34 @@ appleDerivation { cp include/* $out/include/CommonCrypto ''; + appleHeaders = '' + CommonCrypto/CommonBaseXX.h + CommonCrypto/CommonBigNum.h + CommonCrypto/CommonCMACSPI.h + CommonCrypto/CommonCRC.h + CommonCrypto/CommonCrypto.h + CommonCrypto/CommonCryptoError.h + CommonCrypto/CommonCryptoPriv.h + CommonCrypto/CommonCryptor.h + CommonCrypto/CommonCryptorSPI.h + CommonCrypto/CommonDH.h + CommonCrypto/CommonDigest.h + CommonCrypto/CommonDigestSPI.h + CommonCrypto/CommonECCryptor.h + CommonCrypto/CommonHMAC.h + CommonCrypto/CommonHMacSPI.h + CommonCrypto/CommonKeyDerivation.h + CommonCrypto/CommonKeyDerivationSPI.h + CommonCrypto/CommonNumerics.h + CommonCrypto/CommonRSACryptor.h + CommonCrypto/CommonRandom.h + CommonCrypto/CommonRandomSPI.h + CommonCrypto/CommonSymmetricKeywrap.h + CommonCrypto/aes.h + CommonCrypto/lionCompat.h + CommonCrypto/module.modulemap + ''; + meta = with lib; { maintainers = with maintainers; [ copumpkin ]; platforms = platforms.darwin; diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch b/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch deleted file mode 100644 index fd9df8129407b..0000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/icuSources/i18n/ucoleitr.cpp b/icuSources/i18n/ucoleitr.cpp -index ecc94c9..936452f 100644 ---- a/icuSources/i18n/ucoleitr.cpp -+++ b/icuSources/i18n/ucoleitr.cpp -@@ -320,7 +320,7 @@ ucol_nextProcessed(UCollationElements *elems, - int32_t *ixHigh, - UErrorCode *status) - { -- return (UCollationPCE::UCollationPCE(elems)).nextProcessed(ixLow, ixHigh, status); -+ return (UCollationPCE(elems)).nextProcessed(ixLow, ixHigh, status); - } - - -@@ -384,7 +384,7 @@ ucol_previousProcessed(UCollationElements *elems, - int32_t *ixHigh, - UErrorCode *status) - { -- return (UCollationPCE::UCollationPCE(elems)).previousProcessed(ixLow, ixHigh, status); -+ return (UCollationPCE(elems)).previousProcessed(ixLow, ixHigh, status); - } - - U_NAMESPACE_BEGIN diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix index 761ff3ea9252c..032b1447463d8 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix @@ -1,23 +1,56 @@ -{ appleDerivation }: +{ appleDerivation, python3 }: appleDerivation { - patches = [ ./clang-5.patch ]; + nativeBuildInputs = [ python3 ]; postPatch = '' substituteInPlace makefile \ - --replace /usr/bin/ "" \ - --replace '$(ISYSROOT)' "" \ - --replace 'shell xcodebuild -version -sdk' 'shell true' \ - --replace 'shell xcrun -sdk $(SDKPATH) -find' 'shell echo' \ - --replace '-install_name $(libdir)' "-install_name $out/lib/" \ - --replace /usr/local/bin/ /bin/ \ - --replace /usr/lib/ /lib/ \ + --replace "/usr/bin/" "" \ + --replace "xcrun --sdk macosx --find" "echo -n" \ + --replace "xcrun --sdk macosx.internal --show-sdk-path" "echo -n /dev/null" \ + --replace "-install_name " "-install_name $out" + + substituteInPlace icuSources/config/mh-darwin \ + --replace "-install_name " "-install_name $out/" + + # drop using impure /var/db/timezone/icutz + substituteInPlace makefile \ + --replace '-DU_TIMEZONE_FILES_DIR=\"\\\"$(TZDATA_LOOKUP_DIR)\\\"\" -DU_TIMEZONE_PACKAGE=\"\\\"$(TZDATA_PACKAGE)\\\"\"' "" + + # FIXME: This will cause `ld: warning: OS version (12.0) too small, changing to 13.0.0`, APPLE should fix it. + substituteInPlace makefile \ + --replace "ZIPPERING_LDFLAGS=-Wl,-iosmac_version_min,12.0" "ZIPPERING_LDFLAGS=" + + # skip test for missing encodingSamples data + substituteInPlace icuSources/test/cintltst/ucsdetst.c \ + --replace "&TestMailFilterCSS" "NULL" + + patchShebangs icuSources ''; - makeFlags = [ "DSTROOT=$(out)" ]; + # APPLE is using makefile to save its default configuration and call ./configure, so we hack makeFlags + # instead of configuring ourself, trying to stay abreast of APPLE. + dontConfigure = true; + makeFlags = [ + "DSTROOT=$(out)" + + # remove /usr prefix on include and lib + "PRIVATE_HDR_PREFIX=" + "libdir=/lib/" + + "DATA_INSTALL_DIR=/share/icu/" + "DATA_LOOKUP_DIR=$(DSTROOT)$(DATA_INSTALL_DIR)" + + # hack to use our lower macos version + "MAC_OS_X_VERSION_MIN_REQUIRED=__MAC_OS_X_VERSION_MIN_REQUIRED" + "OSX_HOST_VERSION_MIN_STRING=$(MACOSX_DEPLOYMENT_TARGET)" + ]; + + doCheck = true; + checkTarget = "check"; postInstall = '' - mv $out/usr/local/include $out/include + # we don't need all those in usr/local rm -rf $out/usr ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix index 6ebb470145d55..3554a2e15b074 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix @@ -29,4 +29,6 @@ appleDerivation { cp ${Libc_old}/include/libkern/OSAtomic.h $out/include/libkern cp ${Libc_old}/include/libkern/OSCacheControl.h $out/include/libkern ''; + + appleHeaders = builtins.readFile ./headers.txt; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/headers.txt b/pkgs/os-specific/darwin/apple-source-releases/Libc/headers.txt new file mode 100644 index 0000000000000..ea62e31dc781a --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/headers.txt @@ -0,0 +1,138 @@ +CrashReporterClient.h +NSSystemDirectories.h +_locale.h +_types.h +_types/_intmax_t.h +_types/_nl_item.h +_types/_uint16_t.h +_types/_uint32_t.h +_types/_uint64_t.h +_types/_uint8_t.h +_types/_uintmax_t.h +_types/_wctrans_t.h +_types/_wctype_t.h +_wctype.h +_xlocale.h +aio.h +alloca.h +ar.h +arpa/ftp.h +arpa/inet.h +arpa/nameser_compat.h +arpa/telnet.h +arpa/tftp.h +asl.h +assert.h +bitstring.h +cpio.h +crt_externs.h +ctype.h +db.h +dirent.h +disktab.h +err.h +errno.h +execinfo.h +fcntl.h +fmtmsg.h +fnmatch.h +fsproperties.h +fstab.h +fts.h +ftw.h +get_compat.h +getopt.h +glob.h +inttypes.h +iso646.h +langinfo.h +libc.h +libc_private.h +libgen.h +libkern/OSAtomic.h +libkern/OSCacheControl.h +libproc.h +limits.h +locale.h +malloc/malloc.h +memory.h +monetary.h +monitor.h +mpool.h +msgcat.h +ndbm.h +nl_types.h +nlist.h +os/assumes.h +os/debug_private.h +paths.h +poll.h +printf.h +protocols/routed.h +protocols/rwhod.h +protocols/talkd.h +protocols/timed.h +pthread.h +pthread_impl.h +pthread_spis.h +pthread_workqueue.h +ranlib.h +readpassphrase.h +regex.h +runetype.h +sched.h +search.h +secure/_common.h +secure/_stdio.h +secure/_string.h +semaphore.h +setjmp.h +sgtty.h +signal.h +spawn.h +stab.h +standards.h +stddef.h +stdint.h +stdio.h +stdlib.h +strhash.h +string.h +stringlist.h +strings.h +struct.h +sys/acl.h +sys/rbtree.h +sys/statvfs.h +sysexits.h +syslog.h +tar.h +termios.h +time.h +timeconv.h +ttyent.h +tzfile.h +ucontext.h +ulimit.h +unistd.h +util.h +utime.h +utmpx.h +utmpx_thread.h +vis.h +wchar.h +wctype.h +wordexp.h +xlocale.h +xlocale/__wctype.h +xlocale/_ctype.h +xlocale/_inttypes.h +xlocale/_langinfo.h +xlocale/_monetary.h +xlocale/_regex.h +xlocale/_stdio.h +xlocale/_stdlib.h +xlocale/_string.h +xlocale/_time.h +xlocale/_wchar.h +xlocale/_wctype.h diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix index add51a61d3d3c..5481ae74d38d4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix @@ -11,4 +11,40 @@ appleDerivation { export DSTROOT=$out sh xcodescripts/install_files.sh ''; + + appleHeaders = '' + aliasdb.h + bootparams.h + configuration_profile.h + grp.h + ifaddrs.h + ils.h + kvbuf.h + libinfo.h + libinfo_muser.h + membership.h + membershipPriv.h + netdb.h + netdb_async.h + ntsid.h + printerdb.h + pwd.h + rpc/auth.h + rpc/auth_unix.h + rpc/clnt.h + rpc/pmap_clnt.h + rpc/pmap_prot.h + rpc/pmap_rmt.h + rpc/rpc.h + rpc/rpc_msg.h + rpc/svc.h + rpc/svc_auth.h + rpc/types.h + rpc/xdr.h + rpcsvc/yp_prot.h + rpcsvc/ypclnt.h + si_data.h + si_module.h + thread_data.h + ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index ad3f5dea97579..2c98dd35e39d9 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -115,6 +115,8 @@ appleDerivation { ln -s libresolv.9.dylib $out/lib/libresolv.dylib ''; + appleHeaders = builtins.readFile ./headers.txt; + meta = with lib; { description = "The Mac OS libc/libSystem (tapi library with pure headers)"; maintainers = with maintainers; [ copumpkin gridaphobe ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt new file mode 100644 index 0000000000000..09b0ab410459f --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt @@ -0,0 +1,1727 @@ +AssertMacros.h +Availability.h +AvailabilityInternal.h +AvailabilityMacros.h +Block.h +Block_private.h +CommonCrypto/CommonBaseXX.h +CommonCrypto/CommonBigNum.h +CommonCrypto/CommonCMACSPI.h +CommonCrypto/CommonCRC.h +CommonCrypto/CommonCrypto.h +CommonCrypto/CommonCryptoError.h +CommonCrypto/CommonCryptoPriv.h +CommonCrypto/CommonCryptor.h +CommonCrypto/CommonCryptorSPI.h +CommonCrypto/CommonDH.h +CommonCrypto/CommonDigest.h +CommonCrypto/CommonDigestSPI.h +CommonCrypto/CommonECCryptor.h +CommonCrypto/CommonHMAC.h +CommonCrypto/CommonHMacSPI.h +CommonCrypto/CommonKeyDerivation.h +CommonCrypto/CommonKeyDerivationSPI.h +CommonCrypto/CommonNumerics.h +CommonCrypto/CommonRSACryptor.h +CommonCrypto/CommonRandom.h +CommonCrypto/CommonRandomSPI.h +CommonCrypto/CommonSymmetricKeywrap.h +CommonCrypto/aes.h +CommonCrypto/lionCompat.h +ConditionalMacros.h +CrashReporterClient.h +ExtentManager.h +MacTypes.h +NSSystemDirectories.h +TargetConditionals.h +_errno.h +_libkernel_init.h +_locale.h +_simple.h +_types.h +_types/_intmax_t.h +_types/_nl_item.h +_types/_uint16_t.h +_types/_uint32_t.h +_types/_uint64_t.h +_types/_uint8_t.h +_types/_uintmax_t.h +_types/_wctrans_t.h +_types/_wctype_t.h +_wctype.h +_xlocale.h +aio.h +aliasdb.h +alloca.h +ar.h +architecture/alignment.h +architecture/byte_order.h +architecture/i386/alignment.h +architecture/i386/asm_help.h +architecture/i386/byte_order.h +architecture/i386/cpu.h +architecture/i386/desc.h +architecture/i386/fpu.h +architecture/i386/frame.h +architecture/i386/io.h +architecture/i386/pio.h +architecture/i386/reg_help.h +architecture/i386/sel.h +architecture/i386/table.h +architecture/i386/tss.h +arpa/ftp.h +arpa/inet.h +arpa/nameser_compat.h +arpa/telnet.h +arpa/tftp.h +asl.h +assert.h +atm/atm_notification.defs +atm/atm_types.defs +atm/atm_types.h +bank/bank_types.h +bitstring.h +bootparams.h +bootstrap.h +bootstrap_priv.h +bsd/bsm/audit.h +bsd/dev/random/randomdev.h +bsd/i386/_limits.h +bsd/i386/_mcontext.h +bsd/i386/_param.h +bsd/i386/_types.h +bsd/i386/endian.h +bsd/i386/limits.h +bsd/i386/param.h +bsd/i386/profile.h +bsd/i386/signal.h +bsd/i386/types.h +bsd/i386/vmparam.h +bsd/libkern/libkern.h +bsd/machine/_limits.h +bsd/machine/_mcontext.h +bsd/machine/_param.h +bsd/machine/_types.h +bsd/machine/byte_order.h +bsd/machine/disklabel.h +bsd/machine/endian.h +bsd/machine/limits.h +bsd/machine/param.h +bsd/machine/profile.h +bsd/machine/signal.h +bsd/machine/spl.h +bsd/machine/types.h +bsd/machine/vmparam.h +bsd/miscfs/devfs/devfs.h +bsd/miscfs/devfs/devfs_proto.h +bsd/miscfs/devfs/devfsdefs.h +bsd/miscfs/devfs/fdesc.h +bsd/miscfs/fifofs/fifo.h +bsd/miscfs/specfs/specdev.h +bsd/miscfs/union/union.h +bsd/net/bpf.h +bsd/net/dlil.h +bsd/net/ethernet.h +bsd/net/if.h +bsd/net/if_arp.h +bsd/net/if_dl.h +bsd/net/if_ether.h +bsd/net/if_llc.h +bsd/net/if_media.h +bsd/net/if_mib.h +bsd/net/if_types.h +bsd/net/if_utun.h +bsd/net/if_var.h +bsd/net/init.h +bsd/net/kext_net.h +bsd/net/kpi_interface.h +bsd/net/kpi_interfacefilter.h +bsd/net/kpi_protocol.h +bsd/net/ndrv.h +bsd/net/net_kev.h +bsd/net/pfkeyv2.h +bsd/net/radix.h +bsd/net/route.h +bsd/netinet/bootp.h +bsd/netinet/icmp6.h +bsd/netinet/icmp_var.h +bsd/netinet/if_ether.h +bsd/netinet/igmp.h +bsd/netinet/igmp_var.h +bsd/netinet/in.h +bsd/netinet/in_arp.h +bsd/netinet/in_pcb.h +bsd/netinet/in_systm.h +bsd/netinet/in_var.h +bsd/netinet/ip.h +bsd/netinet/ip6.h +bsd/netinet/ip_icmp.h +bsd/netinet/ip_var.h +bsd/netinet/kpi_ipfilter.h +bsd/netinet/tcp.h +bsd/netinet/tcp_fsm.h +bsd/netinet/tcp_seq.h +bsd/netinet/tcp_timer.h +bsd/netinet/tcp_var.h +bsd/netinet/tcpip.h +bsd/netinet/udp.h +bsd/netinet/udp_var.h +bsd/netinet6/ah.h +bsd/netinet6/esp.h +bsd/netinet6/in6.h +bsd/netinet6/in6_var.h +bsd/netinet6/ipcomp.h +bsd/netinet6/ipsec.h +bsd/netinet6/nd6.h +bsd/netinet6/raw_ip6.h +bsd/netinet6/scope6_var.h +bsd/netkey/keysock.h +bsd/security/audit/audit.h +bsd/security/audit/audit_bsd.h +bsd/security/audit/audit_ioctl.h +bsd/security/audit/audit_private.h +bsd/sys/_endian.h +bsd/sys/_select.h +bsd/sys/_structs.h +bsd/sys/_types.h +bsd/sys/_types/_blkcnt_t.h +bsd/sys/_types/_blksize_t.h +bsd/sys/_types/_clock_t.h +bsd/sys/_types/_ct_rune_t.h +bsd/sys/_types/_dev_t.h +bsd/sys/_types/_errno_t.h +bsd/sys/_types/_fd_clr.h +bsd/sys/_types/_fd_copy.h +bsd/sys/_types/_fd_def.h +bsd/sys/_types/_fd_isset.h +bsd/sys/_types/_fd_set.h +bsd/sys/_types/_fd_setsize.h +bsd/sys/_types/_fd_zero.h +bsd/sys/_types/_filesec_t.h +bsd/sys/_types/_fsblkcnt_t.h +bsd/sys/_types/_fsfilcnt_t.h +bsd/sys/_types/_fsid_t.h +bsd/sys/_types/_fsobj_id_t.h +bsd/sys/_types/_gid_t.h +bsd/sys/_types/_guid_t.h +bsd/sys/_types/_id_t.h +bsd/sys/_types/_in_addr_t.h +bsd/sys/_types/_in_port_t.h +bsd/sys/_types/_ino64_t.h +bsd/sys/_types/_ino_t.h +bsd/sys/_types/_int16_t.h +bsd/sys/_types/_int32_t.h +bsd/sys/_types/_int64_t.h +bsd/sys/_types/_int8_t.h +bsd/sys/_types/_intptr_t.h +bsd/sys/_types/_iovec_t.h +bsd/sys/_types/_key_t.h +bsd/sys/_types/_mach_port_t.h +bsd/sys/_types/_mbstate_t.h +bsd/sys/_types/_mode_t.h +bsd/sys/_types/_nlink_t.h +bsd/sys/_types/_null.h +bsd/sys/_types/_o_dsync.h +bsd/sys/_types/_o_sync.h +bsd/sys/_types/_off_t.h +bsd/sys/_types/_offsetof.h +bsd/sys/_types/_os_inline.h +bsd/sys/_types/_pid_t.h +bsd/sys/_types/_posix_vdisable.h +bsd/sys/_types/_ptrdiff_t.h +bsd/sys/_types/_rsize_t.h +bsd/sys/_types/_rune_t.h +bsd/sys/_types/_s_ifmt.h +bsd/sys/_types/_sa_family_t.h +bsd/sys/_types/_seek_set.h +bsd/sys/_types/_sigaltstack.h +bsd/sys/_types/_sigset_t.h +bsd/sys/_types/_size_t.h +bsd/sys/_types/_socklen_t.h +bsd/sys/_types/_ssize_t.h +bsd/sys/_types/_suseconds_t.h +bsd/sys/_types/_time_t.h +bsd/sys/_types/_timespec.h +bsd/sys/_types/_timeval.h +bsd/sys/_types/_timeval32.h +bsd/sys/_types/_timeval64.h +bsd/sys/_types/_u_int16_t.h +bsd/sys/_types/_u_int32_t.h +bsd/sys/_types/_u_int64_t.h +bsd/sys/_types/_u_int8_t.h +bsd/sys/_types/_ucontext.h +bsd/sys/_types/_ucontext64.h +bsd/sys/_types/_uid_t.h +bsd/sys/_types/_uintptr_t.h +bsd/sys/_types/_useconds_t.h +bsd/sys/_types/_user32_itimerval.h +bsd/sys/_types/_user32_timespec.h +bsd/sys/_types/_user32_timeval.h +bsd/sys/_types/_user64_itimerval.h +bsd/sys/_types/_user64_timespec.h +bsd/sys/_types/_user64_timeval.h +bsd/sys/_types/_user_timespec.h +bsd/sys/_types/_user_timeval.h +bsd/sys/_types/_uuid_t.h +bsd/sys/_types/_va_list.h +bsd/sys/_types/_wchar_t.h +bsd/sys/_types/_wint_t.h +bsd/sys/appleapiopts.h +bsd/sys/attr.h +bsd/sys/bsdtask_info.h +bsd/sys/buf.h +bsd/sys/cdefs.h +bsd/sys/codesign.h +bsd/sys/conf.h +bsd/sys/content_protection.h +bsd/sys/cprotect.h +bsd/sys/csr.h +bsd/sys/decmpfs.h +bsd/sys/dir.h +bsd/sys/dirent.h +bsd/sys/disk.h +bsd/sys/disklabel.h +bsd/sys/disktab.h +bsd/sys/dkstat.h +bsd/sys/doc_tombstone.h +bsd/sys/domain.h +bsd/sys/errno.h +bsd/sys/ev.h +bsd/sys/event.h +bsd/sys/eventvar.h +bsd/sys/fbt.h +bsd/sys/fcntl.h +bsd/sys/file.h +bsd/sys/file_internal.h +bsd/sys/filedesc.h +bsd/sys/fileport.h +bsd/sys/filio.h +bsd/sys/fsctl.h +bsd/sys/fsevents.h +bsd/sys/fslog.h +bsd/sys/guarded.h +bsd/sys/imgact.h +bsd/sys/ioccom.h +bsd/sys/ioctl.h +bsd/sys/ioctl_compat.h +bsd/sys/ipc.h +bsd/sys/kasl.h +bsd/sys/kauth.h +bsd/sys/kdebug.h +bsd/sys/kdebugevents.h +bsd/sys/kern_control.h +bsd/sys/kern_event.h +bsd/sys/kern_memorystatus.h +bsd/sys/kernel.h +bsd/sys/kernel_types.h +bsd/sys/kpi_mbuf.h +bsd/sys/kpi_private.h +bsd/sys/kpi_socket.h +bsd/sys/kpi_socketfilter.h +bsd/sys/ktrace.h +bsd/sys/linker_set.h +bsd/sys/lock.h +bsd/sys/lockf.h +bsd/sys/mach_swapon.h +bsd/sys/malloc.h +bsd/sys/mbuf.h +bsd/sys/md5.h +bsd/sys/memory_maintenance.h +bsd/sys/mman.h +bsd/sys/mount.h +bsd/sys/mount_internal.h +bsd/sys/msg.h +bsd/sys/msgbuf.h +bsd/sys/munge.h +bsd/sys/namei.h +bsd/sys/netport.h +bsd/sys/param.h +bsd/sys/paths.h +bsd/sys/persona.h +bsd/sys/pgo.h +bsd/sys/pipe.h +bsd/sys/posix_sem.h +bsd/sys/posix_shm.h +bsd/sys/priv.h +bsd/sys/proc.h +bsd/sys/proc_info.h +bsd/sys/proc_internal.h +bsd/sys/protosw.h +bsd/sys/pthread_internal.h +bsd/sys/pthread_shims.h +bsd/sys/queue.h +bsd/sys/quota.h +bsd/sys/random.h +bsd/sys/reason.h +bsd/sys/resource.h +bsd/sys/resourcevar.h +bsd/sys/sbuf.h +bsd/sys/select.h +bsd/sys/sem.h +bsd/sys/sem_internal.h +bsd/sys/semaphore.h +bsd/sys/shm.h +bsd/sys/shm_internal.h +bsd/sys/signal.h +bsd/sys/signalvar.h +bsd/sys/socket.h +bsd/sys/socketvar.h +bsd/sys/sockio.h +bsd/sys/spawn.h +bsd/sys/spawn_internal.h +bsd/sys/stackshot.h +bsd/sys/stat.h +bsd/sys/stdio.h +bsd/sys/sys_domain.h +bsd/sys/syscall.h +bsd/sys/sysctl.h +bsd/sys/syslimits.h +bsd/sys/syslog.h +bsd/sys/sysproto.h +bsd/sys/systm.h +bsd/sys/termios.h +bsd/sys/time.h +bsd/sys/tree.h +bsd/sys/tty.h +bsd/sys/ttychars.h +bsd/sys/ttycom.h +bsd/sys/ttydefaults.h +bsd/sys/ttydev.h +bsd/sys/types.h +bsd/sys/ubc.h +bsd/sys/ucontext.h +bsd/sys/ucred.h +bsd/sys/uio.h +bsd/sys/uio_internal.h +bsd/sys/ulock.h +bsd/sys/un.h +bsd/sys/unistd.h +bsd/sys/unpcb.h +bsd/sys/user.h +bsd/sys/utfconv.h +bsd/sys/vfs_context.h +bsd/sys/vm.h +bsd/sys/vmmeter.h +bsd/sys/vmparam.h +bsd/sys/vnode.h +bsd/sys/vnode_if.h +bsd/sys/vnode_internal.h +bsd/sys/wait.h +bsd/sys/xattr.h +bsd/uuid/uuid.h +bsd/vfs/vfs_support.h +bsd/vm/vnode_pager.h +bsm/audit.h +bsm/audit_domain.h +bsm/audit_errno.h +bsm/audit_fcntl.h +bsm/audit_internal.h +bsm/audit_kevents.h +bsm/audit_record.h +bsm/audit_socket_type.h +checkint.h +complex.h +configuration_profile.h +copyfile.h +corecrypto/cc.h +corecrypto/cc_config.h +corecrypto/cc_debug.h +corecrypto/cc_macros.h +corecrypto/cc_priv.h +corecrypto/ccaes.h +corecrypto/ccasn1.h +corecrypto/cccmac.h +corecrypto/ccder.h +corecrypto/ccdes.h +corecrypto/ccdigest.h +corecrypto/ccdigest_priv.h +corecrypto/ccdrbg.h +corecrypto/ccdrbg_impl.h +corecrypto/cchmac.h +corecrypto/ccmd5.h +corecrypto/ccmode.h +corecrypto/ccmode_factory.h +corecrypto/ccmode_impl.h +corecrypto/ccmode_siv.h +corecrypto/ccn.h +corecrypto/ccpad.h +corecrypto/ccpbkdf2.h +corecrypto/ccrc4.h +corecrypto/ccrng.h +corecrypto/ccrng_system.h +corecrypto/ccrsa.h +corecrypto/ccsha1.h +corecrypto/ccsha2.h +corecrypto/cczp.h +corpses/task_corpse.h +cpio.h +crt_externs.h +ctype.h +curses.h +cursesapp.h +cursesf.h +cursesm.h +cursesp.h +cursesw.h +cursslk.h +db.h +default_pager/default_pager_types.h +device/device.defs +device/device_port.h +device/device_types.defs +device/device_types.h +dirent.h +disktab.h +dispatch/base.h +dispatch/benchmark.h +dispatch/block.h +dispatch/data.h +dispatch/data_private.h +dispatch/dispatch.h +dispatch/group.h +dispatch/introspection.h +dispatch/introspection_private.h +dispatch/io.h +dispatch/io_private.h +dispatch/layout_private.h +dispatch/mach_private.h +dispatch/object.h +dispatch/once.h +dispatch/private.h +dispatch/queue.h +dispatch/queue_private.h +dispatch/semaphore.h +dispatch/source.h +dispatch/source_private.h +dispatch/time.h +dlfcn.h +dns.h +dns_sd.h +dns_util.h +err.h +errno.h +eti.h +etip.h +execinfo.h +fcntl.h +fenv.h +fmtmsg.h +fnmatch.h +form.h +fsproperties.h +fstab.h +fts.h +ftw.h +get_compat.h +gethostuuid.h +gethostuuid_private.h +getopt.h +glob.h +grp.h +hfs/BTreeScanner.h +hfs/BTreesInternal.h +hfs/BTreesPrivate.h +hfs/CatalogPrivate.h +hfs/FileMgrInternal.h +hfs/HFSUnicodeWrappers.h +hfs/UCStringCompareData.h +hfs/hfs.h +hfs/hfs_alloc_trace.h +hfs/hfs_attrlist.h +hfs/hfs_btreeio.h +hfs/hfs_catalog.h +hfs/hfs_cnode.h +hfs/hfs_cprotect.h +hfs/hfs_dbg.h +hfs/hfs_endian.h +hfs/hfs_extents.h +hfs/hfs_format.h +hfs/hfs_fsctl.h +hfs/hfs_hotfiles.h +hfs/hfs_iokit.h +hfs/hfs_journal.h +hfs/hfs_kdebug.h +hfs/hfs_key_roll.h +hfs/hfs_macos_defs.h +hfs/hfs_mount.h +hfs/hfs_quota.h +hfs/hfs_unistr.h +hfs/kext-config.h +hfs/rangelist.h +i386/_limits.h +i386/_mcontext.h +i386/_param.h +i386/_types.h +i386/eflags.h +i386/endian.h +i386/fasttrap_isa.h +i386/limits.h +i386/param.h +i386/profile.h +i386/signal.h +i386/types.h +i386/user_ldt.h +i386/vmparam.h +ifaddrs.h +ils.h +inttypes.h +iokit/IOKit/AppleKeyStoreInterface.h +iokit/IOKit/IOBSD.h +iokit/IOKit/IOBufferMemoryDescriptor.h +iokit/IOKit/IOCPU.h +iokit/IOKit/IOCatalogue.h +iokit/IOKit/IOCommand.h +iokit/IOKit/IOCommandGate.h +iokit/IOKit/IOCommandPool.h +iokit/IOKit/IOCommandQueue.h +iokit/IOKit/IOConditionLock.h +iokit/IOKit/IODMACommand.h +iokit/IOKit/IODMAController.h +iokit/IOKit/IODMAEventSource.h +iokit/IOKit/IODataQueue.h +iokit/IOKit/IODataQueueShared.h +iokit/IOKit/IODeviceMemory.h +iokit/IOKit/IODeviceTreeSupport.h +iokit/IOKit/IOEventSource.h +iokit/IOKit/IOFilterInterruptEventSource.h +iokit/IOKit/IOHibernatePrivate.h +iokit/IOKit/IOInterleavedMemoryDescriptor.h +iokit/IOKit/IOInterruptAccounting.h +iokit/IOKit/IOInterruptController.h +iokit/IOKit/IOInterruptEventSource.h +iokit/IOKit/IOInterrupts.h +iokit/IOKit/IOKernelReportStructs.h +iokit/IOKit/IOKernelReporters.h +iokit/IOKit/IOKitDebug.h +iokit/IOKit/IOKitDiagnosticsUserClient.h +iokit/IOKit/IOKitKeys.h +iokit/IOKit/IOKitKeysPrivate.h +iokit/IOKit/IOKitServer.h +iokit/IOKit/IOLib.h +iokit/IOKit/IOLocks.h +iokit/IOKit/IOLocksPrivate.h +iokit/IOKit/IOMapper.h +iokit/IOKit/IOMemoryCursor.h +iokit/IOKit/IOMemoryDescriptor.h +iokit/IOKit/IOMessage.h +iokit/IOKit/IOMultiMemoryDescriptor.h +iokit/IOKit/IONVRAM.h +iokit/IOKit/IONotifier.h +iokit/IOKit/IOPlatformExpert.h +iokit/IOKit/IOPolledInterface.h +iokit/IOKit/IORangeAllocator.h +iokit/IOKit/IORegistryEntry.h +iokit/IOKit/IOReportMacros.h +iokit/IOKit/IOReportTypes.h +iokit/IOKit/IOReturn.h +iokit/IOKit/IOService.h +iokit/IOKit/IOServicePM.h +iokit/IOKit/IOSharedDataQueue.h +iokit/IOKit/IOSharedLock.h +iokit/IOKit/IOStatistics.h +iokit/IOKit/IOStatisticsPrivate.h +iokit/IOKit/IOSubMemoryDescriptor.h +iokit/IOKit/IOSyncer.h +iokit/IOKit/IOTimeStamp.h +iokit/IOKit/IOTimerEventSource.h +iokit/IOKit/IOTypes.h +iokit/IOKit/IOUserClient.h +iokit/IOKit/IOWorkLoop.h +iokit/IOKit/OSMessageNotification.h +iokit/IOKit/assert.h +iokit/IOKit/nvram/IONVRAMController.h +iokit/IOKit/platform/AppleMacIO.h +iokit/IOKit/platform/AppleMacIODevice.h +iokit/IOKit/platform/AppleNMI.h +iokit/IOKit/platform/ApplePlatformExpert.h +iokit/IOKit/power/IOPwrController.h +iokit/IOKit/pwr_mgt/IOPM.h +iokit/IOKit/pwr_mgt/IOPMLibDefs.h +iokit/IOKit/pwr_mgt/IOPMPowerSource.h +iokit/IOKit/pwr_mgt/IOPMPowerSourceList.h +iokit/IOKit/pwr_mgt/IOPMpowerState.h +iokit/IOKit/pwr_mgt/IOPowerConnection.h +iokit/IOKit/pwr_mgt/RootDomain.h +iokit/IOKit/rtc/IORTCController.h +iokit/IOKit/system.h +iokit/IOKit/system_management/IOWatchDogTimer.h +iso646.h +kern/exc_resource.h +kern/kcdata.h +kern/kern_cdata.h +kvbuf.h +langinfo.h +launch.h +launch_internal.h +launch_priv.h +libc.h +libc_private.h +libgen.h +libinfo.h +libinfo_muser.h +libkern/OSAtomic.h +libkern/OSAtomicDeprecated.h +libkern/OSAtomicQueue.h +libkern/OSByteOrder.h +libkern/OSCacheControl.h +libkern/OSDebug.h +libkern/OSKextLib.h +libkern/OSReturn.h +libkern/OSSpinLockDeprecated.h +libkern/OSTypes.h +libkern/_OSByteOrder.h +libkern/firehose/chunk_private.h +libkern/firehose/firehose_types_private.h +libkern/firehose/ioctl_private.h +libkern/firehose/tracepoint_private.h +libkern/i386/OSByteOrder.h +libkern/i386/_OSByteOrder.h +libkern/libkern/OSAtomic.h +libkern/libkern/OSBase.h +libkern/libkern/OSByteOrder.h +libkern/libkern/OSDebug.h +libkern/libkern/OSKextLib.h +libkern/libkern/OSKextLibPrivate.h +libkern/libkern/OSMalloc.h +libkern/libkern/OSReturn.h +libkern/libkern/OSSerializeBinary.h +libkern/libkern/OSTypes.h +libkern/libkern/_OSByteOrder.h +libkern/libkern/c++/OSArray.h +libkern/libkern/c++/OSBoolean.h +libkern/libkern/c++/OSCPPDebug.h +libkern/libkern/c++/OSCollection.h +libkern/libkern/c++/OSCollectionIterator.h +libkern/libkern/c++/OSContainers.h +libkern/libkern/c++/OSData.h +libkern/libkern/c++/OSDictionary.h +libkern/libkern/c++/OSEndianTypes.h +libkern/libkern/c++/OSIterator.h +libkern/libkern/c++/OSKext.h +libkern/libkern/c++/OSLib.h +libkern/libkern/c++/OSMetaClass.h +libkern/libkern/c++/OSNumber.h +libkern/libkern/c++/OSObject.h +libkern/libkern/c++/OSOrderedSet.h +libkern/libkern/c++/OSSerialize.h +libkern/libkern/c++/OSSet.h +libkern/libkern/c++/OSString.h +libkern/libkern/c++/OSSymbol.h +libkern/libkern/c++/OSUnserialize.h +libkern/libkern/crypto/aes.h +libkern/libkern/crypto/aesxts.h +libkern/libkern/crypto/crypto_internal.h +libkern/libkern/crypto/des.h +libkern/libkern/crypto/md5.h +libkern/libkern/crypto/rand.h +libkern/libkern/crypto/register_crypto.h +libkern/libkern/crypto/rsa.h +libkern/libkern/crypto/sha1.h +libkern/libkern/crypto/sha2.h +libkern/libkern/i386/OSByteOrder.h +libkern/libkern/i386/_OSByteOrder.h +libkern/libkern/kernel_mach_header.h +libkern/libkern/kext_request_keys.h +libkern/libkern/kxld.h +libkern/libkern/kxld_types.h +libkern/libkern/locks.h +libkern/libkern/machine/OSByteOrder.h +libkern/libkern/mkext.h +libkern/libkern/prelink.h +libkern/libkern/section_keywords.h +libkern/libkern/stack_protector.h +libkern/libkern/sysctl.h +libkern/libkern/tree.h +libkern/libkern/version.h +libkern/libkern/zconf.h +libkern/libkern/zlib.h +libkern/machine/OSByteOrder.h +libkern/os/base.h +libkern/os/log.h +libkern/os/log_private.h +libkern/os/object.h +libkern/os/object_private.h +libkern/os/overflow.h +libkern/os/trace.h +libproc.h +libutil.h +limits.h +locale.h +mach-o/arch.h +mach-o/arm/reloc.h +mach-o/arm64/reloc.h +mach-o/dyld-interposing.h +mach-o/dyld.h +mach-o/dyld_gdb.h +mach-o/dyld_images.h +mach-o/dyld_priv.h +mach-o/dyld_process_info.h +mach-o/fat.h +mach-o/getsect.h +mach-o/hppa/reloc.h +mach-o/hppa/swap.h +mach-o/i386/swap.h +mach-o/i860/reloc.h +mach-o/i860/swap.h +mach-o/ldsyms.h +mach-o/loader.h +mach-o/m68k/swap.h +mach-o/m88k/reloc.h +mach-o/m88k/swap.h +mach-o/nlist.h +mach-o/ppc/reloc.h +mach-o/ppc/swap.h +mach-o/ranlib.h +mach-o/reloc.h +mach-o/sparc/reloc.h +mach-o/sparc/swap.h +mach-o/stab.h +mach-o/swap.h +mach-o/x86_64/reloc.h +mach/audit_triggers.defs +mach/boolean.h +mach/bootstrap.h +mach/clock.defs +mach/clock.h +mach/clock_priv.defs +mach/clock_priv.h +mach/clock_reply.defs +mach/clock_reply.h +mach/clock_types.defs +mach/clock_types.h +mach/dyld_kernel.h +mach/error.h +mach/exc.defs +mach/exc.h +mach/exception.h +mach/exception_types.h +mach/host_info.h +mach/host_notify.h +mach/host_notify_reply.defs +mach/host_priv.defs +mach/host_priv.h +mach/host_reboot.h +mach/host_security.defs +mach/host_security.h +mach/host_special_ports.h +mach/i386/_structs.h +mach/i386/asm.h +mach/i386/boolean.h +mach/i386/exception.h +mach/i386/fp_reg.h +mach/i386/kern_return.h +mach/i386/ndr_def.h +mach/i386/processor_info.h +mach/i386/rpc.h +mach/i386/sdt_isa.h +mach/i386/thread_state.h +mach/i386/thread_status.h +mach/i386/vm_param.h +mach/i386/vm_types.h +mach/kern_return.h +mach/kmod.h +mach/lock_set.defs +mach/lock_set.h +mach/mach.h +mach/mach_error.h +mach/mach_exc.defs +mach/mach_host.defs +mach/mach_host.h +mach/mach_init.h +mach/mach_interface.h +mach/mach_param.h +mach/mach_port.defs +mach/mach_port.h +mach/mach_port_internal.h +mach/mach_syscalls.h +mach/mach_time.h +mach/mach_traps.h +mach/mach_types.defs +mach/mach_types.h +mach/mach_vm.defs +mach/mach_vm.h +mach/mach_vm_internal.h +mach/mach_voucher.defs +mach/mach_voucher.h +mach/mach_voucher_attr_control.defs +mach/mach_voucher_types.h +mach/machine.h +mach/machine/asm.h +mach/machine/boolean.h +mach/machine/exception.h +mach/machine/kern_return.h +mach/machine/machine_types.defs +mach/machine/ndr_def.h +mach/machine/processor_info.h +mach/machine/rpc.h +mach/machine/sdt.h +mach/machine/sdt_isa.h +mach/machine/thread_state.h +mach/machine/thread_status.h +mach/machine/vm_param.h +mach/machine/vm_types.h +mach/memory_object_types.h +mach/message.h +mach/mig.h +mach/mig_errors.h +mach/mig_strncpy_zerofill_support.h +mach/mig_voucher_support.h +mach/ndr.h +mach/notify.defs +mach/notify.h +mach/policy.h +mach/port.h +mach/port_obj.h +mach/processor.defs +mach/processor.h +mach/processor_info.h +mach/processor_set.defs +mach/processor_set.h +mach/rpc.h +mach/sdt.h +mach/semaphore.h +mach/shared_memory_server.h +mach/shared_region.h +mach/std_types.defs +mach/std_types.h +mach/sync.h +mach/sync_policy.h +mach/task.defs +mach/task.h +mach/task_access.defs +mach/task_info.h +mach/task_policy.h +mach/task_special_ports.h +mach/telemetry_notification.defs +mach/thread_act.defs +mach/thread_act.h +mach/thread_act_internal.h +mach/thread_info.h +mach/thread_policy.h +mach/thread_special_ports.h +mach/thread_state.h +mach/thread_status.h +mach/thread_switch.h +mach/time_value.h +mach/vm_attributes.h +mach/vm_behavior.h +mach/vm_inherit.h +mach/vm_map.defs +mach/vm_map.h +mach/vm_map_internal.h +mach/vm_page_size.h +mach/vm_param.h +mach/vm_prot.h +mach/vm_purgable.h +mach/vm_region.h +mach/vm_statistics.h +mach/vm_sync.h +mach/vm_task.h +mach/vm_types.h +mach_debug/hash_info.h +mach_debug/ipc_info.h +mach_debug/lockgroup_info.h +mach_debug/mach_debug.h +mach_debug/mach_debug_types.defs +mach_debug/mach_debug_types.h +mach_debug/page_info.h +mach_debug/vm_info.h +mach_debug/zone_info.h +machine/_limits.h +machine/_mcontext.h +machine/_param.h +machine/_types.h +machine/byte_order.h +machine/endian.h +machine/fasttrap_isa.h +machine/limits.h +machine/param.h +machine/profile.h +machine/signal.h +machine/types.h +machine/vmparam.h +malloc/malloc.h +math.h +membership.h +membershipPriv.h +memory.h +menu.h +miscfs/devfs/devfs.h +miscfs/specfs/specdev.h +miscfs/union/union.h +mntopts.h +monetary.h +monitor.h +mpool.h +msgcat.h +nameser.h +nc_tparm.h +ncurses_dll.h +ndbm.h +net/bpf.h +net/dlil.h +net/ethernet.h +net/if.h +net/if_arp.h +net/if_dl.h +net/if_llc.h +net/if_media.h +net/if_mib.h +net/if_types.h +net/if_utun.h +net/if_var.h +net/kext_net.h +net/ndrv.h +net/net_kev.h +net/pfkeyv2.h +net/route.h +netdb.h +netdb_async.h +netinet/bootp.h +netinet/icmp6.h +netinet/icmp_var.h +netinet/if_ether.h +netinet/igmp.h +netinet/igmp_var.h +netinet/in.h +netinet/in_pcb.h +netinet/in_systm.h +netinet/in_var.h +netinet/ip.h +netinet/ip6.h +netinet/ip_icmp.h +netinet/ip_var.h +netinet/tcp.h +netinet/tcp_fsm.h +netinet/tcp_seq.h +netinet/tcp_timer.h +netinet/tcp_var.h +netinet/tcpip.h +netinet/udp.h +netinet/udp_var.h +netinet6/ah.h +netinet6/esp.h +netinet6/in6.h +netinet6/in6_var.h +netinet6/ipcomp.h +netinet6/ipsec.h +netinet6/nd6.h +netinet6/raw_ip6.h +netinet6/scope6_var.h +netkey/keysock.h +nfs/krpc.h +nfs/nfs.h +nfs/nfs_gss.h +nfs/nfs_ioctl.h +nfs/nfs_lock.h +nfs/nfsdiskless.h +nfs/nfsm_subs.h +nfs/nfsmount.h +nfs/nfsnode.h +nfs/nfsproto.h +nfs/nfsrvcache.h +nfs/rpcv2.h +nfs/xdr_subs.h +nl_types.h +nlist.h +notify.h +notify_keys.h +ntsid.h +objc-shared-cache.h +os/activity.h +os/alloc_once_impl.h +os/assumes.h +os/availability.h +os/base.h +os/base_private.h +os/debug_private.h +os/internal/atomic.h +os/internal/crashlog.h +os/internal/internal_shared.h +os/lock.h +os/lock_private.h +os/log.h +os/object.h +os/object_private.h +os/once_private.h +os/overflow.h +os/semaphore_private.h +os/trace.h +os/tsd.h +os/voucher_activity_private.h +os/voucher_private.h +osfmk/UserNotification/KUNCUserNotifications.h +osfmk/UserNotification/UNDReply.defs +osfmk/UserNotification/UNDRequest.defs +osfmk/UserNotification/UNDTypes.defs +osfmk/UserNotification/UNDTypes.h +osfmk/atm/atm_internal.h +osfmk/atm/atm_notification.defs +osfmk/atm/atm_types.defs +osfmk/atm/atm_types.h +osfmk/bank/bank_types.h +osfmk/console/video_console.h +osfmk/corpses/task_corpse.h +osfmk/default_pager/default_pager_types.h +osfmk/device/device.defs +osfmk/device/device_port.h +osfmk/device/device_types.defs +osfmk/device/device_types.h +osfmk/gssd/gssd_mach.defs +osfmk/gssd/gssd_mach.h +osfmk/gssd/gssd_mach_types.h +osfmk/i386/apic.h +osfmk/i386/asm.h +osfmk/i386/atomic.h +osfmk/i386/bit_routines.h +osfmk/i386/cpu_capabilities.h +osfmk/i386/cpu_data.h +osfmk/i386/cpu_number.h +osfmk/i386/cpu_topology.h +osfmk/i386/cpuid.h +osfmk/i386/eflags.h +osfmk/i386/io_map_entries.h +osfmk/i386/lapic.h +osfmk/i386/lock.h +osfmk/i386/locks.h +osfmk/i386/machine_cpu.h +osfmk/i386/machine_routines.h +osfmk/i386/mp.h +osfmk/i386/mp_desc.h +osfmk/i386/mp_events.h +osfmk/i386/mtrr.h +osfmk/i386/pal_hibernate.h +osfmk/i386/pal_native.h +osfmk/i386/pal_routines.h +osfmk/i386/panic_hooks.h +osfmk/i386/pmCPU.h +osfmk/i386/pmap.h +osfmk/i386/proc_reg.h +osfmk/i386/rtclock_protos.h +osfmk/i386/seg.h +osfmk/i386/simple_lock.h +osfmk/i386/smp.h +osfmk/i386/tsc.h +osfmk/i386/tss.h +osfmk/i386/ucode.h +osfmk/i386/vmx.h +osfmk/ipc/ipc_types.h +osfmk/kdp/kdp_callout.h +osfmk/kdp/kdp_dyld.h +osfmk/kdp/kdp_en_debugger.h +osfmk/kern/affinity.h +osfmk/kern/assert.h +osfmk/kern/audit_sessionport.h +osfmk/kern/backtrace.h +osfmk/kern/bits.h +osfmk/kern/block_hint.h +osfmk/kern/call_entry.h +osfmk/kern/clock.h +osfmk/kern/coalition.h +osfmk/kern/cpu_data.h +osfmk/kern/cpu_number.h +osfmk/kern/debug.h +osfmk/kern/ecc.h +osfmk/kern/energy_perf.h +osfmk/kern/exc_resource.h +osfmk/kern/extmod_statistics.h +osfmk/kern/host.h +osfmk/kern/hv_support.h +osfmk/kern/ipc_mig.h +osfmk/kern/ipc_misc.h +osfmk/kern/kalloc.h +osfmk/kern/kcdata.h +osfmk/kern/kern_cdata.h +osfmk/kern/kern_types.h +osfmk/kern/kext_alloc.h +osfmk/kern/kpc.h +osfmk/kern/ledger.h +osfmk/kern/lock.h +osfmk/kern/locks.h +osfmk/kern/mach_param.h +osfmk/kern/macro_help.h +osfmk/kern/page_decrypt.h +osfmk/kern/pms.h +osfmk/kern/policy_internal.h +osfmk/kern/processor.h +osfmk/kern/queue.h +osfmk/kern/sched_prim.h +osfmk/kern/sfi.h +osfmk/kern/simple_lock.h +osfmk/kern/startup.h +osfmk/kern/task.h +osfmk/kern/telemetry.h +osfmk/kern/thread.h +osfmk/kern/thread_call.h +osfmk/kern/timer_call.h +osfmk/kern/waitq.h +osfmk/kern/zalloc.h +osfmk/kextd/kextd_mach.defs +osfmk/kextd/kextd_mach.h +osfmk/kperf/action.h +osfmk/kperf/context.h +osfmk/kperf/kdebug_trigger.h +osfmk/kperf/kperf.h +osfmk/kperf/kperf_timer.h +osfmk/kperf/kperfbsd.h +osfmk/kperf/pet.h +osfmk/lockd/lockd_mach.defs +osfmk/lockd/lockd_mach.h +osfmk/lockd/lockd_mach_types.h +osfmk/mach/audit_triggers.defs +osfmk/mach/audit_triggers_server.h +osfmk/mach/boolean.h +osfmk/mach/branch_predicates.h +osfmk/mach/clock.defs +osfmk/mach/clock.h +osfmk/mach/clock_priv.defs +osfmk/mach/clock_priv.h +osfmk/mach/clock_reply.defs +osfmk/mach/clock_reply_server.h +osfmk/mach/clock_types.defs +osfmk/mach/clock_types.h +osfmk/mach/coalition.h +osfmk/mach/coalition_notification_server.h +osfmk/mach/dyld_kernel.h +osfmk/mach/error.h +osfmk/mach/exc.defs +osfmk/mach/exc_server.h +osfmk/mach/exception.h +osfmk/mach/exception_types.h +osfmk/mach/host_info.h +osfmk/mach/host_notify.h +osfmk/mach/host_notify_reply.defs +osfmk/mach/host_priv.defs +osfmk/mach/host_priv.h +osfmk/mach/host_reboot.h +osfmk/mach/host_security.defs +osfmk/mach/host_security.h +osfmk/mach/host_special_ports.h +osfmk/mach/i386/_structs.h +osfmk/mach/i386/asm.h +osfmk/mach/i386/boolean.h +osfmk/mach/i386/exception.h +osfmk/mach/i386/fp_reg.h +osfmk/mach/i386/kern_return.h +osfmk/mach/i386/ndr_def.h +osfmk/mach/i386/processor_info.h +osfmk/mach/i386/rpc.h +osfmk/mach/i386/sdt_isa.h +osfmk/mach/i386/syscall_sw.h +osfmk/mach/i386/thread_state.h +osfmk/mach/i386/thread_status.h +osfmk/mach/i386/vm_param.h +osfmk/mach/i386/vm_types.h +osfmk/mach/kern_return.h +osfmk/mach/kmod.h +osfmk/mach/ktrace_background.h +osfmk/mach/lock_set.defs +osfmk/mach/lock_set.h +osfmk/mach/mach_exc.defs +osfmk/mach/mach_exc_server.h +osfmk/mach/mach_host.defs +osfmk/mach/mach_host.h +osfmk/mach/mach_interface.h +osfmk/mach/mach_param.h +osfmk/mach/mach_port.defs +osfmk/mach/mach_port.h +osfmk/mach/mach_syscalls.h +osfmk/mach/mach_time.h +osfmk/mach/mach_traps.h +osfmk/mach/mach_types.defs +osfmk/mach/mach_types.h +osfmk/mach/mach_vm.defs +osfmk/mach/mach_vm.h +osfmk/mach/mach_voucher.defs +osfmk/mach/mach_voucher.h +osfmk/mach/mach_voucher_attr_control.defs +osfmk/mach/mach_voucher_attr_control.h +osfmk/mach/mach_voucher_types.h +osfmk/mach/machine.h +osfmk/mach/machine/asm.h +osfmk/mach/machine/boolean.h +osfmk/mach/machine/exception.h +osfmk/mach/machine/kern_return.h +osfmk/mach/machine/machine_types.defs +osfmk/mach/machine/ndr_def.h +osfmk/mach/machine/processor_info.h +osfmk/mach/machine/rpc.h +osfmk/mach/machine/sdt.h +osfmk/mach/machine/sdt_isa.h +osfmk/mach/machine/syscall_sw.h +osfmk/mach/machine/thread_state.h +osfmk/mach/machine/thread_status.h +osfmk/mach/machine/vm_param.h +osfmk/mach/machine/vm_types.h +osfmk/mach/memory_object_control.h +osfmk/mach/memory_object_default_server.h +osfmk/mach/memory_object_types.h +osfmk/mach/message.h +osfmk/mach/mig.h +osfmk/mach/mig_errors.h +osfmk/mach/mig_strncpy_zerofill_support.h +osfmk/mach/mig_voucher_support.h +osfmk/mach/ndr.h +osfmk/mach/notify.defs +osfmk/mach/notify.h +osfmk/mach/notify_server.h +osfmk/mach/policy.h +osfmk/mach/port.h +osfmk/mach/processor.defs +osfmk/mach/processor.h +osfmk/mach/processor_info.h +osfmk/mach/processor_set.defs +osfmk/mach/processor_set.h +osfmk/mach/resource_monitors.h +osfmk/mach/rpc.h +osfmk/mach/sdt.h +osfmk/mach/semaphore.h +osfmk/mach/sfi_class.h +osfmk/mach/shared_memory_server.h +osfmk/mach/shared_region.h +osfmk/mach/std_types.defs +osfmk/mach/std_types.h +osfmk/mach/sync_policy.h +osfmk/mach/syscall_sw.h +osfmk/mach/sysdiagnose_notification_server.h +osfmk/mach/task.defs +osfmk/mach/task.h +osfmk/mach/task_access.defs +osfmk/mach/task_access.h +osfmk/mach/task_access_server.h +osfmk/mach/task_info.h +osfmk/mach/task_policy.h +osfmk/mach/task_special_ports.h +osfmk/mach/telemetry_notification.defs +osfmk/mach/telemetry_notification_server.h +osfmk/mach/thread_act.defs +osfmk/mach/thread_act.h +osfmk/mach/thread_info.h +osfmk/mach/thread_policy.h +osfmk/mach/thread_special_ports.h +osfmk/mach/thread_status.h +osfmk/mach/thread_switch.h +osfmk/mach/time_value.h +osfmk/mach/upl.h +osfmk/mach/vm_attributes.h +osfmk/mach/vm_behavior.h +osfmk/mach/vm_inherit.h +osfmk/mach/vm_map.defs +osfmk/mach/vm_map.h +osfmk/mach/vm_param.h +osfmk/mach/vm_prot.h +osfmk/mach/vm_purgable.h +osfmk/mach/vm_region.h +osfmk/mach/vm_statistics.h +osfmk/mach/vm_sync.h +osfmk/mach/vm_types.h +osfmk/mach_debug/hash_info.h +osfmk/mach_debug/ipc_info.h +osfmk/mach_debug/lockgroup_info.h +osfmk/mach_debug/mach_debug.h +osfmk/mach_debug/mach_debug_types.defs +osfmk/mach_debug/mach_debug_types.h +osfmk/mach_debug/page_info.h +osfmk/mach_debug/vm_info.h +osfmk/mach_debug/zone_info.h +osfmk/machine/atomic.h +osfmk/machine/cpu_capabilities.h +osfmk/machine/cpu_number.h +osfmk/machine/io_map_entries.h +osfmk/machine/lock.h +osfmk/machine/locks.h +osfmk/machine/machine_cpuid.h +osfmk/machine/machine_kpc.h +osfmk/machine/machine_routines.h +osfmk/machine/pal_hibernate.h +osfmk/machine/pal_routines.h +osfmk/machine/simple_lock.h +osfmk/prng/random.h +osfmk/string.h +osfmk/vm/WKdm_new.h +osfmk/vm/pmap.h +osfmk/vm/vm_compressor_algorithms.h +osfmk/vm/vm_fault.h +osfmk/vm/vm_kern.h +osfmk/vm/vm_map.h +osfmk/vm/vm_options.h +osfmk/vm/vm_pageout.h +osfmk/vm/vm_protos.h +osfmk/vm/vm_shared_region.h +osfmk/voucher/ipc_pthread_priority_types.h +osfmk/x86_64/machine_kpc.h +panel.h +paths.h +pexpert/boot.h +pexpert/i386/boot.h +pexpert/i386/efi.h +pexpert/i386/protos.h +pexpert/machine/boot.h +pexpert/machine/protos.h +pexpert/pexpert.h +pexpert/pexpert/boot.h +pexpert/pexpert/device_tree.h +pexpert/pexpert/i386/boot.h +pexpert/pexpert/i386/efi.h +pexpert/pexpert/i386/protos.h +pexpert/pexpert/machine/boot.h +pexpert/pexpert/machine/protos.h +pexpert/pexpert/pexpert.h +pexpert/pexpert/protos.h +pexpert/protos.h +platform/compat.h +platform/introspection_private.h +platform/string.h +poll.h +printerdb.h +printf.h +protocols/routed.h +protocols/rwhod.h +protocols/talkd.h +protocols/timed.h +pthread.h +pthread/introspection.h +pthread/pthread.h +pthread/pthread_impl.h +pthread/pthread_spis.h +pthread/qos.h +pthread/sched.h +pthread/spawn.h +pthread_impl.h +pthread_spis.h +pthread_workqueue.h +pwd.h +ranlib.h +readpassphrase.h +reboot2.h +regex.h +removefile.h +resolv.h +rpc/auth.h +rpc/auth_unix.h +rpc/clnt.h +rpc/pmap_clnt.h +rpc/pmap_prot.h +rpc/pmap_rmt.h +rpc/rpc.h +rpc/rpc_msg.h +rpc/svc.h +rpc/svc_auth.h +rpc/types.h +rpc/xdr.h +rpcsvc/yp_prot.h +rpcsvc/ypclnt.h +runetype.h +sched.h +search.h +secure/_common.h +secure/_stdio.h +secure/_string.h +security/audit/audit_ioctl.h +security/mac.h +security/mac_policy.h +security/security/_label.h +security/security/mac.h +security/security/mac_alloc.h +security/security/mac_data.h +security/security/mac_framework.h +security/security/mac_internal.h +security/security/mac_mach_internal.h +security/security/mac_policy.h +semaphore.h +servers/bootstrap.h +servers/bootstrap_defs.h +servers/key_defs.h +servers/ls_defs.h +servers/netname.h +servers/netname_defs.h +servers/nm_defs.h +setjmp.h +sgtty.h +si_data.h +si_module.h +signal.h +spawn.h +stab.h +standards.h +stdarg.h +stddef.h +stdint.h +stdio.h +stdlib.h +strhash.h +string.h +stringlist.h +strings.h +struct.h +sys/_endian.h +sys/_posix_availability.h +sys/_pthread/_pthread_attr_t.h +sys/_pthread/_pthread_cond_t.h +sys/_pthread/_pthread_condattr_t.h +sys/_pthread/_pthread_key_t.h +sys/_pthread/_pthread_mutex_t.h +sys/_pthread/_pthread_mutexattr_t.h +sys/_pthread/_pthread_once_t.h +sys/_pthread/_pthread_rwlock_t.h +sys/_pthread/_pthread_rwlockattr_t.h +sys/_pthread/_pthread_t.h +sys/_pthread/_pthread_types.h +sys/_select.h +sys/_structs.h +sys/_symbol_aliasing.h +sys/_types.h +sys/_types/_blkcnt_t.h +sys/_types/_blksize_t.h +sys/_types/_clock_t.h +sys/_types/_ct_rune_t.h +sys/_types/_dev_t.h +sys/_types/_errno_t.h +sys/_types/_fd_clr.h +sys/_types/_fd_copy.h +sys/_types/_fd_def.h +sys/_types/_fd_isset.h +sys/_types/_fd_set.h +sys/_types/_fd_setsize.h +sys/_types/_fd_zero.h +sys/_types/_filesec_t.h +sys/_types/_fsblkcnt_t.h +sys/_types/_fsfilcnt_t.h +sys/_types/_fsid_t.h +sys/_types/_fsobj_id_t.h +sys/_types/_gid_t.h +sys/_types/_guid_t.h +sys/_types/_id_t.h +sys/_types/_in_addr_t.h +sys/_types/_in_port_t.h +sys/_types/_ino64_t.h +sys/_types/_ino_t.h +sys/_types/_int16_t.h +sys/_types/_int32_t.h +sys/_types/_int64_t.h +sys/_types/_int8_t.h +sys/_types/_intptr_t.h +sys/_types/_iovec_t.h +sys/_types/_key_t.h +sys/_types/_mach_port_t.h +sys/_types/_mbstate_t.h +sys/_types/_mode_t.h +sys/_types/_nlink_t.h +sys/_types/_null.h +sys/_types/_o_dsync.h +sys/_types/_o_sync.h +sys/_types/_off_t.h +sys/_types/_offsetof.h +sys/_types/_os_inline.h +sys/_types/_pid_t.h +sys/_types/_posix_vdisable.h +sys/_types/_pthread_attr_t.h +sys/_types/_pthread_cond_t.h +sys/_types/_pthread_condattr_t.h +sys/_types/_pthread_key_t.h +sys/_types/_pthread_mutex_t.h +sys/_types/_pthread_mutexattr_t.h +sys/_types/_pthread_once_t.h +sys/_types/_pthread_rwlock_t.h +sys/_types/_pthread_rwlockattr_t.h +sys/_types/_pthread_t.h +sys/_types/_pthread_types.h +sys/_types/_ptrdiff_t.h +sys/_types/_rsize_t.h +sys/_types/_rune_t.h +sys/_types/_s_ifmt.h +sys/_types/_sa_family_t.h +sys/_types/_seek_set.h +sys/_types/_sigaltstack.h +sys/_types/_sigset_t.h +sys/_types/_size_t.h +sys/_types/_socklen_t.h +sys/_types/_ssize_t.h +sys/_types/_suseconds_t.h +sys/_types/_time_t.h +sys/_types/_timespec.h +sys/_types/_timeval.h +sys/_types/_timeval32.h +sys/_types/_timeval64.h +sys/_types/_u_int16_t.h +sys/_types/_u_int32_t.h +sys/_types/_u_int64_t.h +sys/_types/_u_int8_t.h +sys/_types/_ucontext.h +sys/_types/_ucontext64.h +sys/_types/_uid_t.h +sys/_types/_uintptr_t.h +sys/_types/_useconds_t.h +sys/_types/_uuid_t.h +sys/_types/_va_list.h +sys/_types/_wchar_t.h +sys/_types/_wint_t.h +sys/acct.h +sys/acl.h +sys/aio.h +sys/appleapiopts.h +sys/attr.h +sys/buf.h +sys/cdefs.h +sys/clonefile.h +sys/conf.h +sys/dir.h +sys/dirent.h +sys/disk.h +sys/dkstat.h +sys/domain.h +sys/dtrace.h +sys/dtrace_glue.h +sys/dtrace_impl.h +sys/errno.h +sys/ev.h +sys/event.h +sys/fasttrap.h +sys/fasttrap_isa.h +sys/fcntl.h +sys/file.h +sys/filedesc.h +sys/filio.h +sys/gmon.h +sys/ioccom.h +sys/ioctl.h +sys/ioctl_compat.h +sys/ipc.h +sys/kauth.h +sys/kdebug.h +sys/kdebug_signpost.h +sys/kern_control.h +sys/kern_event.h +sys/kernel.h +sys/kernel_types.h +sys/lctx.h +sys/loadable_fs.h +sys/lock.h +sys/lockf.h +sys/lockstat.h +sys/malloc.h +sys/mbuf.h +sys/mman.h +sys/mount.h +sys/msg.h +sys/msgbuf.h +sys/netport.h +sys/param.h +sys/paths.h +sys/pipe.h +sys/poll.h +sys/posix_sem.h +sys/posix_shm.h +sys/proc.h +sys/proc_info.h +sys/protosw.h +sys/ptrace.h +sys/qos.h +sys/qos_private.h +sys/queue.h +sys/quota.h +sys/random.h +sys/rbtree.h +sys/reboot.h +sys/resource.h +sys/resourcevar.h +sys/sbuf.h +sys/sdt.h +sys/select.h +sys/sem.h +sys/semaphore.h +sys/shm.h +sys/signal.h +sys/signalvar.h +sys/socket.h +sys/socketvar.h +sys/sockio.h +sys/spawn.h +sys/stat.h +sys/statvfs.h +sys/stdio.h +sys/sys_domain.h +sys/syscall.h +sys/sysctl.h +sys/syslimits.h +sys/syslog.h +sys/termios.h +sys/time.h +sys/timeb.h +sys/times.h +sys/tprintf.h +sys/trace.h +sys/tty.h +sys/ttychars.h +sys/ttycom.h +sys/ttydefaults.h +sys/ttydev.h +sys/types.h +sys/ubc.h +sys/ucontext.h +sys/ucred.h +sys/uio.h +sys/un.h +sys/unistd.h +sys/unpcb.h +sys/user.h +sys/utfconv.h +sys/utsname.h +sys/vadvise.h +sys/vcmd.h +sys/vm.h +sys/vmmeter.h +sys/vmparam.h +sys/vnioctl.h +sys/vnode.h +sys/vnode_if.h +sys/vstat.h +sys/wait.h +sys/xattr.h +sysexits.h +syslog.h +tar.h +term.h +term_entry.h +termcap.h +termios.h +thread_data.h +tic.h +time.h +timeconv.h +ttyent.h +tzfile.h +tzlink.h +tzlink_internal.h +ucontext.h +ulimit.h +unctrl.h +unistd.h +util.h +utime.h +utmpx.h +utmpx_thread.h +uuid/uuid.h +vfs/vfs_support.h +vis.h +voucher/ipc_pthread_priority_types.h +vproc.h +vproc_internal.h +vproc_priv.h +wchar.h +wctype.h +wipefs.h +wordexp.h +xlocale.h +xlocale/__wctype.h +xlocale/_ctype.h +xlocale/_inttypes.h +xlocale/_langinfo.h +xlocale/_monetary.h +xlocale/_regex.h +xlocale/_stdio.h +xlocale/_stdlib.h +xlocale/_string.h +xlocale/_time.h +xlocale/_wchar.h +xlocale/_wctype.h diff --git a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix index 5a3b171021613..74327bc4c4285 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix @@ -13,6 +13,24 @@ appleDerivation { DSTROOT = "$(out)"; + appleHeaders = '' + architecture/alignment.h + architecture/byte_order.h + architecture/i386/alignment.h + architecture/i386/asm_help.h + architecture/i386/byte_order.h + architecture/i386/cpu.h + architecture/i386/desc.h + architecture/i386/fpu.h + architecture/i386/frame.h + architecture/i386/io.h + architecture/i386/pio.h + architecture/i386/reg_help.h + architecture/i386/sel.h + architecture/i386/table.h + architecture/i386/tss.h + ''; + meta = with lib; { maintainers = with maintainers; [ copumpkin ]; platforms = platforms.darwin; diff --git a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix index 27a7f7b3e7c55..002709ce2df29 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix @@ -5,25 +5,14 @@ appleDerivation { buildPhase = '' cd migcom.tproj + + # redundant file, don't know why apple not removing it. + rm handler.c + yacc -d parser.y flex --header-file=lexxer.yy.h -o lexxer.yy.c lexxer.l - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o error.o error.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o global.o global.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o handler.o header.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o header.o header.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o mig.o mig.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o routine.o routine.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o server.o server.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o statement.o statement.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o string.o string.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o type.o type.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o user.o user.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o utils.o utils.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o lexxer.yy.o lexxer.yy.c - cc -Os -pipe -DMIG_VERSION="" -Wall -mdynamic-no-pic -I. -c -o y.tab.o y.tab.c - - cc -dead_strip -o migcom error.o global.o header.o mig.o routine.o server.o statement.o string.o type.o user.o utils.o lexxer.yy.o y.tab.o + cc -std=gnu99 -Os -dead_strip -DMIG_VERSION=\"$pname-$version\" -I. -o migcom *.c ''; installPhase = '' @@ -42,8 +31,4 @@ appleDerivation { --replace '/bin/rmdir' "rmdir" \ --replace 'C=''${MIGCC}' "C=cc" ''; - - meta = { - platforms = lib.platforms.darwin; - }; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 12176fd526c82..2343493154217 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -1,6 +1,9 @@ { lib, stdenv, fetchurl, fetchzip, pkgs }: let + macosPackages_11_0_1 = import ./macos-11.0.1.nix { inherit applePackage'; }; + developerToolsPackages_11_3_1 = import ./developer-tools-11.3.1.nix { inherit applePackage'; }; + # This attrset can in theory be computed automatically, but for that to work nicely we need # import-from-derivation to work properly. Currently it's rather ugly when we try to bootstrap # a stdenv out of something like this. With some care we can probably get rid of this, but for @@ -57,6 +60,9 @@ let libplatform = "125"; mDNSResponder = "625.41.2"; + # IOKit contains a set of packages with different versions, so we don't have a general version + IOKit = ""; + libutil = "43"; libunwind = "35.3"; Librpcsvc = "26"; @@ -135,35 +141,65 @@ let }; }; - fetchApple = version: sha256: name: let + fetchApple' = pname: version: sha256: let # When cross-compiling, fetchurl depends on libiconv, resulting # in an infinite recursion without this. It's not clear why this # worked fine when not cross-compiling - fetch = if name == "libiconv" + fetch = if pname == "libiconv" then stdenv.fetchurlBoot else fetchurl; in fetch { - url = "http://www.opensource.apple.com/tarballs/${name}/${name}-${versions.${version}.${name}}.tar.gz"; + url = "http://www.opensource.apple.com/tarballs/${pname}/${pname}-${version}.tar.gz"; inherit sha256; }; - appleDerivation_ = name: version: sha256: attrs: stdenv.mkDerivation ({ - inherit version; - name = "${name}-${version}"; + fetchApple = sdkName: sha256: pname: let + version = versions.${sdkName}.${pname}; + in fetchApple' pname version sha256; + + appleDerivation' = pname: version: sdkName: sha256: attrs: stdenv.mkDerivation ({ + inherit pname version; + + src = if attrs ? srcs then null else (fetchApple' pname version sha256); + enableParallelBuilding = true; - meta = { - platforms = lib.platforms.darwin; - }; - } // (if attrs ? srcs then {} else { - src = fetchApple version sha256 name; - }) // attrs); - applePackage = namePath: version: sha256: - let - name = builtins.elemAt (lib.splitString "/" namePath) 0; - appleDerivation = appleDerivation_ name version sha256; - callPackage = pkgs.newScope (packages // pkgs.darwin // { inherit appleDerivation name version; }); - in callPackage (./. + "/${namePath}"); + # In rare cases, APPLE may drop some headers quietly on new release. + doInstallCheck = attrs ? appleHeaders; + passAsFile = [ "appleHeaders" ]; + installCheckPhase = '' + cd $out/include + + result=$(diff -u "$appleHeadersPath" <(find * -type f | sort) --label "Listed in appleHeaders" --label "Found in \$out/include" || true) + + if [ -z "$result" ]; then + echo "Apple header list is matched." + else + echo >&2 "\ + Apple header list is inconsistent, please ensure no header file is unexpectedly dropped. + $result + " + exit 1 + fi + ''; + + } // attrs // { + meta = (with lib; { + platforms = platforms.darwin; + license = licenses.apsl20; + }) // (attrs.meta or {}); + }); + + applePackage' = namePath: version: sdkName: sha256: let + pname = builtins.head (lib.splitString "/" namePath); + appleDerivation = appleDerivation' pname version sdkName sha256; + callPackage = pkgs.newScope (packages // pkgs.darwin // { inherit appleDerivation; }); + in callPackage (./. + "/${namePath}"); + + applePackage = namePath: sdkName: sha256: let + pname = builtins.head (lib.splitString "/" namePath); + version = versions.${sdkName}.${pname}; + in applePackage' namePath version sdkName sha256; IOKitSpecs = { IOAudioFamily = fetchApple "osx-10.10.5" "0ggq7za3iq8g02j16rj67prqhrw828jsw3ah3bxq8a1cvr55aqnq"; @@ -192,10 +228,10 @@ let # Only used for bootstrapping. It’s convenient because it was the last version to come with a real makefile. adv_cmds-boot = applePackage "adv_cmds/boot.nix" "osx-10.5.8" "102ssayxbg9wb35mdmhswbnw0bg7js3pfd8fcbic83c5q3bqa6c6" {}; - packages = { + # TODO: shorten this list, we should cut down to a minimum set of bootstrap or necessary packages here. + stubPackages = { inherit (adv_cmds-boot) ps locale; architecture = applePackage "architecture" "osx-10.11.6" "1pbpjcd7is69hn8y29i98ci0byik826if8gnp824ha92h90w0fq3" {}; - bootstrap_cmds = applePackage "bootstrap_cmds" "dev-tools-7.0" "1v5dv2q3af1xwj5kz0a5g54fd5dm6j4c9dd2g66n4kc44ixyrhp3" {}; bsdmake = applePackage "bsdmake" "dev-tools-3.2.6" "11a9kkhz5bfgi1i8kpdkis78lhc6b5vxmhd598fcdgra1jw4iac2" {}; CarbonHeaders = applePackage "CarbonHeaders" "osx-10.6.2" "1zam29847cxr6y9rnl76zqmkbac53nx0szmqm9w5p469a6wzjqar" {}; CommonCrypto = applePackage "CommonCrypto" "osx-10.12.6" "0sgsqjcxbdm2g2zfpc50mzmk4b4ldyw7xvvkwiayhpczg1fga4ff" {}; @@ -207,7 +243,6 @@ let dtrace = applePackage "dtrace" "osx-10.12.6" "0hpd6348av463yqf70n3xkygwmf1i5zza8kps4zys52sviqz3a0l" {}; dyld = applePackage "dyld" "osx-10.12.6" "0q4jmk78b5ajn33blh4agyq6v2a63lpb3fln78az0dy12bnp1qqk" {}; eap8021x = applePackage "eap8021x" "osx-10.11.6" "0iw0qdib59hihyx2275rwq507bq2a06gaj8db4a8z1rkaj1frskh" {}; - ICU = applePackage "ICU" "osx-10.10.5" "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" {}; IOKit = applePackage "IOKit" "osx-10.11.6" "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x00" { inherit IOKitSrcs; }; launchd = applePackage "launchd" "osx-10.9.5" "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {}; libauto = applePackage "libauto" "osx-10.9.5" "17z27yq5d7zfkwr49r7f0vn9pxvj95884sd2k6lq6rfaz9gxqhy3" {}; @@ -254,6 +289,8 @@ let # TODO(matthewbauer): # To be removed, once I figure out how to build a newer Security version. - Security = applePackage "Security/boot.nix" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; + Security = applePackage "Security/boot.nix" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; }; + + packages = developerToolsPackages_11_3_1 // macosPackages_11_0_1 // stubPackages; in packages diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer-tools-11.3.1.nix b/pkgs/os-specific/darwin/apple-source-releases/developer-tools-11.3.1.nix new file mode 100644 index 0000000000000..f57d224615f4b --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/developer-tools-11.3.1.nix @@ -0,0 +1,8 @@ +# Generated using: ./generate-sdk-packages.sh developer-tools 11.3.1 + +{ applePackage' }: + +{ +bootstrap_cmds = applePackage' "bootstrap_cmds" "116" "developer-tools-11.3.1" "148xpqkf5xzpslqxch5l8h6vsz7sys8sdzk4ghbg9mkcivp8qa03" {}; +developer_cmds = applePackage' "developer_cmds" "66" "developer-tools-11.3.1" "0q08m4cxxwph7gxqravmx13l418p1i050bd46zwksn9j9zpw9mlr" {}; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh b/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh new file mode 100755 index 0000000000000..d7c3fc89c525b --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/generate-sdk-packages.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl + +# usage: +# generate-sdk-packages.sh macos 11.0.1 + +cd $(dirname "$0") + +sdkName="$1-$2" +outfile="$sdkName.nix" + +>$outfile echo "# Generated using: ./$(basename "$0") $1 $2 + +{ applePackage' }: + +{" + +parse_line() { + readarray -t -d$'\t' package <<<$2 + local pname=${package[0]} version=${package[1]} + + if [ -d $pname ]; then + sha256=$(nix-prefetch-url "https://opensource.apple.com/tarballs/$pname/$pname-$version.tar.gz") + >>$outfile echo "$pname = applePackage' \"$pname\" \"$version\" \"$sdkName\" \"$sha256\" {};" + fi +} +readarray -s1 -c1 -C parse_line < <(curl -sS "https://opensource.apple.com/text/${sdkName//./}.txt") + +>>$outfile echo '}' diff --git a/pkgs/os-specific/darwin/apple-source-releases/hfs/default.nix b/pkgs/os-specific/darwin/apple-source-releases/hfs/default.nix index 58f6fb8d7ab35..58bac765a959c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/hfs/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/hfs/default.nix @@ -1,4 +1,4 @@ -{ appleDerivation, lib, headersOnly ? false }: +{ appleDerivation, lib, headersOnly ? true }: appleDerivation { installPhase = lib.optionalString headersOnly '' @@ -6,6 +6,39 @@ appleDerivation { cp core/*.h $out/include/hfs ''; + appleHeaders = '' + hfs/BTreeScanner.h + hfs/BTreesInternal.h + hfs/BTreesPrivate.h + hfs/CatalogPrivate.h + hfs/FileMgrInternal.h + hfs/HFSUnicodeWrappers.h + hfs/UCStringCompareData.h + hfs/hfs.h + hfs/hfs_alloc_trace.h + hfs/hfs_attrlist.h + hfs/hfs_btreeio.h + hfs/hfs_catalog.h + hfs/hfs_cnode.h + hfs/hfs_cprotect.h + hfs/hfs_dbg.h + hfs/hfs_endian.h + hfs/hfs_extents.h + hfs/hfs_format.h + hfs/hfs_fsctl.h + hfs/hfs_hotfiles.h + hfs/hfs_iokit.h + hfs/hfs_journal.h + hfs/hfs_kdebug.h + hfs/hfs_key_roll.h + hfs/hfs_macos_defs.h + hfs/hfs_mount.h + hfs/hfs_quota.h + hfs/hfs_unistr.h + hfs/kext-config.h + hfs/rangelist.h + ''; + meta = { # Seems nobody wants its binary, so we didn't implement building. broken = !headersOnly; diff --git a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix index eed7982e9d8cc..c882b83d0a384 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix @@ -9,4 +9,18 @@ appleDerivation { cp liblaunch/bootstrap.h $out/include/servers cp liblaunch/bootstrap.h $out/include/servers/bootstrap_defs.h ''; + + appleHeaders = '' + bootstrap.h + bootstrap_priv.h + launch.h + launch_internal.h + launch_priv.h + reboot2.h + servers/bootstrap.h + servers/bootstrap_defs.h + vproc.h + vproc_internal.h + vproc_priv.h + ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix index ac33a24a8b4e6..d42a288208c5b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix @@ -5,4 +5,9 @@ appleDerivation { mkdir -p $out/include cp *.h $out/include/ ''; + + appleHeaders = '' + Block.h + Block_private.h + ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix index e7aa47bdb6b1f..3b9d4a34cc63a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix @@ -22,4 +22,33 @@ appleDerivation { typedef void* dispatch_block_t; #endif' ''; + + appleHeaders = '' + dispatch/base.h + dispatch/benchmark.h + dispatch/block.h + dispatch/data.h + dispatch/data_private.h + dispatch/dispatch.h + dispatch/group.h + dispatch/introspection.h + dispatch/introspection_private.h + dispatch/io.h + dispatch/io_private.h + dispatch/layout_private.h + dispatch/mach_private.h + dispatch/object.h + dispatch/once.h + dispatch/private.h + dispatch/queue.h + dispatch/queue_private.h + dispatch/semaphore.h + dispatch/source.h + dispatch/source_private.h + dispatch/time.h + os/object.h + os/object_private.h + os/voucher_activity_private.h + os/voucher_private.h + ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix index 4fd0ab8a7fb22..9acbcb212e4d8 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix @@ -5,4 +5,28 @@ appleDerivation { mkdir $out cp -r include $out/include ''; + + appleHeaders = '' + _simple.h + libkern/OSAtomic.h + libkern/OSAtomicDeprecated.h + libkern/OSAtomicQueue.h + libkern/OSCacheControl.h + libkern/OSSpinLockDeprecated.h + os/alloc_once_impl.h + os/base.h + os/base_private.h + os/internal/atomic.h + os/internal/crashlog.h + os/internal/internal_shared.h + os/lock.h + os/lock_private.h + os/once_private.h + os/semaphore_private.h + platform/compat.h + platform/introspection_private.h + platform/string.h + setjmp.h + ucontext.h + ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix index d9a9beaccfc8a..20eccd8205970 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix @@ -15,6 +15,40 @@ appleDerivation { cp -r sys/_pthread/*.h $out/include/sys/_types/ ''; + appleHeaders = '' + pthread/introspection.h + pthread/pthread.h + pthread/pthread_impl.h + pthread/pthread_spis.h + pthread/qos.h + pthread/sched.h + pthread/spawn.h + sys/_pthread/_pthread_attr_t.h + sys/_pthread/_pthread_cond_t.h + sys/_pthread/_pthread_condattr_t.h + sys/_pthread/_pthread_key_t.h + sys/_pthread/_pthread_mutex_t.h + sys/_pthread/_pthread_mutexattr_t.h + sys/_pthread/_pthread_once_t.h + sys/_pthread/_pthread_rwlock_t.h + sys/_pthread/_pthread_rwlockattr_t.h + sys/_pthread/_pthread_t.h + sys/_pthread/_pthread_types.h + sys/_types/_pthread_attr_t.h + sys/_types/_pthread_cond_t.h + sys/_types/_pthread_condattr_t.h + sys/_types/_pthread_key_t.h + sys/_types/_pthread_mutex_t.h + sys/_types/_pthread_mutexattr_t.h + sys/_types/_pthread_once_t.h + sys/_types/_pthread_rwlock_t.h + sys/_types/_pthread_rwlockattr_t.h + sys/_types/_pthread_t.h + sys/_types/_pthread_types.h + sys/qos.h + sys/qos_private.h + ''; + meta = { platforms = lib.platforms.darwin; }; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix index 2b196e46ef450..ea9ca75e7e54b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix @@ -27,6 +27,14 @@ appleDerivation { install_name_tool -id $out/lib/libutil.dylib $out/lib/libutil.dylib ''; + # FIXME: headers are different against headersOnly. And all the headers are NOT in macos, do we really want them? + # appleHeaders = '' + # libutil.h + # mntopts.h + # tzlink.h + # wipefs.h + # ''; + meta = with lib; { maintainers = with maintainers; [ copumpkin ]; platforms = platforms.darwin; diff --git a/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix b/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix new file mode 100644 index 0000000000000..517f53e9435da --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix @@ -0,0 +1,46 @@ +# Generated using: ./generate-sdk-packages.sh macos 11.0.1 + +{ applePackage' }: + +{ +adv_cmds = applePackage' "adv_cmds" "176" "macos-11.0.1" "0x8c25rh6fnzndbc26vcb65vcxilvqyfvm2klfyci1wr4bh3ixgk" {}; +architecture = applePackage' "architecture" "279" "macos-11.0.1" "1cgp33ywa30max6cyp69kvii299hx2vgwvmy3ms8n4gaq2mkpaky" {}; +basic_cmds = applePackage' "basic_cmds" "55" "macos-11.0.1" "0hvab4b1v5q2x134hdkal0rmz5gsdqyki1vb0dbw4py1bqf0yaw9" {}; +bootstrap_cmds = applePackage' "bootstrap_cmds" "121" "macos-11.0.1" "09bwclws6adxb1ky9q35f4ikddk4mbalmgds0cmqaf7j23qxl3fv" {}; +CommonCrypto = applePackage' "CommonCrypto" "60178.40.2" "macos-11.0.1" "0r3b1mlfmbdzpwn6pbsbfaga3k63gpwcwbhkbi4r09aq82skl02v" {}; +configd = applePackage' "configd" "1109.40.9" "macos-11.0.1" "173i55wfzli9pg2x2rw437hs68h6l4ngss5jfgf18g26zjkjzv5v" {}; +copyfile = applePackage' "copyfile" "173.40.2" "macos-11.0.1" "0qyp15qj3fdb7yx033n57l7s61d70mv17f43yiwcbhx09mmlrp07" {}; +Csu = applePackage' "Csu" "88" "macos-11.0.1" "029lgcyj0i16036h2lcx6fd6r1yf1bkj5dnvz905rh6ncl8skgdr" {}; +diskdev_cmds = applePackage' "diskdev_cmds" "667.40.1" "macos-11.0.1" "1bqwkwkwd556rba5000ap77xrhaf4xnmy83mszd7a0yvl2xlma7j" {}; +dtrace = applePackage' "dtrace" "370.40.1" "macos-11.0.1" "1941yczmn94ng5zlnhf0i5mjw2f4g7znisgvhkhn5f86gxmd98wl" {}; +dyld = applePackage' "dyld" "832.7.1" "macos-11.0.1" "1s77ca6jg20z91qlph59da8j61m97y23vrw48xs4rywdzh4915n0" {}; +eap8021x = applePackage' "eap8021x" "304.40.1" "macos-11.0.1" "1ph3kcpf527s0jqsi60j2sgg3m8h128spf292d8kyc08siz9mf9c" {}; +file_cmds = applePackage' "file_cmds" "321.40.3" "macos-11.0.1" "04789vn1wghclfr3ma3ncg716xdsxfj66hrcxi5h3h1ryag2ycfz" {}; +hfs = applePackage' "hfs" "556.41.1" "macos-11.0.1" "1rhkmn2yj5p4wmi4aajy5hj2h0gxk63s8j4qz4ziy4g4bjpdgwmy" {}; +ICU = applePackage' "ICU" "66108" "macos-11.0.1" "1d76cyyqpwkzjlxfajm4nsglxmfrcafbnjwnjxc3j5w3nw67pqhx" {}; +Libc = applePackage' "Libc" "1439.40.11" "macos-11.0.1" "0d5xlnks4lc9391wg31c9126vflb40lc5ffkgxmf2kpyglac1280" {}; +libclosure = applePackage' "libclosure" "78" "macos-11.0.1" "089i2bl4agpnfplrg23xbzma1674g0w05988nxdps6ghxl4kz66f" {}; +libdispatch = applePackage' "libdispatch" "1271.40.12" "macos-11.0.1" "0z7r42zfb8y48f0nrw0qw7fanfvimycimgnrg3jig101kjvjar98" {}; +libiconv = applePackage' "libiconv" "59" "macos-11.0.1" "0hqbsqggjrr0sv6h70lcr3gabgk9inyc8aq1b30wibgjm6crjwpp" {}; +Libinfo = applePackage' "Libinfo" "542.40.3" "macos-11.0.1" "0y5x6wxd3mwn6my1jdp8qrak3y7x7sgjdmwyw9cvvbn3kg9v6z1p" {}; +Libnotify = applePackage' "Libnotify" "279.40.4" "macos-11.0.1" "0aswflxki877izp6sacv35sydn6a3639cflv3zhs3i7vkfbsvbf5" {}; +libplatform = applePackage' "libplatform" "254.40.4" "macos-11.0.1" "1mhi8n66864y98dr3n0pkqad3aqim800kn9bxzp6h5jf2jni3aql" {}; +libpthread = applePackage' "libpthread" "454.40.3" "macos-11.0.1" "18rb4dqjdf3krzi4hdj5i310gy49ipf01klbkp9g51i02a55gphq" {}; +libresolv = applePackage' "libresolv" "68" "macos-11.0.1" "1ysvg6d28xyaky9sn7giglnsflhjsbj17h3h3i6knlzxnzznpkql" {}; +Librpcsvc = applePackage' "Librpcsvc" "26" "macos-11.0.1" "1zwfwcl9irxl1dlnf2b4v30vdybp0p0r6n6g1pd14zbdci1jcg2k" {}; +Libsystem = applePackage' "Libsystem" "1292.50.1" "macos-11.0.1" "0w16zaigq18jfsnw15pfyz2mkfqdkn0cc16q617kmgw2khld8j7j" {}; +libunwind = applePackage' "libunwind" "200.10" "macos-11.0.1" "1pmymcqpfk7lfxh6zqch429vfpvmd2m1dlg898170pkx5zhxisl2" {}; +libutil = applePackage' "libutil" "58.40.2" "macos-11.0.1" "1hhgashfj9g4vjv02070c5pn818a5n0bh5l81l2pflmvb2rrqs3f" {}; +mDNSResponder = applePackage' "mDNSResponder" "1310.40.42" "macos-11.0.1" "0d0b9wwah9rg7rwrr29dxd6iy0y4rlmss3wcz2wcqmnd2qb9x8my" {}; +network_cmds = applePackage' "network_cmds" "606.40.2" "macos-11.0.1" "1dlslk67npvmxx5m50385kmn3ysxih2iv220hhzkin11f8abdjv7" {}; +objc4 = applePackage' "objc4" "818.2" "macos-11.0.1" "177gmh9m9ajy6mvcd2sf7gqydgljy44n3iih0yqsn1b13j784azx" {}; +PowerManagement = applePackage' "PowerManagement" "1132.50.3" "macos-11.0.1" "1n5yn6sc8w67g8iism6ilkyl33j46gcnlqcaq6k16zkngx6lprba" {}; +ppp = applePackage' "ppp" "877.40.2" "macos-11.0.1" "1z506z8ndvb1lfr4pypfy2bnig6qimhmq3yhjvqwfnliv91965iq" {}; +removefile = applePackage' "removefile" "49.40.3" "macos-11.0.1" "1fhp47awi15f02385r25qgw1ag5z0kr1v3kvgqm3r8i8yysfqvwp" {}; +Security = applePackage' "Security" "59754.41.1" "macos-11.0.1" "00kqgg7k80ba70ar2c02f0q9yrdgqcb56nb9z5g0bxwkvi40ryph" {}; +shell_cmds = applePackage' "shell_cmds" "216.40.4" "macos-11.0.1" "1mvp1fp34kkm4mi85fdn3i0l0gig4c0w09zg2mvkpxcf68cq2f69" {}; +system_cmds = applePackage' "system_cmds" "880.40.5" "macos-11.0.1" "1kys4vwfz4559sspdsfhmxc238nd8qgylqypza3zdzaqhfh7lx2x" {}; +text_cmds = applePackage' "text_cmds" "106" "macos-11.0.1" "0cpnfpllwpx20hbxzg5i5488gcjyi9adnbac1sd5hpv3bq6z1hs5" {}; +top = applePackage' "top" "129" "macos-11.0.1" "1nyz5mvq7js3zhsi3dwxl5fslg6m7nhlgc6p2hr889xgyl5prw8f" {}; +xnu = applePackage' "xnu" "7195.50.7.100.1" "macos-11.0.1" "14wqkqp3lcxgpm1sjnsysybrc4ppzkghwv3mb5nr5v8ml37prkib" {}; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix b/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix index 2b45fbdb45e28..0b2c1c9c7dcc3 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix @@ -5,4 +5,9 @@ appleDerivation { mkdir -p $out/include/ cp removefile.h checkint.h $out/include/ ''; + + appleHeaders = '' + checkint.h + removefile.h + ''; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index da2d0c5dc7bf0..9892814468e9b 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -127,6 +127,8 @@ appleDerivation ({ mkdir $out/Library/PrivateFrameworks mv $out/Library/Frameworks/IOKit.framework $out/Library/PrivateFrameworks ''; + + appleHeaders = builtins.readFile ./headers.txt; } // lib.optionalAttrs headersOnly { HOST_CODESIGN = "echo"; HOST_CODESIGN_ALLOCATE = "echo"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/headers.txt b/pkgs/os-specific/darwin/apple-source-releases/xnu/headers.txt new file mode 100644 index 0000000000000..93c0dbb18bf7b --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/headers.txt @@ -0,0 +1,1318 @@ +AssertMacros.h +_errno.h +_libkernel_init.h +atm/atm_notification.defs +atm/atm_types.defs +atm/atm_types.h +bank/bank_types.h +bsd/bsm/audit.h +bsd/dev/random/randomdev.h +bsd/i386/_limits.h +bsd/i386/_mcontext.h +bsd/i386/_param.h +bsd/i386/_types.h +bsd/i386/endian.h +bsd/i386/limits.h +bsd/i386/param.h +bsd/i386/profile.h +bsd/i386/signal.h +bsd/i386/types.h +bsd/i386/vmparam.h +bsd/libkern/libkern.h +bsd/machine/_limits.h +bsd/machine/_mcontext.h +bsd/machine/_param.h +bsd/machine/_types.h +bsd/machine/byte_order.h +bsd/machine/disklabel.h +bsd/machine/endian.h +bsd/machine/limits.h +bsd/machine/param.h +bsd/machine/profile.h +bsd/machine/signal.h +bsd/machine/spl.h +bsd/machine/types.h +bsd/machine/vmparam.h +bsd/miscfs/devfs/devfs.h +bsd/miscfs/devfs/devfs_proto.h +bsd/miscfs/devfs/devfsdefs.h +bsd/miscfs/devfs/fdesc.h +bsd/miscfs/fifofs/fifo.h +bsd/miscfs/specfs/specdev.h +bsd/miscfs/union/union.h +bsd/net/bpf.h +bsd/net/dlil.h +bsd/net/ethernet.h +bsd/net/if.h +bsd/net/if_arp.h +bsd/net/if_dl.h +bsd/net/if_ether.h +bsd/net/if_llc.h +bsd/net/if_media.h +bsd/net/if_mib.h +bsd/net/if_types.h +bsd/net/if_utun.h +bsd/net/if_var.h +bsd/net/init.h +bsd/net/kext_net.h +bsd/net/kpi_interface.h +bsd/net/kpi_interfacefilter.h +bsd/net/kpi_protocol.h +bsd/net/ndrv.h +bsd/net/net_kev.h +bsd/net/pfkeyv2.h +bsd/net/radix.h +bsd/net/route.h +bsd/netinet/bootp.h +bsd/netinet/icmp6.h +bsd/netinet/icmp_var.h +bsd/netinet/if_ether.h +bsd/netinet/igmp.h +bsd/netinet/igmp_var.h +bsd/netinet/in.h +bsd/netinet/in_arp.h +bsd/netinet/in_pcb.h +bsd/netinet/in_systm.h +bsd/netinet/in_var.h +bsd/netinet/ip.h +bsd/netinet/ip6.h +bsd/netinet/ip_icmp.h +bsd/netinet/ip_var.h +bsd/netinet/kpi_ipfilter.h +bsd/netinet/tcp.h +bsd/netinet/tcp_fsm.h +bsd/netinet/tcp_seq.h +bsd/netinet/tcp_timer.h +bsd/netinet/tcp_var.h +bsd/netinet/tcpip.h +bsd/netinet/udp.h +bsd/netinet/udp_var.h +bsd/netinet6/ah.h +bsd/netinet6/esp.h +bsd/netinet6/in6.h +bsd/netinet6/in6_var.h +bsd/netinet6/ipcomp.h +bsd/netinet6/ipsec.h +bsd/netinet6/nd6.h +bsd/netinet6/raw_ip6.h +bsd/netinet6/scope6_var.h +bsd/netkey/keysock.h +bsd/security/audit/audit.h +bsd/security/audit/audit_bsd.h +bsd/security/audit/audit_ioctl.h +bsd/security/audit/audit_private.h +bsd/sys/_endian.h +bsd/sys/_select.h +bsd/sys/_structs.h +bsd/sys/_types.h +bsd/sys/_types/_blkcnt_t.h +bsd/sys/_types/_blksize_t.h +bsd/sys/_types/_clock_t.h +bsd/sys/_types/_ct_rune_t.h +bsd/sys/_types/_dev_t.h +bsd/sys/_types/_errno_t.h +bsd/sys/_types/_fd_clr.h +bsd/sys/_types/_fd_copy.h +bsd/sys/_types/_fd_def.h +bsd/sys/_types/_fd_isset.h +bsd/sys/_types/_fd_set.h +bsd/sys/_types/_fd_setsize.h +bsd/sys/_types/_fd_zero.h +bsd/sys/_types/_filesec_t.h +bsd/sys/_types/_fsblkcnt_t.h +bsd/sys/_types/_fsfilcnt_t.h +bsd/sys/_types/_fsid_t.h +bsd/sys/_types/_fsobj_id_t.h +bsd/sys/_types/_gid_t.h +bsd/sys/_types/_guid_t.h +bsd/sys/_types/_id_t.h +bsd/sys/_types/_in_addr_t.h +bsd/sys/_types/_in_port_t.h +bsd/sys/_types/_ino64_t.h +bsd/sys/_types/_ino_t.h +bsd/sys/_types/_int16_t.h +bsd/sys/_types/_int32_t.h +bsd/sys/_types/_int64_t.h +bsd/sys/_types/_int8_t.h +bsd/sys/_types/_intptr_t.h +bsd/sys/_types/_iovec_t.h +bsd/sys/_types/_key_t.h +bsd/sys/_types/_mach_port_t.h +bsd/sys/_types/_mbstate_t.h +bsd/sys/_types/_mode_t.h +bsd/sys/_types/_nlink_t.h +bsd/sys/_types/_null.h +bsd/sys/_types/_o_dsync.h +bsd/sys/_types/_o_sync.h +bsd/sys/_types/_off_t.h +bsd/sys/_types/_offsetof.h +bsd/sys/_types/_os_inline.h +bsd/sys/_types/_pid_t.h +bsd/sys/_types/_posix_vdisable.h +bsd/sys/_types/_ptrdiff_t.h +bsd/sys/_types/_rsize_t.h +bsd/sys/_types/_rune_t.h +bsd/sys/_types/_s_ifmt.h +bsd/sys/_types/_sa_family_t.h +bsd/sys/_types/_seek_set.h +bsd/sys/_types/_sigaltstack.h +bsd/sys/_types/_sigset_t.h +bsd/sys/_types/_size_t.h +bsd/sys/_types/_socklen_t.h +bsd/sys/_types/_ssize_t.h +bsd/sys/_types/_suseconds_t.h +bsd/sys/_types/_time_t.h +bsd/sys/_types/_timespec.h +bsd/sys/_types/_timeval.h +bsd/sys/_types/_timeval32.h +bsd/sys/_types/_timeval64.h +bsd/sys/_types/_u_int16_t.h +bsd/sys/_types/_u_int32_t.h +bsd/sys/_types/_u_int64_t.h +bsd/sys/_types/_u_int8_t.h +bsd/sys/_types/_ucontext.h +bsd/sys/_types/_ucontext64.h +bsd/sys/_types/_uid_t.h +bsd/sys/_types/_uintptr_t.h +bsd/sys/_types/_useconds_t.h +bsd/sys/_types/_user32_itimerval.h +bsd/sys/_types/_user32_timespec.h +bsd/sys/_types/_user32_timeval.h +bsd/sys/_types/_user64_itimerval.h +bsd/sys/_types/_user64_timespec.h +bsd/sys/_types/_user64_timeval.h +bsd/sys/_types/_user_timespec.h +bsd/sys/_types/_user_timeval.h +bsd/sys/_types/_uuid_t.h +bsd/sys/_types/_va_list.h +bsd/sys/_types/_wchar_t.h +bsd/sys/_types/_wint_t.h +bsd/sys/appleapiopts.h +bsd/sys/attr.h +bsd/sys/bsdtask_info.h +bsd/sys/buf.h +bsd/sys/cdefs.h +bsd/sys/codesign.h +bsd/sys/conf.h +bsd/sys/content_protection.h +bsd/sys/cprotect.h +bsd/sys/csr.h +bsd/sys/decmpfs.h +bsd/sys/dir.h +bsd/sys/dirent.h +bsd/sys/disk.h +bsd/sys/disklabel.h +bsd/sys/disktab.h +bsd/sys/dkstat.h +bsd/sys/doc_tombstone.h +bsd/sys/domain.h +bsd/sys/errno.h +bsd/sys/ev.h +bsd/sys/event.h +bsd/sys/eventvar.h +bsd/sys/fbt.h +bsd/sys/fcntl.h +bsd/sys/file.h +bsd/sys/file_internal.h +bsd/sys/filedesc.h +bsd/sys/fileport.h +bsd/sys/filio.h +bsd/sys/fsctl.h +bsd/sys/fsevents.h +bsd/sys/fslog.h +bsd/sys/guarded.h +bsd/sys/imgact.h +bsd/sys/ioccom.h +bsd/sys/ioctl.h +bsd/sys/ioctl_compat.h +bsd/sys/ipc.h +bsd/sys/kasl.h +bsd/sys/kauth.h +bsd/sys/kdebug.h +bsd/sys/kdebugevents.h +bsd/sys/kern_control.h +bsd/sys/kern_event.h +bsd/sys/kern_memorystatus.h +bsd/sys/kernel.h +bsd/sys/kernel_types.h +bsd/sys/kpi_mbuf.h +bsd/sys/kpi_private.h +bsd/sys/kpi_socket.h +bsd/sys/kpi_socketfilter.h +bsd/sys/ktrace.h +bsd/sys/linker_set.h +bsd/sys/lock.h +bsd/sys/lockf.h +bsd/sys/mach_swapon.h +bsd/sys/malloc.h +bsd/sys/mbuf.h +bsd/sys/md5.h +bsd/sys/memory_maintenance.h +bsd/sys/mman.h +bsd/sys/mount.h +bsd/sys/mount_internal.h +bsd/sys/msg.h +bsd/sys/msgbuf.h +bsd/sys/munge.h +bsd/sys/namei.h +bsd/sys/netport.h +bsd/sys/param.h +bsd/sys/paths.h +bsd/sys/persona.h +bsd/sys/pgo.h +bsd/sys/pipe.h +bsd/sys/posix_sem.h +bsd/sys/posix_shm.h +bsd/sys/priv.h +bsd/sys/proc.h +bsd/sys/proc_info.h +bsd/sys/proc_internal.h +bsd/sys/protosw.h +bsd/sys/pthread_internal.h +bsd/sys/pthread_shims.h +bsd/sys/queue.h +bsd/sys/quota.h +bsd/sys/random.h +bsd/sys/reason.h +bsd/sys/resource.h +bsd/sys/resourcevar.h +bsd/sys/sbuf.h +bsd/sys/select.h +bsd/sys/sem.h +bsd/sys/sem_internal.h +bsd/sys/semaphore.h +bsd/sys/shm.h +bsd/sys/shm_internal.h +bsd/sys/signal.h +bsd/sys/signalvar.h +bsd/sys/socket.h +bsd/sys/socketvar.h +bsd/sys/sockio.h +bsd/sys/spawn.h +bsd/sys/spawn_internal.h +bsd/sys/stackshot.h +bsd/sys/stat.h +bsd/sys/stdio.h +bsd/sys/sys_domain.h +bsd/sys/syscall.h +bsd/sys/sysctl.h +bsd/sys/syslimits.h +bsd/sys/syslog.h +bsd/sys/sysproto.h +bsd/sys/systm.h +bsd/sys/termios.h +bsd/sys/time.h +bsd/sys/tree.h +bsd/sys/tty.h +bsd/sys/ttychars.h +bsd/sys/ttycom.h +bsd/sys/ttydefaults.h +bsd/sys/ttydev.h +bsd/sys/types.h +bsd/sys/ubc.h +bsd/sys/ucontext.h +bsd/sys/ucred.h +bsd/sys/uio.h +bsd/sys/uio_internal.h +bsd/sys/ulock.h +bsd/sys/un.h +bsd/sys/unistd.h +bsd/sys/unpcb.h +bsd/sys/user.h +bsd/sys/utfconv.h +bsd/sys/vfs_context.h +bsd/sys/vm.h +bsd/sys/vmmeter.h +bsd/sys/vmparam.h +bsd/sys/vnode.h +bsd/sys/vnode_if.h +bsd/sys/vnode_internal.h +bsd/sys/wait.h +bsd/sys/xattr.h +bsd/uuid/uuid.h +bsd/vfs/vfs_support.h +bsd/vm/vnode_pager.h +bsm/audit.h +bsm/audit_domain.h +bsm/audit_errno.h +bsm/audit_fcntl.h +bsm/audit_internal.h +bsm/audit_kevents.h +bsm/audit_record.h +bsm/audit_socket_type.h +corecrypto/cc.h +corecrypto/cc_config.h +corecrypto/cc_debug.h +corecrypto/cc_macros.h +corecrypto/cc_priv.h +corecrypto/ccaes.h +corecrypto/ccasn1.h +corecrypto/cccmac.h +corecrypto/ccder.h +corecrypto/ccdes.h +corecrypto/ccdigest.h +corecrypto/ccdigest_priv.h +corecrypto/ccdrbg.h +corecrypto/ccdrbg_impl.h +corecrypto/cchmac.h +corecrypto/ccmd5.h +corecrypto/ccmode.h +corecrypto/ccmode_factory.h +corecrypto/ccmode_impl.h +corecrypto/ccmode_siv.h +corecrypto/ccn.h +corecrypto/ccpad.h +corecrypto/ccpbkdf2.h +corecrypto/ccrc4.h +corecrypto/ccrng.h +corecrypto/ccrng_system.h +corecrypto/ccrsa.h +corecrypto/ccsha1.h +corecrypto/ccsha2.h +corecrypto/cczp.h +corpses/task_corpse.h +default_pager/default_pager_types.h +device/device.defs +device/device_port.h +device/device_types.defs +device/device_types.h +gethostuuid.h +gethostuuid_private.h +i386/_limits.h +i386/_mcontext.h +i386/_param.h +i386/_types.h +i386/eflags.h +i386/endian.h +i386/fasttrap_isa.h +i386/limits.h +i386/param.h +i386/profile.h +i386/signal.h +i386/types.h +i386/user_ldt.h +i386/vmparam.h +iokit/IOKit/AppleKeyStoreInterface.h +iokit/IOKit/IOBSD.h +iokit/IOKit/IOBufferMemoryDescriptor.h +iokit/IOKit/IOCPU.h +iokit/IOKit/IOCatalogue.h +iokit/IOKit/IOCommand.h +iokit/IOKit/IOCommandGate.h +iokit/IOKit/IOCommandPool.h +iokit/IOKit/IOCommandQueue.h +iokit/IOKit/IOConditionLock.h +iokit/IOKit/IODMACommand.h +iokit/IOKit/IODMAController.h +iokit/IOKit/IODMAEventSource.h +iokit/IOKit/IODataQueue.h +iokit/IOKit/IODataQueueShared.h +iokit/IOKit/IODeviceMemory.h +iokit/IOKit/IODeviceTreeSupport.h +iokit/IOKit/IOEventSource.h +iokit/IOKit/IOFilterInterruptEventSource.h +iokit/IOKit/IOHibernatePrivate.h +iokit/IOKit/IOInterleavedMemoryDescriptor.h +iokit/IOKit/IOInterruptAccounting.h +iokit/IOKit/IOInterruptController.h +iokit/IOKit/IOInterruptEventSource.h +iokit/IOKit/IOInterrupts.h +iokit/IOKit/IOKernelReportStructs.h +iokit/IOKit/IOKernelReporters.h +iokit/IOKit/IOKitDebug.h +iokit/IOKit/IOKitDiagnosticsUserClient.h +iokit/IOKit/IOKitKeys.h +iokit/IOKit/IOKitKeysPrivate.h +iokit/IOKit/IOKitServer.h +iokit/IOKit/IOLib.h +iokit/IOKit/IOLocks.h +iokit/IOKit/IOLocksPrivate.h +iokit/IOKit/IOMapper.h +iokit/IOKit/IOMemoryCursor.h +iokit/IOKit/IOMemoryDescriptor.h +iokit/IOKit/IOMessage.h +iokit/IOKit/IOMultiMemoryDescriptor.h +iokit/IOKit/IONVRAM.h +iokit/IOKit/IONotifier.h +iokit/IOKit/IOPlatformExpert.h +iokit/IOKit/IOPolledInterface.h +iokit/IOKit/IORangeAllocator.h +iokit/IOKit/IORegistryEntry.h +iokit/IOKit/IOReportMacros.h +iokit/IOKit/IOReportTypes.h +iokit/IOKit/IOReturn.h +iokit/IOKit/IOService.h +iokit/IOKit/IOServicePM.h +iokit/IOKit/IOSharedDataQueue.h +iokit/IOKit/IOSharedLock.h +iokit/IOKit/IOStatistics.h +iokit/IOKit/IOStatisticsPrivate.h +iokit/IOKit/IOSubMemoryDescriptor.h +iokit/IOKit/IOSyncer.h +iokit/IOKit/IOTimeStamp.h +iokit/IOKit/IOTimerEventSource.h +iokit/IOKit/IOTypes.h +iokit/IOKit/IOUserClient.h +iokit/IOKit/IOWorkLoop.h +iokit/IOKit/OSMessageNotification.h +iokit/IOKit/assert.h +iokit/IOKit/nvram/IONVRAMController.h +iokit/IOKit/platform/AppleMacIO.h +iokit/IOKit/platform/AppleMacIODevice.h +iokit/IOKit/platform/AppleNMI.h +iokit/IOKit/platform/ApplePlatformExpert.h +iokit/IOKit/power/IOPwrController.h +iokit/IOKit/pwr_mgt/IOPM.h +iokit/IOKit/pwr_mgt/IOPMLibDefs.h +iokit/IOKit/pwr_mgt/IOPMPowerSource.h +iokit/IOKit/pwr_mgt/IOPMPowerSourceList.h +iokit/IOKit/pwr_mgt/IOPMpowerState.h +iokit/IOKit/pwr_mgt/IOPowerConnection.h +iokit/IOKit/pwr_mgt/RootDomain.h +iokit/IOKit/rtc/IORTCController.h +iokit/IOKit/system.h +iokit/IOKit/system_management/IOWatchDogTimer.h +kern/exc_resource.h +kern/kcdata.h +kern/kern_cdata.h +libkern/OSByteOrder.h +libkern/OSDebug.h +libkern/OSKextLib.h +libkern/OSReturn.h +libkern/OSTypes.h +libkern/_OSByteOrder.h +libkern/firehose/chunk_private.h +libkern/firehose/firehose_types_private.h +libkern/firehose/ioctl_private.h +libkern/firehose/tracepoint_private.h +libkern/i386/OSByteOrder.h +libkern/i386/_OSByteOrder.h +libkern/libkern/OSAtomic.h +libkern/libkern/OSBase.h +libkern/libkern/OSByteOrder.h +libkern/libkern/OSDebug.h +libkern/libkern/OSKextLib.h +libkern/libkern/OSKextLibPrivate.h +libkern/libkern/OSMalloc.h +libkern/libkern/OSReturn.h +libkern/libkern/OSSerializeBinary.h +libkern/libkern/OSTypes.h +libkern/libkern/_OSByteOrder.h +libkern/libkern/c++/OSArray.h +libkern/libkern/c++/OSBoolean.h +libkern/libkern/c++/OSCPPDebug.h +libkern/libkern/c++/OSCollection.h +libkern/libkern/c++/OSCollectionIterator.h +libkern/libkern/c++/OSContainers.h +libkern/libkern/c++/OSData.h +libkern/libkern/c++/OSDictionary.h +libkern/libkern/c++/OSEndianTypes.h +libkern/libkern/c++/OSIterator.h +libkern/libkern/c++/OSKext.h +libkern/libkern/c++/OSLib.h +libkern/libkern/c++/OSMetaClass.h +libkern/libkern/c++/OSNumber.h +libkern/libkern/c++/OSObject.h +libkern/libkern/c++/OSOrderedSet.h +libkern/libkern/c++/OSSerialize.h +libkern/libkern/c++/OSSet.h +libkern/libkern/c++/OSString.h +libkern/libkern/c++/OSSymbol.h +libkern/libkern/c++/OSUnserialize.h +libkern/libkern/crypto/aes.h +libkern/libkern/crypto/aesxts.h +libkern/libkern/crypto/crypto_internal.h +libkern/libkern/crypto/des.h +libkern/libkern/crypto/md5.h +libkern/libkern/crypto/rand.h +libkern/libkern/crypto/register_crypto.h +libkern/libkern/crypto/rsa.h +libkern/libkern/crypto/sha1.h +libkern/libkern/crypto/sha2.h +libkern/libkern/i386/OSByteOrder.h +libkern/libkern/i386/_OSByteOrder.h +libkern/libkern/kernel_mach_header.h +libkern/libkern/kext_request_keys.h +libkern/libkern/kxld.h +libkern/libkern/kxld_types.h +libkern/libkern/locks.h +libkern/libkern/machine/OSByteOrder.h +libkern/libkern/mkext.h +libkern/libkern/prelink.h +libkern/libkern/section_keywords.h +libkern/libkern/stack_protector.h +libkern/libkern/sysctl.h +libkern/libkern/tree.h +libkern/libkern/version.h +libkern/libkern/zconf.h +libkern/libkern/zlib.h +libkern/machine/OSByteOrder.h +libkern/os/base.h +libkern/os/log.h +libkern/os/log_private.h +libkern/os/object.h +libkern/os/object_private.h +libkern/os/overflow.h +libkern/os/trace.h +mach/audit_triggers.defs +mach/boolean.h +mach/bootstrap.h +mach/clock.defs +mach/clock.h +mach/clock_priv.defs +mach/clock_priv.h +mach/clock_reply.defs +mach/clock_reply.h +mach/clock_types.defs +mach/clock_types.h +mach/dyld_kernel.h +mach/error.h +mach/exc.defs +mach/exc.h +mach/exception.h +mach/exception_types.h +mach/host_info.h +mach/host_notify.h +mach/host_notify_reply.defs +mach/host_priv.defs +mach/host_priv.h +mach/host_reboot.h +mach/host_security.defs +mach/host_security.h +mach/host_special_ports.h +mach/i386/_structs.h +mach/i386/asm.h +mach/i386/boolean.h +mach/i386/exception.h +mach/i386/fp_reg.h +mach/i386/kern_return.h +mach/i386/ndr_def.h +mach/i386/processor_info.h +mach/i386/rpc.h +mach/i386/sdt_isa.h +mach/i386/thread_state.h +mach/i386/thread_status.h +mach/i386/vm_param.h +mach/i386/vm_types.h +mach/kern_return.h +mach/kmod.h +mach/lock_set.defs +mach/lock_set.h +mach/mach.h +mach/mach_error.h +mach/mach_exc.defs +mach/mach_host.defs +mach/mach_host.h +mach/mach_init.h +mach/mach_interface.h +mach/mach_param.h +mach/mach_port.defs +mach/mach_port.h +mach/mach_port_internal.h +mach/mach_syscalls.h +mach/mach_time.h +mach/mach_traps.h +mach/mach_types.defs +mach/mach_types.h +mach/mach_vm.defs +mach/mach_vm.h +mach/mach_vm_internal.h +mach/mach_voucher.defs +mach/mach_voucher.h +mach/mach_voucher_attr_control.defs +mach/mach_voucher_types.h +mach/machine.h +mach/machine/asm.h +mach/machine/boolean.h +mach/machine/exception.h +mach/machine/kern_return.h +mach/machine/machine_types.defs +mach/machine/ndr_def.h +mach/machine/processor_info.h +mach/machine/rpc.h +mach/machine/sdt.h +mach/machine/sdt_isa.h +mach/machine/thread_state.h +mach/machine/thread_status.h +mach/machine/vm_param.h +mach/machine/vm_types.h +mach/memory_object_types.h +mach/message.h +mach/mig.h +mach/mig_errors.h +mach/mig_strncpy_zerofill_support.h +mach/mig_voucher_support.h +mach/ndr.h +mach/notify.defs +mach/notify.h +mach/policy.h +mach/port.h +mach/port_obj.h +mach/processor.defs +mach/processor.h +mach/processor_info.h +mach/processor_set.defs +mach/processor_set.h +mach/rpc.h +mach/sdt.h +mach/semaphore.h +mach/shared_memory_server.h +mach/shared_region.h +mach/std_types.defs +mach/std_types.h +mach/sync.h +mach/sync_policy.h +mach/task.defs +mach/task.h +mach/task_access.defs +mach/task_info.h +mach/task_policy.h +mach/task_special_ports.h +mach/telemetry_notification.defs +mach/thread_act.defs +mach/thread_act.h +mach/thread_act_internal.h +mach/thread_info.h +mach/thread_policy.h +mach/thread_special_ports.h +mach/thread_state.h +mach/thread_status.h +mach/thread_switch.h +mach/time_value.h +mach/vm_attributes.h +mach/vm_behavior.h +mach/vm_inherit.h +mach/vm_map.defs +mach/vm_map.h +mach/vm_map_internal.h +mach/vm_page_size.h +mach/vm_param.h +mach/vm_prot.h +mach/vm_purgable.h +mach/vm_region.h +mach/vm_statistics.h +mach/vm_sync.h +mach/vm_task.h +mach/vm_types.h +mach_debug/hash_info.h +mach_debug/ipc_info.h +mach_debug/lockgroup_info.h +mach_debug/mach_debug.h +mach_debug/mach_debug_types.defs +mach_debug/mach_debug_types.h +mach_debug/page_info.h +mach_debug/vm_info.h +mach_debug/zone_info.h +machine/_limits.h +machine/_mcontext.h +machine/_param.h +machine/_types.h +machine/byte_order.h +machine/endian.h +machine/fasttrap_isa.h +machine/limits.h +machine/param.h +machine/profile.h +machine/signal.h +machine/types.h +machine/vmparam.h +miscfs/devfs/devfs.h +miscfs/specfs/specdev.h +miscfs/union/union.h +net/bpf.h +net/dlil.h +net/ethernet.h +net/if.h +net/if_arp.h +net/if_dl.h +net/if_llc.h +net/if_media.h +net/if_mib.h +net/if_types.h +net/if_utun.h +net/if_var.h +net/kext_net.h +net/ndrv.h +net/net_kev.h +net/pfkeyv2.h +net/route.h +netinet/bootp.h +netinet/icmp6.h +netinet/icmp_var.h +netinet/if_ether.h +netinet/igmp.h +netinet/igmp_var.h +netinet/in.h +netinet/in_pcb.h +netinet/in_systm.h +netinet/in_var.h +netinet/ip.h +netinet/ip6.h +netinet/ip_icmp.h +netinet/ip_var.h +netinet/tcp.h +netinet/tcp_fsm.h +netinet/tcp_seq.h +netinet/tcp_timer.h +netinet/tcp_var.h +netinet/tcpip.h +netinet/udp.h +netinet/udp_var.h +netinet6/ah.h +netinet6/esp.h +netinet6/in6.h +netinet6/in6_var.h +netinet6/ipcomp.h +netinet6/ipsec.h +netinet6/nd6.h +netinet6/raw_ip6.h +netinet6/scope6_var.h +netkey/keysock.h +nfs/krpc.h +nfs/nfs.h +nfs/nfs_gss.h +nfs/nfs_ioctl.h +nfs/nfs_lock.h +nfs/nfsdiskless.h +nfs/nfsm_subs.h +nfs/nfsmount.h +nfs/nfsnode.h +nfs/nfsproto.h +nfs/nfsrvcache.h +nfs/rpcv2.h +nfs/xdr_subs.h +os/overflow.h +os/tsd.h +osfmk/UserNotification/KUNCUserNotifications.h +osfmk/UserNotification/UNDReply.defs +osfmk/UserNotification/UNDRequest.defs +osfmk/UserNotification/UNDTypes.defs +osfmk/UserNotification/UNDTypes.h +osfmk/atm/atm_internal.h +osfmk/atm/atm_notification.defs +osfmk/atm/atm_types.defs +osfmk/atm/atm_types.h +osfmk/bank/bank_types.h +osfmk/console/video_console.h +osfmk/corpses/task_corpse.h +osfmk/default_pager/default_pager_types.h +osfmk/device/device.defs +osfmk/device/device_port.h +osfmk/device/device_types.defs +osfmk/device/device_types.h +osfmk/gssd/gssd_mach.defs +osfmk/gssd/gssd_mach.h +osfmk/gssd/gssd_mach_types.h +osfmk/i386/apic.h +osfmk/i386/asm.h +osfmk/i386/atomic.h +osfmk/i386/bit_routines.h +osfmk/i386/cpu_capabilities.h +osfmk/i386/cpu_data.h +osfmk/i386/cpu_number.h +osfmk/i386/cpu_topology.h +osfmk/i386/cpuid.h +osfmk/i386/eflags.h +osfmk/i386/io_map_entries.h +osfmk/i386/lapic.h +osfmk/i386/lock.h +osfmk/i386/locks.h +osfmk/i386/machine_cpu.h +osfmk/i386/machine_routines.h +osfmk/i386/mp.h +osfmk/i386/mp_desc.h +osfmk/i386/mp_events.h +osfmk/i386/mtrr.h +osfmk/i386/pal_hibernate.h +osfmk/i386/pal_native.h +osfmk/i386/pal_routines.h +osfmk/i386/panic_hooks.h +osfmk/i386/pmCPU.h +osfmk/i386/pmap.h +osfmk/i386/proc_reg.h +osfmk/i386/rtclock_protos.h +osfmk/i386/seg.h +osfmk/i386/simple_lock.h +osfmk/i386/smp.h +osfmk/i386/tsc.h +osfmk/i386/tss.h +osfmk/i386/ucode.h +osfmk/i386/vmx.h +osfmk/ipc/ipc_types.h +osfmk/kdp/kdp_callout.h +osfmk/kdp/kdp_dyld.h +osfmk/kdp/kdp_en_debugger.h +osfmk/kern/affinity.h +osfmk/kern/assert.h +osfmk/kern/audit_sessionport.h +osfmk/kern/backtrace.h +osfmk/kern/bits.h +osfmk/kern/block_hint.h +osfmk/kern/call_entry.h +osfmk/kern/clock.h +osfmk/kern/coalition.h +osfmk/kern/cpu_data.h +osfmk/kern/cpu_number.h +osfmk/kern/debug.h +osfmk/kern/ecc.h +osfmk/kern/energy_perf.h +osfmk/kern/exc_resource.h +osfmk/kern/extmod_statistics.h +osfmk/kern/host.h +osfmk/kern/hv_support.h +osfmk/kern/ipc_mig.h +osfmk/kern/ipc_misc.h +osfmk/kern/kalloc.h +osfmk/kern/kcdata.h +osfmk/kern/kern_cdata.h +osfmk/kern/kern_types.h +osfmk/kern/kext_alloc.h +osfmk/kern/kpc.h +osfmk/kern/ledger.h +osfmk/kern/lock.h +osfmk/kern/locks.h +osfmk/kern/mach_param.h +osfmk/kern/macro_help.h +osfmk/kern/page_decrypt.h +osfmk/kern/pms.h +osfmk/kern/policy_internal.h +osfmk/kern/processor.h +osfmk/kern/queue.h +osfmk/kern/sched_prim.h +osfmk/kern/sfi.h +osfmk/kern/simple_lock.h +osfmk/kern/startup.h +osfmk/kern/task.h +osfmk/kern/telemetry.h +osfmk/kern/thread.h +osfmk/kern/thread_call.h +osfmk/kern/timer_call.h +osfmk/kern/waitq.h +osfmk/kern/zalloc.h +osfmk/kextd/kextd_mach.defs +osfmk/kextd/kextd_mach.h +osfmk/kperf/action.h +osfmk/kperf/context.h +osfmk/kperf/kdebug_trigger.h +osfmk/kperf/kperf.h +osfmk/kperf/kperf_timer.h +osfmk/kperf/kperfbsd.h +osfmk/kperf/pet.h +osfmk/lockd/lockd_mach.defs +osfmk/lockd/lockd_mach.h +osfmk/lockd/lockd_mach_types.h +osfmk/mach/audit_triggers.defs +osfmk/mach/audit_triggers_server.h +osfmk/mach/boolean.h +osfmk/mach/branch_predicates.h +osfmk/mach/clock.defs +osfmk/mach/clock.h +osfmk/mach/clock_priv.defs +osfmk/mach/clock_priv.h +osfmk/mach/clock_reply.defs +osfmk/mach/clock_reply_server.h +osfmk/mach/clock_types.defs +osfmk/mach/clock_types.h +osfmk/mach/coalition.h +osfmk/mach/coalition_notification_server.h +osfmk/mach/dyld_kernel.h +osfmk/mach/error.h +osfmk/mach/exc.defs +osfmk/mach/exc_server.h +osfmk/mach/exception.h +osfmk/mach/exception_types.h +osfmk/mach/host_info.h +osfmk/mach/host_notify.h +osfmk/mach/host_notify_reply.defs +osfmk/mach/host_priv.defs +osfmk/mach/host_priv.h +osfmk/mach/host_reboot.h +osfmk/mach/host_security.defs +osfmk/mach/host_security.h +osfmk/mach/host_special_ports.h +osfmk/mach/i386/_structs.h +osfmk/mach/i386/asm.h +osfmk/mach/i386/boolean.h +osfmk/mach/i386/exception.h +osfmk/mach/i386/fp_reg.h +osfmk/mach/i386/kern_return.h +osfmk/mach/i386/ndr_def.h +osfmk/mach/i386/processor_info.h +osfmk/mach/i386/rpc.h +osfmk/mach/i386/sdt_isa.h +osfmk/mach/i386/syscall_sw.h +osfmk/mach/i386/thread_state.h +osfmk/mach/i386/thread_status.h +osfmk/mach/i386/vm_param.h +osfmk/mach/i386/vm_types.h +osfmk/mach/kern_return.h +osfmk/mach/kmod.h +osfmk/mach/ktrace_background.h +osfmk/mach/lock_set.defs +osfmk/mach/lock_set.h +osfmk/mach/mach_exc.defs +osfmk/mach/mach_exc_server.h +osfmk/mach/mach_host.defs +osfmk/mach/mach_host.h +osfmk/mach/mach_interface.h +osfmk/mach/mach_param.h +osfmk/mach/mach_port.defs +osfmk/mach/mach_port.h +osfmk/mach/mach_syscalls.h +osfmk/mach/mach_time.h +osfmk/mach/mach_traps.h +osfmk/mach/mach_types.defs +osfmk/mach/mach_types.h +osfmk/mach/mach_vm.defs +osfmk/mach/mach_vm.h +osfmk/mach/mach_voucher.defs +osfmk/mach/mach_voucher.h +osfmk/mach/mach_voucher_attr_control.defs +osfmk/mach/mach_voucher_attr_control.h +osfmk/mach/mach_voucher_types.h +osfmk/mach/machine.h +osfmk/mach/machine/asm.h +osfmk/mach/machine/boolean.h +osfmk/mach/machine/exception.h +osfmk/mach/machine/kern_return.h +osfmk/mach/machine/machine_types.defs +osfmk/mach/machine/ndr_def.h +osfmk/mach/machine/processor_info.h +osfmk/mach/machine/rpc.h +osfmk/mach/machine/sdt.h +osfmk/mach/machine/sdt_isa.h +osfmk/mach/machine/syscall_sw.h +osfmk/mach/machine/thread_state.h +osfmk/mach/machine/thread_status.h +osfmk/mach/machine/vm_param.h +osfmk/mach/machine/vm_types.h +osfmk/mach/memory_object_control.h +osfmk/mach/memory_object_default_server.h +osfmk/mach/memory_object_types.h +osfmk/mach/message.h +osfmk/mach/mig.h +osfmk/mach/mig_errors.h +osfmk/mach/mig_strncpy_zerofill_support.h +osfmk/mach/mig_voucher_support.h +osfmk/mach/ndr.h +osfmk/mach/notify.defs +osfmk/mach/notify.h +osfmk/mach/notify_server.h +osfmk/mach/policy.h +osfmk/mach/port.h +osfmk/mach/processor.defs +osfmk/mach/processor.h +osfmk/mach/processor_info.h +osfmk/mach/processor_set.defs +osfmk/mach/processor_set.h +osfmk/mach/resource_monitors.h +osfmk/mach/rpc.h +osfmk/mach/sdt.h +osfmk/mach/semaphore.h +osfmk/mach/sfi_class.h +osfmk/mach/shared_memory_server.h +osfmk/mach/shared_region.h +osfmk/mach/std_types.defs +osfmk/mach/std_types.h +osfmk/mach/sync_policy.h +osfmk/mach/syscall_sw.h +osfmk/mach/sysdiagnose_notification_server.h +osfmk/mach/task.defs +osfmk/mach/task.h +osfmk/mach/task_access.defs +osfmk/mach/task_access.h +osfmk/mach/task_access_server.h +osfmk/mach/task_info.h +osfmk/mach/task_policy.h +osfmk/mach/task_special_ports.h +osfmk/mach/telemetry_notification.defs +osfmk/mach/telemetry_notification_server.h +osfmk/mach/thread_act.defs +osfmk/mach/thread_act.h +osfmk/mach/thread_info.h +osfmk/mach/thread_policy.h +osfmk/mach/thread_special_ports.h +osfmk/mach/thread_status.h +osfmk/mach/thread_switch.h +osfmk/mach/time_value.h +osfmk/mach/upl.h +osfmk/mach/vm_attributes.h +osfmk/mach/vm_behavior.h +osfmk/mach/vm_inherit.h +osfmk/mach/vm_map.defs +osfmk/mach/vm_map.h +osfmk/mach/vm_param.h +osfmk/mach/vm_prot.h +osfmk/mach/vm_purgable.h +osfmk/mach/vm_region.h +osfmk/mach/vm_statistics.h +osfmk/mach/vm_sync.h +osfmk/mach/vm_types.h +osfmk/mach_debug/hash_info.h +osfmk/mach_debug/ipc_info.h +osfmk/mach_debug/lockgroup_info.h +osfmk/mach_debug/mach_debug.h +osfmk/mach_debug/mach_debug_types.defs +osfmk/mach_debug/mach_debug_types.h +osfmk/mach_debug/page_info.h +osfmk/mach_debug/vm_info.h +osfmk/mach_debug/zone_info.h +osfmk/machine/atomic.h +osfmk/machine/cpu_capabilities.h +osfmk/machine/cpu_number.h +osfmk/machine/io_map_entries.h +osfmk/machine/lock.h +osfmk/machine/locks.h +osfmk/machine/machine_cpuid.h +osfmk/machine/machine_kpc.h +osfmk/machine/machine_routines.h +osfmk/machine/pal_hibernate.h +osfmk/machine/pal_routines.h +osfmk/machine/simple_lock.h +osfmk/prng/random.h +osfmk/string.h +osfmk/vm/WKdm_new.h +osfmk/vm/pmap.h +osfmk/vm/vm_compressor_algorithms.h +osfmk/vm/vm_fault.h +osfmk/vm/vm_kern.h +osfmk/vm/vm_map.h +osfmk/vm/vm_options.h +osfmk/vm/vm_pageout.h +osfmk/vm/vm_protos.h +osfmk/vm/vm_shared_region.h +osfmk/voucher/ipc_pthread_priority_types.h +osfmk/x86_64/machine_kpc.h +pexpert/boot.h +pexpert/i386/boot.h +pexpert/i386/efi.h +pexpert/i386/protos.h +pexpert/machine/boot.h +pexpert/machine/protos.h +pexpert/pexpert.h +pexpert/pexpert/boot.h +pexpert/pexpert/device_tree.h +pexpert/pexpert/i386/boot.h +pexpert/pexpert/i386/efi.h +pexpert/pexpert/i386/protos.h +pexpert/pexpert/machine/boot.h +pexpert/pexpert/machine/protos.h +pexpert/pexpert/pexpert.h +pexpert/pexpert/protos.h +pexpert/protos.h +security/audit/audit_ioctl.h +security/mac.h +security/mac_policy.h +security/security/_label.h +security/security/mac.h +security/security/mac_alloc.h +security/security/mac_data.h +security/security/mac_framework.h +security/security/mac_internal.h +security/security/mac_mach_internal.h +security/security/mac_policy.h +servers/key_defs.h +servers/ls_defs.h +servers/netname.h +servers/netname_defs.h +servers/nm_defs.h +sys/_endian.h +sys/_posix_availability.h +sys/_select.h +sys/_structs.h +sys/_symbol_aliasing.h +sys/_types.h +sys/_types/_blkcnt_t.h +sys/_types/_blksize_t.h +sys/_types/_clock_t.h +sys/_types/_ct_rune_t.h +sys/_types/_dev_t.h +sys/_types/_errno_t.h +sys/_types/_fd_clr.h +sys/_types/_fd_copy.h +sys/_types/_fd_def.h +sys/_types/_fd_isset.h +sys/_types/_fd_set.h +sys/_types/_fd_setsize.h +sys/_types/_fd_zero.h +sys/_types/_filesec_t.h +sys/_types/_fsblkcnt_t.h +sys/_types/_fsfilcnt_t.h +sys/_types/_fsid_t.h +sys/_types/_fsobj_id_t.h +sys/_types/_gid_t.h +sys/_types/_guid_t.h +sys/_types/_id_t.h +sys/_types/_in_addr_t.h +sys/_types/_in_port_t.h +sys/_types/_ino64_t.h +sys/_types/_ino_t.h +sys/_types/_int16_t.h +sys/_types/_int32_t.h +sys/_types/_int64_t.h +sys/_types/_int8_t.h +sys/_types/_intptr_t.h +sys/_types/_iovec_t.h +sys/_types/_key_t.h +sys/_types/_mach_port_t.h +sys/_types/_mbstate_t.h +sys/_types/_mode_t.h +sys/_types/_nlink_t.h +sys/_types/_null.h +sys/_types/_o_dsync.h +sys/_types/_o_sync.h +sys/_types/_off_t.h +sys/_types/_offsetof.h +sys/_types/_os_inline.h +sys/_types/_pid_t.h +sys/_types/_posix_vdisable.h +sys/_types/_ptrdiff_t.h +sys/_types/_rsize_t.h +sys/_types/_rune_t.h +sys/_types/_s_ifmt.h +sys/_types/_sa_family_t.h +sys/_types/_seek_set.h +sys/_types/_sigaltstack.h +sys/_types/_sigset_t.h +sys/_types/_size_t.h +sys/_types/_socklen_t.h +sys/_types/_ssize_t.h +sys/_types/_suseconds_t.h +sys/_types/_time_t.h +sys/_types/_timespec.h +sys/_types/_timeval.h +sys/_types/_timeval32.h +sys/_types/_timeval64.h +sys/_types/_u_int16_t.h +sys/_types/_u_int32_t.h +sys/_types/_u_int64_t.h +sys/_types/_u_int8_t.h +sys/_types/_ucontext.h +sys/_types/_ucontext64.h +sys/_types/_uid_t.h +sys/_types/_uintptr_t.h +sys/_types/_useconds_t.h +sys/_types/_uuid_t.h +sys/_types/_va_list.h +sys/_types/_wchar_t.h +sys/_types/_wint_t.h +sys/acct.h +sys/aio.h +sys/appleapiopts.h +sys/attr.h +sys/buf.h +sys/cdefs.h +sys/clonefile.h +sys/conf.h +sys/dir.h +sys/dirent.h +sys/disk.h +sys/dkstat.h +sys/domain.h +sys/dtrace.h +sys/dtrace_glue.h +sys/dtrace_impl.h +sys/errno.h +sys/ev.h +sys/event.h +sys/fasttrap.h +sys/fasttrap_isa.h +sys/fcntl.h +sys/file.h +sys/filedesc.h +sys/filio.h +sys/gmon.h +sys/ioccom.h +sys/ioctl.h +sys/ioctl_compat.h +sys/ipc.h +sys/kauth.h +sys/kdebug.h +sys/kdebug_signpost.h +sys/kern_control.h +sys/kern_event.h +sys/kernel.h +sys/kernel_types.h +sys/lctx.h +sys/loadable_fs.h +sys/lock.h +sys/lockf.h +sys/lockstat.h +sys/malloc.h +sys/mbuf.h +sys/mman.h +sys/mount.h +sys/msg.h +sys/msgbuf.h +sys/netport.h +sys/param.h +sys/paths.h +sys/pipe.h +sys/poll.h +sys/posix_sem.h +sys/posix_shm.h +sys/proc.h +sys/proc_info.h +sys/protosw.h +sys/ptrace.h +sys/queue.h +sys/quota.h +sys/random.h +sys/reboot.h +sys/resource.h +sys/resourcevar.h +sys/sbuf.h +sys/sdt.h +sys/select.h +sys/sem.h +sys/semaphore.h +sys/shm.h +sys/signal.h +sys/signalvar.h +sys/socket.h +sys/socketvar.h +sys/sockio.h +sys/spawn.h +sys/stat.h +sys/stdio.h +sys/sys_domain.h +sys/syscall.h +sys/sysctl.h +sys/syslimits.h +sys/syslog.h +sys/termios.h +sys/time.h +sys/timeb.h +sys/times.h +sys/tprintf.h +sys/trace.h +sys/tty.h +sys/ttychars.h +sys/ttycom.h +sys/ttydefaults.h +sys/ttydev.h +sys/types.h +sys/ubc.h +sys/ucontext.h +sys/ucred.h +sys/uio.h +sys/un.h +sys/unistd.h +sys/unpcb.h +sys/user.h +sys/utfconv.h +sys/utsname.h +sys/vadvise.h +sys/vcmd.h +sys/vm.h +sys/vmmeter.h +sys/vmparam.h +sys/vnioctl.h +sys/vnode.h +sys/vnode_if.h +sys/vstat.h +sys/wait.h +sys/xattr.h +uuid/uuid.h +vfs/vfs_support.h +voucher/ipc_pthread_priority_types.h diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix index 9f0ee4db118cd..560be0c31ab61 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ ninja python3 ]; buildInputs = [ curl libxml2 objc4 ICU ]; - sourceRoot = "source/CoreFoundation"; + postPatch = '' + cd CoreFoundation - patchPhase = '' cp ${sysdir-free-system-directories} Base.subproj/CFSystemDirectories.c # In order, since I can't comment individual lines: @@ -39,6 +39,7 @@ stdenv.mkDerivation { # Fix sandbox impurities. substituteInPlace ../lib/script.py \ --replace '/bin/cp' cp + patchShebangs --build ../configure # Includes xpc for some initialization routine that they don't define anyway, so no harm here substituteInPlace PlugIn.subproj/CFBundlePriv.h \ diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix index 9e7450775147e..026ef5b0f468c 100644 --- a/pkgs/os-specific/linux/akvcam/default.nix +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ qmake ]; + dontWrapQtApps = true; qmakeFlags = [ "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 7d72b0eec56ba..84bc6086d1223 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -36,7 +36,8 @@ stdenv.mkDerivation rec { # TODO: Remove the musl patches when # https://github.com/linux-audit/audit-userspace/pull/25 # is available with the next release. - patches = lib.optional stdenv.hostPlatform.isMusl [ + patches = [ ./patches/weak-symbols.patch ] + ++ lib.optional stdenv.hostPlatform.isMusl [ ( let patch = fetchpatch { url = "https://github.com/linux-audit/audit-userspace/commit/d579a08bb1cde71f939c13ac6b2261052ae9f77e.patch"; @@ -55,6 +56,13 @@ stdenv.mkDerivation rec { prePatch = '' sed -i 's,#include <sys/poll.h>,#include <poll.h>\n#include <limits.h>,' audisp/audispd.c + '' + # According to https://stackoverflow.com/questions/13089166 + # --whole-archive linker flag is required to be sure that linker + # correctly chooses strong version of symbol regardless of order of + # object files at command line. + + lib.optionalString stdenv.targetPlatform.isStatic '' + export LDFLAGS=-Wl,--whole-archive ''; meta = { description = "Audit Library"; diff --git a/pkgs/os-specific/linux/audit/patches/weak-symbols.patch b/pkgs/os-specific/linux/audit/patches/weak-symbols.patch new file mode 100644 index 0000000000000..301ea9a5476ce --- /dev/null +++ b/pkgs/os-specific/linux/audit/patches/weak-symbols.patch @@ -0,0 +1,147 @@ +Executables in src/ directory are built from source files in src/ +and are linked to libauparse, with both src/auditd-config.c and +auparse/auditd-config.c defining "free_config" function. + +It is known (although obscure) behaviour of shared libraries that +symbol defined in binary itself overrides symbol in shared library; +with static linkage it expectedly results in multiple definition +error. + +This set of fixes explicitly marks libauparse versions of +conflicting functions as weak to have behaviour coherent with +dynamic linkage version -- definitions in src/ overriding definition +in auparse/. + +Still, this architecture is very strange and confusing. + +diff -r -U5 audit-2.8.5-orig/auparse/auditd-config.c audit-2.8.5/auparse/auditd-config.c +--- audit-2.8.5-orig/auparse/auditd-config.c 2019-03-01 20:19:13.000000000 +0000 ++++ audit-2.8.5/auparse/auditd-config.c 2021-01-13 11:36:12.716226498 +0000 +@@ -68,10 +68,11 @@ + }; + + /* + * Set everything to its default value + */ ++#pragma weak clear_config + void clear_config(struct daemon_conf *config) + { + config->local_events = 1; + config->qos = QOS_NON_BLOCKING; + config->sender_uid = 0; +@@ -322,10 +323,11 @@ + if (config->log_file == NULL) + return 1; + return 0; + } + ++#pragma weak free_config + void free_config(struct daemon_conf *config) + { + free((void*)config->log_file); + } + +diff -r -U5 audit-2.8.5-orig/auparse/interpret.c audit-2.8.5/auparse/interpret.c +--- audit-2.8.5-orig/auparse/interpret.c 2019-03-01 20:19:13.000000000 +0000 ++++ audit-2.8.5/auparse/interpret.c 2021-01-13 11:39:42.107217224 +0000 +@@ -545,10 +545,11 @@ + else + snprintf(buf, size, "unknown(%d)", uid); + return buf; + } + ++#pragma weak aulookup_destroy_uid_list + void aulookup_destroy_uid_list(void) + { + if (uid_cache_created == 0) + return; + +@@ -2810,10 +2811,11 @@ + + /* + * This is the main entry point for the auparse library. Call chain is: + * auparse_interpret_field -> nvlist_interp_cur_val -> interpret + */ ++#pragma weak interpret + const char *interpret(const rnode *r, auparse_esc_t escape_mode) + { + const nvlist *nv = &r->nv; + int type; + idata id; +diff -r -U5 audit-2.8.5-orig/auparse/nvlist.c audit-2.8.5/auparse/nvlist.c +--- audit-2.8.5-orig/auparse/nvlist.c 2019-02-04 14:26:52.000000000 +0000 ++++ audit-2.8.5/auparse/nvlist.c 2021-01-13 11:37:37.190222757 +0000 +@@ -27,10 +27,11 @@ + #include "nvlist.h" + #include "interpret.h" + #include "auparse-idata.h" + + ++#pragma weak nvlist_create + void nvlist_create(nvlist *l) + { + l->head = NULL; + l->cur = NULL; + l->cnt = 0; +@@ -47,17 +48,19 @@ + while (node->next) + node = node->next; + l->cur = node; + } + ++#pragma weak nvlist_next + nvnode *nvlist_next(nvlist *l) + { + if (l->cur) + l->cur = l->cur->next; + return l->cur; + } + ++#pragma weak nvlist_append + void nvlist_append(nvlist *l, nvnode *node) + { + nvnode* newnode = malloc(sizeof(nvnode)); + + newnode->name = node->name; +@@ -141,10 +144,11 @@ + if (l->cur->interp_val) + return l->cur->interp_val; + return interpret(r, escape_mode); + } + ++#pragma weak nvlist_clear + void nvlist_clear(nvlist* l) + { + nvnode* nextnode; + register nvnode* current; + +diff -r -U5 audit-2.8.5-orig/auparse/strsplit.c audit-2.8.5/auparse/strsplit.c +--- audit-2.8.5-orig/auparse/strsplit.c 2019-03-01 21:15:30.000000000 +0000 ++++ audit-2.8.5/auparse/strsplit.c 2021-01-13 11:38:04.306221556 +0000 +@@ -54,10 +54,11 @@ + return NULL; + return s; + } + } + ++#pragma weak audit_strsplit + char *audit_strsplit(char *s) + { + static char *str = NULL; + char *ptr; + +diff -r -U5 audit-2.8.5-orig/lib/strsplit.c audit-2.8.5/lib/strsplit.c +--- audit-2.8.5-orig/lib/strsplit.c 2019-03-01 20:19:13.000000000 +0000 ++++ audit-2.8.5/lib/strsplit.c 2021-01-13 11:38:29.444220443 +0000 +@@ -23,10 +23,11 @@ + + #include <string.h> + #include "libaudit.h" + #include "private.h" + ++#pragma weak audit_strsplit_r + char *audit_strsplit_r(char *s, char **savedpp) + { + char *ptr; + + if (s) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index a4a7adeb8b791..6c034e1c2af0c 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -118,9 +118,11 @@ stdenv.mkDerivation rec { logger() { '$out'/bin/logger "$@"; }\ ' ${debianDispatcherScript} > ${outDispatchPath} chmod 555 ${outDispatchPath} - PATH=$out/bin patchShebangs ${outDispatchPath} + HOST_PATH=$out/bin patchShebangs --host ${outDispatchPath} ''; + strictDeps = true; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ]; diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 82157ffa07915..797e7a5b13050 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -6,12 +6,12 @@ with lib; stdenv.mkDerivation rec { - version = "1.8.6"; + version = "1.8.7"; pname = "iptables"; src = fetchurl { url = "https://www.netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2"; - sha256 = "0rvp0k8a72h2snrdx48cfn75bfa0ycrd2xl3kjysbymq7q6gxx50"; + sha256 = "1w6qx3sxzkv80shk21f63rq41c84irpx68k62m2cv629n1mwj2f1"; }; nativeBuildInputs = [ pkg-config pruneLibtoolFiles flex bison ]; diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 0079aa79a22b9..56942d6d4201d 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,12 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, gettext, libxslt, docbook_xsl_ns , libcap, libidn2 }: -with lib; - let - version = "20200821"; + version = "20210202"; sunAsIsLicense = { fullName = "AS-IS, SUN MICROSYSTEMS license"; url = "https://github.com/iputils/iputils/blob/s${version}/rdisc.c"; @@ -18,18 +16,10 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "s${version}"; - sha256 = "1jhbcz75a4ij1myyyi110ma1d8d5hpm3scz9pyw7js6qym50xvh4"; + rev = version; + sha256 = "08j2hfgnfh31vv9rn1ml7090j2lsvm9wdpdz13rz60rmyzrx9dq3"; }; - patches = [ - # Proposed upstream patch to reduce dependency on systemd: https://github.com/iputils/iputils/pull/297 - (fetchpatch { - url = "https://github.com/iputils/iputils/commit/13d6aefd57fd471ecad06e19073dcc44608dff5e.patch"; - sha256 = "1n62zxmzp7hgz9qapbbpqv3fxqvc3qyd2a73jhp357x6by84kj49"; - }) - ]; - mesonFlags = [ "-DBUILD_RARPD=true" "-DBUILD_TRACEROUTE6=true" @@ -39,13 +29,13 @@ in stdenv.mkDerivation rec { "-DINSTALL_SYSTEMD_UNITS=true" ] # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): - ++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; + ++ lib.optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ]; buildInputs = [ libcap ] - ++ optional (!stdenv.hostPlatform.isMusl) libidn2; + ++ lib.optional (!stdenv.hostPlatform.isMusl) libidn2; - meta = { + meta = with lib; { description = "A set of small useful utilities for Linux networking"; inherit (src.meta) homepage; changelog = "https://github.com/iputils/iputils/releases/tag/s${version}"; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 5e90010a1102b..c71fdc327358f 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -172,6 +172,8 @@ let (whenAtLeast "4.17" yes) ]; NF_TABLES_NETDEV = mkMerge [ (whenOlder "4.17" module) (whenAtLeast "4.17" yes) ]; + NFT_REJECT_NETDEV = whenAtLeast "5.11" module; + # IP: Netfilter Configuration NF_TABLES_IPV4 = mkMerge [ (whenOlder "4.17" module) (whenAtLeast "4.17" yes) ]; @@ -248,6 +250,8 @@ let DRM_AMDGPU_SI = whenAtLeast "4.9" yes; # (stable) amdgpu support for bonaire and newer chipsets DRM_AMDGPU_CIK = whenAtLeast "4.9" yes; + # amdgpu support for RX6000 series + DRM_AMD_DC_DCN3_0 = whenAtLeast "5.9.12" yes; # Allow device firmware updates DRM_DP_AUX_CHARDEV = whenAtLeast "4.6" yes; } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") { @@ -356,6 +360,7 @@ let F2FS_FS = module; F2FS_FS_SECURITY = option yes; F2FS_FS_ENCRYPTION = option yes; + F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes; UDF_FS = module; NFSD_PNFS = whenBetween "4.0" "4.6" yes; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 843b93a77d082..1fb714354fa08 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,14 +13,14 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.16-hardened1.patch", - "sha256": "0qd38hrc5qhm1gkk7rdlsf897cw7srs0ibz3xqdbl2zvwxrk1f1w", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.16-hardened1/linux-hardened-5.10.16-hardened1.patch" + "name": "linux-hardened-5.10.17-hardened1.patch", + "sha256": "0c3q7a85vfcq8yc2ig4qv7ix7v5wrj3968cj9j4zgg5537da6cp5", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.17-hardened1/linux-hardened-5.10.17-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.98-hardened1.patch", - "sha256": "0nwj49rb87agkbsv9qfi8wc6mv31a40zdbvl2wp316qxhb1d5n9c", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.98-hardened1/linux-hardened-5.4.98-hardened1.patch" + "name": "linux-hardened-5.4.99-hardened1.patch", + "sha256": "0a70n90757kk79wva72ywkn4yy7d2mp6rq1x4cnk0mgpf80lsrdr", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.99-hardened1/linux-hardened-5.4.99-hardened1.patch" } } diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 246f02805f097..24e9011875669 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -7,11 +7,11 @@ assert usePam -> pam != null; stdenv.mkDerivation rec { pname = "libcap"; - version = "2.46"; + version = "2.47"; src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; - sha256 = "1d6q447wf0iagiyzhfdqcj4cv0dmzc49i0czwikrcv7s2cad3lsf"; + sha256 = "0jx0vjlfg1nzdjdrkrnbdkrqjx4l80vi9isf2qav7s4zbzs5s5mg"; }; patches = lib.optional isStatic ./no-shared-lib.patch; diff --git a/pkgs/os-specific/linux/musl-fts/default.nix b/pkgs/os-specific/linux/musl-fts/default.nix new file mode 100644 index 0000000000000..cdb1cca47c6aa --- /dev/null +++ b/pkgs/os-specific/linux/musl-fts/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: + +stdenv.mkDerivation rec { + pname = "musl-fts"; + version = "1.2.7"; + + src = fetchFromGitHub { + owner = "void-linux"; + repo = "musl-fts"; + rev = "v${version}"; + sha256 = "Azw5qrz6OKDcpYydE6jXzVxSM5A8oYWAztrHr+O/DOE="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/void-linux/musl-fts"; + description = "An implementation of fts(3) for musl-libc"; + platforms = platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.pjjw ]; + }; +} diff --git a/pkgs/os-specific/linux/musl-obstack/default.nix b/pkgs/os-specific/linux/musl-obstack/default.nix new file mode 100644 index 0000000000000..f7682d37efd94 --- /dev/null +++ b/pkgs/os-specific/linux/musl-obstack/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: + +stdenv.mkDerivation rec { + pname = "musl-obstack"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "void-linux"; + repo = "musl-obstack"; + rev = "v${version}"; + sha256 = "v0RTnrqAmJfOeGsJFc04lqFR8QZhYiLyvy8oRYiuC80="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/void-linux/musl-obstack"; + description = + "An extraction of the obstack functions and macros from GNU libiberty for use with musl-libc"; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.pjjw ]; + }; +} diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 115c12ec5e4e5..bb5e3f5196428 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -10,12 +10,12 @@ with lib; stdenv.mkDerivation rec { - version = "0.9.7"; + version = "0.9.8"; pname = "nftables"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2"; - sha256 = "1c1c2475nifncv0ng8z77h2dpanlsx0bhqm15k00jb3a6a68lszy"; + sha256 = "1r4g22grhd4s1918wws9vggb8821sv4kkj8197ygxr6sar301z30"; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 6e7e5607c6438..c8ff738cd6e4d 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook269, util-linux, nukeReferences, coreutils -, perl, buildPackages, nixosTests +, perl, nixosTests , configFile ? "all" # Userspace dependencies @@ -9,7 +9,7 @@ , nfs-utils , gawk, gnugrep, gnused, systemd , smartmontools, enableMail ? false -, sysstat, sudo, pkg-config +, sysstat, pkg-config # Kernel dependencies , kernel ? null diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 4e951f888fdef..ce7fbfb606487 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -52,7 +52,7 @@ "arwn" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "asterisk_cdr" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox - "asuswrt" = ps: with ps; [ ]; # missing inputs: aioasuswrt + "asuswrt" = ps: with ps; [ aioasuswrt ]; "atag" = ps: with ps; [ ]; # missing inputs: pyatag "aten_pe" = ps: with ps; [ atenpdu ]; "atome" = ps: with ps; [ ]; # missing inputs: pyatome @@ -209,7 +209,7 @@ "ee_brightbox" = ps: with ps; [ ]; # missing inputs: eebrightbox "efergy" = ps: with ps; [ ]; "egardia" = ps: with ps; [ ]; # missing inputs: pythonegardia - "eight_sleep" = ps: with ps; [ ]; # missing inputs: pyeight + "eight_sleep" = ps: with ps; [ pyeight ]; "elgato" = ps: with ps; [ ]; # missing inputs: elgato "eliqonline" = ps: with ps; [ ]; # missing inputs: eliqonline "elkm1" = ps: with ps; [ ]; # missing inputs: elkm1-lib @@ -496,7 +496,7 @@ "microsoft_face_detect" = ps: with ps; [ aiohttp-cors ]; "microsoft_face_identify" = ps: with ps; [ aiohttp-cors ]; "miflora" = ps: with ps; [ bluepy ]; # missing inputs: miflora - "mikrotik" = ps: with ps; [ ]; # missing inputs: librouteros + "mikrotik" = ps: with ps; [ librouteros ]; "mill" = ps: with ps; [ ]; # missing inputs: millheater "min_max" = ps: with ps; [ ]; "minecraft_server" = ps: with ps; [ aiodns getmac ]; # missing inputs: mcstatus diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index fae857fda5dcd..754b752cbed1d 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -9,8 +9,7 @@ # Override Python packages using # self: super: { pkg = super.pkg.overridePythonAttrs (oldAttrs: { ... }); } # Applied after defaultOverrides -, packageOverrides ? self: super: { -} +, packageOverrides ? self: super: {} # Skip pip install of required packages on startup , skipPip ? true }: diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 48b5a7195b5b5..d64279bf7e178 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.37.8"; + version = "0.38.0"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "sha256-T3isJcnDUvN4TCd9tZA1p46pamhdPSwIKKAOr6+1F30="; + sha256 = "170fj2cc7drh6c1dgl60f9n79vfrsw2v57lmds677naxnq254jhp"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 08af694560bf5..42b071427ff9c 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,7 +2,7 @@ let pname = "miniflux"; - version = "2.0.27"; + version = "2.0.28"; in buildGoModule { inherit pname version; @@ -11,10 +11,10 @@ in buildGoModule { owner = pname; repo = pname; rev = version; - sha256 = "0sl1hxdybafzpa1bi22b8r4fxdzwynr012ga5jvwcn2rcxbdbd8z"; + sha256 = "sha256-XvQhLqGP1TliSrIm55dP04yGoOMnHmcI2gH00SYVLVY="; }; - vendorSha256 = "183whf29zq771rq0z4008gwaps1iipb0m9kp6xyizbnzafwm3zwm"; + vendorSha256 = "sha256-NKpMLjro06gWN2Xu5M+xM4hVNvlOZ12F3Jv+bL5E0I8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 492e0236d19c6..677d166a3c2c3 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio"; - version = "2021-02-11T08-23-43Z"; + version = "2021-02-14T04-01-33Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-Y2iyi+bdBCLV/MWPPsrrJFEayuQVGsvrs63kOuFljJ8="; + sha256 = "sha256-Su3BkVZJ4c5T829/1TNQi7b0fZhpG/Ly80ynt5Po+Qs="; }; - vendorSha256 = "sha256-7WvR6WHiaFHHBhpPoqnkr9pzFxNpLpZuaB1a/SkLBtc="; + vendorSha256 = "sha256-r0QtgpIfDYu2kSy6/wSAExc3Uwd62sDEi1UZ8XzTBoU="; doCheck = false; diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix index 4511fbcd040a9..63d89a29d13f5 100644 --- a/pkgs/servers/nosql/cassandra/2.1.nix +++ b/pkgs/servers/nosql/cassandra/2.1.nix @@ -4,4 +4,8 @@ callPackage ./generic.nix (args // { version = "2.1.22"; sha256 = "1wk57dz0kmc6d5y8d8dkx269lzh3ark3751z734gxncwdlclcyz3"; generation = "2_1"; + extraMeta.knownVulnerabilities = [ + # Fixed in 3.* but 2.* hasn't been released since + "CVE-2020-17516" + ]; }) diff --git a/pkgs/servers/nosql/cassandra/2.2.nix b/pkgs/servers/nosql/cassandra/2.2.nix index 5cec13e4cd185..dc04c374b3d53 100644 --- a/pkgs/servers/nosql/cassandra/2.2.nix +++ b/pkgs/servers/nosql/cassandra/2.2.nix @@ -4,4 +4,8 @@ callPackage ./generic.nix (args // { version = "2.2.14"; sha256 = "1b2x3q1ach44qg07sh8wr7d8a10n36w5522drd3p35djbiwa3d9q"; generation = "2_2"; + extraMeta.knownVulnerabilities = [ + # Fixed in 3.* but 2.* hasn't been released since + "CVE-2020-17516" + ]; }) diff --git a/pkgs/servers/nosql/cassandra/3.0.nix b/pkgs/servers/nosql/cassandra/3.0.nix index 72af03af1d88e..7788e3ff381ab 100644 --- a/pkgs/servers/nosql/cassandra/3.0.nix +++ b/pkgs/servers/nosql/cassandra/3.0.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.0.23"; - sha256 = "0cbia20bggq85q2p6gsybw045qdfqxd5xv8ihppq1hwl21sb2klz"; + version = "3.0.24"; + sha256 = "1yxw4jg9n49dbi1mjdfpxczsznl9m6sxlzkmzjancmjzvj5s6bvz"; generation = "3_0"; }) diff --git a/pkgs/servers/nosql/cassandra/3.11.nix b/pkgs/servers/nosql/cassandra/3.11.nix index 15e11145d595f..bcdfc8793db56 100644 --- a/pkgs/servers/nosql/cassandra/3.11.nix +++ b/pkgs/servers/nosql/cassandra/3.11.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.11.9"; - sha256 = "1ckaacc1z0j72llklrc4587ia6a0pab02bdyac6g3kl6kqvcz40c"; + version = "3.11.10"; + sha256 = "1wcv0drhb765fda6kkpsxsyfdv4cqf7nqfwc4bimh4c4djap5rxv"; generation = "3_11"; }) diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index 4d9f09637e9fa..ca2001817a34f 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -3,6 +3,7 @@ # generation is the attribute version suffix such as 3_11 in pkgs.cassandra_3_11 , generation , version, sha256 +, extraMeta ? {} , ... }: @@ -30,6 +31,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper coreutils ]; installPhase = '' + runHook preInstall + mkdir $out mv * $out @@ -85,6 +88,8 @@ stdenv.mkDerivation rec { done wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin + + runHook postInstall ''; passthru = { @@ -104,5 +109,5 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.asl20; maintainers = [ maintainers.roberth ]; - }; + } // extraMeta; } diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index a8ead4263cbcd..6c4352e23b921 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.21.3.4021-5a0a3e4b2"; + version = "1.21.3.4046-3c1c83ba4"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "1342xxbxqq3g0khw3cyib0djy8slsc2b4xxl18lli7wrfcg6kgxb"; + sha256 = "1ikv75pgircqnllimx3yszihpfaj8blhrmgvli0lagirx6sg22zl"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "05rixrk5nlmnywb7xdkmrk0zpd1ik05dyzz0b09kd212rahw0iig"; + sha256 = "1fywpkchpc726a66q7xpqrn92g73v4941df19glscrrvy7808f8n"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index d01252781768a..e8282ec4c0ba3 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "traefik"; - version = "2.4.2"; + version = "2.4.3"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-W6NtlIxeRg432RTiaJHu25Izv1VWNqYetzilCr2gPjU="; + sha256 = "sha256-lCUwzd+ECi2g5jv6ksxrlDdx7cjLgBnaBdYbgzADkcg="; stripRoot = false; }; - vendorSha256 = "sha256-kwA0MtmlUEO1eQFr4NpdsMikEFQc3N3Meolw/xw9dgM="; + vendorSha256 = "sha256-kCRXDEuaxFVZuP7PkmZIiXjhMUWjMYbOOtWl4V81DeI="; doCheck = false; diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix index 05741e0ac21af..3ff42050eb2d0 100644 --- a/pkgs/servers/web-apps/virtlyst/default.nix +++ b/pkgs/servers/web-apps/virtlyst/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config autoPatchelfHook ]; buildInputs = [ qtbase libvirt cutelyst grantlee ]; + dontWrapQtApps = true; + installPhase = '' mkdir -p $out/lib cp src/libVirtlyst.so $out/lib diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 7e38d9dec3a18..e36e32d043f84 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -56,8 +56,12 @@ let # source both, but source the more global configuration files earlier # than the more local ones, so that more local configurations inherit # from but override the more global locations. + # + # Special care needs to be taken, when fish is called from an FHS user env + # or similar setup, because this configuration file will then be relocated + # to /etc/fish/config.fish, so we test for this case to avoid nontermination. - if test -f /etc/fish/config.fish + if test -f /etc/fish/config.fish && test /etc/fish/config.fish != (status filename) source /etc/fish/config.fish end diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index a0a070b926606..804fea0102f02 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-v0u04xY4iEbOTeaPKmbHImNTzEgdqf1wZWV0hKOV6Vg="; + sha256 = "sha256-OesIOL5jn5a3yvOSayMXmZQK9XpYxspOvDvZ6OY5JD4="; }; - cargoSha256 = "sha256-0Ncjy6vZqiMNB+aRzf255tsIdrnpG0a4Xoid+mAAvUk="; + cargoSha256 = "sha256-YFtpg5IXhWJmBtX79MIBme4SKOoq+13UakvAJnTzJFo="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 4ff0a6caf7608..7168ce4084c87 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -787,7 +787,7 @@ substituteAllInPlace() { # the environment used for building. dumpVars() { if [ "${noDumpEnvVars:-0}" != 1 ]; then - export >| "$NIX_BUILD_TOP/env-vars" || true + export 2>/dev/null >| "$NIX_BUILD_TOP/env-vars" || true fi } diff --git a/pkgs/test/patch-shebangs/default.nix b/pkgs/test/patch-shebangs/default.nix index 5e1d859c13899..5c49787eee3b2 100644 --- a/pkgs/test/patch-shebangs/default.nix +++ b/pkgs/test/patch-shebangs/default.nix @@ -1,26 +1,70 @@ { lib, stdenv, runCommand }: let - bad-shebang = stdenv.mkDerivation { - name = "bad-shebang"; - dontUnpack = true; - installPhase = '' - mkdir -p $out/bin - echo "#!/bin/sh" > $out/bin/test - echo "echo -n hello" >> $out/bin/test - chmod +x $out/bin/test - ''; + tests = { + bad-shebang = stdenv.mkDerivation { + name = "bad-shebang"; + dontUnpack = true; + installPhase = '' + mkdir -p $out/bin + echo "#!/bin/sh" > $out/bin/test + echo "echo -n hello" >> $out/bin/test + chmod +x $out/bin/test + ''; + passthru = { + assertion = "grep -v '^#!/bin/sh' $out/bin/test > /dev/null"; + }; + }; + + ignores-nix-store = stdenv.mkDerivation { + name = "ignores-nix-store"; + dontUnpack = true; + installPhase = '' + mkdir -p $out/bin + echo "#!$NIX_STORE/path/to/sh" > $out/bin/test + echo "echo -n hello" >> $out/bin/test + chmod +x $out/bin/test + ''; + passthru = { + assertion = "grep \"^#!$NIX_STORE/path/to/sh\" $out/bin/test > /dev/null"; + }; + }; }; in runCommand "patch-shebangs-test" { - passthru = { inherit bad-shebang; }; + passthru = { inherit (tests) bad-shebang ignores-nix-store; }; meta.platforms = lib.platforms.all; } '' - printf "checking whether patchShebangs works properly... ">&2 - if ! grep -q '^#!/bin/sh' ${bad-shebang}/bin/test; then - echo "yes" >&2 - touch $out - else - echo "no" >&2 + validate() { + local name=$1 + local testout=$2 + local assertion=$3 + + echo -n "... $name: " >&2 + + local rc=0 + (out=$testout eval "$assertion") || rc=1 + + if [ "$rc" -eq 0 ]; then + echo "yes" >&2 + else + echo "no" >&2 + fi + + return "$rc" + } + + echo "checking whether patchShebangs works properly... ">&2 + + fail= + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (_: test: '' + validate "${test.name}" "${test}" ${lib.escapeShellArg test.assertion} || fail=1 + '') tests)} + + if [ "$fail" ]; then + echo "failed" exit 1 + else + echo "succeeded" + touch $out fi '' diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 2360ef20e1f63..defb46b4443cf 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -35,8 +35,12 @@ in with py.pkgs; buildPythonApplication rec { sha256 = "sha256-SwYL2ViwazP2MDZbW9cRThvg6jVOMlkfsbpY6QDsjQY="; }; + # https://github.com/aws/aws-cli/issues/4837 + # https://github.com/aws/aws-cli/pull/5887 postPatch = '' - substituteInPlace setup.py --replace "docutils>=0.10,<0.16" "docutils>=0.10" + substituteInPlace setup.py \ + --replace "docutils>=0.10,<0.16" "docutils>=0.10" \ + --replace "PyYAML>=3.10,<5.4" "PyYAML>=3.10" ''; # No tests included diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 0db8865957505..202f576633ad7 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-1IhCBDMfGW9hDvQoGSJKJ1ZlShzVeIGjVOfiUspHRBw="; + sha256 = "sha256-QMJKrM5IBDqNfdxYAaEzmZ8YFMPu2hB6jvl6R/7ORl8="; }; - vendorSha256 = "sha256-fa8IrJhsy5cBzBs4tGIx7ykJcXjdvLqms3Dk97P4Vik="; + vendorSha256 = "sha256-VTKnkMe0SB6sWRJTC4p6BMjH5qZ6LsSQnjuPFfOP/Eg="; doCheck = false; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 2352f4420b16c..644bdedffe57e 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,24 +21,24 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "135xbaz6q4565mklxjmm4mybm5qayvz34m0bdg609597kxw6l97j"; + sha256 = "sha256-aHFwcynt4xQ0T1J+OTSxgttU9W3VFJAqCwmQSdVg8Fk="; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "1i4cp6kyqbqj0fnmwx11bq6a1k4hrhyxz9qifr1qjfi7n8ybqrqy"; + sha256 = "sha256-MfldToK7ZfdWZiZnI1qKI1o/dSiUcysxzUkTYMVZ5u4="; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "327.0.0"; + version = "328.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); - buildInputs = [ python makeWrapper ]; + buildInputs = [ python ]; - nativeBuildInputs = [ jq ]; + nativeBuildInputs = [ jq makeWrapper ]; patches = [ # For kubectl configs, don't store the absolute path of the `gcloud` binary as it can be garbage-collected diff --git a/pkgs/tools/archivers/xtrt/default.nix b/pkgs/tools/archivers/xtrt/default.nix new file mode 100644 index 0000000000000..175494057e0a1 --- /dev/null +++ b/pkgs/tools/archivers/xtrt/default.nix @@ -0,0 +1,36 @@ +{ bzip2, fetchFromGitHub, gzip, gnutar, lib, stdenv, unzip, xz }: + +stdenv.mkDerivation rec { + pname = "xtrt"; + version = "unstable-2021-02-17"; + + src = fetchFromGitHub { + owner = "figsoda"; + repo = pname; + rev = "61884fb7c48c7e1e2194afd82b85f415a6dc7c20"; + sha256 = "073l4q6mx5if791p5a6w8m8bz2aypmjmycaijq4spql8bh6h12vf"; + }; + + postPatch = '' + substituteInPlace xtrt \ + --replace "bzip2 " "${bzip2}/bin/bzip2 " \ + --replace "gzip " "${gzip}/bin/gzip " \ + --replace "tar " "${gnutar}/bin/tar " \ + --replace "unzip " "${unzip}/bin/unzip " \ + --replace "xz " "${xz}/bin/xz " + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp xtrt $out/bin + runHook postInstall + ''; + + meta = with lib; { + description = "Tiny script to extract archives by their extensions"; + homepage = "https://github.com/figsoda/xtrt"; + license = licenses.unlicense; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/tools/backup/sanoid/default.nix b/pkgs/tools/backup/sanoid/default.nix index 569a07a459be1..a60683a27e19c 100644 --- a/pkgs/tools/backup/sanoid/default.nix +++ b/pkgs/tools/backup/sanoid/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, coreutils, zfs -, perlPackages, procps, which, openssh, sudo, mbuffer, pv, lzop, gzip, pigz }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, zfs +, perlPackages, procps, which, openssh, mbuffer, pv, lzop, gzip, pigz }: with lib; diff --git a/pkgs/tools/backup/zrepl/default.nix b/pkgs/tools/backup/zrepl/default.nix new file mode 100644 index 0000000000000..8d5a51598774c --- /dev/null +++ b/pkgs/tools/backup/zrepl/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "zrepl"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "zrepl"; + repo = "zrepl"; + rev = "v${version}"; + sha256 = "sha256-wtUL8GGSJxn9yEdyTWKtkHODfxxLOxojNPlPLRjI9xo="; + }; + + vendorSha256 = "sha256-4LBX0bD8qirFaFkV52QFU50lEW4eae6iObIa5fFT/wA="; + + subPackages = [ "." ]; + + postInstall = '' + mkdir -p $out/lib/systemd/system + substitute dist/systemd/zrepl.service $out/lib/systemd/system/zrepl.service \ + --replace /usr/local/bin/zrepl $out/bin/zrepl + ''; + + meta = with lib; { + homepage = "https://zrepl.github.io/"; + description = "A one-stop, integrated solution for ZFS replication"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ cole-h danderson ]; + }; +} diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix index 438e169d23c93..f580709495ed9 100644 --- a/pkgs/tools/compression/ncompress/default.nix +++ b/pkgs/tools/compression/ncompress/default.nix @@ -1,15 +1,14 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "ncompress-4.2.4.6"; + pname = "ncompress"; + version = "5.0"; builder = ./builder.sh; - patches = [ ./makefile.patch ]; - src = fetchurl { - url = "mirror://sourceforge/project/ncompress/${name}.tar.gz"; - sha256 = "0sw3c7h80v9pagfqfx16ws9w2y3yrajrdk54bgiwdm0b0q06lyzv"; + url = "mirror://sourceforge/project/ncompress/${pname}-${version}.tar.gz"; + sha256 = "004r086c11sw9vg2j3srgxpz98w8pycjl33bk3pgqnd0s92igrn4"; }; meta = { diff --git a/pkgs/tools/compression/ncompress/makefile.patch b/pkgs/tools/compression/ncompress/makefile.patch deleted file mode 100644 index b61b1272f8bd2..0000000000000 --- a/pkgs/tools/compression/ncompress/makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ncompress-4.2.4.2.orig/Makefile.def ncompress-4.2.4.2/Makefile.def ---- ncompress-4.2.4.2.orig/Makefile.def 2007-09-06 22:28:42.000000000 -0500 -+++ ncompress-4.2.4.2/Makefile.def 2009-08-18 12:30:53.000000000 -0500 -@@ -31,7 +33,7 @@ - # -DDEF_ERRNO=1 Define error (not defined in errno.h). - # -DMAXSEG_64K=1 -BITS=16 Support segment processsor like 80286. - # --options= $(CFLAGS) $(CPPFLAGS) -DDIRENT=1 -DUSERMEM=800000 -DREGISTERS=3 -+options= $(CFLAGS) $(CPPFLAGS) -DDIRENT=1 -DUSERMEM=800000 -DREGISTERS=3 -DNOFUNCDEF=1 - - # libary options - LBOPT= $(LDFLAGS) diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index cc6916869b6fd..12052100db32a 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, fuse, pkg-config }: stdenv.mkDerivation rec { - version = "1.14.9"; + version = "1.15.1"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "0fnij365dn4ihkpfc92x63inxxwpminzffyj55krp1w02canpl5n"; + sha256 = "sha256-BN01hKbN+a9DRNQDxiGFyp+rMc465aJdAQG8EJNsaKs="; }; nativeBuildInputs = [ pkg-config ]; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "A FUSE filesystem for mounting a directory to another location"; homepage = "https://bindfs.org"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ lovek323 ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ lovek323 lovesegfault ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix index 2f179a151d1ee..6c101dbc9c0e0 100644 --- a/pkgs/tools/filesystems/catcli/default.nix +++ b/pkgs/tools/filesystems/catcli/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "catcli"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "deadc0de6"; repo = pname; rev = "v${version}"; - sha256 = "0myhvflph4fayl2bg8m9a7prh5pcnvnb75p0jb4jpmbx7jyn7ihp"; + sha256 = "1k5xjz353ry0vbmq1ql7brb9g4wwsijzix2zh5zpd768xl8nc1z8"; }; propagatedBuildInputs = [ docopt anytree ]; diff --git a/pkgs/tools/filesystems/rmfuse/default.nix b/pkgs/tools/filesystems/rmfuse/default.nix new file mode 100644 index 0000000000000..b7850f7023fee --- /dev/null +++ b/pkgs/tools/filesystems/rmfuse/default.nix @@ -0,0 +1,26 @@ +{ poetry2nix, pkgs, lib }: + +let + pythonPackages = (poetry2nix.mkPoetryPackages { + projectDir = ./.; + overrides = [ + poetry2nix.defaultPoetryOverrides + (import ./poetry-git-overlay.nix { inherit pkgs; }) + (self: super: { + + rmfuse = super.rmfuse.overridePythonAttrs(old: { + meta = old.meta // { + description = "RMfuse provides access to your reMarkable Cloud files in the form of a FUSE filesystem."; + longDescription = '' + RMfuse provides access to your reMarkable Cloud files in the form of a FUSE filesystem. These files are exposed either in their original format, or as PDF files that contain your annotations. This lets you manage files in the reMarkable Cloud using the same tools you use on your local system. + ''; + license = lib.licenses.mit; + homepage = "https://github.com/rschroll/rmfuse"; + maintainers = [ lib.maintainers.adisbladis ]; + }; + }); + + }) + ]; + }).python.pkgs; +in pythonPackages.rmfuse diff --git a/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix b/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix new file mode 100644 index 0000000000000..9185faedc07ff --- /dev/null +++ b/pkgs/tools/filesystems/rmfuse/poetry-git-overlay.nix @@ -0,0 +1,14 @@ +{ pkgs }: +self: super: { + + rmfuse = super.rmfuse.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/rschroll/rmfuse.git"; + rev = "ac91d477cc32311c88aa7ecd1bebd6503e426ae7"; + sha256 = "129n00hricsf4jkgj39bq3m5nhvy4d4yg7mcvrcgwb2546wcix0n"; + }; + } + ); + +} diff --git a/pkgs/tools/filesystems/rmfuse/poetry.lock b/pkgs/tools/filesystems/rmfuse/poetry.lock new file mode 100644 index 0000000000000..a97b89181fb7a --- /dev/null +++ b/pkgs/tools/filesystems/rmfuse/poetry.lock @@ -0,0 +1,547 @@ +[[package]] +category = "main" +description = "High level compatibility layer for multiple asynchronous event loop implementations" +name = "anyio" +optional = false +python-versions = ">=3.6.2" +version = "2.1.0" + +[package.dependencies] +idna = ">=2.8" +sniffio = ">=1.1" + +[package.extras] +curio = ["curio (>=1.4)"] +doc = ["sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"] +test = ["coverage (>=4.5)", "hypothesis (>=4.0)", "pytest (>=6.0)", "trustme", "uvloop"] +trio = ["trio (>=0.16)"] + +[[package]] +category = "main" +description = "asks - async http" +name = "asks" +optional = false +python-versions = ">= 3.6.2" +version = "2.4.12" + +[package.dependencies] +anyio = ">=2.0,<3.0" +async_generator = "*" +h11 = "*" + +[[package]] +category = "main" +description = "Async generators and context managers for Python 3.5+" +name = "async-generator" +optional = false +python-versions = ">=3.5" +version = "1.10" + +[[package]] +category = "main" +description = "Classes Without Boilerplate" +name = "attrs" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "20.3.0" + +[package.extras] +dev = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "furo", "sphinx", "pre-commit"] +docs = ["furo", "sphinx", "zope.interface"] +tests = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"] +tests_no_zope = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six"] + +[[package]] +category = "main" +description = "The bidirectional mapping library for Python." +name = "bidict" +optional = false +python-versions = ">=3.6" +version = "0.21.2" + +[package.extras] +coverage = ["coverage (<6)", "pytest-cov (<3)"] +dev = ["setuptools-scm", "hypothesis (<6)", "py (<2)", "pytest (<7)", "pytest-benchmark (>=3.2.0,<4)", "sortedcollections (<2)", "sortedcontainers (<3)", "Sphinx (<4)", "sphinx-autodoc-typehints (<2)", "coverage (<6)", "pytest-cov (<3)", "pre-commit (<3)", "tox (<4)"] +docs = ["Sphinx (<4)", "sphinx-autodoc-typehints (<2)"] +precommit = ["pre-commit (<3)"] +test = ["hypothesis (<6)", "py (<2)", "pytest (<7)", "pytest-benchmark (>=3.2.0,<4)", "sortedcollections (<2)", "sortedcontainers (<3)", "Sphinx (<4)", "sphinx-autodoc-typehints (<2)"] + +[[package]] +category = "main" +description = "Foreign Function Interface for Python calling C code." +name = "cffi" +optional = false +python-versions = "*" +version = "1.14.5" + +[package.dependencies] +pycparser = "*" + +[[package]] +category = "main" +description = "cssselect2" +name = "cssselect2" +optional = false +python-versions = ">=3.6" +version = "0.4.1" + +[package.dependencies] +tinycss2 = "*" +webencodings = "*" + +[package.extras] +doc = ["sphinx", "sphinx-rtd-theme"] +test = ["pytest", "pytest-cov", "pytest-flake8", "pytest-isort", "coverage"] + +[[package]] +category = "main" +description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" +name = "h11" +optional = false +python-versions = ">=3.6" +version = "0.12.0" + +[[package]] +category = "main" +description = "Internationalized Domain Names in Applications (IDNA)" +name = "idna" +optional = false +python-versions = ">=3.4" +version = "3.1" + +[[package]] +category = "main" +description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API." +name = "lxml" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, != 3.4.*" +version = "4.6.2" + +[package.extras] +cssselect = ["cssselect (>=0.7)"] +html5 = ["html5lib"] +htmlsoup = ["beautifulsoup4"] +source = ["Cython (>=0.29.7)"] + +[[package]] +category = "main" +description = "Capture the outcome of Python function calls." +name = "outcome" +optional = false +python-versions = ">=3.6" +version = "1.1.0" + +[package.dependencies] +attrs = ">=19.2.0" + +[[package]] +category = "main" +description = "PDF file reader/writer library" +name = "pdfrw" +optional = false +python-versions = "*" +version = "0.4" + +[[package]] +category = "main" +description = "Python Imaging Library (Fork)" +name = "pillow" +optional = false +python-versions = ">=3.6" +version = "8.1.0" + +[[package]] +category = "main" +description = "C parser in Python" +name = "pycparser" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "2.20" + +[[package]] +category = "main" +description = "Python 3 bindings for libfuse 3 with async I/O support" +name = "pyfuse3" +optional = false +python-versions = ">=3.5" +version = "3.2.0" + +[package.dependencies] +trio = ">=0.15" + +[[package]] +category = "main" +description = "The Reportlab Toolkit" +name = "reportlab" +optional = false +python-versions = "*" +version = "3.5.59" + +[package.dependencies] +pillow = ">=4.0.0" + +[[package]] +category = "main" +description = "reMarkable Cloud Library" +name = "rmcl" +optional = false +python-versions = ">=3.7,<4.0" +version = "0.3.1" + +[package.dependencies] +asks = ">=2.4.12,<3.0.0" +trio = ">=0.18.0,<0.19.0" +xdg = ">=5.0.1,<6.0.0" + +[[package]] +category = "main" +description = "" +name = "rmfuse" +optional = false +python-versions = "^3.7" +version = "0.1.1" + +[package.dependencies] +bidict = "^0.21.2" +pyfuse3 = "^3.2.0" +rmcl = "^0.3.1" +rmrl = "^0.1.2" + +[package.source] +reference = "ac91d477cc32311c88aa7ecd1bebd6503e426ae7" +type = "git" +url = "https://github.com/rschroll/rmfuse.git" +[[package]] +category = "main" +description = "Render reMarkable documents to PDF" +name = "rmrl" +optional = false +python-versions = ">=3.7,<4.0" +version = "0.1.2" + +[package.dependencies] +pdfrw = ">=0.4,<0.5" +reportlab = ">=3.5.59,<4.0.0" +svglib = ">=1.0.1,<2.0.0" +xdg = ">=5.0.1,<6.0.0" + +[[package]] +category = "main" +description = "Sniff out which async library your code is running under" +name = "sniffio" +optional = false +python-versions = ">=3.5" +version = "1.2.0" + +[[package]] +category = "main" +description = "Sorted Containers -- Sorted List, Sorted Dict, Sorted Set" +name = "sortedcontainers" +optional = false +python-versions = "*" +version = "2.3.0" + +[[package]] +category = "main" +description = "A pure-Python library for reading and converting SVG" +name = "svglib" +optional = false +python-versions = ">=3" +version = "1.0.1" + +[package.dependencies] +cssselect2 = ">=0.2.0" +lxml = "*" +reportlab = "*" +tinycss2 = ">=0.6.0" + +[[package]] +category = "main" +description = "tinycss2" +name = "tinycss2" +optional = false +python-versions = ">=3.6" +version = "1.1.0" + +[package.dependencies] +webencodings = ">=0.4" + +[package.extras] +doc = ["sphinx", "sphinx-rtd-theme"] +test = ["pytest", "pytest-cov", "pytest-flake8", "pytest-isort", "coverage"] + +[[package]] +category = "main" +description = "A friendly Python library for async concurrency and I/O" +name = "trio" +optional = false +python-versions = ">=3.6" +version = "0.18.0" + +[package.dependencies] +async-generator = ">=1.9" +attrs = ">=19.2.0" +cffi = ">=1.14" +idna = "*" +outcome = "*" +sniffio = "*" +sortedcontainers = "*" + +[[package]] +category = "main" +description = "Character encoding aliases for legacy web content" +name = "webencodings" +optional = false +python-versions = "*" +version = "0.5.1" + +[[package]] +category = "main" +description = "Variables defined by the XDG Base Directory Specification" +name = "xdg" +optional = false +python-versions = ">=3.6,<4.0" +version = "5.0.1" + +[metadata] +content-hash = "df8dfb527656dec034712b2d07aaacfdee20f89f635d38af52bb21888d7d4130" +lock-version = "1.0" +python-versions = "^3.8" + +[metadata.files] +anyio = [ + {file = "anyio-2.1.0-py3-none-any.whl", hash = "sha256:c286818ccd5dcbd5d385b223f16a055393474527b1d5650da489828a9887d559"}, + {file = "anyio-2.1.0.tar.gz", hash = "sha256:8a56e08623dc55955a06719d4ad62de6009bb3f1dd04936e60b2104dd58da484"}, +] +asks = [ + {file = "asks-2.4.12.tar.gz", hash = "sha256:38de944eb350e7e4e3a918055fa8ff033da5f7b5ff385c1160a2d6b9d84783b0"}, +] +async-generator = [ + {file = "async_generator-1.10-py3-none-any.whl", hash = "sha256:01c7bf666359b4967d2cda0000cc2e4af16a0ae098cbffcb8472fb9e8ad6585b"}, + {file = "async_generator-1.10.tar.gz", hash = "sha256:6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"}, +] +attrs = [ + {file = "attrs-20.3.0-py2.py3-none-any.whl", hash = "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6"}, + {file = "attrs-20.3.0.tar.gz", hash = "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"}, +] +bidict = [ + {file = "bidict-0.21.2-py2.py3-none-any.whl", hash = "sha256:929d056e8d0d9b17ceda20ba5b24ac388e2a4d39802b87f9f4d3f45ecba070bf"}, + {file = "bidict-0.21.2.tar.gz", hash = "sha256:4fa46f7ff96dc244abfc437383d987404ae861df797e2fd5b190e233c302be09"}, +] +cffi = [ + {file = "cffi-1.14.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991"}, + {file = "cffi-1.14.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1"}, + {file = "cffi-1.14.5-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa"}, + {file = "cffi-1.14.5-cp27-cp27m-win32.whl", hash = "sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3"}, + {file = "cffi-1.14.5-cp27-cp27m-win_amd64.whl", hash = "sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5"}, + {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482"}, + {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6"}, + {file = "cffi-1.14.5-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045"}, + {file = "cffi-1.14.5-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa"}, + {file = "cffi-1.14.5-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406"}, + {file = "cffi-1.14.5-cp35-cp35m-win32.whl", hash = "sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369"}, + {file = "cffi-1.14.5-cp35-cp35m-win_amd64.whl", hash = "sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315"}, + {file = "cffi-1.14.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892"}, + {file = "cffi-1.14.5-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058"}, + {file = "cffi-1.14.5-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5"}, + {file = "cffi-1.14.5-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132"}, + {file = "cffi-1.14.5-cp36-cp36m-win32.whl", hash = "sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53"}, + {file = "cffi-1.14.5-cp36-cp36m-win_amd64.whl", hash = "sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813"}, + {file = "cffi-1.14.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73"}, + {file = "cffi-1.14.5-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06"}, + {file = "cffi-1.14.5-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1"}, + {file = "cffi-1.14.5-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49"}, + {file = "cffi-1.14.5-cp37-cp37m-win32.whl", hash = "sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62"}, + {file = "cffi-1.14.5-cp37-cp37m-win_amd64.whl", hash = "sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4"}, + {file = "cffi-1.14.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053"}, + {file = "cffi-1.14.5-cp38-cp38-manylinux1_i686.whl", hash = "sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0"}, + {file = "cffi-1.14.5-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e"}, + {file = "cffi-1.14.5-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827"}, + {file = "cffi-1.14.5-cp38-cp38-win32.whl", hash = "sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e"}, + {file = "cffi-1.14.5-cp38-cp38-win_amd64.whl", hash = "sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396"}, + {file = "cffi-1.14.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea"}, + {file = "cffi-1.14.5-cp39-cp39-manylinux1_i686.whl", hash = "sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322"}, + {file = "cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c"}, + {file = "cffi-1.14.5-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee"}, + {file = "cffi-1.14.5-cp39-cp39-win32.whl", hash = "sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396"}, + {file = "cffi-1.14.5-cp39-cp39-win_amd64.whl", hash = "sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d"}, + {file = "cffi-1.14.5.tar.gz", hash = "sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c"}, +] +cssselect2 = [ + {file = "cssselect2-0.4.1-py3-none-any.whl", hash = "sha256:2f4a9f20965367bae459e3bb42561f7927e0cfe5b7ea1692757cf67ef5d7dace"}, + {file = "cssselect2-0.4.1.tar.gz", hash = "sha256:93fbb9af860e95dd40bf18c3b2b6ed99189a07c0f29ba76f9c5be71344664ec8"}, +] +h11 = [ + {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"}, + {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"}, +] +idna = [ + {file = "idna-3.1-py3-none-any.whl", hash = "sha256:5205d03e7bcbb919cc9c19885f9920d622ca52448306f2377daede5cf3faac16"}, + {file = "idna-3.1.tar.gz", hash = "sha256:c5b02147e01ea9920e6b0a3f1f7bb833612d507592c837a6c49552768f4054e1"}, +] +lxml = [ + {file = "lxml-4.6.2-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:a9d6bc8642e2c67db33f1247a77c53476f3a166e09067c0474facb045756087f"}, + {file = "lxml-4.6.2-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:791394449e98243839fa822a637177dd42a95f4883ad3dec2a0ce6ac99fb0a9d"}, + {file = "lxml-4.6.2-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:68a5d77e440df94011214b7db907ec8f19e439507a70c958f750c18d88f995d2"}, + {file = "lxml-4.6.2-cp27-cp27m-win32.whl", hash = "sha256:fc37870d6716b137e80d19241d0e2cff7a7643b925dfa49b4c8ebd1295eb506e"}, + {file = "lxml-4.6.2-cp27-cp27m-win_amd64.whl", hash = "sha256:69a63f83e88138ab7642d8f61418cf3180a4d8cd13995df87725cb8b893e950e"}, + {file = "lxml-4.6.2-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:42ebca24ba2a21065fb546f3e6bd0c58c3fe9ac298f3a320147029a4850f51a2"}, + {file = "lxml-4.6.2-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:f83d281bb2a6217cd806f4cf0ddded436790e66f393e124dfe9731f6b3fb9afe"}, + {file = "lxml-4.6.2-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:535f067002b0fd1a4e5296a8f1bf88193080ff992a195e66964ef2a6cfec5388"}, + {file = "lxml-4.6.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:366cb750140f221523fa062d641393092813b81e15d0e25d9f7c6025f910ee80"}, + {file = "lxml-4.6.2-cp35-cp35m-manylinux2014_aarch64.whl", hash = "sha256:97db258793d193c7b62d4e2586c6ed98d51086e93f9a3af2b2034af01450a74b"}, + {file = "lxml-4.6.2-cp35-cp35m-win32.whl", hash = "sha256:648914abafe67f11be7d93c1a546068f8eff3c5fa938e1f94509e4a5d682b2d8"}, + {file = "lxml-4.6.2-cp35-cp35m-win_amd64.whl", hash = "sha256:4e751e77006da34643ab782e4a5cc21ea7b755551db202bc4d3a423b307db780"}, + {file = "lxml-4.6.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:681d75e1a38a69f1e64ab82fe4b1ed3fd758717bed735fb9aeaa124143f051af"}, + {file = "lxml-4.6.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:127f76864468d6630e1b453d3ffbbd04b024c674f55cf0a30dc2595137892d37"}, + {file = "lxml-4.6.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4fb85c447e288df535b17ebdebf0ec1cf3a3f1a8eba7e79169f4f37af43c6b98"}, + {file = "lxml-4.6.2-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:5be4a2e212bb6aa045e37f7d48e3e1e4b6fd259882ed5a00786f82e8c37ce77d"}, + {file = "lxml-4.6.2-cp36-cp36m-win32.whl", hash = "sha256:8c88b599e226994ad4db29d93bc149aa1aff3dc3a4355dd5757569ba78632bdf"}, + {file = "lxml-4.6.2-cp36-cp36m-win_amd64.whl", hash = "sha256:6e4183800f16f3679076dfa8abf2db3083919d7e30764a069fb66b2b9eff9939"}, + {file = "lxml-4.6.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:d8d3d4713f0c28bdc6c806a278d998546e8efc3498949e3ace6e117462ac0a5e"}, + {file = "lxml-4.6.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:8246f30ca34dc712ab07e51dc34fea883c00b7ccb0e614651e49da2c49a30711"}, + {file = "lxml-4.6.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:923963e989ffbceaa210ac37afc9b906acebe945d2723e9679b643513837b089"}, + {file = "lxml-4.6.2-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:1471cee35eba321827d7d53d104e7b8c593ea3ad376aa2df89533ce8e1b24a01"}, + {file = "lxml-4.6.2-cp37-cp37m-win32.whl", hash = "sha256:2363c35637d2d9d6f26f60a208819e7eafc4305ce39dc1d5005eccc4593331c2"}, + {file = "lxml-4.6.2-cp37-cp37m-win_amd64.whl", hash = "sha256:f4822c0660c3754f1a41a655e37cb4dbbc9be3d35b125a37fab6f82d47674ebc"}, + {file = "lxml-4.6.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0448576c148c129594d890265b1a83b9cd76fd1f0a6a04620753d9a6bcfd0a4d"}, + {file = "lxml-4.6.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:60a20bfc3bd234d54d49c388950195d23a5583d4108e1a1d47c9eef8d8c042b3"}, + {file = "lxml-4.6.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:2e5cc908fe43fe1aa299e58046ad66981131a66aea3129aac7770c37f590a644"}, + {file = "lxml-4.6.2-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:50c348995b47b5a4e330362cf39fc503b4a43b14a91c34c83b955e1805c8e308"}, + {file = "lxml-4.6.2-cp38-cp38-win32.whl", hash = "sha256:94d55bd03d8671686e3f012577d9caa5421a07286dd351dfef64791cf7c6c505"}, + {file = "lxml-4.6.2-cp38-cp38-win_amd64.whl", hash = "sha256:7a7669ff50f41225ca5d6ee0a1ec8413f3a0d8aa2b109f86d540887b7ec0d72a"}, + {file = "lxml-4.6.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e0bfe9bb028974a481410432dbe1b182e8191d5d40382e5b8ff39cdd2e5c5931"}, + {file = "lxml-4.6.2-cp39-cp39-manylinux1_i686.whl", hash = "sha256:6fd8d5903c2e53f49e99359b063df27fdf7acb89a52b6a12494208bf61345a03"}, + {file = "lxml-4.6.2-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:7e9eac1e526386df7c70ef253b792a0a12dd86d833b1d329e038c7a235dfceb5"}, + {file = "lxml-4.6.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:7ee8af0b9f7de635c61cdd5b8534b76c52cd03536f29f51151b377f76e214a1a"}, + {file = "lxml-4.6.2-cp39-cp39-win32.whl", hash = "sha256:2e6fd1b8acd005bd71e6c94f30c055594bbd0aa02ef51a22bbfa961ab63b2d75"}, + {file = "lxml-4.6.2-cp39-cp39-win_amd64.whl", hash = "sha256:535332fe9d00c3cd455bd3dd7d4bacab86e2d564bdf7606079160fa6251caacf"}, + {file = "lxml-4.6.2.tar.gz", hash = "sha256:cd11c7e8d21af997ee8079037fff88f16fda188a9776eb4b81c7e4c9c0a7d7fc"}, +] +outcome = [ + {file = "outcome-1.1.0-py2.py3-none-any.whl", hash = "sha256:c7dd9375cfd3c12db9801d080a3b63d4b0a261aa996c4c13152380587288d958"}, + {file = "outcome-1.1.0.tar.gz", hash = "sha256:e862f01d4e626e63e8f92c38d1f8d5546d3f9cce989263c521b2e7990d186967"}, +] +pdfrw = [ + {file = "pdfrw-0.4-py2.py3-none-any.whl", hash = "sha256:758289edaa3b672e9a1a67504be73c18ec668d4e5b9d5ac9cbc0dc753d8d196b"}, + {file = "pdfrw-0.4.tar.gz", hash = "sha256:0dc0494a0e6561b268542b28ede2280387c2728114f117d3bb5d8e4787b93ef4"}, +] +pillow = [ + {file = "Pillow-8.1.0-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:d355502dce85ade85a2511b40b4c61a128902f246504f7de29bbeec1ae27933a"}, + {file = "Pillow-8.1.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:93a473b53cc6e0b3ce6bf51b1b95b7b1e7e6084be3a07e40f79b42e83503fbf2"}, + {file = "Pillow-8.1.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:2353834b2c49b95e1313fb34edf18fca4d57446675d05298bb694bca4b194174"}, + {file = "Pillow-8.1.0-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:1d208e670abfeb41b6143537a681299ef86e92d2a3dac299d3cd6830d5c7bded"}, + {file = "Pillow-8.1.0-cp36-cp36m-win32.whl", hash = "sha256:dd9eef866c70d2cbbea1ae58134eaffda0d4bfea403025f4db6859724b18ab3d"}, + {file = "Pillow-8.1.0-cp36-cp36m-win_amd64.whl", hash = "sha256:b09e10ec453de97f9a23a5aa5e30b334195e8d2ddd1ce76cc32e52ba63c8b31d"}, + {file = "Pillow-8.1.0-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:b02a0b9f332086657852b1f7cb380f6a42403a6d9c42a4c34a561aa4530d5234"}, + {file = "Pillow-8.1.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:ca20739e303254287138234485579b28cb0d524401f83d5129b5ff9d606cb0a8"}, + {file = "Pillow-8.1.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:604815c55fd92e735f9738f65dabf4edc3e79f88541c221d292faec1904a4b17"}, + {file = "Pillow-8.1.0-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:cf6e33d92b1526190a1de904df21663c46a456758c0424e4f947ae9aa6088bf7"}, + {file = "Pillow-8.1.0-cp37-cp37m-win32.whl", hash = "sha256:47c0d93ee9c8b181f353dbead6530b26980fe4f5485aa18be8f1fd3c3cbc685e"}, + {file = "Pillow-8.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:96d4dc103d1a0fa6d47c6c55a47de5f5dafd5ef0114fa10c85a1fd8e0216284b"}, + {file = "Pillow-8.1.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:7916cbc94f1c6b1301ac04510d0881b9e9feb20ae34094d3615a8a7c3db0dcc0"}, + {file = "Pillow-8.1.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:3de6b2ee4f78c6b3d89d184ade5d8fa68af0848f9b6b6da2b9ab7943ec46971a"}, + {file = "Pillow-8.1.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:cdbbe7dff4a677fb555a54f9bc0450f2a21a93c5ba2b44e09e54fcb72d2bd13d"}, + {file = "Pillow-8.1.0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:f50e7a98b0453f39000619d845be8b06e611e56ee6e8186f7f60c3b1e2f0feae"}, + {file = "Pillow-8.1.0-cp38-cp38-win32.whl", hash = "sha256:cb192176b477d49b0a327b2a5a4979552b7a58cd42037034316b8018ac3ebb59"}, + {file = "Pillow-8.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:6c5275bd82711cd3dcd0af8ce0bb99113ae8911fc2952805f1d012de7d600a4c"}, + {file = "Pillow-8.1.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:165c88bc9d8dba670110c689e3cc5c71dbe4bfb984ffa7cbebf1fac9554071d6"}, + {file = "Pillow-8.1.0-cp39-cp39-manylinux1_i686.whl", hash = "sha256:5e2fe3bb2363b862671eba632537cd3a823847db4d98be95690b7e382f3d6378"}, + {file = "Pillow-8.1.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:7612520e5e1a371d77e1d1ca3a3ee6227eef00d0a9cddb4ef7ecb0b7396eddf7"}, + {file = "Pillow-8.1.0-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:d673c4990acd016229a5c1c4ee8a9e6d8f481b27ade5fc3d95938697fa443ce0"}, + {file = "Pillow-8.1.0-cp39-cp39-win32.whl", hash = "sha256:dc577f4cfdda354db3ae37a572428a90ffdbe4e51eda7849bf442fb803f09c9b"}, + {file = "Pillow-8.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:22d070ca2e60c99929ef274cfced04294d2368193e935c5d6febfd8b601bf865"}, + {file = "Pillow-8.1.0-pp36-pypy36_pp73-macosx_10_10_x86_64.whl", hash = "sha256:a3d3e086474ef12ef13d42e5f9b7bbf09d39cf6bd4940f982263d6954b13f6a9"}, + {file = "Pillow-8.1.0-pp36-pypy36_pp73-manylinux2010_i686.whl", hash = "sha256:731ca5aabe9085160cf68b2dbef95fc1991015bc0a3a6ea46a371ab88f3d0913"}, + {file = "Pillow-8.1.0-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:bba80df38cfc17f490ec651c73bb37cd896bc2400cfba27d078c2135223c1206"}, + {file = "Pillow-8.1.0-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:c3d911614b008e8a576b8e5303e3db29224b455d3d66d1b2848ba6ca83f9ece9"}, + {file = "Pillow-8.1.0-pp37-pypy37_pp73-manylinux2010_i686.whl", hash = "sha256:39725acf2d2e9c17356e6835dccebe7a697db55f25a09207e38b835d5e1bc032"}, + {file = "Pillow-8.1.0-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:81c3fa9a75d9f1afafdb916d5995633f319db09bd773cb56b8e39f1e98d90820"}, + {file = "Pillow-8.1.0-pp37-pypy37_pp73-win32.whl", hash = "sha256:b6f00ad5ebe846cc91763b1d0c6d30a8042e02b2316e27b05de04fa6ec831ec5"}, + {file = "Pillow-8.1.0.tar.gz", hash = "sha256:887668e792b7edbfb1d3c9d8b5d8c859269a0f0eba4dda562adb95500f60dbba"}, +] +pycparser = [ + {file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"}, + {file = "pycparser-2.20.tar.gz", hash = "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"}, +] +pyfuse3 = [ + {file = "pyfuse3-3.2.0.tar.gz", hash = "sha256:45f0053ad601b03a36e2c283a5271403674245a66a0daf50e3deaab0ea4fa82f"}, +] +reportlab = [ + {file = "reportlab-3.5.59-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:1da3d7a35f918cee905facfa94bd00ae6091cadc06dca1b0b31b69ae02d41d1d"}, + {file = "reportlab-3.5.59-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:792efba0c0c6e4ee94f6dc95f305451733ee9230a1c7d51cb8e5301a549e0dfb"}, + {file = "reportlab-3.5.59-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:f3d4a1a273dc141e03b72a553c11bc14dd7a27ec7654a071edcf83eb04f004bc"}, + {file = "reportlab-3.5.59-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:e2b4e33fea2ce9d3a14ea39191b169e41eb2ac995274f54ac8fd27519974bce8"}, + {file = "reportlab-3.5.59-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:b1b20208ecdfffd7ca027955c4fe8972b28b30a4b3b80cf25099a08d3b20ed7c"}, + {file = "reportlab-3.5.59-cp27-cp27m-win32.whl", hash = "sha256:5ed00894e0f8281c0b7c0494b4d3067c641fd90c8e5cf933089ec4cc9a48e491"}, + {file = "reportlab-3.5.59-cp27-cp27m-win_amd64.whl", hash = "sha256:85650446538cd2f606ca234634142a7ccd74cb6db7cfec250f76a4242e0f2431"}, + {file = "reportlab-3.5.59-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:79d63ca40231ca3860859b39a92daa5219035ba9553da89a5e1b218550744121"}, + {file = "reportlab-3.5.59-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:a0c377bc45e73c3f15f55d7de69fab270d174749d5b454ab0de502b15430ec2a"}, + {file = "reportlab-3.5.59-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:cfa854bea525f8c913cb77e2bda724d94b965a0eb3bcfc4a645a9baa29bb86e2"}, + {file = "reportlab-3.5.59-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:3d7713dddaa8081ed709a1fa2456a43f6a74b0f07d605da8441fd53fef334f69"}, + {file = "reportlab-3.5.59-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:ff547cf4c1de7e104cad1a378431ff81efcb03e90e40871ee686107da5b91442"}, + {file = "reportlab-3.5.59-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:19353aead39fc115a4d6c598d6fb9fa26da7e69160a0443ebb49b02903e704e8"}, + {file = "reportlab-3.5.59-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:6f3ad2b1afe99c436563cd436d8693d4a12e2c4bd45f70c7705759ff7837fe53"}, + {file = "reportlab-3.5.59-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:b26d6f416891cef93411d6d478a25db275766081a5fb66368248293ef459f3be"}, + {file = "reportlab-3.5.59-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:dd9687359e466086b9f6fe6d8069034017f8b6ca3080944fae5709767ca6814e"}, + {file = "reportlab-3.5.59-cp36-cp36m-win32.whl", hash = "sha256:b71faf3b6e4d7058e1af1b8afedaf39a962db4a219affc8177009d8244ec10d4"}, + {file = "reportlab-3.5.59-cp36-cp36m-win_amd64.whl", hash = "sha256:4ca5233a19a5ceca23546290f43addec2345789c7d65bb32f8b2668aa148351f"}, + {file = "reportlab-3.5.59-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:9da445cb79e3f740756924c053edc952cde11a65ff5af8acfda3c0a1317136ef"}, + {file = "reportlab-3.5.59-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:07bff6742fba612da8d1b1f783c436338c6fdc6962828159827d5ca7d2b67935"}, + {file = "reportlab-3.5.59-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:52f8237654acbc78ea2fa6fb4a6a06e5b023b6da93f7889adfe2deba09473fad"}, + {file = "reportlab-3.5.59-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:739b743b7ca1ba4b4d64c321de6fccb49b562d0507ea06c817d9cc4faed5cd22"}, + {file = "reportlab-3.5.59-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:33f3cfdc492575f8af3225701301a7e62fc478358729820c9e0091aff5831378"}, + {file = "reportlab-3.5.59-cp37-cp37m-win32.whl", hash = "sha256:3e2b4d69763103b9dc9b54c0952dc3cee05cedd06e28c0987fad7f84705b12c0"}, + {file = "reportlab-3.5.59-cp37-cp37m-win_amd64.whl", hash = "sha256:18a876449c9000c391dd3415ebc8454cd7bb9e488977b894886a2d7d018f16cd"}, + {file = "reportlab-3.5.59-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:04a08d284da86882ec3a41a7c719833362ef891b09ee8e2fbb47cee352aa684a"}, + {file = "reportlab-3.5.59-cp38-cp38-manylinux1_i686.whl", hash = "sha256:83b28104edd58ad65748d2d0e60e0d97e3b91b3e90b4573ea6fe60de6811972c"}, + {file = "reportlab-3.5.59-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:9fabd5fbd24f5971085ffe53150d663f158f7d3050b25c95736e29ebf676d454"}, + {file = "reportlab-3.5.59-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:b4ba4c30af7044ee987e61c88a5ffb76031ca0c53666bc85d823b7de55ddbc75"}, + {file = "reportlab-3.5.59-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:a315edef5c5610b0c75790142f49487e89ea34397fc247ae8aa890fe6d6dd057"}, + {file = "reportlab-3.5.59-cp38-cp38-win32.whl", hash = "sha256:5214a289cf01ebbd65e49bae83709671dd9edb601891cf0ae8abf85f3c0b392f"}, + {file = "reportlab-3.5.59-cp38-cp38-win_amd64.whl", hash = "sha256:009fa61710647cdc62eb373345248d8ebb93583a058990f7c4f9be46d90aa5b1"}, + {file = "reportlab-3.5.59-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:09fb11ab1500e679fc1b01199d2fed24435499856e75043a9ac0d31dd48fd881"}, + {file = "reportlab-3.5.59-cp39-cp39-manylinux1_i686.whl", hash = "sha256:18eec161411026dde49767bee4e5e8eeb8014879554811a62581dc7433628d5b"}, + {file = "reportlab-3.5.59-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:a1d3f7022a920d4a5e165d264581f1862e1c1b877ceeabb96fe98cec98125ae5"}, + {file = "reportlab-3.5.59-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:1b85c20e89c22ae902ca973df2afdd2d64d27dc4ffd2b29ebad8c805a213756b"}, + {file = "reportlab-3.5.59-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:de0c675fc2998a7eaa929c356ba49c84f53a892e9ab25e8ee7d8ebbbdcb2ac16"}, + {file = "reportlab-3.5.59-cp39-cp39-win32.whl", hash = "sha256:3b0026c1129147befd4e5a8cf25da8dea1096fce371e7b2412e36d7254019c06"}, + {file = "reportlab-3.5.59-cp39-cp39-win_amd64.whl", hash = "sha256:6191961533d49c9d860964d42bada4d7ac3bb28502d984feb8034093f2012fa8"}, + {file = "reportlab-3.5.59.tar.gz", hash = "sha256:a755cca2dcf023130b03bb671670301a992157d5c3151d838c0b68ef89894536"}, +] +rmcl = [ + {file = "rmcl-0.3.1-py3-none-any.whl", hash = "sha256:e4ebcc3e6ce7e9efb1dec4a2d0a44c463ef3854d44e1f8919c65a2b3f9312ec7"}, + {file = "rmcl-0.3.1.tar.gz", hash = "sha256:5b5316adf53cca9e56273cad220cb7374cd56e7bac962c943868b05fc090e98c"}, +] +rmfuse = [] +rmrl = [ + {file = "rmrl-0.1.2-py3-none-any.whl", hash = "sha256:173231c7122a11201232ed8fe74e4a9a65192b87886ef8a98ae912aa9b875c26"}, + {file = "rmrl-0.1.2.tar.gz", hash = "sha256:8c8e757af5ca3eb7475f56803f7f37256fe4c5cad3a9ea5ad7534b2ebd172447"}, +] +sniffio = [ + {file = "sniffio-1.2.0-py3-none-any.whl", hash = "sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663"}, + {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"}, +] +sortedcontainers = [ + {file = "sortedcontainers-2.3.0-py2.py3-none-any.whl", hash = "sha256:37257a32add0a3ee490bb170b599e93095eed89a55da91fa9f48753ea12fd73f"}, + {file = "sortedcontainers-2.3.0.tar.gz", hash = "sha256:59cc937650cf60d677c16775597c89a960658a09cf7c1a668f86e1e4464b10a1"}, +] +svglib = [ + {file = "svglib-1.0.1.tar.gz", hash = "sha256:ff01593e8c07ea462d3742e1f4141bfa261cbd4400ceb25dfb8fec3508ad0e50"}, +] +tinycss2 = [ + {file = "tinycss2-1.1.0-py3-none-any.whl", hash = "sha256:0353b5234bcaee7b1ac7ca3dea7e02cd338a9f8dcbb8f2dcd32a5795ec1e5f9a"}, + {file = "tinycss2-1.1.0.tar.gz", hash = "sha256:fbdcac3044d60eb85fdb2aa840ece43cf7dbe798e373e6ee0be545d4d134e18a"}, +] +trio = [ + {file = "trio-0.18.0-py3-none-any.whl", hash = "sha256:a42af0634ba729cbfe8578be058750c6471dac19fbc7167ec6a3ca3f966fb424"}, + {file = "trio-0.18.0.tar.gz", hash = "sha256:87a66ae61f27fe500c9024926a9ba482c07e1e0f56380b70a264d19c435ba076"}, +] +webencodings = [ + {file = "webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78"}, + {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"}, +] +xdg = [ + {file = "xdg-5.0.1-py3-none-any.whl", hash = "sha256:9ddd6649bee9148f952305603a08474e3ef37c909eb19dfcb9737d54ebcc407e"}, + {file = "xdg-5.0.1.tar.gz", hash = "sha256:97a27058caa61b4ce04e05471643caa6bc8c563d2638f92c0516ac50208146d8"}, +] diff --git a/pkgs/tools/filesystems/rmfuse/pyproject.toml b/pkgs/tools/filesystems/rmfuse/pyproject.toml new file mode 100644 index 0000000000000..1163e308e7044 --- /dev/null +++ b/pkgs/tools/filesystems/rmfuse/pyproject.toml @@ -0,0 +1,15 @@ +[tool.poetry] +name = "rmfuse-env" +version = "0.1.0" +description = "" +authors = [] + +[tool.poetry.dependencies] +python = "^3.8" +rmfuse = {git = "https://github.com/rschroll/rmfuse.git"} + +[tool.poetry.dev-dependencies] + +[build-system] +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" diff --git a/pkgs/tools/filesystems/rmfuse/update b/pkgs/tools/filesystems/rmfuse/update new file mode 100644 index 0000000000000..77cfe9ff86d9c --- /dev/null +++ b/pkgs/tools/filesystems/rmfuse/update @@ -0,0 +1,5 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p poetry poetry2nix.cli +set -eu +poetry lock +poetry2nix lock diff --git a/pkgs/tools/inputmethods/evscript/default.nix b/pkgs/tools/inputmethods/evscript/default.nix index 66f264bc7a362..456a57a135168 100644 --- a/pkgs/tools/inputmethods/evscript/default.nix +++ b/pkgs/tools/inputmethods/evscript/default.nix @@ -12,7 +12,6 @@ rustPlatform.buildRustPackage rec { }; cargoSha256 = "1dcyhxfyq0nrjl05g1s9pjkg7vqw63wbdhlskrdcvxncmci3s7rp"; - verifyCargoDeps = true; meta = with lib; { homepage = "https://github.com/myfreeweb/${pname}"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index 2af4061ae0463..2767b4c7c0ef5 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { cp -rv ${store_path} $NIX_BUILD_TOP/$name/data/${ZHUYIN_DATA_FILE_NAME} ''; + dontWrapQtApps = true; + meta = with lib; { isFcitxEngine = true; description = "Fcitx Wrapper for libpinyin, Library to deal with pinyin"; diff --git a/pkgs/tools/inputmethods/hime/default.nix b/pkgs/tools/inputmethods/hime/default.nix index 8ec6146a02095..988f8941d14b1 100644 --- a/pkgs/tools/inputmethods/hime/default.nix +++ b/pkgs/tools/inputmethods/hime/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { preConfigure = "patchShebangs configure"; configureFlags = [ "--disable-lib64" "--disable-qt5-immodule" ]; - + dontWrapQtApps = true; meta = with lib; { homepage = "http://hime-ime.github.io/"; diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 2140e405ff4ab..ffee232172c0d 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchurl, lib -, fetchpatch +{ stdenv, fetchFromGitHub, lib , cmake, perl, uthash, pkg-config, gettext , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, cairo, pango , readline, woff2, zeromq, libuninameslist @@ -15,25 +14,15 @@ assert withGTK -> withGUI; stdenv.mkDerivation rec { pname = "fontforge"; - version = "20200314"; + version = "20201107"; - src = fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "0qf88wd6riycq56d24brybyc93ns74s0nyyavm43zp2kfcihn6fd"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "sha256-Rl/5lbXaPgIndANaD0IakaDus6T53FjiBb45FIuGrvc="; }; - patches = [ - # Unreleased fix for https://github.com/fontforge/fontforge/issues/4229 - # which is required to fix an uninterposated `${CMAKE_INSTALL_PREFIX}/lib`, see - # see https://github.com/nh2/static-haskell-nix/pull/98#issuecomment-665395399 - # TODO: Remove https://github.com/fontforge/fontforge/pull/4232 is in a release. - (fetchpatch { - name = "fontforge-cmake-set-rpath-to-the-configure-time-CMAKE_INSTALL_PREFIX"; - url = "https://github.com/fontforge/fontforge/commit/297ee9b5d6db5970ca17ebe5305189e79a1520a1.patch"; - sha256 = "14qfp8pwh0vzzib4hq2nc6xhn8lc1cal1sb0lqwb2q5dijqx5kqk"; - }) - ]; - # use $SOURCE_DATE_EPOCH instead of non-deterministic timestamps postPatch = '' find . -type f -name '*.c' -exec sed -r -i 's#\btime\(&(.+)\)#if (getenv("SOURCE_DATE_EPOCH")) \1=atol(getenv("SOURCE_DATE_EPOCH")); else &#g' {} \; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index bc933312afc5e..19d2e862ec4b7 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,10 +1,14 @@ { lib, stdenv, fetchgit, flex, bison, python3, autoconf, automake, gnulib, libtool , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config +, pkgsBuildBuild +, nixosTests , fuse # only needed for grub-mount +, runtimeShell , zfs ? null , efiSupport ? false , zfsSupport ? false , xenSupport ? false +, kbdcompSupport ? false, ckbcomp }: with lib; @@ -53,11 +57,20 @@ stdenv.mkDerivation rec { ./fix-bash-completion.patch ]; - nativeBuildInputs = [ bison flex python3 pkg-config autoconf automake ]; - buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ] + postPatch = if kbdcompSupport then '' + sed -i util/grub-kbdcomp.in -e 's@\bckbcomp\b@${ckbcomp}/bin/ckbcomp@' + '' else '' + echo '#! ${runtimeShell}' > util/grub-kbdcomp.in + echo 'echo "Compile grub2 with { kbdcompSupport = true; } to enable support for this command."' >> util/grub-kbdcomp.in + ''; + + nativeBuildInputs = [ bison flex python3 pkg-config autoconf automake gettext ]; + buildInputs = [ ncurses libusb-compat-0_1 freetype lvm2 fuse libtool ] ++ optional doCheck qemu ++ optional zfsSupport zfs; + strictDeps = true; + hardeningDisable = [ "all" ]; # Work around a bug in the generated flex lexer (upstream flex bug?) @@ -90,7 +103,10 @@ stdenv.mkDerivation rec { substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts' ''; - configureFlags = [ "--enable-grub-mount" ] # dep of os-prober + configureFlags = [ + "--enable-grub-mount" # dep of os-prober + "BUILD_CC=${pkgsBuildBuild.stdenv.cc}/bin/cc" + ] ++ optional zfsSupport "--enable-libzfs" ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}" "--program-prefix=" ] ++ optionals xenSupport [ "--with-platform=xen" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"]; @@ -110,6 +126,14 @@ stdenv.mkDerivation rec { sed -i $out/lib/grub/*/modinfo.sh -e "/grub_target_cppflags=/ s|'.*'|' '|" ''; + passthru.tests = { + nixos-grub = nixosTests.grub; + nixos-install-simple = nixosTests.installer.simple; + nixos-install-grub1 = nixosTests.installer.grub1; + nixos-install-grub-uefi = nixosTests.installer.simpleUefiGrub; + nixos-install-grub-uefi-spec = nixosTests.installer.simpleUefiGrubSpecialisation; + }; + meta = with lib; { description = "GNU GRUB, the Grand Unified Boot Loader (2.x beta)"; diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index efacd87d9a447..6aaf8cc8a523e 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nix-direnv"; - version = "1.2.1"; + version = "1.2.3"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - sha256 = "sha256-D31ORVdS8P1OkPShsfjEFLVCcv8Bff9OyexUKKHdguQ="; + sha256 = "sha256-a0OyIONKtVWh9g/FZ6H0JSRuA1U48HSOX53G9z/h7t8="; }; # Substitute instead of wrapping because the resulting file is diff --git a/pkgs/tools/misc/piston-cli/default.nix b/pkgs/tools/misc/piston-cli/default.nix index 67a5a98173f7a..73e3ca8d6893f 100644 --- a/pkgs/tools/misc/piston-cli/default.nix +++ b/pkgs/tools/misc/piston-cli/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "piston-cli"; - version = "1.2.1"; + version = "1.2.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "bf0hhKb+6+07HhrkFrsWCnUQfsQWOdK/dPTlt9iZTno="; + sha256 = "hhOistr5lHF6rIuMpudKwSuBQhaQDzTdelAOCjyVQZk="; }; propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments ]; diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 9159de9fd8c2d..04f1c5ec33e55 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "3.1.5"; + version = "4.0.1"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "000h4yiaym7i5bcm268rvsjbs2brz2is9lhm6vm3dx0q7k1pcx45"; + sha256 = "sha256-YQrANrCd0nFdn98LfHH/Ishm+fDb12cUAkxlwtZ1ng8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 0e094a4b2add4..38a43c7ac3dd7 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2021.1"; + version = "2021.2"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-1GpM7IW27MgbXG6iVo5qnWaotwN1GgcXf7dFGRF8s0w="; + sha256 = "sha256-msu5LReTYupgoS6Rm2nrMz9jauciAD99hh+w8BhSYn4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/tab-rs/default.nix b/pkgs/tools/misc/tab-rs/default.nix index b6c9b35ac8704..affea98ea5550 100644 --- a/pkgs/tools/misc/tab-rs/default.nix +++ b/pkgs/tools/misc/tab-rs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tab-rs"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "austinjones"; repo = pname; rev = "v${version}"; - sha256 = "1gyl2dxyhh4d2lpxg9s5cx734sfs1kys5z5hjqfgbiny28hp9sw6"; + sha256 = "1crj0caimin667f9kz34c0sm77892dmqaf1kxryqakqm75az5wfr"; }; - cargoSha256 = "1apjzn164kakb2snrq1wfl7grm72hkddi3am6d01h5kkngkp68qm"; + cargoSha256 = "0c2478c5gblvci0s68pv8386kxhs88dxzcpd2rq6l82bjn7yzymd"; buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 98551193afa97..014fdad13dca5 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "6.5.1"; + version = "6.5.2"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5S9mKmnrycrL7DFq8duWVbzEHQfiXAXQYcc3bdiVu1k="; + sha256 = "sha256-7tgYVxZ4E6qi/HLgfC0ZreHuXgtd3JMg4ENQL50YWr4="; }; - cargoSha256 = "0sbkqdwfsfb7q52a9vh5lmggrc8ny2l0xr4qx3m42xm0h64f3y6n"; + cargoSha256 = "sha256-xxJfNFegvtHJno7o54Rqai9DvvffrkxTFci673Yq/NI="; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index 9e88e5da4f873..fe121c2d51cef 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + dontWrapQtApps = true; + meta = with lib; { description = "An automatic hinter for TrueType fonts"; longDescription = '' diff --git a/pkgs/tools/misc/uhubctl/default.nix b/pkgs/tools/misc/uhubctl/default.nix index c1dfae6805039..f5bbe2de73f56 100644 --- a/pkgs/tools/misc/uhubctl/default.nix +++ b/pkgs/tools/misc/uhubctl/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "uhubctl"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "mvp"; repo = "uhubctl"; rev = "v${version}"; - sha256 = "1wxsiygw6gwv1h90yassnxylkyi2dfz7y59qkmb7rs8a8javj7nv"; + sha256 = "sha256-F3fOoZYnfIWMrESyVJ/9z6Vou1279avhs600rQayUVA="; }; buildInputs = [ libusb1 ]; diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index 1176e440cef29..02982f9cc4a3d 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { buildInputs = [ pythonPackages.python qtbase qtgraphicaleffects qtquickcontrols qtquickcontrols2 pyotherside ]; - enableParallelBuilding = true; - pythonPath = [ yubikey-manager ]; dontWrapQtApps = true; diff --git a/pkgs/tools/networking/chisel/default.nix b/pkgs/tools/networking/chisel/default.nix index 56868e07688f4..8533958ac2bb6 100644 --- a/pkgs/tools/networking/chisel/default.nix +++ b/pkgs/tools/networking/chisel/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "chisel"; - version = "1.7.4"; + version = "1.7.6"; src = fetchFromGitHub { owner = "jpillora"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1vg9tJLYbW8pfPpw3gQ15c9Kwj2lFfblMRhOK4yWKb8="; + sha256 = "sha256-hUurgwbSUcNZiSi+eVTG/Ija/yxPeWuvEE5pUiG7Dls="; }; vendorSha256 = "sha256-GzsQ6LXxe9UQc13XbsYFOWPe0EzlyHechchKc6xDkAc="; diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 130a7a18ae029..7335a7a55360c 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2021-02-10T07-32-57Z"; + version = "2021-02-14T04-28-06Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-dwgQ322KV1aR1RYSowHkb7Q0Pn7vuiV6Me1s6cMyaEs="; + sha256 = "sha256-Wef8HyJVffDb+ZdVPZOxguIFBC0B9s/1u39j7uXWSnw="; }; - vendorSha256 = "sha256-MXCZZZ7NGDu8NMBzfIiNdRduvj7d7nboN2r8ObGx4dQ="; + vendorSha256 = "sha256-V/fsFfc1QbPR/ouW/9AqGeVhLSbDg6NHPqZYa4Fpx6I="; doCheck = false; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 03e19d5cb7a47..8f46e657edb21 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.4.13"; + version = "1.4.15"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "03cp2ppj07xpb0c43d3cr8m9jps07mfm8clmlk03sjbxg1widsh0"; + sha256 = "sha256-VIUA0W+AmEbvGWatv4maBGILvUTGhBgO3iQtjIc3vG8="; }; postPatch = lib.optionalString (batchSize != null) '' diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix index 23b3f2688c9a9..a983ef9c42c88 100644 --- a/pkgs/tools/networking/spoofer/default.nix +++ b/pkgs/tools/networking/spoofer/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl protobuf libpcap traceroute ] ++ optional withGUI qt5.qtbase ; + dontWrapQtApps = true; + meta = with lib; { homepage = "https://www.caida.org/projects/spoofer"; description = "Assess and report on deployment of source address validation"; diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index d822dfc7fc6cb..13c7f6a1d5bd4 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tendermint"; - version = "0.34.4"; + version = "0.34.7"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kh2B+2BImQdDOo9iyg4ijSMUNQjXFaqWDStpAQL3fy8="; + sha256 = "sha256-nucfxQYjUKm9c1vn7c4w0Mxkf+rU1qEZ1bjzcL258MQ="; }; vendorSha256 = "sha256-0Y9QDBVNYE2x3nY3loRKTCtYWXRnK7v+drRVvTMY4Dg="; diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index 183f226f84b10..bccc840a27a46 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -1,31 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, jdk8, ant, runtimeShell }: +{ lib, stdenv, fetchurl, jre, runtimeShell }: -let jdk = jdk8; in stdenv.mkDerivation rec { pname = "zap"; - version = "2.7.0"; - src = fetchFromGitHub { - owner = "zaproxy"; - repo = "zaproxy"; - rev =version; - sha256 = "1bz4pgq66v6kxmgj99llacm1d85vj8z78jlgc2z9hv0ha5i57y32"; + version = "2.10.0"; + src = fetchurl { + url = "https://github.com/zaproxy/zaproxy/releases/download/v${version}/ZAP_${version}_Linux.tar.gz"; + sha256 = "1mz9s56pbs62g4pnd1ml8y6jpf9ilisdwwvjv5kn6yxrcdi2zzqh"; }; - buildInputs = [ jdk ant ]; + buildInputs = [ jre ]; - buildPhase = '' - cd build - echo -n "${version}" > version.txt - ant -f build.xml setup init compile dist copy-source-to-build package-linux - ''; + # From https://github.com/zaproxy/zaproxy/blob/master/zap/src/main/java/org/parosproxy/paros/Constant.java + version_tag = "2010000"; + # Copying config and adding version tag before first use to avoid permission + # issues if zap tries to copy config on it's own. installPhase = '' - mkdir -p "$out/share" - tar xvf "ZAP_${version}_Linux.tar.gz" -C "$out/share/" - mkdir -p "$out/bin" - echo "#!${runtimeShell}" > "$out/bin/zap" - echo \"$out/share/ZAP_${version}/zap.sh\" >> "$out/bin/zap" - chmod +x "$out/bin/zap" + mkdir -p "$out/bin" "$out/share" + cp -pR . "$out/share/${pname}/" + + cat >> "$out/bin/${pname}" << EOF + #!${runtimeShell} + export PATH="${lib.makeBinPath [ jre ]}:\$PATH" + export JAVA_HOME='${jre}' + if ! [ -f "~/.ZAP/config.xml" ];then + mkdir -p "\$HOME/.ZAP" + head -n 2 $out/share/${pname}/xml/config.xml > "\$HOME/.ZAP/config.xml" + echo "<version>${version_tag}</version>" >> "\$HOME/.ZAP/config.xml" + tail -n +3 $out/share/${pname}/xml/config.xml >> "\$HOME/.ZAP/config.xml" + fi + exec "$out/share/${pname}/zap.sh" "\$@" + EOF + + chmod u+x "$out/bin/${pname}" ''; meta = with lib; { diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index c17023103f8b4..04711b3d86180 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zerotierone"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "0a9sjcri96pv4pvvi94g7jyldwfhqqsi1k58maymm0jnqnj91z25"; + sha256 = "06b6k1rzqkd7cdl7n0gz5ky48fs2nhn0q2qxx1rww38vbfc7lpmf"; }; preConfigure = '' diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 7eee52f8efa83..459b9550b7c89 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dpkg"; - version = "1.20.5"; + version = "1.20.7.1"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "1pg0yd1q9l5cx7pr0853yds1n3mh5b28zkw79gjqjzcmjwqkzwpj"; + sha256 = "sha256-Cq0t5of3l++OvavHuv0W3BSX8c4jvZFG+apz85alY28="; }; configureFlags = [ diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix index f87ce8258fa00..d1d135c157951 100644 --- a/pkgs/tools/package-management/packagekit/qt.nix +++ b/pkgs/tools/package-management/packagekit/qt.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config qttools ]; + dontWrapQtApps = true; + meta = packagekit.meta // { description = "System to facilitate installing and updating packages - Qt"; }; diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 1222ade4ad70d..f3aabb4a9f349 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.22.0"; + version = "3.22.1"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-Vx+f2IgCOdRxCVppkJNzVDBnsWjt4X96PyCJl9MmfWI="; + sha256 = "sha256-f0kj9JgF49WsZm+c3oFA2+bDI5hTPRGRr1Ts4zdcutI="; }; vendorSha256 = "sha256-rQrlnIYYnRc+cqyiyJoh1YqxD61doyjte7ehrX4RDTI="; diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix new file mode 100644 index 0000000000000..5070cbe3f0d9e --- /dev/null +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -0,0 +1,43 @@ +{ lib +, makeWrapper +, buildGoModule +, fetchFromGitHub +, installShellFiles +, gopass +}: + +buildGoModule rec { + pname = "gopass-jsonapi"; + version = "1.11.1"; + + src = fetchFromGitHub { + owner = "gopasspw"; + repo = pname; + rev = "v${version}"; + sha256 = "03xhza7n92xg12z83as9qdvvc0yx1qy6q0c7i4njvng594f9a8x2"; + }; + + vendorSha256 = "0d4fyppsdfzvmjb0qvpnfnw0vl6z256bly7hfb0whk6rldks60wr"; + + subPackages = [ "." ]; + + nativeBuildInputs = [ installShellFiles makeWrapper ]; + + preBuild = '' + buildFlagsArray+=( + "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" + ) + ''; + + postFixup = '' + wrapProgram $out/bin/gopass-jsonapi --prefix PATH : "${lib.makeBinPath [ gopass ]}" + ''; + + meta = with lib; { + description = "Enables communication with gopass via JSON messages"; + homepage = "https://www.gopass.pw/"; + license = licenses.mit; + maintainers = with maintainers; [ maxhbr ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 7ffbb5c03235a..86c44ef095305 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.29" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.30" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 926d955d2e852..dd5d4dc2f6b7d 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: f54a838fa686f495854a71cb32fadcb1853b6201 - ref: refs/tags/6.0.29 + revision: f444c3995f21f9e9eaba63d465fac7d60ba88ebb + ref: refs/tags/6.0.30 specs: - metasploit-framework (6.0.29) + metasploit-framework (6.0.30) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -93,26 +93,26 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (5.2.4.4) - actionview (= 5.2.4.4) - activesupport (= 5.2.4.4) + actionpack (5.2.4.5) + actionview (= 5.2.4.5) + activesupport (= 5.2.4.5) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.4.4) - activesupport (= 5.2.4.4) + actionview (5.2.4.5) + activesupport (= 5.2.4.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activemodel (5.2.4.4) - activesupport (= 5.2.4.4) - activerecord (5.2.4.4) - activemodel (= 5.2.4.4) - activesupport (= 5.2.4.4) + activemodel (5.2.4.5) + activesupport (= 5.2.4.5) + activerecord (5.2.4.5) + activemodel (= 5.2.4.5) + activesupport (= 5.2.4.5) arel (>= 9.0) - activesupport (5.2.4.4) + activesupport (5.2.4.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -124,22 +124,22 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.0) - aws-partitions (1.424.0) + aws-partitions (1.427.0) aws-sdk-core (3.112.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.224.0) + aws-sdk-ec2 (1.225.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.47.0) + aws-sdk-iam (1.48.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-kms (1.42.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.88.0) + aws-sdk-s3 (1.88.1) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -149,7 +149,7 @@ GEM bcrypt_pbkdf (1.1.0) bindata (2.4.8) bit-struct (0.16) - bson (4.11.1) + bson (4.12.0) builder (3.2.4) concurrent-ruby (1.0.5) cookiejar (0.3.3) @@ -168,7 +168,7 @@ GEM eventmachine (>= 1.0.0.beta.4) erubi (1.10.0) eventmachine (1.2.7) - faker (2.15.1) + faker (2.16.0) i18n (>= 1.6, < 2) faraday (1.3.0) faraday-net_http (~> 1.0) @@ -183,9 +183,9 @@ GEM hrr_rb_ssh (0.3.0.pre2) ed25519 (~> 1.2) http_parser.rb (0.6.0) - i18n (1.8.8) + i18n (1.8.9) concurrent-ruby (~> 1.0) - io-console (0.5.7) + io-console (0.5.8) irb (1.3.3) reline (>= 0.1.5) jmespath (1.4.0) @@ -273,9 +273,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (5.2.4.4) - actionpack (= 5.2.4.4) - activesupport (= 5.2.4.4) + railties (5.2.4.5) + actionpack (= 5.2.4.5) + activesupport (= 5.2.4.5) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -294,17 +294,18 @@ GEM rex-core rex-struct2 rex-text - rex-core (0.1.15) + rex-core (0.1.16) rex-encoder (0.1.5) metasm rex-arch rex-text - rex-exploitation (0.1.26) + rex-exploitation (0.1.27) jsobfu metasm rex-arch rex-encoder rex-text + rexml rex-java (0.1.6) rex-mime (0.1.6) rex-text @@ -333,6 +334,7 @@ GEM rex-text (0.2.31) rex-zip (0.1.4) rex-text + rexml (3.2.4) rkelly-remix (0.0.7) ruby-macho (2.5.0) ruby-rc4 (0.1.5) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index e11b1dd299081..619cc9c3192c4 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.29"; + version = "6.0.30"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-QDgInLW/uOBGf0ioPPBMUZv/c9tA7OtTOfp2CEAjf24="; + sha256 = "sha256-DD/nFbSNs3nVNe+W+5zAmDlvMCseYuWWpKX9Dp+9Etc="; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index d33ca7ce03fba..72f60a90ea433 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d8gxymshjhva5fyv33iy2hzp4jm3i44asdbma9pv9wzpl5fwhn0"; + sha256 = "1dh83klnrhfi94s066ahfl2bxaqxqc0sqga71bvcgn8xmcl56bhq"; type = "gem"; }; - version = "5.2.4.4"; + version = "5.2.4.5"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k8dgkplqj76i3q1f8897m8svj2xggd1knhy3bcwfl4nh7998kw6"; + sha256 = "0kxf9gd52hh33z6015gsfsnyavly29f15lbsljlai68r7qc2j89c"; type = "gem"; }; - version = "5.2.4.4"; + version = "5.2.4.5"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g79l7v0ddpxcj5r2s9kii6h4r4nbpy5bksbqi5lxvivrb3pkz1m"; + sha256 = "0qc4bjxnkjrlqpz2k7hllqk30ydad5m2q7pbqzdr0hxzycavxz7m"; type = "gem"; }; - version = "5.2.4.4"; + version = "5.2.4.5"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05b9l85a31cq6g7v4b4ifrj798q49rlidcvvfasmb3bk412wlp03"; + sha256 = "1smg691az7r2bsydfj2d46mr2d5sm0lq3ydwvfv6hl5c3y1y5jfg"; type = "gem"; }; - version = "5.2.4.4"; + version = "5.2.4.5"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd"; + sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc"; type = "gem"; }; - version = "5.2.4.4"; + version = "5.2.4.5"; }; addressable = { groups = ["default"]; @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dxyx3pnih7g23hq794ldapsszddcmldxf6pq3z99q4d8rg8rrqp"; + sha256 = "1v7dwyqkwdbp4f627y459lj22vimjzwhk2z987bcncq2ml7ldrfz"; type = "gem"; }; - version = "1.424.0"; + version = "1.427.0"; }; aws-sdk-core = { groups = ["default"]; @@ -134,20 +134,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lg8vh124viba77b0qhi5j8xx8b4wxdiyycl4kaawmddwhr33zx9"; + sha256 = "1x2f3jp8p7ag9kw7glkiq60ypqq26ra79qnhms4apqz5www86d4d"; type = "gem"; }; - version = "1.224.0"; + version = "1.225.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16152qidkisakl2iqvghrjnccq279pahb953q5a4q0ipk5imw2c1"; + sha256 = "02xsqb66r7a53a9nnwrhpvd5s9n7wdrvd51c56gs1hlb38j45y0j"; type = "gem"; }; - version = "1.47.0"; + version = "1.48.0"; }; aws-sdk-kms = { groups = ["default"]; @@ -164,10 +164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "029iqr52fxxz8d6jb2g4k76i7nnjyspvjdlx52xah25zzhp3bx7v"; + sha256 = "01zlv2icx3m0pq94z9fcsp1r9ivdqhfpnpbrv63fpr6m7yqww24y"; type = "gem"; }; - version = "1.88.0"; + version = "1.88.1"; }; aws-sigv4 = { groups = ["default"]; @@ -224,10 +224,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12v95l3v7n7lh3mk8k1jdrkpn2vjnkb8k636hcygaczzv4jdsdfp"; + sha256 = "0gny4n34gwfc6x04x7vli5my6cdl90n4i0wsxm758q81hfmkqxd7"; type = "gem"; }; - version = "4.11.1"; + version = "4.12.0"; }; builder = { groups = ["default"]; @@ -344,10 +344,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l0dvswigzxaz9558wmfix3v8cmwwkgdvrx1fmpd3qnr5hky1qrk"; + sha256 = "1jc6wffxnl7rbhg4hpj572f38fkxgrkgvv5imgzamrdmw55h206b"; type = "gem"; }; - version = "2.15.1"; + version = "2.16.0"; }; faraday = { groups = ["default"]; @@ -424,20 +424,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k7q3pwm0l1qvx6sc3d4dxmdxqx2pc63lbfjwv0k0higq94rinvs"; + sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; type = "gem"; }; - version = "1.8.8"; + version = "1.8.9"; }; io-console = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gp1xx2g1x81wsh929x7rzsm0c8qgkhr2mkjn79fbdwyfnk4s04l"; + sha256 = "0prpvq05wzp8n7vk44zcwmn53p1akn4r105n5py6bmbxsmmkvyhr"; type = "gem"; }; - version = "0.5.7"; + version = "0.5.8"; }; irb = { groups = ["default"]; @@ -524,12 +524,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "f54a838fa686f495854a71cb32fadcb1853b6201"; - sha256 = "0vkz4d00hxps759ypv20vdrzz6si9kq3ra28gx3f1f5znnf0hf20"; + rev = "f444c3995f21f9e9eaba63d465fac7d60ba88ebb"; + sha256 = "1mqjpnghxzd5ljbfaqhy5cq6yfcqq2fgp5pg6papkcwdnhayfgqc"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.29"; + version = "6.0.30"; }; metasploit-model = { groups = ["default"]; @@ -886,10 +886,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "089kiwmv8fxyfk0zp57q74nyd5i6d5x5ihlrzbzwl041v94s2zx9"; + sha256 = "1qwgjwfzkm4q7wby30c9r724w1sp1bywbqfmpv20lq3zdcrf1rfd"; type = "gem"; }; - version = "5.2.4.4"; + version = "5.2.4.5"; }; rake = { groups = ["default"]; @@ -966,10 +966,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bjz0mhxijvfq535hpzswr83yrq3ghkkmqna63yjsabh61qpxx16"; + sha256 = "08krnf05mbq6x2d92fv34bl8xdz1d3yq2m0mp8bfbq5kd6a13l2w"; type = "gem"; }; - version = "0.1.15"; + version = "0.1.16"; }; rex-encoder = { groups = ["default"]; @@ -986,10 +986,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z4dn579mxl22qdxcnbmxp0diia6kr7c20giv0bn4r0viavz49gc"; + sha256 = "1b10rcrw52nj2aswsn0kwv0s601rbn077k0r6n5lblip6fbrqz9i"; type = "gem"; }; - version = "0.1.26"; + version = "0.1.27"; }; rex-java = { groups = ["default"]; @@ -1121,6 +1121,16 @@ }; version = "0.1.4"; }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + type = "gem"; + }; + version = "3.2.4"; + }; rkelly-remix = { groups = ["default"]; platforms = []; diff --git a/pkgs/tools/security/nmap-unfree/default.nix b/pkgs/tools/security/nmap-unfree/default.nix new file mode 100644 index 0000000000000..1e6ed42bae45d --- /dev/null +++ b/pkgs/tools/security/nmap-unfree/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchurl +, libpcap +, pkg-config +, openssl +, lua5_3 +, pcre +, liblinear +, libssh2 +, zlib +, withLua ? true +}: + +stdenv.mkDerivation rec { + pname = "nmap-unfree"; + version = "7.91"; + + src = fetchurl { + url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; + sha256 = "001kb5xadqswyw966k2lqi6jr6zz605jpp9w4kmm272if184pk0q"; + }; + + prePatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace libz/configure \ + --replace /usr/bin/libtool ar \ + --replace 'AR="libtool"' 'AR="ar"' \ + --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"' + ''; + + configureFlags = [ + (if withLua then "--with-liblua=${lua5_3}" else "--without-liblua") + ]; + + makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "AR=${stdenv.cc.bintools.targetPrefix}ar" + "RANLIB=${stdenv.cc.bintools.targetPrefix}ranlib" + "CC=${stdenv.cc.targetPrefix}gcc" + ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + pcre + liblinear + libssh2 + libpcap + openssl + zlib + ]; + + enableParallelBuilding = true; + + # Tests require network access + doCheck = false; + + meta = with lib; { + description = "Open source utility for network discovery and security auditing"; + homepage = "http://www.nmap.org"; + # Nmap Public Source License Version 0.93 + # https://github.com/nmap/nmap/blob/master/LICENSE + license = licenses.unfree; + maintainers = with maintainers; [ fab SuperSandro2000 ]; + }; +} diff --git a/pkgs/tools/security/proxmark3/default.nix b/pkgs/tools/security/proxmark3/default.nix index 3b1f21ac71873..b52e7279fa98e 100644 --- a/pkgs/tools/security/proxmark3/default.nix +++ b/pkgs/tools/security/proxmark3/default.nix @@ -15,6 +15,8 @@ let nativeBuildInputs = [ pkg-config gcc-arm-embedded ]; buildInputs = [ ncurses readline pcsclite qt5.qtbase ]; + dontWrapQtApps = true; + postPatch = '' substituteInPlace client/Makefile --replace '-ltermcap' ' ' substituteInPlace liblua/Makefile --replace '-ltermcap' ' ' diff --git a/pkgs/tools/security/wafw00f/default.nix b/pkgs/tools/security/wafw00f/default.nix new file mode 100644 index 0000000000000..dae4f5a5ad0c6 --- /dev/null +++ b/pkgs/tools/security/wafw00f/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, pluginbase +, requests +}: + +buildPythonApplication rec { + pname = "wafw00f"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "EnableSecurity"; + repo = pname; + rev = "v${version}"; + sha256 = "0526kz6ypww9nxc2vddkhpn1gqvn25mzj3wmi91wwxwxjjb6w4qj"; + }; + + propagatedBuildInputs = [ + requests + pluginbase + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "wafw00f" ]; + + meta = with lib; { + description = "Tool to identify and fingerprint Web Application Firewalls (WAF)"; + homepage = "https://github.com/EnableSecurity/wafw00f"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix index 6754d0806b6b9..6c0143a34b640 100644 --- a/pkgs/tools/system/bpytop/default.nix +++ b/pkgs/tools/system/bpytop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bpytop"; - version = "1.0.61"; + version = "1.0.62"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E6blMhDkZa3Wbdbsw7f8jdHwHFINOQ48XC5pQdkVPtQ="; + sha256 = "sha256-ds+N0z7Vfw7xv+nE8RIfFjel81mJgIo1u1KspOHLxKc="; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 0c63bf651baed..7b0b45fedb033 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gdu"; - version = "4.3.2"; + version = "4.6.2"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m4J797bmQzKuyA01JgDLVlf+PbXDVXWtYbID/0QVLxE="; + sha256 = "sha256-q26NnHSnJ8vVWHwXtFJ90/8xr772x/gW6BRG29wsIeI="; }; vendorSha256 = "sha256-kIMd0xzQ+c+jCpX2+qdD/GcFEirR15PMInbEV184EBU="; diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index b5f7c369dfdb0..b3b084fbe71cf 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gptfdisk"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { # https://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home # page clearly implies a preference for using SourceForge's bandwidth: url = "mirror://sourceforge/gptfdisk/${pname}-${version}.tar.gz"; - sha256 = "0bybgp30pqxb6x5krxazkq4drca0gz4inxj89fpyr204rn3kjz8f"; + sha256 = "sha256-3cVR1kOlPwvURANF064yxJsEp5fpwBA26kYLa7QWjKg="; }; postPatch = '' diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index 513b48c66304e..e91cd6da6b97e 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -14,27 +14,21 @@ stdenv.mkDerivation rec { }; # Logrotate wants to access the 'mail' program; to be done. - patchPhase = '' - sed -i -e 's,[a-z/]\+gzip,${gzip}/bin/gzip,' \ - -e 's,[a-z/]\+gunzip,${gzip}/bin/gunzip,' configure.ac - - ${lib.optionalString (mailutils != null) '' - sed -i -e 's,[a-z/]\+mail,${mailutils}/bin/mail,' configure.ac - ''} - ''; - - autoreconfPhase = '' - ./autogen.sh - ''; + configureFlags = [ + "--with-compress-command=${gzip}/bin/gzip" + "--with-uncompress-command=${gzip}/bin/gunzip" + ] ++ lib.optionals (mailutils != null) [ + "--with-default-mail-command=${mailutils}/bin/mail" + ]; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ popt ]; - meta = { + meta = with lib; { homepage = "https://fedorahosted.org/releases/l/o/logrotate/"; description = "Rotates and compresses system logs"; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.viric ]; - platforms = lib.platforms.all; + license = licenses.gpl2Plus; + maintainers = [ maintainers.viric ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/system/stressapptest/default.nix b/pkgs/tools/system/stressapptest/default.nix new file mode 100644 index 0000000000000..9b7eb0a6f3e2b --- /dev/null +++ b/pkgs/tools/system/stressapptest/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, fetchFromGitHub +, libaio +}: + +stdenv.mkDerivation rec { + pname = "stressapptest"; + version = "1.0.9"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1qzj6h6adx042rb9aiz916jna269whibvj5ys4p5nwdp17fqh922"; + }; + + buildInputs = [ libaio ]; + + meta = with lib; { + description = "Userspace memory and IO stress test tool"; + homepage = "https://github.com/stressapptest/stressapptest"; + license = with licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ fab ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/text/ledger2beancount/default.nix b/pkgs/tools/text/ledger2beancount/default.nix index fe2078222d2ea..b3f48085d1db6 100644 --- a/pkgs/tools/text/ledger2beancount/default.nix +++ b/pkgs/tools/text/ledger2beancount/default.nix @@ -4,21 +4,26 @@ with lib; let perlDeps = with perlPackages; [ - ConfigOnion DateCalc - FileBaseDir YAMLLibYAML - GetoptLongDescriptive DateTimeFormatStrptime + DateCalc + DateTimeFormatStrptime + enum + FileBaseDir + GetoptLongDescriptive + ListMoreUtils + RegexpCommon StringInterpolate + YAMLLibYAML ]; in stdenv.mkDerivation rec { pname = "ledger2beancount"; - version = "2.1"; + version = "2.5"; src = fetchFromGitHub { - owner = "zacchiro"; + owner = "beancount"; repo = "ledger2beancount"; rev = version; - sha256 = "0w88jb1x0w02jwwf6ipx3cxr89kzffrrdqws3556zrvvs01bh84j"; + sha256 = "0kimp8l9ax37grfv5r5iw0g0xnrpkak022fl10y3i7kc4nyi1s99"; }; phases = [ @@ -50,7 +55,7 @@ in stdenv.mkDerivation rec { Conversion is based on (concrete) syntax, so that information that is not meaningful for accounting reasons but still valuable (e.g., comments, formatting, etc.) can be preserved. ''; - homepage = "https://github.com/zacchiro/ledger2beancount"; + homepage = "https://github.com/beancount/ledger2beancount"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ pablovsky ]; diff --git a/pkgs/tools/text/markdown-pp/default.nix b/pkgs/tools/text/markdown-pp/default.nix index 50ef560f6c3f7..c6e937eab2754 100644 --- a/pkgs/tools/text/markdown-pp/default.nix +++ b/pkgs/tools/text/markdown-pp/default.nix @@ -1,13 +1,15 @@ -{ fetchFromGitHub, pythonPackages, lib }: +{ lib +, fetchFromGitHub +, python3 +}: -with pythonPackages; -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "MarkdownPP"; version = "1.5.1"; - propagatedBuildInputs = [ pillow watchdog ]; + propagatedBuildInputs = with python3.pkgs; [ pillow watchdog ]; checkPhase = '' cd test - PATH=$out/bin:$PATH ${python}/bin/${python.executable} test.py + PATH=$out/bin:$PATH ${python3}/bin/${python3.executable} test.py ''; src = fetchFromGitHub { owner = "jreese"; diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index b012bdfe57e52..04f0cb59c0387 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -37,7 +37,13 @@ rustPlatform.buildRustPackage rec { installShellCompletion --zsh complete/_rg ''; - passthru.tests = { inherit (nixosTests) ripgrep; }; + doInstallCheck = true; + installCheckPhase = '' + file="$(mktemp)" + echo "abc\nbcd\ncde" > "$file" + $out/bin/rg -N 'bcd' "$file" + $out/bin/rg -N 'cd' "$file" + ''; meta = with lib; { description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep"; diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 61af8102f51eb..849da7e606c04 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -147,6 +147,8 @@ stdenv.mkDerivation rec { pname = "asciidoc"; version = "9.0.4"; + # Note: a substitution to improve reproducibility should be updated once 10.0.0 is + # released. See the comment in `patchPhase` for more information. src = fetchFromGitHub { owner = "asciidoc"; repo = "asciidoc-py3"; @@ -261,7 +263,15 @@ stdenv.mkDerivation rec { '') + '' patchShebangs . - sed -i -e "s,/etc/vim,,g" Makefile.in + # Note: this substitution will not work in the planned 10.0.0 release: + # + # https://github.com/asciidoc/asciidoc-py3/commit/dfffda23381014481cd13e8e9d8f131e1f93f08a + # + # Update this substitution to: + # + # --replace "python3 -m asciidoc.a2x" "python3 -m asciidoc.a2x -a revdate=01/01/1980" + substituteInPlace Makefile.in \ + --replace "python3 a2x.py" "python3 a2x.py -a revdate=01/01/1980" ''; preInstall = "mkdir -p $out/etc/vim"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ff218311e934..c8322e5dbdff3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -158,6 +158,8 @@ in fishnet = callPackage ../servers/fishnet { }; + authy = callPackage ../applications/misc/authy { }; + avro-tools = callPackage ../development/tools/avro-tools { }; bacnet-stack = callPackage ../tools/networking/bacnet-stack {}; @@ -748,6 +750,8 @@ in metapixel = callPackage ../tools/graphics/metapixel { }; + xtrt = callPackage ../tools/archivers/xtrt { }; + yabridge = callPackage ../tools/audio/yabridge { wine = wineWowPackages.minimal; }; @@ -1403,6 +1407,8 @@ in gopass = callPackage ../tools/security/gopass { }; + gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { }; + gospider = callPackage ../tools/security/gospider { }; browserpass = callPackage ../tools/security/browserpass { }; @@ -6628,6 +6634,8 @@ in graphicalSupport = true; }; + nmap-unfree = callPackage ../tools/security/nmap-unfree { }; + nmapsi4 = libsForQt514.callPackage ../tools/security/nmap/qt.nix { }; nnn = callPackage ../applications/misc/nnn { }; @@ -8161,6 +8169,8 @@ in stress-ng = callPackage ../tools/system/stress-ng { }; + stressapptest = callPackage ../tools/system/stressapptest { }; + stoken = callPackage ../tools/security/stoken (config.stoken or {}); storeBackup = callPackage ../tools/backup/store-backup { }; @@ -12817,7 +12827,7 @@ in inherit (callPackage ../development/tools/build-managers/shards { }) shards_0_11 - shards_0_12 + shards_0_13 shards; shellcheck = callPackage ../development/tools/shellcheck {}; @@ -15722,9 +15732,7 @@ in libxmp = callPackage ../development/libraries/libxmp { }; - libxslt = callPackage ../development/libraries/libxslt { - python = if stdenv.isDarwin then python2 else python3; - }; + libxslt = callPackage ../development/libraries/libxslt { }; libxsmm = callPackage ../development/libraries/libxsmm { }; @@ -19689,6 +19697,9 @@ in musl = callPackage ../os-specific/linux/musl { }; + musl-fts = callPackage ../os-specific/linux/musl-fts { }; + musl-obstack = callPackage ../os-specific/linux/musl-obstack { }; + nushell = callPackage ../shells/nushell { inherit (darwin.apple_sdk.frameworks) AppKit Security; }; @@ -21611,6 +21622,8 @@ in python3Packages = python37Packages; }; + cqrlog = callPackage ../applications/radio/cqrlog { }; + crun = callPackage ../applications/virtualization/crun {}; csdp = callPackage ../applications/science/math/csdp { }; @@ -22365,6 +22378,10 @@ in formatter = callPackage ../applications/misc/formatter { }; + formiko = with python3Packages; callPackage ../applications/editors/formiko { + inherit buildPythonApplication; + }; + foxtrotgps = callPackage ../applications/misc/foxtrotgps { }; fractal = callPackage ../applications/networking/instant-messengers/fractal { }; @@ -23268,6 +23285,8 @@ in kubectl = callPackage ../applications/networking/cluster/kubectl { }; + kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { }; + kubeless = callPackage ../applications/networking/cluster/kubeless { }; kubelogin = callPackage ../applications/networking/cluster/kubelogin { }; @@ -25300,6 +25319,8 @@ in ticpp = callPackage ../development/libraries/ticpp { }; + ticker = callPackage ../applications/misc/ticker { }; + tickrs = callPackage ../applications/misc/tickrs { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -25703,6 +25724,8 @@ in wad = python3Packages.callPackage ../tools/security/wad { }; + wafw00f = python3Packages.callPackage ../tools/security/wafw00f { }; + waon = callPackage ../applications/audio/waon { }; w3m = callPackage ../applications/networking/browsers/w3m { }; @@ -27301,6 +27324,10 @@ in typespeed = callPackage ../games/typespeed { }; + uchess = callPackage ../games/uchess { + buildGoModule = buildGo116Module; + }; + udig = callPackage ../applications/gis/udig { }; ufoai = callPackage ../games/ufoai { }; @@ -29270,6 +29297,8 @@ in ricty = callPackage ../data/fonts/ricty { }; + rmfuse = callPackage ../tools/filesystems/rmfuse {}; + rmount = callPackage ../tools/filesystems/rmount {}; romdirfs = callPackage ../tools/filesystems/romdirfs {}; @@ -29965,6 +29994,8 @@ in zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { }; + zrepl = callPackage ../tools/backup/zrepl { }; + runwayml = callPackage ../applications/graphics/runwayml {}; uhubctl = callPackage ../tools/misc/uhubctl {}; @@ -30025,7 +30056,10 @@ in zalgo = callPackage ../tools/misc/zalgo { }; - zettlr = callPackage ../applications/misc/zettlr { }; + zettlr = callPackage ../applications/misc/zettlr { + texlive = texlive.combined.scheme-medium; + inherit (haskellPackages) pandoc-citeproc; + }; unifi-poller = callPackage ../servers/monitoring/unifi-poller {}; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index cfe7296589b8a..c4fb9b2aabd56 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9724,12 +9724,11 @@ let HTTPDaemon = buildPerlPackage { pname = "HTTP-Daemon"; - version = "6.12"; + version = "6.01"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Daemon-6.12.tar.gz"; - sha256 = "19hz9r6f1p406fk1pqyd99h96ipxsmknh4fh1xw0qrrq1k8vwiyz"; + url = "mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-6.01.tar.gz"; + sha256 = "1hmd2isrkilf0q0nkxms1q64kikjmcw9imbvrjgky6kh89vqdza3"; }; - buildInputs = [ CPANMetaCheck ModuleBuildTiny TestNeeds ]; propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "A simple http server class"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a5de7a1e7232e..bdff2fce15228 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -204,9 +204,11 @@ in { aioambient = callPackage ../development/python-modules/aioambient { }; + ailment = callPackage ../development/python-modules/ailment { }; + aioamqp = callPackage ../development/python-modules/aioamqp { }; - ailment = callPackage ../development/python-modules/ailment { }; + aioasuswrt = callPackage ../development/python-modules/aioasuswrt { }; aiocoap = callPackage ../development/python-modules/aiocoap { }; @@ -1708,6 +1710,8 @@ in { deskcon = callPackage ../development/python-modules/deskcon { }; + desktop-notifier = callPackage ../development/python-modules/desktop-notifier { }; + detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 devolo-home-control-api = callPackage ../development/python-modules/devolo-home-control-api { }; @@ -3517,6 +3521,12 @@ in { kitchen = callPackage ../development/python-modules/kitchen { }; + kivy = callPackage ../development/python-modules/kivy { + inherit (pkgs) mesa; + }; + + kivy-garden = callPackage ../development/python-modules/kivy-garden { }; + kiwisolver = if isPy3k then callPackage ../development/python-modules/kiwisolver { } else @@ -3696,6 +3706,8 @@ in { librosa = callPackage ../development/python-modules/librosa { }; + librouteros = callPackage ../development/python-modules/librouteros { }; + libsass = (callPackage ../development/python-modules/libsass { inherit (pkgs) libsass; }); libsavitar = callPackage ../development/python-modules/libsavitar { }; @@ -3747,7 +3759,7 @@ in { libxslt = (toPythonModule (pkgs.libxslt.override { pythonSupport = true; - inherit python; + python3 = python; inherit (self) libxml2; })).py; @@ -3872,20 +3884,11 @@ in { macropy = callPackage ../development/python-modules/macropy { }; maestral = callPackage ../development/python-modules/maestral { - - # https://github.com/SamSchott/maestral/issues/250#issuecomment-739510048 - survey = self.survey.overridePythonAttrs (old: rec { - version = "2.2.1"; + keyring = self.keyring.overridePythonAttrs (old: rec { + version = "22.0.1"; src = old.src.override { inherit version; - sha256 = "sha256-7ubWkqk1vyaJDLMOuKwUx2Bjziyi3HqpaQq4pKp4Z+0="; - }; - }); - watchdog = self.watchdog.overridePythonAttrs (old: rec { - version = "0.10.3"; - src = old.src.override { - inherit version; - sha256 = "4214e1379d128b0588021880ccaf40317ee156d4603ac388b9adcf29165e0c04"; + sha256 = "sha256-mss+FFLtu3VEgisS/SVFkHh2nlYPpR9Bi20Ar6pheN8="; }; }); }; @@ -4887,9 +4890,14 @@ in { else callPackage ../development/python-modules/pillow { inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; - inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libX11 libxcb; }; + pillow-simd = callPackage ../development/python-modules/pillow-simd { + inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; + inherit (pkgs.xorg) libX11; + }; + pims = callPackage ../development/python-modules/pims { }; pinboard = callPackage ../development/python-modules/pinboard { }; @@ -5402,6 +5410,8 @@ in { pyee = callPackage ../development/python-modules/pyee { }; + pyeight = callPackage ../development/python-modules/pyeight { }; + pyelftools = callPackage ../development/python-modules/pyelftools { }; pyemd = callPackage ../development/python-modules/pyemd { }; diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index 88ea6a00f8c1d..923d2b80818a3 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -27,6 +27,7 @@ rec { xineramaSupport = true; xmlSupport = true; sdlSupport = true; + mingwSupport = true; }; full = base.override { |