diff options
226 files changed, 5303 insertions, 2539 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3018ebf68746a..7dc14a61cbaed 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -97,9 +97,9 @@ /pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn @expipiplus1 # Perl -/pkgs/development/interpreters/perl @volth @stigtsp -/pkgs/top-level/perl-packages.nix @volth @stigtsp -/pkgs/development/perl-modules @volth @stigtsp +/pkgs/development/interpreters/perl @volth @stigtsp @zakame +/pkgs/top-level/perl-packages.nix @volth @stigtsp @zakame +/pkgs/development/perl-modules @volth @stigtsp @zakame # R /pkgs/applications/science/math/R @jbedo @bcdarwin diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8de0815436033..0f7e448b549aa 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8709,6 +8709,12 @@ githubId = 13225611; name = "Nicolas Martin"; }; + pennae = { + name = "pennae"; + email = "github@quasiparticle.net"; + github = "pennae"; + githubId = 82953136; + }; p3psi = { name = "Elliot Boo"; email = "p3psi.boo@gmail.com"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 700ad741c0036..73baf71f5ef59 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -57,6 +57,11 @@ </listitem> <listitem> <para> + KDE Plasma now finally works on Wayland. + </para> + </listitem> + <listitem> + <para> bash now defaults to major version 5. </para> </listitem> @@ -1106,6 +1111,23 @@ Superuser created successfully. functionality. </para> </listitem> + <listitem> + <para> + <literal>services.xserver.displayManager.defaultSession = "plasma5"</literal> + does not work anymore, instead use either + <literal>"plasma"</literal> for the Plasma X11 + session or <literal>"plasmawayland"</literal> for + the Plasma Wayland sesison. + </para> + </listitem> + <listitem> + <para> + <literal>boot.kernelParams</literal> now only accepts one + command line parameter per string. This change is aimed to + reduce common mistakes like <quote>param = 12</quote>, which + would be parsed as 3 parameters. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-notable-changes"> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index f92721e2fc76d..b7fa2cf0f2548 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -346,6 +346,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `opencv2` no longer includes the non-free libraries by default, and consequently `pfstools` no longer includes OpenCV support by default. Both packages now support an `enableUnfree` option to re-enable this functionality. - `services.xserver.displayManager.defaultSession = "plasma5"` does not work anymore, instead use either `"plasma"` for the Plasma X11 session or `"plasmawayland"` for the Plasma Wayland sesison. +- `boot.kernelParams` now only accepts one command line parameter per string. This change is aimed to reduce common mistakes like "param = 12", which would be parsed as 3 parameters. + ## Other Notable Changes {#sec-release-21.11-notable-changes} diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index c7c9871cfeccb..f7383b2023a4e 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -96,9 +96,8 @@ let }; } cfg.extraConfig; - configFile = pkgs.runCommand "config.toml" { - buildInputs = [ pkgs.remarshal ]; - preferLocalBuild = true; + configFile = pkgs.runCommandLocal "config.toml" { + nativeBuildInputs = [ pkgs.remarshal ]; } '' remarshal -if json -of toml \ < ${pkgs.writeText "config.json" (builtins.toJSON configOptions)} \ diff --git a/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix b/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix index 01e420db38978..ef829a1b7d02e 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix @@ -61,6 +61,11 @@ in serviceConfig = { # rtl-sdr udev rules make supported USB devices +rw by plugdev. SupplementaryGroups = "plugdev"; + # rtl_433 needs rw access to the USB radio. + PrivateDevices = lib.mkForce false; + DeviceAllow = lib.mkForce "char-usb_device rw"; + RestrictAddressFamilies = [ "AF_NETLINK" ]; + ExecStart = let matchers = (map (m: "--channel_matcher '${m.name},${toString m.channel},${m.location}'" diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 530614ad93742..caf89c84397f9 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -221,5 +221,5 @@ in }; - meta.maintainers = with lib.maintainers; [ erictapen ]; + meta.maintainers = with lib.maintainers; [ erictapen pennae ]; } diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 4f57f9abd06e9..e036c684c886a 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -26,7 +26,6 @@ let load-module module-udev-detect load-module module-native-protocol-unix load-module module-default-device-restore - load-module module-rescue-streams load-module module-always-sink load-module module-intended-roles load-module module-suspend-on-idle diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 46f2e3fec04cf..4a9da93945191 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -83,7 +83,10 @@ in }; boot.kernelParams = mkOption { - type = types.listOf types.str; + type = types.listOf (types.strMatching ''([^"[:space:]]|"[^"]*")+'' // { + name = "kernelParam"; + description = "string, with spaces inside double quotes"; + }); default = [ ]; description = "Parameters added to the kernel command line."; }; diff --git a/pkgs/applications/audio/mousai/default.nix b/pkgs/applications/audio/mousai/default.nix index 9044d201c457e..f61b7c5b7b947 100644 --- a/pkgs/applications/audio/mousai/default.nix +++ b/pkgs/applications/audio/mousai/default.nix @@ -1,6 +1,7 @@ { lib , python3 , fetchFromGitHub +, substituteAll , appstream-glib , desktop-file-utils , gettext @@ -13,12 +14,13 @@ , meson , ninja , pkg-config +, pulseaudio , wrapGAppsHook }: python3.pkgs.buildPythonApplication rec { pname = "mousai"; - version = "0.4.2"; + version = "0.6.6"; format = "other"; @@ -26,9 +28,16 @@ python3.pkgs.buildPythonApplication rec { owner = "SeaDve"; repo = "Mousai"; rev = "v${version}"; - sha256 = "sha256-zH++GGFIz3oxkKOYB4zhY6yL3vENEXxtrv8mZZ+41kU="; + sha256 = "sha256-nCbFVFg+nVF8BOBfdzQVgdTRXR5UF18PJFC266yTFwg="; }; + patches = [ + (substituteAll { + src = ./paths.patch; + pactl = "${lib.getBin pulseaudio}/bin/pactl"; + }) + ]; + postPatch = '' patchShebangs build-aux/meson ''; @@ -53,6 +62,7 @@ python3.pkgs.buildPythonApplication rec { gtk4 libadwaita librsvg + pulseaudio ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/audio/mousai/paths.patch b/pkgs/applications/audio/mousai/paths.patch new file mode 100644 index 0000000000000..35b328ad0ea3c --- /dev/null +++ b/pkgs/applications/audio/mousai/paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/backend/utils.py b/src/backend/utils.py +index cebc009..0087c09 100644 +--- a/src/backend/utils.py ++++ b/src/backend/utils.py +@@ -79,7 +79,7 @@ class Utils: + @staticmethod + def get_default_audio_sources(): + pactl_output = subprocess.run( +- ['/usr/bin/pactl', 'info'], ++ ['@pactl@', 'info'], + stdout=subprocess.PIPE, + text=True + ).stdout.splitlines() diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index a0adc22af7b72..10418c418f6d2 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "21.9.2"; + version = "21.10.2"; name = "${pname}-${version}"; suffix = { @@ -18,9 +18,9 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; - sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | rg ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-mgip818sGkrKwF4v2mj/JeTNxBoj7DgdNPoxZ8sp8OvojHB2sa0hm4YXfrzAdPf8CP6d5ChUmwccQyYilGUiOQ=="; - x86_64-linux = "sha512-f02m8Q6ITYhIXH1FS2BA/QYYsdtxklDDNYBXBarj8b1kA+yhDFZ3VL9vy+nZNdPQHQ2yMQreDzpcToXBQ67XyQ=="; + sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' + aarch64-linux = "sha512-+qXN9cQk1u18ZzeMecPNfhkTTsw61iM/IJYksPJl9+zx2AKldv9tAFUnnmKZ65LabiaIXI+emN185SRRcaOndw=="; + x86_64-linux = "sha512-WpiG8VOEODqsQ1/jERiEEGwVqR0zbMqERGjOysEVYorA0p3xZyl7OSpWOSWaUjPBZpQtJIBdqhSXeoSRcvfJgg=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 5a3cd7b13f656..9cee6485500a0 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,12 +13,12 @@ let sha256Hash = "0k8jcq8vpjayvwm9wqcrjhnp7dly0h4bb8nxspck5zmi8q2ar67l"; }; betaVersion = { - version = "2020.3.1.21"; # "Android Studio Arctic Fox (2020.3.1) RC 1" - sha256Hash = "04k7c328bl8ixi8bvp2mm33q2hmv40yc9p5dff5cghyycarwpd3f"; + version = "2021.1.1.14"; # "Android Studio Bumblebee (2021.1.1) Beta 1" + sha256Hash = "1j1fxl4vzq3bln2z9ycxn9imjgy55yd1nbl7ycmsi90bdp96pzj0"; }; latestVersion = { # canary & dev - version = "2021.1.1.13"; # "Android Studio Bumblebee (2021.1.1) Canary 13" - sha256Hash = "04w5jw79fkxk4gy1n9iy8kjxg6k3zcl59z76f04rh556n12f01gm"; + version = "2021.2.1.1"; # "Android Studio Chipmunk (2021.2.1) Canary 1" + sha256Hash = "1fn0jv6ybgdhgpwhamw16fjqbg2961ir9jhbjzanysi7y3935nbv"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix b/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix index c0fb5680461af..0d9028e59fc99 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix @@ -7,13 +7,13 @@ trivialBuild rec { pname = "apheleia"; - version = "0.pre+unstable=2021-08-08"; + version = "1.1.2+unstable=2021-10-03"; src = fetchFromGitHub { owner = "raxod502"; repo = pname; - rev = "8e022c67fea4248f831c678b31c19646cbcbbf6f"; - hash = "sha256-Put/BBQ7V423C18UIVfaM17T+TDWtAxRZi7WI8doPJw="; + rev = "8b9d576f2fda10d0c9051fc03c1eb1d9791e32fd"; + hash = "sha256-QwGlCdHBll16mbfQxGw1EORZFUxYCZSt8ThYTTGjRpo="; }; buildInputs = [ diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 8d6ba3540bdae..7eb9f12a5a05d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -369,10 +369,10 @@ elpaBuild { pname = "boxy"; ename = "boxy"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/boxy-1.0.2.tar"; - sha256 = "07m832kn4d6njfz21qfmh12gzd35d17v29pqlxfq9v03cazww4lr"; + url = "https://elpa.gnu.org/packages/boxy-1.0.4.tar"; + sha256 = "0cwzjyj8yjg13b63va6pnj01m6kc5g3zx69c9w2ysl2wk24zn6dz"; }; packageRequires = [ emacs ]; meta = { @@ -380,18 +380,18 @@ license = lib.licenses.free; }; }) {}; - boxy-headlines = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib }: + boxy-headings = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib, org }: elpaBuild { - pname = "boxy-headlines"; - ename = "boxy-headlines"; - version = "1.0.2"; + pname = "boxy-headings"; + ename = "boxy-headings"; + version = "2.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/boxy-headlines-1.0.2.tar"; - sha256 = "1j8j2vc318mb4i116qs9zj6cvkiy1fips09mkzj6lqr25qk5fi31"; + url = "https://elpa.gnu.org/packages/boxy-headings-2.1.0.tar"; + sha256 = "021w4ic028jsq7vxz1jgnfny9dymcz6v112b3b3nwyw3g3dnc62f"; }; - packageRequires = [ boxy emacs ]; + packageRequires = [ boxy emacs org ]; meta = { - homepage = "https://elpa.gnu.org/packages/boxy-headlines.html"; + homepage = "https://elpa.gnu.org/packages/boxy-headings.html"; license = lib.licenses.free; }; }) {}; @@ -666,10 +666,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-0.11.tar"; - sha256 = "14zjhsfhq5g9257maivyzpj5qxi1kprcsdk1qalwybyylyb4q4kk"; + url = "https://elpa.gnu.org/packages/consult-0.12.tar"; + sha256 = "0xcr7jki9m30hppy24z74nrw7xv5nahm1yrjilcck32mxfkrc69x"; }; packageRequires = [ emacs ]; meta = { @@ -696,10 +696,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.11"; + version = "0.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.11.tar"; - sha256 = "1sf7ll25ry7vwff4bvqgdh84zviqj6wifmqdb2z8hf12awz63icz"; + url = "https://elpa.gnu.org/packages/corfu-0.13.tar"; + sha256 = "0psvkxr7fjqq7gkqdzl0ma367zjlxgixk563vpv9hmwfwymddyyb"; }; packageRequires = [ emacs ]; meta = { @@ -1086,10 +1086,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.8.5.tar"; - sha256 = "1p2chzj5hnaiqhammvdp82ck5pi6h1rl9r782zaqxrhrqsp3vg09"; + url = "https://elpa.gnu.org/packages/ebdb-0.8.6.tar"; + sha256 = "0amr1s1q5w4513qw31qsr8gpsfgj5b2j7qn017rmwbaf1mj0k6z0"; }; packageRequires = [ emacs seq ]; meta = { @@ -1146,10 +1146,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20211006"; + version = "20211011"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20211006.tar"; - sha256 = "08z9q5y46fqm7r1gwiv0ir2hcybwfrvh0b7pxsrppjs1gvclyazn"; + url = "https://elpa.gnu.org/packages/eev-20211011.tar"; + sha256 = "1a71qam6z5s3zl7fvxpsnabbqxh8a7llm1524nxs2353pb6ksfra"; }; packageRequires = [ emacs ]; meta = { @@ -1325,6 +1325,21 @@ license = lib.licenses.free; }; }) {}; + erc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "erc"; + ename = "erc"; + version = "5.4.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/erc-5.4.1.tar"; + sha256 = "0hghqwqrx11f8qa1zhyhjqp99w01l686azsmd24z9w0l93fz598a"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/erc.html"; + license = lib.licenses.free; + }; + }) {}; ergoemacs-mode = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -2084,16 +2099,16 @@ license = lib.licenses.free; }; }) {}; - kiwix = callPackage ({ elpaBuild, elquery, emacs, fetchurl, lib, request }: + kiwix = callPackage ({ elpaBuild, emacs, fetchurl, lib, request }: elpaBuild { pname = "kiwix"; ename = "kiwix"; - version = "1.1.0"; + version = "1.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/kiwix-1.1.0.tar"; - sha256 = "1clp0q34bs395d0hrqdyvm9ds665hgf5qrdiqa14k31h4lbv2wsn"; + url = "https://elpa.gnu.org/packages/kiwix-1.1.4.tar"; + sha256 = "1ls11a7fc6d4gj85g8m09r95fvc4ppc0k0fs28d1hzybmgl89rgl"; }; - packageRequires = [ elquery emacs request ]; + packageRequires = [ emacs request ]; meta = { homepage = "https://elpa.gnu.org/packages/kiwix.html"; license = lib.licenses.free; @@ -2268,10 +2283,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "0.8"; + version = "0.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-0.8.tar"; - sha256 = "0afry11i7kgfa0q83p63hmahl7jzsqhn4sl1rnkjy98pnikwv9kd"; + url = "https://elpa.gnu.org/packages/marginalia-0.9.tar"; + sha256 = "0jnw9ys7p2rhi7sx2wxi3xs95ryg9vr34xb2jdfiz0p1xv04a300"; }; packageRequires = [ emacs ]; meta = { @@ -2577,14 +2592,29 @@ license = lib.licenses.free; }; }) {}; + nano-agenda = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "nano-agenda"; + ename = "nano-agenda"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/nano-agenda-0.1.tar"; + sha256 = "1bylgd4ly6dybpg66ndgsmgs5w0y5ymfq3s2pbwjnl46fnrmggz0"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/nano-agenda.html"; + license = lib.licenses.free; + }; + }) {}; nano-modeline = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "nano-modeline"; ename = "nano-modeline"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nano-modeline-0.1.tar"; - sha256 = "10hnxgjp56dqydf39mbn9zmwwvnwzi89lwnam5k3x6d6p2cnfgcx"; + url = "https://elpa.gnu.org/packages/nano-modeline-0.2.tar"; + sha256 = "13m8j8jnd33wwv1siv6frzdbs7bhspg859sflq58vimv444zjzac"; }; packageRequires = [ emacs ]; meta = { @@ -2596,10 +2626,10 @@ elpaBuild { pname = "nano-theme"; ename = "nano-theme"; - version = "0.2"; + version = "0.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nano-theme-0.2.tar"; - sha256 = "0kcirnl1fg9kvavw8aq9l16jv4rrxv5w62i7wrsjn7np697sm0s6"; + url = "https://elpa.gnu.org/packages/nano-theme-0.2.1.tar"; + sha256 = "0m98kq40dhbrn55x4bp2x5d5j1gps4y7z4086mgnj8wr1y3w8kdl"; }; packageRequires = [ emacs ]; meta = { @@ -2791,16 +2821,16 @@ license = lib.licenses.free; }; }) {}; - org-real = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib }: + org-real = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib, org }: elpaBuild { pname = "org-real"; ename = "org-real"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-real-1.0.1.tar"; - sha256 = "0rklzp32v30ndyqli3fjcsqvvpiz3klsz26b7zn2bai2ldx6016s"; + url = "https://elpa.gnu.org/packages/org-real-1.0.4.tar"; + sha256 = "0bn9vyx74lki2nggzir02mcrww94dnqpbkryjr7a4i6am0ylf705"; }; - packageRequires = [ boxy emacs ]; + packageRequires = [ boxy emacs org ]; meta = { homepage = "https://elpa.gnu.org/packages/org-real.html"; license = lib.licenses.free; @@ -3020,10 +3050,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/project-0.8.0.tar"; - sha256 = "05q2zr661bn2h6pdvyv3apdajfxnsx0rb0n5np8cg98a7gw4zyxd"; + url = "https://elpa.gnu.org/packages/project-0.8.1.tar"; + sha256 = "1x3zkbjsi04v5ny3yxqrb75vcacrj9kxmpm9mvkp0n07j5g34f68"; }; packageRequires = [ emacs xref ]; meta = { @@ -3095,10 +3125,10 @@ elpaBuild { pname = "python"; ename = "python"; - version = "0.27.1"; + version = "0.28"; src = fetchurl { - url = "https://elpa.gnu.org/packages/python-0.27.1.el"; - sha256 = "0jygl2w8x73v22w0rzq75i2hnm3f46dzgg5x1ckz720nznvwwkka"; + url = "https://elpa.gnu.org/packages/python-0.28.tar"; + sha256 = "1pvhsdjla1rvw223h7irmbzzsrixnpy1rsskiq9xmkpkc688b6pm"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3546,10 +3576,10 @@ elpaBuild { pname = "shelisp"; ename = "shelisp"; - version = "0.9.1"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/shelisp-0.9.1.el"; - sha256 = "15z8rpx8nhx53q77z5fqcpww255di80lb5mm28mnn2myalrr8b59"; + url = "https://elpa.gnu.org/packages/shelisp-1.0.0.tar"; + sha256 = "05r26gy1ajl47ir0yz5gn62xw2f31vdq04n3r8ywlzxbqyvzlc0d"; }; packageRequires = []; meta = { @@ -3561,10 +3591,10 @@ elpaBuild { pname = "shell-command-plus"; ename = "shell-command+"; - version = "2.2.1"; + version = "2.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.2.1.tar"; - sha256 = "1dmi7fn4g55va5ljpyswr3dpgj471747kkdixfyp8zpsbhvr5yf6"; + url = "https://elpa.gnu.org/packages/shell-command+-2.3.1.tar"; + sha256 = "0g8pcrkkh3bxcxxbasnz834gi3pvhlkpf011fvmlhwzswypcyqmy"; }; packageRequires = [ emacs ]; meta = { @@ -4574,10 +4604,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-1.2.2.tar"; - sha256 = "14kdy8blhs6lwg349l9lmv0bbpybgi9nsg2iic3v87j4jyi41ljm"; + url = "https://elpa.gnu.org/packages/xref-1.3.0.tar"; + sha256 = "0bw2cbxmjavzhmpd9gyl41d4c201p535jrfz3b7jb5zw12jdnppl"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 2ee92e251bf08..3f5dd795ccb96 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -198,8 +198,6 @@ railgun = callPackage ./railgun { }; - rec-mode = callPackage ./rec-mode { }; - structured-haskell-mode = self.shm; sv-kalender = callPackage ./sv-kalender { }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index be3c69e1140d3..ac2fdc4b373bb 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -155,14 +155,29 @@ license = lib.licenses.free; }; }) {}; + flymake-kondor = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "flymake-kondor"; + ename = "flymake-kondor"; + version = "0.1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/flymake-kondor-0.1.0.tar"; + sha256 = "0fn9vnrqy5nmv07jv2ry0xs90rkb92qhrh7j5pdikw7zykcwlbdd"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/flymake-kondor.html"; + license = lib.licenses.free; + }; + }) {}; geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.16"; + version = "0.18"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-0.16.tar"; - sha256 = "1mhngb1ik3qsc3w466cs61rbz3nn08ag29m5vfbd6adk60xmhnfk"; + url = "https://elpa.nongnu.org/nongnu/geiser-0.18.tar"; + sha256 = "131j4f82hl4pqj07qsl1f2dz4105v5fyll3bc97ggayzvrdiy58i"; }; packageRequires = [ emacs ]; meta = { @@ -330,10 +345,10 @@ elpaBuild { pname = "git-commit"; ename = "git-commit"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/git-commit-3.2.1.tar"; - sha256 = "1jndc8ppj4r2s62idabygj4q0qbpk4gwifn8jrd6pa61d7dlvp28"; + url = "https://elpa.nongnu.org/nongnu/git-commit-3.3.0.tar"; + sha256 = "0lp6r4w1k0idvfc2h0chlplap2i4x2slva9cw3iw1rhhxbcvlmdx"; }; packageRequires = [ dash emacs transient with-editor ]; meta = { @@ -416,6 +431,21 @@ license = lib.licenses.free; }; }) {}; + haskell-tng-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, popup }: + elpaBuild { + pname = "haskell-tng-mode"; + ename = "haskell-tng-mode"; + version = "0.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/haskell-tng-mode-0.0.1.tar"; + sha256 = "1dndnxb9bdjnixyl09025065wdrk0h8q721rbwvransq308fijwy"; + }; + packageRequires = [ emacs popup ]; + meta = { + homepage = "https://elpa.gnu.org/packages/haskell-tng-mode.html"; + license = lib.licenses.free; + }; + }) {}; highlight-parentheses = callPackage ({ elpaBuild , emacs , fetchurl @@ -560,10 +590,10 @@ elpaBuild { pname = "magit"; ename = "magit"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-3.2.1.tar"; - sha256 = "0yyf16605bp5q8jl2vbljxx04ja0ljvs775dnnawlc3mvn13zd9n"; + url = "https://elpa.nongnu.org/nongnu/magit-3.3.0.tar"; + sha256 = "0ihrds45z12z155c1y7haz1mxc95w6v4rynh0izm159xhz44121z"; }; packageRequires = [ dash @@ -582,10 +612,10 @@ elpaBuild { pname = "magit-section"; ename = "magit-section"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-section-3.2.1.tar"; - sha256 = "1ppinys8rfa38ac8grcx16hlaw33p03pif4ya6bbw280kq8c73rv"; + url = "https://elpa.nongnu.org/nongnu/magit-section-3.3.0.tar"; + sha256 = "08ac10vips6f2gy4x4w2wkz2ki3q0d6dhynkmlpdinsdmgagziny"; }; packageRequires = [ dash emacs ]; meta = { @@ -657,10 +687,10 @@ elpaBuild { pname = "org-contrib"; ename = "org-contrib"; - version = "0.1"; + version = "0.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-contrib-0.1.tar"; - sha256 = "07hzywvgj11wd21dw4lbkvqv32da03407f9qynlzgg1qa7wknm2k"; + url = "https://elpa.nongnu.org/nongnu/org-contrib-0.3.tar"; + sha256 = "0fqhyby7624drskfsasgvzyxbgjb42rd6vw8l6xgb3h22kaprl0q"; }; packageRequires = [ emacs org ]; meta = { @@ -683,6 +713,21 @@ license = lib.licenses.free; }; }) {}; + popup = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "popup"; + ename = "popup"; + version = "0.5.8"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/popup-0.5.8.tar"; + sha256 = "1amwxsymzvzmj8696fa6i0cqx4ac581rvr4dwkri7akkr7amh3yh"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/popup.html"; + license = lib.licenses.free; + }; + }) {}; projectile = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "projectile"; @@ -841,10 +886,10 @@ elpaBuild { pname = "swift-mode"; ename = "swift-mode"; - version = "8.4.0"; + version = "8.4.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/swift-mode-8.4.0.tar"; - sha256 = "1pfp1nvq2gny6kbiq3q0dcms0ysw43zq0aayfwqdj0llkf025dfp"; + url = "https://elpa.nongnu.org/nongnu/swift-mode-8.4.1.tar"; + sha256 = "0f87bjgva0iv818bh2dqvc1svrwh5zm134jpxcmvmzr1yqazx4qp"; }; packageRequires = [ emacs seq ]; meta = { @@ -882,6 +927,21 @@ license = lib.licenses.free; }; }) {}; + vc-fossil = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "vc-fossil"; + ename = "vc-fossil"; + version = "20210928"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/vc-fossil-20210928.tar"; + sha256 = "0n4h1cj1336mv5cswq0139bkry5gnv4hrrwzd4bqhrxp5kbhqa5y"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/vc-fossil.html"; + license = lib.licenses.free; + }; + }) {}; web-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "web-mode"; @@ -916,10 +976,10 @@ elpaBuild { pname = "with-editor"; ename = "with-editor"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/with-editor-3.0.4.tar"; - sha256 = "032i954rzn8sg1qp6vjhz6j8j1fl6mpvhfnmd3va8k9q9m27k4an"; + url = "https://elpa.nongnu.org/nongnu/with-editor-3.0.5.tar"; + sha256 = "0bri6jr99133k9w0d754rw2f6hgjzndczngfw2lf2rvxks448krm"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/rec-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/rec-mode/default.nix deleted file mode 100644 index 8cb560fde534b..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/rec-mode/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib -, trivialBuild -, recutils -}: - -trivialBuild { - pname = "rec-mode"; - - inherit (recutils) version src; - - postUnpack = '' - sourceRoot="$sourceRoot/etc" - ''; - - meta = recutils.meta // { - description = "A major mode for editing rec files"; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 663510d92e6a6..5b2372f634f5d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -1878,25 +1878,25 @@ "repo": "minad/affe", "unstable": { "version": [ - 20211006, - 1629 + 20211011, + 725 ], "deps": [ "consult" ], - "commit": "ccf486a902cd573d79b43ca61a4ba855fd056567", - "sha256": "07zhp5a4bfi7nyjsr84a7yp9rasn9yk08m445iwjcrjxxy230qlg" + "commit": "0ee5e2374339c1a57d36c06818247afeecadc2c5", + "sha256": "0r9ziscf2f4plp740ggd2vh73cgax31xsvzmc1f5w9cy88i9f8nn" }, "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "consult" ], - "commit": "be08c4ec49681474cbebaf0957568f27e42c4b3c", - "sha256": "0lpqpy33bmsh84ib1i278sr8ldn8y9ydqdikch1xi56via4ic2x2" + "commit": "0ee5e2374339c1a57d36c06818247afeecadc2c5", + "sha256": "0r9ziscf2f4plp740ggd2vh73cgax31xsvzmc1f5w9cy88i9f8nn" } }, { @@ -1962,8 +1962,8 @@ "annotation", "eri" ], - "commit": "e913532676fb92272b650f3a053e116eaaffc963", - "sha256": "1mrzdks03d9g2f81v9dvjdq4m22x24bsry46591wd65m8qgzms7v" + "commit": "070d0c841788d3a09e4557d92fd954bb1b6a7e9e", + "sha256": "055cyxcanmj29yphvw7g6k022bj8gs19xrhamxm4xii7bwbd5imv" }, "stable": { "version": [ @@ -2344,20 +2344,20 @@ "deps": [ "flycheck" ], - "commit": "0508d5a0e6e18cd6e489506d98730a9aaa6541a2", - "sha256": "1fn12zdsdn0ssj88ziyqw97ibkzvvql90dxf0x1a02mjqzkqviif" + "commit": "bddc1dc5757bd6ef308f21ed70811281a2ad5298", + "sha256": "1vpsddfjxpvylq70r7ip6c0iaqn10jdkxmwd93r1zzkxg30hzsf3" }, "stable": { "version": [ 1, - 3, - 1 + 4, + 0 ], "deps": [ "flycheck" ], - "commit": "ef9b4d4653c95388b9e0b242bc24fea9922cfcbb", - "sha256": "0w6p5qy3cdlngrn1nv79gbgv97idkpxmw47xfcw8fn615wa5j9q4" + "commit": "bddc1dc5757bd6ef308f21ed70811281a2ad5298", + "sha256": "1vpsddfjxpvylq70r7ip6c0iaqn10jdkxmwd93r1zzkxg30hzsf3" } }, { @@ -2476,14 +2476,14 @@ "repo": "iyefrat/all-the-icons-completion", "unstable": { "version": [ - 20210728, - 2119 + 20211009, + 2207 ], "deps": [ "all-the-icons" ], - "commit": "96500418541b7376cd0b3e4583b9509c0dd92b27", - "sha256": "0sn5jxmhdpnnjn8x99vc9m9d31kw9alkkdr0xc345aa0ssjlkf6f" + "commit": "a0f34d68cc12330ab3992a7521f9caa1de3b8470", + "sha256": "18dd37p1vh8ixc2q07jqwzpc82qq31m89nzps192pdgkfffhdp8r" } }, { @@ -2495,13 +2495,13 @@ "unstable": { "version": [ 20211007, - 1405 + 1729 ], "deps": [ "all-the-icons" ], - "commit": "46ca70416391c1bf3a2b148c4a636dee249aa1b3", - "sha256": "1b2w6bkdc5f02xhgvl37gh7x0d2vjl6kdwnxh87qwscd68mc11qy" + "commit": "5e9b097f9950cc9f86de922b07903a4e5fefc733", + "sha256": "0p09rdq97hshg9gaivsqz9zvi2ba2p1a2ja1i8z6f896xv5jqs98" }, "stable": { "version": [ @@ -3246,8 +3246,8 @@ 20200914, 644 ], - "commit": "e913532676fb92272b650f3a053e116eaaffc963", - "sha256": "1mrzdks03d9g2f81v9dvjdq4m22x24bsry46591wd65m8qgzms7v" + "commit": "070d0c841788d3a09e4557d92fd954bb1b6a7e9e", + "sha256": "055cyxcanmj29yphvw7g6k022bj8gs19xrhamxm4xii7bwbd5imv" }, "stable": { "version": [ @@ -3567,11 +3567,11 @@ "repo": "dieter-wilhelm/apdl-mode", "unstable": { "version": [ - 20211004, - 527 + 20211014, + 612 ], - "commit": "48c66a669523d45de7e066d42933c1c7ca965bf4", - "sha256": "07hf143fzwnxj6a0l9yhy5s48zdsmlbmfjwy73pqbqfpi16739s2" + "commit": "30616b0924d85a99ca381f21d4717cb6eccc9f95", + "sha256": "09jb6xagdiyr0qvigsr4ij9kqgmm3qrq37z1djrh1r95qlq9b6wf" }, "stable": { "version": [ @@ -3599,6 +3599,30 @@ } }, { + "ename": "apheleia", + "commit": "74ef92045e0f64b34cdb1ca686c9159b0623e61f", + "sha256": "0dmjvj7gw8qd8vh9m8ibs5pqgs63f5pv02686k97sawbkav7mg1r", + "fetcher": "github", + "repo": "raxod502/apheleia", + "unstable": { + "version": [ + 20211003, + 1818 + ], + "commit": "8b9d576f2fda10d0c9051fc03c1eb1d9791e32fd", + "sha256": "16j6lcqlsn1qy6nr82aq9hamkr0h6mnc9l5pk5x5v5n1s44sa0a3" + }, + "stable": { + "version": [ + 1, + 1, + 2 + ], + "commit": "53ac964e53e75b9a35a7bd173f23290d0f42d95c", + "sha256": "0f2dqid4h0psdyx3p18c7xn7nf8zr6y4qq98yvyjfbwq5lcjk4rn" + } + }, + { "ename": "apib-mode", "commit": "dc2ebb04f975d8226a76260895399c937d6a1940", "sha256": "0y3n0xmyc4gkypq07v4sp0i6291qaj2m13zkg6mxp61zm669v2fb", @@ -3658,11 +3682,11 @@ "repo": "alexmurray/apparmor-mode", "unstable": { "version": [ - 20201213, - 1118 + 20211014, + 2319 ], - "commit": "8c0c20b6896bba65c7f6cfe0a21e22b21a12c5f9", - "sha256": "1pr2qpvwfmqd0qysbdvaz0r0y7zznifridy0jyd8lwkddyi8jypf" + "commit": "9d1937af52cd8ecfeec27185644ea8cbf0dc1c08", + "sha256": "1kzvqxz0m2lgcm0whb121g1580vi7bvk4fj780d5xqqqlv0091a0" } }, { @@ -5579,8 +5603,8 @@ "avy", "embark" ], - "commit": "98121bacef39abaf6f6849f87a439ba2184c03e2", - "sha256": "1mbp247sdjflnxfiig80zy34zbbs2qfiypg29767pkd0rhfmk83v" + "commit": "010b7356af782a3723fcfbbfc943bc8082c54c27", + "sha256": "0ag3s7qyihh0231y7zmv33yafpb8ly01djxgpvdr0vhsflp0c7v6" }, "stable": { "version": [ @@ -7053,15 +7077,15 @@ "repo": "bdarcus/bibtex-actions", "unstable": { "version": [ - 20211002, - 1322 + 20211014, + 2143 ], "deps": [ "bibtex-completion", "parsebib" ], - "commit": "e84804e6f88747d39b36d9d18765ac0de99e95f5", - "sha256": "0ll6p81ijfrmivy0x4z07zyfgnw43x1l6y2rhlj9g3jrp2jrcwlx" + "commit": "b96728a7ccaa578360f7275bb01080c28bebd216", + "sha256": "17mif19zax6xhx0qbiwimfq1q3m18rka28nv6c9x5g3l6f0hby4i" }, "stable": { "version": [ @@ -8329,11 +8353,11 @@ "repo": "topikettunen/brutal-emacs", "unstable": { "version": [ - 20211007, - 926 + 20211014, + 2212 ], - "commit": "0d7d3133b80a2f37abcc67daf608c418e6372543", - "sha256": "19775jb6dknplafmy0gishi25x5i3rzfi096v6i069kwnn8g0wch" + "commit": "ce00e434baec93bdf846195516f083190edf3662", + "sha256": "0ax0qy597xknrqg8bp4sf7ag4nl7pdlgg1zicfis25xbdanyg9ar" } }, { @@ -8587,30 +8611,30 @@ "repo": "countvajhula/buffer-ring", "unstable": { "version": [ - 20210927, - 1513 + 20211008, + 1508 ], "deps": [ "dynaring", "ht", "s" ], - "commit": "cd54616afa99cbc1feeafdaeb5e5761fc4bfa82d", - "sha256": "1hhyw0kd0cfhm5pyvkv2f7a12ylv18a268qsa08qnm1cq625p6qn" + "commit": "7336ae668c0b26e3a53bcd36577ea84a8090ec21", + "sha256": "1gzgp7w4j8dlig4psqc9g4ns69dd70hj83347al0jqcnrhw0ysy3" }, "stable": { "version": [ 0, 3, - 2 + 3 ], "deps": [ "dynaring", "ht", "s" ], - "commit": "cd54616afa99cbc1feeafdaeb5e5761fc4bfa82d", - "sha256": "1hhyw0kd0cfhm5pyvkv2f7a12ylv18a268qsa08qnm1cq625p6qn" + "commit": "7336ae668c0b26e3a53bcd36577ea84a8090ec21", + "sha256": "1gzgp7w4j8dlig4psqc9g4ns69dd70hj83347al0jqcnrhw0ysy3" } }, { @@ -9775,8 +9799,8 @@ 20210707, 2310 ], - "commit": "d47d5871e2bce25aaab117cea3cdb7a41d9b0822", - "sha256": "1l3c8wpzif1cw94rdrj7ds6dp6av3yk44gxpv2nknq3gvx49n3av" + "commit": "cd6587efb64f58dc0e542f08734c875b93e63968", + "sha256": "094flwbwvvdr8asx5wgr07gbxz4n3fxb8ywbg13f69c9wagk6rkp" }, "stable": { "version": [ @@ -9886,11 +9910,11 @@ "repo": "fritzgrabo/cascading-dir-locals", "unstable": { "version": [ - 20210221, - 1516 + 20211013, + 1955 ], - "commit": "53967a3f4b2ac742ab8fd6b639c87cbb0229d5f8", - "sha256": "0pvvwxi7qbbg9h9hax6ispz69h0wk4c0adc26dyj1a2dpdxz2r5p" + "commit": "345d4b70e837d45ee84014684127e7399932d5e6", + "sha256": "160ay9rf1s4hm9xmmsd7z0mkhqrj9wpm8dpd49hhibcng8hv6z6a" } }, { @@ -10464,8 +10488,8 @@ 20171115, 2108 ], - "commit": "c2ab9b7ca6e0f23cfa359d69aba11f146bffa64d", - "sha256": "1ipyjli65sm09rns4yjmj92mrzs8gwgqspviz05df3rfw731b42c" + "commit": "ffa981bace8ab7dc1166c335b4b906b3bc0c6d32", + "sha256": "0ly2mnxpr27axvr4rxrk9a45jl0frfp190i86azd3sb9fj2klvq7" }, "stable": { "version": [ @@ -10583,16 +10607,16 @@ "repo": "Alexander-Miller/cfrs", "unstable": { "version": [ - 20211006, - 1711 + 20211013, + 1802 ], "deps": [ "dash", "posframe", "s" ], - "commit": "894d889a68a482d369010fe25da16c75f13f7cdb", - "sha256": "1698nnchw0i8xmar0v2lccn418w7snd3l0jarklk0xh33dq2klzr" + "commit": "c1f639d7bfd3e728cf85dbe224b06a4be76158f4", + "sha256": "1bic67769xvjdhinq88jqxnb4dql8gssmnx1wvrl69338zjqqjzg" }, "stable": { "version": [ @@ -11255,8 +11279,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20211003, - 947 + 20211013, + 2024 ], "deps": [ "clojure-mode", @@ -11267,8 +11291,8 @@ "sesman", "spinner" ], - "commit": "2b8bde358063e782771f2f12bdf32374d68a7174", - "sha256": "13x1wdxra3qqrsmxw1dqvc5d54za08yz4q4faprajs82h94vkifd" + "commit": "0a9d0ef429e76ee36c34e116c4633c69cea96c67", + "sha256": "06hzm7dpb7gsdrbxn3v3zjdci6qdm6mcnm7f03bgij3qcjg0isky" }, "stable": { "version": [ @@ -11537,8 +11561,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20211005, - 1943 + 20211014, + 1115 ], "deps": [ "dash", @@ -11549,8 +11573,8 @@ "s", "string-inflection" ], - "commit": "34e66583d95a8d80fb5b9f2960f3382ca0e6d3ab", - "sha256": "0y5apy2r657pzszgsc6vbxfy0l9qgxrwz2r4kj76fah4mf9g251b" + "commit": "c8ff95862823cdff067e8cc9bb7f5ef537e8f1d9", + "sha256": "1dqs5slpd9i8dj6fgryg46zabd6c134qrdq8dkj1i5n0k17ni0h1" }, "stable": { "version": [ @@ -11616,11 +11640,11 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20210929, - 1422 + 20211010, + 1654 ], - "commit": "442a840a96e7103ef1873ffa253f8a83c79b2eec", - "sha256": "1xwb7vp5a576n8cfjixqpgyiiaqq1lv4d21pxda4yn4mvk4cjfa4" + "commit": "047aece5a6d8e1ed267e542c53f5f013293fce21", + "sha256": "09szz5m8gw3j86c3pd449wghrff1zbs1nxypbxxagry59kvsdxkf" }, "stable": { "version": [ @@ -12564,17 +12588,19 @@ 20210104, 1831 ], - "commit": "24fb43e3e757ad963082d9e92362242efb6ad265", - "sha256": "0amg5677g9ik40nsr2p2icny8vh7hw98gmp97ysz7if4yw928zd6" + "commit": "c5ae200d94333600117fc93e50c66bdd50994bbc", + "sha256": "0pay9ly2vzjb69a1aah1h6jkmixhrkps31i3mgk8frxyanlgjkgd" }, "stable": { "version": [ 3, - 21, - 3 + 22, + 0, + -1, + 1 ], - "commit": "7612abd52f192a13848a4d74191633a008892449", - "sha256": "1sg0vishbwhyxvw9p8vaqbfyaqaybv4bdkb32448irgsi382jp7w" + "commit": "167060303b6d9ffb56b2785cec0f7e363f0876c6", + "sha256": "0zaw4zjxsrjfm4rajqlh4wff158crbxyjpajbmh4yckd3gnz1swr" } }, { @@ -12726,11 +12752,11 @@ "repo": "astoff/code-cells.el", "unstable": { "version": [ - 20210925, - 1531 + 20211014, + 738 ], - "commit": "031f726941994d4a98649631eceeebb44b515b1b", - "sha256": "1rdrzrflnvskv41jg92zl5l99m3rzh1a7gwm325bmmi5fvsgsndd" + "commit": "68148cfc1f0723e554a09cbae4c732cfc348ecfd", + "sha256": "07y8ry0rwlxqdw39fi2maw114yyga8yzlbrxypw6irhnpm8mscjw" } }, { @@ -14070,30 +14096,30 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20210924, - 1159 + 20211015, + 1239 ], "deps": [ "company", "ht", "s" ], - "commit": "371d32ae7b488f76905fe98f3063ae30a72010fd", - "sha256": "1r3l2z6lagfj5piibph3n9lsb8fl3w5l8q6qg9z4fqfqrl9xclxi" + "commit": "493fe05fa81ba680fd44c5d05256a2ae788dabbe", + "sha256": "0fysg6fc20z8ymay27g6s1b3jcq0ndfcv5wynwjdfgvv2f5aay6z" }, "stable": { "version": [ 1, 2, - 1 + 2 ], "deps": [ "company", "ht", "s" ], - "commit": "4d6d56a8b92af72aa3b1e0af1a7e7add965bf468", - "sha256": "1yr050zgygjvhwjmm2yd5p889y24vars90cr4pyqc4zhmgzrdkw5" + "commit": "ea577f13d0a47b6efbe2974a5a347a87d27c0c42", + "sha256": "1g6p5868qb2001ippdcnsscsm15d1fwl0iyilq7jk3ys68j30pr3" } }, { @@ -15004,16 +15030,16 @@ "repo": "Alexander-Miller/company-shell", "unstable": { "version": [ - 20170518, - 541 + 20211013, + 1725 ], "deps": [ "cl-lib", "company", "dash" ], - "commit": "52f3bf26b74adc30a275f5f4290a1fc72a6876ff", - "sha256": "0nv8vwmqgdb33cl1wfdbmncbrpfdciid48f6w8vmw39ks53i2z32" + "commit": "a77f4de75912aa87314cde92c603b831d5050246", + "sha256": "1mh93l6xn9frfvw86vbvs1fz544c7ylja118iaccfl42gr2ypsw9" }, "stable": { "version": [ @@ -15745,19 +15771,19 @@ "repo": "minad/consult", "unstable": { "version": [ - 20211007, - 848 + 20211014, + 1752 ], - "commit": "1af9ad3483f2ad2e52d03db3c1ee9bf6074a9669", - "sha256": "0wyz72579la8j5qd1xlwnpnpwr9z03yb8ckl081f4n9s6g4rb4qf" + "commit": "3715f7378bf1ea54af3878d118da1222bbf4bfa0", + "sha256": "1a3zg2nv2i2lgyvzn7l2y6d65s2jcrsmkz7j92gdv9zgmg4dbw7w" }, "stable": { "version": [ 0, - 11 + 12 ], - "commit": "105a1ac50169382368a36ed53d7af908d02ffa07", - "sha256": "01kx3zg858bqyajglamxn319qabycnabzj73kl4x7sd55p2yi179" + "commit": "ebb62563127a4b9442148372f897efb7baef61d2", + "sha256": "1bzlqn7k5akhyl763q29853yh5s8rmk6y1ncmy3am940wfypxjic" } }, { @@ -15775,8 +15801,8 @@ "company", "consult" ], - "commit": "9cd7987ebbcc7411404799639a88f24b690d8e16", - "sha256": "1djfb3dwg9yjx4kz37n1dd7i5pr9ks27c951yfijjhqcfr9m97aw" + "commit": "914c51c7d983e36869dd27bf21c80a8cac96a41f", + "sha256": "1wpq468mqzjq1c9ixks4hqik9yhli2p31x7mfmfqx3lw5rnc74cy" } }, { @@ -15787,15 +15813,15 @@ "repo": "karthink/consult-dir", "unstable": { "version": [ - 20210917, - 435 + 20211007, + 2352 ], "deps": [ "consult", "project" ], - "commit": "d3bb96abb5ccca29f4b04c6f623818386167a2b2", - "sha256": "1pqzc45g5db69nx5vq3qm48i47f3gjrdkq81pnh705vh4q7qgpky" + "commit": "08f543ae6acbfc1ffe579ba1d00a5414012d5c0b", + "sha256": "1cff4ssrn1mw2s5n090pdmwdirnfih8idg5f0ll2bi2djc4hq5kn" } }, { @@ -15813,8 +15839,8 @@ "consult", "eglot" ], - "commit": "28a09cc839a9010df1a00a55528697ab34e1b259", - "sha256": "0vfr9cj2xzkpias7p25bl1yjbykg1lpphmn4a3p3sdmyh32zjy2s" + "commit": "f93c571dc392a8b11d35541bffde30bd9f411d30", + "sha256": "1jqg6sg6iaqxpfn7symiy221mg9sn4y1rn0l1rw9rj9xmcnng7s0" }, "stable": { "version": [ @@ -16009,8 +16035,8 @@ "consult", "yasnippet" ], - "commit": "9700eacab1ae7cabfacf1504db1b695b28a780b8", - "sha256": "1jzac2k9wx5wirz1m89a7fyhk4bi4vjfhlvkp618999dbfcqdx2q" + "commit": "bf6b496e00cecfd6475ebaa374a0c7c407963a8a", + "sha256": "0wgighq6r2vn9nxnisx7ci6xrxcpzhn19vaqs5xp2ig2gsm1andp" } }, { @@ -16103,6 +16129,36 @@ } }, { + "ename": "conventional-changelog", + "commit": "edbcd5c7d573bb4cb83260cd312144e707bfe897", + "sha256": "0bwyla7v8jvdm1xysg25fv0srpsn5wpi4dzqv6gz22z6rz4l3mp5", + "fetcher": "github", + "repo": "liuyinz/emacs-conventional-changelog", + "unstable": { + "version": [ + 20211012, + 1322 + ], + "deps": [ + "transient" + ], + "commit": "ba6285674d12d1eab6624ebf7a3bae7e72d56f99", + "sha256": "13l3h3akismyfgsw1l47df56lx3myr1zjqimhfzcl1jk4qg2579q" + }, + "stable": { + "version": [ + 1, + 2, + 0 + ], + "deps": [ + "transient" + ], + "commit": "ba6285674d12d1eab6624ebf7a3bae7e72d56f99", + "sha256": "13l3h3akismyfgsw1l47df56lx3myr1zjqimhfzcl1jk4qg2579q" + } + }, + { "ename": "copy-as-format", "commit": "42fe8a2113d1c15701abe7a7e0a68e939c3d789b", "sha256": "1yij5mqm0dg6326yms0a2w8gs42kdxq0ih8dhkpdar54r0bk3m8k", @@ -16528,14 +16584,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20210930, - 1140 + 20211010, + 1332 ], "deps": [ "counsel" ], - "commit": "dc7b9f9b381dffd19c79cb7ee53b79034590d309", - "sha256": "1zmx7vfi02c8k9wnbsmka5yx3ci8fv9wl8r0cc28jn40vgrivn8c" + "commit": "98860e5981b07952b5c15361cdb996741e5842c5", + "sha256": "056zqa9rq32vrmqq7i1yi37l5ypjdk2dgcd0yl9wlcl339cdzwsq" }, "stable": { "version": [ @@ -17195,11 +17251,11 @@ "repo": "kijimaD/create-link", "unstable": { "version": [ - 20210601, - 1327 + 20211014, + 1617 ], - "commit": "b2c24f42f2fae63433787150f77b397d69ce0e5b", - "sha256": "1c0smqhc87fzg7db20k92k938p8dkqiig59krwylkqgagsi7hbg4" + "commit": "e765b1067ced891a90ba0478af7fe675cff9b713", + "sha256": "1nr5dsbmhn9bs0v0h6v7d8a0pkgg859cm677nz7br2xaibdz0z47" }, "stable": { "version": [ @@ -18199,8 +18255,8 @@ 20190111, 2150 ], - "commit": "72c18e73679fc3b74d2acd037b4de2cbfff25257", - "sha256": "1ks9sr3r0kx7yi6dbwas6ncd9pn0ncgd9mqhriw5zxyd9c0b92ch" + "commit": "c129b15e8ee249a33ca9a5dc82a3defe509ad5c0", + "sha256": "0lg75np90niwj2ajqvla8s4dsgg8jr8k5bhgqsry6v6kx549rzvs" }, "stable": { "version": [ @@ -18407,8 +18463,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20211005, - 2006 + 20211013, + 1936 ], "deps": [ "bui", @@ -18420,8 +18476,8 @@ "posframe", "s" ], - "commit": "a225e73026f28b67f1837e80497fe3ec641373f4", - "sha256": "1bv19jpgk4h6rk8kzfnf29m4xpa8s2wgljqy4im184jhl4x2qg3c" + "commit": "1cddcedf9ab57a2c14a5ec50b6907b866920f42e", + "sha256": "0g67m40y4giill6sild7d9iaz5dis666wlxpcdl89vyvj2ys8hqd" }, "stable": { "version": [ @@ -21265,26 +21321,26 @@ "repo": "wbolster/emacs-direnv", "unstable": { "version": [ - 20210419, - 1851 + 20211011, + 1804 ], "deps": [ "dash" ], - "commit": "4b94393a9adf677c7c037215e233eef5fbca553d", - "sha256": "14whrhi6hgzadrw9z9k2sh2800483xs1h611avz4x68c8d2jfj5k" + "commit": "bd161f38621d1a9e4d70c9bafab9b7e3520f00b2", + "sha256": "0cf5npgksl9a03mnfdhfdhlf46gr9qz9adjxz3dbckq9b1vl0dfc" }, "stable": { "version": [ 2, - 1, + 2, 0 ], "deps": [ "dash" ], - "commit": "1f93e3f9cae5ec171939fe5c1fe9744a28fa6576", - "sha256": "0xkqn4604k2imas6azy1www56br8ls4iv9a44pxcd8h94j1fp44d" + "commit": "bd161f38621d1a9e4d70c9bafab9b7e3520f00b2", + "sha256": "0cf5npgksl9a03mnfdhfdhlf46gr9qz9adjxz3dbckq9b1vl0dfc" } }, { @@ -22040,8 +22096,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20210930, - 556 + 20211011, + 824 ], "deps": [ "dash", @@ -22051,8 +22107,8 @@ "tablist", "transient" ], - "commit": "e1c0c99047a9835b8751b1d9f544ef0bc16c77a9", - "sha256": "0y54fg1i84k8avb9wnbn77wfl935z6d84xrqd7af13pdwndl2jjm" + "commit": "9d845e1eaed663ccc811c0a9ede3b3c61859e9e4", + "sha256": "01rnsyqrxvyc3kbfa4nmvxqxw261sc9b6jhqsnx14s3qfhy9w51l" }, "stable": { "version": [ @@ -22276,11 +22332,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20210923, - 1515 + 20211014, + 244 ], - "commit": "fe7ec7cf99608412073d2d68885577b9135a94ac", - "sha256": "1kjv2sh9pcmvciay1y6kp5k9lqm3mqm90qqlwh5g844bc5p7dgbh" + "commit": "6e20848a2786e8e9a5fecf27b6f29a7954635ff7", + "sha256": "1wdk4m117x9vidin1n5kr8a33znf08r4j096pnqhwm5axq5s3ciz" } }, { @@ -22413,16 +22469,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20211001, - 1049 + 20211013, + 644 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "257b9cd6deae367d0a167f0b634d39deb846aef6", - "sha256": "07i3rnrqwl99zpmrbhq0mq5p6l4jzkchg515hn6m8n04slfai59d" + "commit": "56876e64d92fa1aa2d569831a126e1a26ce06849", + "sha256": "1vpqa95ibw5srisrypfnmf3rkkspiq7crk72yf3sghpcancl7b50" }, "stable": { "version": [ @@ -22466,14 +22522,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20210916, - 2120 + 20211011, + 1314 ], "deps": [ "cl-lib" ], - "commit": "e716ddbb882a3a06744faa74decb2fea1569c921", - "sha256": "02gp36hbmxcadp4567mnsj29b2ql9favhdcr9sm4pyp9bszm75ns" + "commit": "3e6f5d9ce129ac6fc0f466eb6f5518593625578f", + "sha256": "1ar9nb67hppqhbdl6l6mv1y6zl48mcdl91bmsc49bjpzp9a38y5b" }, "stable": { "version": [ @@ -23129,8 +23185,8 @@ 20210909, 1010 ], - "commit": "64f3f710e7238bab9164e75b3fe2e7d17918e6e3", - "sha256": "1jwrcxjld82xs97vx9s5laamg8l4s5hpz314x3rvcb5q6mrd7h07" + "commit": "87a2d25e56caf65600e9d3f647bcb4999556ecb4", + "sha256": "0g7vwfcbv88kbsxz7qzwj7wdxf88ir22wwlglxryaf5249fzzln5" }, "stable": { "version": [ @@ -23895,14 +23951,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20210930, - 1217 + 20211014, + 1059 ], "deps": [ "parsebib" ], - "commit": "63b0700eefc982276002ae8d618e8a7fa1f68732", - "sha256": "14qiy68q60na9llh81kj3n4bqxn0car1431sdmfv3jjv2h176qv0" + "commit": "b829aac34b90471cb53960ac0c0186603d032946", + "sha256": "0fp2nbr3zrq62mj83qwfh7x358mpkicphh9ha0yq64pd6a4l0ivd" }, "stable": { "version": [ @@ -24604,11 +24660,19 @@ "repo": "suntsov/efar", "unstable": { "version": [ - 20210604, - 503 + 20211014, + 728 + ], + "commit": "1823b9301f552a6944a42f49a0a136a2861ffb88", + "sha256": "0fvdybwda6p09frlij7imqljmnlpa16p03wv45f6w1gsi4akqzy8" + }, + "stable": { + "version": [ + 1, + 23 ], - "commit": "afc19e212a6f1227b5747b42407226b8222f92c5", - "sha256": "04ld4sk52hm6w4bqlsfd5b1633nb7waf0cmm6rpkgidnzlwv4fxm" + "commit": "a9ff16e8994f525086e72d1e6a827e5fe90d1326", + "sha256": "0wv351ajzdy1srsbfmg33az2fdns96zc1jxygxfyzja0y2r9q065" } }, { @@ -24759,8 +24823,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210905, - 1905 + 20211009, + 1931 ], "deps": [ "eldoc", @@ -24769,8 +24833,8 @@ "project", "xref" ], - "commit": "c17bdf6c98d6bf0f1a85f1175556e1038654402f", - "sha256": "10liic4skqd5qr1zw18k0kx50i2m5pa90vc4yypli5c6bpadsyq4" + "commit": "9665359bb6bfb6a96b0c3b307d4abea9fcbff7a5", + "sha256": "154wf1ps7s00vpmdxgj2pw36gcda1w82f5yw0zhl9c7gi05g3xn3" }, "stable": { "version": [ @@ -24920,8 +24984,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20210809, - 2101 + 20211012, + 347 ], "deps": [ "anaphora", @@ -24932,8 +24996,8 @@ "websocket", "with-editor" ], - "commit": "0600c286bd7b0812f4908d7df1be279b6b65923f", - "sha256": "0cwqngw05fg8rs6vz65wzji6h4fv2smp7xlh1xjbw03nrrz41bc2" + "commit": "e354ea77c29e8c20b6b1a9ee00d86e6a9512bc0d", + "sha256": "1ny4gjawwsq7gx1ih7f37p24pyyjv9jbp702v1sl6wfnk6r7ll9c" }, "stable": { "version": [ @@ -25382,11 +25446,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20210524, - 1611 + 20211011, + 158 ], - "commit": "64545671174f9ae307c0bd0aa9f1304d04236421", - "sha256": "10hjqva6xpilnsfsi8z7w3mjmii4hzf53cmccv1w3076ccvcpq62" + "commit": "f4a45e47e58414da0984f9ac1328be207a897ba9", + "sha256": "1s1i665a3bknjchg47jsaxydmmq4fqyb59i18np7w0zhhzzpjxxs" } }, { @@ -25886,26 +25950,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20210925, - 2 + 20211008, + 2330 ], "deps": [ "elfeed" ], - "commit": "52a00267ca5f382d9972f411491f38e96d31c6e4", - "sha256": "1idd7qn8hfcj04rm4v4g65wdmnv3nzh2g129hmx443nf4xbv0irb" + "commit": "973b337d7104a7adb519b7b74a91fc21f8757731", + "sha256": "16a0whgx47irgp3p17xwdwfiaylrv85f26dynh5ba2sy7l0d0irq" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "elfeed" ], - "commit": "52a00267ca5f382d9972f411491f38e96d31c6e4", - "sha256": "1idd7qn8hfcj04rm4v4g65wdmnv3nzh2g129hmx443nf4xbv0irb" + "commit": "d97c813d472b68c977569b14761c242cb33345e1", + "sha256": "1drgv16555cyn7w6g44z23yhi1i0cy1b9h1ri3lz6h814px0wj0z" } }, { @@ -26160,15 +26224,15 @@ "repo": "Wilfred/elisp-refs", "unstable": { "version": [ - 20210615, - 1624 + 20211009, + 1531 ], "deps": [ "dash", "s" ], - "commit": "fdde21e34b1272783d566d8230b5ed2dc4749048", - "sha256": "15g3xp3w8lrshjf812c8v50y396zx7107fcyc59kljhsc257j62y" + "commit": "c06aec4486c034d0d4efae98cb7054749f9cc0ec", + "sha256": "0dhflhgc1px9kj2bhv9m646ab08a6qjcqdd1a6wd5psj047bkj9p" }, "stable": { "version": [ @@ -26236,11 +26300,11 @@ "repo": "elixir-editors/emacs-elixir", "unstable": { "version": [ - 20211005, - 1542 + 20211013, + 1408 ], - "commit": "e44d5bfd68d735c4d93df9d2ae8e78ed9cb52d31", - "sha256": "0f0q6mn7zxwpsnln3k15911kskfp0gf1vyn2mdlzx13ql616a3r1" + "commit": "907ef434a0ce0f94dbd0c77f09bdfcdc779bca73", + "sha256": "0sri7m0n0wafc9dyffi5myvv2vawkfwx6lgmfrj7kikbds0l5s4c" }, "stable": { "version": [ @@ -26629,11 +26693,11 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20211007, - 915 + 20211008, + 1217 ], - "commit": "02fade7fc9a6b642359552694cc7bed95132cf18", - "sha256": "0428hhz57gb0sfxzfa34zm7c4m1njglc27sq9mbdmma8hk9by91p" + "commit": "81e107a26924747c10c671882032d341ca6d77c4", + "sha256": "1psvfqk71bi9p5mq99r2ihpk4h80sb7p8398fg2zb33a3j3g52b7" }, "stable": { "version": [ @@ -27216,8 +27280,8 @@ "deps": [ "emacsql" ], - "commit": "50aa9bdd76b0d18bf80526cff13a69fe306ee29c", - "sha256": "1jzvvsvi8jm2ws3y49nmpmwd3zlvf8j83rl2vwizd1aplwwdnmd6" + "commit": "209fd0c2649db0c7532e543ec12e7ba881a3325c", + "sha256": "0zr56gwn8rcgvaa9halhfxpxnn0x6yqc66z6r7vqzx5jbj7d6q46" }, "stable": { "version": [ @@ -27336,11 +27400,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20211004, - 1250 + 20211013, + 119 ], - "commit": "98121bacef39abaf6f6849f87a439ba2184c03e2", - "sha256": "1mbp247sdjflnxfiig80zy34zbbs2qfiypg29767pkd0rhfmk83v" + "commit": "010b7356af782a3723fcfbbfc943bc8082c54c27", + "sha256": "0ag3s7qyihh0231y7zmv33yafpb8ly01djxgpvdr0vhsflp0c7v6" }, "stable": { "version": [ @@ -27359,15 +27423,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210829, - 1334 + 20211012, + 1921 ], "deps": [ "consult", "embark" ], - "commit": "98121bacef39abaf6f6849f87a439ba2184c03e2", - "sha256": "1mbp247sdjflnxfiig80zy34zbbs2qfiypg29767pkd0rhfmk83v" + "commit": "010b7356af782a3723fcfbbfc943bc8082c54c27", + "sha256": "0ag3s7qyihh0231y7zmv33yafpb8ly01djxgpvdr0vhsflp0c7v6" }, "stable": { "version": [ @@ -27534,16 +27598,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20210911, - 2031 + 20211013, + 1353 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "c42fab572846b1dd76d82c5293ccfb6ee2c45991", - "sha256": "1jb4di2v1fxjd7qw8mjwzqpr3j8jcbli4jx7236b7kmcid9zfds7" + "commit": "f0da8453ae94aec630ad5b3395d6bc882ef0ae57", + "sha256": "098lx63narp2drx0bq6bni20z0mi6nwr80cb4gc358ry7zy4m9rn" }, "stable": { "version": [ @@ -28885,15 +28949,14 @@ "repo": "ergoemacs/ergoemacs-mode", "unstable": { "version": [ - 20210402, - 1642 + 20211012, + 142 ], "deps": [ - "cl-lib", - "undo-tree" + "cl-lib" ], - "commit": "f9d6e3f7d99b877a63fa6f5ab61e6ba05a7075c8", - "sha256": "0xw99i47mmry205aps4mha1ninnnzir652s7jh81fdsys8y5j7w1" + "commit": "3f961db491f572b7f0637e09fd113c43a1061617", + "sha256": "1519y2q6mqvjncd8axdimajb12z7xmzmgxr8c021iq8s2ikf65bs" }, "stable": { "version": [ @@ -28940,8 +29003,8 @@ 20200914, 644 ], - "commit": "e913532676fb92272b650f3a053e116eaaffc963", - "sha256": "1mrzdks03d9g2f81v9dvjdq4m22x24bsry46591wd65m8qgzms7v" + "commit": "d281edeac893db140ab2a0ec9f42a4c1dd2efecb", + "sha256": "089z3mgpgsb7gx6v7ysmvi8nc2fzbhd72av1yh2m4lc1alxw711a" }, "stable": { "version": [ @@ -28964,8 +29027,8 @@ 20210315, 1640 ], - "commit": "818bfab3463cf5f289a4d7be5a77667d673207d8", - "sha256": "0ab8g4p4ak49pzbigcn69657v19wx34v66hl8rqiwd9gmwji0d74" + "commit": "e782c0305e2fcdff0b9ea9c2b365878e602df04a", + "sha256": "1vfy86wsv8mx1w7lawxp7h7lc7iyqn9jsddi8006f8ccqsndbbzc" }, "stable": { "version": [ @@ -29826,11 +29889,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20211006, - 2210 + 20211011, + 2049 ], - "commit": "5691859d4edc4387165e561a2a06527c85e795ec", - "sha256": "1ja7ppw65n20kjfnij71fxf5nnvbdly4hk74wmdhvsr220vkc90n" + "commit": "569dca1f4ff939a93c7be97c34577666d9af8b3a", + "sha256": "086nl0486l28n1zmw9jxqh63d7bqanzlqwh9nm4a4aw1fyjy7pda" }, "stable": { "version": [ @@ -29994,15 +30057,15 @@ "repo": "ShuguangSun/ess-view-data", "unstable": { "version": [ - 20211001, - 1717 + 20211009, + 55 ], "deps": [ "csv-mode", "ess" ], - "commit": "9be3d4566426264acea459f24428e1d0c868c6fe", - "sha256": "1bs2awcmmxzcdhqlyizgrhxgrgh80jl8a6jbkk5zspl838cq4n39" + "commit": "6fd97a89c73815672de7df21d1ecd362a66126b5", + "sha256": "1vbq9xnspbmykbz4axrxskfsb30bzcnfkymiyfy82shb65r53fn4" }, "stable": { "version": [ @@ -30421,15 +30484,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20211006, - 1559 + 20211011, + 2205 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "ebae35360c9be4828b7a9069396bd6a5ef3e9fdf", - "sha256": "0nq7sw7j6nwv44ynhgr6jjkxvlg0cy4ps77y12q9f4g0nx6sj5ga" + "commit": "44f75e93c6db89de882a0eb1d8bcc7c4ebb8e94e", + "sha256": "12r45djpmdhf4ygc9wdxj1jmxwcag300a8skfhkpiqimapnm8k5k" }, "stable": { "version": [ @@ -30573,28 +30636,28 @@ "repo": "wbolster/emacs-evil-colemak-basics", "unstable": { "version": [ - 20210818, - 1228 + 20211011, + 1752 ], "deps": [ "evil", "evil-snipe" ], - "commit": "db01118a76112c61b7617aa44aa8c438d8f1871f", - "sha256": "15ihz0wwc7gzqsmzbrr48zzh3rw3bmbf2ghnhcy13pdq42wridcv" + "commit": "05c023740f3d95805533081894bfd87f06401af5", + "sha256": "1fnzrwr53h18wp4wkb834j39xg8bv7yqcmilb41bc81npfmi2mn1" }, "stable": { "version": [ 2, - 1, - 0 + 2, + 1 ], "deps": [ "evil", "evil-snipe" ], - "commit": "7844079b47f47bb1dc24c885b0ac2e67524fa960", - "sha256": "0phspmd31pcxana2lp6mqywmghhdpj6ydsrl1bjn4b1gcp1fqsy2" + "commit": "05c023740f3d95805533081894bfd87f06401af5", + "sha256": "1fnzrwr53h18wp4wkb834j39xg8bv7yqcmilb41bc81npfmi2mn1" } }, { @@ -30623,15 +30686,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20211003, - 1458 + 20211007, + 1722 ], "deps": [ "annalist", "evil" ], - "commit": "bc5a02ed8572e7d40d04a78f17abc08061dfc37e", - "sha256": "1y5sw51k86sravaspmyg4j0986yldfsyl21cwcr9cvapsp46ba52" + "commit": "6709c1ec4118c8721df43ea6708ae45ebbc01fd3", + "sha256": "1wcjrqvirymwfn0f5sv8axw7ycfjff3h0x5f1cadakbpa96jrc9g" }, "stable": { "version": [ @@ -31324,11 +31387,11 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20210719, - 1305 + 20211014, + 455 ], - "commit": "6bc41317ba4b8710d713a62e1b78047c3cc2d2d5", - "sha256": "14s2zrl2rpnqpfp647naa80qzb2x4c6jflvs1nhxsvn43s0gdfj9" + "commit": "63baf2d1c796edd11bbec5fe1dee711173d4155d", + "sha256": "0kk9l9wvvb40hric4wdzvccp98mbipln7ah9h8grl5ayb9kw6xxg" }, "stable": { "version": [ @@ -31363,14 +31426,14 @@ "repo": "juliapath/evil-numbers", "unstable": { "version": [ - 20210808, - 1424 + 20211011, + 103 ], "deps": [ "evil" ], - "commit": "8ce0066fa4889c9a43db5917d116baa9497837b7", - "sha256": "04dls5fmr4a8b8j3802nm0cf4rngr01bgpsa25rgdq1cdv9x9zb6" + "commit": "08f0c1ee93b8a563770eaefaf21ab9087fca7bdb", + "sha256": "0pcacrfvvk6ra9dgq84fdcsh5ziwk78k8dmr2c442fvr2lzch4yn" }, "stable": { "version": [ @@ -31949,8 +32012,8 @@ "deps": [ "evil" ], - "commit": "ebae35360c9be4828b7a9069396bd6a5ef3e9fdf", - "sha256": "0nq7sw7j6nwv44ynhgr6jjkxvlg0cy4ps77y12q9f4g0nx6sj5ga" + "commit": "44f75e93c6db89de882a0eb1d8bcc7c4ebb8e94e", + "sha256": "12r45djpmdhf4ygc9wdxj1jmxwcag300a8skfhkpiqimapnm8k5k" }, "stable": { "version": [ @@ -32141,15 +32204,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20211001, - 1457 + 20211008, + 1630 ], "deps": [ "evil", "tree-sitter" ], - "commit": "5b8dd1d1803e69dc7e7812841df6bfe772396f43", - "sha256": "0r4q1cn0wv7g8krmp8a3pflq1bfz9hp69wz0pzgvlnag55zmavps" + "commit": "ebde473af5a484959cda97483453d855c7bab89b", + "sha256": "1x30il32l57pmqiqj872z83w1v7g87scsaaspn05i4wd8x7y30qp" } }, { @@ -33260,19 +33323,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20210602, - 1952 + 20211013, + 1554 ], - "commit": "cb8803355e20812d84195b1b7c9b0578c3262e68", - "sha256": "0wx2k9262p712aasn3ha8si250yzhcqz513apna8lp5gri2rxsg8" + "commit": "3c13ae4d694025207ba7eb43f174f90bb49395d4", + "sha256": "1iv9i1j39wj29y86z49yyw1a22wgyafdybjizmji60hi7x4r66az" }, "stable": { "version": [ 2, - 20 + 21 ], - "commit": "45f2faef92ee23738b86f4f8d0a433ad729a5ca8", - "sha256": "0slvrgw508388il24wlx9g0bf32anpk6rbhmb2r99anq2vhn4b4g" + "commit": "3c13ae4d694025207ba7eb43f174f90bb49395d4", + "sha256": "1iv9i1j39wj29y86z49yyw1a22wgyafdybjizmji60hi7x4r66az" } }, { @@ -33391,14 +33454,14 @@ "repo": "condy0919/fanyi.el", "unstable": { "version": [ - 20211006, - 842 + 20211015, + 1502 ], "deps": [ "s" ], - "commit": "4deddb48b5c9798bdb68a341a9cd23056b4fb2c4", - "sha256": "0vsfjk912n24j46ivlkfw8vlqi913qnvy8hixfcf13f68ak8cbav" + "commit": "d6913c8a8dff0711d3e3dc42ba1b63fb0a39ece5", + "sha256": "1pk7mfmfzxi1saaq2g76bgps9w4gcdbj1ck74hkhiv5a166w3fi8" } }, { @@ -33888,15 +33951,15 @@ "repo": "knpatel401/filetree", "unstable": { "version": [ - 20211006, - 2239 + 20211008, + 2353 ], "deps": [ "dash", "helm" ], - "commit": "65ec7d5c10115f3670b7488825922494e749d34a", - "sha256": "0hwimg57lwny3n2jz0m224blbhrjdd3qjfa5xmcvwsnw5lp54i48" + "commit": "1f0bcf009bf124c213d64dd2726061db6af981b5", + "sha256": "1wsqddl48shi2815zmx609g39bpc9kn28hv26vpjljap8qxpxpzw" } }, { @@ -34201,8 +34264,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20210919, - 929 + 20211015, + 937 ], "deps": [ "async", @@ -34213,8 +34276,8 @@ "s", "transient" ], - "commit": "77421f62e6e616ada9d6ee1bb2b7a920aeb51726", - "sha256": "12089lm3h70igfxasvjw8ccm1iag0p3159w2pn661awnv9nplwl0" + "commit": "21a492d3e67e5e3ab59b75107d345142a4c3ac02", + "sha256": "02n3h2zvdf24jxmcpp0cjcfba54cs0isymcd4k4j68zywszwzp36" }, "stable": { "version": [ @@ -36468,8 +36531,8 @@ "flycheck", "keg" ], - "commit": "e4c7d9d8f823fa717df5f0e7039d525758429fc9", - "sha256": "0idr47ssysz3qp2cdrciapljwm7zh76fnj3vgpz9i2wdmgr12m2d" + "commit": "3436d0634080f6bcbcde68dc804e6128f632a4f8", + "sha256": "1afa33hga4c00p086q15cahjmd2hhmnmiqa55qpadx3nvyy2rqhi" } }, { @@ -39407,8 +39470,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20211006, - 2025 + 20211014, + 1707 ], "deps": [ "closql", @@ -39421,14 +39484,14 @@ "transient", "yaml" ], - "commit": "8264234db61b8a7f427b972aaef6235f9f6a13fa", - "sha256": "0fw2v05bxjkya78jms7n3jdzf04plr1piwh9z92an7421m7mjkdj" + "commit": "cdf34e7586a2d4edde7a6da38752741080b68233", + "sha256": "15zm5azgl8gyd91i40a00ih4s2iwg1r8007n2gcfnmi6m4b7s0ak" }, "stable": { "version": [ 0, - 2, - 1 + 3, + 0 ], "deps": [ "closql", @@ -39438,10 +39501,11 @@ "let-alist", "magit", "markdown-mode", - "transient" + "transient", + "yaml" ], - "commit": "e7d0d759440492549db331f3c39c3cc62880118f", - "sha256": "0j28vc0q1h36pk0y2nidnlsc2y7n0vpfrd8civiv1zp8z0jwfyc9" + "commit": "cdf34e7586a2d4edde7a6da38752741080b68233", + "sha256": "15zm5azgl8gyd91i40a00ih4s2iwg1r8007n2gcfnmi6m4b7s0ak" } }, { @@ -39476,15 +39540,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20210929, - 2019 + 20211011, + 1029 ], "deps": [ "inheritenv", "language-id" ], - "commit": "772beb9acc3152cce10767ebba545c7af52b76e4", - "sha256": "1k70lrkbrj7g071nknqili0lga971fdyn52fzgjb8qwgr90j9fmp" + "commit": "88e095ab6f8eee9537ffad23f068ebbdee3cea31", + "sha256": "1z1sar005454b8lnfwmnnncpsdli13g4b1f2hvwl8c5w4z30n4g9" }, "stable": { "version": [ @@ -39621,26 +39685,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20211007, - 846 + 20211015, + 607 ], "deps": [ "seq" ], - "commit": "f672b9af16184597747424543b87cbc6910e8ab8", - "sha256": "0xx67c8vbnqzdcyfsqv725xxj493hd9b3p3bqzl6an7v75v6bpi1" + "commit": "f370f8f2e57805b94ab61ea6997ad31e13f81f5c", + "sha256": "0ghxg54n09syxfnngiiil3hf1m566ajxkwi051i0m3pwfqcg6nwa" }, "stable": { "version": [ 3, 5, - 1 + 3 ], "deps": [ "seq" ], - "commit": "7de7159a58e0594c0120d66af78f65264f61ea5f", - "sha256": "0y7dd6qq4b95scj7fay4zzhkf0g0x89npylc4v1hz59b1yyylfqy" + "commit": "16bc2a6a817b53ed3306a3ff3cebd271e7bf8746", + "sha256": "13k84dzjar67fa1ixicl6h8gxzblszd0ik8vi11bvipysgp3j3ws" } }, { @@ -39702,15 +39766,14 @@ "repo": "alphapapa/frame-purpose.el", "unstable": { "version": [ - 20201219, - 1340 + 20211011, + 1518 ], "deps": [ - "dash", - "dash-functional" + "dash" ], - "commit": "b4a259fa077671e2dcf33d11b42955c91e395b8b", - "sha256": "033vbvv4rrjbsfw0bbhhzx2754r96vy9h4n1y8jmxrqzs9wi5mmq" + "commit": "7d498147445cc0afb87b922a8225d2e163e5ed5a", + "sha256": "03qalcx8hbf6r0jmh7hf1r4san13fbgaaabcs4c50cam7kdv525r" }, "stable": { "version": [ @@ -41172,6 +41235,25 @@ } }, { + "ename": "gemini-write", + "commit": "e97c45cafc44a4b2f08e577325e375c6312f6557", + "sha256": "039rdjsyx9lw7lh21ps84agm1rpinbylzlks6iv1h5pn341s67nd", + "fetcher": "git", + "url": "https://alexschroeder.ch/cgit/gemini-write", + "unstable": { + "version": [ + 20211009, + 2110 + ], + "deps": [ + "elpher", + "gemini-mode" + ], + "commit": "7e1fe7d4f2c65c0854eb571edc78e5a45d7078de", + "sha256": "0p1ch44w7sn73p87a7k47drgdj4sam961arfr4k0ii4fny54cyip" + } + }, + { "ename": "general", "commit": "d86383b443622d78f6d8ff7b8ac74c8d72879d26", "sha256": "104ywsfylfymly64p1i3hsy9pnpz3dkpmcq1ygafnld8zjd08gpc", @@ -41179,14 +41261,14 @@ "repo": "noctuid/general.el", "unstable": { "version": [ - 20210918, - 1525 + 20211008, + 1651 ], "deps": [ "cl-lib" ], - "commit": "a78da8f74fddb84412b98b9a8c881af4dce7ab24", - "sha256": "11rx5i0fmigjydpm2w4gwgrsf74a4xa856i17i6056mw1sjsjwaq" + "commit": "26f1d4c4e258c40e6b70ce831a04800c914f29b3", + "sha256": "16rjsmmhjjx4mch1aygrxqj3pr5c4xxqzf21qvr6s4c9yk6ayx1f" } }, { @@ -41412,11 +41494,11 @@ "repo": "leoliu/ggtags", "unstable": { "version": [ - 20190320, - 2208 + 20211008, + 528 ], - "commit": "1c43705753e639b34b58c9bf961a80b6610a7109", - "sha256": "15hv3d4wc32nidi0pl73i2v673s2lipzsy8llqy6asls2y268qgz" + "commit": "1442ab8c7f02d246f14150207534fba4a42201ba", + "sha256": "0bibr36b9cxxx5qgi27srfj21mv272npy5w1krrgmn0521qd07w1" }, "stable": { "version": [ @@ -41947,22 +42029,22 @@ }, { "ename": "git-commit", - "commit": "2571aed58ce9c4df998588cbcffdde704f4dce54", - "sha256": "171spbjdgnphv1d108y2ivf09yaqfpg61sjc7gs62cwld4krk4l6", + "commit": "cca2c57104e14cb0c47e27d7fe4b437b38009a5c", + "sha256": "0j4z9pmkbn366gqc9521dix5g5capqw4r6prjfxc6g0vlnzan30g", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20211006, - 1626 + 20211010, + 1635 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "d122f15edd5147d4c890161819b9589b9ed9ad99", - "sha256": "1ivr49iidc7qv5p7hg9whw83wnhpxdsj3mc5iqhpv63m2iw6wsy7" + "commit": "348d9b98614c824be3e2f05eef5ab91d67f6695e", + "sha256": "0rrrm202lxmdxld2nlp7ap89h2m1qkl1rpks8hzq2b9bzbniln95" }, "stable": { "version": [ @@ -42059,8 +42141,8 @@ 20211002, 2345 ], - "commit": "c7fd6010ae223a1acde42260302b0be1ec11bdc3", - "sha256": "1r3pssix4g23adxxq5jf2v51dnk65xj4xr0zs31jnm5xj9z0qx1v" + "commit": "c1e51865eb26739052035177846f53476c8605da", + "sha256": "00rldkgmrjzr8nc3mngfh4vjscsdswqfqzrdwxmwmc0m3kx2yppz" }, "stable": { "version": [ @@ -42696,8 +42778,8 @@ "repo": "charignon/github-review", "unstable": { "version": [ - 20211003, - 1704 + 20211011, + 1933 ], "deps": [ "a", @@ -42706,8 +42788,8 @@ "ghub", "s" ], - "commit": "4d91dd6c56be1ae2b93b6b9e50c73f657cc461b6", - "sha256": "1j3qd7i1pjirzjfar29m6iyngj75jn13b08ba56mapp37jkzgavk" + "commit": "2a24e75dfc2d9f37789ff60b4c10deb7c96f3f88", + "sha256": "1mahd3kg5rr6jf1x3ixjvhgkv9c8fq8mxvikrmpjciari05sd58y" } }, { @@ -43370,11 +43452,11 @@ "repo": "lokedhs/gnu-apl-mode", "unstable": { "version": [ - 20210907, - 223 + 20211012, + 1139 ], - "commit": "f66273ba34a6f1d2bbb39bec9a6b4e38dc8d48f1", - "sha256": "1540z31hkz4mg9kkxkl7ii1pz1hy446j23r42la1qbchif6q0zpz" + "commit": "5d998206a963f2205dc6c4eddb41fb34187cb527", + "sha256": "1yzyq8k770j78f2gkkr1n1d5jpdfmj9l3w40pjd7fmn94xg3qw9a" } }, { @@ -43742,26 +43824,26 @@ "repo": "benma/go-dlv.el", "unstable": { "version": [ - 20200713, - 1202 + 20211015, + 816 ], "deps": [ "go-mode" ], - "commit": "69b86c1bdb73d78fb3404f2f1eefbc9a93b1aba6", - "sha256": "1ww91sw15qnwrglz9q37vxm5qxxa43ccpyczz7kkjp66qs6746wh" + "commit": "8811c0aa79fcbc0d495ed8c68f49a3c42d1a0d4b", + "sha256": "1h4p0i13fxsr4rgxh4grn5p24sbwb9c6mszwdajnlf8yjz65prf9" }, "stable": { "version": [ 0, - 4, + 5, 0 ], "deps": [ "go-mode" ], - "commit": "69b86c1bdb73d78fb3404f2f1eefbc9a93b1aba6", - "sha256": "1ww91sw15qnwrglz9q37vxm5qxxa43ccpyczz7kkjp66qs6746wh" + "commit": "8811c0aa79fcbc0d495ed8c68f49a3c42d1a0d4b", + "sha256": "1h4p0i13fxsr4rgxh4grn5p24sbwb9c6mszwdajnlf8yjz65prf9" } }, { @@ -44239,19 +44321,19 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20211007, - 1403 + 20211014, + 1322 ], - "commit": "ae83654b4cdd752047674232290e7ca5c566748f", - "sha256": "07bjzs0w8b0spcksa2v5h20cnb8dvya1840xnagrpvcb1qfa49sk" + "commit": "ce730f126a63eae77bc9585f75fe1dce968d9a2f", + "sha256": "1r4x1v5j67k7idsy6vidc367kn2iznwdmlhx6h6lpnqv0l36n6py" }, "stable": { "version": [ 0, - 1 + 2 ], - "commit": "27d9218aa10dc361aa89f666f91aea7fdfb43d1f", - "sha256": "0jgicsv8102pk340fn122w0hbhvac2nqcpr16lj7ccjg44qmnrdw" + "commit": "b3174e09a03954b1423c4ea2f2936f9fcd94f381", + "sha256": "054l7m9slhznpfkixrnk6n5h8rc9x7gjsahizxvkd73q0jvgqxgn" } }, { @@ -44864,14 +44946,14 @@ "magit-popup", "s" ], - "commit": "d6bd701aca21e3481213fc3769c5b220a2215826", - "sha256": "0irmk67zh0w890vy0cljqb6mcykimkjdjw410nlhl8hmvzykx5yn" + "commit": "086bb561d0544da01690d1028e6fd23c7c943573", + "sha256": "1ad9q4rv7c13ls1c9z5vdshcj8y6723phlkpzgq0aicw9fxvi36m" }, "stable": { "version": [ 0, - 26, - 1 + 27, + 0 ], "deps": [ "dash", @@ -44879,8 +44961,8 @@ "magit-popup", "s" ], - "commit": "ec5a4a7c63275875655d0fb57962ccefd68d39e5", - "sha256": "0zmam6s2vpdl88qd3h863gzy25m0g6bkmzrgib00807sj2i42704" + "commit": "086bb561d0544da01690d1028e6fd23c7c943573", + "sha256": "1ad9q4rv7c13ls1c9z5vdshcj8y6723phlkpzgq0aicw9fxvi36m" } }, { @@ -45646,11 +45728,11 @@ "repo": "ROCKTAKEY/grugru", "unstable": { "version": [ - 20210617, - 1028 + 20211008, + 1720 ], - "commit": "7efb041b826f15b10aa9cfb67b971fdc41064980", - "sha256": "175gfhi1621pclwvhbz2a8rramfb47v353x5hxjys1b0p848yk1l" + "commit": "856d66a65a75fd9906c47a930a8ee584bdef4077", + "sha256": "1w4qcvmkwqz0kmzrqidrlr6mga8fi6khwdq2w5nzr31g915n2cv0" }, "stable": { "version": [ @@ -46011,11 +46093,11 @@ "repo": "Overdr0ne/gumshoe", "unstable": { "version": [ - 20210923, - 2359 + 20211015, + 1752 ], - "commit": "b5c7121a4a6e67c7e90bb6d8363936e50876093f", - "sha256": "0iccr1sjkbaw4lb3dja9bgyix6gwknvbmkk7xdn3misphl0fvnk1" + "commit": "e530afd2e42bc560b3236cebeabdeaef0e33faca", + "sha256": "10x8k19sf4jgbwxl0akzm3s47z8h78r83yb7512l62s2an3wi2g7" } }, { @@ -46962,16 +47044,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20211007, - 1355 + 20211013, + 727 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "d8e433cac4ec2c594740f6d040e5fbfdec7a0bb5", - "sha256": "1hs3psdb69vc16jg49mnfy89gvhhc21ci9q3v8kjk0f26gvh5k6j" + "commit": "a86bcc99dcd45cd898a497715b4333d118a3c6f2", + "sha256": "0bf3cx7w11h7dwjys3gb62p8mfl586qnf86jlsrzhvsg0dm56b5f" }, "stable": { "version": [ @@ -47870,14 +47952,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20211004, - 1655 + 20211013, + 445 ], "deps": [ "async" ], - "commit": "d8e433cac4ec2c594740f6d040e5fbfdec7a0bb5", - "sha256": "1hs3psdb69vc16jg49mnfy89gvhhc21ci9q3v8kjk0f26gvh5k6j" + "commit": "a86bcc99dcd45cd898a497715b4333d118a3c6f2", + "sha256": "0bf3cx7w11h7dwjys3gb62p8mfl586qnf86jlsrzhvsg0dm56b5f" }, "stable": { "version": [ @@ -49500,26 +49582,26 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20211004, - 857 + 20211013, + 430 ], "deps": [ "helm" ], - "commit": "11d9f8ca48f2ae638250b61ad8d7ef3741b07fbb", - "sha256": "1y0wqr8ic78n5a3fl205r9ss34lqm5mggncwxl240fckyzf2ibgq" + "commit": "ae2202fbbbe11873ad4b393a6959da50ac250c1e", + "sha256": "01j41pidn8aipz1c0x17p88rzr15bg7ij5fr1q2kf8qhky07xfvx" }, "stable": { "version": [ 1, 9, - 2 + 3 ], "deps": [ "helm" ], - "commit": "563f664df4076ec214035c8c1f8cee47841565de", - "sha256": "07jgkc8csnc2hcg4csy07zy3wjbm4fbk4lqiy82rdlxp1vad25vi" + "commit": "312392b786a7ea322914b60760e2693b53772ad6", + "sha256": "1bqk0z6zd3aza7ibb8h0ghya5kid4m6z01gs7jf4sr6p49rzp7hd" } }, { @@ -50004,8 +50086,8 @@ "repo": "alphapapa/org-recent-headings", "unstable": { "version": [ - 20201213, - 837 + 20211011, + 1519 ], "deps": [ "dash", @@ -50014,8 +50096,8 @@ "org-recent-headings", "s" ], - "commit": "5da516a1586675992c0122ed32978c18dda06318", - "sha256": "1xnhahgs1q6y7w0rrc33qbkdagjm6q71a4i0msi4gsfnnzwn4vam" + "commit": "97418d581ea030f0718794e50b005e9bae44582e", + "sha256": "1y11rlnhi36lzhc1cagninv6hlcwbvj88xfr0g0xzpbzy7hys021" } }, { @@ -51555,14 +51637,25 @@ "repo": "brotzeit/helm-xref", "unstable": { "version": [ - 20201004, - 1817 + 20211013, + 1538 + ], + "deps": [ + "helm" + ], + "commit": "9764eabd50c40b009073c7ef64e3a71d0d066d0b", + "sha256": "0v0wm1x11r1h9p139c5rl0r4s5q6092bmwrsnr2140ddbq34mnvy" + }, + "stable": { + "version": [ + 1, + 0 ], "deps": [ "helm" ], - "commit": "23f1174cfca7667d95828dcd388c655a4a9c877d", - "sha256": "0v0lkabpi1n4hgnp28jk19f7b78yk93ssm0gr0fr25yqx5zskdnk" + "commit": "9764eabd50c40b009073c7ef64e3a71d0d066d0b", + "sha256": "0v0wm1x11r1h9p139c5rl0r4s5q6092bmwrsnr2140ddbq34mnvy" } }, { @@ -54240,11 +54333,11 @@ "repo": "ideasman42/emacs-idle-highlight-mode", "unstable": { "version": [ - 20211007, - 308 + 20211011, + 557 ], - "commit": "ca48999554e720d20be46f194f69919fb2894a82", - "sha256": "10n6fnxnsg6xmgj07h172g9sqwqwldp6cw31zrylgirz5nk3vn4r" + "commit": "0916be7075e792773440c3bdb5cf9c153691846b", + "sha256": "0817y99zm1x01nya6lnhby96da2w9kivw4p59bbaxm7hi0ycrsfz" }, "stable": { "version": [ @@ -57628,14 +57721,14 @@ "repo": "alexmurray/ivy-xref", "unstable": { "version": [ - 20211006, - 1043 + 20211008, + 1103 ], "deps": [ "ivy" ], - "commit": "45df80767104dd8f4fe957156c82f1d8b77d64d5", - "sha256": "1c0k1in2hpfwfd7m5r8623d58kxsrfl6pwpgdrkk3077vdgbwiip" + "commit": "a82e8e117d2dd62c28b6a3e3d6e4cfb11c0bda38", + "sha256": "0h4cnhfqgrzm63kfrlz2mhgsk20jkcq18gjx9pvbbhhg59xvvnaj" } }, { @@ -59094,28 +59187,26 @@ "repo": "joshwnj/json-mode", "unstable": { "version": [ - 20190123, - 422 + 20211011, + 630 ], "deps": [ - "json-reformat", "json-snatcher" ], - "commit": "0e819e519ae17a2686e0881c4ca51fa873fa9b83", - "sha256": "0m4i6b5qmakdc0h8npsyajdp06jq03cb1c5rkj6x0khnjw9fv2fl" + "commit": "eedb4560034f795a7950fa07016bd4347c368873", + "sha256": "0r0k56q58kb133l9x9nbisz9p2kbphfgw1l4g2xp0pjqsc9wvq8z" }, "stable": { "version": [ 1, - 7, + 8, 0 ], "deps": [ - "json-reformat", "json-snatcher" ], - "commit": "9ba01b868a6b138feeff82b9eb0abd331d29325f", - "sha256": "0i79lqzdg59vkqwjd3q092xxn9vhxspb1vn4pkis0vfvn46g01jy" + "commit": "eedb4560034f795a7950fa07016bd4347c368873", + "sha256": "0r0k56q58kb133l9x9nbisz9p2kbphfgw1l4g2xp0pjqsc9wvq8z" } }, { @@ -60060,15 +60151,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20211007, - 1037 + 20211014, + 318 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "7fc3bb521cdb691067838acf756ce4579b727d9b", - "sha256": "0vgahjgdvggg2scif18msw8ddsbkdxw988j2ki5ipclil9qfz8h4" + "commit": "fd6f154ac96309ff56220c595f80e9126ec566c6", + "sha256": "1a8fy48xg4bbz3qf9dxvxh8xhvig5w8wkdvy9prn5fd456bn58hj" }, "stable": { "version": [ @@ -60210,14 +60301,14 @@ "repo": "conao3/keg.el", "unstable": { "version": [ - 20210226, - 2246 + 20211008, + 1702 ], "deps": [ "cl-lib" ], - "commit": "e4c7d9d8f823fa717df5f0e7039d525758429fc9", - "sha256": "0idr47ssysz3qp2cdrciapljwm7zh76fnj3vgpz9i2wdmgr12m2d" + "commit": "3436d0634080f6bcbcde68dc804e6128f632a4f8", + "sha256": "1afa33hga4c00p086q15cahjmd2hhmnmiqa55qpadx3nvyy2rqhi" } }, { @@ -60231,8 +60322,8 @@ 20200601, 333 ], - "commit": "e4c7d9d8f823fa717df5f0e7039d525758429fc9", - "sha256": "0idr47ssysz3qp2cdrciapljwm7zh76fnj3vgpz9i2wdmgr12m2d" + "commit": "3436d0634080f6bcbcde68dc804e6128f632a4f8", + "sha256": "1afa33hga4c00p086q15cahjmd2hhmnmiqa55qpadx3nvyy2rqhi" } }, { @@ -60360,8 +60451,8 @@ 20200226, 2129 ], - "commit": "1ee67f3f8977d95785e021f7896685de1979137e", - "sha256": "0cv0naq2g8z52vgf1p4mb55ww30bp2kpj1jp5cjnql1hxsvbx0mm" + "commit": "6d31fcf78a1ab1841f735dfb5cbd2bf6b2ed25db", + "sha256": "19cszpr5m6j5xj18wl4myn7ifw27rrwbmhd0wcsds28b4czw2mhm" } }, { @@ -60893,8 +60984,8 @@ 20210318, 2106 ], - "commit": "9a1794e8c3e020252f7e41bc2d6ed78c461a69b0", - "sha256": "0yqgq71kfi68iy1f90yxlg0iar3z88ngs166s5rwp3m2yal9fdan" + "commit": "6430e1356248313f5cdd3a96c8861b17b12c0be7", + "sha256": "01rzf8v9psihzpg0s5ar2svkxccmb32ypwsms3863c67ag9d9818" }, "stable": { "version": [ @@ -60914,26 +61005,26 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20210909, - 30 + 20211013, + 1558 ], "deps": [ "request" ], - "commit": "6191d43e184e29de868a82331495ced9c9cc9be0", - "sha256": "1a8rcrln36brdik5rki7dkrm1syl8my7sjsv960fw45pfr1pkb5s" + "commit": "cb843349c10b1a492ceb59da20bfcef3ef02f4b5", + "sha256": "08dkxjrpdy3i6j0zgfa7bqdk8cykjfzybrfwrrf9848fxy96n4pb" }, "stable": { "version": [ 1, 1, - 3 + 4 ], "deps": [ "request" ], - "commit": "7d6039fa5d5d7561f42c4c2a93c698468ed34e70", - "sha256": "0g99qkch22ws3d8qwp91v0mysjh295bag1ak3bdl8q7rl015p9ik" + "commit": "6191d43e184e29de868a82331495ced9c9cc9be0", + "sha256": "1a8rcrln36brdik5rki7dkrm1syl8my7sjsv960fw45pfr1pkb5s" } }, { @@ -61269,8 +61360,8 @@ "transient", "with-editor" ], - "commit": "7a5ec79c51698123098af58dea2d10bf15c5a82f", - "sha256": "1imjar42hxyh6pl7dlszh7b6a6yfz3nrxb17l99ng8qw4db19i1d" + "commit": "7cb6e4f2d571d45c49dba2427f7e65a9e0a994f2", + "sha256": "1h9daqmskb9cv0s1w3rbv4p5sg5pmym0pkwz922hy72kvm593fyg" }, "stable": { "version": [ @@ -61304,8 +61395,8 @@ "evil", "kubernetes" ], - "commit": "7a5ec79c51698123098af58dea2d10bf15c5a82f", - "sha256": "1imjar42hxyh6pl7dlszh7b6a6yfz3nrxb17l99ng8qw4db19i1d" + "commit": "7cb6e4f2d571d45c49dba2427f7e65a9e0a994f2", + "sha256": "1h9daqmskb9cv0s1w3rbv4p5sg5pmym0pkwz922hy72kvm593fyg" }, "stable": { "version": [ @@ -61530,8 +61621,8 @@ 20211005, 1517 ], - "commit": "6609581a58ae9c0124de785b056f4f5bbcec3b61", - "sha256": "12bav2dd0q6b47sxnqfv6ibrhzd6i74wwqz7zvm7lp9s4mpqscsa" + "commit": "3ef4c22982119674861ed61e3302ac3e0f05be2b", + "sha256": "0m05qyy0w5k9ycb2ywv222cy99brw2d1gmcan6b4311r04fv9k70" }, "stable": { "version": [ @@ -61580,16 +61671,16 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20210520, - 1737 + 20211008, + 1231 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "2aeeb4cf1dcdc47ada963634731dde0b7a9e4948", - "sha256": "189mmxxdwyc8w94rqpg7f4hd0fhk973mrszvlw92xpca1i9825cq" + "commit": "933a1b37b86685bb1f2df2a2185741b0d21aaa78", + "sha256": "0mxsqf78y4chm4yyxbfz69p56m3n35c5sv4agdwg6griaf0s5f59" } }, { @@ -62314,8 +62405,8 @@ 20211003, 1412 ], - "commit": "a3cf051632d48d95eb0d3bafb6f79d61170c0755", - "sha256": "14j9c3i1vv5wq240j2q7b818cg1xm425nnhncrawizajj4wk2ri3" + "commit": "ac6ef9cbd39f7d9ac0019e28da09aad5bc2cfae5", + "sha256": "1gsv9yir8l53qfz280ji7307vawrifxx80g7bb5kyq7s0k5zfsan" } }, { @@ -62947,20 +63038,20 @@ "repo": "ligolang/ligo", "unstable": { "version": [ - 20210303, - 1751 + 20211011, + 954 ], - "commit": "2eeb1dabf6b3105561233250063abf1d066a0df3", - "sha256": "13rb8wf8lihqwnpzbzxx5wzxv0qayix0qgjg2540mfsgzgsy7rd3" + "commit": "972179180b6a09791737b1af75a6f653a7146047", + "sha256": "180z2clv90zwg9dkzbzs2wmiydz5z4hwmry93qp9ywn9qg1iaqfk" }, "stable": { "version": [ 0, - 26, + 27, 0 ], - "commit": "d48098c6724bc0a62170c2f9ff73c792c71c8452", - "sha256": "15vvpa4jqqxv8vffq86dh44qn0lij7hv6mbgizwz9bssbq1cdgsb" + "commit": "d5d3a30e724a4ba2d5a96b51180e1fd907e57d32", + "sha256": "180z2clv90zwg9dkzbzs2wmiydz5z4hwmry93qp9ywn9qg1iaqfk" } }, { @@ -62971,15 +63062,16 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20210715, - 839 + 20211015, + 511 ], "deps": [ "fringe-helper", + "ht", "indicators" ], - "commit": "97494f705c0208ccc8dd51d8c0366cb2bd5f228e", - "sha256": "023kx8v7phaw3why3zkh1q7n6igqb0zgf37zkli6gi8y4spzlbns" + "commit": "c78bbb33c1f120da517ccd11f0681321bca17647", + "sha256": "114afr2b41yk60s4r1068nambkhj19k6pn6dn2v94i4gbq8p37bb" }, "stable": { "version": [ @@ -63111,14 +63203,14 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20210926, - 1333 + 20211008, + 1652 ], "deps": [ "avy" ], - "commit": "4326da5617e5d04715538536b93c44a085f5dad1", - "sha256": "024cyywz38bpb9szqjnnc0pjrl7cxi7k59bbgpa740r7713qybs4" + "commit": "83cd0489b16f013647d0507ef20905a0a91db433", + "sha256": "0kwaia6i0asr7yqcw1anzq6lf93357cc1fphkvp0llbmxizmkzb3" } }, { @@ -63213,6 +63305,30 @@ } }, { + "ename": "liquidmetal", + "commit": "9aa2004e04ef2f1fbfdd722b271c7cdcbdc8ad10", + "sha256": "0f7xp490nd4ff43pi5g911hsbcvlxzj5wx26b6lflhhnljkh5fsv", + "fetcher": "github", + "repo": "jcs-elpa/liquidmetal", + "unstable": { + "version": [ + 20211004, + 1429 + ], + "commit": "e42baf790629cc3a7310194c4f00d9dafa34f933", + "sha256": "1p3bgfcp1pqilmc4jxs3y182mcddrqd7m0l9b2k2wbdcar1fphpf" + }, + "stable": { + "version": [ + 1, + 3, + 0 + ], + "commit": "32ddd9b52875a6fa403104ed271e15d86d215463", + "sha256": "1czyiy26wxkxc2lbrrblz8hzpf8p71fyp4hh63vsdf2fyimyl1cw" + } + }, + { "ename": "liso-theme", "commit": "27b849f3a41a5ae3d497cef02a95c92fd479b93b", "sha256": "014a71dnhnr0dr36sl2h8ffp6il9nasij31ahqz0bjgn4r16s5gy", @@ -63315,8 +63431,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20210914, - 1209 + 20211014, + 1136 ], "deps": [ "ace-window", @@ -63325,8 +63441,8 @@ "iedit", "zoutline" ], - "commit": "9568ee1aa5ac12e0ed03b9904b77c7a5bc4bb2e2", - "sha256": "1ysprqpha2nxf3zak0lssls66asfl95qn58q90k57p1hpf0qbs06" + "commit": "8ddcf0c8f69e2a669f197c50a701dc6aea74d7c5", + "sha256": "1z9z8225bb5ih9bf2d0nzwl6258wk327dky91z247jddv5mzj4m5" }, "stable": { "version": [ @@ -63763,8 +63879,8 @@ 20210701, 1955 ], - "commit": "aa92fa4aa2e41acb45bc697187036407f953ab03", - "sha256": "0x2s1xvdgmw7w6dr1kfvybqfwq6i1mvn2ijwbzi2sil8l5hb73a6" + "commit": "a1a02199a73e0d4edf50f977203eb40a1797e366", + "sha256": "0k2ya743k6ghkxnx0pyb3brsrbx8a31il62bj01ax4p17gq1w902" }, "stable": { "version": [ @@ -64514,8 +64630,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210929, - 1620 + 20211009, + 2036 ], "deps": [ "dap-mode", @@ -64525,14 +64641,14 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "38906bb3e69c16b3e8d328fd6ae764f1d4369b9f", - "sha256": "03ppi015i1fkq30vx401x4fny3jz6msqzy5lg5jyqrym3s6gfml7" + "commit": "e2f4ee0d3a88956afdd8515a055678b06f947bf0", + "sha256": "0ma0q36q7i0bxbxx525h8s0y0p63pc1hnc5bidbdykrp3hlxw50c" }, "stable": { "version": [ 1, 20, - 0 + 1 ], "deps": [ "dap-mode", @@ -64542,8 +64658,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "1a839dcdedac47c90b4f82f456fea0a7cacf2940", - "sha256": "0m1bccpamxvasimdg6pq28lnbwy2v2xnzjradbl93x7c2drsvnik" + "commit": "e2f4ee0d3a88956afdd8515a055678b06f947bf0", + "sha256": "0ma0q36q7i0bxbxx525h8s0y0p63pc1hnc5bidbdykrp3hlxw50c" } }, { @@ -64946,8 +65062,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20211006, - 1954 + 20211013, + 1655 ], "deps": [ "dash", @@ -64957,8 +65073,8 @@ "markdown-mode", "spinner" ], - "commit": "237363939b2630a807261f31614ac98fad29b785", - "sha256": "1x436jki9wqxjzp2j1p0kx8waw71glxbfh8zlcw31nyiwk7znb4i" + "commit": "b5d9b3b2c8638e223ba1524c76c16d0f616d73ce", + "sha256": "07ngkr86zgpi7xp1h9nx68gwpfvk5ffdk69m0mb4xn2zkjpd2d58" }, "stable": { "version": [ @@ -65292,16 +65408,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20211003, - 402 + 20211009, + 1545 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "69880741041d5c61abcef941d06234f7cbd545b0", - "sha256": "05awyfzwgzv8d3qjpmaxrkgxhh7njfqj72lkxlij6l5snng24bgz" + "commit": "d08c5528ba0a63433a466c2fa1265ec3250fcef1", + "sha256": "0p12arjl03y2ax8b6g36ppnb1qqkkc2pvv415wsgxydqias775mq" }, "stable": { "version": [ @@ -65806,14 +65922,14 @@ }, { "ename": "magit", - "commit": "4158066a2c75cf0bff128bd2dc1073472c32b1f4", - "sha256": "1hrh90qd47s6q6grr6rp2y7kfqq8bzhdfpyq2saihrric91s1rqz", + "commit": "cca2c57104e14cb0c47e27d7fe4b437b38009a5c", + "sha256": "0n327xp6zdyp5bbqr84qp0f779qqv6jrlr2kaf00whkgp59g5kf4", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20211005, - 1646 + 20211011, + 1635 ], "deps": [ "dash", @@ -65822,8 +65938,8 @@ "transient", "with-editor" ], - "commit": "d122f15edd5147d4c890161819b9589b9ed9ad99", - "sha256": "1ivr49iidc7qv5p7hg9whw83wnhpxdsj3mc5iqhpv63m2iw6wsy7" + "commit": "348d9b98614c824be3e2f05eef5ab91d67f6695e", + "sha256": "0rrrm202lxmdxld2nlp7ap89h2m1qkl1rpks8hzq2b9bzbniln95" }, "stable": { "version": [ @@ -66157,21 +66273,21 @@ }, { "ename": "magit-libgit", - "commit": "0580362be495894c61b99b7efb4cfa435cc0dd72", - "sha256": "0fi3w2f79qn3hf5rw5jp8128xbk5r0xwwwb56zcjn2na02dynfb1", + "commit": "cca2c57104e14cb0c47e27d7fe4b437b38009a5c", + "sha256": "1hh7d1ii3aw9ghmidc6pifaa0ci230vm17sadl3xlq7snpghlrhi", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ 20211004, - 1955 + 1956 ], "deps": [ "libgit", "magit" ], - "commit": "d122f15edd5147d4c890161819b9589b9ed9ad99", - "sha256": "1ivr49iidc7qv5p7hg9whw83wnhpxdsj3mc5iqhpv63m2iw6wsy7" + "commit": "348d9b98614c824be3e2f05eef5ab91d67f6695e", + "sha256": "0rrrm202lxmdxld2nlp7ap89h2m1qkl1rpks8hzq2b9bzbniln95" }, "stable": { "version": [ @@ -66326,20 +66442,20 @@ }, { "ename": "magit-section", - "commit": "92cab05cc5ba4153be97648d6fcd95417871e9c7", - "sha256": "1v9g8y9r0lmp54hgaxgjqr3x86l7cz4wvrrjbpij7aai40ddqdp3", + "commit": "cca2c57104e14cb0c47e27d7fe4b437b38009a5c", + "sha256": "13dxx1rjpj465h1ns2nki7wfsmnfh9m1gzlm49jkka38iwnqr81j", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20211004, - 1955 + 20211012, + 1845 ], "deps": [ "dash" ], - "commit": "d122f15edd5147d4c890161819b9589b9ed9ad99", - "sha256": "1ivr49iidc7qv5p7hg9whw83wnhpxdsj3mc5iqhpv63m2iw6wsy7" + "commit": "348d9b98614c824be3e2f05eef5ab91d67f6695e", + "sha256": "0rrrm202lxmdxld2nlp7ap89h2m1qkl1rpks8hzq2b9bzbniln95" }, "stable": { "version": [ @@ -67134,19 +67250,19 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20211006, - 724 + 20211012, + 1606 ], - "commit": "c9444d790d75c7cfaab1046570a05125f62576f0", - "sha256": "0si3wiacczqychsfc0dppnmwrcgjsb1n7rh555nn5jk1hsl0a0j5" + "commit": "9cd762b6c3f2714375f47993e9a6384d3bc16ebf", + "sha256": "05w8c4rlbdbiwpwirkpnkixifjki6rfgcz8myh0i4kyb1ayfrq2c" }, "stable": { "version": [ 0, - 8 + 9 ], - "commit": "b65d66e9301f9a0e3012568ca6721ae4ec276ebc", - "sha256": "1d6xbidxcxd5gxs5cjxbx1i1wdcmgdnn3hh7fxz0sgf1gaxyp5kv" + "commit": "37e24b798afca98da0d0364dde3fa63a42c5853e", + "sha256": "19l3fwh6phd17rssxk30v2380bs04x7w6cb3hjy4mx7vkc7w6ymv" } }, { @@ -67769,20 +67885,20 @@ "repo": "dochang/mb-url", "unstable": { "version": [ - 20210917, - 1715 + 20211013, + 611 ], - "commit": "ac82a66826a4b03533e7e995d83ed4f019b8968a", - "sha256": "1w6yc8k047ixrplm9n4cyq4h3ghafbsq7zzy3b2zlmdgkhjwh2wp" + "commit": "f6b608db585231eee231d5473edcf4183bb678fe", + "sha256": "1rrg7skg1ifh6bnplxdcp1wryqgwf3aspcvdrrh8k6wd1z7zgdai" }, "stable": { "version": [ 0, - 6, - 1 + 7, + 0 ], - "commit": "ac82a66826a4b03533e7e995d83ed4f019b8968a", - "sha256": "1w6yc8k047ixrplm9n4cyq4h3ghafbsq7zzy3b2zlmdgkhjwh2wp" + "commit": "f6b608db585231eee231d5473edcf4183bb678fe", + "sha256": "1rrg7skg1ifh6bnplxdcp1wryqgwf3aspcvdrrh8k6wd1z7zgdai" } }, { @@ -68677,8 +68793,8 @@ 20210131, 2152 ], - "commit": "88516546fa25f3a629dc6729403328b6edc29109", - "sha256": "080m42ck7gdaa545vra02gkvx0prav43xspp5hwhx30mzkb77n5m" + "commit": "e9791ff92c27bc7df18f238a29f05fc164da2f51", + "sha256": "1j7ni3qjcy0fikzhhm4xwwwskdm6qnb1c1kshh8xrd9c06kmfrv7" }, "stable": { "version": [ @@ -69683,15 +69799,15 @@ "repo": "damon-kwok/modern-sh", "unstable": { "version": [ - 20210917, - 748 + 20211015, + 335 ], "deps": [ "eval-in-repl", "hydra" ], - "commit": "1905cc0c5fe7a306abb4e862c36f00471ce9d0cf", - "sha256": "1xmv6wkbrra3prdm2s3c6hjw5fzp082w15mha60638i3rfmj6sm8" + "commit": "e88d83958ab43e17b9763b3220e0dde862b49a83", + "sha256": "0x2j9i3kns5w9b6bklvmf077dbc5mdim3f4l68nbl0l6kcmlb68k" } }, { @@ -69741,11 +69857,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20211007, - 1358 + 20211015, + 456 ], - "commit": "86ce981066010f4f17de567546ed7151ce5aa4cc", - "sha256": "1934i9is9fdsgv20cp8v8g5jmi9gh51mq3mvg5qzizixslwp8pcv" + "commit": "5ea090b223e8a83f7f3800a96bd4ed3ac9d62230", + "sha256": "1dw6v1sz3b8xf28ly17vsf9j5r9ylwd1p1hz26c05zf9dygiwp45" }, "stable": { "version": [ @@ -70376,8 +70492,8 @@ 20210306, 1053 ], - "commit": "7a2decc75a4b9b1e08ed994c0e675b21e2b0f81a", - "sha256": "06zgjibyd8j0mnyf6cymrb5qhl26kg64z5jizrh2p841wija426v" + "commit": "aa48b23dcf92ea1d85d8e8dbca8c0a0c37e159f8", + "sha256": "181l8l2bihvsg3y652qhfjza5vp0irwdc6q6h1bl8zj0by66p859" }, "stable": { "version": [ @@ -71298,14 +71414,14 @@ "repo": "zevlg/multitran.el", "unstable": { "version": [ - 20210701, - 2153 + 20211008, + 826 ], "deps": [ "cl-lib" ], - "commit": "c34536186088f29d4e85631825e7c6d557a8d0fa", - "sha256": "0iqkgs3rrkhbj2mind4aa4qv7bf7vflnkdysd39b50jbwd7rv4fx" + "commit": "3a3f3561dba816f580cc21526d4f7a231a30bb51", + "sha256": "1s3iavcbbbb4rf70qay4maf7fvfm8i69smyxl2771vb7dj5fjk48" }, "stable": { "version": [ @@ -72522,11 +72638,11 @@ "repo": "danielsz/newspeak-mode", "unstable": { "version": [ - 20210913, - 1029 + 20211011, + 1425 ], - "commit": "4bfef8f834b021d65cf6f920b02c082a719a302f", - "sha256": "1ng024c5qw38p9qlmldh9r08wcvivs17vw2kl8y17z6d233xrgnw" + "commit": "7ae89edd0f72c2dc005933fada5ddaf48ec97dd6", + "sha256": "0fnl27phpmdgg3ja2jpm846x1pq47fqi3yjngxr32fag86hjamvw" } }, { @@ -72751,11 +72867,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20210929, - 2219 + 20211014, + 1848 ], - "commit": "e5d12e26bc98f99b3b1e4b5af452f3079a98e0ff", - "sha256": "0i02r2kvji7dkmkr5waix7bjzlqrjxmvbx53k3ywb9268pi9yv2j" + "commit": "b9e383b4fcc7a3232f9943aed29586a760602a1d", + "sha256": "1kmcpndqh4072nkkji2vxd2br0wyp4ih3b7r4rx90mrimpdvcbrm" } }, { @@ -73487,17 +73603,18 @@ 20210920, 2339 ], - "commit": "3e2e724d53a1dce3ba00a20c71b2e6f735678136", - "sha256": "0hx8l131qwy5cmxii22lhr48lnwni2i7sd025h12gjala6z78jfz" + "commit": "0f196b5659c8a66af4357fee3d4b3a169044472d", + "sha256": "0h068mfry2gllr8gy836a7i8zpkd6bqljnwfcm7yssfv3flrw3z3" }, "stable": { "version": [ 0, - 33, - 2 + 34, + -1, + 0 ], - "commit": "3c60a25c6dcc4d594b66c0f8acd3e84b82a6f42d", - "sha256": "0cqwvs8035rcnwjl92wx0gi4idnfq93n1k04gf19s0609409kbxw" + "commit": "0f196b5659c8a66af4357fee3d4b3a169044472d", + "sha256": "0h068mfry2gllr8gy836a7i8zpkd6bqljnwfcm7yssfv3flrw3z3" } }, { @@ -75364,8 +75481,8 @@ 20210923, 1348 ], - "commit": "3e4d68c726ff8f1baf04ee8076be57d712d2373e", - "sha256": "17r5k0kyvmmnj8g0zqhar0y0zm06q7rqjq4bd1n1cvr5f1zp9gg1" + "commit": "aa673e27f6d7cbc882ab6109cfbcca2ba0864507", + "sha256": "0xv9hmj7girdb4c1xqlk5nj4snhvl34yaz7k28jny50frkszvfca" }, "stable": { "version": [ @@ -75558,26 +75675,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20210915, - 1404 + 20211015, + 1032 ], "deps": [ "org-re-reveal" ], - "commit": "af96d75e9a4248fe0a0fcc8d2c01fe10f274b75d", - "sha256": "0srjw62f9cg6hdq7ldp1yyc6b5gaadlw2fl10vhjwk3chqq0fcp9" + "commit": "12a795417f9ec0d06245a71de595b7aaba86c3df", + "sha256": "1g3sjign97svlf2y0x6bnd4sv7rnqf9ak4gagk58ih7m2ipq174b" }, "stable": { "version": [ 3, - 24, + 25, 0 ], "deps": [ "org-re-reveal" ], - "commit": "af96d75e9a4248fe0a0fcc8d2c01fe10f274b75d", - "sha256": "0srjw62f9cg6hdq7ldp1yyc6b5gaadlw2fl10vhjwk3chqq0fcp9" + "commit": "12a795417f9ec0d06245a71de595b7aaba86c3df", + "sha256": "1g3sjign97svlf2y0x6bnd4sv7rnqf9ak4gagk58ih7m2ipq174b" } }, { @@ -76565,14 +76682,14 @@ "repo": "yilkalargaw/org-auto-tangle", "unstable": { "version": [ - 20210214, - 917 + 20211010, + 958 ], "deps": [ "async" ], - "commit": "ea2ca74a68eb44d935b7240ffc8f19c8a4db334a", - "sha256": "0wskvkwrw0vgknq895by10bcwglaikgkrs1z54f6wyfyksa801ja" + "commit": "50292af50d275846baa28e52d94eb8ef69c8d00b", + "sha256": "0n0divfnk4635aanjm0b3swdjkcj4qxr0x95q05pdlb67s6lfp5d" }, "stable": { "version": [ @@ -77490,8 +77607,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20210805, - 2225 + 20211007, + 1843 ], "deps": [ "alert", @@ -77499,8 +77616,8 @@ "request", "request-deferred" ], - "commit": "db3072adc3f1a57c7a459a3ee911a40db0fc6a8e", - "sha256": "02jfcgl8schra7ir89ajzvnyc9ql208vfasa3qm27vr3yyxvykaj" + "commit": "8b6df4b727339e3933c68045e104b6b1d99816f7", + "sha256": "0gkdh32cfmqbmvvqd67i2x9i1fm5yfmhw6i5yvrb9swsl24kv194" }, "stable": { "version": [ @@ -78909,28 +79026,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20211005, - 1608 + 20211008, + 1310 ], "deps": [ "htmlize", "org" ], - "commit": "36d0973c6c3110a71bc27f8464f4d4b6a798e467", - "sha256": "146hnd1jd9j2bgpn951k7m8kh6ncvcfqvvs4rdhmsk1w426ah5vb" + "commit": "33d226ff707a31804ff3e6ba22416c3f0b463ad7", + "sha256": "0hi8lq9rj6i2m14dh75dzq7lq41i4f6qj4xbp2b8krqw6mk9xg7z" }, "stable": { "version": [ 3, 12, - 0 + 1 ], "deps": [ "htmlize", "org" ], - "commit": "36d0973c6c3110a71bc27f8464f4d4b6a798e467", - "sha256": "146hnd1jd9j2bgpn951k7m8kh6ncvcfqvvs4rdhmsk1w426ah5vb" + "commit": "33d226ff707a31804ff3e6ba22416c3f0b463ad7", + "sha256": "0hi8lq9rj6i2m14dh75dzq7lq41i4f6qj4xbp2b8krqw6mk9xg7z" } }, { @@ -78973,18 +79090,17 @@ "repo": "alphapapa/org-recent-headings", "unstable": { "version": [ - 20201213, - 747 + 20211011, + 1519 ], "deps": [ "dash", - "dash-functional", "frecency", "org", "s" ], - "commit": "5da516a1586675992c0122ed32978c18dda06318", - "sha256": "1xnhahgs1q6y7w0rrc33qbkdagjm6q71a4i0msi4gsfnnzwn4vam" + "commit": "97418d581ea030f0718794e50b005e9bae44582e", + "sha256": "1y11rlnhi36lzhc1cagninv6hlcwbvj88xfr0g0xzpbzy7hys021" }, "stable": { "version": [ @@ -79014,8 +79130,8 @@ "deps": [ "org" ], - "commit": "093c1726ffe4358d60fbb97c1bcf01b785827098", - "sha256": "004g7av1dx3i25lr0r33dd2ch4i9r5mcgjh7gjm6rj6nbyh1gqhb" + "commit": "5662cc897ab1533b39e3e93b2150dacbe699d591", + "sha256": "0fq8ns5f0k9mg9dz1w778jp0icpjkx62fa3a51yrsqisycl3cl6y" }, "stable": { "version": [ @@ -79052,8 +79168,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20210913, - 1445 + 20211008, + 1334 ], "deps": [ "bibtex-completion", @@ -79068,8 +79184,8 @@ "pdf-tools", "s" ], - "commit": "8c503e61681a39cfb104793b35f2f7b801c6830f", - "sha256": "1pz4gwi8gwlbnxa003hk2k0arzic8700xsj0bhpnh2d0zarghcj0" + "commit": "9556a6c9639f6b32124ec2b8059975b0538625c2", + "sha256": "0g7ldyxy1p5r2xrw51h0h4r3kcxncvfb5c0dfaw174r0g2vw4j5d" }, "stable": { "version": [ @@ -79216,8 +79332,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20211003, - 557 + 20211013, + 1624 ], "deps": [ "dash", @@ -79227,8 +79343,8 @@ "magit-section", "org" ], - "commit": "54d17cc50f03f22ca44f4d88f7e589a00c59d05c", - "sha256": "1j2nv3c424x88riqy3m0kb9qinpa15ixrpzqa0zizcnx2dj4iqmn" + "commit": "e9299297f9cc1aafda62deb8af7957dc8d56dc04", + "sha256": "0cg8kywg8qwr3079k2863gmlpjns6s61r38pc0p4iys1ry02bgxm" }, "stable": { "version": [ @@ -80071,11 +80187,11 @@ "repo": "takaxp/org-tree-slide", "unstable": { "version": [ - 20210915, - 335 + 20211009, + 1707 ], - "commit": "571ff333084dad83a535becfc1fdd601ead2da02", - "sha256": "0k1lg3rc6x6alxhjwggh3fdlmpbx8qni8d6qakp6i1ba7459d0mj" + "commit": "27f8bb6a9676e1c0b500e75799e3b5c37a9156af", + "sha256": "0751qlg8xxwx7mldgdry1gfrarvhzg2smjzxd3382i6j63mpala9" }, "stable": { "version": [ @@ -80731,15 +80847,15 @@ "repo": "tarsius/orglink", "unstable": { "version": [ - 20211006, - 1626 + 20211010, + 2105 ], "deps": [ "org", "seq" ], - "commit": "657d655caf408283cc1c6fcf437f33b25166244b", - "sha256": "1y2lav5dk67k4yy67kc0hxyd46x9mdg0kkzmc4sw5vvr9jgjk1in" + "commit": "05df4989c987dece40a450bd5cfbbd6cda0f2e7a", + "sha256": "184hag1kjbzfc7k7c1nd1y9w3gimgxjgkkyqawjzv00sph3mnvd4" }, "stable": { "version": [ @@ -81952,8 +82068,8 @@ "ox-gfm", "s" ], - "commit": "e79c4c4429f64fe61cfa673dcd33273bba30f9db", - "sha256": "153sr1pnnlglzmsz9kx8d8h604j01anf85n57pdz2dnbh6wr2wak" + "commit": "4adf97dd195f0a777b952b97888b77cdd9479629", + "sha256": "0yxzhgjkipy632jhw83l8cz5s7727m87sj6ldpzdh57w1abklidq" } }, { @@ -82131,14 +82247,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20210902, - 1452 + 20211010, + 357 ], "deps": [ "org" ], - "commit": "624dee4ee2300315eb1a32b17e8831ce6677fc72", - "sha256": "1n49iwrfzxx9ad399sm5q1phzlv5890i3vacxci6hpmi26bnqb89" + "commit": "d99311fc5be0a7f0acf2ce9ae2d012a651e1c31d", + "sha256": "1ayqi6s4ympskn7iklk2kplnciryfr32yq3r6zm6x091vlayck69" } }, { @@ -83470,20 +83586,20 @@ "repo": "clojure-emacs/parseclj", "unstable": { "version": [ - 20210930, - 540 + 20211013, + 453 ], - "commit": "fcebf650759929256ec9c4bb83b677240622be8a", - "sha256": "15aar5fsci2y8hy045ypdrig4z4kqrd8318im3yzyyf40y1xrz1d" + "commit": "a8c4cf30fb68b66ae51541462a8b21753229a6e5", + "sha256": "0n0m3xc2dawgdhb68zznpsbzbbvf9fwgf9v8pzzwa2jncgi1yhh0" }, "stable": { "version": [ 1, 0, - 4 + 6 ], - "commit": "5809ae74cd7f5217ae29dc3bae2dba4c1c2c855a", - "sha256": "15aar5fsci2y8hy045ypdrig4z4kqrd8318im3yzyyf40y1xrz1d" + "commit": "a8c4cf30fb68b66ae51541462a8b21753229a6e5", + "sha256": "0n0m3xc2dawgdhb68zznpsbzbbvf9fwgf9v8pzzwa2jncgi1yhh0" } }, { @@ -83494,28 +83610,28 @@ "repo": "clojure-emacs/parseedn", "unstable": { "version": [ - 20210930, - 1615 + 20211013, + 452 ], "deps": [ "map", "parseclj" ], - "commit": "b00eb42a1c10f19ba0f6ff5f8cb9e3ac05285dbf", - "sha256": "1drlhsnqvqyxdw8k9dlfjnzqxgx1m5kpda1cjkanz1s0jq1dxgcl" + "commit": "e5ba280d1fb7b408d54062d4eac545326e850172", + "sha256": "1xp2d42yvqkimb7a15bv89bj0124lljw9cb36g49m13d7ny4fafn" }, "stable": { "version": [ 1, 0, - 4 + 6 ], "deps": [ "map", "parseclj" ], - "commit": "3b1bea14257fe2acd067b6644e0d916cfaa806ba", - "sha256": "1cz2bgaddlrcqzra8q50yh90rdl0kpyf5js2vxccdsq6ngr8bnmv" + "commit": "e5ba280d1fb7b408d54062d4eac545326e850172", + "sha256": "1xp2d42yvqkimb7a15bv89bj0124lljw9cb36g49m13d7ny4fafn" } }, { @@ -86018,11 +86134,11 @@ "repo": "thomasluquet/playerctl.el", "unstable": { "version": [ - 20210411, - 1442 + 20211014, + 856 ], - "commit": "41564d453c9f936a4ce2699afacc6d1dff974f1c", - "sha256": "0fbnfxhfyam5zvf2ild5bxq489dnpyrzclnfwq0lhzgswjj70hw6" + "commit": "4c3a6132616fd28f902590bf6e63332e6055492b", + "sha256": "18b59kcni6xp46r8lkwb8baz2mic9n4zyndib10dvfs6gwjmas2p" } }, { @@ -86996,8 +87112,8 @@ "repo": "ponylang/ponylang-mode", "unstable": { "version": [ - 20210118, - 1325 + 20211015, + 331 ], "deps": [ "company-ctags", @@ -87009,8 +87125,8 @@ "yafolding", "yasnippet" ], - "commit": "d3b108338219ff275e4ed2c67a2c5f2ce334bb94", - "sha256": "0klpwchiaqrg9gclpbc4ya4kkf33bl6h7khp1b4pjx6zg28qk8ih" + "commit": "1abf04bc8f4f09a6add4b587c7cf5ca23735e7c0", + "sha256": "1iv04dj2nc9cyyslhir7aj5sligwan1yyclsiarn86lik7b9lmwn" }, "stable": { "version": [ @@ -87087,11 +87203,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20211003, - 1054 + 20211011, + 435 ], - "commit": "918306c2afbb09e92f7cc704ddbabe9701bef6f8", - "sha256": "1rk9lzcjhkqvaxjgwj0gsfwnzh9q1kmlwiy1jvp3wzi81j42zdf2" + "commit": "6a2ddcb35432afb56f32e11518c2b6ae7795e8c0", + "sha256": "0sv8bi34fbg0awi8maah5fs13s0wmzbvalq13z2zx9ybb8ivrsfi" }, "stable": { "version": [ @@ -88176,11 +88292,11 @@ "repo": "fritzgrabo/project-mode-line-tag", "unstable": { "version": [ - 20210615, - 1825 + 20211013, + 1954 ], - "commit": "ed6adf9287d2aa526d85451623f1aa281cfa7e0a", - "sha256": "0xryvjsb2r4rj22wgjpixa31kg4sp7xww63hldnf7c1cvcc9g305" + "commit": "e411432a33cd82f8a9ff95471c91e9fe1833841c", + "sha256": "03aiv70shxhcjcldahny7xxclnqdw5bf37f8496dxmzz0zx0v98j" } }, { @@ -88693,11 +88809,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20210918, - 2238 + 20211013, + 1911 ], - "commit": "38ae8fdf23f37af71b8a4f9717ba48c52653db63", - "sha256": "1x5d0rki2lsyg85srldwg34jaiq14l1nw58bab74n7xhp426pvyw" + "commit": "fd04605af1b07684da522c32d83ac346050926bb", + "sha256": "017j3vcwlg6k2h76wbads6jxmnmxj19g4c42zs3mi2vwqhfvgdqx" }, "stable": { "version": [ @@ -88797,11 +88913,11 @@ "repo": "google/protobuf", "unstable": { "version": [ - 20200619, - 1742 + 20211013, + 1726 ], - "commit": "b7cc13068dc198e480271e98b53cbeed195e9d05", - "sha256": "1lfy5p2akjnmpssc92jfx5j88q53s35338zhsafc2k4s650dc4f2" + "commit": "c01cd6ec794fd91b316cb236663c81eefa1efa4e", + "sha256": "1rqsg37dxglxddipfpph5xv6mlsh73hgy66vlirrvcs0ijiyjj8g" }, "stable": { "version": [ @@ -89212,11 +89328,11 @@ "repo": "AmaiKinono/puni", "unstable": { "version": [ - 20210928, - 703 + 20211011, + 1529 ], - "commit": "a076d32f281d2984c6072461d034688c41eae3c1", - "sha256": "106qvdspwahyahd4my5wby02ffykbwb04ahlqcrbdapw6aflnv19" + "commit": "825952d0a4a1d5eebf849280ffd4e1e44e1a847c", + "sha256": "1w3iz542v83n6vc4j0nhqmkp21h0m42rqgp6648jlx7q0n4qmdz6" } }, { @@ -89876,8 +89992,8 @@ 20210411, 1931 ], - "commit": "c4ed76d3948afdb0176835c1fa6eb48f54bfd54f", - "sha256": "0m9ksp59bl9lkhrzgkjivnwkl3lv5lgg1zhs47q2gc0sl66xrknz" + "commit": "ab775f6f4507a1f0cd9dab0fd027c2f08be06928", + "sha256": "0js9addqxk2dchgrjnz2wdxxp7sszq95zvga8j1igihx7w83xp7f" }, "stable": { "version": [ @@ -90157,11 +90273,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20210930, - 836 + 20211013, + 1620 ], - "commit": "c0ca60e1a83c635d96a76d36e912904e6d0e3446", - "sha256": "1c7w6bl9lccx96i9vyrxg714lwmfhdd3lar5rvf4k6an0vifqzc8" + "commit": "e92d0e800b494c1dfcca109154a6b7eb6fad0e4e", + "sha256": "1lxi1iwckpfk6966sgcdj3sz9bcbylsm3nqv9wbbzkqbjlyd28y4" }, "stable": { "version": [ @@ -90312,11 +90428,11 @@ "repo": "jorgenschaefer/pyvenv", "unstable": { "version": [ - 20210527, - 829 + 20211014, + 707 ], - "commit": "045ff9476dac26086a04538d9b7ba186aa8f0fd1", - "sha256": "1y5jqqqh0df75qydw3h7rx24pv5z628ci8ymdksn5khl1qp5041x" + "commit": "31ea715f2164dd611e7fc77b26390ef3ca93509b", + "sha256": "1708xh2sq7xvs4z5zkik9ircxvzimhzi6phc2j43fvvxgglcgrk5" }, "stable": { "version": [ @@ -90382,12 +90498,10 @@ "stable": { "version": [ 1, - 1, - -2, 1 ], - "commit": "eb2d5bad076b17a8c431200be7357460a7d3c088", - "sha256": "1y7xd2lr88z47s70xaxkd9zl3aqna2d87ad2ism3ywncb1sqmd24" + "commit": "76de0de6449031ef5dd3e73ea4ab820e0d58a0e2", + "sha256": "1b7z3nxwrgkw1p7dp6ibsvhvpyl2m881w9yr9qcmdrkf78cqlpvx" } }, { @@ -90803,11 +90917,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20211005, - 1559 + 20211015, + 1650 ], - "commit": "46df4d9ecbaa7da1f48e55e5769d05e4ffdbd8b1", - "sha256": "0c4h86vxv9gwq7cy4jd446zxnp7kbkfj9h58m29i1hhwz056pk6j" + "commit": "46bb0bf29f6b2fb571374e1aaf4252bf5f54281f", + "sha256": "0hkshj2kf23pqnmwc6d1glcg7my402qqngcn4iliy89rp56xdgqs" } }, { @@ -93387,8 +93501,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20210723, - 1236 + 20211014, + 548 ], "deps": [ "cl-lib", @@ -93396,8 +93510,8 @@ "popup", "posframe" ], - "commit": "1d9bcc6dad4182e9b6a5839f8261b260e57be2fc", - "sha256": "157hndsslfxyi4n927y67shnk2xwhwz0idxwkdhcd4zl9jjzwpqr" + "commit": "b296856c21d32e700005110328fb6a1d48dcbf8d", + "sha256": "1x3v18hwxj56zhn4437nklyni4d3chk84c82a8y1z1flcayjipvy" }, "stable": { "version": [ @@ -94430,8 +94544,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20210830, - 1944 + 20211014, + 2241 ], "deps": [ "dash", @@ -94444,8 +94558,8 @@ "spinner", "xterm-color" ], - "commit": "804ebfe0295a6bf37870e06f84a8d35f55c9f1a6", - "sha256": "0ya7l8yfbax74lrwvcr3lxaffb238m3yk8y37msvsk1pvwcjfkr7" + "commit": "4f25042b12a782c0acd87fc436de2a1a9140322e", + "sha256": "1aq79dijx62y1h8g5kgdbi5xh4w6wdq47m6g5w64c0rr2igziixg" } }, { @@ -94934,8 +95048,8 @@ 20200830, 301 ], - "commit": "dc045a7670c3f6a6b7c59cf38fd58d980c70e0f4", - "sha256": "1yhfa2f5yrhq9wbq5mshd1cnwks9pwx27isbi1v6gp32lzfwi1jq" + "commit": "dd7f6c0256ccfbd1e6efa6c06b9a12ef3565c29c", + "sha256": "0b5rkj75yxhcdbl7zy008g1n7lwivpnaz78434wb1ljn3l0s56yi" } }, { @@ -96825,8 +96939,8 @@ 20210924, 445 ], - "commit": "690e394a9c401f4fc69506d700d959e675ac5b6c", - "sha256": "09j42178p7cnyw7f9r302aj4q2nvqmcyln15zza56nxfszcbwdnq" + "commit": "c088fe627f12597726dfc2062454e2e7bd99798a", + "sha256": "0bhvhhqs55nh1qb212zmmxw76l22xd830pvw0n9wihv02yrg7kim" } }, { @@ -99270,6 +99384,36 @@ } }, { + "ename": "soccer", + "commit": "5111fad0a1dfc8b1e2254ace7907e5ce1be038ca", + "sha256": "1gzfqfgzfwkj85mxzrz83i13v6jrqldcbzcwfcz6bg49agh244bk", + "fetcher": "github", + "repo": "md-arif-shaikh/soccer", + "unstable": { + "version": [ + 20211015, + 934 + ], + "deps": [ + "dash" + ], + "commit": "8547a36789be66ac32caf4c80a330e7bdf9bb5dd", + "sha256": "0kddpbha5mlih9rmygkxqm8gs9719ics749p18p2np02pvka3x06" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "dash" + ], + "commit": "c486cad32f07db9bd55af08c6b4a6bb0cd481d67", + "sha256": "0gsd4mi1nddxn4z9jayi0fhn3bvk9rpj6615ssb5426k0zfhwjsz" + } + }, + { "ename": "socyl", "commit": "774b3006f5b6b781594257f1d9819068becbbcc1", "sha256": "00b7x247cyjh4gci101fq1j6708vbcz1g9ls3845w863wjf6m5sz", @@ -100200,11 +100344,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20211007, - 305 + 20211008, + 106 ], - "commit": "4e7ad5c5efadee670e29fa009c9026222a5bd3e3", - "sha256": "1m9biqvahmdigdf2iz3c2vns0jhrjsr60q444q9aa7l7k509lf35" + "commit": "f38bebefea9d23c2bd4293ecf7100211c1410cd4", + "sha256": "0wvg4c1z5y62icagfwl2vb329jprf6si804726mqka92zj4nnn77" } }, { @@ -101216,8 +101360,8 @@ 20200606, 1308 ], - "commit": "689689adb35f984f9fd833a6b92d4bf50ac565b3", - "sha256": "1iighf4kx2azakrqjf4s08nnsafzp6bh66d15qd68k5z1lkgljsl" + "commit": "ef629fd74c5d963f5b68507179896169a34a078e", + "sha256": "1wnx8s8cabg8zja0w0cvk6jfsqbkgbszdx624v1bl6g5iiv2im1j" }, "stable": { "version": [ @@ -101727,14 +101871,14 @@ "url": "https://git.sr.ht/~amk/subsonic.el", "unstable": { "version": [ - 20210909, - 1003 + 20211008, + 1439 ], "deps": [ "transient" ], - "commit": "a4eb0da98a3909d301a7c07ae2e64197f8db22a0", - "sha256": "1pwy3h7k8y8hwb2dhpcx22sc5qzyk22r6hvvs4yd2gyjd4lw77vi" + "commit": "de3d4539dd8dd33c9b9d1a982cfc47c452c612de", + "sha256": "0xhggrjq3f9wq5aq69ib2bny36295aw678avgdib2vp1bf9xd73n" }, "stable": { "version": [ @@ -102037,11 +102181,11 @@ "repo": "leafOfTree/svelte-mode", "unstable": { "version": [ - 20210222, - 1037 + 20211011, + 607 ], - "commit": "839f579fa881467149e77d0e096a4a4a6c5d9878", - "sha256": "18hhl6x3xg5lykfq01iw2p03lj248x7rqaygq8nj64hbw46nzn0v" + "commit": "282acf8c01c37899955afe3dc32d9cbfb18065e2", + "sha256": "1kjnc7nl5kshy8wjppvjzavv94h4ynwas610g1xqbzfbpirsnz2p" } }, { @@ -102290,26 +102434,26 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20210925, - 430 + 20211009, + 635 ], "deps": [ "seq" ], - "commit": "4ec7c7328d0f09bf323c8be2db3be248bf30827a", - "sha256": "12sjfyy04ffm7pggd51xal89p4vkh3b9kppvx5vjpq7cx8dalkb0" + "commit": "babe36ca93e72c34b2a3856d8fac7e3fc9884f21", + "sha256": "133r7isdnz7r7y7pbf239928kjmk9ps2i8zqnxnma9zcmncw88ld" }, "stable": { "version": [ 8, 4, - 0 + 1 ], "deps": [ "seq" ], - "commit": "4ec7c7328d0f09bf323c8be2db3be248bf30827a", - "sha256": "12sjfyy04ffm7pggd51xal89p4vkh3b9kppvx5vjpq7cx8dalkb0" + "commit": "babe36ca93e72c34b2a3856d8fac7e3fc9884f21", + "sha256": "133r7isdnz7r7y7pbf239928kjmk9ps2i8zqnxnma9zcmncw88ld" } }, { @@ -102621,16 +102765,16 @@ "repo": "bgwines/symbol-navigation-hydra", "unstable": { "version": [ - 20211003, - 1859 + 20211010, + 2353 ], "deps": [ "auto-highlight-symbol", "hydra", "multiple-cursors" ], - "commit": "2744210b04fb8f5ee8c7948f5f36c8b2df1ea76d", - "sha256": "1a3gv2jpax1y5k1p7kmns9gnd7paqbllnm0gbmzxkh8p7yc0lrak" + "commit": "b3b1257e676514d93cd2d71a10a485bf00b5375f", + "sha256": "0ic6i589y8g41mpi9vzsd76rzcskxaxicfwwpw8d9g44p8zfghfz" } }, { @@ -103104,11 +103248,11 @@ "repo": "fritzgrabo/tab-bar-echo-area", "unstable": { "version": [ - 20210525, - 2204 + 20211013, + 1942 ], - "commit": "2196e76cb6f11e6ae0f35ac8259dfb755ea60336", - "sha256": "1xifgdwqpf0ccmdxhdr9zxzqsa769984xs4343v657171f53flz4" + "commit": "d0d51ecbc5929eb7752b387c5bdfe4d879e78224", + "sha256": "1p3ikc776mr18r5py0sw098ahsj9w45ikqns4wbgr2fsjmgcgksr" } }, { @@ -103119,14 +103263,14 @@ "repo": "fritzgrabo/tab-bar-groups", "unstable": { "version": [ - 20210615, - 1915 + 20211013, + 2012 ], "deps": [ "s" ], - "commit": "a2e456097322d0b1cfdb7aa37c32a628bcca3bf0", - "sha256": "19ni9bl34hzmqsb9wiznbghw67m7g9zz3z5m3wgndn9zsj37ccka" + "commit": "a0389d87d2e793055dd74ae85b4593aa1d2720fd", + "sha256": "040nl3yn0vfhk5nbll2jpxz7qcjf8kdlkzqa44lz0gvc6d9414yv" } }, { @@ -103137,11 +103281,11 @@ "repo": "fritzgrabo/tab-bar-lost-commands", "unstable": { "version": [ - 20210215, - 1412 + 20211013, + 1945 ], - "commit": "e587cdb5d6d2c8d509c43db4b5bb285415916c4e", - "sha256": "1bnpcfh0lzjz4f1lbj2jqz7ly6d3bv8jhi4lxr5pj3g21437xf4y" + "commit": "989e03dc3d1057264b21b9a5d241fcba86cd297a", + "sha256": "047261v8nvi67h9yils2f1jilmbxc55n31v98qlqxmf56jkzz158" } }, { @@ -103588,28 +103732,28 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20211007, - 616 + 20211014, + 927 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "dcf5f041d30f5dd407e54f014f281e368d755529", - "sha256": "02d34p14yjqvaypirmr63h1vldmsvzpgkm0c18q2gfxbki6bj9f5" + "commit": "744d3698dd27a58822b2edcd4fe9689a701d0c37", + "sha256": "1hciz2anrjjrm1nw1j657zgglg4ggf9pkzby96a41s7l6d1qi10a" }, "stable": { "version": [ 0, 7, - 30 + 31 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "26fee82fac70d55ade55381b475e865d99dde496", - "sha256": "1g29v5fgkqx43wsvh1npx0g3hj00n37lxgvxjvy85fs4h9226gl9" + "commit": "c07f310552643dfeb6bed98860bd63b965baf262", + "sha256": "05j82796s4k3yr0igl6hir3p8qj0cw66vvhbpbcy28d6q9v9vjjz" } }, { @@ -104694,18 +104838,18 @@ 20200212, 1903 ], - "commit": "dd17e81e813e8e6604b870be0e1ba547ac9fa1dc", - "sha256": "1961wkf50w6qyqdqdnplhjhzqs40m76kflg9vbybr0gqz23abspc" + "commit": "9e70d608bf5f80e8ec0132953b91b7fa3d30ca26", + "sha256": "0x7hsy9v2py8b5i7pn8v5xymgjg8rixkmsxaxvvsbmr771blpkqm" }, "stable": { "version": [ 2021, 10, - 4, + 11, 0 ], - "commit": "6563eeda0cbcc599e0b9fffb665759e5b159b8ec", - "sha256": "1kmcnffdpl44bx80m1ybrssfqbgalw8x00gs9zqnfbyaqcxf0mqr" + "commit": "77016aea52af2156be7c8ebde55b821fe46b7849", + "sha256": "1lmh733m0anfny0izi2lc5njqaqdvr2z96lqfkyzsf0ln73ipb9b" } }, { @@ -104761,8 +104905,8 @@ "deps": [ "haskell-mode" ], - "commit": "991d5c7d1b53bc1b51b44e0560b9074ffdfd941c", - "sha256": "1sy74xi8j8v1bxc1y65j9f4bjhdbc2ym6n70zll9czzqa34g600g" + "commit": "5bc0b35756ab14af950aafa5f3d76bae568d3095", + "sha256": "13pryqrqk1y9qb5h2pg45hi62w17xnzrlrg471b6ga9r4zwn8vfz" }, "stable": { "version": [ @@ -105010,11 +105154,11 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20210925, - 1118 + 20210930, + 1521 ], - "commit": "ed7f90d74d87e629dded6bfe0de2d04a856c5d61", - "sha256": "0lfj2ncygp7fzxcw1kswh75zhx5cdkdyrpd7ms4dfk8j8h7ra09j" + "commit": "e7655e95ad48418a3784de4e8a7dc45ed69540ed", + "sha256": "05bdavm4a1d0p176b8cnipv6byxlchbbp1fcma67ly5px4wxn0ld" }, "stable": { "version": [ @@ -105779,11 +105923,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20210920, - 1038 + 20211013, + 2148 ], - "commit": "57942fe961d261360e61a72e47c676172ba7963f", - "sha256": "0d8mnvjbwnghh2yz7ys8r9395cy69mx5wjsm2kg8msi4kgk6yfjj" + "commit": "45975c24e1ab08bb32e9bdc06f5c5efe7c256e16", + "sha256": "0prx06z35fdvwbn1k18khw74phvfsa64pfsh4kpyihldj2k5f69j" }, "stable": { "version": [ @@ -106163,8 +106307,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211006, - 1837 + 20211015, + 1613 ], "deps": [ "ace-window", @@ -106176,14 +106320,14 @@ "pfuture", "s" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "ace-window", @@ -106195,8 +106339,8 @@ "pfuture", "s" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106214,21 +106358,21 @@ "all-the-icons", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106239,28 +106383,28 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210927, - 1735 + 20211007, + 1608 ], "deps": [ "evil", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "evil", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106271,26 +106415,26 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210630, - 1953 + 20211011, + 1824 ], "deps": [ "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106301,30 +106445,30 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210906, - 1653 + 20211010, + 1005 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106343,22 +106487,22 @@ "persp-mode", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106377,22 +106521,22 @@ "perspective", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "dash", "perspective", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -106410,21 +106554,21 @@ "projectile", "treemacs" ], - "commit": "5bd0d87548cefa6d5e195eb5578b415a98dad516", - "sha256": "0ffz2s9yr9p9r0fzn1dmpd4cl7k18fiihjm5dbg13ybzm3knax08" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" }, "stable": { "version": [ 2, 9, - 1 + 3 ], "deps": [ "projectile", "treemacs" ], - "commit": "dd8c9d364f4791fe4d091e78436edb4b31999222", - "sha256": "1c75b4ni8mxf58b6z9n9f7mij54aial0pbsnp390wcry57z2c77l" + "commit": "6b71604773f852158f00596776a68a82fb2633bd", + "sha256": "0ik7wkv6w5vga29pmj8zzn3lq9a2ww26gkl380hmaak809in6k65" } }, { @@ -108385,11 +108529,11 @@ "repo": "ideasman42/emacs-utimeclock", "unstable": { "version": [ - 20211006, - 1337 + 20211008, + 454 ], - "commit": "b55e265735cb89f384ae51d903a59cda3e52509a", - "sha256": "1xa0p3q5n96rp85knj686argg2yx6302i9g9rc50zrc43lznvgl9" + "commit": "e6e3dd50fb7e3b20e38db555950b2f417a12c993", + "sha256": "0iri2836zxadqdvivkmm0rz2ai4wxb1khnfxjmk8k8q274w1lslf" } }, { @@ -108468,15 +108612,15 @@ "repo": "damon-kwok/v-mode", "unstable": { "version": [ - 20210608, - 629 + 20211015, + 309 ], "deps": [ "dash", "hydra" ], - "commit": "3afbd72180417ada6aeeec861081495aca962124", - "sha256": "0is9hdh8w87l9x84ihhcd040z8m7cy2321q2rmbfmpffaaja90cl" + "commit": "a5f39031a3391d0044c716425eb28645af51c79c", + "sha256": "0k0100fxhhzfyl2pcsrwblj1h7j0x9fzfnpcxqd751yvwihgrsb6" } }, { @@ -109594,11 +109738,11 @@ "repo": "joostkremers/visual-fill-column", "unstable": { "version": [ - 20210419, - 857 + 20211014, + 2141 ], - "commit": "bd78372bd3d8f3e90508e1eb0c9d1a53948dcc2b", - "sha256": "18ynnvz7an3bg33pd4fhkk0y85j2v48bgxny163ya6nbk0xp074s" + "commit": "2df643827a4fd82b732ea93042916c61078d4206", + "sha256": "1j8x044s4xzmfmqrsabim9gv435scj2yhym3f3p9bf5vq5ds2smj" }, "stable": { "version": [ @@ -110160,11 +110304,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210923, - 2248 + 20211009, + 252 ], - "commit": "690e394a9c401f4fc69506d700d959e675ac5b6c", - "sha256": "09j42178p7cnyw7f9r302aj4q2nvqmcyln15zza56nxfszcbwdnq" + "commit": "c088fe627f12597726dfc2062454e2e7bd99798a", + "sha256": "0bhvhhqs55nh1qb212zmmxw76l22xd830pvw0n9wihv02yrg7kim" } }, { @@ -110385,16 +110529,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20210629, - 1252 + 20211008, + 1118 ], "deps": [ "apel", "flim", "semi" ], - "commit": "769699d60aa033049804083b459ee562b82db77e", - "sha256": "0mgl28xsvc0421pysy6hh0hymr0li8iayaa330r41cbqsk3gz4nw" + "commit": "92ded1534ce7143f379b92a4029db275f3e22ee8", + "sha256": "0ai48j19dpyny1mmf81wjwmr5i5i5rnaj4d5n0hfchs4dcng0xrq" } }, { @@ -111921,11 +112065,11 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20211001, - 2220 + 20211015, + 1917 ], - "commit": "0c37fea45603257435294e2e01a403627da23abe", - "sha256": "1pynm4ng4rki2b2ka5dz01p66ygghk69mldsfbxs81d52jqfnx8f" + "commit": "8d52f933e50624c7bca3880f57297ac17ba4ac2d", + "sha256": "0k0k7mbsizsbgyjb92qj9hp5f2jbwbkzmfbxjhbmniw87q1flmmp" }, "stable": { "version": [ @@ -112241,8 +112385,8 @@ "repo": "abo-abo/worf", "unstable": { "version": [ - 20210913, - 1123 + 20211014, + 1207 ], "deps": [ "ace-link", @@ -112250,8 +112394,8 @@ "swiper", "zoutline" ], - "commit": "238b7c89229e4b56b36e81f06a2a49488940212a", - "sha256": "06qlkxkdq316habdxvhyyrf6d25i9pdxwjc4dmk3l83sg61rlg79" + "commit": "d22146bae521d4eeefd0bc2d95c7b64796760faa", + "sha256": "1vakix6pdv4ssmwzw7p7iaprp5kyiqjiw8gpi41hn7l3dsgmi4iq" }, "stable": { "version": [ @@ -112670,11 +112814,15 @@ "repo": "xahlee/xah-css-mode", "unstable": { "version": [ - 20210925, - 1643 + 20211008, + 707 ], - "commit": "0e834f351733fcae07e1cbd1a47d6330f17a8d74", - "sha256": "1gs5iynyljvjcwxjgvm7xj4zjk5ca59bpxgm016lmxkmdnr68fy5" + "commit": "eab9b2c6d7b06c23dcef23b0c1127d76ea7b09ba", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://github.com/xahlee/xah-css-mode/archive/eab9b2c6d7b06c23dcef23b0c1127d76ea7b09ba.tar.gz': Couldn't resolve host name (6); retrying in 269 ms\nerror: unable to download 'https://github.com/xahlee/xah-css-mode/archive/eab9b2c6d7b06c23dcef23b0c1127d76ea7b09ba.tar.gz': HTTP error 404\n" + ] } }, { @@ -112685,11 +112833,15 @@ "repo": "xahlee/xah-elisp-mode", "unstable": { "version": [ - 20211001, - 1536 + 20211008, + 717 ], - "commit": "bfd1d20e39d80ff00d3aefdf18c711df0685b022", - "sha256": "1v2i56ny5isvkdgac663g8c67r632fvvz6hkcyyy0fv9l0rzdmsl" + "commit": "de43714d9d4993b744afc4829d2f29ad1e806342", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nerror: unable to download 'https://github.com/xahlee/xah-elisp-mode/archive/de43714d9d4993b744afc4829d2f29ad1e806342.tar.gz': HTTP error 404\n" + ] } }, { @@ -112715,11 +112867,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20210919, - 1355 + 20211009, + 1810 ], - "commit": "de9df16b79ec7e2caa81d7d53c8312a54bd52100", - "sha256": "13n4h58nqlxyfjwz4lq32lig73imvq4jk87w72j8cin5hgvnsv30" + "commit": "de43f45e5adc5342937a9bb66f5d00b2c02c16a7", + "sha256": "01wj3ii4lacns3ly8f0812sc53spvkqkwf9g7nqyda1laxqsgnic" } }, { @@ -112745,11 +112897,15 @@ "repo": "xahlee/lookup-word-on-internet", "unstable": { "version": [ - 20210925, - 1653 + 20211008, + 659 ], - "commit": "d99cce539d82cb4f0e10b7c02b5500561b13ff09", - "sha256": "07mlhsxhb3l3xawlvzx76jy4z6q52znjapmpj47w8hllnaibmhmy" + "commit": "f9c3fda86930bebf718da6e39649500be5628cc5", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nerror: unable to download 'https://github.com/xahlee/lookup-word-on-internet/archive/f9c3fda86930bebf718da6e39649500be5628cc5.tar.gz': HTTP error 404\n" + ] } }, { @@ -114691,14 +114847,14 @@ "repo": "schmir/zimports.el", "unstable": { "version": [ - 20200809, - 2035 + 20211011, + 2059 ], "deps": [ "projectile" ], - "commit": "4067b20a2ea25327504b0a42f443903728aa7966", - "sha256": "01ljp3cpslkmp8kxm24ayp5jlg6r431vpk6dm1b9ylr4x4p1klgx" + "commit": "76cf76bdc871cb0454a6fc555aeb1aa94f1b6e57", + "sha256": "1vx4j9n5q4gmc63lk1l4gbz5j5qn2423cyfibqcbynkkbwgas11z" } }, { @@ -115010,30 +115166,30 @@ "repo": "fvdbeek/emacs-zotero", "unstable": { "version": [ - 20211006, - 2051 + 20211008, + 2207 ], "deps": [ "ht", "oauth", "s" ], - "commit": "e63eba9deed272e4d8f4426949b9a5743db3c511", - "sha256": "0266hxdsi74pp2l5higyrqg8hdrmda2x1l63c4yi2x1w351i4jlb" + "commit": "811bd1f14b38c3dde3f80cd8a13490c9900de888", + "sha256": "0gh04kbg109038xxcrzhjffqrfcxx7vbz0dz2idglcmbqpg7lzjq" }, "stable": { "version": [ 0, 2, - 2 + 3 ], "deps": [ "ht", "oauth", "s" ], - "commit": "15eb7a8d099c93440f0a8920499633103f00fc83", - "sha256": "13mrssrkcjrrpc470rjpb3mwjfdsyvr4i8niqza54rzk0zxj2m95" + "commit": "811bd1f14b38c3dde3f80cd8a13490c9900de888", + "sha256": "0gh04kbg109038xxcrzhjffqrfcxx7vbz0dz2idglcmbqpg7lzjq" } }, { diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 998341d6bb524..38f38ae3a51b9 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv +{ stdenv +, lib , ctags +, cmark , appstream-glib , desktop-file-utils -, docbook_xsl -, docbook_xml_dtd_43 , fetchurl , flatpak , gnome , libgit2-glib +, gi-docgen , gobject-introspection , glade , gspell -, gtk-doc , gtk3 , gtksourceview4 , json-glib @@ -39,20 +39,20 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "3.40.2"; + version = "41.1"; + + outputs = [ "out" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16kikslvcfjqj4q3j857mq9i8cyd965b3lvfzcwijc91x3ylr15j"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "XVXkqqKkdYpGJj0cf9AJyz20RV4O1/nkTDoWNIYfo4o="; }; nativeBuildInputs = [ appstream-glib desktop-file-utils - docbook_xsl - docbook_xml_dtd_43 + gi-docgen gobject-introspection - gtk-doc meson ninja pkg-config @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { buildInputs = [ ctags + cmark flatpak gnome.devhelp glade @@ -92,8 +93,6 @@ stdenv.mkDerivation rec { xvfb-run ]; - outputs = [ "out" "devdoc" ]; - prePatch = '' patchShebangs build-aux/meson/post_install.py ''; @@ -134,9 +133,13 @@ stdenv.mkDerivation rec { done ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput share/doc/libide "$devdoc" + ''; + passthru.updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "odd-unstable"; }; meta = with lib; { diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 8ca19d95a7a58..7f8a0aba0ab88 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "072wdzl8gp4ygprgza4cfg46fvrd13zx9za5fa8s6vsd9w1l95l7"; - x86_64-darwin = "083sipxp9r7g6p6la15jjlib52l8xjbfxn2cb05scigq3zsyffy7"; - aarch64-linux = "1s82f6ba57r7bnjhbanmih5g7wa001sf6php1402w06cxxy7dz00"; - armv7l-linux = "113nk1rqw07giqq8pnc11dymzxdhj3nn3q2p0fppnm3lpccaq9hs"; + x86_64-linux = "0ic7h5aq1lyplk01bydqwrvz40h59sf0n0q4gxj844k4qidy14md"; + x86_64-darwin = "15s3vj7740ksb82gdjqpxw6cyd45ymdpacamkqk800929cv715qs"; + aarch64-linux = "0n3bxggfzlr1cqarq861yfqka3qfgpwvk8j22l7dv4vki06f8jzy"; + armv7l-linux = "0jksfdals8xf3vh5hqrd40pj5qn8byjrakjnrv926qznxjj152bn"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.61.0"; + version = "1.61.1"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 50e1babda2acd..d412c6fded878 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.11.4"; + version = "3.12.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3ZsPiUXX34Ev/a3OyMO94dyXZyMy4AVt5Cp/ELZLIGw="; + sha256 = "sha256-Pe/8AwOE5ktXNhxDfHm0ga4Uie9EyHroVugbsQ2OOD8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/fnott/default.nix b/pkgs/applications/misc/fnott/default.nix index 4c2e262c9ae18..93886b3a2c21d 100644 --- a/pkgs/applications/misc/fnott/default.nix +++ b/pkgs/applications/misc/fnott/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "fnott"; - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fnott"; rev = version; - sha256 = "sha256-gzU5AqjCIZlhLbnj/xuSGJ69ZhLv9zQxlM0Nn+MIX/U="; + sha256 = "sha256-+x3uN7Uj0fqO0kpHlOVnsshgEJA1z/6ZElKSTyLzfG4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 3ff33a14f2e80..797dfe504cae4 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -4,9 +4,9 @@ , curl, writeShellScript, common-updater-scripts }: let - url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.2-b5029032/Hubstaff-1.6.2-b5029032.sh"; - version = "1.6.2-b5029032"; - sha256 = "1q3gimg6bcpdnm1fkn1vq3b6shwgi6y84bixisyfcva5px7dmi4s"; + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.2-328c666b/Hubstaff-1.6.2-328c666b.sh"; + version = "1.6.2-328c666b"; + sha256 = "0fmlblw19qk9s9xsl0dl705cnns825wrlc7navii4bvbsn6ycl5v"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 38513937d01f8..bd35d44b7cccd 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -121,4 +121,16 @@ in buildFHSUserEnv { ln -sf ${lutris-unwrapped}/share/applications $out/share ln -sf ${lutris-unwrapped}/share/icons $out/share ''; + + meta = { + inherit (lutris-unwrapped.meta) + homepage + description + platforms + license + maintainers + broken; + + mainProgram = "lutris"; + }; } diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 952a7b00d0874..435bbda24d030 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -2,47 +2,51 @@ , stdenv , fetchFromGitHub , gtk4 -, gtksourceview +, hicolor-icon-theme , json-glib , libadwaita , libgee , meson , ninja , nix-update-script -, pantheon , pkg-config , python3 , vala -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "notejot"; - version = "3.1.5"; + version = "3.2.0"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - hash = "sha256-wsHQvN+sqAMs1QldiRoc9JlF4d54JFqNkqC+lyuHC7M="; + hash = "sha256-WyW1tGhO3+OykNa8BRavi93cBMOSBJw0M+0bwQHJOjU="; }; + patches = [ + # build: use gtk4-update-icon-cache + # https://github.com/lainsce/notejot/pull/307 + ./use-gtk4-update-icon-cache.patch + ]; + nativeBuildInputs = [ meson ninja - vala pkg-config python3 - wrapGAppsHook + vala + wrapGAppsHook4 ]; + buildInputs = [ gtk4 - gtksourceview + hicolor-icon-theme json-glib libadwaita libgee - pantheon.elementary-icon-theme - pantheon.granite ]; postPatch = '' @@ -50,6 +54,10 @@ stdenv.mkDerivation rec { patchShebangs build-aux/post_install.py ''; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { homepage = "https://github.com/lainsce/notejot"; description = "Stupidly-simple sticky notes applet"; @@ -57,8 +65,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members; platforms = platforms.linux; }; - - passthru.updateScript = nix-update-script { - attrPath = pname; - }; } diff --git a/pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch b/pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch new file mode 100644 index 0000000000000..9431c43cef69b --- /dev/null +++ b/pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch @@ -0,0 +1,20 @@ +diff --git a/build-aux/post_install.py b/build-aux/post_install.py +index 1278304..fface6d 100644 +--- a/build-aux/post_install.py ++++ b/build-aux/post_install.py +@@ -2,11 +2,13 @@ + import os + import subprocess + +-schemadir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas') ++install_prefix = os.environ['MESON_INSTALL_PREFIX'] ++icondir = os.path.join(install_prefix, 'share', 'icons', 'hicolor') ++schemadir = os.path.join(install_prefix, 'share', 'glib-2.0', 'schemas') + + if not os.environ.get('DESTDIR'): + print('Compiling gsettings schemas…') + subprocess.call(['glib-compile-schemas', schemadir], shell=False) + + print('Rebuilding desktop icons cache...') +- subprocess.call(['gtk-update-icon-cache', '/usr/share/icons/hicolor/'], shell=False) ++ subprocess.call(['gtk4-update-icon-cache', '-qtf', icondir], shell=False) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index fe739cb581a38..688d5acdd1278 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -8,7 +8,6 @@ , gettext , yelp-tools , itstool -, libxmlxx3 , python , pygobject3 , gtk3 @@ -35,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "40.0"; + version = "41.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0hq0zdcn80ficpcffbk667907v6m7dih3dhyc7ss01mrj3iyw000"; + sha256 = "dpflFEXhn9d05osWCtr2aHuAgXLeBBdgLhaXZra21L0="; }; patches = [ @@ -58,7 +57,6 @@ buildPythonApplication rec { autoreconfHook wrapGAppsHook pkg-config - libxmlxx3 gettext yelp-tools itstool diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index e269d6313ae1e..ec4d9da93bc12 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -6,7 +6,7 @@ # Native build inputs: , ninja, pkg-config -, python2, python3, perl +, python3, perl , gnutar, which , llvmPackages # postPatch: @@ -56,6 +56,10 @@ let python3WithPackages = python3.withPackages(ps: with ps; [ ply jinja2 setuptools ]); + clangFormatPython3 = fetchurl { + url = "https://chromium.googlesource.com/chromium/tools/build/+/e77882e0dde52c2ccf33c5570929b75b4a2a2522/recipes/recipe_modules/chromium/resources/clang-format?format=TEXT"; + sha256 = "0ic3hn65dimgfhakli1cyf9j3cxcqsf1qib706ihfhmlzxf7256l"; + }; # The additional attributes for creating derivations based on the chromium # source tree. @@ -122,7 +126,7 @@ let nativeBuildInputs = [ ninja pkg-config - python2 python3WithPackages perl + python3WithPackages perl gnutar which llvmPackages.bintools ]; @@ -209,6 +213,9 @@ let # Allow to put extensions into the system-path. sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc + # We need the fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1254408: + base64 --decode ${clangFormatPython3} > buildtools/linux64/clang-format + patchShebangs . # Link to our own Node.js and Java (required during the build): mkdir -p third_party/node/linux/node-linux-x64/bin diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index a7ef9e495b1bb..8cc2725e79721 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": "95.0.4638.40", - "sha256": "1v1n113rh5nzfbk5xaq4kp7fdg5n9rca978a9700nmrd0gqpd2hn", - "sha256bin64": "0xadlal8fb7hqjcq6d931if555spw72wa4d23m0fqcan31sky3i0", + "version": "95.0.4638.49", + "sha256": "11fiq6p2d99hl166pf39g83pk7m7ibi1zz19wj7qmcc7ql7006jz", + "sha256bin64": "04s81fnr01jq74fpl5n6jg8iw5iw6sdwyz40zja68h1crxh5d6d6", "deps": { "gn": { "version": "2021-08-11", @@ -31,9 +31,9 @@ } }, "dev": { - "version": "96.0.4662.6", - "sha256": "14vr0nlp195h0hwfsd43fifl9r3qr875fw2da3gi9l5yi0pxns2q", - "sha256bin64": "1lq114rsgxqrdh18f2x3i0iwdn5ijxw3jb6nrxjxx0c3bvlzhsw8", + "version": "96.0.4664.9", + "sha256": "0hlniaglnd19cb3k2wi9mmf56ws8i89lm5y2dbjpr7vqnmj6qc39", + "sha256bin64": "1crl8gbhjyaa0yhkvm4va0g9dyljra8n5zg9bd1znmjlk0c124x3", "deps": { "gn": { "version": "2021-09-24", diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index d882e3cd2de18..7cc11b1af60fd 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -111,7 +111,7 @@ GEM zeitwerk (2.4.2) PLATFORMS - x86_64-linux + ruby DEPENDENCIES krane diff --git a/pkgs/applications/networking/cluster/nomad/1.0.nix b/pkgs/applications/networking/cluster/nomad/1.0.nix index 092a620b98f42..53430cdf94ed5 100644 --- a/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.11"; - sha256 = "15h7w020p576zl91s5mr4npcmngrqqfj9xzlx6bk9i1cp6h4w0jy"; + version = "1.0.12"; + sha256 = "04fqliz7y4zzs4xraid54mqxwgrzh138nmfcs876vp534slvikpi"; } diff --git a/pkgs/applications/networking/cluster/nomad/1.1.nix b/pkgs/applications/networking/cluster/nomad/1.1.nix index 6363852068e5f..b8c58e9c347c4 100644 --- a/pkgs/applications/networking/cluster/nomad/1.1.nix +++ b/pkgs/applications/networking/cluster/nomad/1.1.nix @@ -6,7 +6,7 @@ callPackage ./genericModule.nix { inherit buildGoModule nvidia_x11 nvidiaGpuSupport; - version = "1.1.5"; - sha256 = "03gxh12bd5mj1l4q3xilil806dsqaqmz93ff7ysf441frgkx3iy3"; + version = "1.1.6"; + sha256 = "1q6fqay1s9qwimjwlldc8hr6009cgx3ghz142mdx36jjv9isj9ln"; vendorSha256 = "0rfd22rf76mwj489zhswah4g3dhhz6davm336xgm9dbnyaz9d8r0"; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 15ce26b6db542..7be9c9cc742ba 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1095,12 +1095,13 @@ "version": "0.1.0" }, "vault": { - "owner": "terraform-providers", + "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vault", "repo": "terraform-provider-vault", - "rev": "v2.11.0", - "sha256": "1yzakc7jp0rs9axnfdqw409asrbjhq0qa7xn4xzpi7m94g1ii12d", - "version": "2.11.0" + "rev": "v2.24.1", + "sha256": "1xk14q06js774lqyylkbp53dnlsbgh3vi38mqqmndh80xigs6d99", + "version": "2.24.1", + "vendorSha256": "1ksla455qfgxpk2dmq3pg52nyyw3v0bg6fm5s60j6cb0lzvjbq48" }, "vcd": { "owner": "terraform-providers", diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 32413346310f2..e9c85450f409c 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.1.138"; + version = "3.1.139"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "0xjcvq7c6rrgqw8cfcfl7af122lm428cqz3v6ssxi595qxq1rg44"; + sha256 = "0gnj89q5mv5qiy6zsp85sswmwzm0y73nffjj3vrccx5lmxd955nv"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 5b14fba5b420b..874fbd6375d0b 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -2,7 +2,7 @@ freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsa-lib, cups, expat, udev, wrapGAppsHook, -hicolor-icon-theme, libuuid, at-spi2-core, at-spi2-atk }: +hicolor-icon-theme, libuuid, at-spi2-core, at-spi2-atk, libappindicator-gtk3 }: let rpath = lib.makeLibraryPath [ @@ -21,6 +21,7 @@ let gnome2.GConf gtk3 pango + libappindicator-gtk3 libuuid libX11 libXScrnSaver diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 9d8a0d68e756f..9b15e12d66fc2 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,33 +1,47 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, openssl -, glibcLocales, expect, ncurses, libotr, curl, readline, libuuid -, cmocka, libmicrohttpd, expat, sqlite, libmesode, autoconf-archive - -, autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null -, notifySupport ? true, libnotify ? null, gdk-pixbuf ? null -, traySupport ? true, gtk2 ? null -, pgpSupport ? true, gpgme ? null -, pythonPluginSupport ? true, python ? null -, omemoSupport ? true, libsignal-protocol-c ? null, libgcrypt ? null +{ lib +, stdenv +, fetchFromGitHub +, autoconf-archive +, autoreconfHook +, cmocka +, curl +, expat +, expect +, glib +, glibcLocales +, libmesode +, libmicrohttpd +, libotr +, libuuid +, ncurses +, openssl +, pkg-config +, readline +, sqlite +, autoAwaySupport ? true, libXScrnSaver ? null, libX11 +, notifySupport ? true, libnotify, gdk-pixbuf +, omemoSupport ? true, libsignal-protocol-c, libgcrypt +, pgpSupport ? true, gpgme +, pythonPluginSupport ? true, python +, traySupport ? true, gtk }: assert autoAwaySupport -> libXScrnSaver != null && libX11 != null; assert notifySupport -> libnotify != null && gdk-pixbuf != null; -assert traySupport -> gtk2 != null; +assert traySupport -> gtk != null; assert pgpSupport -> gpgme != null; assert pythonPluginSupport -> python != null; assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null; -with lib; - stdenv.mkDerivation rec { pname = "profanity"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = version; - sha256 = "0xmzsh0szm8x3hgw65j0cd2bp8cmrnq5pjz49lqajircyzflsngm"; + hash = "sha256-8WGHOy0fSW8o7vMCYZqqpvDsn81JZefM6wGfjQ5iKbU="; }; patches = [ @@ -37,26 +51,42 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - autoreconfHook autoconf-archive glibcLocales pkg-config + autoconf-archive + autoreconfHook + glibcLocales + pkg-config ]; buildInputs = [ - expect readline libuuid glib openssl expat ncurses libotr - curl libmesode cmocka libmicrohttpd sqlite - ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ] - ++ optionals notifySupport [ libnotify gdk-pixbuf ] - ++ optionals traySupport [ gtk2 ] - ++ optionals pgpSupport [ gpgme ] - ++ optionals pythonPluginSupport [ python ] - ++ optionals omemoSupport [ libsignal-protocol-c libgcrypt ]; + cmocka + curl + expat + expect + glib + libmesode + libmicrohttpd + libotr + libuuid + ncurses + openssl + readline + sqlite + ] ++ lib.optionals autoAwaySupport [ libXScrnSaver libX11 ] + ++ lib.optionals notifySupport [ libnotify gdk-pixbuf ] + ++ lib.optionals omemoSupport [ libsignal-protocol-c libgcrypt ] + ++ lib.optionals pgpSupport [ gpgme ] + ++ lib.optionals pythonPluginSupport [ python ] + ++ lib.optionals traySupport [ gtk ]; # Enable feature flags, so that build fail if libs are missing - configureFlags = [ "--enable-c-plugins" "--enable-otr" ] - ++ optionals notifySupport [ "--enable-notifications" ] - ++ optionals traySupport [ "--enable-icons-and-clipboard" ] - ++ optionals pgpSupport [ "--enable-pgp" ] - ++ optionals pythonPluginSupport [ "--enable-python-plugins" ] - ++ optionals omemoSupport [ "--enable-omemo" ]; + configureFlags = [ + "--enable-c-plugins" + "--enable-otr" + ] ++ lib.optionals notifySupport [ "--enable-notifications" ] + ++ lib.optionals traySupport [ "--enable-icons-and-clipboard" ] + ++ lib.optionals pgpSupport [ "--enable-pgp" ] + ++ lib.optionals pythonPluginSupport [ "--enable-python-plugins" ] + ++ lib.optionals omemoSupport [ "--enable-omemo" ]; preAutoreconf = '' mkdir m4 @@ -66,18 +96,15 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.utf8"; - meta = { + meta = with lib; { + homepage = "http://www.profanity.im/"; description = "A console based XMPP client"; longDescription = '' Profanity is a console based XMPP client written in C using ncurses and libstrophe, inspired by Irssi. ''; - homepage = "http://www.profanity.im/"; license = licenses.gpl3Plus; - platforms = platforms.unix; - changelog = "https://github.com/profanity-im/profanity/releases/tag/${version}"; - downloadPage = "https://github.com/profanity-im/profanity/releases/"; maintainers = [ maintainers.devhell ]; - updateWalker = true; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix index d169e1fdea658..04f1732f7a5b8 100644 --- a/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "alpine"; - version = "2.24"; + version = "2.25"; src = fetchurl { url = "http://alpine.x10host.com/alpine/release/src/${pname}-${version}.tar.xz"; - sha256 = "1vxw19nx10y7nx01d9i6gah2f3y5r2idbq56l13bdqi91bx9y6k5"; + sha256 = "0xppxhcbafq9qa1rns5zl0n238gai08xhvcf2as0nx7nh84ib2k5"; }; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 50b3b66f15dce..23b636458c9ba 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,27 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, fetchpatch +{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which , ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib }: stdenv.mkDerivation rec { - version = "20210205"; + version = "20211015"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "sha256-ADg/+gmndOiuQHsncOzS5K4chthXeUFz6RRJsrZNeZY="; + sha256 = "sha256-ObYeh9Q/WZ1N60pxR2LoDNCU8rP4tQt/oIxnqALqMhs="; }; - patches = [ - (fetchpatch { - name = "CVE-2021-32055.patch"; - url = "https://github.com/neomutt/neomutt/commit/fa1db5785e5cfd9d3cd27b7571b9fe268d2ec2dc.patch"; - sha256 = "0bb7gisjynq3w7hhl6vxa469h609bcz6fkdi8vf740pqrwhk68yn"; - }) - ]; - buildInputs = [ cyrus_sasl gss gpgme libkrb5 libidn ncurses notmuch openssl perl lmdb diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 01ad09cd25f80..19354df40adf5 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -1,28 +1,54 @@ -{ lib, fetchurl, appimageTools }: +{ stdenv, lib, fetchurl, makeDesktopItem, copyDesktopItems, makeWrapper, +electron, libsecret }: -let +stdenv.mkDerivation rec { pname = "tutanota-desktop"; version = "3.88.4"; - name = "tutanota-desktop-${version}"; + src = fetchurl { - url = "https://mail.tutanota.com/desktop/tutanota-desktop-linux.AppImage"; - name = "tutanota-desktop-${version}.AppImage"; - sha256 = "sha256-MwvH6SGZwcvxAr5olklqKTF2p2pv8+F5qwpmwN3uZkc="; + url = "https://github.com/tutao/tutanota/releases/download/tutanota-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; + name = "tutanota-desktop-${version}.tar.gz"; + sha256 = "sha256-UOb63+NfW6mHKaj3PDEzvz5hcmJBIISq02rtwgSZMjo="; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; -in appimageTools.wrapType2 { - inherit name src; + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; + + dontConfigure = true; + dontBuild = true; + + desktopItems = makeDesktopItem { + name = pname; + exec = "tutanota-desktop"; + icon = "tutanota-desktop"; + comment = meta.description; + desktopName = "Tutanota Desktop"; + genericName = "Email Reader"; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/opt/tutanota-desktop $out/share/tutanota-desktop + + cp -r ./ $out/opt/tutanota-desktop + mv $out/opt/tutanota-desktop/{locales,resources} $out/share/tutanota-desktop - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ]; + for icon_size in 64 512; do + icon=resources/icons/icon/$icon_size.png + path=$out/share/icons/hicolor/$icon_size'x'$icon_size/apps/tutanota-desktop.png + install -Dm644 $icon $path + done - extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} + makeWrapper ${electron}/bin/electron \ + $out/bin/tutanota-desktop \ + --add-flags $out/share/tutanota-desktop/resources/app.asar \ + --run "mkdir /tmp/tutanota" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]} - install -m 444 -D ${appimageContents}/tutanota-desktop.desktop -t $out/share/applications - substituteInPlace $out/share/applications/tutanota-desktop.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 7c9a697243bda..15688d383b38f 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "owncloud-client"; - version = "2.9.0.5150"; + version = "2.9.1.5500"; src = fetchurl { url = "https://download.owncloud.com/desktop/ownCloud/stable/${version}/source/ownCloud-${version}.tar.xz"; - sha256 = "0nf68x840p30yng4fh1nlyiqg40z0rkcv0lskpz8dd4pj1iw5jjs"; + sha256 = "0h4dclxr6kmhmx318wvxz36lhyqw84q0mg4c6di6p230mp8b1l4v"; }; nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ]; diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/applications/office/khronos/default.nix index b3a38905531e3..f319b419fbbc1 100644 --- a/pkgs/applications/office/khronos/default.nix +++ b/pkgs/applications/office/khronos/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , meson @@ -6,25 +7,24 @@ , vala , pkg-config , desktop-file-utils -, pantheon , python3 , glib , gtk4 , json-glib , libadwaita , libgee -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "khronos"; - version = "3.5.9"; + version = "3.6.0"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "sha256-3FatmyANB/tNYSN2hu5IVkyCy0YrC3uA2d/3+5u48w8="; + sha256 = "sha256-AETyVCBUuBzHwDgTkGRIokFYwcmXrb/F85J5GEIu4dE="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { vala pkg-config python3 - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ @@ -43,12 +43,14 @@ stdenv.mkDerivation rec { json-glib libadwaita libgee - pantheon.granite ]; postPatch = '' chmod +x build-aux/post_install.py patchShebangs build-aux/post_install.py + # https://github.com/lainsce/khronos/pull/75 + substituteInPlace build-aux/post_install.py \ + --replace 'gtk-update-icon-cache' 'gtk4-update-icon-cache' ''; passthru = { diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 723b67872c234..16db7384df17a 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -44,7 +44,7 @@ let "8.13.0".sha256 = "0sjbqmz6qcvnz0hv87xha80qbhvmmyd675wyc5z4rgr34j2l1ymd"; "8.13.1".sha256 = "0xx2ns84mlip9bg2mkahy3pmc5zfcgrjxsviq9yijbzy1r95wf0n"; "8.13.2".sha256 = "1884vbmwmqwn9ngibax6dhnqh4cc02l0s2ajc6jb1xgr0i60whjk"; - "8.14+rc1".sha256 = "0jrkgj7c2959dsinw4x7q4ril1x24qq08snl25hgx33ls4sym5zb"; + "8.14.0".sha256 = "04y2z0qyvag66zanfyc3f9agvmzbn4lsr0p1l7ck6yjhqx7vbm17"; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 20219be776a5e..b46cfb8ee8df2 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip, pkg-config }: rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dRHlbxNV4nS50WbJP5lD1zB7NkZmv7nlPUm3RlQIBtc="; + sha256 = "sha256-NzE2eT3QxnbDW63Cnv6M7IlYgb2XuymphwaL1PTfcyQ="; }; - cargoSha256 = "sha256-9uRvxax0SrvRkD89mbZPxsfRItde11joA/ZgnXK9XBE="; + cargoSha256 = "sha256-9SWovdjYfeneqOVl+I+tuJTIC/htC7h1tXi2KUbdYb8="; nativeBuildInputs = [ python3 perl pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 4126eabed2e2a..849965e15f5a9 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.17.1"; + version = "2.17.2"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-ZVwMfjlKga47oXf6g/P2IAMu6Fcuj8BbRahniTZXmTg="; + sha256 = "sha256-JfT0jW6aUZAYESQI0tFfnITFv20Jk7DWbvz8Ipt4t1Y="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 9859163031c34..f3400f7e8e026 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "odd-unstable"; + versionPolicy = "none"; # should be odd-unstable but we are tracking unstable versions for now }; }; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 3a613f26ae68c..ce9a72aebf9a4 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate fluidsynth wayland wayland-protocols ncurses srt - ] ++ optional (!stdenv.hostPlatform.isAarch64) live555 + ] ++ optional (!stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isAarch32) live555 ++ optionals withQt5 [ qtbase qtsvg qtx11extras ] ++ optionals skins2Support (with xorg; [ libXpm freetype libXext libXinerama ]) ++ optional jackSupport libjack2 @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - LIVE555_PREFIX = if (!stdenv.hostPlatform.isAarch64) then live555 else null; + LIVE555_PREFIX = if (!stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isAarch32) then live555 else null; # vlc depends on a c11-gcc wrapper script which we don't have so we need to # set the path to the compiler diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index d8b6dfc2efaa9..54378dbe13d3f 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -2,6 +2,7 @@ , csmSupport ? false, seabios ? null , secureBoot ? false , httpSupport ? false +, tpmSupport ? false }: assert csmSupport -> seabios != null; @@ -30,9 +31,10 @@ edk2.mkDerivation projectDscPath { hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ]; buildFlags = - lib.optional secureBoot "-DSECURE_BOOT_ENABLE=TRUE" + lib.optional secureBoot "-D SECURE_BOOT_ENABLE=TRUE" ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ] - ++ lib.optionals httpSupport [ "-DNETWORK_HTTP_ENABLE=TRUE" "-DNETWORK_HTTP_BOOT_ENABLE=TRUE" ]; + ++ lib.optionals httpSupport [ "-D NETWORK_HTTP_ENABLE=TRUE" "-D NETWORK_HTTP_BOOT_ENABLE=TRUE" ] + ++ lib.optionals tpmSupport [ "-D TPM_ENABLE" "-D TPM2_ENABLE" "-D TPM2_CONFIG_ENABLE"]; postPatch = lib.optionalString csmSupport '' cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix new file mode 100644 index 0000000000000..3ce3d9a880f8b --- /dev/null +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "docker-compose"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "docker"; + repo = "compose"; + rev = "v${version}"; + sha256 = "sha256-6OjA3f6c9s/86UPxy9EqLIc/0ZuW6UhKyQdkM7YoTsU="; + }; + + vendorSha256 = "sha256-6h36TZmo0RvB3YzZRmsrs2Fbl+8zPTuL9LxWkuNgRqw="; + + doCheck = false; + installPhase = '' + install -D $GOPATH/bin/cmd $out/libexec/docker/cli-plugins/docker-compose + ''; + + meta = with lib; { + description = "Docker CLI plugin to define and run multi-container applications with Docker"; + license = licenses.asl20; + maintainers = [ maintainers.babariviere ]; + }; +} diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 24bd7a1339aa1..8345b2b42d76e 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -8,16 +8,16 @@ rec { , moby-src , runcRev, runcSha256 , containerdRev, containerdSha256 - , tiniRev, tiniSha256, buildxSupport ? true + , tiniRev, tiniSha256, buildxSupport ? true, composeSupport ? true # package dependencies , stdenv, fetchFromGitHub, buildGoPackage , makeWrapper, installShellFiles, pkg-config, glibc , go-md2man, go, containerd_1_4, runc, docker-proxy, tini, libtool - , sqlite, iproute2, lvm2, systemd, docker-buildx + , sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose_2 , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, libseccomp , nixosTests - , clientOnly ? !stdenv.isLinux + , clientOnly ? !stdenv.isLinux, symlinkJoin }: let docker-runc = runc.overrideAttrs (oldAttrs: { @@ -117,6 +117,10 @@ rec { ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper" ++ optional (libseccomp != null) "seccomp"; }); + + plugins = optionals buildxSupport [ docker-buildx ] + ++ optionals composeSupport [ docker-compose_2 ]; + pluginsRef = symlinkJoin { name = "docker-plugins"; paths = plugins; }; in buildGoPackage ((optionalAttrs (!clientOnly) { @@ -141,14 +145,14 @@ rec { ]; buildInputs = optionals (!clientOnly) [ sqlite lvm2 btrfs-progs systemd libseccomp - ] ++ optionals (buildxSupport) [ docker-buildx ]; + ] ++ plugins; postPatch = '' patchShebangs man scripts/build/ substituteInPlace ./scripts/build/.variables --replace "set -eu" "" - '' + optionalString buildxSupport '' + '' + optionalString (plugins != []) '' substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \ - ${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]} + "${pluginsRef}/libexec/docker/cli-plugins" ''; # Keep eyes on BUILDTIME format - https://github.com/docker/cli/blob/${version}/scripts/build/.variables diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix index 327b7fa2ca52a..57069fadbc5ec 100644 --- a/pkgs/data/fonts/inconsolata/default.nix +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -1,12 +1,18 @@ -{ lib, stdenv, google-fonts }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "inconsolata"; + version = "unstable-2021-01-19"; - inherit (google-fonts) src version; + src = fetchFromGitHub { + owner = "google"; + repo = "fonts"; + rev = "f113126dc4b9b1473d9354a86129c9d7b837aa1a"; + sha256 = "0safw5prpa63mqcyfw3gr3a535w4c9hg5ayw5pkppiwil7n3pyxs"; + }; installPhase = '' - install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/static/*.ttf + install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/*.ttf ''; meta = with lib; { diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix index 00de4f6760cde..c0f65ab7eadc6 100644 --- a/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/pkgs/data/icons/qogir-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-icon-theme"; - version = "2021-07-14"; + version = "2021-10-14"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0anma2ss3yqr9njx4ay2nyxjkgnj7ky17c93ipwgrvgsv8jk5nn2"; + sha256 = "0qbbg0hcdda7apk892b8nhbrsvji12nv97ss7lv412xwcmxsj9fp"; }; nativeBuildInputs = [ gtk3 jdupes ]; diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index a1af75ba6ae44..ad72f3e357a60 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "ba457d86df5e8781485cf1b109f249ecf00ee4c6", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/ba457d86df5e8781485cf1b109f249ecf00ee4c6.tar.gz", - "sha256": "1h1qnllhdfp6n71b36jw8kaw7kani76z3mmbigrvy8cmkbvj2mdc", - "msg": "Update from Hackage at 2021-10-08T09:46:02Z" + "commit": "67f421ee170f4f161832c146be8ef87499ff0d37", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/67f421ee170f4f161832c146be8ef87499ff0d37.tar.gz", + "sha256": "0rzwh0iff4xn499vvzv960gmrd85z6amjbbsyhb5qcldcap5jpjs", + "msg": "Update from Hackage at 2021-10-11T20:00:11Z" } diff --git a/pkgs/data/themes/jade1/default.nix b/pkgs/data/themes/jade1/default.nix index f33fa2db54627..42979c8c81b3e 100644 --- a/pkgs/data/themes/jade1/default.nix +++ b/pkgs/data/themes/jade1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.13"; + version = "1.14"; src = fetchurl { url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz"; - sha256 = "04a9c56w4hm8lwa8hzy5lwj4yli19gzy5wp5iinsm61qas9xgy69"; + sha256 = "01p1g0gy6d1c8aa9y7inhn6zhm0qy0fzmwlniiv07h15g32appvd"; }; sourceRoot = "."; diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix index 809b45a0fda08..1eb6a5f39e6d4 100644 --- a/pkgs/data/themes/marwaita/default.nix +++ b/pkgs/data/themes/marwaita/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "11.1"; + version = "11.2"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0jzjrx21i9bny4117nlwkrvjc4cg2w6r42ra66hxzaazcs9hvny2"; + sha256 = "1krfjk76yjyzsxkhymc1dpy3y7ykawdxzwb282wgbb480dpg8s05"; }; buildInputs = [ diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index c158cc8a00ced..83764e3c8bca7 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2021-07-27"; + version = "2021-09-24"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "17x4lqlv6whx8vg0c1nm89j7671l033apn4alqyhjb9qx5w2fa43"; + sha256 = "12dwmgq0kadjfky5bjm62vwgdlw3nmrrhqqs5iw15w0pn3mbmd5c"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/apps/gnome-connections/default.nix b/pkgs/desktops/gnome/apps/gnome-connections/default.nix index a00b239641f82..1f2cb9dc52e1a 100644 --- a/pkgs/desktops/gnome/apps/gnome-connections/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-connections/default.nix @@ -13,6 +13,7 @@ , wrapGAppsHook , glib , gtk3 +, libhandy , libxml2 , gtk-vnc , gtk-frdp @@ -21,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-connections"; - version = "40.0.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-vpvLoHzz+vWs4M5UzSL4YJtNx3ZuJe5f2cGAw5WbTRE="; + hash = "sha256-M5/1VaEI0gt6sPO/GCmWMWAYYOeO+peLpqudGO3DtGA="; }; nativeBuildInputs = [ @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { glib gtk-vnc gtk3 + libhandy libxml2 gtk-frdp ]; diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 11cd3735e1d53..39eb0338332c7 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "40.4"; + version = "41.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "M0IFAODgYPF4pDUGMZfULa57Z+OcxDepZRCjPd9+lfs="; + sha256 = "lautDW/urJVg2zq4C6fF6rsf3xyg47PJMzmvBUU6JNg="; }; postPatch = '' diff --git a/pkgs/desktops/gnome/core/gucharmap/default.nix b/pkgs/desktops/gnome/core/gucharmap/default.nix index 3d2f19b02e8b6..7d15e6b41ef60 100644 --- a/pkgs/desktops/gnome/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome/core/gucharmap/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , intltool , fetchFromGitLab , meson @@ -11,7 +12,6 @@ , desktop-file-utils , gtk-doc , wrapGAppsHook -, gnome , itstool , libxml2 , yelp-tools @@ -25,6 +25,7 @@ , runCommand , symlinkJoin , gobject-introspection +, nix-update-script }: let @@ -93,8 +94,8 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = pname; + updateScript = nix-update-script { + attrPath = "gnome.gucharmap"; }; }; diff --git a/pkgs/desktops/gnome/core/totem/default.nix b/pkgs/desktops/gnome/core/totem/default.nix index 7d1d4e90abf05..0178c04b53ca9 100644 --- a/pkgs/desktops/gnome/core/totem/default.nix +++ b/pkgs/desktops/gnome/core/totem/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "totem"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/totem/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "j/rPfA6inO3qBndzCGHUh2qPesTaTGI0u3X3/TcFoQg="; + sha256 = "/OVi4rJsvPwMZ4U43MgfncFc5g1aie5DWJB79jQwTEA="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix index 6efefd1fb0320..5b1d110d46a58 100644 --- a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-dash-to-dock"; - version = "unstable-2021-07-07"; + version = "unstable-2021-10-03"; - # temporarily switched to https://github.com/micheleg/dash-to-dock/pull/1402 because upstream doesn't work with GNOME 40 yet. + # temporarily switched to commit hash because GNOME 40 version is not released yet. src = fetchFromGitHub { - owner = "ewlsh"; + owner = "micheleg"; repo = "dash-to-dock"; - rev = "e4beec847181e4163b0a99ceaef4c4582cc8ae4c"; - hash = "sha256-7UVnLXH7COnIbqxbt3CCscuu1YyPH6ax5DlKdaHCT/0="; + rev = "9605dd69fe86d4f92416299c3f62605e75827dd3"; + sha256 = "0vrkiq5z2f11gqlfyis2rsnp6j25hwsp24s21vr55qkzkfszsigg"; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix new file mode 100644 index 0000000000000..f9b8020c924cf --- /dev/null +++ b/pkgs/development/compilers/ligo/default.nix @@ -0,0 +1,62 @@ +{ lib +, fetchFromGitLab +, coq +, cacert +}: + +coq.ocamlPackages.buildDunePackage rec { + pname = "ligo"; + version = "0.26.0"; + src = fetchFromGitLab { + owner = "ligolang"; + repo = "ligo"; + rev = "d48098c6724bc0a62170c2f9ff73c792c71c8452"; + sha256 = "sha256-uu5985llYsi/9ExKZetk48FqU0sJQB1EirdT/pUw0DA="; + }; + + # The build picks this up for ligo --version + LIGO_VERSION=version; + + useDune2 = true; + + buildInputs = with coq.ocamlPackages; [ + coq + menhir + menhirLib + qcheck + ocamlgraph + ppx_deriving + ppx_deriving_yojson + ppx_expect + tezos-base + tezos-shell-services + tezos-010-PtGRANAD-test-helpers + tezos-protocol-010-PtGRANAD-parameters + tezos-protocol-010-PtGRANAD + tezos-protocol-environment + yojson + getopt + terminal_size + pprint + linenoise + data-encoding + bisect_ppx + cmdliner + ]; + + checkInputs = [ + cacert + coq.ocamlPackages.ca-certs + ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://ligolang.org/"; + downloadPage = "https://ligolang.org/docs/intro/installation"; + description = "A friendly Smart Contract Language for Tezos"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ ulrikstrid ]; + }; +} diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index fb134962b74a2..ba64e53876cb9 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -91,10 +91,11 @@ let doCheck = false; # fails, requires dbus daemon passthru = { - updateScript = gnome.updateScript { - attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}"; - packageName = pname; - }; + updateScript = gnome.updateScript { + attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}"; + packageName = pname; + freeze = true; + }; }; meta = with lib; { diff --git a/pkgs/development/coq-modules/gaia/default.nix b/pkgs/development/coq-modules/gaia/default.nix index 57a1beead497d..4c571f483e16d 100644 --- a/pkgs/development/coq-modules/gaia/default.nix +++ b/pkgs/development/coq-modules/gaia/default.nix @@ -9,7 +9,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.10" "8.13") "1.12.0" ]; out = "1.12"; } + { cases = [ (range "8.10" "8.14") "1.12.0" ]; out = "1.12"; } { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "1.11"; } ] null; diff --git a/pkgs/development/coq-modules/goedel/default.nix b/pkgs/development/coq-modules/goedel/default.nix index 965ae1b6ec461..c50f8672e01cb 100644 --- a/pkgs/development/coq-modules/goedel/default.nix +++ b/pkgs/development/coq-modules/goedel/default.nix @@ -5,12 +5,14 @@ mkCoqDerivation { pname = "goedel"; owner = "coq-community"; - release."8.12.0".rev = "v8.12.0"; + releaseRev = (v: "v${v}"); + release."8.12.0".sha256 = "sha256-4lAwWFHGUzPcfHI9u5b+N+7mQ0sLJ8bH8beqQubfFEQ="; + release."8.13.0".sha256 = "0sqqkmj6wsk4xmhrnqkhcsbsrqjzn2gnk67nqzgrmjpw5danz8y5"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.11" "8.13"; out = "8.12.0"; } + { case = range "8.11" "8.14"; out = "8.13.0"; } ] null; propagatedBuildInputs = [ hydra-battles pocklington ]; diff --git a/pkgs/development/coq-modules/mathcomp-zify/default.nix b/pkgs/development/coq-modules/mathcomp-zify/default.nix index 65af999d08f29..6ed8e114d8031 100644 --- a/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -8,10 +8,11 @@ with lib; mkCoqDerivation rec { defaultVersion = with versions; switch [ coq.coq-version mathcomp-algebra.version ] [ - { cases = [ (isEq "8.13") (isEq "1.12") ]; out = "1.0.0+1.12+8.13"; } + { cases = [ (range "8.13" "8.14") (isEq "1.12") ]; out = "1.1.0+1.12+8.13"; } ] null; release."1.0.0+1.12+8.13".sha256 = "1j533vx6lacr89bj1bf15l1a0s7rvrx4l00wyjv99aczkfbz6h6k"; + release."1.1.0+1.12+8.13".sha256 = "1plf4v6q5j7wvmd5gsqlpiy0vwlw6hy5daq2x42gqny23w9mi2pr"; propagatedBuildInputs = [ mathcomp-algebra ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index de595427da845..812029e5974d1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -64,7 +64,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1022ff2x9jvi2a0820lbgmmh54cxh1vbn0qfdwr50w7ggvjp88i6"; + sha256 = "1yn84q0iy81b2sczbf4gx8b56f9ghb9kgwjc0n7l5xn5lb2wqlqa"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash @@ -1990,7 +1990,7 @@ EOT # Needs Cabal >= 3.4 chs-cabal = super.chs-cabal.override { - Cabal = self.Cabal_3_6_1_0; + Cabal = self.Cabal_3_6_2_0; }; # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too. diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 714b889f2c058..4d0c33208944a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -44,15 +44,15 @@ self: super: { # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = super.cabal-install.overrideScope (self: super: { - Cabal = self.Cabal_3_6_1_0; + Cabal = self.Cabal_3_6_2_0; }); # cabal-install-parsers is written for Cabal 3.6 - cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_1_0; }; + cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_2_0; }; # older version of cabal-install-parsers for reverse dependencies that use Cabal 3.4 cabal-install-parsers_0_4_2 = super.cabal-install-parsers_0_4_2.override { - Cabal = self.Cabal_3_4_0_0; + Cabal = self.Cabal_3_4_1_0; }; # Jailbreak to fix the build. diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 0d1efbf711987..25d8e44b4545a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -51,7 +51,7 @@ self: super: { # cabal-install needs more recent versions of Cabal and random, but an older # version of base16-bytestring. cabal-install = super.cabal-install.overrideScope (self: super: { - Cabal = self.Cabal_3_6_1_0; + Cabal = self.Cabal_3_6_2_0; }); # Ignore overly restrictive upper version bounds. @@ -98,7 +98,7 @@ self: super: { darcs = dontDistribute super.darcs; # The package needs the latest Cabal version. - cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_6_1_0; }); + cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_6_2_0; }); # cabal-fmt requires Cabal3 cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_1_0; }; 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 df96afc0e0ca4..f8e6cdb8193ac 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: { # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { - Cabal = self.Cabal_3_6_1_0; + Cabal = self.Cabal_3_6_2_0; }); # Jailbreaks & Version Updates @@ -72,6 +72,17 @@ self: super: { vector-binary-instances = doJailbreak super.vector-binary-instances; vector-th-unbox = doJailbreak super.vector-th-unbox; zlib = doJailbreak super.zlib; + weeder = self.weeder_2_3_0; + generic-lens-core = self.generic-lens-core_2_2_0_0; + generic-lens = self.generic-lens_2_2_0_0; + + # Doesn't allow Dhall 1.39.* + weeder_2_3_0 = super.weeder_2_3_0.override { + dhall = self.dhall_1_40_1; + }; + + # Upstream also disables test for GHC 9: https://github.com/kcsongor/generic-lens/pull/130 + generic-lens_2_2_0_0 = dontCheck super.generic-lens_2_2_0_0; # Apply patches from head.hackage. alex = appendPatch (dontCheck super.alex) (pkgs.fetchpatch { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 7471021f0a915..0bd4b31a15a9c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1284,6 +1284,7 @@ broken-packages: - escape-artist - escoger - espial + - esqueleto-pgcrypto - ess - estimators - EstProgress @@ -1534,7 +1535,6 @@ broken-packages: - funcons-values - function-instances-algebra - functor - - functor-combinators - functor-friends - functor-infix - functorm @@ -1676,6 +1676,7 @@ broken-packages: - git-cuk - git-date - gitdo + - github - github-backup - github-data - github-tools @@ -3847,7 +3848,6 @@ broken-packages: - process-leksah - process-listlike - processmemory - - procex - procrastinating-variable - procstat - prof2pretty @@ -4384,6 +4384,7 @@ broken-packages: - shopify - shortcut-links - shorten-strings + - short-vec - show-prettyprint - Shpadoinkle-backend-snabbdom - Shpadoinkle-isreal @@ -4716,6 +4717,7 @@ broken-packages: - SVD2HS - svfactor - svg-builder-fork + - svgcairo - svgutils - svm-light-utils - svm-simple @@ -5288,6 +5290,7 @@ broken-packages: - warc - warp-dynamic - warp-grpc + - warp-quic - warp-static - warp-systemd - wasm diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 073fc552f1a25..2e0fa14b663a9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -98,6 +98,8 @@ default-package-overrides: - ghc-api-compat == 8.10.7 # 2021-09-14: Pin hiedb to version needed by ghcide - hiedb == 0.4.0.* + # 2021-10-13: weeder 2.3.0 require GHC == 9.0.*; remove pin when GHC version changes + - weeder < 2.3.0 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 9c3f7a77e80a7..7d516aa93de59 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -534,6 +534,7 @@ dont-distribute-packages: - base64-bytes - baserock-schema - batchd + - batching - battlenet-yesod - battleships - bayes-stack @@ -732,7 +733,9 @@ dont-distribute-packages: - claferwiki - clash - clash-ghc + - clash-ghc_1_4_4 - clash-lib + - clash-lib_1_4_4 - clash-multisignal - clash-prelude-quickcheck - clash-shake @@ -935,6 +938,7 @@ dont-distribute-packages: - delta - delta-h - dep-t-advice + - dependent-literals-plugin - dependent-state - dephd - deptrack-devops @@ -1117,6 +1121,7 @@ dont-distribute-packages: - filesystem-enumerator - find-clumpiness - findhttp + - finite-table - firstify - fix-parser-simple - fixed-point-vector @@ -2426,6 +2431,7 @@ dont-distribute-packages: - nomyx-language - nomyx-library - nomyx-server + - notifications-tray-icon - notmuch-haskell - notmuch-web - numeric-ode @@ -2453,6 +2459,7 @@ dont-distribute-packages: - one-liner_2_0 - online - online-csv + - opc-xml-da-client - open-adt-tutorial - open-union - openpgp-Crypto @@ -2559,6 +2566,7 @@ dont-distribute-packages: - polh-lexicon - polydata - polysemy-RandomFu + - polysemy-check - polysemy-http - polysemy-log-co - polysemy-methodology-co-log @@ -2907,13 +2915,13 @@ dont-distribute-packages: - servant-auth-token-persistent - servant-auth-token-rocksdb - servant-auth-wordpress - - servant-cli - servant-client-namedargs - servant-csharp - servant-db-postgresql - servant-ede - servant-event-stream - servant-examples + - servant-github-webhook - servant-http2-client - servant-matrix-param - servant-polysemy @@ -2941,6 +2949,7 @@ dont-distribute-packages: - shelduck - shellmate-extras - shine-varying + - short-vec-lens - showdown - shpider - shuffle diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index bdb1a8dda4915..5fc968ccddeba 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -978,4 +978,21 @@ self: super: builtins.intersectAttrs super { doCheck = with pkgs.stdenv; hostPlatform == buildPlatform && buildPlatform.isx86; }; + + # procex relies on close_range which has been introduced in Linux 5.9, + # the test suite seems to force the use of this feature (or the fallback + # mechanism is broken), so we can't run the test suite on machines with a + # Kernel < 5.9. To check for this, we use uname -r to obtain the Kernel + # version and sort -V to compare against our minimum version. If the + # Kernel turns out to be older, we disable the test suite. + procex = overrideCabal super.procex (drv: { + postConfigure = '' + minimumKernel=5.9 + higherVersion=`printf "%s\n%s\n" "$minimumKernel" "$(uname -r)" | sort -rV | head -n1` + if [[ "$higherVersion" = "$minimumKernel" ]]; then + echo "Used Kernel doesn't support close_range, disabling tests" + unset doCheck + fi + '' + (drv.postConfigure or ""); + }); } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7d8e69f2b7ff4..cf6245bf32d62 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2745,7 +2745,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal_3_4_0_0" = callPackage + "Cabal_3_4_1_0" = callPackage ({ mkDerivation, array, async, base, base-compat, base-orphans , binary, bytestring, clock, containers, deepseq, Diff, directory , filepath, integer-logarithms, mtl, optparse-applicative, parsec @@ -2755,8 +2755,8 @@ self: { }: mkDerivation { pname = "Cabal"; - version = "3.4.0.0"; - sha256 = "1za1cl14fkw8y89hhw6sqirzmkixjaa4wpqsibyk0fvnjs59jydq"; + version = "3.4.1.0"; + sha256 = "1rqpq6l4b9990rmlgcyz44awps6r37ccyi6bgk7dhcsflad6prj4"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -2775,15 +2775,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal_3_6_1_0" = callPackage + "Cabal_3_6_2_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, mtl, parsec, pretty, process, text , time, transformers, unix }: mkDerivation { pname = "Cabal"; - version = "3.6.1.0"; - sha256 = "0yjdp78775752k10q4j5dbvqj37xaa2b3anmfld53mgr17k182a7"; + version = "3.6.2.0"; + sha256 = "0hmw2wkypd42qyyfi6rhbsxmymbxg9rrw683yg39627vlw33v44y"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -3369,6 +3369,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "Color_0_3_3" = callPackage + ({ mkDerivation, base, colour, criterion, data-default-class + , deepseq, hspec, hspec-discover, HUnit, JuicyPixels, massiv + , massiv-test, QuickCheck, random, vector + }: + mkDerivation { + pname = "Color"; + version = "0.3.3"; + sha256 = "14sf71lhqc1w6s3p1k8a99xgzcwfnr3v5irvfkr09rvv7fd66nva"; + libraryHaskellDepends = [ base data-default-class deepseq vector ]; + testHaskellDepends = [ + base colour hspec HUnit JuicyPixels massiv massiv-test QuickCheck + random vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base colour criterion deepseq random ]; + description = "Color spaces and conversions between them"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Combinatorrent" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, cereal , containers, deepseq, directory, filepath, hopenssl, hslogger @@ -9439,6 +9460,8 @@ self: { pname = "HTTP"; version = "4000.3.16"; sha256 = "0bgyj3ahqlyg0jw6qsm2sncp8mklc4h0dj91s043vb3ig01iq2fn"; + revision = "1"; + editedCabalFile = "0wagwgzfy2mqkha88fjl37ah0l7h4biz34v65993xd502ly68hk0"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -18082,8 +18105,8 @@ self: { pname = "SecureHash-SHA3"; version = "0.1.1.0"; sha256 = "0dva3bzfzyzh8kxljyipd041a2w1zhxjvxmhnw2mlv2jcywnk2hz"; - revision = "2"; - editedCabalFile = "0rvalvvjadb0i0rh9z5lgw2hca4a9yw3cg2f6gcx7h30f5dp8x1j"; + revision = "3"; + editedCabalFile = "0jsx09bjk98nvfy0fvr5n2dyx8s22xnq66dvniyl572g5kfyknwm"; libraryHaskellDepends = [ base bytestring ]; description = "simple static linked SHA3 using private symbols and the ref impl"; license = lib.licenses.bsd2; @@ -24450,6 +24473,41 @@ self: { license = lib.licenses.bsd3; }) {}; + "aeson_2_0_1_0" = callPackage + ({ mkDerivation, attoparsec, base, base-compat + , base-compat-batteries, base-orphans, base16-bytestring + , bytestring, containers, data-fix, deepseq, Diff, directory, dlist + , filepath, generic-deriving, ghc-prim, hashable + , indexed-traversable, integer-logarithms, primitive, QuickCheck + , quickcheck-instances, scientific, semialign, strict, tagged + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck + , template-haskell, text, th-abstraction, these, time, time-compat + , unordered-containers, uuid-types, vector, witherable + }: + mkDerivation { + pname = "aeson"; + version = "2.0.1.0"; + sha256 = "0zlplkgsv1czp4rvi9k6pyyrfgd6vcdkj9vq84dr9zf7pzi8fl1s"; + libraryHaskellDepends = [ + attoparsec base base-compat-batteries bytestring containers + data-fix deepseq dlist ghc-prim hashable indexed-traversable + primitive scientific semialign strict tagged template-haskell text + th-abstraction these time time-compat unordered-containers + uuid-types vector witherable + ]; + testHaskellDepends = [ + attoparsec base base-compat base-orphans base16-bytestring + bytestring containers data-fix Diff directory dlist filepath + generic-deriving ghc-prim hashable integer-logarithms QuickCheck + quickcheck-instances scientific strict tagged tasty tasty-golden + tasty-hunit tasty-quickcheck template-haskell text these time + time-compat unordered-containers uuid-types vector + ]; + description = "Fast JSON parsing and encoding"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson-applicative" = callPackage ({ mkDerivation, aeson, base, text, unordered-containers }: mkDerivation { @@ -24604,6 +24662,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "aeson-compat_0_3_10" = callPackage + ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base + , base-compat, base-orphans, bytestring, containers, exceptions + , hashable, QuickCheck, quickcheck-instances, scientific, tagged + , tasty, tasty-hunit, tasty-quickcheck, text, time + , time-locale-compat, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-compat"; + version = "0.3.10"; + sha256 = "0ia3qfdpbrzhwwg4ywpdwca0z1m85k081pcz6jh1sx8qjsvcr71w"; + libraryHaskellDepends = [ + aeson attoparsec attoparsec-iso8601 base base-compat bytestring + containers exceptions hashable scientific tagged text time + time-locale-compat unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat base-orphans bytestring + containers exceptions hashable QuickCheck quickcheck-instances + scientific tagged tasty tasty-hunit tasty-quickcheck text time + time-locale-compat unordered-containers vector + ]; + description = "Compatibility layer for aeson"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson-decode" = callPackage ({ mkDerivation, aeson, aeson-qq, base, containers, data-default , hedgehog, text, time, unordered-containers, vector @@ -24712,10 +24797,8 @@ self: { }: mkDerivation { pname = "aeson-extra"; - version = "0.5"; - sha256 = "0nlp6bwb8zynfncfzr05fi9acfs8n2fkz4anm2c0g97dk2ziq213"; - revision = "2"; - editedCabalFile = "02c6rjwm8dyijfcj2wvhx1s9pd3d37g9yqgih4x80na533naps31"; + version = "0.5.1"; + sha256 = "13d01hppx71cm7f901n1bd0hxj69ikbp57i6ckfygc6da0mg49jc"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base base-compat-batteries bytestring containers deepseq exceptions hashable parsec @@ -24994,6 +25077,24 @@ self: { license = lib.licenses.mit; }) {}; + "aeson-optics_1_1_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , optics-core, optics-extra, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "aeson-optics"; + version = "1.1.1"; + sha256 = "1na5nsbp4sds8q289knzj4rgiwabbinxm0ihh66jfz0sjiia4wp7"; + libraryHaskellDepends = [ + aeson attoparsec base base-compat bytestring optics-core + optics-extra scientific text unordered-containers vector + ]; + description = "Law-abiding optics for aeson"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson-options" = callPackage ({ mkDerivation, aeson, base }: mkDerivation { @@ -25062,6 +25163,8 @@ self: { pname = "aeson-pretty"; version = "0.8.8"; sha256 = "09n7gs91y1fbw6gjszrd2na3isnvk3y5rsi90lzjrwywnqfadkl1"; + revision = "1"; + editedCabalFile = "0xr8f76vmcdvlg8wvw0jdrzpzqy73d4rvf633wfwhmslfr7f5jvg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25096,6 +25199,29 @@ self: { license = lib.licenses.mit; }) {}; + "aeson-qq_0_8_4" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim + , haskell-src-meta, hspec, hspec-discover, parsec, scientific + , template-haskell, text, vector + }: + mkDerivation { + pname = "aeson-qq"; + version = "0.8.4"; + sha256 = "0dpklq2xdhrkg1rdc7zfdjnzm6c3qxx2i1xskrqdxpqi84ffnlyh"; + libraryHaskellDepends = [ + aeson attoparsec base base-compat haskell-src-meta parsec + scientific template-haskell text vector + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat ghc-prim haskell-src-meta hspec + parsec scientific template-haskell text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "JSON quasiquoter for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson-quick" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , deepseq, microlens, tasty, tasty-hunit, text @@ -25189,6 +25315,37 @@ self: { broken = true; }) {}; + "aeson-schemas_1_3_5" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, criterion, deepseq + , first-class-families, hashable, hint, interpolate, megaparsec + , QuickCheck, raw-strings-qq, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, text, th-orphans + , th-test-utils, unordered-containers + }: + mkDerivation { + pname = "aeson-schemas"; + version = "1.3.5"; + sha256 = "1fdq109yjmvixri7hamj8z0iryxxdja8kkm6pk54mi0az0vx9743"; + libraryHaskellDepends = [ + aeson base first-class-families hashable megaparsec + template-haskell text unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-qq base deepseq first-class-families hashable hint + interpolate megaparsec QuickCheck raw-strings-qq tasty tasty-golden + tasty-hunit tasty-quickcheck template-haskell text th-orphans + th-test-utils unordered-containers + ]; + benchmarkHaskellDepends = [ + aeson base criterion deepseq first-class-families hashable + megaparsec template-haskell text th-test-utils unordered-containers + ]; + description = "Easily consume JSON data on-demand with type-safety"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "aeson-serialize" = callPackage ({ mkDerivation, aeson, base, cereal, hspec, HUnit }: mkDerivation { @@ -27924,8 +28081,8 @@ self: { pname = "amazonka-core"; version = "1.6.1"; sha256 = "0hx250dja1l4n4y5115w0qngzlqj8f6p861sdaykh0yjm4nzb621"; - revision = "1"; - editedCabalFile = "1656dyw6fk3gvph6v3xzvdp3p8xny3ji0gxg7qxvmvn60gj9ricv"; + revision = "2"; + editedCabalFile = "15mwn2cv4f99rb53wzk7hplb6ncpcl7crsvj8dx71ymm60cf2kxr"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit conduit-extra cryptonite deepseq exceptions hashable @@ -30453,8 +30610,8 @@ self: { }: mkDerivation { pname = "ansi-terminal-game"; - version = "1.1.1.0"; - sha256 = "07b4sxx36r604j2q3xyk1y962c6fgy091ly4gc27v49zhmfrmypr"; + version = "1.2.0.0"; + sha256 = "167zld2dwb1l81w1n8iiqdgxx8805sirr9lsacn1ni8cfzzl2gf6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35120,15 +35277,28 @@ self: { }) {}; "attenuation" = callPackage - ({ mkDerivation, base, profunctors }: + ({ mkDerivation, base, constraints }: mkDerivation { pname = "attenuation"; - version = "0.1.0.0"; - sha256 = "0swiqnh34654rljydbd91nbkpgi1x816b7y3f57i4qnync29nsd0"; + version = "0.2.0"; + sha256 = "0qp203qchmllxsrcfz04lxnssrij203i5q8byy159vc8cspd03nq"; revision = "1"; - editedCabalFile = "1bh0ydj5fywx8zcgvfb40092jb09njj2kk09kg7gfvq2fvpz5whr"; - libraryHaskellDepends = [ base profunctors ]; - description = "Representational subtyping relations and variance roles"; + editedCabalFile = "11h8m92hb0spgzvbijkgfbhbhrnf76a8w2z6yw8zahk0bgdqxrzi"; + libraryHaskellDepends = [ base constraints ]; + description = "Subtyping relations and variance roles"; + license = lib.licenses.asl20; + }) {}; + + "attenuation-profunctors" = callPackage + ({ mkDerivation, attenuation, base, constraints, profunctors }: + mkDerivation { + pname = "attenuation-profunctors"; + version = "0.1.0"; + sha256 = "11zhh9iwb7r2jfp9bn8bqx1wzl4mln9v80gb2jijp0rryag25ili"; + libraryHaskellDepends = [ + attenuation base constraints profunctors + ]; + description = "Attenuation support for Profunctors"; license = lib.licenses.asl20; }) {}; @@ -35729,6 +35899,8 @@ self: { pname = "authenticate"; version = "1.3.5"; sha256 = "10df40ycd4r45p58xzdh0vcsa401909fa99nkgd18fx5alqh84sz"; + revision = "1"; + editedCabalFile = "0lmb1m5d1l2scnm2fqxfk348m8xqbc7f7kvk7zvpsvcdcpxinafz"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring case-insensitive conduit containers html-conduit http-conduit http-types network-uri @@ -36497,6 +36669,8 @@ self: { pname = "aws"; version = "0.22"; sha256 = "1l3f94mpih7slz37ikyjkyrwvlf110w87997d8sbnbd8glwlcb8r"; + revision = "1"; + editedCabalFile = "1xj2chcn73v45wxb3lr0b3px6p3gbbzvwgx1mqrds4lp2yy7a1cr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38790,8 +38964,8 @@ self: { pname = "base64-bytestring-type"; version = "1.0.1"; sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn"; - revision = "9"; - editedCabalFile = "003vi0psr8s5whjy1qw43swiw1g1l1mxa962xqz9fdpxbmvlanfy"; + revision = "10"; + editedCabalFile = "0d9nd34ga5xhgkvbysqzyn03w3zi42hgfjk6cza2ymiqxrl2yk9m"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable http-api-data QuickCheck serialise text @@ -39136,6 +39310,7 @@ self: { ]; description = "An Applicative Functor deferring actions to run in a batch later"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "battlenet" = callPackage @@ -40982,6 +41157,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "binary-instances_1_0_2" = callPackage + ({ mkDerivation, aeson, base, binary, binary-orphans, bytestring + , case-insensitive, hashable, QuickCheck, quickcheck-instances + , scientific, tagged, tasty, tasty-quickcheck, text, text-binary + , time-compat, unordered-containers, vector + , vector-binary-instances + }: + mkDerivation { + pname = "binary-instances"; + version = "1.0.2"; + sha256 = "10z29k35clq74ma2f0yrkbyf14wdax1zzgb6mn26ja4vp9f5wc14"; + libraryHaskellDepends = [ + aeson base binary binary-orphans case-insensitive hashable + scientific tagged text text-binary time-compat unordered-containers + vector vector-binary-instances + ]; + testHaskellDepends = [ + aeson base binary bytestring case-insensitive hashable QuickCheck + quickcheck-instances scientific tagged tasty tasty-quickcheck text + time-compat unordered-containers vector + ]; + description = "Orphan instances for binary"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "binary-io" = callPackage ({ mkDerivation, async, base, binary, bytestring, concurrency , deque, exceptions, hspec, process, stm, transformers @@ -41256,6 +41457,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "binary-tagged_0_3_1" = callPackage + ({ mkDerivation, array, base, base16-bytestring, binary + , binary-instances, bytestring, containers, criterion, deepseq + , QuickCheck, quickcheck-instances, singleton-bool, structured + , tagged, tasty, tasty-hunit, tasty-quickcheck, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "binary-tagged"; + version = "0.3.1"; + sha256 = "01d1wb8h5mz76l09r2azphvhm1y3nar8pqrh2waxn797bd2dh6fp"; + libraryHaskellDepends = [ + array base base16-bytestring binary bytestring containers + structured tagged + ]; + testHaskellDepends = [ + base binary binary-instances bytestring QuickCheck + quickcheck-instances singleton-bool tagged tasty tasty-hunit + tasty-quickcheck transformers + ]; + benchmarkHaskellDepends = [ + base binary binary-instances bytestring criterion deepseq text + unordered-containers + ]; + description = "Tagged binary serialisation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "binary-tree" = callPackage ({ mkDerivation, base, ChasingBottoms, checkers, criterion, deepseq , doctest, ghc-prim, HUnit, QuickCheck, random, test-framework @@ -43815,8 +44045,8 @@ self: { pname = "blank-canvas"; version = "0.7.3"; sha256 = "1g10959ly5nv2xfhax4pamzxnxkqbniahplc5za8k5r4nq1vjrm2"; - revision = "3"; - editedCabalFile = "0bdl3xbxj2dpg5gv1h0561hhjjs6pp3bkgrg18gpl3pbksmr9q8j"; + revision = "4"; + editedCabalFile = "0lxslpm4s98ddh12py9810k2q872vizphfrszp8gxkkvfzflbb5b"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -47127,6 +47357,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "bugsnag-hs_0_2_0_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, hedgehog, http-client + , text, time, unordered-containers + }: + mkDerivation { + pname = "bugsnag-hs"; + version = "0.2.0.5"; + sha256 = "1gm38w8vjgxmn2a9a7xr364pcv7vsvd3brf90hwbwh7y88q6jdn2"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring http-client text time unordered-containers + ]; + testHaskellDepends = [ aeson base bytestring hedgehog ]; + description = "A Bugsnag client for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bugzilla" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection , containers, data-default, http-conduit, http-types, iso8601-time @@ -47991,10 +48239,8 @@ self: { }: mkDerivation { pname = "bytesmith"; - version = "0.3.7.0"; - sha256 = "13dc4cwiga63wmnw9hl332d8gvqjl4yl0p09z2pkmwl81br7ybrc"; - revision = "1"; - editedCabalFile = "0jwax6jdzfcy007dqwdza1r4q8s12ly2gpzpaqy8gi52ap6xc05x"; + version = "0.3.8.0"; + sha256 = "0rfqpnc1awnpn50yfjxgwb65byhdcg5rivg3mbsd5clmq337cz12"; libraryHaskellDepends = [ base byteslice bytestring contiguous primitive run-st text-short wide-word @@ -49428,8 +49674,8 @@ self: { }: mkDerivation { pname = "cabal-install"; - version = "3.6.0.0"; - sha256 = "0ishq4n1jn0kll8257akrzm95lg9ryhyp9pzypcikgvqhl0sz741"; + version = "3.6.2.0"; + sha256 = "0dihpm4h3xh13vnpvwflnb7v614qdvljycc6ffg5cvhwbwfrxyfw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -49552,6 +49798,8 @@ self: { pname = "cabal-install-parsers"; version = "0.4.3"; sha256 = "0gpnfv80rhrws12b1klyi5fkqvn8pgnl2hxh5fbnfp8fbrwklfjq"; + revision = "1"; + editedCabalFile = "18ngagasjind29r0840rnsjzzki92q01yi1p0fw4i5p129mczc8n"; libraryHaskellDepends = [ aeson base base16-bytestring binary binary-instances bytestring Cabal containers cryptohash-sha256 deepseq directory filepath lukko @@ -49701,6 +49949,34 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "cabal-plan_0_7_2_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base, base-compat + , base16-bytestring, bytestring, containers, directory, filepath + , mtl, optics-core, optparse-applicative, parsec, process + , semialign, singleton-bool, text, these, topograph, transformers + , vector + }: + mkDerivation { + pname = "cabal-plan"; + version = "0.7.2.1"; + sha256 = "0n45bakzf1r1nyvs76fmrj0cf74knqnpyb2i82baxia0falbp48r"; + configureFlags = [ "-fexe" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring containers directory + filepath text + ]; + executableHaskellDepends = [ + ansi-terminal async base base-compat bytestring containers + directory mtl optics-core optparse-applicative parsec process + semialign singleton-bool text these topograph transformers vector + ]; + description = "Library and utility for processing cabal's plan.json file"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "cabal-progdeps" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { @@ -50990,8 +51266,8 @@ self: { }: mkDerivation { pname = "camfort"; - version = "1.1.1"; - sha256 = "173k5mf2w4ba553j8qh5biljw3xhrk0qipix72cx8xd0vadkh62f"; + version = "1.1.2"; + sha256 = "13a6x4j4f95izwz7g5sykpb2pq4lzwcswi31986gkyl6nicn5cfj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56080,6 +56356,37 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "clash-ghc_1_4_4" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, Cabal + , clash-lib, clash-prelude, concurrent-supply, containers, deepseq + , directory, exceptions, extra, filepath, ghc, ghc-boot, ghc-prim + , ghc-typelits-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, ghci, hashable, haskeline, integer-gmp + , lens, mtl, primitive, process, reflection, split + , template-haskell, text, time, transformers, uniplate, unix + , unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "clash-ghc"; + version = "1.4.4"; + sha256 = "0dcyf8q5n37v1arq7dyxbgg80j1dnh3i444v9p1p9rs93l2vfnab"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bifunctors bytestring Cabal clash-lib clash-prelude + concurrent-supply containers deepseq directory exceptions extra + filepath ghc ghc-boot ghc-prim ghc-typelits-extra + ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable + haskeline integer-gmp lens mtl primitive process reflection split + template-haskell text time transformers uniplate unix + unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ base ]; + description = "Clash: a functional hardware description language - GHC frontend"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "clash-lib" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array , attoparsec, base, base16-bytestring, binary, bytestring @@ -56123,6 +56430,49 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "clash-lib_1_4_4" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array + , attoparsec, base, base16-bytestring, binary, bytestring + , clash-prelude, concurrent-supply, containers, cryptohash-sha256 + , data-binary-ieee754, data-default, deepseq, directory, dlist + , errors, exceptions, extra, filepath, ghc, ghc-boot-th + , ghc-typelits-knownnat, hashable, haskell-src-exts + , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl + , ordered-containers, parsers, pretty-show, prettyprinter + , primitive, process, quickcheck-text, reducers, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, terminal-size + , text, text-show, time, transformers, trifecta + , unordered-containers, utf8-string, vector + , vector-binary-instances + }: + mkDerivation { + pname = "clash-lib"; + version = "1.4.4"; + sha256 = "1s04m806mdx12mbg30qrx8w75mavs5r8g7dmf5k1v9jn97jk4gvs"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal array attoparsec base + base16-bytestring binary bytestring clash-prelude concurrent-supply + containers cryptohash-sha256 data-binary-ieee754 data-default + deepseq directory dlist errors exceptions extra filepath ghc + ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate + lens mtl ordered-containers parsers pretty-show prettyprinter + primitive process reducers template-haskell temporary terminal-size + text text-show time transformers trifecta unordered-containers + utf8-string vector vector-binary-instances + ]; + testHaskellDepends = [ + aeson aeson-pretty base base16-bytestring bytestring clash-prelude + concurrent-supply containers data-default deepseq ghc + ghc-typelits-knownnat haskell-src-exts lens pretty-show + quickcheck-text tasty tasty-hunit tasty-quickcheck template-haskell + text transformers unordered-containers + ]; + description = "Clash: a functional hardware description language - As a library"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "clash-multisignal" = callPackage ({ mkDerivation, base, clash-prelude, deepseq , ghc-typelits-knownnat, QuickCheck @@ -56180,6 +56530,48 @@ self: { broken = true; }) {}; + "clash-prelude_1_4_4" = callPackage + ({ mkDerivation, array, arrows, base, bifunctors, binary + , bytestring, Cabal, cabal-doctest, constraints, containers + , criterion, data-binary-ieee754, data-default-class, deepseq + , doctest, ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, half, hashable, hedgehog, hint + , integer-gmp, interpolate, lens, QuickCheck + , quickcheck-classes-base, recursion-schemes, reflection + , singletons, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck + , tasty-th, template-haskell, text, text-show, th-abstraction + , th-lift, th-orphans, time, transformers, type-errors, uniplate + , vector + }: + mkDerivation { + pname = "clash-prelude"; + version = "1.4.4"; + sha256 = "14304dc9s91blh8ljv8hd3h6gsz0nr83fzf83xkr6mxkdlhzknd4"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array arrows base bifunctors binary bytestring constraints + containers data-binary-ieee754 data-default-class deepseq ghc-prim + ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise + half hashable integer-gmp interpolate lens QuickCheck + recursion-schemes reflection singletons template-haskell text + text-show th-abstraction th-lift th-orphans time transformers + type-errors uniplate vector + ]; + testHaskellDepends = [ + base deepseq doctest ghc-typelits-extra ghc-typelits-knownnat + ghc-typelits-natnormalise hedgehog hint quickcheck-classes-base + tasty tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th + template-haskell + ]; + benchmarkHaskellDepends = [ + base criterion deepseq template-haskell + ]; + description = "Clash: a functional hardware description language - Prelude library"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "clash-prelude-quickcheck" = callPackage ({ mkDerivation, base, clash-prelude, QuickCheck }: mkDerivation { @@ -66442,8 +66834,8 @@ self: { pname = "criterion"; version = "1.5.10.0"; sha256 = "0akws27z3i9381xrb0p0h5qicz4w5nnxy8jq7gk68gi50gj0flxq"; - revision = "1"; - editedCabalFile = "0j5cmc0w5m4fy28531f79dmbv3la51zh7k14l3kq3ix835crmmbz"; + revision = "2"; + editedCabalFile = "11jdxivx971fbwrg8g0pq365kg6zr6gs06zc5jcjhj34pyr6xpdr"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -66467,6 +66859,44 @@ self: { license = lib.licenses.bsd3; }) {}; + "criterion_1_5_11_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat + , base-compat-batteries, binary, binary-orphans, bytestring + , cassava, code-page, containers, criterion-measurement, deepseq + , directory, exceptions, filepath, Glob, HUnit, js-chart + , microstache, mtl, mwc-random, optparse-applicative, parsec + , QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck + , text, time, transformers, transformers-compat, vector + , vector-algorithms + }: + mkDerivation { + pname = "criterion"; + version = "1.5.11.0"; + sha256 = "1lwawng4rmhmqqn8gsalfn4xj2n19gwz7pl4wjssicl5qgmnvp8s"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base base-compat-batteries binary + binary-orphans bytestring cassava code-page containers + criterion-measurement deepseq directory exceptions filepath Glob + js-chart microstache mtl mwc-random optparse-applicative parsec + statistics text time transformers transformers-compat vector + vector-algorithms + ]; + executableHaskellDepends = [ + base base-compat-batteries optparse-applicative + ]; + testHaskellDepends = [ + aeson base base-compat base-compat-batteries bytestring deepseq + directory HUnit QuickCheck statistics tasty tasty-hunit + tasty-quickcheck vector + ]; + description = "Robust, reliable performance measurement and analysis"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "criterion-cmp" = callPackage ({ mkDerivation, ansi-terminal, base, boxes, bytestring, cassava , containers, filepath, optparse-applicative, vector @@ -67362,6 +67792,28 @@ self: { broken = true; }) {cryptohash-sha256-pure = null;}; + "cryptohash-sha256_0_11_102_1" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, criterion + , SHA, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "cryptohash-sha256"; + version = "0.11.102.1"; + sha256 = "1xkb7iqplbw4fy1122p79xf1zcb7k44rl0wmfj1q06l7cdqxr9vk"; + configureFlags = [ "-fuse-cbits" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base base16-bytestring bytestring SHA tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base bytestring criterion SHA ]; + description = "Fast, pure and practical SHA-256 implementation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "cryptohash-sha512" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, criterion , SHA, tasty, tasty-hunit, tasty-quickcheck @@ -67689,8 +68141,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "5.4.1"; - sha256 = "0dyafw91ycsr71sxf7z3fbvfbp9vh8l260l9ygfxlrg37971l4pj"; + version = "5.4.3"; + sha256 = "00hd0sb1787cx7yppg2f3zkd3y8d75fsmf460qnsxc77m4qw5388"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -67707,8 +68159,8 @@ self: { }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.3.7"; - sha256 = "1qx9qig18y89k4sxpn333hvqz74c6f56nbvaf8dfbawx5asar0jm"; + version = "0.3.8"; + sha256 = "0q94d228zsjrnjzl3w11i4cqdnx3w1mcvsrf3w6jrvysrn1zskbz"; libraryHaskellDepends = [ array base Boolean containers data-default data-fix data-fix-cse deriving-compat hashable transformers wl-pprint @@ -67740,8 +68192,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.2.5"; - sha256 = "1bid3wxg879l69w8c1vcana0xxrggxv30dw9bqi8zww2w23id54q"; + version = "0.2.7"; + sha256 = "1mh1mfyi2vx8ykyc1ca8vpbi545fkp7f0ss5nw6dkykl6zm7pj6d"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic @@ -73669,8 +74121,8 @@ self: { }: mkDerivation { pname = "dep-t"; - version = "0.4.4.0"; - sha256 = "1qknqh9j7nvyy15zfi3prx6bifp2nd72kgfd085p478z887i71r4"; + version = "0.4.5.0"; + sha256 = "0hmyfq7xkz3l7d2f3d9ax782b6h0vvq1cfcxxnj1dg29hrnpd1ja"; libraryHaskellDepends = [ base mtl transformers unliftio-core ]; testHaskellDepends = [ base doctest mtl rank2classes sop-core tasty tasty-hunit @@ -73689,8 +74141,8 @@ self: { }: mkDerivation { pname = "dep-t-advice"; - version = "0.4.6.0"; - sha256 = "1v1nn0qbr3l7hh3f5aw6ril8ifzg6r8im7gpyj5plfbp272v4gs9"; + version = "0.4.6.1"; + sha256 = "1afr4qjzxvf4h56l0m1zjxy2m9vxs51wj1rcvxpqr3q9hvdg17vx"; libraryHaskellDepends = [ base dep-t sop-core transformers ]; testHaskellDepends = [ barbies base dep-t doctest mtl rank2classes sop-core tasty @@ -73751,10 +74203,12 @@ self: { pname = "dependent-literals"; version = "0.1.1.0"; sha256 = "0dw2xc5l8cmhsmr2akyyhyfj8m3qx02pz81fn52ii9mkhzs6rcjb"; + revision = "2"; + editedCabalFile = "1l3fns5gi8l5bav6z3ymvp93i1cq59f9b6p3dc496c0rmkh01kjq"; libraryHaskellDepends = [ base fin-int numeric-kinds sint snumber tagged wrapped ]; - description = "Provides library support for pseudo-dependently-typed int literals"; + description = "Library for dependent-literals-plugin"; license = lib.licenses.asl20; }) {}; @@ -73766,13 +74220,16 @@ self: { pname = "dependent-literals-plugin"; version = "0.1.0.1"; sha256 = "1rpjlcv3g150rcmxidn48n25xxv2ghdz4x9jnap1swkz0fb10i3a"; + revision = "2"; + editedCabalFile = "1bfsv402cxwhwz22gqj8p0grr4wb9ynsd2swnwy1m6xdsfi1wdy4"; libraryHaskellDepends = [ base ghc syb ]; testHaskellDepends = [ base dependent-literals fin-int numeric-kinds short-vec sint snumber wrapped ]; - description = "Rewrites integer literals to a pseudo-dependently-typed form"; + description = "Dependent integer literals"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "dependent-map_0_2_4_0" = callPackage @@ -79573,6 +80030,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "doclayout_0_3_1" = callPackage + ({ mkDerivation, base, containers, criterion, emojis, mtl, safe + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "doclayout"; + version = "0.3.1"; + sha256 = "0cbb8l1m7w1ycf0pv8y9cbly9qxw3w5ngqbghj6qd5kk02my9zwj"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base containers emojis mtl safe text ]; + testHaskellDepends = [ + base emojis mtl tasty tasty-golden tasty-hunit tasty-quickcheck + text + ]; + benchmarkHaskellDepends = [ base criterion mtl text ]; + description = "A prettyprinting library for laying out text documents"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "docopt" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers , HUnit, parsec, split, template-haskell, text @@ -79656,20 +80133,20 @@ self: { license = lib.licenses.bsd3; }) {}; - "doctemplates_0_10" = callPackage + "doctemplates_0_10_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific , tasty, tasty-golden, tasty-hunit, temporary, text - , text-conversions, unordered-containers, vector + , text-conversions, vector }: mkDerivation { pname = "doctemplates"; - version = "0.10"; - sha256 = "1nwav01dqxhbbmf4si8ks70lmhkldmy70m1dw89xrndvcgcynmrx"; + version = "0.10.0.1"; + sha256 = "08l8lgmvn83xwbdlh4m2jljj5gcyxiq1vjd1ggysv36d81swsg1x"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers doclayout filepath HsYAML mtl parsec safe - scientific text text-conversions unordered-containers vector + scientific text text-conversions vector ]; testHaskellDepends = [ aeson base bytestring containers doclayout filepath Glob tasty @@ -85345,6 +85822,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "emojis_0_1_2" = callPackage + ({ mkDerivation, base, containers, HUnit, text }: + mkDerivation { + pname = "emojis"; + version = "0.1.2"; + sha256 = "09x2xrppwypi369y7rzf3ln2g7c3g9qfckn2gydxpfzglcp9rziw"; + libraryHaskellDepends = [ base containers text ]; + testHaskellDepends = [ base HUnit text ]; + description = "Conversion between emoji characters and their names"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "empty" = callPackage ({ mkDerivation }: mkDerivation { @@ -87118,6 +87608,8 @@ self: { ]; description = "Esqueleto support for the pgcrypto PostgreSQL module"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ess" = callPackage @@ -88855,6 +89347,8 @@ self: { pname = "exiftool"; version = "0.2.0.0"; sha256 = "138d25fxqz3vg62mfgmva52flyzjxd8dxr0kc7ayfil1zk3bp4jg"; + revision = "1"; + editedCabalFile = "0sgi3w8x1zlch0v3zpxrjhisxd1s6wj1qznjlm0gz2r5d1pzc03z"; libraryHaskellDepends = [ aeson base base64 bytestring hashable process scientific string-conversions temporary text unordered-containers vector @@ -93172,15 +93666,13 @@ self: { }: mkDerivation { pname = "fin-int"; - version = "0.1.0.0"; - sha256 = "0ksjc8jz3l5jh6xd7aam424vpcq1ah7dcq2r5vmh4c7hcd48fakv"; - revision = "1"; - editedCabalFile = "0fq6cliihr0dhks62nim33f0sxqs2rwn4yd7gdd67h07acimcrzf"; + version = "0.2.0"; + sha256 = "0ra5lcd3ybmv1a0l7bisjlgi7b8mywa6c6pj7n82ppyi6rqssdlh"; libraryHaskellDepends = [ attenuation base data-default-class deepseq portray portray-diff QuickCheck sint ]; - description = "The type of finite sets with elements identified by the ordinals"; + description = "Finite sets of static size"; license = lib.licenses.asl20; }) {}; @@ -93482,6 +93974,8 @@ self: { pname = "finite-table"; version = "0.1.0.1"; sha256 = "17bn5wmv5sz89yh3lh39i1armi168wxxnz6l9smcfmw334lidlv6"; + revision = "1"; + editedCabalFile = "17marqdap2mhlv90khnhygy78mn4gj9068gbz2ld4xv7q2kf3vlm"; libraryHaskellDepends = [ adjunctions base cereal data-default-class deepseq distributive fin-int indexed-traversable lens portray portray-diff short-vec @@ -93495,6 +93989,7 @@ self: { ]; description = "Types isomorphic to Fin, and Tables indexed by them"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "finite-typelits" = callPackage @@ -98849,8 +99344,6 @@ self: { ]; description = "Tools for functor combinator-based program design"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "functor-combinators_0_4_1_0" = callPackage @@ -98880,7 +99373,6 @@ self: { description = "Tools for functor combinator-based program design"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "functor-combo" = callPackage @@ -106507,8 +106999,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20210903"; - sha256 = "1p6zgk98jmxvqdin5xsdxhgq276bjdr2spi0wabj8x0ziry97rvl"; + version = "8.20211011"; + sha256 = "02s7921ihmbndp7lk1nhhiljky02ikq4qax4mhg609qjhbl6piwd"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -107036,8 +107528,8 @@ self: { }: mkDerivation { pname = "github"; - version = "0.26"; - sha256 = "1vbskrkhmz4d3fccn3w12zgz2dbl40b2gljsm7lyd5k8hz50kds8"; + version = "0.27"; + sha256 = "0vlqsdhhjnfw9wk5vn1i8cmwa45vgczhz4nn46mwgs600xfn94am"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-instances bytestring containers cryptohash-sha1 deepseq deepseq-generics @@ -107053,6 +107545,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Access to the GitHub API, v3"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "github-backup" = callPackage @@ -107170,7 +107664,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "github-rest_1_1_0" = callPackage + "github-rest_1_1_1" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring, http-client , http-client-tls, http-types, jwt, mtl, scientific, tasty , tasty-golden, tasty-hunit, tasty-quickcheck, text, time @@ -107178,8 +107672,8 @@ self: { }: mkDerivation { pname = "github-rest"; - version = "1.1.0"; - sha256 = "0xyvmc8hj3rfglnhg6xcrdsd9gbii8yzh8qw5xjdyccmdsibckx3"; + version = "1.1.1"; + sha256 = "1wf4gs3324h4pfal5qcpb65lfpm4kpmxmv4fiv6asrvhas9cwglm"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types jwt mtl scientific text time transformers unliftio unliftio-core @@ -107424,15 +107918,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "gitlab-haskell_0_3_1_1" = callPackage + "gitlab-haskell_0_3_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, connection, http-client , http-conduit, http-types, tasty, tasty-hunit, temporary, text , time, transformers, unix }: mkDerivation { pname = "gitlab-haskell"; - version = "0.3.1.1"; - sha256 = "146azh83v963njnkbcf6lacj95qx89wcvi294s3nc89bp72z8igz"; + version = "0.3.2.0"; + sha256 = "1ibsb4wyavyb6s64czy1pdbcskfwn96wcky4vlpr0r1f8gjpym5s"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring connection http-client http-conduit @@ -111432,6 +111926,8 @@ self: { pname = "google-drive"; version = "0.4.1"; sha256 = "1whpifspbvqgw9hg367fjhp14ci61nnirskivawpv2airzn45xzk"; + revision = "1"; + editedCabalFile = "02hpkgp1k5gsc6rrx6gzzskcrdjzqbcdcppxkmv36lq0r1sj5afw"; libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra directory filepath http-conduit http-types mtl random resourcet text time @@ -124840,8 +125336,8 @@ self: { pname = "hastache"; version = "0.6.1"; sha256 = "0r5l8k157pgvz1ck4lfid5x05f2s0nlmwf33f4fj09b1kmk8k3wc"; - revision = "5"; - editedCabalFile = "0fwd1jd6sqkscmy2yq1w3dcl4va4w9n8mhs6ldrilh1cj6b54r3f"; + revision = "6"; + editedCabalFile = "1d9a6algvdyhjl94ikbz6ccnpbh0f68x8dp6bmx6lljq4b2srx51"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130898,22 +131394,22 @@ self: { }) {}; "hinotify-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit, filepath-bytestring - , hinotify, mtl, resourcet, stm, stm-chans, stm-conduit + ({ mkDerivation, async, base, bytestring, conduit, containers + , directory, filepath, filepath-bytestring, hinotify, hspec + , resourcet, stm, stm-chans, stm-conduit, temporary, unix }: mkDerivation { pname = "hinotify-conduit"; - version = "0.1.0.0"; - sha256 = "1gy914b7npldn0dvhra7cf6fx1bdv18w9p66ypdigy2x36dvfb8d"; - revision = "2"; - editedCabalFile = "0d7fpksxwfa7jjklb70lpnr6cnpa6s9qz98n6ci1d2w2y5xrbql4"; + version = "0.1.0.1"; + sha256 = "1377ws4rmafkjrnyn9x0a5wj98v5ysc85yzq6frg12aslc1bmvx9"; libraryHaskellDepends = [ - base bytestring conduit filepath-bytestring hinotify mtl resourcet - stm stm-chans stm-conduit + base bytestring conduit containers directory filepath + filepath-bytestring hinotify resourcet stm stm-chans stm-conduit ]; testHaskellDepends = [ - base bytestring conduit filepath-bytestring hinotify mtl resourcet - stm stm-chans stm-conduit + async base bytestring conduit containers directory filepath + filepath-bytestring hinotify hspec resourcet stm stm-chans + stm-conduit temporary unix ]; description = "inotify conduit sources"; license = lib.licenses.bsd3; @@ -132611,8 +133107,8 @@ self: { pname = "hlint"; version = "3.2.7"; sha256 = "0z6gxndrh7blzapkdn6fq1pkbkjlmbgjbq9ydnvy2wm00fb3v73g"; - revision = "1"; - editedCabalFile = "1wc66vjdcf0xdwiw7r2ias1xx328ipjw0227w1xfr48if5lgc4k1"; + revision = "2"; + editedCabalFile = "0p2d3pi268jkb3hz750apjn917kr40hhamc2apgiv08chqyk82bj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -132639,6 +133135,8 @@ self: { pname = "hlint"; version = "3.3.4"; sha256 = "030hvf0hmnf5pamrcqvr97zmm185b1vs0y28nq6vzlyyg15ap6qq"; + revision = "1"; + editedCabalFile = "10h1asqbk2qqmxac34amwjz9ybz2vahpa0dsrdljg3zw1r1yzkb8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -135130,6 +135628,8 @@ self: { pname = "hoogle"; version = "5.0.18.2"; sha256 = "1xacx2f33x1a4qlv25f8rlmb4wi0cjfzrj22nlnkrd0knghik3m7"; + revision = "1"; + editedCabalFile = "11ig5z81h27ify5sx2dyrx4kiv61gzd96k9qi8a11hvnk2w51a9y"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -135951,6 +136451,8 @@ self: { pname = "hpack"; version = "0.34.4"; sha256 = "1xszy00al5zzga64gh7nvgqc93242f61kqy8lb09jkm98a8fs4bl"; + revision = "1"; + editedCabalFile = "0gq6ax8a7yc5lp0n24kd60kq0dgpgsgcgl970jrf1hqnzf53pspk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136565,6 +137067,8 @@ self: { pname = "hpqtypes-extras"; version = "1.12.0.0"; sha256 = "0pxidphf0qzfy5zv1q7qhp49bgglf3pqd6r91qq0iawnvgzcyi7z"; + revision = "2"; + editedCabalFile = "0gprlxfjdc6lxf2xazfr1wrna9whw6sh1jpv5rhp8bw0haslzl6j"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions extra fields-json hpqtypes lifted-base log-base monad-control mtl @@ -139768,8 +140272,8 @@ self: { pname = "hslogger"; version = "1.3.1.0"; sha256 = "0nyar9xcblx5jwks85y8f4jfy9k1h4ss6rvj4mdbiidrq3v688vz"; - revision = "3"; - editedCabalFile = "04mda3bwr2a00f5nbkqc84d46lmqfsk3gibzg3amdh74ngb451xq"; + revision = "4"; + editedCabalFile = "0249qf58s5dvqf98xqbqqigav055dgj5cx4dmz4ssl8ckk2dizdk"; libraryHaskellDepends = [ base bytestring containers deepseq network network-bsd old-locale time unix @@ -143551,6 +144055,31 @@ self: { license = lib.licenses.publicDomain; }) {}; + "http-link-header_1_2_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, criterion, directory + , errors, hspec, hspec-attoparsec, http-api-data, network-uri + , QuickCheck, text, transformers + }: + mkDerivation { + pname = "http-link-header"; + version = "1.2.1"; + sha256 = "15pcav5k7j4pvqwkyyrqgcm7yxqippx4yiprsg9fpml4kywcr2ca"; + libraryHaskellDepends = [ + attoparsec base bytestring errors http-api-data network-uri text + ]; + testHaskellDepends = [ + attoparsec base bytestring errors hspec hspec-attoparsec + http-api-data network-uri QuickCheck text + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion directory errors http-api-data + network-uri text transformers + ]; + description = "A parser and writer for the HTTP Link header per RFC 5988"; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + }) {}; + "http-listen" = callPackage ({ mkDerivation, base, bytestring, exceptions, HTTP, network , transformers @@ -150484,27 +151013,23 @@ self: { "inline-asm" = callPackage ({ mkDerivation, base, bytestring, containers, either, ghc-prim - , hspec, hspec-core, megaparsec, mtl, parser-combinators + , hspec, hspec-core, megaparsec, mtl, parser-combinators, primitive , QuickCheck, template-haskell, uniplate }: mkDerivation { pname = "inline-asm"; - version = "0.4.0.2"; - sha256 = "01npi02i8wf9b0pa18cgl78ma6r9xqz0i7dc3khkj1725w5wkhvp"; + version = "0.5.0.0"; + sha256 = "02zxgkaa4wgacgj6si4158cxgk3cdf0gkvl5avmyrivbcc18xkdi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers either ghc-prim megaparsec mtl - parser-combinators template-haskell uniplate - ]; - executableHaskellDepends = [ - base bytestring containers either ghc-prim megaparsec mtl - parser-combinators template-haskell uniplate + parser-combinators primitive template-haskell uniplate ]; testHaskellDepends = [ base bytestring containers either ghc-prim hspec hspec-core - megaparsec mtl parser-combinators QuickCheck template-haskell - uniplate + megaparsec mtl parser-combinators primitive QuickCheck + template-haskell uniplate ]; description = "Inline some Assembly in ur Haskell!"; license = lib.licenses.bsd3; @@ -150695,8 +151220,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.5"; sha256 = "0bb3ggzic8z5zmvmzp1fsnb572c2v383740b0ddf1fwihpn52c1y"; - revision = "1"; - editedCabalFile = "12x4xi525ikbqvxh2kmnxsl7cqmbz2l8vqc5ym4lap0p21niiazr"; + revision = "2"; + editedCabalFile = "1xjrd1sn3wkhv8f40wi5p53y8n74lkj5pnr4psjlbpqqlr4hy2ya"; libraryHaskellDepends = [ aeson base base-compat deepseq hashable indexed-traversable lens optics-core optics-extra semigroupoids semigroups text transformers @@ -151644,8 +152169,8 @@ self: { }: mkDerivation { pname = "interval-algebra"; - version = "1.0.1"; - sha256 = "1pw4z3h1ihb82105v1i3809icp024a6cmlic2zfgdhdqf8wvfzv4"; + version = "1.1.0"; + sha256 = "16xx8fw7xf8rrji9n34r3xchjpd6sh3wnlbz70a3mhbdl3yp55vq"; libraryHaskellDepends = [ base containers foldl QuickCheck safe time witherable ]; @@ -151950,6 +152475,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "invertible-grammar_0_1_3_2" = callPackage + ({ mkDerivation, base, bifunctors, containers, mtl, prettyprinter + , profunctors, semigroups, tagged, template-haskell, text + , transformers + }: + mkDerivation { + pname = "invertible-grammar"; + version = "0.1.3.2"; + sha256 = "14i0xf5j01j6ayvxix32qr2m0bz3818q26z3b4xyw41ikbhxmkp2"; + libraryHaskellDepends = [ + base bifunctors containers mtl prettyprinter profunctors semigroups + tagged template-haskell text transformers + ]; + description = "Invertible parsing combinators framework"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "invertible-hlist" = callPackage ({ mkDerivation, base, HList, invertible }: mkDerivation { @@ -152456,25 +152999,24 @@ self: { , doctest, envy, flow, Glob, http-media, lens, lens-aeson , monad-logger, network-ip, QuickCheck, regex-compat, rio, servant , servant-client, servant-multipart, servant-multipart-api - , servant-multipart-client, servant-server, swagger2, text, vector - , yaml + , servant-multipart-client, swagger2, text, vector, yaml }: mkDerivation { pname = "ipfs"; - version = "1.3.2"; - sha256 = "11gy8szp41l1y6mnvj6knb5lhlax859gri9j31w5lzhidj0045df"; + version = "1.4.0"; + sha256 = "1lz5wbjlxd053805cc0l51hj69rwj4a2i4b5y72gmajjqrcw4hcd"; libraryHaskellDepends = [ aeson base bytestring envy flow Glob http-media lens monad-logger network-ip regex-compat rio servant servant-client servant-multipart servant-multipart-api servant-multipart-client - servant-server swagger2 text vector + swagger2 text vector ]; testHaskellDepends = [ aeson base bytestring directory directory-tree doctest envy flow Glob http-media lens lens-aeson monad-logger network-ip QuickCheck regex-compat rio servant servant-client servant-multipart - servant-multipart-api servant-multipart-client servant-server - swagger2 text vector yaml + servant-multipart-api servant-multipart-client swagger2 text vector + yaml ]; description = "Access IPFS locally and remotely"; license = lib.licenses.asl20; @@ -156475,6 +157017,27 @@ self: { license = lib.licenses.mit; }) {}; + "jsonifier_0_1_2" = callPackage + ({ mkDerivation, aeson, base, buffer-builder, bytestring, gauge + , hedgehog, numeric-limits, ptr-poker, rerebase, scientific, text + , text-builder + }: + mkDerivation { + pname = "jsonifier"; + version = "0.1.2"; + sha256 = "14cgk8h7lasnm0z9qlddkn166vk557msnkrpahdzqpl7arwdddid"; + libraryHaskellDepends = [ + base bytestring ptr-poker scientific text + ]; + testHaskellDepends = [ aeson hedgehog numeric-limits rerebase ]; + benchmarkHaskellDepends = [ + aeson buffer-builder gauge rerebase text-builder + ]; + description = "Fast and simple JSON encoding toolkit"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "jsonnet" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring , containers, data-fix, deriving-compat, directory, exceptions @@ -157390,10 +157953,8 @@ self: { }: mkDerivation { pname = "kansas-comet"; - version = "0.4"; - sha256 = "1q9rffh6589a5am8mvfzxzwws34vg08rdjxggfabhmg9y9jla6hz"; - revision = "22"; - editedCabalFile = "0ii81jv62cbrvj8dpj86m2rs75jjjwnp9kka63y8bvdbacchycvj"; + version = "0.4.1"; + sha256 = "1j54rsqna8xrw1si8i74v0c9k4jjv8a2q001aa8sx4rxb7d1qbzy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time @@ -164071,6 +164632,23 @@ self: { license = lib.licenses.mit; }) {}; + "lens-aeson_1_1_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, lens + , scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "lens-aeson"; + version = "1.1.2"; + sha256 = "0pdjjyjwlavcgm2wrv1fiz09l41hisl2xj6y67xbdix1h6h07hxz"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring lens scientific text + unordered-containers vector + ]; + description = "Law-abiding lenses for aeson"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lens-core" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -169621,8 +170199,8 @@ self: { }: mkDerivation { pname = "log-base"; - version = "0.10.0.1"; - sha256 = "0h4b7hjxcc75swj43wx0axcp5znsndkrnhn9c8fm7f7a2gmvb8l1"; + version = "0.11.0.0"; + sha256 = "155lzi9x33rhiymfy1271k0dz7c4qm1r48cz6kc7gcwxvrfh8dxi"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions mmorph monad-control mtl semigroups stm text time transformers-base @@ -169696,8 +170274,8 @@ self: { }: mkDerivation { pname = "log-elasticsearch"; - version = "0.12.1.0"; - sha256 = "07z0p5jcd5gjhk4dyf9ny74l68ja58ffa80mbfsyaz66ff6k4y6s"; + version = "0.12.1.1"; + sha256 = "0jrfrqydbg549d7gh38mq852kzd0nsaaaq6l5bi4ldfpj443kz8a"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq http-client http-client-tls http-types log-base network-uri @@ -169717,8 +170295,8 @@ self: { }: mkDerivation { pname = "log-postgres"; - version = "0.8.0.1"; - sha256 = "0bc63v9w023xw1fq0pkfnk4ac336hgliayy21ny0zaz9xf39a24l"; + version = "0.8.0.2"; + sha256 = "167asvp7a5v8621sbr6r4j25byg18d125gqd2i4jrq57g5f2mivf"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq hpqtypes http-client lifted-base log-base mtl semigroups split text @@ -174318,23 +174896,19 @@ self: { license = lib.licenses.bsd3; }) {}; - "massiv_1_0_0_0" = callPackage + "massiv_1_0_1_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, doctest, exceptions - , mersenne-random-pure64, mwc-random, primitive, QuickCheck, random - , scheduler, splitmix, template-haskell, unliftio-core, vector + , primitive, random, scheduler, unliftio-core, vector }: mkDerivation { pname = "massiv"; - version = "1.0.0.0"; - sha256 = "0cb9riab486gz9xxx44sx5pagfjc8kv8936avywxpwpn3dhbxg6a"; + version = "1.0.1.0"; + sha256 = "1s47x3cya73mp4gxqn271yp8z23pfgw170pnlxbka61ap4kykmkk"; libraryHaskellDepends = [ base bytestring deepseq exceptions primitive random scheduler unliftio-core vector ]; - testHaskellDepends = [ - base doctest mersenne-random-pure64 mwc-random QuickCheck random - splitmix template-haskell - ]; + testHaskellDepends = [ base doctest ]; description = "Massiv (Массив) is an Array Library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -174412,15 +174986,15 @@ self: { broken = true; }) {}; - "massiv-persist_1_0_0_0" = callPackage + "massiv-persist_1_0_0_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, doctest, hspec , hspec-discover, massiv, massiv-test, persist, primitive , QuickCheck }: mkDerivation { pname = "massiv-persist"; - version = "1.0.0.0"; - sha256 = "0kgw4ac6ywgx44mqyfyhhxpaxzyph9pgz27nvr625j4hg84mx552"; + version = "1.0.0.1"; + sha256 = "1j5vzk5m2r1cs5v5pzmf1i7p8zdlf29g0gdklf6snl9llk755pgy"; libraryHaskellDepends = [ base bytestring deepseq massiv persist primitive ]; @@ -174475,14 +175049,14 @@ self: { broken = true; }) {}; - "massiv-serialise_1_0_0_0" = callPackage + "massiv-serialise_1_0_0_1" = callPackage ({ mkDerivation, base, deepseq, doctest, hspec, hspec-discover , massiv, massiv-test, QuickCheck, serialise, vector }: mkDerivation { pname = "massiv-serialise"; - version = "1.0.0.0"; - sha256 = "18ahbfq54mggar7wknghdjybd4pbqjzgfaghv5lp5daccbxahgyd"; + version = "1.0.0.1"; + sha256 = "0zmikmfjjshf9p0fawcg05832hxdzj04kqqh11bz1kqcc1yc7yk0"; libraryHaskellDepends = [ base deepseq massiv serialise vector ]; testHaskellDepends = [ base doctest hspec massiv massiv-test QuickCheck serialise @@ -177843,6 +178417,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "microstache_1_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , directory, filepath, hspec, parsec, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "microstache"; + version = "1.0.2"; + sha256 = "0pirywb9304j2ylasskwq20k6d2srk616sh41l4s37yajsjggx5i"; + libraryHaskellDepends = [ + aeson base containers deepseq directory filepath parsec text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec parsec text + ]; + description = "Mustache templates for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "microtimer" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -182533,8 +183128,8 @@ self: { pname = "months"; version = "0.2"; sha256 = "054dag7806850hdii7s5rxg8gx2spdp33pnx4s4ckni9ayvspija"; - revision = "2"; - editedCabalFile = "1fvpzhfjpf2j01p2rwds6m82d2q0j77ak5v467nxsc8f161rfz21"; + revision = "3"; + editedCabalFile = "1j57vvb2vs0jd5jsq2dh0q5wpvxibwn43dwkg1l3ysl46k5sv58i"; libraryHaskellDepends = [ aeson attoparsec base base-compat deepseq hashable intervals QuickCheck text time-compat @@ -185849,6 +186444,8 @@ self: { pname = "mustache"; version = "2.3.1"; sha256 = "0j5kzlirirnj2lscxgc6r9j0if8s3pvxswjblma6yxpw6qyzk2xc"; + revision = "1"; + editedCabalFile = "05qsxxpbqacfbvdzmz2y2yh3rpf2f0n2rvhvmhn33gsvydxvadbv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188346,6 +188943,21 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) libsodium;}; + "netcode-io_0_0_3" = callPackage + ({ mkDerivation, base, bindings-DSL, libsodium }: + mkDerivation { + pname = "netcode-io"; + version = "0.0.3"; + sha256 = "132rih1fd2qdshnpb8q3glhwgc8790pm8xpm3786hnrl3di1384z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bindings-DSL ]; + librarySystemDepends = [ libsodium ]; + description = "Bindings to the low-level netcode.io library."; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) libsodium;}; + "netcore" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bimap, binary, binary-strict , bytestring, containers, fgl, HList, hslogger, HUnit, mtl @@ -192044,6 +192656,7 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; + hydraPlatforms = lib.platforms.none; }) {}; "notmuch" = callPackage @@ -192793,8 +193406,10 @@ self: { pname = "numeric-kinds"; version = "0.1.0.0"; sha256 = "0rdx39wa7kklx9a7i5rdwf541fxpz9v3n32rvy2fa6i7n4hr64s4"; + revision = "1"; + editedCabalFile = "0zbn5yxga0sknpa83a6v2gx3dhi1rgxlxh0p3d1gd37x2zyd8lxf"; libraryHaskellDepends = [ base ]; - description = "Type-level numeric types, classes, and instances"; + description = "Type-level numeric types and classes"; license = lib.licenses.asl20; }) {}; @@ -192817,14 +193432,14 @@ self: { pname = "numeric-logarithms"; version = "0.1.0.0"; sha256 = "1izd7gc9xdrs7a1wbzmhhkv8s9rw2mcq77agvr351dc5jyzdnwiy"; - revision = "1"; - editedCabalFile = "0a37gmm0xgjzh05i7ix3nkgr5d2qa824nsh2wg78ikyksfq46vfv"; + revision = "2"; + editedCabalFile = "11lxh2lz3adwdb1hgxgqh2p2igqzbclpwal072fhdk1hcz987acq"; libraryHaskellDepends = [ base integer-gmp ]; testHaskellDepends = [ base integer-gmp QuickCheck test-framework test-framework-quickcheck2 ]; - description = "Efficient rounded log2 algorithms on integral and rational types"; + description = "Integral and rational log2 algorithms"; license = lib.licenses.asl20; }) {}; @@ -194916,6 +195531,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "opc-xml-da-client" = callPackage + ({ mkDerivation, acc, attoparsec, attoparsec-data, base, base64 + , binary, bytestring, caerbannog, containers, data-default, domain + , domain-optics, hashable, hashable-time, http-client, QuickCheck + , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit + , tasty-quickcheck, text, text-builder, time, transformers + , unordered-containers, vector, vector-instances, xml-conduit + , xml-parser + }: + mkDerivation { + pname = "opc-xml-da-client"; + version = "0.1"; + sha256 = "0wi2qv4594fz3z6jqdmqnxv17w1yp5ds8xwflnxawb6lpadprskp"; + libraryHaskellDepends = [ + acc attoparsec attoparsec-data base base64 bytestring containers + data-default domain domain-optics hashable hashable-time + http-client QuickCheck rerebase scientific text text-builder time + transformers unordered-containers vector vector-instances + xml-conduit xml-parser + ]; + testHaskellDepends = [ + attoparsec binary caerbannog data-default http-client QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + text-builder xml-conduit xml-parser + ]; + doHaddock = false; + description = "OPC XML-DA Client"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "open-adt" = callPackage ({ mkDerivation, base, constraints, recursion-schemes, row-types , template-haskell @@ -196242,6 +196888,8 @@ self: { pname = "operational"; version = "0.2.4.0"; sha256 = "1hwmwbsxzwv68b39rv4gn3da6irv8zm89gqrkc3rdsgwi5ziyn3i"; + revision = "1"; + editedCabalFile = "1b5vjp87lh34lpp9i4mrwcmr6rs45r6azdamwinlhrxynn91n8ri"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl ]; @@ -196816,6 +197464,25 @@ self: { maintainers = with lib.maintainers; [ Gabriel439 ]; }) {}; + "optparse-generic_1_4_6" = callPackage + ({ mkDerivation, base, bytestring, Only, optparse-applicative + , system-filepath, text, time, transformers, transformers-compat + , void + }: + mkDerivation { + pname = "optparse-generic"; + version = "1.4.6"; + sha256 = "1ihr5ly5xkhhds7frifgy1djay1d7yvdc617qqb7h61h4930kl3k"; + libraryHaskellDepends = [ + base bytestring Only optparse-applicative system-filepath text time + transformers transformers-compat void + ]; + description = "Auto-generate a command-line parser for your datatype"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ Gabriel439 ]; + }) {}; + "optparse-helper" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -197498,8 +198165,8 @@ self: { }: mkDerivation { pname = "os-release"; - version = "1.0.2"; - sha256 = "0wjf1z76pqfv091b88zc3w0hmqv8i2i6qsx21cfcgaym4r3zqpjf"; + version = "1.0.2.1"; + sha256 = "0fyf6mjk4lmxvjgkvsz7ypx2ir67ry816wa6j7s27a1754cz6cw3"; libraryHaskellDepends = [ aeson base megaparsec safe-exceptions text unordered-containers ]; @@ -203578,6 +204245,8 @@ self: { pname = "persistent"; version = "2.13.1.2"; sha256 = "09si4h64i9drqr80a2sxpxhmsinacqx9bvsc3jah5zlm915q092y"; + revision = "1"; + editedCabalFile = "0xasbm1m5az7anp1wqfr69j0b7jycg82qdcq4kd97lqdn7rqvhsp"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data lift-type monad-logger @@ -205202,8 +205871,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-common"; - version = "0.1.4.0"; - sha256 = "1dsfnjjri15mhm31ny82j26djbsw6lgvvqpq9k7fzgj0inb5slns"; + version = "0.2.0.0"; + sha256 = "1v2v571rjmfxqzdnm7z2v3dygknlk5nyvfyv7dkgzf7apmlmnpd2"; libraryHaskellDepends = [ base heaps mmsyn2-array phonetic-languages-constraints-array phonetic-languages-ukrainian-array @@ -205249,8 +205918,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-common"; - version = "0.2.1.0"; - sha256 = "1i05h0rd6svffwpwzsrryzf6yvjwxd0g3f4wasz8mkh1sdgj0r5g"; + version = "0.3.0.0"; + sha256 = "1ajgp4wyfdzvvnj5272r0cpl9jykps5bwzn93asmfbilzfdjaynz"; libraryHaskellDepends = [ base heaps phonetic-languages-phonetics-basics ]; @@ -209232,6 +209901,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "polysemy-check" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover + , kind-generics, kind-generics-th, polysemy, polysemy-plugin + , QuickCheck + }: + mkDerivation { + pname = "polysemy-check"; + version = "0.3.0.0"; + sha256 = "1m7m1mi7fbf1nj98c91qxhbnhyqxgb8y7ryj7bk1llinmp2lmwaz"; + libraryHaskellDepends = [ + base containers kind-generics kind-generics-th polysemy QuickCheck + ]; + testHaskellDepends = [ + base containers hspec kind-generics kind-generics-th polysemy + polysemy-plugin QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + description = "QuickCheck for Polysemy"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "polysemy-chronos" = callPackage ({ mkDerivation, aeson, base, chronos, containers, hedgehog , polysemy, polysemy-test, polysemy-time, relude, tasty @@ -210481,12 +211172,14 @@ self: { pname = "portray"; version = "0.2.0"; sha256 = "1kzzvwqphlg1dmd486ijkv6vsqmxnp8h05mwc8590yjxdln5vzdw"; + revision = "1"; + editedCabalFile = "0bl0kagjn1k58pq6zbdj2zyzhpdpzs7ra1vrr8a1qdkb11gmp4n2"; libraryHaskellDepends = [ base containers text wrapped ]; testHaskellDepends = [ base containers HUnit test-framework test-framework-hunit text wrapped ]; - description = "A pseudo-Haskell syntax type and typeclass producing it"; + description = "Rendering to pseudo-Haskell syntax"; license = lib.licenses.asl20; }) {}; @@ -210496,10 +211189,12 @@ self: { pname = "portray-diff"; version = "0.1.0.1"; sha256 = "1da884cj865q6g1bd1fhcazyl1nzxb0pk2nvhcpp4iqkjvhyd8hw"; + revision = "1"; + editedCabalFile = "1dfl488jq79l0k8d8s2q1wxdibvnrrl64sz8gdy9mp0nkd6vaszl"; libraryHaskellDepends = [ base containers dlist portray text wrapped ]; - description = "Visualize the structural differences between two values"; + description = "Pretty structural diffs between two values"; license = lib.licenses.asl20; }) {}; @@ -210510,10 +211205,12 @@ self: { pname = "portray-diff-hunit"; version = "0.1.0.0"; sha256 = "0gig1gvw0s7cl4jbffqh53r7lfs08clkcjpdypjjbpk0815pk34h"; + revision = "1"; + editedCabalFile = "023p7j386zbcmzsbdk7xk85ygi8qq4llh6zp6811grsyq3hfnsa1"; libraryHaskellDepends = [ base HUnit portray-diff portray-pretty pretty ]; - description = "Equality assertion functions for HUnit based on portray-diff"; + description = "HUnit assertions based on portray-diff"; license = lib.licenses.asl20; }) {}; @@ -210523,10 +211220,12 @@ self: { pname = "portray-diff-quickcheck"; version = "0.1.0.0"; sha256 = "1kif82y8bapf5d3awkfv7wp3ih89q3p14djanyz6jfapryhccm12"; + revision = "1"; + editedCabalFile = "0nf5wxwvs9sad3bphb8dci5d3nr982nr05y99fmsy3vdifi366l2"; libraryHaskellDepends = [ base portray-diff portray-pretty QuickCheck ]; - description = "Equality assertion functions for QuickCheck based on portray-diff"; + description = "QuickCheck tests with portray-diff"; license = lib.licenses.asl20; }) {}; @@ -210538,12 +211237,14 @@ self: { pname = "portray-pretty"; version = "0.1.0.2"; sha256 = "1gh50r77yz1l8qkhdz96bds2l0d5zi75fkir27x3si406h7sdic9"; + revision = "1"; + editedCabalFile = "0v30gdwjb0339q5phkbnwxj687w33rgivy772j37vp51zpiylnak"; libraryHaskellDepends = [ base portray portray-diff pretty text ]; testHaskellDepends = [ base HUnit portray portray-diff pretty test-framework test-framework-hunit text ]; - description = "A portray backend using the pretty package"; + description = "Portray backend for pretty"; license = lib.licenses.asl20; }) {}; @@ -210556,6 +211257,8 @@ self: { pname = "portray-prettyprinter"; version = "0.2.0"; sha256 = "16g55vjcfawx1jxmgy3zgl6bqv67h831z00912fbfh878s1s24ic"; + revision = "1"; + editedCabalFile = "1w7y8j2sx9wjyv5iknxjyq3r02l1kym85k1gq6carr49lf05s567"; libraryHaskellDepends = [ base portray portray-diff prettyprinter prettyprinter-ansi-terminal text @@ -210565,7 +211268,7 @@ self: { prettyprinter-ansi-terminal QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; - description = "A portray backend using the prettyprinter package"; + description = "Portray backend for prettyprinter"; license = lib.licenses.asl20; }) {}; @@ -211006,6 +211709,34 @@ self: { license = lib.licenses.mit; }) {}; + "postgresql-binary_0_12_4_2" = callPackage + ({ mkDerivation, aeson, base, binary-parser, bytestring + , bytestring-strict-builder, containers, conversion + , conversion-bytestring, conversion-text, criterion, json-ast + , network-ip, postgresql-libpq, QuickCheck, quickcheck-instances + , rerebase, scientific, tasty, tasty-hunit, tasty-quickcheck, text + , time, transformers, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.12.4.2"; + sha256 = "1bklkkf0r5dimdxgmgcviircv87ahv0g4nmkl34kc13pwn6l7xjm"; + libraryHaskellDepends = [ + aeson base binary-parser bytestring bytestring-strict-builder + containers network-ip scientific text time transformers + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson conversion conversion-bytestring conversion-text json-ast + network-ip postgresql-libpq QuickCheck quickcheck-instances + rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "postgresql-common" = callPackage ({ mkDerivation, attoparsec, base, bytestring, postgresql-simple }: mkDerivation { @@ -211364,8 +212095,8 @@ self: { pname = "postgresql-simple"; version = "0.6.4"; sha256 = "0rz2bklxp4pvbxb2w49h5p6pbwabn6d5d4j4mrya4fpa0d13k43d"; - revision = "2"; - editedCabalFile = "1kwjlj0bsc1yd4dgfc0ydawq9acfjlf0bymwc830dryp16wpj9zv"; + revision = "3"; + editedCabalFile = "1gx4vjk99lr10bcvdismr84i6rpl5ny0j08f7f7rq9j8hivj0frp"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable Only postgresql-libpq @@ -214504,8 +215235,6 @@ self: { testHaskellDepends = [ async base bytestring hspec unix ]; description = "Ergonomic process launching with extreme flexibility and speed"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "procrastinating-structure" = callPackage @@ -215672,8 +216401,8 @@ self: { }: mkDerivation { pname = "proto-lens"; - version = "0.7.0.0"; - sha256 = "1dg73jwc9mis7igxdj3chkb8fz9a25wxw3d6nz11r98z3ambd8rs"; + version = "0.7.1.0"; + sha256 = "0b5wn89d23p87swjbafndrbmklix360amcq5jsl73zaqlh3vy4sy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim lens-family parsec @@ -215692,8 +216421,8 @@ self: { }: mkDerivation { pname = "proto-lens-arbitrary"; - version = "0.1.2.9"; - sha256 = "0ndh8jr9aybjpf1p6a6zs2qjci0z7h3c3v3i5hf28ls8w2g8zr4x"; + version = "0.1.2.10"; + sha256 = "1dx82fx4q2q58xavkw62ws34vikpg5g6p0w3mpvn0pigwykjnzda"; libraryHaskellDepends = [ base bytestring containers lens-family proto-lens QuickCheck text ]; @@ -215763,8 +216492,8 @@ self: { ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { pname = "proto-lens-optparse"; - version = "0.1.1.7"; - sha256 = "0fskg0y66qp81z2x2r6jyvrisn7asmbynnq1zq2j97dn7003nqpa"; + version = "0.1.1.8"; + sha256 = "1y5ygqzwyvphxyj6qr5cnknjk06rs6h0xlbwa864p6hjwlayapcn"; libraryHaskellDepends = [ base optparse-applicative proto-lens text ]; @@ -215781,8 +216510,8 @@ self: { }: mkDerivation { pname = "proto-lens-protobuf-types"; - version = "0.7.0.0"; - sha256 = "1db0z3394g1fzw80ilxldbvy7m3a4piks0fk2wmlaw5k6bza82c7"; + version = "0.7.1.0"; + sha256 = "0yrwif600lr2pmqfninwap348k4xg5mvzx9cqp99gdgkknfb88hn"; setupHaskellDepends = [ base Cabal proto-lens-setup ]; libraryHaskellDepends = [ base lens-family proto-lens proto-lens-runtime text @@ -215799,8 +216528,8 @@ self: { }: mkDerivation { pname = "proto-lens-protoc"; - version = "0.7.0.0"; - sha256 = "1k060lr5d54mzj6c7d2k19vg2432mfnp66wr7gs1qcgpj19q9yvs"; + version = "0.7.1.0"; + sha256 = "14lbal80mrwla51h3yax8v1hsd05mh5xyipc051n0jkxdifs1cv5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base filepath ]; @@ -215819,8 +216548,8 @@ self: { }: mkDerivation { pname = "proto-lens-runtime"; - version = "0.7.0.0"; - sha256 = "0qxangmbldzdvm9qdvhw1cnjakx0zrxrq0nbscqvih2m2yzaxhad"; + version = "0.7.0.1"; + sha256 = "03dxnawrsz22s52qzfwgnzs18r7mdb1jvirsck2g62bh5incg80a"; libraryHaskellDepends = [ base bytestring containers deepseq filepath lens-family proto-lens text vector @@ -215835,8 +216564,8 @@ self: { }: mkDerivation { pname = "proto-lens-setup"; - version = "0.4.0.4"; - sha256 = "09ka0x4ril0lw3ppx2q26zw2r9g2cszsyqrbwy0amw78g1kxma8v"; + version = "0.4.0.5"; + sha256 = "1zl6srfsa4nizrrrbm7b69200w42rfmxmyzdzgb3cl0675ks2r28"; libraryHaskellDepends = [ base bytestring Cabal containers deepseq directory filepath process proto-lens-protoc temporary text @@ -219877,8 +220606,8 @@ self: { }: mkDerivation { pname = "raaz"; - version = "0.3.4"; - sha256 = "1kqinh0vwbl5qh55ai41nmkbcfbhmjdwp5pp0xap03cd0nmn84xq"; + version = "0.3.5"; + sha256 = "1b1xwsh01d5p685r85w0mlnf6ldqzy57vrbcsnr9lgdn6bjhvlih"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -220333,8 +221062,8 @@ self: { }: mkDerivation { pname = "ralist"; - version = "0.3.0.0"; - sha256 = "1qy6y7fcylbp6lym7y1k0bg28imhrfxrkvlfrm9mxg3lhvl71mrf"; + version = "0.4.0.0"; + sha256 = "1axn2mh1jiz5d39ygf0hg7a0bkywnld4j8jjkflycks1yr7mxha1"; libraryHaskellDepends = [ base deepseq indexed-traversable transformers ]; @@ -233640,22 +234369,20 @@ self: { license = lib.licenses.bsd3; }) {}; - "scheduler_2_0_0" = callPackage - ({ mkDerivation, atomic-primops, base, deepseq, doctest, exceptions - , genvalidity-hspec, hspec, hspec-discover, mwc-random, primitive - , pvar, QuickCheck, template-haskell, unliftio, unliftio-core - , vector + "scheduler_2_0_0_1" = callPackage + ({ mkDerivation, atomic-primops, base, deepseq, exceptions + , genvalidity-hspec, hspec, hspec-discover, primitive, pvar + , QuickCheck, unliftio, unliftio-core }: mkDerivation { pname = "scheduler"; - version = "2.0.0"; - sha256 = "1i0fz2gj2q12gfl1h8ar0ikkqksznr1rij7fsx1v0qi6qg9d7cc3"; + version = "2.0.0.1"; + sha256 = "1hdqm04m3n5y3xrhilj0hykrmqdsjz5p6k2p9y1005khkj5dag9f"; libraryHaskellDepends = [ atomic-primops base deepseq exceptions primitive pvar unliftio-core ]; testHaskellDepends = [ - base deepseq doctest genvalidity-hspec hspec mwc-random QuickCheck - template-haskell unliftio vector + base deepseq genvalidity-hspec hspec QuickCheck unliftio ]; testToolDepends = [ hspec-discover ]; description = "Work stealing scheduler"; @@ -234148,8 +234875,8 @@ self: { pname = "scotty"; version = "0.12"; sha256 = "1lpggpdzgjk23mq7aa64yylds5dbm4ynhcvbarqihjxabvh7xmz1"; - revision = "5"; - editedCabalFile = "0fvxkpggysz6wfpllqwzx5xywgb2fnfmknw9xhvmxgk765v60jrn"; + revision = "6"; + editedCabalFile = "15gwvx9gdk4vxh1x2n5xvnrix8m0wl96a4aqbdmdfrka43sywfma"; libraryHaskellDepends = [ aeson base base-compat-batteries blaze-builder bytestring case-insensitive data-default-class exceptions fail http-types @@ -236187,6 +236914,8 @@ self: { pname = "semigroupoids"; version = "5.3.6"; sha256 = "0glhqc9x8i5z3bdg23xvl2lfns95msid3h3x0jksna7i6c8j869n"; + revision = "1"; + editedCabalFile = "0inbks8x588bpcw7kyap69iy0zrkygycp8hwgrd9yhbxlvj9hmh9"; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant distributive hashable tagged template-haskell transformers @@ -237500,10 +238229,8 @@ self: { }: mkDerivation { pname = "servant-benchmark"; - version = "0.1.2.0"; - sha256 = "0lqqk410nx48g895pfxkbbk85b1ijs4bfl9zr2li2p7wwwc4gyi9"; - revision = "3"; - editedCabalFile = "17pj6n143lpk5nsr6j8j1a6fj45y1bv61jcm16m0fwsdmhv01866"; + version = "0.2.0.0"; + sha256 = "0dxyq9n0v09287nz1nqb2m0bdyabdzqig9avpmx4viyf9xzyh6bd"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive http-media http-types QuickCheck servant text yaml @@ -237621,7 +238348,6 @@ self: { ]; description = "Command line interface for Servant API clients"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "servant-client" = callPackage @@ -238175,6 +238901,7 @@ self: { ]; description = "Servant combinators to facilitate writing GitHub webhooks"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "servant-haxl-client" = callPackage @@ -238693,8 +239420,8 @@ self: { }: mkDerivation { pname = "servant-pagination"; - version = "2.3.0"; - sha256 = "0kza7lr3akx3zviqbxlw74f1y66y8c6kys52n49brvrhqwnv4xwd"; + version = "2.4.1"; + sha256 = "181an5p0qfzbv3cirnaq8bw778iib4qhv53y60z1ssn16v2vxhq5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -239565,8 +240292,8 @@ self: { }: mkDerivation { pname = "servant-to-elm"; - version = "0.4.2.0"; - sha256 = "1hbz6c9233wgpgmgnplg9qv5hrniynkn5n4zsmkyansw07gmaw05"; + version = "0.4.3.0"; + sha256 = "1s63x270bci7nyz595azff1ny868jjpqbilmy01rzbspjrfhwi7d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -240542,6 +241269,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "sexp-grammar_2_3_3_1" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers + , criterion, data-fix, deepseq, happy, invertible-grammar + , prettyprinter, QuickCheck, recursion-schemes, scientific + , semigroups, tasty, tasty-hunit, tasty-quickcheck, text + , utf8-string + }: + mkDerivation { + pname = "sexp-grammar"; + version = "2.3.3.1"; + sha256 = "08sqpk5qgq3mqlxvz24sw43m52khynpf41cnd4yif4b4ri583mb9"; + libraryHaskellDepends = [ + array base bytestring containers data-fix deepseq + invertible-grammar prettyprinter recursion-schemes scientific + semigroups text utf8-string + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + base bytestring containers invertible-grammar prettyprinter + QuickCheck scientific semigroups tasty tasty-hunit tasty-quickcheck + text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq text + ]; + description = "Invertible grammar combinators for S-expressions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sexp-show" = callPackage ({ mkDerivation, base, pretty-show }: mkDerivation { @@ -241364,6 +242121,8 @@ self: { pname = "shakespeare"; version = "2.0.25"; sha256 = "1fjv3yg425d87d3dih0l3ff95g5a5yp9w85m58sjara6xqivj9s4"; + revision = "1"; + editedCabalFile = "0na31a7h3sq8ndrx79waywsfj5667pm0masy10gxzhzwmf6i3s1l"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring containers directory exceptions ghc-prim parsec process scientific template-haskell text @@ -242179,8 +242938,8 @@ self: { pname = "short-vec"; version = "0.1.0.0"; sha256 = "0w651jipwxh7k4ng5rvq507br4347hzy8x8c47c1g7haryj80gzq"; - revision = "2"; - editedCabalFile = "1w56zmw085509grvk5ddlrv12pqpzfpmdprjd44lv4sgzv09bzfk"; + revision = "4"; + editedCabalFile = "1rwzaxdpkrn1v7p8jph4m91vyphdzm9h2yppnmanp636p0sjxzf4"; libraryHaskellDepends = [ adjunctions base data-default-class deepseq distributive fin-int indexed-traversable integer-gmp portray portray-diff QuickCheck @@ -242197,8 +242956,10 @@ self: { gauge indexed-traversable integer-gmp portray portray-diff QuickCheck semigroupoids sint ]; - description = "A length-indexed vector type build on 'SmallArray#'"; + description = "Length-indexed vectors using SmallArray#"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "short-vec-lens" = callPackage @@ -242209,11 +242970,14 @@ self: { pname = "short-vec-lens"; version = "0.1.0.0"; sha256 = "1afz1izz19xrjy0cdhmpy7b667waa5v8jh1ps3jpjfpgbmysjz3g"; + revision = "1"; + editedCabalFile = "1bkvx7csgqdn16kamih5h797pcg3ppcf6gln7lf01bw9pd5hpkkb"; libraryHaskellDepends = [ base fin-int indexed-traversable lens short-vec sint ]; description = "Lenses and related functionality for the `short-vec` package"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "shortbytestring" = callPackage @@ -248097,8 +248861,10 @@ self: { pname = "snumber"; version = "0.1.0.0"; sha256 = "0f340hzhhmiy342c5250m61f3gkcnfymjbd2a13alzdh7pmhb2mg"; + revision = "1"; + editedCabalFile = "0cc7chg4qhqlrkdv2m7y514gs9lm1hixwaw543dv47vqb12063im"; libraryHaskellDepends = [ base numeric-kinds ]; - description = "Indexed numeric types linking type-level and value-level numbers"; + description = "Integer singletons with flexible representation"; license = lib.licenses.asl20; }) {}; @@ -252134,6 +252900,8 @@ self: { pname = "stackcollapse-ghc"; version = "0.0.1.4"; sha256 = "1scqjjp1cpz3zzvqa6wmfz11qrhsbqwgq7h8qjg0d8ri3r9z82lb"; + revision = "1"; + editedCabalFile = "0k4gayvmjdfvfbyxjcmw1hk9vi90l0f9p3npi4rv2wwn1pl00vgm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -255653,8 +256421,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "string-interpreter"; - version = "0.5.3.0"; - sha256 = "0ny0py7fhcbv1zkr96ngypb9mf241avds0i77lynnpig96j1ay14"; + version = "0.5.4.1"; + sha256 = "1dgmqircw5gz62crxzx3d7gk2xyvmcwqdy15rpjgy2q7q5brcv7h"; libraryHaskellDepends = [ base ]; description = "Is used in the phonetic languages approach (e. g. in the recursive mode)."; license = lib.licenses.mit; @@ -256311,6 +257079,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "structured_0_1_1" = callPackage + ({ mkDerivation, aeson, array, base, base16-bytestring, binary + , bytestring, containers, hashable, scientific, tagged, text + , time-compat, transformers, unordered-containers, uuid-types + , vector + }: + mkDerivation { + pname = "structured"; + version = "0.1.1"; + sha256 = "1mz02ys85z79nj24ylsmgh8v2m7zv2rixf7w0iqnwc49lax52w4q"; + libraryHaskellDepends = [ + aeson array base base16-bytestring binary bytestring containers + hashable scientific tagged text time-compat transformers + unordered-containers uuid-types vector + ]; + description = "Structure (hash) of your data types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "structured-cli" = callPackage ({ mkDerivation, base, data-default, exceptions, haskeline, mtl , split, transformers @@ -257715,6 +258503,8 @@ self: { libraryPkgconfigDepends = [ librsvg ]; description = "Binding to the libsvg-cairo library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) librsvg;}; "svgone" = callPackage @@ -258226,7 +259016,7 @@ self: { license = "unknown"; }) {}; - "sydtest_0_4_0_0" = callPackage + "sydtest_0_4_1_0" = callPackage ({ mkDerivation, async, base, bytestring, containers, Diff, dlist , envparse, filepath, MonadRandom, mtl, optparse-applicative, path , path-io, pretty-show, QuickCheck, quickcheck-io, random-shuffle @@ -258235,8 +259025,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.4.0.0"; - sha256 = "1r3isd8rjlzx7j1j5drgd1zjxdp8a1hvwsla513hpv32mkbqf0za"; + version = "0.4.1.0"; + sha256 = "1g63qq1hisfpnic9sl2a8bry1wyr6ccdcq0l2dagdnggripjgdl1"; libraryHaskellDepends = [ async base bytestring containers Diff dlist envparse filepath MonadRandom mtl optparse-applicative path path-io pretty-show @@ -261471,8 +262261,8 @@ self: { pname = "taskwarrior"; version = "0.3.0.0"; sha256 = "1h24d799q1s6b36hd40bxa4c9m1izkgh6j7p2jv1p6cxngz28ni0"; - revision = "5"; - editedCabalFile = "1h7ybnxx5f0w1h13wzbx30ycf578dnv12wx4pqn3pfxqz1jz3gjg"; + revision = "6"; + editedCabalFile = "02jag4yib1fqf2fp9p323hb3vsbkrqm1k9zp2wag6ysl5kvvq1x6"; libraryHaskellDepends = [ aeson base bytestring containers process random text time unordered-containers uuid @@ -263549,6 +264339,8 @@ self: { pname = "ten"; version = "0.1.0.2"; sha256 = "0djvcb2l9dnnjbhivchi6yyaj5i96jmy7yhr9x3paiz1l54brrqx"; + revision = "1"; + editedCabalFile = "1dcr49q8g3wr1glhlawvg4bbz3mykvwnx7z9pw1ssvk9w7839z6r"; libraryHaskellDepends = [ adjunctions base data-default-class deepseq distributive hashable portray portray-diff some text transformers wrapped @@ -263558,7 +264350,7 @@ self: { HUnit portray portray-diff some test-framework test-framework-hunit text transformers wrapped ]; - description = "Typeclasses like Functor, etc. over arity-1 type constructors."; + description = "Functors et al. over arity-1 type constructors"; license = lib.licenses.asl20; }) {}; @@ -263583,6 +264375,8 @@ self: { pname = "ten-unordered-containers"; version = "0.1.0.2"; sha256 = "0y4aw77ix2ay43l8n17322hbmm1npcdr1bl7kdza377jd1ci20px"; + revision = "1"; + editedCabalFile = "196gjc39c0x4p444byh7mwnhf9ci7dxhmxl602ha52fr554cdh0j"; libraryHaskellDepends = [ base hashable portray portray-diff some ten unordered-containers wrapped @@ -263592,7 +264386,7 @@ self: { portray-pretty some ten ten-lens test-framework test-framework-hunit text transformers unordered-containers wrapped ]; - description = "A package providing one unordered container"; + description = "Higher-kinded hash containers"; license = lib.licenses.asl20; }) {}; @@ -265702,6 +266496,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-short_0_1_4" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, ghc-prim + , hashable, quickcheck-instances, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text + }: + mkDerivation { + pname = "text-short"; + version = "0.1.4"; + sha256 = "1p56cjm6f883ajb54y8hmrl01sqda6a36xvbmgjv3mb9gxv953v4"; + libraryHaskellDepends = [ + base binary bytestring deepseq ghc-prim hashable template-haskell + text + ]; + testHaskellDepends = [ + base binary bytestring quickcheck-instances tasty tasty-hunit + tasty-quickcheck template-haskell text + ]; + description = "Memory-efficient representation of Unicode text strings"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-show" = callPackage ({ mkDerivation, array, base, base-compat-batteries, base-orphans , bifunctors, bytestring, bytestring-builder, containers, criterion @@ -267329,6 +268145,8 @@ self: { pname = "threepenny-gui"; version = "0.9.1.0"; sha256 = "00sjkfa9qfnnwqfdw68yb8hq6nm1y5qv9896rzn5aachr7mlfpx2"; + revision = "1"; + editedCabalFile = "0zdpkp0pl6z4aabikbq30md392gk988fxwcqw10khv1icm143pcc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -271979,6 +272797,34 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "tree-diff_0_2_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base + , base-compat, bytestring, bytestring-builder, containers + , criterion, deepseq, Diff, hashable, parsec, parsers, pretty + , primitive, QuickCheck, scientific, semialign, strict, tagged + , tasty, tasty-golden, tasty-quickcheck, text, these, time + , trifecta, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "tree-diff"; + version = "0.2.1"; + sha256 = "0bybi4qp7nj9117yza5qqgw2f7s6rk3i7q642jqd7sdn3bx5cnap"; + libraryHaskellDepends = [ + aeson ansi-terminal ansi-wl-pprint base base-compat bytestring + bytestring-builder containers deepseq hashable parsec parsers + pretty primitive QuickCheck scientific semialign strict tagged text + these time unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + ansi-terminal ansi-wl-pprint base base-compat parsec primitive + QuickCheck tagged tasty tasty-golden tasty-quickcheck trifecta + ]; + benchmarkHaskellDepends = [ base criterion deepseq Diff ]; + description = "Diffing of (expression) trees"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "tree-fun" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -283869,6 +284715,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "wai-feature-flags_0_1_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, splitmix, text + , unordered-containers, wai, warp + }: + mkDerivation { + pname = "wai-feature-flags"; + version = "0.1.0.2"; + sha256 = "03w8hskgajvkhjsrj7ynxcx92qghqfd9rfxb5v4wm7wb6lag8qvh"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring splitmix text unordered-containers wai + ]; + executableHaskellDepends = [ base wai warp ]; + description = "Feature flag support for WAI applications"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "wai-frontend-monadcgi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, cgi , containers, http-types, transformers, wai @@ -285684,6 +286550,8 @@ self: { ]; description = "Warp based on QUIC"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "warp-static" = callPackage @@ -287299,6 +288167,32 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; + "weeder_2_3_0" = callPackage + ({ mkDerivation, algebraic-graphs, base, bytestring, containers + , dhall, directory, filepath, generic-lens, ghc, lens, mtl + , optparse-applicative, regex-tdfa, text, transformers + }: + mkDerivation { + pname = "weeder"; + version = "2.3.0"; + sha256 = "1l3g0afb0k91qb64kpj18nb53njbv3s5w06rkjf58p7qk6ynk9ig"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + algebraic-graphs base bytestring containers dhall directory + filepath generic-lens ghc lens mtl optparse-applicative regex-tdfa + text transformers + ]; + executableHaskellDepends = [ + base bytestring containers directory filepath ghc + optparse-applicative transformers + ]; + description = "Detect dead code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; + }) {}; + "weekdaze" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , cryptohash, data-default, deepseq, directory, extra, factory @@ -288198,6 +289092,8 @@ self: { pname = "witherable"; version = "0.4.1"; sha256 = "1jj2dq0ddaa2v3hksnrv1z1ll19fa4npsqlp7fs4nn5g6833y58b"; + revision = "1"; + editedCabalFile = "02l2gbcab7w72hqlbs1ikylgb1970a0iyrikn847nncivbzrc3gj"; libraryHaskellDepends = [ base base-orphans containers hashable indexed-traversable indexed-traversable-instances transformers unordered-containers @@ -289152,8 +290048,10 @@ self: { pname = "wrapped"; version = "0.1.0.1"; sha256 = "00fvammhn4dlna5d1dc8lpwrdrigj9cnlyi8scwslibr6bjsjzfp"; + revision = "1"; + editedCabalFile = "0qfl0k0bsxhf5zibfdfm08jn82j1nm8pdnmv23znmhv77hpm4li8"; libraryHaskellDepends = [ base ]; - description = "Provides a single standardized place to hang DerivingVia instances"; + description = "Newtypes to carry DerivingVia instances"; license = lib.licenses.asl20; }) {}; @@ -289163,8 +290061,10 @@ self: { pname = "wrapped-generic-default"; version = "0.1.0.1"; sha256 = "10hbz8m98cw8lr2xj0wkc017pnypagb11ss1ihpp6lnc4w1hpj3f"; + revision = "1"; + editedCabalFile = "0i75biqz6qml17yzg3k4q0ms5vzvwph37da1wl3l5v8cjnw2yrs7"; libraryHaskellDepends = [ base data-default-class wrapped ]; - description = "Provides an orphan instance Default (Wrapped Generic a)"; + description = "A Generic instance of Default"; license = lib.licenses.asl20; }) {}; @@ -291884,16 +292784,16 @@ self: { }) {}; "xmonad-dbus" = callPackage - ({ mkDerivation, base, dbus, utf8-string }: + ({ mkDerivation, base, dbus }: mkDerivation { pname = "xmonad-dbus"; - version = "0.1.0.0"; - sha256 = "18phy3wxags8cmgs9bdkhwb4gy8fr72j25b18nk44q8956a3060p"; + version = "0.1.0.1"; + sha256 = "15sqfk4y4arrv0bjzkrw49z1p7k3fqkn4w8pak2j7rki3915iyd4"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base dbus utf8-string ]; - executableHaskellDepends = [ base dbus utf8-string ]; - testHaskellDepends = [ base dbus utf8-string ]; + libraryHaskellDepends = [ base dbus ]; + executableHaskellDepends = [ base dbus ]; + testHaskellDepends = [ base dbus ]; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; @@ -292955,6 +293855,8 @@ self: { pname = "yaml"; version = "0.11.6.0"; sha256 = "0hxg9mfi1dn9a7kp3imzfvnk7jj4sdjdxi6xyqz9ra7lqg14np3r"; + revision = "1"; + editedCabalFile = "1yydwna0x7fj1zw0zkz3n1cfvnwdykblk19wz5bw9rcwp0i0mzkb"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -292973,6 +293875,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "yaml_0_11_7_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , conduit, containers, directory, filepath, hspec, HUnit, libyaml + , mockery, mtl, raw-strings-qq, resourcet, scientific + , template-haskell, temporary, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "yaml"; + version = "0.11.7.0"; + sha256 = "0s08kw0hqxixxripwjmz7b4yh9130dws3jaj460x8ds8q4b6khbx"; + configureFlags = [ "-fsystem-libyaml" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory + filepath libyaml mtl resourcet scientific template-haskell text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat bytestring conduit containers + directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq + resourcet scientific template-haskell temporary text transformers + unordered-containers vector + ]; + description = "Support for parsing and rendering YAML documents"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "yaml-combinators" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop , scientific, tasty, tasty-hunit, text, transformers diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index a780e6ba49f1e..de61714f2421d 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -16,7 +16,8 @@ let overrides = packageOverrides; }; -plat = if stdenv.isLinux then "linux" +plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux" + else if (stdenv.isLinux && lib.versionAtLeast self.luaversion "5.4") then "linux-readline" else if stdenv.isDarwin then "macosx" else if stdenv.hostPlatform.isMinGW then "mingw" else if stdenv.isFreeBSD then "freebsd" diff --git a/pkgs/development/libraries/argtable/default.nix b/pkgs/development/libraries/argtable/default.nix index a16885ab2549e..f22f81c877099 100644 --- a/pkgs/development/libraries/argtable/default.nix +++ b/pkgs/development/libraries/argtable/default.nix @@ -1,22 +1,27 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake }: stdenv.mkDerivation rec { pname = "argtable"; - version = "3.1.5"; - srcVersion = "v${version}.1c1bb23"; + version = "3.2.1"; + srcVersion = "v${version}.52f24e5"; src = fetchFromGitHub { owner = "argtable"; repo = "argtable3"; rev = srcVersion; - sha256 = "sha256-sL6mnxsuL1K0DY26jLF/2Czo0RxHYJ3xU3VyavISiMM="; + hash = "sha256-HFsk91uJXQ0wpvAQxP4/yZwRQx9kLH7KgB3Y/+zcZC0="; }; nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ]; + postPatch = '' patchShebangs tools/build ''; @@ -37,4 +42,7 @@ stdenv.mkDerivation rec { platforms = with platforms; all; }; } -# TODO [ AndersonTorres ]: a NixOS test suite +# TODO: a NixOS test suite +# TODO: multiple outputs +# TODO: documentation +# TODO: build both shared and static libs diff --git a/pkgs/development/libraries/atkmm/2.36.nix b/pkgs/development/libraries/atkmm/2.36.nix index 03dd009d26412..6b22c34e0c2f5 100644 --- a/pkgs/development/libraries/atkmm/2.36.nix +++ b/pkgs/development/libraries/atkmm/2.36.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { + attrPath = "atkmm_2_36"; packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix new file mode 100644 index 0000000000000..5969de54682e8 --- /dev/null +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-cal +, aws-c-common +, aws-c-compression +, aws-c-http +, aws-c-io +, cmake +, s2n-tls +}: + +stdenv.mkDerivation rec { + pname = "aws-c-auth"; + version = "0.6.4"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-auth"; + rev = "v${version}"; + sha256 = "120p69lj279yq3d2b81f45kgfrvf32j6m7s03m8hh27w8yd4vbfp"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + aws-c-cal + aws-c-common + aws-c-compression + aws-c-http + aws-c-io + s2n-tls + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C99 library implementation of AWS client-side authentication"; + homepage = "https://github.com/awslabs/aws-c-auth"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index 6f3df977efa83..d0bcfc9010842 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" ]; meta = with lib; { diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index ae47959dd3aa3..323b6001407b6 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.6.9"; + version = "0.6.12"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bnKIL51AW+0T87BxEazXDZElYqiwOUHQVEDKOCUzsbM="; + sha256 = "sha256-Bbb6YbPMpzVy+Pa9OGe62TXihTbUeKTlPS29sa70aQ8="; }; nativeBuildInputs = [ cmake ]; @@ -23,10 +23,20 @@ stdenv.mkDerivation rec { "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests ]; + # aws-c-common misuses cmake modules, so we need + # to manually add a MODULE_PATH to its consumers + setupHook = ./setup-hook.sh; + # Prevent the execution of tests known to be flaky. - preCheck = '' + preCheck = let + ignoreTests = [ + "promise_test_multiple_waiters" + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + "sba_metrics" # https://github.com/awslabs/aws-c-common/issues/839 + ]; + in '' cat <<EOW >CTestCustom.cmake - SET(CTEST_CUSTOM_TESTS_IGNORE promise_test_multiple_waiters) + SET(CTEST_CUSTOM_TESTS_IGNORE ${toString ignoreTests}) EOW ''; diff --git a/pkgs/development/libraries/aws-c-common/setup-hook.sh b/pkgs/development/libraries/aws-c-common/setup-hook.sh new file mode 100644 index 0000000000000..e670f7cf85299 --- /dev/null +++ b/pkgs/development/libraries/aws-c-common/setup-hook.sh @@ -0,0 +1,5 @@ +addAwsCCommonModuleDir() { + cmakeFlags="-DCMAKE_MODULE_PATH=@out@/lib/cmake ${cmakeFlags:-}" +} + +postHooks+=(addAwsCCommonModuleDir) diff --git a/pkgs/development/libraries/aws-c-compression/default.nix b/pkgs/development/libraries/aws-c-compression/default.nix new file mode 100644 index 0000000000000..9d885278ff06c --- /dev/null +++ b/pkgs/development/libraries/aws-c-compression/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-common +, cmake +}: + +stdenv.mkDerivation rec { + pname = "aws-c-compression"; + version = "0.2.14"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-compression"; + rev = "v${version}"; + sha256 = "0fs3zhhzxsb9nfcjpvfbcq79hal7si2ia1c09scab9a8m264f4vd"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + aws-c-common + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C99 implementation of huffman encoding/decoding"; + homepage = "https://github.com/awslabs/aws-c-compression"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix index b6468a8dae0ad..24cb52d61a678 100644 --- a/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS:BOOL=ON" - "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" ]; meta = with lib; { diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/development/libraries/aws-c-http/default.nix new file mode 100644 index 0000000000000..0bde86d674b8f --- /dev/null +++ b/pkgs/development/libraries/aws-c-http/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-cal +, aws-c-common +, aws-c-compression +, aws-c-io +, cmake +, s2n-tls +}: + +stdenv.mkDerivation rec { + pname = "aws-c-http"; + version = "0.6.7"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-http"; + rev = "v${version}"; + sha256 = "1s06bz6w7355ldyhwjidcpbff7591ch4lwwjcj47a6k2kczdmiz4"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + aws-c-cal + aws-c-common + aws-c-compression + aws-c-io + s2n-tls + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C99 implementation of the HTTP/1.1 and HTTP/2 specifications"; + homepage = "https://github.com/awslabs/aws-c-http"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 012d96fca4d71..938c6c79773d8 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.10.5"; + version = "0.10.9"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+H6dUKgpgXG1fh8r6k7TpVFMBso4G762zRfLAZD+Nss="; + sha256 = "sha256-16MhOQlvFwbiSBNI1NWGjrLh0z/fCnAGmc8JguZQPZM="; }; nativeBuildInputs = [ cmake ]; @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" ]; meta = with lib; { diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/development/libraries/aws-c-mqtt/default.nix new file mode 100644 index 0000000000000..92e5ad44b8717 --- /dev/null +++ b/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-cal +, aws-c-common +, aws-c-compression +, aws-c-http +, aws-c-io +, cmake +, ninja +, s2n-tls +}: + +stdenv.mkDerivation rec { + pname = "aws-c-mqtt"; + version = "0.7.8"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-mqtt"; + rev = "v${version}"; + sha256 = "19j6nw2v36c4yff4p0fbf0748s06fd5r9cp2yakry9ybn1ada99c"; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + aws-c-cal + aws-c-common + aws-c-compression + aws-c-http + aws-c-io + s2n-tls + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C99 implementation of the MQTT 3.1.1 specification"; + homepage = "https://github.com/awslabs/aws-c-mqtt"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix new file mode 100644 index 0000000000000..514fdee1d4e22 --- /dev/null +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-auth +, aws-c-cal +, aws-c-common +, aws-c-compression +, aws-c-http +, aws-c-io +, cmake +, s2n-tls +}: + +stdenv.mkDerivation rec { + pname = "aws-c-s3"; + version = "0.1.27"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-c-s3"; + rev = "v${version}"; + sha256 = "sha256-GtBUC5cKMN9rd5GQbYoipVvxrUCCNKbb5vhHUGQpeH8="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + aws-c-auth + aws-c-cal + aws-c-common + aws-c-compression + aws-c-http + aws-c-io + s2n-tls + ]; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C99 library implementation for communicating with the S3 service"; + homepage = "https://github.com/awslabs/aws-c-s3"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index 75b26695e2f2c..9042dc5615442 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" ]; meta = with lib; { diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/development/libraries/aws-crt-cpp/default.nix new file mode 100644 index 0000000000000..68414931e4133 --- /dev/null +++ b/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -0,0 +1,63 @@ +{ lib, stdenv +, fetchFromGitHub +, aws-c-auth +, aws-c-cal +, aws-c-common +, aws-c-compression +, aws-c-event-stream +, aws-c-http +, aws-c-io +, aws-c-mqtt +, aws-c-s3 +, aws-checksums +, cmake +, s2n-tls +}: + +stdenv.mkDerivation rec { + pname = "aws-crt-cpp"; + version = "0.17.0"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = "aws-crt-cpp"; + rev = "v${version}"; + sha256 = "0ijvyg3hrh1d0npca62syz8qy6nkqh90fq54cqyln0p333z16q52"; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt --replace '-Werror' "" + ''; + + nativeBuildInputs = [ + cmake + ]; + + propagatedBuildInputs = [ + aws-c-auth + aws-c-cal + aws-c-common + aws-c-compression + aws-c-event-stream + aws-c-http + aws-c-io + aws-c-mqtt + aws-c-s3 + aws-checksums + s2n-tls + ]; + + cmakeFlags = [ + "-DBUILD_DEPS=OFF" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DBUILD_SHARED_LIBS=ON" + ]; + + meta = with lib; { + description = "C++ wrapper around the aws-c-* libraries"; + homepage = "https://github.com/awslabs/aws-crt-cpp"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; + }; +} diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 69cb1cc22ae9f..d58fabfd5ea2f 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, curl, openssl, s2n-tls, zlib +, aws-crt-cpp , aws-c-cal, aws-c-common, aws-c-event-stream, aws-c-io, aws-checksums , CoreAudio, AudioToolbox , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. @@ -17,15 +18,23 @@ in stdenv.mkDerivation rec { pname = "aws-sdk-cpp"; - version = "1.8.130"; + version = "1.9.121"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "sha256-5T4l0KYB0utFTdEOtYT9trQ/JehQbXxk/IhI6YavErs="; + sha256 = "sha256-VQpWauk0tdJ1QU0HmtdTwQdKbiAuTTXXsUo2cqpqmdU="; }; + postPatch = '' + # Includes aws-c-auth private headers, so only works with submodule build + rm aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + # TestRandomURLMultiThreaded fails + rm aws-cpp-sdk-core-tests/http/HttpClientTest.cpp + ''; + # FIXME: might be nice to put different APIs in different outputs # (e.g. libaws-cpp-sdk-s3.so in output "s3"). outputs = [ "out" "dev" ]; @@ -33,6 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake curl ]; buildInputs = [ + aws-crt-cpp curl openssl zlib ] ++ lib.optionals (stdenv.isDarwin && ((builtins.elem "text-to-speech" apis) || diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 69e16a8922a53..09a407fc3bc3c 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -5,27 +5,29 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "2.9.8"; + version = "2.9.9"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - sha256 = "sha256-nEICs1oAIXu6/5O4R3mbwig1OY+HDIWWeQjrcYnCwT0="; + hash = "sha256-DWyqVN7v+j2XCArv4jmrD45XKWMNhd2DddJHH3gQWQY="; }; + outputs = [ "out" "doc" ]; + installPhase = '' runHook preInstall + install -dm 755 $out/include/CImg/plugins $doc/share/doc/cimg/examples install -m 644 CImg.h $out/include/ cp -dr --no-preserve=ownership examples/* $doc/share/doc/cimg/examples/ cp -dr --no-preserve=ownership plugins/* $out/include/CImg/plugins/ cp README.txt $doc/share/doc/cimg/ + runHook postInstall ''; - outputs = [ "out" "doc" ]; - meta = with lib; { homepage = "http://cimg.eu/"; description = "A small, open source, C++ toolkit for image processing"; diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index ff3e9ee52e998..a556b64f1d385 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -1,26 +1,69 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, exiv2 +, glib +, gnome +, gobject-introspection +, vala +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, python3 +}: stdenv.mkDerivation rec { pname = "gexiv2"; - version = "0.12.3"; + version = "0.14.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jt5cqL8b4QBULrR7XnBy+xnKVHhgMHh7DPKbHMMWfM="; + sha256 = "5YJ5pv8gtvZPpJlhXaXptXz2W6eFC3L6/fFyIanW1p4="; }; - nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ glib ]; - propagatedBuildInputs = [ exiv2 ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ]; + + buildInputs = [ + glib + # Python binding overrides + python3 + python3.pkgs.pygobject3 + ]; + + propagatedBuildInputs = [ + exiv2 + ]; mesonFlags = [ "-Dgtk_doc=true" + "-Dpython3_girdir=${placeholder "out"}/${python3.sitePackages}/gi/overrides" ]; doCheck = true; + preCheck = '' + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running unit tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that will be overridden during installation. + mkdir -p $out/lib + ln -s $PWD/gexiv2/libgexiv2.so.2 $out/lib/libgexiv2.so.2 + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; @@ -31,7 +74,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://wiki.gnome.org/Projects/gexiv2"; description = "GObject wrapper around the Exiv2 photo metadata library"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = teams.gnome.members; }; diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix index db713cf9ea5f8..1ba18898ad892 100644 --- a/pkgs/development/libraries/glibmm/2.68.nix +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.68.1"; + version = "2.70.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ZmTifJqcyoHCnjVof0ny4NFzovyemMNCgxH3B9tTL4w="; + sha256 = "sha256-gAj9iu3cyGej+X8RPeYl9ulu+Yz3hgN5gTqcD+/9tSA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index dfa454b9253ac..f409935372eed 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.66.1"; + version = "2.66.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ab1rUydxbKL1EatYCpaf178M0sJM4V4dDlMFktP/IJw="; + sha256 = "sha256-sqTNe5rph3lMu1ob7MEM7LZRgrm7hBhoYl1ruxI+2x0="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index 4194064a5a29a..1f2966695d864 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib, gnome }: stdenv.mkDerivation rec { pname = "goocanvas"; @@ -20,6 +20,15 @@ stdenv.mkDerivation rec { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; + passthru = { + updateScript = gnome.updateScript { + attrPath = "${pname}${lib.versions.major version}"; + packageName = pname; + versionPolicy = "odd-unstable"; + freeze = true; + }; + }; + meta = with lib; { description = "Canvas widget for GTK based on the the Cairo 2D library"; homepage = "https://wiki.gnome.org/Projects/GooCanvas"; diff --git a/pkgs/development/libraries/goocanvas/3.x.nix b/pkgs/development/libraries/goocanvas/3.x.nix index c5decffe74e2e..8a07f31b818d4 100644 --- a/pkgs/development/libraries/goocanvas/3.x.nix +++ b/pkgs/development/libraries/goocanvas/3.x.nix @@ -9,6 +9,7 @@ , cairo , gtk3 , glib +, gnome }: stdenv.mkDerivation rec { @@ -39,6 +40,14 @@ stdenv.mkDerivation rec { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; + passthru = { + updateScript = gnome.updateScript { + attrPath = "${pname}${lib.versions.major version}"; + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + meta = with lib; { description = "Canvas widget for GTK based on the the Cairo 2D library"; homepage = "https://wiki.gnome.org/Projects/GooCanvas"; diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix index 1bc763349a869..03268fb024c66 100644 --- a/pkgs/development/libraries/goocanvas/default.nix +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "none"; + versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix index 4e706f409870d..7642080086562 100644 --- a/pkgs/development/libraries/goocanvasmm/default.nix +++ b/pkgs/development/libraries/goocanvasmm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; attrPath = "goocanvasmm2"; - versionPolicy = "odd-unstable"; + versionPolicy = "none"; # stable version has not been released yet, last update 2015 }; }; diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 13ec503fae0e6..ed8f8edd656fb 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "grilo-plugins"; - version = "0.3.13"; + version = "0.3.14"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HEMF1nNkqTBUODbMGYLzDpRpc7j/avPv4x2HcJq1IPg="; + sha256 = "aGhEs07HOySTH/bMT2Az8AcpR6bbYKzcf7Pq8Velgcg="; }; patches = [ @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/Grilo"; description = "A collection of plugins for the Grilo framework"; maintainers = teams.gnome.members; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index 172ae39536e6e..16897c6f04468 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -1,40 +1,62 @@ -{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3 -, gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, libxml2, gnome, gobject-introspection, libsoup, totem-pl-parser }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, gettext +, vala +, glib +, liboauth +, gtk3 +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, libxml2 +, gnome +, gobject-introspection +, libsoup +, totem-pl-parser +}: -let +stdenv.mkDerivation rec { pname = "grilo"; - version = "0.3.13"; # if you change minor, also change ./setup-hook.sh -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "0.3.14"; # if you change minor, also change ./setup-hook.sh outputs = [ "out" "dev" "man" "devdoc" ]; outputBin = "dev"; + setupHook = ./setup-hook.sh; + src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ywjvh7xw4ql1q4fvl0q5n06n08pga1g1nc9l7c3x5214gr3fj6i"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "A2nQsAuw9Zul966oz8Zl843xSltBgtKMfB4s0VtRh0M="; }; - patches = [ - (fetchpatch { - name = "CVE-2021-39365.patch"; - url = "https://gitlab.gnome.org/GNOME/grilo/-/commit/cd2472e506dafb1bb8ae510e34ad4797f63e263e.patch"; - sha256 = "1i1p21vlms43iawg4dl1dibnpsbnkx27kcfvllnx76q07bfrpwzm"; - }) - ]; - - setupHook = ./setup-hook.sh; - mesonFlags = [ "-Denable-gtk-doc=true" ]; nativeBuildInputs = [ - meson ninja pkg-config gettext gobject-introspection vala - gtk-doc docbook_xsl docbook_xml_dtd_43 + meson + ninja + pkg-config + gettext + gobject-introspection + vala + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ]; + + buildInputs = [ + glib + liboauth + gtk3 + libxml2 + libsoup + totem-pl-parser ]; - buildInputs = [ glib liboauth gtk3 libxml2 libsoup totem-pl-parser ]; passthru = { updateScript = gnome.updateScript { @@ -47,7 +69,7 @@ in stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/Grilo"; description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; maintainers = teams.gnome.members; - license = licenses.lgpl2; + license = licenses.lgpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index 7123aa0d3ac1f..76adcc1fae338 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = "gst_all_1.gstreamermm"; + attrPath = "gst_all_1.gstreamermm"; + packageName = "gstreamermm"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix index e6c6d93919331..b7c2d5d3aa9c6 100644 --- a/pkgs/development/libraries/gtk-frdp/default.nix +++ b/pkgs/development/libraries/gtk-frdp/default.nix @@ -9,19 +9,19 @@ , glib , gtk3 , freerdp -, nix-update-script +, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "gtk-frdp"; - version = "3.37.1-unstable-2020-10-26"; + version = "unstable-2021-10-01"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "805721e82ca1df6a50da3b5bd3b75d6747016482"; - sha256 = "q/UFKYj3LUkAzll3KeKd6oec0GJnDtTuFMTTatKFlcs="; + rev = "9c15c1202ed66fe20334e33d798cc5ebd39917f0"; + sha256 = "2YOLpyd26qWQKvneH4ww2DS8h/ZNYDmfbYIjQDvDMko="; }; nativeBuildInputs = [ @@ -39,8 +39,10 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = pname; + updateScript = unstableGitUpdater { + # The updater tries src.url by default, which does not exist for fetchFromGitHub (fetchurl). + url = "${meta.homepage}.git"; + branch = "gtk-frdp-0-1"; }; }; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 7999d62b91125..499615a79c1c7 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -202,6 +202,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = "gtk+"; attrPath = "gtk3"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 2e43e58db42da..734cf833fd846 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { packageName = pname; attrPath = "${pname}3"; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index 0a654d9518dca..67afc4026d1ac 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "4.2.0"; + version = "4.4.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12x9j82y37r4v0ngs22rzp4wmw7k2bbb9d3bymcczzz7y8w4q328"; + sha256 = "LrRkMmCW5qQMgunNB0Fk2BA/teB4ZWecCmSeQXRwDdo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index e5563d37f1ace..0095b6ca9e08c 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -88,6 +88,7 @@ stdenv.mkDerivation rec { packageName = "gtksourceview"; attrPath = "gtksourceview4"; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/pkgs/development/libraries/gtksourceviewmm/4.x.nix index 3011a126c10de..5bdcc029c5c8c 100644 --- a/pkgs/development/libraries/gtksourceviewmm/4.x.nix +++ b/pkgs/development/libraries/gtksourceviewmm/4.x.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { + attrPath = "gtksourceviewmm4"; packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix index 2b9124032590e..cdc96f3f1a04b 100644 --- a/pkgs/development/libraries/gtksourceviewmm/default.nix +++ b/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = "gtksourceviewmm"; versionPolicy = "none"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 405598c69640e..5889c6ee3acfc 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -12,13 +12,16 @@ , vala , gobject-introspection , fribidi +, glib , gtk4 +, gnome +, gsettings-desktop-schemas , xvfb-run }: stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.0.0-alpha.2"; + version = "1.0.0.alpha.3"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -28,7 +31,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - sha256 = "1yvjdzs5ipmr4gi0l4k6dkqhl9b090kpjc3ll8bv1a6i7yfaf53s"; + sha256 = "sha256-4ED2m8hZMWbu5sFbkH0W6q05+cYCCkx+ubeDqg3W3a0="; }; nativeBuildInputs = [ @@ -54,13 +57,31 @@ stdenv.mkDerivation rec { ]; checkInputs = [ + gnome.adwaita-icon-theme xvfb-run ]; doCheck = true; checkPhase = '' - xvfb-run meson test + runHook preCheck + + testEnvironment=( + # Disable portal since we cannot run it in tests. + ADW_DISABLE_PORTAL=1 + + # AdwSettings needs to be initialized from “org.gnome.desktop.interface” GSettings schema when portal is not used for color scheme. + # It will not actually be used since the “color-scheme” key will only have been introduced in GNOME 42, falling back to detecting theme name. + # See adw_settings_constructed function in https://gitlab.gnome.org/GNOME/libadwaita/commit/60ec69f0a5d49cad8a6d79e4ecefd06dc6e3db12 + "XDG_DATA_DIRS=${glib.getSchemaPath gsettings-desktop-schemas}/../.." + + # Tests need a cache directory + "HOME=$TMPDIR" + ) + env "''${testEnvironment[@]}" xvfb-run \ + meson test --print-errorlogs + + runHook postCheck ''; postInstall = '' diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index b3f6e1a7cdd99..63acabb320e4c 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -87,6 +87,7 @@ assert postgresSupport -> postgresql != null; updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix index ad5e0cbecd6e8..34735e644e436 100644 --- a/pkgs/development/libraries/libgdamm/default.nix +++ b/pkgs/development/libraries/libgdamm/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "odd-unstable"; + versionPolicy = "none"; # Should be odd-unstable but stable version has not been released yet. }; }; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index cbc2c8a617b4e..d4583c74df0ff 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libsigc++"; - version = "2.10.6"; + version = "2.10.7"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3aF23EaBvanVoqwbxVJzvdOBZit6bUnpGCZ9E+h3Ths="; + sha256 = "sha256-0IKiznLHUPZrGkFavj6FLfLq4eivUwEPSsLqJhpHiDI="; }; nativeBuildInputs = [ pkg-config meson ninja ]; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { packageName = pname; attrPath = "libsigcxx"; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index 6fd7f3e696a2c..b958ba3076747 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { glib-networking.out ]; updateScript = gnome.updateScript { - attrPath = "libsoup3"; + attrPath = "libsoup_3"; packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 6d2150103a107..f902d32037761 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index 39a1d505b6521..c78cc192a7cff 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "libwnck"; - version = "3.36.0"; + version = "40.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0pwjdhca9lz2n1gf9b60xf0m6ipf9snp8rqf9csj4pgdnd882l5w"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "MMt5qDn5DNZvPiAvP5jLUWb6DNm5LrVxrZxHCkMCHYM="; }; nativeBuildInputs = [ @@ -62,8 +62,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "${pname}${lib.versions.major version}"; - versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 67c5a0794ed5f..19af942d759f7 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -17,8 +17,10 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { + attrPath = "libxmlxx"; packageName = pname; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix index 41c842220c7de..b3ff59ad41e17 100644 --- a/pkgs/development/libraries/libxmlxx/v3.nix +++ b/pkgs/development/libraries/libxmlxx/v3.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome }: stdenv.mkDerivation rec { pname = "libxml++"; @@ -22,6 +22,15 @@ stdenv.mkDerivation rec { --replace 'docdir=''${datarootdir}' "docdir=$doc/share" ''; + passthru = { + updateScript = gnome.updateScript { + attrPath = "libxmlxx3"; + packageName = pname; + versionPolicy = "odd-unstable"; + freeze = true; + }; + }; + meta = with lib; { homepage = "http://libxmlplusplus.sourceforge.net/"; description = "C++ wrapper for the libxml2 XML parser library, version 3"; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index c3f46d8e31efd..0263ef3096ddc 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -13,6 +13,7 @@ , gflags , protobuf , config +, ocl-icd , enableJPEG ? true , libjpeg @@ -313,6 +314,8 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" + ] ++ lib.optionals (!stdenv.isDarwin) [ + "-DOPENCL_LIBRARY=${ocl-icd}/lib/libOpenCL.so" ] ++ lib.optionals enablePython [ "-DOPENCV_SKIP_PYTHON_LOADER=ON" ]; diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 2ad169f2a3f6a..1ce6f26721044 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssl }: +{ lib, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, openssl +}: stdenv.mkDerivation rec { pname = "s2n-tls"; @@ -11,6 +16,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-6XqBpNURU8fzGkTt4jsijgMiOkzMebmLmPAq8yQsTg4="; }; + patches = [ + # Fix FindLibCrypto paths (https://github.com/aws/s2n-tls/pull/3067) + (fetchpatch { + url = "https://github.com/aws/s2n-tls/commit/bda649524402be4018c44bff07f6c64502a351ec.patch"; + sha256 = "02jmxsrd506vhjzlrgh1p2z1f1sn4v8klks25zisiykyqkyaczkv"; + }) + ]; + nativeBuildInputs = [ cmake ]; outputs = [ "out" "dev"]; @@ -26,8 +39,11 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto). postInstall = '' - substituteInPlace $out/lib/s2n/cmake/shared/s2n-targets.cmake \ - --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES ""' + # Glob for 'shared' or 'static' subdir + for f in $out/lib/s2n/cmake/*/s2n-targets.cmake; do + substituteInPlace "$f" \ + --replace 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/include"' 'INTERFACE_INCLUDE_DIRECTORIES ""' + done ''; meta = with lib; { diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index a5553dd0d00a4..2668de9b4612e 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-5NNhNRsVbyhipSRBX76/BTnHgc2HxmKWYvAmW0gDuLg="; + sha256 = "sha256-Bi+C3VSKYq7IUQWFAROskBpiK8UcbPxjIFY2Xof4GYE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 39ac21b7ad6c5..fc0ba54cbe7ef 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , gettext , meson , ninja @@ -44,6 +45,13 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit asciidoc; }) + ] ++ lib.optionals (stdenv.hostPlatform.isi686) [ + # Upstream: https://gitlab.gnome.org/GNOME/tracker/-/issues/332 + (fetchpatch { + name = "i686-test.patch"; + url = "https://gitlab.gnome.org/GNOME/tracker/-/commit/af707181a2c492a794daec7ce3f3062d67ffd9dc.patch"; + sha256 = "sha256-KOdkTy79w3oiQILrPG00UVrv+VBjAk4Y868I8jtifqk="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index fc3be7421adb2..d6864b80f9ed0 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -13,13 +13,13 @@ python3.pkgs.buildPythonApplication rec { pname = "yelp-tools"; - version = "40.0"; + version = "41.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/yelp-tools/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1bkanqp3qwmirv06mi99qv2acr5ba5rlhy9zlh0fyrfxygraqjv6"; + sha256 = "N/GswCvL5ooxuG4HwSmoOb0yduZW3Inrf8CpJ0bv8nI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index bbc9a804aa746..ccd0b19e1ad3c 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -1,6 +1,7 @@ { pkgs, nodejs, stdenv, applyPatches, fetchFromGitHub, fetchpatch, fetchurl }: let + inherit (pkgs) lib; since = (version: pkgs.lib.versionAtLeast nodejs.version version); before = (version: pkgs.lib.versionOlder nodejs.version version); super = import ./composition.nix { @@ -319,23 +320,11 @@ let }; netlify-cli = - let - esbuild = pkgs.esbuild.overrideAttrs (old: rec { - version = "0.13.6"; - - src = fetchFromGitHub { - owner = "netlify"; - repo = "esbuild"; - rev = "v${version}"; - sha256 = "0asjmqfzdrpfx2hd5hkac1swp52qknyqavsm59j8xr4c1ixhc6n9"; - }; - - }); - in super.netlify-cli.override { preRebuild = '' - export ESBUILD_BINARY_PATH="${esbuild}/bin/esbuild" + export ESBUILD_BINARY_PATH="${pkgs.esbuild_netlify}/bin/esbuild" ''; + meta.maintainers = with lib.maintainers; [ roberth ]; }; ssb-server = super.ssb-server.override { diff --git a/pkgs/development/ocaml-modules/color/default.nix b/pkgs/development/ocaml-modules/color/default.nix new file mode 100644 index 0000000000000..84d2f11d8629d --- /dev/null +++ b/pkgs/development/ocaml-modules/color/default.nix @@ -0,0 +1,29 @@ +{ lib +, fetchurl +, buildDunePackage +, gg +}: + +buildDunePackage rec { + pname = "color"; + version = "0.2.0"; + + useDune2 = true; + minimalOCamlVersion = "4.05"; + + src = fetchurl { + url = "https://github.com/anuragsoni/color/releases/download/${version}/color-${version}.tbz"; + sha256 = "0wg3a36i1a7fnz5pf57qzbdghwr6dzp7nnxyrz9m9765lxsn65ph"; + }; + + propagatedBuildInputs = [ + gg + ]; + + meta = with lib; { + description = "Converts between different color formats"; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + homepage = "https://github.com/anuragsoni/color"; + }; +} diff --git a/pkgs/development/python-modules/annexremote/default.nix b/pkgs/development/python-modules/annexremote/default.nix index a508e7b271111..9ea365079451c 100644 --- a/pkgs/development/python-modules/annexremote/default.nix +++ b/pkgs/development/python-modules/annexremote/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "annexremote"; - version = "1.4.5"; + version = "1.6.0"; # use fetchFromGitHub instead of fetchPypi because the test suite of # the package is not included into the PyPI tarball @@ -17,7 +17,7 @@ buildPythonPackage rec { rev = "v${version}"; owner = "Lykos153"; repo = "AnnexRemote"; - sha256 = "0r5chdk2aiqcz7z8r8m1j657cz79f6bbv96xdmhj4m5fiqn672if"; + sha256 = "08myswj1vqkl4s1glykq6xn76a070nv5mxj0z8ibl6axz89bvypi"; }; propagatedBuildInputs = [ future ]; diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 62f383c567857..c60122ff18021 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "1.5.0"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "3cb1b0e28f420232d894d89665d5c0c8241b99e56d806171f4faf5cdfec08ae1"; + sha256 = "c0357c62223fefcfc7a7565389dbd4db900623bf10eccf2bc8e87586ec59b38d"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index bad63d287be32..9136ed0a4eb8f 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.6.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "69035c81f280fac5fa9c55f87be3a359b264853727486e3568818bb43988080e"; + sha256 = "3faaecb645e3b2300648a4a452458ec0e31e13d9dc928e710992e43ef4694205"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index d8e8f45d7cc8c..a89e803220d7c 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "23.0.0"; + version = "23.1.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1eb26b965ba4049ddcf10d4f25818725fc03c491c3be76537d0d74ceb1146b04"; + sha256 = "49dbb0f51006d557cbd0b22999cb9ecf3eabc2be46d96efcc6d651c6b33754b3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 8454d4463f4b3..c2c4e6328d5bb 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "1.1.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "433ad8e83bd8df4abc5af47a0e3a7a4515f79931db4036f2bccd65b5a9e88bfb"; + sha256 = "df14272a1835f743d1889f901e972ed6ec9ea9d6f8966ba2865bf10306a621cc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/braceexpand/default.nix b/pkgs/development/python-modules/braceexpand/default.nix new file mode 100644 index 0000000000000..c5e711bb8043d --- /dev/null +++ b/pkgs/development/python-modules/braceexpand/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "braceexpand"; + version = "0.1.7"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit version pname; + sha256 = "01gpcnksnqv6np28i4x8s3wkngawzgs99zvjfia57spa42ykkrg6"; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "braceexpand" ]; + + meta = with lib; { + description = "Bash-style brace expansion for Python"; + homepage = "https://github.com/trendels/braceexpand"; + changelog = "https://github.com/trendels/braceexpand/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix index 09987ddb3bf23..f286cd4a7f02e 100644 --- a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix +++ b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cucumber-tag-expressions"; - version = "4.0.2"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "4ef4e0513d4c26d42299ffed010ed5e24125b87fc64de2e74b979d4a84c8f522"; + sha256 = "e314d5fed6eebb2f90380271f562248fb15e18636764faf40f4dde4b28b1f960"; }; checkInputs = [ pytest pytest-html ]; diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index cc5a1ba01b8f2..33b33631c29f8 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-storages"; - version = "1.12"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "b3fdb4337b1e54b8a23fe41c62d91648e26249f9fc00e882d1d09e16207aa204"; + sha256 = "cb079981e2e4fe16d7f41000913225140dc334a84f5b7c5e4fcc6b7e6a028222"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix index fdd4bd03b7057..fc0d0e0921b48 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django_modelcluster/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "django-modelcluster"; - version = "5.1"; + version = "5.2"; src = fetchPypi { inherit pname version; - sha256 = "783d177f7bf5c8f30fe365c347b9a032920de371fe1c63d955d7b283684d4c08"; + sha256 = "e541a46a0a899ef4778a4708be22e71cac3efacc09a6ff44bc065c5c9194c054"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 5e9492f90412c..ee815e53f0105 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.13"; + version = "0.5.14"; src = fetchFromGitHub { owner = "michaeldavie"; repo = "env_canada"; rev = "v${version}"; - sha256 = "sha256-Z/5YRvHcZgRuSQnaMbNIT93uSYvRzMWpdMy0M7tD2QI="; + sha256 = "06v9ifpgdfx5v8k8jwqd4y985p27s1wxl7908v3aqxv7203acn7w"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index cceda84be1059..8a48df97f97da 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.6.1"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ug96Nj50fg29QHVCD95Cs+bFDnObqAiAdXh4l4qPT/k="; + sha256 = "48b8081700eeaa92f8921d5aff6a5287c0eb47a3cc483f2032105290ce0454b5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index 9cc1d8252eed6..d461392705f2c 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "0.1.3"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "5d1847f44a23a2fba815cbfbe7391a0364fd6a5c088fcd5f5a09d454aad8cc7c"; + sha256 = "3d4fb605d2611586a66d16d02803fcb306331f21351b16497ee8c40753be3a27"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 3cba24e12bfb0..203102cafb9a2 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.8.0"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4RQCpgJ+QkTgNAu/9rJmnA0wxOUm3HeAEDLWBbMMuSo="; + sha256 = "bedd376807ab3dde08f2d92caa0e4e5ad7c2ccfc7069561e80964b998a0d8f51"; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 94a1a5e342de9..d7c389bb86403 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.2.4"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3gbCBb+jnz4hE2T02JsSGxoFSIVg2UDTOaRMKCXh1vg="; + sha256 = "3b53fde67a97718642d29ac26b1b7608e7581b37d1e468f3c2ae38ea6cf7308f"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index ced64648602bc..43b35ca1988dc 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.4.1"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cxuLaZ4cBdsWsyfRqb4NJ1+RWZSJhvTTclYF9uy6QM4="; + sha256 = "49c91574e04d52fc7c0fade95dd5e6ccb51190ab8b419352d008a617c7799879"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 23698885aba25..e6b88e727fa52 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.4.4"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RqFvdF4sYDTgz0uZfqOn1trcSQX6qrbUH89957zbUoU="; + sha256 = "e56e35fa647d794429c6fc1595b2ebf5f4d627f0b3d6499a000b54be343ea37e"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus]; diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 8891b513421ab..e781c2127dab6 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { - version = "2.4.2"; + version = "2.5.0"; pname = "gsd"; disabled = isPy27; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = pname; rev = "v${version}"; - sha256 = "1yv84girmqm155yjhhkiy1gdflf62110m2kgjiv4vcsjpy2i6has"; + sha256 = "0zw3ihbzkldwijz9phwivnzwylj30a2a4lknfbwm6vkx78rdrb1a"; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index 00791ac642f01..70b1a1fe52765 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.3.3"; + version = "10.4.0"; src = fetchPypi { inherit pname version; - sha256 = "ca3b0ae45a2c3a811c0dc39153b8a1ea8a5c8f786c56370a41dfd83a5bff2502"; + sha256 = "64fd249a7fcabea60953fc3e7f08da6a85960aca367c04d078b999b7f6fd0246"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index cc7572499da19..741fd996ffdc1 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.11.3"; + version = "3.12.0"; src = fetchPypi { inherit pname version; - sha256 = "c855d0111dd570f36497cdb8c11510ae8d14fb70698f20529e19f88485266233"; + sha256 = "ff3e8675a982f7754359ec598329ba5635014e2bfd51573b9413605849ef314a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/inifile/default.nix b/pkgs/development/python-modules/inifile/default.nix index 1aac6dad01266..0e9cb91ded9eb 100644 --- a/pkgs/development/python-modules/inifile/default.nix +++ b/pkgs/development/python-modules/inifile/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "inifile"; - version = "0.3"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0zgd53czc1irwx6b5zip8xlmyfr40hz2pd498d8yv61znj6lm16h"; + sha256 = "d9e5eb4708ebf13353c4cfce798ad47890a8bcc5fbae04630223d15d79f55e96"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix index e3f09860e89e8..a3d603a13d42b 100644 --- a/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/pkgs/development/python-modules/intensity-normalization/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "intensity-normalization"; - version = "2.0.3"; + version = "2.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d6f2ac360f51f5314e690272cb26c454e6deab69ef48a7c650ea760247d1d4db"; + sha256 = "0d6eab99067e935336289c564caab541209ddd5e951a111f604b1ec92c710b84"; }; postPatch = '' diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index cd51661bde052..95981992fea3e 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "keepkey"; - version = "6.7.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "keepkey"; repo = "python-keepkey"; rev = "v${version}"; - sha256 = "0yi27wzb4q371y4bywi4hz37h4x63wjsyaa2mbx0rgc8xl2wm6yz"; + sha256 = "00hqppdj3s9y25x4ad59y8axq94dd4chhw9zixq32sdrd9v8z55a"; }; propagatedBuildInputs = [ protobuf hidapi trezor ]; diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 46306feb9367b..0bfa586a8ba5d 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "lightgbm"; - version = "3.2.1"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "bd98e3b501b4c24dc127f4ad93e467f42923fe3eefa99e143b5b93158f024395"; + sha256 = "107ae7babbbda2c2f0e07484f0c53cdeb455e9219235f79dc4e1685d7541e505"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 0afd8902d9568..1753b0dce8c14 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2021.07.21"; + version = "2021.10.9"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "80ca1db9648e7678f81b373dab04d06025ec6532e68a9be773ddbd159de54e4c"; + sha256 = "907a4a0765ab29ccd1c2247efa0eda7a9bd82d3be3a2ecfdeb9b9e6fbb9aa56e"; }; postPatch = '' diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index 61b7c68d53f6c..2056bbb0b9468 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "miniaudio"; - version = "1.44"; + version = "1.45"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "irmen"; repo = "pyminiaudio"; rev = "v${version}"; - sha256 = "1na3vx10lc41gkk14h6s3fm4bnrd2bwf4qbf1l6bfvhs92b9k111"; + sha256 = "1yx4n4zax103fmjzdiqzw37zibsh68b2p2l5qvgcnx2zrrjd31yl"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mockupdb/default.nix b/pkgs/development/python-modules/mockupdb/default.nix index 341660e1af0bc..47107f0617bee 100644 --- a/pkgs/development/python-modules/mockupdb/default.nix +++ b/pkgs/development/python-modules/mockupdb/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mockupdb"; - version = "1.8.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "130z5g96r52h362qc5jbf1g3gw3irb2wr946xlhgcv9ww9z64cl8"; + sha256 = "d36d0e5b6445ff9141e34d012fa2b5dfe589847aa1e3ecb8d774074962af944e"; }; propagatedBuildInputs = [ pymongo ]; diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 17f3ff34ba5bf..046f0b3149ab6 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.18.60"; + version = "1.18.62"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "4881fdbb41a74a15076c12285abd925a40e29d9f1b06d92b4d7cb12e8d208ae0"; + sha256 = "a12c44b1a1a9653d6f9148f174a9b7b71785481374ef43d962bd580967b6bca8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 0bc184d138f36..eb715c91e50d1 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "3.6.4"; + version = "3.6.5"; pname = "nltk"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "dd7e8012af25737e6aa7bc26568a319508dca789f13e62afa09798dccc7798b5"; + sha256 = "834d1a8e38496369390be699be9bca4f2a0f2175b50327272b2ec7a98ffda2a0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index 9277a4633f1b7..75eb114ac5815 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.5.0"; + version = "1.5.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "d0a7cfbb34dd93aff299a5a357f6f259a0a407c0e9136bab8e495a36e3f0846d"; + sha256 = "2c57a9ffe6d462b0ad1ea49ac3ce9ebb3e8d43b2adf653dbe47eaf1b13be3c3b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/onetimepass/default.nix b/pkgs/development/python-modules/onetimepass/default.nix new file mode 100644 index 0000000000000..220265fbc01d0 --- /dev/null +++ b/pkgs/development/python-modules/onetimepass/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchFromGitHub, six, timecop }: + +buildPythonPackage rec { + pname = "onetimepass"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "tadeck"; + repo = pname; + rev = "v${version}"; + sha256 = "0wmv62l3r8r4428gdzyj80lhgadfqvj220khz1wnm9alyzg60wkh"; + }; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + timecop + ]; + + pythonImportsCheck = [ "onetimepass" ]; + + meta = with lib; { + description = "One-time password library for HMAC-based (HOTP) and time-based (TOTP) passwords"; + homepage = "https://github.com/tadeck/onetimepass"; + license = licenses.mit; + maintainers = with maintainers; [ zakame ]; + }; +} diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 72b0bcfa197f6..766b7090f90f1 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "progressbar2"; - version = "3.54.0"; + version = "3.55.0"; src = fetchPypi { inherit pname version; - sha256 = "d878893cda2f477c63b5bd0f7f5301f03dd0a81c02554a1f2c5562036369376a"; + sha256 = "86835d1f1a9317ab41aeb1da5e4184975e2306586839d66daf63067c102f8f04"; }; propagatedBuildInputs = [ python-utils ]; diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index 19fa273c04665..005974a542c41 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "21.9.1"; + version = "21.10.4"; src = fetchPypi { inherit pname version; - sha256 = "8eef4dbfc97d984e63fd609a3f690d005173ec5342be88d10f67dd507affdf32"; + sha256 = "c9593a54d01dc1ab47ef20464aa7d00433690c86ae840c58f458fe6dedd6b41a"; }; patches = [ diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix index b4ff976c8eac6..7742a8890455c 100644 --- a/pkgs/development/python-modules/pymetar/default.nix +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pymetar"; - version = "1.3"; + version = "1.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-zhuXOZIIzh5p0CDOsiUNTqeXDoHFcf1BPg868fc7CIg="; + sha256 = "48dbe6c4929961021cb61e49bb9e0605b54c4b61b9fb9ade51076705a08ecd54"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index 7256749f8decf..4173987a7f6ad 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pynndescent"; - version = "0.5.4"; + version = "0.5.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "221124cbad8e3cf3ed421a4089d80ac5a29d3215e76cb49effc1df887533d2a8"; + sha256 = "7a7df8412b19cfb3596060faf5a8c5d0bf5b3bd504f8efd900fc4e3918c6f882"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix index 4b7f85482a415..a700a7d1fd6de 100644 --- a/pkgs/development/python-modules/pynput/default.nix +++ b/pkgs/development/python-modules/pynput/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pynput"; - version = "1.7.3"; + version = "1.7.4"; src = fetchPypi { inherit pname version; - sha256 = "4e50b1a0ab86847e87e58f6d1993688b9a44f9f4c88d4712315ea8eb552ef828"; + sha256 = "16fecc4d1e53a28fb7c669c79e189c3f2cde14a08d6b457c3da07075c82f3b4c"; }; nativeBuildInputs = [ sphinx ]; diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index a939caf49703b..0655d29f6af7f 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "1.4"; + version = "1.5"; pname = "python-rapidjson"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "018c20d3983cccfdc9cfed64407d4ba861ef3d64fe324a486f7130431afdefa7"; + sha256 = "04323e63cf57f7ed927fd9bcb1861ef5ecb0d4d7213f2755969d4a1ac3c2de6f"; }; LC_ALL="en_US.utf-8"; diff --git a/pkgs/development/python-modules/pytwitchapi/default.nix b/pkgs/development/python-modules/pytwitchapi/default.nix index 943642bfd64c3..423f87c1f7d31 100644 --- a/pkgs/development/python-modules/pytwitchapi/default.nix +++ b/pkgs/development/python-modules/pytwitchapi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytwitchapi"; - version = "2.4.2"; + version = "2.5.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Teekeks"; repo = "pyTwitchAPI"; rev = "v${version}"; - sha256 = "0fq1ky6nbrb47mlznl3vq8m86lqb6p78fvbcy8x3rm3m5zngxnz7"; + sha256 = "0sbzl9a4zxnvnvkmmmfc9c157dgq7y6qfb2cid5nym6jhxkixnqk"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index 3c7082d0e67b7..a2f475f3b3146 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyvmomi"; - version = "7.0.2"; + version = "7.0.3"; src = fetchFromGitHub { owner = "vmware"; repo = pname; rev = "v${version}"; - sha256 = "0li6g72ps1vxjzqhz10n02fl6cs069173jd9y4ih5am7vwhrwgpa"; + sha256 = "07jwlbi3k5kvpmgygvpkhsnbdp9m2ndwqxk9k6kyzfszwcbdx4bk"; }; # requires old version of vcrpy diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index 3cc833b561efe..3acb55377f9fa 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "robotframework"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "19pmjd9z3g9xpbri363lzd0gi1xa06aiyw2wjnxwqmd73x6pw695"; + sha256 = "0s6lakbd8h1pa4lfdj18sm13gpywszgpcns4hz026a4kam787kby"; }; checkInputs = [ jsonschema ]; diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 32c6cc4f9f117..015ba22781a82 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.60.0"; + version = "2.63.0"; src = fetchPypi { inherit pname version; - sha256 = "0fbd43343918137460eb1b563a81fe6de9b51c2ae4be0b844cf198c5567cd82e"; + sha256 = "b4d793217181f4ff1d269aa22e44f82e21a060ec9723301e1ae5e7d9082c76c8"; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix index cbd08934115c9..d85113b50d2ef 100644 --- a/pkgs/development/python-modules/strictyaml/default.nix +++ b/pkgs/development/python-modules/strictyaml/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "1.4.4"; + version = "1.5.0"; pname = "strictyaml"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "044ae3bec56f31e18dff8cfa62a2c9c028f4c7fe4c0f761e50761184d3b68eef"; + sha256 = "273a6382cc98a404d20779351cd5bb12e746397fbe18a8e9ccec4ae3c0ffa0e2"; }; postPatch = '' diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index e02da9a07ca52..384d7e3902eda 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.60.0"; + version = "2.61.0"; src = fetchPypi { inherit pname version; - sha256 = "8966b7793014380f60c6f121ba333d6f333a55818edaf79c8d70464ce0a7a808"; + sha256 = "8131addd3512a22c4c539dda2d869a8f488e06f1b02d1f3a5f0f4848fc56184e"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/svdtools/default.nix b/pkgs/development/python-modules/svdtools/default.nix new file mode 100644 index 0000000000000..b02058b8d3014 --- /dev/null +++ b/pkgs/development/python-modules/svdtools/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, braceexpand +, click +, pyyaml +, lxml +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "svdtools"; + version = "0.1.20"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit version pname; + sha256 = "028s1bn50mfpaygf1wc2mvf06s50wqfplqrkhrjz6kx8vzrmwj72"; + }; + + propagatedBuildInputs = [ + braceexpand + click + pyyaml + lxml + ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "svdtools" ]; + + meta = with lib; { + description = "Python package to handle vendor-supplied, often buggy SVD files"; + homepage = "https://github.com/stm32-rs/svdtools"; + changelog = "https://github.com/stm32-rs/svdtools/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index af8ef6d956fed..b3e38c8640701 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "3.17.5"; + version = "3.18.0"; src = fetchPypi { inherit pname version; - sha256 = "f719a3f436a09d4a13411c9df1209e61b788dca64c6478fcd68e0ae5c5671283"; + sha256 = "a391d1a9138fe53fe08aeb6aa15ca7f1a188659b9a6c12af5313c55730eccd6c"; }; propagatedBuildInputs = [ types-futures ]; diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 772ea06ad5181..05fb1b2b9f438 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.25.10"; + version = "2.25.11"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PhIZiBaM/8+mHv+vSPkOvF7gI/bMUNBMAUTt16ImW2U="; + sha256 = "sha256-snkoTlH2aOOO4S2WZeTXiQifUy3CoL5KFQjKDv2Yup4="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/versionfinder/default.nix b/pkgs/development/python-modules/versionfinder/default.nix new file mode 100644 index 0000000000000..a6c36e07c51e7 --- /dev/null +++ b/pkgs/development/python-modules/versionfinder/default.nix @@ -0,0 +1,32 @@ +{ lib, buildPythonPackage, fetchFromGitHub, GitPython, pytest, backoff, requests }: + +buildPythonPackage rec { + pname = "versionfinder"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "jantman"; + repo = pname; + rev = version; + sha256 = "16mvjwyhmw39l8by69dgr9b9jnl7yav36523lkh7w7pwd529pbb9"; + }; + + propagatedBuildInputs = [ + GitPython + backoff + ]; + + checkInputs = [ + pytest + requests + ]; + + pythonImportsCheck = [ "versionfinder" ]; + + meta = with lib; { + description = "Find the version of another package, whether installed via pip, setuptools or git"; + homepage = "https://github.com/jantman/versionfinder"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ zakame ]; + }; +} diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index 0e0d19e4f40ab..1542a447a1bce 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.7.5"; + version = "0.7.6"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = version; - sha256 = "sha256-vC2teem231Lw7cglVc+0M+QbgMgZ23JzTYy7wvnhFI4="; + sha256 = "sha256-Gf3hNCXioaLiQ0fZWPe9PO2YQeId4ZLmWsSZ5WvjSk0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index c645cd359032c..f287d10ff42d0 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.32.1"; + version = "0.33.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0DK6uTbuIVqrfsrTF0tAbx1WnVpc97nE0zuwTcFoBf8="; + sha256 = "1cq84ggp32xx79sgrxyqysqs34lhzyv8jdg7d46d9hdvjcwjb5af"; }; - vendorSha256 = "sha256-ox5Wx/9sJhZq4kFuI/GQlmFzuo5xti8yV+FY0bdR6Ek="; + vendorSha256 = "1ay3vf4dqlbizq98nxz2cgi67ck1c6lw7wi28w56607qzbx0yvmg"; doCheck = false; diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/development/tools/ashpd-demo/default.nix new file mode 100644 index 0000000000000..9e24309d984a0 --- /dev/null +++ b/pkgs/development/tools/ashpd-demo/default.nix @@ -0,0 +1,93 @@ +{ stdenv +, lib +, fetchFromGitHub +, nix-update-script +, meson +, ninja +, python3 +, rustPlatform +, pkg-config +, glib +, libshumate +, gst_all_1 +, gtk4 +, libadwaita +, llvmPackages +, glibc +, pipewire +, wayland +, wrapGAppsHook4 +, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "ashpd-demo"; + version = "0.0.1-alpha"; + + src = + let + share = fetchFromGitHub { + owner = "bilelmoussaoui"; + repo = "ashpd"; + rev = version; + sha256 = "Lf3Wj4VTDyJ5a1bJTEI6R6aaeEHZ+4hO+BsD98sKb/s="; + }; + in + "${share}/ashpd-demo"; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-npqC8lu7acAggJyR4iDkcQZYMNNnseV2pB3+j4G/nIk="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + rustPlatform.rust.cargo + rustPlatform.cargoSetupHook + rustPlatform.rust.rustc + wrapGAppsHook4 + desktop-file-utils + glib # for glib-compile-schemas + ]; + + buildInputs = [ + glib + gtk4 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + libadwaita + pipewire + wayland + libshumate + ]; + + # libspa-sys requires this for bindgen + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + # <spa-0.2/spa/utils/defs.h> included by libspa-sys requires <stdbool.h> + BINDGEN_EXTRA_CLANG_ARGS = "-I${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include -I${glibc.dev}/include"; + + postPatch = '' + patchShebangs build-aux/meson_post_install.py + # https://github.com/bilelmoussaoui/ashpd/pull/32 + substituteInPlace build-aux/meson_post_install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" + ''; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + description = "Tool for playing with XDG desktop portals"; + homepage = "https://github.com/bilelmoussaoui/ashpd/tree/master/ashpd-demo"; + license = licenses.mit; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/esbuild/netlify.nix b/pkgs/development/tools/esbuild/netlify.nix new file mode 100644 index 0000000000000..efd5b917e9cde --- /dev/null +++ b/pkgs/development/tools/esbuild/netlify.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "esbuild"; + version = "0.13.6"; + + src = fetchFromGitHub { + owner = "netlify"; + repo = "esbuild"; + rev = "v${version}"; + sha256 = "0asjmqfzdrpfx2hd5hkac1swp52qknyqavsm59j8xr4c1ixhc6n9"; + }; + + vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; + + meta = with lib; { + description = "A fork of esbuild maintained by netlify"; + homepage = "https://github.com/netlify/esbuild"; + license = licenses.mit; + maintainers = with maintainers; [ roberth ]; + }; +} diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index a0b9b813f4f06..298c55c47e96e 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.10.6"; + version = "0.10.7"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1f31z5isr34acv3nbsdigk3h426vind2zk5qvy44zmb5qmlb15x9"; + outputHash = "0sk4vwpy06smn0k7035bdz0g2y98l8hxmn4v3gijsqaxvnya36x9"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix index f37815081ee46..dbcd49dcfbe44 100644 --- a/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, makeWrapper, fetchFromGitHub, cctools }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "macdylibbundler"; - version = "20180825"; + version = "1.0.0"; src = fetchFromGitHub { owner = "auriamg"; repo = "macdylibbundler"; - rev = "ce13cb585ead5237813b85e68fe530f085fc0a9e"; - sha256 = "149p3dcnap4hs3nhq5rfvr3m70rrb5hbr5xkj1h0gsfp0d7gvxnj"; + rev = version; + sha256 = "02w04qvaf9v8yw8bgncx5qj3jx08xdfa855isvq92q27hsb8m8hv"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 42a30cce8eb91..4fe721d9193f7 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - hash = "sha256-iXsV7zt190GH0kTMpdmf8xHk4cqtCVwq6LDICmhe5qU="; + sha256 = "sha256-QLrmUlgrys+Bd2hiaPcfDUtn75XdaMhVThsDRq/ijQQ="; }; - cargoHash = "sha256-Yqn6VpAKw93QvkxuwNcYvrQm0C4TfisRDcmFy95/yw8="; + cargoSha256 = "sha256-Xw0/vEL50vc9ktwjTz09160Fo7rXRVgeRo/EnWJ2PH0="; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix index 26d7063c81f28..6c0465c1cf356 100644 --- a/pkgs/development/tools/pgformatter/default.nix +++ b/pkgs/development/tools/pgformatter/default.nix @@ -2,19 +2,22 @@ perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "5.0"; + version = "5.1"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; rev = "v${version}"; - sha256 = "10ml3va6ip501ibaykbhq8282y1j6r8bc8azc1gqxskk5jvfz1jm"; + sha256 = "1a6rmph96s7c8lpmpkizcvdf0x4jlsr5iqi7qjprxqsf6zak2rfg"; }; outputs = [ "out" ]; makeMakerFlags = [ "INSTALLDIRS=vendor" ]; + # Avoid creating perllocal.pod, which contains a timestamp + installTargets = [ "pure_install" ]; + # Makefile.PL only accepts DESTDIR and INSTALLDIRS, but we need to set more to make this work for NixOS. patchPhase = '' substituteInPlace pg_format \ diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix index 13339e4dc3428..f5de052e0e554 100644 --- a/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/pkgs/development/tools/rust/cargo-flash/default.nix @@ -3,10 +3,8 @@ , rustPlatform , fetchFromGitHub , libusb1 -, openssl , pkg-config , rustfmt -, Security , AppKit }: @@ -24,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-f5vUMdyz3vDh2yE0pMKZiknsqTAKkuvTCtlgb6/gaLc="; nativeBuildInputs = [ pkg-config rustfmt ]; - buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ Security AppKit ]; + buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; meta = with lib; { description = "A cargo extension for working with microcontrollers"; diff --git a/pkgs/development/tools/rust/cargo-limit/default.nix b/pkgs/development/tools/rust/cargo-limit/default.nix index 76f766685ab4e..da5f019d660ae 100644 --- a/pkgs/development/tools/rust/cargo-limit/default.nix +++ b/pkgs/development/tools/rust/cargo-limit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-limit"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "alopatindev"; repo = "cargo-limit"; rev = version; - sha256 = "sha256-OHBxQcXhZkJ1F6xLc7/sPpJhJzuJXb91IUjAtyC3XP8="; + sha256 = "sha256-GRitz9LOdZhbakbLZI2BUfZjqXLrsMK2MQJgixiEHaA="; }; - cargoSha256 = "sha256-LxqxRtMKUKZeuvk1caoYy8rv1bkEOQBM8i5SXMF4GXc="; + cargoSha256 = "sha256-uiANH9HOvy41FiABTTx2D9Rz1z/F7eITc5aiofaMSfI="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock b/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock index a51aef852d970..6b50ab4c79347 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock +++ b/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock @@ -30,14 +30,14 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] name = "anyhow" -version = "1.0.42" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" +checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" [[package]] name = "arrayvec" @@ -105,7 +105,7 @@ checksum = "c98233c6673d8601ab23e77eb38f999c51100d46c5703b17288c57fddf3a1ffe" dependencies = [ "bstr", "doc-comment", - "predicates 2.0.1", + "predicates 2.0.3", "predicates-core", "predicates-tree", "wait-timeout", @@ -119,7 +119,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -129,12 +129,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] -name = "base-x" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" - -[[package]] name = "base64" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -158,9 +152,9 @@ checksum = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" @@ -197,9 +191,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.7.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" +checksum = "d9df67f7bf9ef8498769f994239c45613ef0c5899415fb58e9add412d2c1a538" [[package]] name = "byteorder" @@ -208,6 +202,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] +name = "bytes" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + +[[package]] +name = "bytes" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" + +[[package]] name = "canvas" version = "0.1.0" dependencies = [ @@ -218,9 +224,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.69" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" +checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" [[package]] name = "cfg-if" @@ -251,7 +257,7 @@ dependencies = [ "num-integer", "num-traits 0.2.14", "time 0.1.43", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -268,7 +274,7 @@ checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" dependencies = [ "ansi_term", "atty", - "bitflags 1.2.1", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap", "unicode-width", @@ -292,11 +298,11 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "console_error_panic_hook" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "wasm-bindgen", ] @@ -309,10 +315,20 @@ dependencies = [ ] [[package]] -name = "const_fn" -version = "0.4.8" +name = "core-foundation" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7" +checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "crossbeam-channel" @@ -360,24 +376,24 @@ dependencies = [ [[package]] name = "curl" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "003cb79c1c6d1c93344c7e1201bb51c2148f24ec2bd9c253709d6b2efb796515" +checksum = "aaa3b8db7f3341ddef15786d250106334d4a6c4b0ae4a46cd77082777d9849b9" dependencies = [ "curl-sys", "libc", "openssl-probe", "openssl-sys", "schannel", - "socket2", - "winapi", + "socket2 0.4.2", + "winapi 0.3.9", ] [[package]] name = "curl-sys" -version = "0.4.45+curl-7.78.0" +version = "0.4.49+curl-7.79.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de9e5a72b1c744eb5dd20b2be4d7eb84625070bb5c4ab9b347b70464ab1e62eb" +checksum = "e0f44960aea24a786a46907b8824ebc0e66ca06bf4e4978408c7499620343483" dependencies = [ "cc", "libc", @@ -385,7 +401,7 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -424,12 +440,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - -[[package]] name = "doc-comment" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -462,6 +472,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] +name = "encoding_rs" +version = "0.8.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] name = "enum_primitive" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -504,7 +523,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -517,6 +536,12 @@ dependencies = [ ] [[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] name = "foreign-types" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -542,6 +567,22 @@ dependencies = [ ] [[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +dependencies = [ + "bitflags 1.3.2", + "fuchsia-zircon-sys", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + +[[package]] name = "funty" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -549,9 +590,9 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" [[package]] name = "futures" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adc00f486adfc9ce99f77d717836f0c5aa84965eb0b4f051f4e83f7cab53f8b" +checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca" dependencies = [ "futures-channel", "futures-core", @@ -564,9 +605,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9" +checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" dependencies = [ "futures-core", "futures-sink", @@ -583,9 +624,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99" +checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" [[package]] name = "futures-core-preview" @@ -595,9 +636,9 @@ checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" [[package]] name = "futures-executor" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c" +checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c" dependencies = [ "futures-core", "futures-task", @@ -606,9 +647,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582" +checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" [[package]] name = "futures-lite" @@ -617,14 +658,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" dependencies = [ "futures-core", - "pin-project-lite", + "pin-project-lite 0.2.7", ] [[package]] name = "futures-macro" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57" +checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" dependencies = [ "autocfg", "proc-macro-hack", @@ -635,21 +676,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53" +checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" [[package]] name = "futures-task" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2" +checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" [[package]] name = "futures-util" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78" +checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" dependencies = [ "autocfg", "futures-channel", @@ -659,7 +700,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite", + "pin-project-lite 0.2.7", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -694,6 +735,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] +name = "gloo" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68ce6f2dfa9f57f15b848efa2aade5e1850dc72986b87a2b0752d44ca08f4967" +dependencies = [ + "gloo-console-timer", + "gloo-events", + "gloo-file", + "gloo-timers", +] + +[[package]] +name = "gloo-console-timer" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b48675544b29ac03402c6dffc31a912f716e38d19f7e74b78b7e900ec3c941ea" +dependencies = [ + "web-sys", +] + +[[package]] +name = "gloo-events" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "088514ec8ef284891c762c88a66b639b3a730134714692ee31829765c5bc814f" +dependencies = [ + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-file" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f9fecfe46b5dc3cc46f58e98ba580cc714f2c93860796d002eb3527a465ef49" +dependencies = [ + "gloo-events", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gloo-timers" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f" +dependencies = [ + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] name = "guide-supported-types-examples" version = "0.1.0" dependencies = [ @@ -702,6 +797,32 @@ dependencies = [ ] [[package]] +name = "h2" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" +dependencies = [ + "bytes 0.5.6", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", + "tracing-futures", +] + +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" + +[[package]] name = "heck" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -727,10 +848,37 @@ dependencies = [ ] [[package]] +name = "http" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" +dependencies = [ + "bytes 1.1.0", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" +dependencies = [ + "bytes 0.5.6", + "http", +] + +[[package]] name = "httparse" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" +checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" + +[[package]] +name = "httpdate" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" [[package]] name = "humansize" @@ -745,6 +893,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] +name = "hyper" +version = "0.13.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" +dependencies = [ + "bytes 0.5.6", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project", + "socket2 0.3.19", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" +dependencies = [ + "bytes 0.5.6", + "hyper", + "native-tls", + "tokio", + "tokio-tls", +] + +[[package]] name = "id-arena" version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -789,12 +974,37 @@ dependencies = [ ] [[package]] +name = "indexmap" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] name = "inflate" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7e0062d2dc2f17d2f13750d95316ae8a2ff909af0fda957084f5defd87c43bb" [[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "ipnet" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" + +[[package]] name = "itertools" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -805,9 +1015,9 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "jpeg-decoder" @@ -820,7 +1030,7 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.52" +version = "0.3.55" dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", @@ -828,6 +1038,12 @@ dependencies = [ ] [[package]] +name = "json" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" + +[[package]] name = "julia_set" version = "0.1.0" dependencies = [ @@ -836,6 +1052,16 @@ dependencies = [ ] [[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -843,9 +1069,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "leb128" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "lexical-core" @@ -854,7 +1080,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" dependencies = [ "arrayvec", - "bitflags 1.2.1", + "bitflags 1.3.2", "cfg-if 1.0.0", "ryu", "static_assertions", @@ -862,9 +1088,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.99" +version = "0.2.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" +checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6" [[package]] name = "libz-sys" @@ -895,9 +1121,9 @@ checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" [[package]] name = "matches" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "memchr" @@ -931,6 +1157,37 @@ dependencies = [ ] [[package]] +name = "mio" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log", + "miow", + "net2", + "slab", + "winapi 0.2.8", +] + +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", +] + +[[package]] name = "multipart" version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -949,6 +1206,35 @@ dependencies = [ ] [[package]] +name = "native-tls" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "net2" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", +] + +[[package]] name = "no-std" version = "0.1.0" dependencies = [ @@ -1051,11 +1337,11 @@ checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "openssl" -version = "0.10.35" +version = "0.10.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885" +checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "cfg-if 1.0.0", "foreign-types", "libc", @@ -1071,18 +1357,18 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-src" -version = "111.15.0+1.1.1k" +version = "111.16.0+1.1.1l" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a5f6ae2ac04393b217ea9f700cd04fa9bf3d93fae2872069f3d15d908af70a" +checksum = "7ab2173f69416cf3ec12debb5823d244127d23a9b127d5a5189aa97c5fa2859f" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.65" +version = "0.9.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" +checksum = "69df2d8dfc6ce3aaf44b40dec6f487d5a886516cf6879c49e98e0710f310a058" dependencies = [ "autocfg", "cc", @@ -1108,6 +1394,32 @@ dependencies = [ ] [[package]] +name = "pin-project" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" + +[[package]] name = "pin-project-lite" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1121,9 +1433,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" +checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb" [[package]] name = "png" @@ -1158,9 +1470,9 @@ dependencies = [ [[package]] name = "predicates" -version = "2.0.1" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc3d91237f5de3bcd9d927e24d03b495adb6135097b001cea7403e2d573d00a9" +checksum = "5c6ce811d0b2e103743eec01db1c50612221f173084ce2f7941053e94b6bb474" dependencies = [ "difflib", "itertools", @@ -1175,12 +1487,12 @@ checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" [[package]] name = "predicates-tree" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7dd0fd014130206c9352efbdc92be592751b2b9274dff685348341082c6ea3d" +checksum = "338c7be2905b732ae3984a2f40032b5e94fd8f52505b186c7d4d68d193445df7" dependencies = [ "predicates-core", - "treeline", + "termtree", ] [[package]] @@ -1221,9 +1533,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" +checksum = "edc3358ebc67bc8b7fa0c007f945b0b18226f78437d61bec735a9eb96b61ee70" dependencies = [ "unicode-xid", ] @@ -1236,9 +1548,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" dependencies = [ "proc-macro2", ] @@ -1345,7 +1657,7 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", ] [[package]] @@ -1377,7 +1689,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1389,10 +1701,45 @@ dependencies = [ ] [[package]] +name = "reqwest" +version = "0.10.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" +dependencies = [ + "base64 0.13.0", + "bytes 0.5.6", + "encoding_rs", + "futures-core", + "futures-util", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "lazy_static", + "log", + "mime", + "mime_guess", + "native-tls", + "percent-encoding", + "pin-project-lite 0.2.7", + "serde", + "serde_urlencoded", + "tokio", + "tokio-tls", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] name = "rouille" -version = "3.2.1" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263ea8c0988dbdd89e679d408eaa5505bb886677e997562646c2e2ba4d2e6db" +checksum = "dfc1bcf3b32bd9ef568402e750404c369ff172a6a34597c858f8ccf5f3bed013" dependencies = [ "base64 0.13.0", "chrono", @@ -1406,7 +1753,7 @@ dependencies = [ "serde_json", "sha1", "threadpool", - "time 0.2.27", + "time 0.3.3", "tiny_http", "url", ] @@ -1419,19 +1766,23 @@ dependencies = [ ] [[package]] -name = "rustc-demangle" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49" +name = "rust-webassembly-weather-reports" +version = "0.1.1" +dependencies = [ + "chrono", + "gloo", + "json", + "reqwest", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] [[package]] -name = "rustc_version" -version = "0.2.3" +name = "rustc-demangle" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" [[package]] name = "ryu" @@ -1462,7 +1813,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" dependencies = [ "lazy_static", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1484,34 +1835,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "semver" -version = "0.9.0" +name = "security-framework" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" dependencies = [ - "semver-parser", + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", ] [[package]] -name = "semver-parser" -version = "0.7.0" +name = "security-framework-sys" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" +dependencies = [ + "core-foundation-sys", + "libc", +] [[package]] name = "serde" -version = "1.0.127" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" +checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.127" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" +checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" dependencies = [ "proc-macro2", "quote", @@ -1520,10 +1879,22 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.66" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" +checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" dependencies = [ + "form_urlencoded", "itoa", "ryu", "serde", @@ -1537,34 +1908,36 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" [[package]] name = "slab" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" +checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "socket2" -version = "0.4.1" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" +checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" dependencies = [ + "cfg-if 1.0.0", "libc", - "winapi", + "winapi 0.3.9", ] [[package]] -name = "sourcefile" -version = "0.1.4" +name = "socket2" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" +checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" +dependencies = [ + "libc", + "winapi 0.3.9", +] [[package]] -name = "standback" -version = "0.2.17" +name = "sourcefile" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] +checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" [[package]] name = "static_assertions" @@ -1573,55 +1946,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - -[[package]] name = "strsim" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1635,9 +1959,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "structopt" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b041cdcb67226aca307e6e7be44c8806423d83e018bd662360a93dabce4d71" +checksum = "bf9d950ef167e25e0bdb073cf1d68e9ad2795ac826f2f3f59647817cf23c0bfa" dependencies = [ "clap", "lazy_static", @@ -1646,9 +1970,9 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.15" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7813934aecf5f51a54775e00068c237de98489463968231a51746bbbc03f9c10" +checksum = "134d838a2c9943ac3125cf6df165eda53493451b719f3255b2a26b85f772d0ba" dependencies = [ "heck", "proc-macro-error", @@ -1659,9 +1983,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.74" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" +checksum = "d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194" dependencies = [ "proc-macro2", "quote", @@ -1685,7 +2009,7 @@ dependencies = [ "rand", "redox_syscall", "remove_dir_all", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -1698,6 +2022,12 @@ dependencies = [ ] [[package]] +name = "termtree" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78fbf2dd23e79c28ccfa2472d3e6b3b189866ffef1aeb91f17c2d968b6586378" + +[[package]] name = "textwrap" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1722,45 +2052,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" dependencies = [ "libc", - "winapi", + "winapi 0.3.9", ] [[package]] name = "time" -version = "0.2.27" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +checksum = "cde1cf55178e0293453ba2cca0d5f8392a922e52aa958aee9c28ed02becc6d03" dependencies = [ - "const_fn", "libc", - "standback", - "stdweb", - "time-macros", - "version_check", - "winapi", -] - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn", ] [[package]] @@ -1778,9 +2079,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.3.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" +checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7" dependencies = [ "tinyvec_macros", ] @@ -1803,6 +2104,47 @@ dependencies = [ ] [[package]] +name = "tokio" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" +dependencies = [ + "bytes 0.5.6", + "fnv", + "futures-core", + "iovec", + "lazy_static", + "memchr", + "mio", + "pin-project-lite 0.1.12", + "slab", +] + +[[package]] +name = "tokio-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" +dependencies = [ + "bytes 0.5.6", + "futures-core", + "futures-sink", + "log", + "pin-project-lite 0.1.12", + "tokio", +] + +[[package]] name = "toml" version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1812,16 +2154,53 @@ dependencies = [ ] [[package]] -name = "treeline" -version = "0.1.0" +name = "tower-service" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" + +[[package]] +name = "tracing" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" +checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" +dependencies = [ + "cfg-if 1.0.0", + "log", + "pin-project-lite 0.2.7", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + +[[package]] +name = "try-lock" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "trybuild" -version = "1.0.43" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02c413315329fc96167f922b46fd0caa3a43f4697b7a7896b183c7142635832" +checksum = "dbaccfa9796293406a02ec790614628c88d0b3246249a620ac1ee7076274716b" dependencies = [ "glob", "lazy_static", @@ -1846,6 +2225,7 @@ version = "0.1.0" dependencies = [ "js-sys", "wasm-bindgen", + "wasm-bindgen-futures", "web-sys", ] @@ -1860,12 +2240,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" -dependencies = [ - "matches", -] +checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" [[package]] name = "unicode-normalization" @@ -1884,9 +2261,9 @@ checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" [[package]] name = "unicode-width" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" [[package]] name = "unicode-xid" @@ -1961,6 +2338,16 @@ dependencies = [ ] [[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + +[[package]] name = "wasi" version = "0.10.2+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1968,7 +2355,7 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.75" +version = "0.2.78" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -1984,7 +2371,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.75" +version = "0.2.78" dependencies = [ "bumpalo", "lazy_static", @@ -2005,7 +2392,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli" -version = "0.2.75" +version = "0.2.78" dependencies = [ "anyhow", "assert_cmd", @@ -2033,7 +2420,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli-support" -version = "0.2.75" +version = "0.2.78" dependencies = [ "anyhow", "base64 0.9.3", @@ -2055,7 +2442,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-externref-xform" -version = "0.2.75" +version = "0.2.78" dependencies = [ "anyhow", "rayon", @@ -2067,7 +2454,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.25" +version = "0.4.28" dependencies = [ "cfg-if 1.0.0", "futures-channel-preview", @@ -2081,7 +2468,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.75" +version = "0.2.78" dependencies = [ "quote", "trybuild", @@ -2092,7 +2479,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.75" +version = "0.2.78" dependencies = [ "proc-macro2", "quote", @@ -2103,7 +2490,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-multi-value-xform" -version = "0.2.75" +version = "0.2.78" dependencies = [ "anyhow", "rayon", @@ -2124,11 +2511,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.75" +version = "0.2.78" [[package]] name = "wasm-bindgen-test" -version = "0.3.25" +version = "0.3.28" dependencies = [ "console_error_panic_hook", "js-sys", @@ -2154,7 +2541,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.25" +version = "0.3.28" dependencies = [ "proc-macro2", "quote", @@ -2162,7 +2549,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-threads-xform" -version = "0.2.75" +version = "0.2.78" dependencies = [ "anyhow", "walrus", @@ -2171,7 +2558,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-conventions" -version = "0.2.75" +version = "0.2.78" dependencies = [ "anyhow", "walrus", @@ -2179,7 +2566,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-interpreter" -version = "0.2.75" +version = "0.2.78" dependencies = [ "anyhow", "log", @@ -2191,7 +2578,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-webidl" -version = "0.2.75" +version = "0.2.76" dependencies = [ "anyhow", "env_logger", @@ -2255,18 +2642,18 @@ checksum = "b35c86d22e720a07d954ebbed772d01180501afe7d03d464f413bb5f8914a8d6" [[package]] name = "wasmparser" -version = "0.80.0" +version = "0.80.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f71b80b8193e50910919e7d1bc956d2b4f42b1cb1fad84bacb59332c16f2cf" +checksum = "449167e2832691a1bff24cde28d2804e90e09586a448c8e76984792c44334a6b" [[package]] name = "wasmprinter" -version = "0.2.28" +version = "0.2.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b48e4f2999b9930e9b037e328357d7d2367e0d8ea6e534be90aeff60976c0452" +checksum = "bf83acd0a74a68f7b96acddc6035af45a09659d53f877b73aa22c816ed3e71e7" dependencies = [ "anyhow", - "wasmparser 0.80.0", + "wasmparser 0.80.2", ] [[package]] @@ -2280,25 +2667,25 @@ dependencies = [ [[package]] name = "wast" -version = "37.0.0" +version = "38.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bc7b9a76845047ded00e031754ff410afee0d50fbdf62b55bdeecd245063d68" +checksum = "ae0d7b256bef26c898fa7344a2d627e8499f5a749432ce0a05eae1a64ff0c271" dependencies = [ "leb128", ] [[package]] name = "wat" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab2cc8d9a69d1ab28a41d9149bb06bb927aba8fc9d56625f8b597a564c83f50" +checksum = "adcfaeb27e2578d2c6271a45609f4a055e6d7ba3a12eff35b1fd5ba147bdf046" dependencies = [ - "wast 37.0.0", + "wast 38.0.1", ] [[package]] name = "web-sys" -version = "0.3.52" +version = "0.3.55" dependencies = [ "js-sys", "wasm-bindgen", @@ -2377,6 +2764,12 @@ dependencies = [ [[package]] name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" @@ -2386,6 +2779,12 @@ dependencies = [ ] [[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2397,7 +2796,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] @@ -2407,6 +2806,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] +name = "winreg" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] name = "wit-parser" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2499,6 +2907,16 @@ dependencies = [ ] [[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] name = "wyz" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index fba7c979390ab..9eada274bef51 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.75"; + version = "0.2.78"; src = let @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { owner = "rustwasm"; repo = "wasm-bindgen"; rev = version; - hash = "sha256-eRAe6/v0Xrtd1d2k6p0WETZ2vkQkiDRZOds7y0DidY0="; + hash = "sha256-1Z5d4gjZUic6Yrd+O8oLWYpJqAYGcByZYP0H1iInXHA="; }; in runCommand "source" { } '' @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-xZrGBRnsBQKvqGkZyU7FQCkx0dHt/hXlrVLSvGKx27k="; + cargoHash = "sha256-RixIEat7EzGzgSQTnPennePpiucmAatrDGhbFSfTajo="; cargoBuildFlags = [ "-p" pname ]; meta = with lib; { diff --git a/pkgs/games/gl-gsync-demo/default.nix b/pkgs/games/gl-gsync-demo/default.nix new file mode 100644 index 0000000000000..a4b30c572a00d --- /dev/null +++ b/pkgs/games/gl-gsync-demo/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, libX11, freeglut, glew, libXNVCtrl, libXext, lib }: + +stdenv.mkDerivation rec { + pname = "gl-gsync-demo"; + version = "unstable-2020-12-27"; + + src = fetchFromGitHub { + owner = "dahenry"; + repo = "gl-gsync-demo"; + rev = "4fd963a8ad880dc2d846394c8c80b2091a119591"; + sha256 = "1innsmpsd9n9ih80v16rhj2ijrl28jd7x6a4jmxdirba7mjibm8d"; + }; + + buildInputs = [ libX11 freeglut glew libXNVCtrl libXext ]; + + installPhase = '' + runHook preInstall + + install -D gl-gsync-demo -t $out/bin/ + + runHook postInstall + ''; + + meta = with lib; { + license = with licenses; mit; + platforms = platforms.linux; + maintainers = with maintainers; [ atemu ]; + description = "A very basic OpenGL demo for testing NVIDIA's G-SYNC technology on Linux"; + longDescription = '' + The demo simply draws a vertical bar moving accross the screen at constant speed, but deliberately rendered at a variable frame rate. + + The min and max frame rates can be manually changed at runtime, by step of 10 fps and with a min of 10 fps. + + The demo also allows to toggle V-Sync on/off. + ''; + homepage = "https://github.com/dahenry/gl-gsync-demo"; + }; +} diff --git a/pkgs/games/julius/default.nix b/pkgs/games/julius/default.nix index 84e80d7d63277..84970d1105506 100644 --- a/pkgs/games/julius/default.nix +++ b/pkgs/games/julius/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "julius"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "bvschaik"; repo = "julius"; rev = "v${version}"; - sha256 = "0nfdn8n6ywhm69ckz9a1chl5xxiqyaj3l337wadsbppnpscjihrc"; + sha256 = "0w7kmgz9ya0ck9cxhsyralarg7y6ydx4plmh33r4mkxkamlr7493"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index c2714e8496221..dda34a113a0fc 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.1006.1"; + version = "2021.1016.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "zQMXDqWfZ8g4HP3VQgeLogif51vVFLjb+a+7ma7OHIc="; + sha256 = "PaN/+t5qnHaOjh+DfM/Ylw1vESCM3Tejd3li9ml2Z+A="; }; nativeBuildInputs = [ diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index fccef5864a23f..d89a24b379e69 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -158,9 +158,9 @@ (fetchNuGet { name = "OpenTabletDriver.Plugin"; version = "0.5.3.1"; sha256 = "17dxsvcz9g8kzydk5xlfz9kfxl62x9wi20609rh76wjd881bg1br"; }) (fetchNuGet { name = "ppy.LocalisationAnalyser"; version = "2021.725.0"; sha256 = "00nvk8kw94v0iq5k7y810sa235lqdjlggq7f00c64c3d1zam4203"; }) (fetchNuGet { name = "ppy.ManagedBass"; version = "3.1.3-alpha"; sha256 = "0qdrklalp42pbyb30vpr7c0kwjablsja0s6xplxxkpfd14y8mzk4"; }) - (fetchNuGet { name = "ppy.osu.Framework"; version = "2021.1004.0"; sha256 = "01w8z0pz8b0fpa4qqk22lq1cf5pdic2nwrqyqmcz051yyiglmz3q"; }) + (fetchNuGet { name = "ppy.osu.Framework"; version = "2021.1014.0"; sha256 = "0j0b9hhglpqgla82c8yxqangjxqabsc9xb0z1jc6lb7rh854xzli"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; version = "2021.805.0"; sha256 = "004c053s6p7339bfw68lvlyk9jkbw6djkf2d72dz8wam546k8dcl"; }) - (fetchNuGet { name = "ppy.osu.Game.Resources"; version = "2021.1004.0"; sha256 = "0wxdb72l7gzxzxyjysm1zshvlf0psaaanaqv2km1j3i37cnag0jp"; }) + (fetchNuGet { name = "ppy.osu.Game.Resources"; version = "2021.1015.0"; sha256 = "0h2sb35yajgnfhn9729p9r83m8mwv7r03gd55b07wl8vhzb2r3s5"; }) (fetchNuGet { name = "ppy.osuTK.NS20"; version = "1.0.178"; sha256 = "1bv77rrf3g6zr4bzfrrqqzl0vjj4c8izc0sakckda8dlm6h3gxln"; }) (fetchNuGet { name = "ppy.SDL2-CS"; version = "1.0.452-alpha"; sha256 = "0l59cfji8w0x2nrp3m7xvfpw4y7z5dhwsq4wq3wf4r6npwnra0hc"; }) (fetchNuGet { name = "ppy.squirrel.windows"; version = "1.9.0.5"; sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl"; }) @@ -358,4 +358,5 @@ (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) (fetchNuGet { name = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) (fetchNuGet { name = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { name = "TagLibSharp"; version = "2.2.0"; sha256 = "0jb0f84p4jd59ha36spyk9q08g6fjap3xywq32rcs2xwzhhqiq0y"; }) ] diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/misc/jitsi-meet-prosody/default.nix index 43c9af533fae6..4edbd70a22110 100644 --- a/pkgs/misc/jitsi-meet-prosody/default.nix +++ b/pkgs/misc/jitsi-meet-prosody/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-prosody"; - version = "1.0.5307"; + version = "1.0.5415"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "VsOoW8h7yFgMRVTP6AHs2HOqSwXMnRNgJI8FM/rHp2I="; + sha256 = "XvW+bAuad1IKJPZzVJBkT7vA2BBDFQBvTWtbyK/in6A="; }; dontBuild = true; diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 89950a51598ca..4a03c46dce4a5 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, vscode-utils, extractNuGet -, icu, curl, openssl, lttng-ust, autoPatchelfHook +, icu, curl, openssl, liburcu, lttng-ust, autoPatchelfHook , python3, musl , pythonUseFixed ? false # When `true`, the python default setting will be fixed to specified. # Use version from `PATH` for default setting otherwise. @@ -12,6 +12,24 @@ assert ctagsUseFixed -> null != ctags; let + liburcu-0-12 = liburcu.overrideAttrs (oldAttrs: rec { + version = "0.12.2"; + src = fetchurl { + url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; + sha256 = "0yx69kbx9zd6ayjzvwvglilhdnirq4f1x1sdv33jy8bc9wgc3vsf"; + }; + }); + + lttng-ust-2-10 = (lttng-ust.override { + liburcu = liburcu-0-12; + }).overrideAttrs (oldAttrs: rec { + version = "2.10.5"; + src = fetchurl { + url = "https://lttng.org/files/lttng-ust/lttng-ust-${version}.tar.bz2"; + sha256 = "0ddwk0nl28bkv2xb78gz16a2bvlpfbjmzwfbgwf5p1cq46dyvy86"; + }; + }); + pythonDefaultsTo = if pythonUseFixed then "${python3}/bin/python" else "python"; ctagsDefaultsTo = if ctagsUseFixed then "${ctags}/bin/ctags" else "ctags"; @@ -54,7 +72,7 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { icu curl openssl - lttng-ust + lttng-ust-2-10 musl ]; @@ -75,6 +93,19 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { # Patch `packages.json` so that nix's *ctags* is used as default value for `python.workspaceSymbols.ctagsPath`. substituteInPlace "./package.json" \ --replace "\"default\": \"ctags\"" "\"default\": \"${ctagsDefaultsTo}\"" + + # Similar cleanup to what's done in the `debugpy` python package. + # This prevent our autopatchelf logic to bark on unsupported binaries (`attach_x86.so` + # was problematic) but also should make our derivation less heavy. + ( + cd pythonFiles/lib/python/debugpy/_vendored/pydevd/pydevd_attach_to_process + declare kept_aside="${{ + "x86_64-linux" = "attach_linux_amd64.so"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")}" + mv "$kept_aside" "$kept_aside.hidden" + rm *.so *.dylib *.dll *.exe *.pdb + mv "$kept_aside.hidden" "$kept_aside" + ) ''; postInstall = '' diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 922675fa422c9..5ee2a08f5ad63 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.210"; + version = "4.19.211"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0cv126j4sghwgzjm9p5l1brcnxkbgggja2ai37gl8m2s99cj59wv"; + sha256 = "1m3y5gsf5s8bb4jxkri20dlxi8aiqabzaijj2h1svz4r19ca8j7v"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 5a8ef895c2b97..0da279cfc5919 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.72"; + version = "5.10.73"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0z2cp8gqnbv7iz8kb5ydfmk019m0gds8wwvwc6kccsk4wypkbmml"; + sha256 = "0xhf0g5pra27hnavpy0y3mn05m5hqn5rd3d6fx0a3vr35c1jicpd"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.14.nix b/pkgs/os-specific/linux/kernel/linux-5.14.nix index 465a3f82d515c..5722faf3bdcb3 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.14.11"; + version = "5.14.12"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0capilz3wx29pw7n2m5cn229vy9psrccmdspp27znhjkvwj0m0wk"; + sha256 = "0dswxf1qk70lms5lph15i7nz3ybwiia58v8zzrmi71ajviwjc9wd"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 931f9f56f828c..1ff0803114b97 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.152"; + version = "5.4.153"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1may19d47d06mplpk29dpjsq31sxk8wwbwb2jspj3vay9h9wfi40"; + sha256 = "0jaz57sd51xqc7w8k3f43bfc5mdsh1413mdngqqsgr8isv4hg7vd"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index d8d9edcf4af7d..8ee8c663b3b50 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -16,7 +16,7 @@ let in linux.override { argsOverride = { - modDirVersion = "${linux.modDirVersion}-gnu"; + modDirVersion = "${linux.modDirVersion}-gnu1"; isLibre = true; src = stdenv.mkDerivation { @@ -35,8 +35,6 @@ in linux.override { ''; }; - extraMeta.broken = true; - passthru.updateScript = ./update-libre.sh; maintainers = [ lib.maintainers.qyliss ]; diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 79594a87c5158..b8a0487bc7e77 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, gettext, libnl, ncurses, pciutils +{ lib, stdenv, fetchFromGitHub, gettext, libnl, ncurses, pciutils , pkg-config, zlib, autoreconfHook }: stdenv.mkDerivation rec { @@ -17,14 +17,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ gettext libnl ncurses pciutils zlib ]; - patches = lib.optional stdenv.hostPlatform.isMusl ( - fetchpatch { - name = "strerror_r.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/powertop/strerror_r.patch?id=3b9214d436f1611f297b01f72469d66bfe729d6e"; - sha256 = "1kzddhcrb0n2iah4lhgxwwy4mkhq09ch25jjngyq6pdj6pmfkpfw"; - } - ); - NIX_LDFLAGS = [ "-lpthread" ]; postPatch = '' @@ -36,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Analyze power consumption on Intel-based laptops"; homepage = "https://01.org/powertop"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; }; diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/servers/jitsi-videobridge/default.nix index 0bf023668abc5..7c2d8b80de0c5 100644 --- a/pkgs/servers/jitsi-videobridge/default.nix +++ b/pkgs/servers/jitsi-videobridge/default.nix @@ -2,10 +2,10 @@ let pname = "jitsi-videobridge2"; - version = "2.1-551-g2ad6eb0b"; + version = "2.1-570-gb802be83"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "XwVcjvBtJkZP46kGMnE4R1ax7Re725GMoV+pCnCNpak="; + sha256 = "0SLaCIjMN2/+Iushyz8OQpRHHBYVqn6+DpwNGbQEzy4="; }; in stdenv.mkDerivation { diff --git a/pkgs/servers/maddy/default.nix b/pkgs/servers/maddy/default.nix index 3f495add9f18c..3381b7858beb8 100644 --- a/pkgs/servers/maddy/default.nix +++ b/pkgs/servers/maddy/default.nix @@ -29,11 +29,11 @@ buildGoModule rec { mkdir -p $out/lib/systemd/system substitute dist/systemd/maddy.service $out/lib/systemd/system/maddy.service \ - --replace "/usr/bin/maddy" "$out/bin/maddy" \ + --replace "/usr/local/bin/maddy" "$out/bin/maddy" \ --replace "/bin/kill" "${coreutils}/bin/kill" substitute dist/systemd/maddy@.service $out/lib/systemd/system/maddy@.service \ - --replace "/usr/bin/maddy" "$out/bin/maddy" \ + --replace "/usr/local/bin/maddy" "$out/bin/maddy" \ --replace "/bin/kill" "${coreutils}/bin/kill" ''; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 7f0e5c78eba9a..ea4a511f72221 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "node_exporter"; - version = "1.1.2"; + version = "1.2.2"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "1kz52zhsm0xx63vczzplj15hli4i22qfxl08grb7m50bqk651j1n"; + sha256 = "11xjbkws3vv5r4p6w6qfmm9wrmlhzwmvlx3vcgz99ylz34r19xvc"; }; - vendorSha256 = "05lr2ln87902bwamw4l3rrk2j9sdgv1pcvxyvzbga64rymi9dmjb"; + vendorSha256 = "0wwji220pidrmsjzd9c3n40v237680av750jf6hdvp0aqi63p9nr"; # FIXME: tests fail due to read-only nix store doCheck = false; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index d2cbf8c0d5206..5209927c506de 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -34,7 +34,7 @@ let description = "Controller for Ubiquiti UniFi access points"; license = licenses.unfree; platforms = platforms.unix; - maintainers = with maintainers; [ erictapen globin patryk27 ]; + maintainers = with maintainers; [ erictapen globin patryk27 pennae ]; }; }; diff --git a/pkgs/servers/vouch-proxy/default.nix b/pkgs/servers/vouch-proxy/default.nix index 4060917ad5373..94ef0b23f3b72 100644 --- a/pkgs/servers/vouch-proxy/default.nix +++ b/pkgs/servers/vouch-proxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vouch-proxy"; - version = "0.34.1"; + version = "0.35.1"; src = fetchFromGitHub { owner = "vouch"; repo = "vouch-proxy"; rev = "v${version}"; - sha256 = "sha256-UUqETnvkdLBoxUHUpcfE3bxE7fZJEToDxz2Q6kN1/n4="; + sha256 = "sha256-dKf68WjCynB73RBWneBsMoyowUcrEaBTnMKVKB0sgsg="; }; vendorSha256 = "sha256-ifH+420FIrib+zQtzzHtMMYd84BED+vgnRw4xToYIl4="; diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/servers/web-apps/jitsi-meet/default.nix index 5752d94d6a5cf..9151202d94a97 100644 --- a/pkgs/servers/web-apps/jitsi-meet/default.nix +++ b/pkgs/servers/web-apps/jitsi-meet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet"; - version = "1.0.5307"; + version = "1.0.5415"; src = fetchurl { url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2"; - sha256 = "epdVQnuL5dJ7DmoqyjfiLEfZxr4IQwkFEla/Y034sgg="; + sha256 = "DJk+2EAADIz3Jck5Tf3AMWq0pZn3q1JQpDm/VdIz7nc="; }; dontBuild = true; diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index ac552abda07d7..ee9739bfac28f 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-xfGx9rtpLmotW00pB4822dwBzB2u+QYNSLWtA+JDffU="; + sha256 = "sha256-C1KLwl+hwyoRUK4GrDhj1Wwx4Fut+QuhgTFagyQeldc="; }; - vendorSha256 = "sha256-USWrI2vH0RpGJgxoEfEwqDUwXjxylOOqA9g7GltOdYQ="; + vendorSha256 = "sha256-v81YkImg8GdI5locfsU4dg2JyO7XB24mfHRIZ+k8QBA="; doCheck = false; diff --git a/pkgs/tools/misc/flitter/default.nix b/pkgs/tools/misc/flitter/default.nix new file mode 100644 index 0000000000000..49903559c136a --- /dev/null +++ b/pkgs/tools/misc/flitter/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, ocamlPackages +, fetchFromGitHub +, makeWrapper +, python3 +}: + +ocamlPackages.buildDunePackage rec { + pname = "flitter"; + # request to tag releases: https://github.com/alexozer/flitter/issues/34 + version = "unstable-2020-10-05"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "alexozer"; + repo = "flitter"; + rev = "666c5483bc93efa6d01e0b7a927461269f8e14de"; + sha256 = "1k3m7bjq5yrrq7vhnbdykni65dsqhq6knnv9wvwq3svb3n07z4w3"; + }; + + # https://github.com/alexozer/flitter/issues/28 + postPatch = '' + for f in src/colors.ml src/duration.ml src/event_loop.ml src/splits.ml; do + substituteInPlace "$f" \ + --replace 'Unix.gettimeofday' 'Caml_unix.gettimeofday' + done + ''; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = with ocamlPackages; [ + core + lwt_ppx + sexp_pretty + color + notty + ]; + + postInstall = '' + wrapProgram $out/bin/flitter \ + --prefix PATH : "${python3.withPackages (pp: [ pp.pynput ])}/bin" + ''; + + meta = with lib; { + description = "A Livesplit-inspired speedrunning split timer for Linux/macOS terminal"; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + homepage = "https://github.com/alexozer/flitter"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index d38a0ad713777..e56a61338aaaa 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fzf"; - version = "0.27.2"; + version = "0.27.3"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "sha256-JWTyZRZrW1mFy91D+eZL6iYV0CcNxJUT4JA0hrBKZZU="; + sha256 = "sha256-uVGU8tOHHJYBoWTwx9ilnOKo49R0QHdCABKfGoL7Dkk="; }; - vendorSha256 = "sha256-FKDCIotyra/TZ48wbpzudJZ2aI2pn+ZR4EoZ+9+19Mw="; + vendorSha256 = "sha256-omvCzM5kH3nAE57S33NV0OFRJmU+Ty7hhriaG/Dc0o0="; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index b135ed061dee7..5d812f5867cc5 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lf"; - version = "24"; + version = "25"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "0nc7vfkaxxl2a201wnbz74an3siz8cjwrfylx17v6al5n93vxip0"; + sha256 = "sha256-5/OfEWgtB9R3XRJ16ponf+bBVGAXkqPq8IlB8+zyjAQ="; }; vendorSha256 = "sha256-ujQh4aE++K/fn3PJqkAbTtwRyJPSI9TJQ1DvwLF9etU="; diff --git a/pkgs/tools/networking/oha/default.nix b/pkgs/tools/networking/oha/default.nix index 185176440c1b3..4f59810a76234 100644 --- a/pkgs/tools/networking/oha/default.nix +++ b/pkgs/tools/networking/oha/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "oha"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "hatoo"; repo = pname; rev = "v${version}"; - sha256 = "0vx8ki0wi9xil2iksvxzh8mhx4c5ikkhdcnc8mcwqn14cvjkggja"; + sha256 = "sha256-/gcNVTfLJKA5qzRgAqFSlSI618QBsJTxFE1doOKR7e8="; }; - cargoSha256 = "1nx2lvbjflsjma5q9ck6vq499hf75w91i4h8wlzr83wqk37i7rhc"; + cargoSha256 = "sha256-o5VKj69Wp7zLR3TS+wNA0D8nP6Cynlr4KtW4JSUm0VE="; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; diff --git a/pkgs/tools/security/agebox/default.nix b/pkgs/tools/security/agebox/default.nix index 060961f3a3676..fcc63e6f772fb 100644 --- a/pkgs/tools/security/agebox/default.nix +++ b/pkgs/tools/security/agebox/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "agebox"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "slok"; repo = pname; rev = "v${version}"; - sha256 = "1mg16xxvsbm5jxlkdjyi3nsvzj37858d9ksh1wsa9ycxj2qipgw2"; + sha256 = "1gi6lj3dpckhsx6hdpdnr8rclqgfkbdmkzx966nlxyi52bjfzbsv"; }; vendorSha256 = "1gw83bd14ig18y8si3f94iivx2ir1vw4b5b95fp6r7qhfp0rgbih"; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 9d2e23e3bd2d3..86ab11f9f385a 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-10-13"; + version = "2021-10-15"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-rJRr8MEt3GMNPgC/YvWWs8zh1X0DBstM/UeCMlV7VqI="; + sha256 = "sha256-7bQoBYPfePhanh7SCZ6MO/eWtyD8cfWaYjc9AWOT2rc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 22ef43d36f906..00780306d9056 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "kubescape"; - version = "1.0.109"; + version = "1.0.120"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aPy0FcDFoBK02pCmDTe5T1QyB9+WC++cBuOI7CtaXtY="; + sha256 = "sha256-aFFJAib0/FTOaPtSLYXIFV3+QfIpzy8fC7rWAQW5yh0="; }; vendorSha256 = "sha256-vN+ci2vCbtDuEEVzZQiFkdi1QkMgnnbbJgD9g6DS7qs="; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 55116147f3bde..1ea4f8b051914 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.1.9" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.10" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 41c8daf293586..1eaf6d48a38cf 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: 1e520ab4a5779648de889d198100af4eb556a7f6 - ref: refs/tags/6.1.9 + revision: 822dd1ef2b1a1171d62803add58ee2afce30ea06 + ref: refs/tags/6.1.10 specs: - metasploit-framework (6.1.9) + metasploit-framework (6.1.10) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -128,13 +128,13 @@ GEM arel-helpers (2.12.1) activerecord (>= 3.1.0, < 7) aws-eventstream (1.2.0) - aws-partitions (1.512.0) + aws-partitions (1.516.0) aws-sdk-core (3.121.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.266.0) + aws-sdk-ec2 (1.270.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.61.0) @@ -220,7 +220,7 @@ GEM jmespath (1.4.0) jsobfu (0.4.2) rkelly-remix - json (2.5.1) + json (2.6.0) little-plugger (1.1.4) logging (2.3.0) little-plugger (~> 1.1) @@ -296,7 +296,7 @@ GEM ttfunk pg (1.2.3) public_suffix (4.0.6) - puma (5.5.0) + puma (5.5.2) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 29c8b177986fb..91b2bd60a318b 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -14,13 +14,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.9"; + version = "6.1.10"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-ZhNy6rp3Jdrua1dZr3dTQxLOVAflWiI0lc/f38d0kqc="; + sha256 = "sha256-VdnczTauHKYexXZs6U5F5v4DP8lJb8wCDy6yiPdEavI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 7b0e12b509b01..8ba307e2b5a0a 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09v7z0sg09vsysv0hm1552b3laa8sf933c0sqnb35mb4wksj1fv9"; + sha256 = "1jx44f1hc41712k8fqmzrbpqs2j9yl0msdqcmmfp0pirkbqw6ri0"; type = "gem"; }; - version = "1.512.0"; + version = "1.516.0"; }; aws-sdk-core = { groups = ["default"]; @@ -124,10 +124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bwkgmdas7ig52cbfdx6vf63j8qk91lizd7sdjdapbfnabbpwmq1"; + sha256 = "1m46n4fn505l0qqwamc5gk88h6aqvjqc7j0pkrcngxcgh5r7hcvf"; type = "gem"; }; - version = "1.266.0"; + version = "1.270.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -594,10 +594,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; + sha256 = "0a7p95md8j8lbgxx9dzygysxmrg1s80895f46f1y47k9kq9q56ry"; type = "gem"; }; - version = "2.5.1"; + version = "2.6.0"; }; little-plugger = { groups = ["default"]; @@ -664,12 +664,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "1e520ab4a5779648de889d198100af4eb556a7f6"; - sha256 = "19wjfk3xzpygjls24np50xacw4j3advsynapdgpdl9bppbm744v6"; + rev = "822dd1ef2b1a1171d62803add58ee2afce30ea06"; + sha256 = "1wka8kvqicif1w1cqvs9r4zh7zp68m7fjv3nqlgac75f6v6xrnam"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.9"; + version = "6.1.10"; }; metasploit-model = { groups = ["default"]; @@ -977,10 +977,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ahk9a2a05985m0037gqlpha5vdkvmwhyk8v1shkbnwkkm30k0mq"; + sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn"; type = "gem"; }; - version = "5.5.0"; + version = "5.5.2"; }; racc = { groups = ["default"]; diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/tools/security/swtpm/default.nix index daceff1486e3c..fa2d774e1174b 100644 --- a/pkgs/tools/security/swtpm/default.nix +++ b/pkgs/tools/security/swtpm/default.nix @@ -42,8 +42,21 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-cuse" + "--localstatedir=/var" ]; + prePatch = '' + # Makefile tries to create the directory /var/lib/swtpm-localcafor, which fails + substituteInPlace samples/Makefile.am \ + --replace 'install-data-local:' 'do-not-execute:' + + # Use the correct path to the certtool binary + # instead of relying on it being in the environment + substituteInPlace samples/swtpm_localca.c --replace \ + '# define CERTTOOL_NAME "certtool"' \ + '# define CERTTOOL_NAME "${gnutls}/bin/certtool"' + ''; + enableParallelBuilding = true; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index c269da48273ed..1c8682e93bc0e 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-7jJMF8pNCKkiOAY9sZEK0lOqP2/yBVqS3FaKOOz74XI="; + sha256 = "sha256-t/BQu6nq0FcmqTc/vo3bTUbVNDqzePqlOMFkl4pD598="; }; - vendorSha256 = "sha256-j+07Q5dpt8I0sf5B3AVw4343EMWyJDqrzFrdDrBp0DY="; + vendorSha256 = "sha256-9eXDcuVm+N4nenotUtCvyp2qB5uPDwzGHk43Y4uTT14="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 9758b6fbda8eb..b67d63938c951 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,26 +1,26 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc }: let - version = "1.8.3"; + version = "1.8.4"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "sha256-x1ZHemRyblfMgmG2zx3AnZmhn2Q952v3nzi3HEvlmE8="; + sha256 = "sha256-zrCRnIScIWJ8ocrgYPNhtvuX3PBLF9HX0dyZU/zY4yk="; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "1141zjf56fz76ka7bim9qkdk46pa3kk39swxza17g3qxpj21w0jp"; + sha256 = "0sh9q29b0bi5ap6nvll0ykxd5vf4wliksj31cmm4gw5vp90irvl3"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "06bkka2k09alhps5h2dk0dgczgnnd6g4npjp9j103lvzi935zjsy"; + sha256 = "09nhfdw20g46fnrn82my7a59pfa81dxncxhiswmha3cdy8n0p6wb"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "1z9pv46pgqnn34mc624x9z41kvr4hrjjdp6y9zv033h0cpxbd0y7"; + sha256 = "01ra0xrgivf01ff87p0gqmi1flnac9y02x7jpv5j6a9czr1sqw1j"; }; }; diff --git a/pkgs/tools/system/battop/battery.patch b/pkgs/tools/system/battop/battery.patch deleted file mode 100644 index 218359d904fe4..0000000000000 --- a/pkgs/tools/system/battop/battery.patch +++ /dev/null @@ -1,588 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 57ee609..d156cd2 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1,430 +1,429 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. -+version = 3 -+ - [[package]] - name = "autocfg" - version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" - - [[package]] - name = "battery" --version = "0.7.4" -+version = "0.7.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b4b624268937c0e0a3edb7c27843f9e547c320d730c610d3b8e6e8e95b2026e4" - dependencies = [ -- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "nix 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "uom 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 1.0.0", -+ "core-foundation", -+ "lazycell", -+ "libc", -+ "mach", -+ "nix", -+ "num-traits", -+ "uom", -+ "winapi", - ] - - [[package]] - name = "battop" - version = "0.2.4" - dependencies = [ -- "battery 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "stderrlog 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tui 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "battery", -+ "humantime", -+ "itertools", -+ "log", -+ "stderrlog", -+ "structopt", -+ "termion", -+ "tui", - ] - - [[package]] - name = "bitflags" --version = "1.0.4" -+version = "1.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - - [[package]] - name = "cassowary" - version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" - - [[package]] - name = "cc" - version = "1.0.37" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" - - [[package]] - name = "cfg-if" - version = "0.1.9" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" -+ -+[[package]] -+name = "cfg-if" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - - [[package]] - name = "chrono" - version = "0.4.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" - dependencies = [ -- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-integer", -+ "num-traits", -+ "time", - ] - - [[package]] - name = "clap" - version = "2.33.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" - dependencies = [ -- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags", -+ "textwrap", -+ "unicode-width", - ] - - [[package]] - name = "core-foundation" --version = "0.6.4" -+version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" - dependencies = [ -- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -+ "core-foundation-sys", -+ "libc", - ] - - [[package]] - name = "core-foundation-sys" --version = "0.6.2" -+version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - - [[package]] - name = "either" - version = "1.5.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" - - [[package]] - name = "heck" - version = "0.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" - dependencies = [ -- "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-segmentation", - ] - - [[package]] - name = "humantime" - version = "1.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" - dependencies = [ -- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quick-error", - ] - - [[package]] - name = "itertools" - version = "0.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" - dependencies = [ -- "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "either", - ] - - [[package]] - name = "lazy_static" - version = "1.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" - - [[package]] - name = "lazycell" --version = "1.2.1" -+version = "1.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - - [[package]] - name = "libc" --version = "0.2.58" -+version = "0.2.98" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" - - [[package]] - name = "log" - version = "0.4.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" - dependencies = [ -- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.9", - ] - - [[package]] - name = "mach" --version = "0.2.3" -+version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" - dependencies = [ -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", - ] - - [[package]] - name = "nix" --version = "0.14.0" -+version = "0.19.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2" - dependencies = [ -- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", -- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags", -+ "cc", -+ "cfg-if 1.0.0", -+ "libc", - ] - - [[package]] - name = "num-integer" - version = "0.1.41" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" - dependencies = [ -- "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg", -+ "num-traits", - ] - - [[package]] - name = "num-traits" - version = "0.2.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" - dependencies = [ -- "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg", - ] - - [[package]] - name = "numtoa" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" - - [[package]] - name = "proc-macro2" - version = "0.4.30" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" - dependencies = [ -- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid", - ] - - [[package]] - name = "quick-error" - version = "1.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" - - [[package]] - name = "quote" - version = "0.6.12" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" - dependencies = [ -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2", - ] - - [[package]] - name = "redox_syscall" - version = "0.1.54" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" - - [[package]] - name = "redox_termios" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" - dependencies = [ -- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall", - ] - - [[package]] - name = "stderrlog" - version = "0.4.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "61dc66b7ae72b65636dbf36326f9638fb3ba27871bb737a62e2c309b87d91b70" - dependencies = [ -- "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "chrono", -+ "log", -+ "termcolor", -+ "thread_local", - ] - - [[package]] - name = "structopt" - version = "0.2.17" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c767a8971f53d7324583085deee2e230903be09e52fb27df9af94c5cb2b43c31" - dependencies = [ -- "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "clap", -+ "structopt-derive", - ] - - [[package]] - name = "structopt-derive" - version = "0.2.17" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c57a30c87454ced2186f62f940e981746e8cbbe026d52090c8c4352b636f8235" - dependencies = [ -- "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", -+ "heck", -+ "proc-macro2", -+ "quote", -+ "syn", - ] - - [[package]] - name = "syn" - version = "0.15.34" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe" - dependencies = [ -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2", -+ "quote", -+ "unicode-xid", - ] - - [[package]] - name = "termcolor" - version = "0.3.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" - dependencies = [ -- "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wincolor", - ] - - [[package]] - name = "termion" - version = "1.5.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" - dependencies = [ -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "numtoa", -+ "redox_syscall", -+ "redox_termios", - ] - - [[package]] - name = "textwrap" - version = "0.11.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" - dependencies = [ -- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-width", - ] - - [[package]] - name = "thread_local" - version = "0.3.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" - dependencies = [ -- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static", - ] - - [[package]] - name = "time" - version = "0.1.42" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" - dependencies = [ -- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "redox_syscall", -+ "winapi", - ] - - [[package]] - name = "tui" - version = "0.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8896d3a5cb81557cddef234cdeaa2a219d2af5fa9ccbb3cbdfbb52a576feb86f" - dependencies = [ -- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags", -+ "cassowary", -+ "either", -+ "itertools", -+ "log", -+ "termion", -+ "unicode-segmentation", -+ "unicode-width", - ] - - [[package]] - name = "typenum" - version = "1.10.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" - - [[package]] - name = "unicode-segmentation" - version = "1.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" - - [[package]] - name = "unicode-width" - version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" - - [[package]] - name = "unicode-xid" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - - [[package]] - name = "uom" --version = "0.23.1" -+version = "0.30.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e76503e636584f1e10b9b3b9498538279561adcef5412927ba00c2b32c4ce5ed" - dependencies = [ -- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits", -+ "typenum", - ] - --[[package]] --name = "void" --version = "1.0.2" --source = "registry+https://github.com/rust-lang/crates.io-index" -- - [[package]] - name = "winapi" - version = "0.3.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" - dependencies = [ -- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", - ] - - [[package]] - name = "winapi-i686-pc-windows-gnu" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - - [[package]] - name = "winapi-x86_64-pc-windows-gnu" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - - [[package]] - name = "wincolor" - version = "0.1.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" - dependencies = [ -- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi", - ] -- --[metadata] --"checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" --"checksum battery 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6d6fe5630049e900227cd89afce4c1204b88ec8e61a2581bb96fcce26f047b" --"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" --"checksum cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" --"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" --"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" --"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" --"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" --"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" --"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" --"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" --"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" --"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" --"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" --"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" --"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" --"checksum libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "6281b86796ba5e4366000be6e9e18bf35580adf9e63fbe2294aadb587613a319" --"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" --"checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" --"checksum nix 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d10caafde29a846a82ae0af70414e4643e072993441033b2c93217957e2f867" --"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" --"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" --"checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" --"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" --"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" --"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" --"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" --"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" --"checksum stderrlog 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "61dc66b7ae72b65636dbf36326f9638fb3ba27871bb737a62e2c309b87d91b70" --"checksum structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c767a8971f53d7324583085deee2e230903be09e52fb27df9af94c5cb2b43c31" --"checksum structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c57a30c87454ced2186f62f940e981746e8cbbe026d52090c8c4352b636f8235" --"checksum syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)" = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe" --"checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" --"checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" --"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" --"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" --"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" --"checksum tui 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8896d3a5cb81557cddef234cdeaa2a219d2af5fa9ccbb3cbdfbb52a576feb86f" --"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" --"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" --"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" --"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" --"checksum uom 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ef5bbe8385736e498dbb0033361f764ab43a435192513861447b9f7714b3fec" --"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" --"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" --"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" --"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" --"checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" -diff --git a/Cargo.toml b/Cargo.toml -index 3d3df77..34b9bc5 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -17,7 +17,7 @@ travis-ci = { repository = "svartalf/rust-battop", branch = "master" } - maintenance = { status = "actively-developed" } - - [dependencies] --battery = "^0.7" -+battery = "^0.7.7" - structopt = { version = "0.2", default-features = false } - log = "0.4.6" - stderrlog = "0.4.1" diff --git a/pkgs/tools/system/battop/default.nix b/pkgs/tools/system/battop/default.nix deleted file mode 100644 index e28789b835ec6..0000000000000 --- a/pkgs/tools/system/battop/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "battop"; - version = "0.2.4"; - - src = fetchFromGitHub { - owner = "svartalf"; - repo = "rust-battop"; - rev = "v${version}"; - sha256 = "0p53jl3r2p1w9m2fvhzzrj8d9gwpzs22df5sbm7wwja4pxn7ay1w"; - }; - - # https://github.com/svartalf/rust-battop/issues/11 - cargoPatches = [ ./battery.patch ]; - - cargoSha256 = "0ipmnrn6lmf6rqzsqmaxzy9lblrxyrxzkji968356nxxmwzfbfvh"; - - meta = with lib; { - description = "is an interactive battery viewer"; - homepage = "https://github.com/svartalf/rust-battop"; - license = licenses.asl20; - maintainers = with maintainers; [ hdhog ]; - }; -} diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 25a98d299a75d..fc350162845a6 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "vale"; - version = "2.10.6"; + version = "2.11.2"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; src = fetchFromGitHub { - owner = "errata-ai"; - repo = "vale"; - rev = "v${version}"; - sha256 = "sha256-exBrs/MQhfqCxAJrnxECdKnxvsK9LvXIqpnYkR5h7uA="; + owner = "errata-ai"; + repo = "vale"; + rev = "v${version}"; + sha256 = "1g8k9723d1xmx918f60lpla52ly90rz6z0ffzwsb2rh62r3h80h5"; }; - vendorSha256 = "sha256-3rCrRA9OKG2/wUlVvkG9lynJZOYFVqMkUZpGpW89KZc="; + vendorSha256 = "0czxigagjbqdzzgmh1iw3q0d4sj6635384lnn1w5smws8nsqr9ia"; postInstall = '' mkdir -p $data/share/vale diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 9cbf9ac7e2f93..bfd0bfb64bf1c 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; fetchSubmodules = true; - sha256 = "sha256-CMvT9DouwERhDtBsLDesxN/QgEEfXLgtJaQLjq+SzOI="; + sha256 = "1x6pxzl2fxv0ldfdlgm5x2pcbkny8cf2b4gpk8yj8hhnn1ypim1w"; }; - cargoSha256 = "sha256-zGsb49yt6SRFfvNHZY+RpjihGpV9ziLsg9BII7WTX2Y="; + cargoSha256 = "0v5jc26icz83ssky85c8l92jcmglq9f2jbihfh4yqanpmwbpp5fl"; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9b962708a2abc..46d3b06a14ea1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -616,6 +616,8 @@ mapAliases ({ osquery = throw "osquery has been removed."; # added 2019-11-24 osxfuse = macfuse-stubs; # added 2021-03-20 otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # added 2020-02-02 + OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # added 2021-10-16 + OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # added 2021-10-16 owncloudclient = owncloud-client; # added 2016-08 ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # added 2021-07-12 p11_kit = p11-kit; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d3647fce230b..16d44fc601284 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1269,6 +1269,8 @@ with pkgs; ashuffle = callPackage ../applications/audio/ashuffle {}; + ashpd-demo = callPackage ../development/tools/ashpd-demo {}; + asls = callPackage ../development/tools/misc/asls { }; astc-encoder = callPackage ../tools/graphics/astc-encoder { }; @@ -1614,6 +1616,8 @@ with pkgs; esbuild = callPackage ../development/tools/esbuild { }; + esbuild_netlify = callPackage ../development/tools/esbuild/netlify.nix { }; + essentia-extractor = callPackage ../tools/audio/essentia-extractor { }; esh = callPackage ../tools/text/esh { }; @@ -2845,6 +2849,8 @@ with pkgs; fits-cloudctl = callPackage ../tools/admin/fits-cloudctl { }; + flitter = callPackage ../tools/misc/flitter { }; + frangipanni = callPackage ../tools/text/frangipanni { }; fselect = callPackage ../tools/misc/fselect { }; @@ -6657,6 +6663,8 @@ with pkgs; ldc = callPackage ../development/compilers/ldc { }; + ligo = callPackage ../development/compilers/ligo { }; + ldgallery = callPackage ../tools/graphics/ldgallery { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -12636,7 +12644,7 @@ with pkgs; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-feature = callPackage ../development/tools/rust/cargo-feature { }; cargo-flash = callPackage ../development/tools/rust/cargo-flash { - inherit (darwin.apple_sdk.frameworks) Security AppKit; + inherit (darwin.apple_sdk.frameworks) AppKit; }; cargo-fund = callPackage ../development/tools/rust/cargo-fund { inherit (darwin.apple_sdk.frameworks) Security; @@ -12816,6 +12824,8 @@ with pkgs; svd2rust = callPackage ../development/tools/rust/svd2rust { }; + svdtools = with python3Packages; toPythonApplication svdtools; + swift = callPackage ../development/compilers/swift { }; swiProlog = callPackage ../development/compilers/swi-prolog { @@ -15382,20 +15392,32 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices; }; + aws-c-auth = callPackage ../development/libraries/aws-c-auth { }; + aws-c-cal = callPackage ../development/libraries/aws-c-cal { inherit (darwin.apple_sdk.frameworks) Security; }; aws-c-common = callPackage ../development/libraries/aws-c-common { }; + aws-c-compression = callPackage ../development/libraries/aws-c-compression { }; + aws-c-event-stream = callPackage ../development/libraries/aws-c-event-stream { }; + aws-c-http = callPackage ../development/libraries/aws-c-http { }; + aws-c-io = callPackage ../development/libraries/aws-c-io { inherit (darwin.apple_sdk.frameworks) Security; }; + aws-c-mqtt = callPackage ../development/libraries/aws-c-mqtt { }; + + aws-c-s3 = callPackage ../development/libraries/aws-c-s3 { }; + aws-checksums = callPackage ../development/libraries/aws-checksums { }; + aws-crt-cpp = callPackage ../development/libraries/aws-crt-cpp { }; + aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp { inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; }; @@ -20942,8 +20964,12 @@ with pkgs; qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; OVMF = callPackage ../applications/virtualization/OVMF { }; - OVMF-CSM = OVMF.override { csmSupport = true; }; - OVMF-secureBoot = OVMF.override { secureBoot = true; }; + OVMFFull = callPackage ../applications/virtualization/OVMF { + secureBoot = true; + csmSupport = true; + httpSupport = true; + tpmSupport = true; + }; seabios = callPackage ../applications/virtualization/seabios { }; @@ -24185,6 +24211,7 @@ with pkgs; afterburn = callPackage ../tools/admin/afterburn {}; docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { }; + docker-compose_2 = callPackage ../applications/virtualization/docker/compose.nix { }; amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { }; @@ -27183,6 +27210,7 @@ with pkgs; procmail = callPackage ../applications/misc/procmail { }; profanity = callPackage ../applications/networking/instant-messengers/profanity ({ + gtk = gtk3; python = python3; } // (config.profanity or {})); @@ -29696,6 +29724,10 @@ with pkgs; gltron = callPackage ../games/gltron { }; + gl-gsync-demo = callPackage ../games/gl-gsync-demo { + libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; + }; + gmad = callPackage ../games/gmad { }; gnonograms = callPackage ../games/gnonograms { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c80919e07afdb..3a1fc6a939890 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -183,6 +183,8 @@ let cohttp-mirage = callPackage ../development/ocaml-modules/cohttp/mirage.nix { }; + color = callPackage ../development/ocaml-modules/color { }; + conduit = callPackage ../development/ocaml-modules/conduit { }; conduit-async = callPackage ../development/ocaml-modules/conduit/async.nix { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8c6882929aeb4..96203b0be038a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -118,6 +118,36 @@ let }; }; + ActionCircuitBreaker = buildPerlPackage { + pname = "Action-CircuitBreaker"; + version = "0.1"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HA/HANGY/Action-CircuitBreaker-0.1.tar.gz"; + sha256 = "3f8f5d726fae537ab336e00a6819ae4a8596e4c5f243e772a536ef2eb6e606b1"; + }; + buildInputs = [ ActionRetry TryTiny ]; + propagatedBuildInputs = [ Moo ]; + meta = { + homepage = "https://github.com/hangy/Action-CircuitBreaker"; + description = "Module to try to perform an action, with an option to suspend execution after a number of failures"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + ActionRetry = buildPerlPackage { + pname = "Action-Retry"; + version = "0.24"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAMS/Action-Retry-0.24.tar.gz"; + sha256 = "a3759742c5bef2d1975ab73d35499d8113324919b24936130255cff07d0294f7"; + }; + propagatedBuildInputs = [ MathFibonacci ModuleRuntime Moo ]; + meta = { + description = "Module to try to perform an action, with various ways of retrying and sleeping between retries"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AlgorithmAnnotate = buildPerlPackage { pname = "Algorithm-Annotate"; version = "0.10"; @@ -141,6 +171,20 @@ let }; }; + AlgorithmCheckDigits = buildPerlModule { + pname = "Algorithm-CheckDigits"; + version = "1.3.5"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MAMAWE/Algorithm-CheckDigits-v1.3.5.tar.gz"; + sha256 = "a956d0517180d6d9042f47d73aa6a2728b75fcbd546940d2dbe0a7e7cf428f73"; + }; + buildInputs = [ ProbePerl ]; + meta = { + description = "Perl extension to generate and test check digits"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AlgorithmDiff = buildPerlPackage { pname = "Algorithm-Diff"; version = "1.1903"; @@ -510,6 +554,19 @@ let }; }; + URIEscapeXS = buildPerlPackage { + pname = "URI-Escape-XS"; + version = "0.14"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DANKOGAI/URI-Escape-XS-0.14.tar.gz"; + sha256 = "c39ac50c6c2b831ae4bf08692e6ca5d4a3f9c57dc4d7f9c4cb0663e2c86c2759"; + }; + meta = { + description = "Drop-In replacement for URI::Escape"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ApacheAuthCookie = buildPerlPackage { pname = "Apache-AuthCookie"; version = "3.30"; @@ -531,6 +588,19 @@ let }; }; + ApacheDB = buildPerlPackage { + pname = "Apache-DB"; + version = "0.18"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LZ/LZE/Apache-DB-0.18.tar.gz"; + sha256 = "6527f4f1598270bea07bec787b71bdf0ec2b572548be7438cf74f2b9a600bfed"; + }; + meta = { + description = "Run the interactive Perl debugger under mod_perl"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ApacheLogFormatCompiler = buildPerlModule { pname = "Apache-LogFormat-Compiler"; version = "0.36"; @@ -1497,6 +1567,38 @@ let }; }; + BSON = buildPerlPackage { + pname = "BSON"; + version = "1.12.2"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MO/MONGODB/BSON-v1.12.2.tar.gz"; + sha256 = "f4612c0c354310741b99ab6d26451226823150ca27109b1b391232d5cfdda6db"; + }; + buildInputs = [ JSONMaybeXS PathTiny TestDeep TestFatal ]; + propagatedBuildInputs = [ CryptURandom Moo TieIxHash boolean namespaceclean ]; + meta = { + homepage = "https://github.com/mongodb-labs/mongo-perl-bson"; + description = "BSON serialization and deserialization (EOL)"; + license = lib.licenses.asl20; + }; + }; + + BSONXS = buildPerlPackage { + pname = "BSON-XS"; + version = "0.8.4"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MO/MONGODB/BSON-XS-v0.8.4.tar.gz"; + sha256 = "28f7d338fd78b6f9c9a6080be9de3f5cb23d888b96ebf6fcbface9f2966aebf9"; + }; + buildInputs = [ ConfigAutoConf JSONMaybeXS PathTiny TestDeep TestFatal TieIxHash ]; + propagatedBuildInputs = [ BSON boolean JSONXS JSONPP CpanelJSONXS ]; + meta = { + homepage = "https://github.com/mongodb-labs/mongo-perl-bson-xs"; + description = "XS implementation of MongoDB's BSON serialization (EOL)"; + license = lib.licenses.asl20; + }; + }; + BUtils = buildPerlPackage { pname = "B-Utils"; version = "0.27"; @@ -3205,6 +3307,23 @@ let }; }; + CLDRNumber = buildPerlModule { + pname = "CLDR-Number"; + version = "0.19"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PA/PATCH/CLDR-Number-0.19.tar.gz"; + sha256 = "c6716488e65fe779ff79a83f0f2036ad94463efe3d0f349c6b99112975bd85fc"; + }; + buildInputs = [ SoftwareLicense TestDifferences TestException TestWarn ]; + propagatedBuildInputs = + [ ClassMethodModifiers MathRound Moo namespaceclean ]; + meta = { + homepage = "https://github.com/patch/cldr-number-pm5"; + description = "Localized number formatters using the Unicode CLDR"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CLIHelpers = buildPerlPackage { pname = "CLI-Helpers"; version = "1.8"; @@ -3310,6 +3429,21 @@ let }; }; + ColorLibrary = buildPerlPackage { + pname = "Color-Library"; + version = "0.021"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RO/ROKR/Color-Library-0.021.tar.gz"; + sha256 = "58cbf7e333d3a4a40297abc43412b321da449c6816020e4fa6625ab079fc90a5"; + }; + buildInputs = [ TestMost TestWarn TestException TestDeep TestDifferences ModulePluggable ]; + propagatedBuildInputs = [ ClassAccessor ClassDataInheritable ]; + meta = { + description = "An easy-to-use and comprehensive named-color library"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CommandRunner = buildPerlModule { pname = "Command-Runner"; version = "0.103"; @@ -4841,6 +4975,21 @@ let }; }; + DataDumperAutoEncode = buildPerlModule { + pname = "Data-Dumper-AutoEncode"; + version = "1.00"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BA/BAYASHI/Data-Dumper-AutoEncode-1.00.tar.gz"; + sha256 = "2d9a0262ad443d321dc489ef6dfa7b3eed11a2708a75d397d371bb2585e5eca1"; + }; + buildInputs = [ ModuleBuildPluggable ModuleBuildPluggableCPANfile ]; + propagatedBuildInputs = [ IOInteractiveTiny ]; + meta = { + description = "Dump with recursive encoding"; + license = lib.licenses.artistic2; + }; + }; + DataDumperConcise = buildPerlPackage { pname = "Data-Dumper-Concise"; version = "2.023"; @@ -6470,6 +6619,18 @@ let }; }; + DevelSize = buildPerlPackage { + pname = "Devel-Size"; + version = "0.83"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NW/NWCLARK/Devel-Size-0.83.tar.gz"; + sha256 = "757a67e0aa59ae103ea5ca092cbecc025644ebdc326731688ffab6f8823ef4b3"; + }; + meta = { + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DevelStackTraceAsHTML = buildPerlPackage { pname = "Devel-StackTrace-AsHTML"; version = "0.15"; @@ -7441,6 +7602,22 @@ let }; }; + EncodePunycode = buildPerlPackage { + pname = "Encode-Punycode"; + version = "1.002"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CF/CFAERBER/Encode-Punycode-1.002.tar.gz"; + sha256 = "ca3aceecdb80b5d45aa10e1cde8fec4e90b4f8c9189c7504dd8658f071f77194"; + }; + buildInputs = [ TestNoWarnings ]; + propagatedBuildInputs = [ NetIDNEncode ]; + meta = { + homepage = "http://search.cpan.org/dist/Encode-Punycode"; + description = "Encode plugin for Punycode (RFC 3492)"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + enum = buildPerlPackage { pname = "enum"; version = "1.11"; @@ -7526,6 +7703,21 @@ let }; }; + ExcelWriterXLSX = buildPerlPackage { + pname = "Excel-Writer-XLSX"; + version = "1.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/Excel-Writer-XLSX-1.09.tar.gz"; + sha256 = "d679c6ac19e93c32ab77594c793e41b948c7bb3873b600e70ad637d093dca187"; + }; + propagatedBuildInputs = [ ArchiveZip ]; + meta = { + homepage = "http://jmcnamara.github.com/excel-writer-xlsx/"; + description = "Create a new file in the Excel 2007+ XLSX format"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ExceptionBase = buildPerlModule { pname = "Exception-Base"; version = "0.2501"; @@ -8022,6 +8214,35 @@ let }; }; + Filechmod = buildPerlPackage { + pname = "File-chmod"; + version = "0.42"; + src = fetchurl { + url = "mirror://cpan/authors/id/X/XE/XENO/File-chmod-0.42.tar.gz"; + sha256 = "6cafafff68bc84215168b55ede0d191dcb57f9a3201b51d61edb2858a2407795"; + }; + meta = { + homepage = "https://metacpan.org/dist/File-chmod"; + description = "Implements symbolic and ls chmod modes"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + FilechmodRecursive = buildPerlPackage { + pname = "File-chmod-Recursive"; + version = "1.0.3"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MITHUN/File-chmod-Recursive-v1.0.3.tar.gz"; + sha256 = "9348ca5c5b88deadcc483b9399ef7c2e0fc2504f9058db65f3c3c53c41139aa7"; + }; + propagatedBuildInputs = [ Filechmod ]; + meta = { + homepage = "https://github.com/mithun/perl-file-chmod-recursive"; + description = "Run chmod recursively against directories"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + FileCopyRecursive = buildPerlPackage { pname = "File-Copy-Recursive"; version = "0.45"; @@ -9260,6 +9481,22 @@ let }; }; + GraphicsColor = buildPerlPackage { + pname = "Graphics-Color"; + version = "0.31"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GP/GPHAT/Graphics-Color-0.31.tar.gz"; + sha256 = "faa8fed5b2d80e5160af976e5db2242c0b3555542ce1042575ff6b694587a33d"; + }; + buildInputs = [ TestNumberDelta ModulePluggable ]; + propagatedBuildInputs = [ ColorLibrary Moose MooseXAliases MooseXClone MooseXStorage MooseXTypes ]; + meta = { + homepage = "https://github.com/gphat/graphics-color"; + description = "Device and library agnostic color spaces"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + GraphicsTIFF = buildPerlPackage { pname = "Graphics-TIFF"; version = "16"; @@ -10556,6 +10793,29 @@ let }; }; + ImageOCRTesseract = buildPerlPackage { + pname = "Image-OCR-Tesseract"; + version = "1.26"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LE/LEOCHARRE/Image-OCR-Tesseract-1.26.tar.gz"; + sha256 = "98d904266a7062f09c9b46f77c4e94529e1fe99339e3f83fda1f92013f007cea"; + }; + nativeBuildInputs = [ pkgs.which pkgs.makeWrapper pkgs.tesseract pkgs.imagemagick ]; + propagatedBuildInputs = [ FileFindRule FileWhich LEOCHARRECLI StringShellQuote ]; + postPatch = '' + substituteInPlace lib/Image/OCR/Tesseract.pm \ + --replace "which('tesseract')" "\"${pkgs.tesseract}/bin/tesseract\"" \ + --replace "which('convert')" "\"${pkgs.imagemagick}/bin/convert"\" + ''; + postInstall = '' + wrapProgram $out/bin/ocr --prefix PATH : ${lib.makeBinPath [ pkgs.tesseract pkgs.imagemagick ]} + ''; + meta = { + description = "Read an image with tesseract ocr and get output"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + IMAPClient = buildPerlPackage { pname = "IMAP-Client"; version = "0.13"; @@ -10763,6 +11023,19 @@ let }; }; + IOInteractiveTiny = buildPerlPackage { + pname = "IO-Interactive-Tiny"; + version = "0.2"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DM/DMUEY/IO-Interactive-Tiny-0.2.tar.gz"; + sha256 = "45c0696505c7e4347845f5cd2512b7b1bc78fbce4cbed2b58008283fc95ea5f9"; + }; + meta = { + description = "Is_interactive() without large deps"; + license = lib.licenses.artistic2; + }; + }; + IOLockedFile = buildPerlPackage { pname = "IO-LockedFile"; version = "0.23"; @@ -11232,6 +11505,20 @@ let buildInputs = [ TestFatal TestRequires TestWarnings TestWithoutModule ]; }; + JSONCreate = buildPerlPackage { + pname = "JSON-Create"; + version = "0.35"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Create-0.35.tar.gz"; + sha256 = "5faefe0d833b8132568865308f3239d3cdaa1b8a1ecc9b5624dcf1efbe10683e"; + }; + propagatedBuildInputs = [ JSONParse UnicodeUTF8 ]; + meta = { + description = "Create JSON"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + JSONMaybeXS = buildPerlPackage { pname = "JSON-MaybeXS"; version = "1.004003"; @@ -11274,10 +11561,10 @@ let JSONParse = buildPerlPackage { pname = "JSON-Parse"; - version = "0.57"; + version = "0.61"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.57.tar.gz"; - sha256 = "1rqaqpgh068kqj11srw874m5ph5qkaz77ib5fi4hrc402d2qxa45"; + url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.61.tar.gz"; + sha256 = "ce8e55e70bef9bcbba2e96af631d10a605900961a22cad977e71aab56c3f2806"; }; meta = { description = "Read JSON into a Perl variable"; @@ -11396,6 +11683,33 @@ let }; }; + LEOCHARRECLI = buildPerlPackage { + pname = "LEOCHARRE-CLI"; + version = "1.19"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LE/LEOCHARRE/LEOCHARRE-CLI-1.19.tar.gz"; + sha256 = "37835f11ee35326241b4d30368ae1bc195a50414b3662db3e13b865bd52fcde9"; + }; + propagatedBuildInputs = [ FileWhich Filechmod LEOCHARREDebug Linuxusermod YAML ]; + meta = { + description = "Useful subs for coding cli scripts"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + LEOCHARREDebug = buildPerlPackage { + pname = "LEOCHARRE-Debug"; + version = "1.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LE/LEOCHARRE/LEOCHARRE-Debug-1.03.tar.gz"; + sha256 = "c1665aa3abd457cc8624b8c418c6f8bdf58fb3a686f8eed515cf7e93514df192"; + }; + meta = { + description = "Debug sub"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + libapreq2 = buildPerlPackage { pname = "libapreq2"; version = "2.16"; @@ -11770,6 +12084,20 @@ let }; }; + Linuxusermod = buildPerlPackage { + pname = "Linux-usermod"; + version = "0.69"; + src = fetchurl { + url = "mirror://cpan/authors/id/V/VI/VIDUL/Linux-usermod-0.69.tar.gz"; + sha256 = "97ca186a3c416bf69ed62da046f1a60d88d89b8e6ed25008b2f96e787dee9d60"; + }; + meta = { + description = "This module adds, removes and modify user and group accounts according to the passwd and shadow files syntax"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + platforms = lib.platforms.linux; + }; + }; + ListAllUtils = buildPerlPackage { pname = "List-AllUtils"; version = "0.18"; @@ -11888,6 +12216,20 @@ let LANG="C"; }; + LocaleMaketextLexiconGetcontext = buildPerlPackage { + pname = "Locale-Maketext-Lexicon-Getcontext"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SA/SAPER/Locale-Maketext-Lexicon-Getcontext-0.05.tar.gz"; + sha256 = "75cb33df9472a5962de54082f42c6a76b260fc405ba10ca53246fb1f82c09208"; + }; + propagatedBuildInputs = [ LocaleMaketextLexicon ]; + meta = { + description = "PO file parser for Maketext"; + license = lib.licenses.mit; + }; + }; + LocaleMOFile = buildPerlPackage { pname = "Locale-MO-File"; version = "0.09"; @@ -12084,6 +12426,21 @@ let }; }; + LogAnyAdapterTAP = buildPerlPackage { + pname = "Log-Any-Adapter-TAP"; + version = "0.003003"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NE/NERDVANA/Log-Any-Adapter-TAP-0.003003.tar.gz"; + sha256 = "131f0689b2b42b1b31449714c6eda8f811dd96a7c86748f1e03b239cfd0121c0"; + }; + propagatedBuildInputs = [ LogAny TryTiny ]; + meta = { + homepage = "https://github.com/silverdirk/perl-Log-Any-Adapter-TAP"; + description = "Logger suitable for use with TAP test files"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + LogContextual = buildPerlPackage { pname = "Log-Contextual"; version = "0.008001"; @@ -12798,6 +13155,19 @@ let }; }; + MathFibonacci = buildPerlPackage { + pname = "Math-Fibonacci"; + version = "1.5"; + src = fetchurl { + url = "mirror://cpan/authors/id/V/VI/VIPUL/Math-Fibonacci-1.5.tar.gz"; + sha256 = "70a8286e94558df99dc92f52d83e1e20a7b8f7852bcc3a1de7d9e338260b99ba"; + }; + meta = { + description = "This module provides a few functions related to Fibonacci numbers"; + license = lib.licenses.artistic2; + }; + }; + MathGMP = buildPerlPackage { pname = "Math-GMP"; version = "2.20"; @@ -13507,6 +13877,22 @@ let buildInputs = [ TestSharedFork ]; }; + ModuleBuildPluggableCPANfile = buildPerlModule { + pname = "Module-Build-Pluggable-CPANfile"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/Module-Build-Pluggable-CPANfile-0.05.tar.gz"; + sha256 = "4aec6cba240cb6e78016406b6a3a875634cc2aec08ffc5f1572da1cdc40e1e7c"; + }; + buildInputs = [ CaptureTiny TestRequires TestSharedFork ]; + propagatedBuildInputs = [ ModuleBuildPluggable ModuleCPANfile ]; + meta = { + homepage = "https://github.com/kazeburo/Module-Build-Pluggable-CPANfile"; + description = "Include cpanfile"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ModuleBuildPluggablePPPort = buildPerlModule { pname = "Module-Build-Pluggable-PPPort"; version = "0.04"; @@ -14275,6 +14661,22 @@ let }; }; + MongoDB = buildPerlPackage { + pname = "MongoDB"; + version = "2.2.2"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MO/MONGODB/MongoDB-v2.2.2.tar.gz"; + sha256 = "201935f92dac94f39c35de73661e8b252439e496f228657db85ff93257c3268f"; + }; + buildInputs = [ JSONMaybeXS PathTiny TestDeep TestFatal TimeMoment ]; + propagatedBuildInputs = [ AuthenSASLSASLprep AuthenSCRAM BSON IOSocketSSL NetSSLeay ClassXSAccessor BSONXS TypeTinyXS MozillaCA Moo NetDNS SafeIsa SubQuote TieIxHash TypeTiny UUIDURandom boolean namespaceclean ]; + meta = { + homepage = "https://github.com/mongodb-labs/mongo-perl-driver"; + description = "Official MongoDB Driver for Perl (EOL)"; + license = lib.licenses.asl20; + }; + }; + MonitoringPlugin = buildPerlPackage { pname = "Monitoring-Plugin"; version = "0.40"; @@ -14527,6 +14929,22 @@ let }; }; + MooseXStorageFormatJSONpm = buildPerlPackage { + pname = "MooseX-Storage-Format-JSONpm"; + version = "0.093093"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Storage-Format-JSONpm-0.093093.tar.gz"; + sha256 = "ebe0407a7eb1870270e0e2579f097dfd7df2aea3307fb71f324fb69e242cc58f"; + }; + buildInputs = [ Moose TestDeepJSON TestWithoutModule DigestHMAC MooseXTypes ]; + propagatedBuildInputs = [ JSON MooseXRoleParameterized MooseXStorage namespaceautoclean ]; + meta = { + homepage = "https://github.com/rjbs/MooseX-Storage-Format-JSONpm"; + description = "A format role for MooseX::Storage using JSON.pm"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MooX = buildPerlPackage { pname = "MooX"; version = "0.101"; @@ -15019,6 +15437,22 @@ let propagatedBuildInputs = [ Moose ]; }; + MooseXStorage = buildPerlPackage { + pname = "MooseX-Storage"; + version = "0.53"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Storage-0.53.tar.gz"; + sha256 = "8704bfe505f66b340f62e85c9ff319c19e9670b26d4b012c91f4e103b1daace0"; + }; + buildInputs = [ TestDeep TestDeepType TestFatal TestNeeds TestDeepJSON TestWithoutModule DigestHMAC MooseXTypes ]; + propagatedBuildInputs = [ ModuleRuntime Moose MooseXRoleParameterized PodCoverage StringRewritePrefix namespaceautoclean IOStringy JSON JSONXS JSONMaybeXS CpanelJSONXS YAML YAMLOld YAMLTiny YAMLLibYAML YAMLSyck ]; + meta = { + homepage = "https://github.com/moose/MooseX-Storage"; + description = "A serialization framework for Moose classes"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MooseXStrictConstructor = buildPerlPackage { pname = "MooseX-StrictConstructor"; version = "0.21"; @@ -19122,6 +19556,21 @@ let }; }; + SpreadsheetCSV = buildPerlPackage { + pname = "Spreadsheet-CSV"; + version = "0.20"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DD/DDICK/Spreadsheet-CSV-0.20.tar.gz"; + sha256 = "070bb252a8fe8b938a1ce4fc90525f833d4e619b6d4673b0ae0a23408d514ab6"; + }; + nativeBuildInputs = [ CGI ]; + propagatedBuildInputs = [ ArchiveZip SpreadsheetParseExcel TextCSV_XS XMLParser ]; + meta = { + description = "Drop-in replacement for Text::CSV_XS with spreadsheet support"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + SpreadsheetParseExcel = buildPerlPackage { pname = "Spreadsheet-ParseExcel"; version = "0.65"; @@ -20935,6 +21384,38 @@ let }; }; + TestDeepJSON = buildPerlModule { + pname = "Test-Deep-JSON"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MO/MOTEMEN/Test-Deep-JSON-0.05.tar.gz"; + sha256 = "aec8571b9e31b7301e26132c132c6800952dc089c645d76954a3ad1a6b350858"; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ ExporterLite JSONMaybeXS TestDeep ]; + meta = { + homepage = "https://github.com/motemen/perl5-Test-Deep-JSON"; + description = "Compare JSON with Test::Deep"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + TestDeepType = buildPerlPackage { + pname = "Test-Deep-Type"; + version = "0.008"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Deep-Type-0.008.tar.gz"; + sha256 = "6e7bea1a2f1e75319a22d1c51996ebac50ca5e3663d1bc223130887e62e959f1"; + }; + buildInputs = [ TestFatal TestNeeds ]; + propagatedBuildInputs = [ TestDeep TryTiny ]; + meta = { + homepage = "https://github.com/karenetheridge/Test-Deep-Type"; + description = "A Test::Deep plugin for validating type constraints"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestDir = buildPerlPackage { pname = "Test-Dir"; version = "1.16"; @@ -22376,6 +22857,19 @@ let }; }; + TextFuzzy = buildPerlPackage { + pname = "Text-Fuzzy"; + version = "0.29"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BK/BKB/Text-Fuzzy-0.29.tar.gz"; + sha256 = "3df5cfd2ca1a4c5ca7ff7bab3cc8d53ad2064e134cbf11004f3cf8c4b9055bff"; + }; + meta = { + description = "Partial string matching using edit distances"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TextGerman = buildPerlPackage { pname = "Text-German"; version = "0.06"; @@ -23154,6 +23648,20 @@ let }; }; + TimeMoment = buildPerlPackage { + pname = "Time-Moment"; + version = "0.44"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CH/CHANSEN/Time-Moment-0.44.tar.gz"; + sha256 = "64acfa042f634fcef8dadf55e7f42ba4eaab8aaeb7d5212eb89815a31f78f6fd"; + }; + buildInputs = [ TestFatal TestNumberDelta TestRequires ]; + meta = { + description = "Represents a date and time of day with an offset from UTC"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TimeOut = buildPerlPackage { pname = "Time-Out"; version = "0.11"; @@ -23354,6 +23862,20 @@ let buildInputs = [ TestMemoryCycle ]; }; + TypeTinyXS = buildPerlPackage { + pname = "Type-Tiny-XS"; + version = "0.022"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-XS-0.022.tar.gz"; + sha256 = "bcc34a31f7dc1d30cc803889b5c8f90e4773b73b5becbdb3860f5abe7e22ff00"; + }; + meta = { + homepage = "https://metacpan.org/release/Type-Tiny-XS"; + description = "Provides an XS boost for some of Type::Tiny's built-in type constraints"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TypesSerialiser = buildPerlPackage { pname = "Types-Serialiser"; version = "1.01"; @@ -23670,6 +24192,21 @@ let }; }; + UUIDURandom = buildPerlPackage { + pname = "UUID-URandom"; + version = "0.001"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/UUID-URandom-0.001.tar.gz"; + sha256 = "3f13631b13b9604fb489e2989490c99f103743a837239bdafae9d6baf55f8f46"; + }; + propagatedBuildInputs = [ CryptURandom ]; + meta = { + homepage = "https://github.com/dagolden/UUID-URandom"; + description = "UUIDs based on /dev/urandom or the Windows Crypto API"; + license = lib.licenses.asl20; + }; + }; + VariableMagic = buildPerlPackage { pname = "Variable-Magic"; version = "0.62"; @@ -24016,6 +24553,20 @@ let }; }; + XMLEncoding = buildPerlPackage { + pname = "XML-Encoding"; + version = "2.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SH/SHAY/XML-Encoding-2.11.tar.gz"; + sha256 = "a50e41af0a79b882d48816b95681f38a55af1e6a88828dcd96374a8bde2305a1"; + }; + propagatedBuildInputs = [ XMLParser ]; + meta = { + description = "A perl module for parsing XML encoding maps"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + XMLDOM = buildPerlPackage { pname = "XML-DOM"; version = "1.46"; @@ -24263,6 +24814,21 @@ let }; }; + XMLRules = buildPerlModule { + pname = "XML-Rules"; + version = "1.16"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JE/JENDA/XML-Rules-1.16.tar.gz"; + sha256 = "3788255c07afe4195a0de72ce050652320d817528ff2d10c611f6e392043868b"; + }; + propagatedBuildInputs = [ XMLParser ]; + meta = { + description = + "Parse XML and specify what and how to keep/process for individual tags"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + XMLSAX = buildPerlPackage { pname = "XML-SAX"; version = "1.02"; @@ -24484,6 +25050,21 @@ let }; }; + YAMLOld = buildPerlPackage { + pname = "YAML-Old"; + version = "1.23"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IN/INGY/YAML-Old-1.23.tar.gz"; + sha256 = "fa546fcd9acc5a39bc8871902f7fc1eba50e7dc781c5cd5c0abf1aece6d17ecd"; + }; + buildInputs = [ TestYAML TestBase ]; + meta = { + homepage = "https://github.com/ingydotnet/yaml-old-pm"; + description = "Old YAML.pm Legacy Code"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + YAMLSyck = buildPerlPackage { pname = "YAML-Syck"; version = "1.34"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 573d73ba7cf60..87950c2168890 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1236,6 +1236,8 @@ in { bpython = callPackage ../development/python-modules/bpython { }; + braceexpand = callPackage ../development/python-modules/braceexpand { }; + bracex = callPackage ../development/python-modules/bracex { }; braintree = callPackage ../development/python-modules/braintree { }; @@ -5170,6 +5172,8 @@ in { ondilo = callPackage ../development/python-modules/ondilo { }; + onetimepass = callPackage ../development/python-modules/onetimepass { }; + onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { }; onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; @@ -8857,6 +8861,8 @@ in { suseapi = callPackage ../development/python-modules/suseapi { }; + svdtools = callPackage ../development/python-modules/svdtools { }; + svg2tikz = callPackage ../development/python-modules/svg2tikz { }; svglib = callPackage ../development/python-modules/svglib { }; @@ -9528,6 +9534,8 @@ in { versioneer = callPackage ../development/python-modules/versioneer { }; + versionfinder = callPackage ../development/python-modules/versionfinder { }; + versiontag = callPackage ../development/python-modules/versiontag { }; versiontools = callPackage ../development/python-modules/versiontools { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 0d7ef5628ee45..3c48db55a1d63 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -305,7 +305,7 @@ let # package sets (like Cabal, jailbreak-cabal) are # working as expected. cabal-install = all; - Cabal_3_6_1_0 = with compilerNames; [ ghc884 ghc8107 ghc901 ghc921 ]; + Cabal_3_6_2_0 = with compilerNames; [ ghc884 ghc8107 ghc901 ghc921 ]; cabal2nix-unstable = all; funcmp = all; haskell-language-server = all; |