diff options
280 files changed, 4203 insertions, 2429 deletions
diff --git a/lib/attrsets.nix b/lib/attrsets.nix index c0d3ede73d0..516fdd8d33f 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -4,8 +4,8 @@ let inherit (builtins) head tail length; inherit (lib.trivial) id; - inherit (lib.strings) concatStringsSep sanitizeDerivationName; - inherit (lib.lists) foldr foldl' concatMap concatLists elemAt all; + inherit (lib.strings) concatStringsSep concatMapStringsSep escapeNixIdentifier sanitizeDerivationName; + inherit (lib.lists) foldr foldl' concatMap concatLists elemAt all partition groupBy take foldl; in rec { @@ -78,6 +78,103 @@ rec { in attrByPath attrPath (abort errorMsg); + /* Update or set specific paths of an attribute set. + + Takes a list of updates to apply and an attribute set to apply them to, + and returns the attribute set with the updates applied. Updates are + represented as { path = ...; update = ...; } values, where `path` is a + list of strings representing the attribute path that should be updated, + and `update` is a function that takes the old value at that attribute path + as an argument and returns the new + value it should be. + + Properties: + - Updates to deeper attribute paths are applied before updates to more + shallow attribute paths + - Multiple updates to the same attribute path are applied in the order + they appear in the update list + - If any but the last `path` element leads into a value that is not an + attribute set, an error is thrown + - If there is an update for an attribute path that doesn't exist, + accessing the argument in the update function causes an error, but + intermediate attribute sets are implicitly created as needed + + Example: + updateManyAttrsByPath [ + { + path = [ "a" "b" ]; + update = old: { d = old.c; }; + } + { + path = [ "a" "b" "c" ]; + update = old: old + 1; + } + { + path = [ "x" "y" ]; + update = old: "xy"; + } + ] { a.b.c = 0; } + => { a = { b = { d = 1; }; }; x = { y = "xy"; }; } + */ + updateManyAttrsByPath = let + # When recursing into attributes, instead of updating the `path` of each + # update using `tail`, which needs to allocate an entirely new list, + # we just pass a prefix length to use and make sure to only look at the + # path without the prefix length, so that we can reuse the original list + # entries. + go = prefixLength: hasValue: value: updates: + let + # Splits updates into ones on this level (split.right) + # And ones on levels further down (split.wrong) + split = partition (el: length el.path == prefixLength) updates; + + # Groups updates on further down levels into the attributes they modify + nested = groupBy (el: elemAt el.path prefixLength) split.wrong; + + # Applies only nested modification to the input value + withNestedMods = + # Return the value directly if we don't have any nested modifications + if split.wrong == [] then + if hasValue then value + else + # Throw an error if there is no value. This `head` call here is + # safe, but only in this branch since `go` could only be called + # with `hasValue == false` for nested updates, in which case + # it's also always called with at least one update + let updatePath = (head split.right).path; in + throw + ( "updateManyAttrsByPath: Path '${showAttrPath updatePath}' does " + + "not exist in the given value, but the first update to this " + + "path tries to access the existing value.") + else + # If there are nested modifications, try to apply them to the value + if ! hasValue then + # But if we don't have a value, just use an empty attribute set + # as the value, but simplify the code a bit + mapAttrs (name: go (prefixLength + 1) false null) nested + else if isAttrs value then + # If we do have a value and it's an attribute set, override it + # with the nested modifications + value // + mapAttrs (name: go (prefixLength + 1) (value ? ${name}) value.${name}) nested + else + # However if it's not an attribute set, we can't apply the nested + # modifications, throw an error + let updatePath = (head split.wrong).path; in + throw + ( "updateManyAttrsByPath: Path '${showAttrPath updatePath}' needs to " + + "be updated, but path '${showAttrPath (take prefixLength updatePath)}' " + + "of the given value is not an attribute set, so we can't " + + "update an attribute inside of it."); + + # We get the final result by applying all the updates on this level + # after having applied all the nested updates + # We use foldl instead of foldl' so that in case of multiple updates, + # intermediate values aren't evaluated if not needed + in foldl (acc: el: el.update acc) withNestedMods split.right; + + in updates: value: go 0 true value updates; + /* Return the specified attributes from a set. Example: @@ -477,6 +574,20 @@ rec { overrideExisting = old: new: mapAttrs (name: value: new.${name} or value) old; + /* Turns a list of strings into a human-readable description of those + strings represented as an attribute path. The result of this function is + not intended to be machine-readable. + + Example: + showAttrPath [ "foo" "10" "bar" ] + => "foo.\"10\".bar" + showAttrPath [] + => "<root attribute path>" + */ + showAttrPath = path: + if path == [] then "<root attribute path>" + else concatMapStringsSep "." escapeNixIdentifier path; + /* Get a package output. If no output is found, fallback to `.out` and then to the default. diff --git a/lib/default.nix b/lib/default.nix index 3fead03a463..f8ab51c6579 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -78,9 +78,10 @@ let mapAttrs' mapAttrsToList mapAttrsRecursive mapAttrsRecursiveCond genAttrs isDerivation toDerivation optionalAttrs zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil - recursiveUpdate matchAttrs overrideExisting getOutput getBin + recursiveUpdate matchAttrs overrideExisting showAttrPath getOutput getBin getLib getDev getMan chooseDevOutputs zipWithNames zip - recurseIntoAttrs dontRecurseIntoAttrs cartesianProductOfSets; + recurseIntoAttrs dontRecurseIntoAttrs cartesianProductOfSets + updateManyAttrsByPath; inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1 concatMap flatten remove findSingle findFirst any all count optional optionals toList range partition zipListsWith zipLists diff --git a/lib/lists.nix b/lib/lists.nix index 1dbff7668d7..a030280c8dc 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -4,6 +4,7 @@ let inherit (lib.strings) toInt; inherit (lib.trivial) compare min; + inherit (lib.attrsets) mapAttrs; in rec { @@ -340,15 +341,15 @@ rec { groupBy' builtins.add 0 (x: boolToString (x > 2)) [ 5 1 2 3 4 ] => { true = 12; false = 3; } */ - groupBy' = op: nul: pred: lst: - foldl' (r: e: - let - key = pred e; - in - r // { ${key} = op (r.${key} or nul) e; } - ) {} lst; + groupBy' = op: nul: pred: lst: mapAttrs (name: foldl op nul) (groupBy pred lst); - groupBy = groupBy' (sum: e: sum ++ [e]) []; + groupBy = builtins.groupBy or ( + pred: foldl' (r: e: + let + key = pred e; + in + r // { ${key} = (r.${key} or []) ++ [e]; } + ) {}); /* Merges two lists of the same size together. If the sizes aren't the same the merging stops at the shortest. How both lists are merged is defined diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 5fa95828df6..27111903139 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -761,4 +761,156 @@ runTests { { a = 3; b = 30; c = 300; } ]; }; + + # The example from the showAttrPath documentation + testShowAttrPathExample = { + expr = showAttrPath [ "foo" "10" "bar" ]; + expected = "foo.\"10\".bar"; + }; + + testShowAttrPathEmpty = { + expr = showAttrPath []; + expected = "<root attribute path>"; + }; + + testShowAttrPathVarious = { + expr = showAttrPath [ + "." + "foo" + "2" + "a2-b" + "_bc'de" + ]; + expected = ''".".foo."2".a2-b._bc'de''; + }; + + testGroupBy = { + expr = groupBy (n: toString (mod n 5)) (range 0 16); + expected = { + "0" = [ 0 5 10 15 ]; + "1" = [ 1 6 11 16 ]; + "2" = [ 2 7 12 ]; + "3" = [ 3 8 13 ]; + "4" = [ 4 9 14 ]; + }; + }; + + testGroupBy' = { + expr = groupBy' builtins.add 0 (x: boolToString (x > 2)) [ 5 1 2 3 4 ]; + expected = { false = 3; true = 12; }; + }; + + # The example from the updateManyAttrsByPath documentation + testUpdateManyAttrsByPathExample = { + expr = updateManyAttrsByPath [ + { + path = [ "a" "b" ]; + update = old: { d = old.c; }; + } + { + path = [ "a" "b" "c" ]; + update = old: old + 1; + } + { + path = [ "x" "y" ]; + update = old: "xy"; + } + ] { a.b.c = 0; }; + expected = { a = { b = { d = 1; }; }; x = { y = "xy"; }; }; + }; + + # If there are no updates, the value is passed through + testUpdateManyAttrsByPathNone = { + expr = updateManyAttrsByPath [] "something"; + expected = "something"; + }; + + # A single update to the root path is just like applying the function directly + testUpdateManyAttrsByPathSingleIncrement = { + expr = updateManyAttrsByPath [ + { + path = [ ]; + update = old: old + 1; + } + ] 0; + expected = 1; + }; + + # Multiple updates can be applied are done in order + testUpdateManyAttrsByPathMultipleIncrements = { + expr = updateManyAttrsByPath [ + { + path = [ ]; + update = old: old + "a"; + } + { + path = [ ]; + update = old: old + "b"; + } + { + path = [ ]; + update = old: old + "c"; + } + ] ""; + expected = "abc"; + }; + + # If an update doesn't use the value, all previous updates are not evaluated + testUpdateManyAttrsByPathLazy = { + expr = updateManyAttrsByPath [ + { + path = [ ]; + update = old: old + throw "nope"; + } + { + path = [ ]; + update = old: "untainted"; + } + ] (throw "start"); + expected = "untainted"; + }; + + # Deeply nested attributes can be updated without affecting others + testUpdateManyAttrsByPathDeep = { + expr = updateManyAttrsByPath [ + { + path = [ "a" "b" "c" ]; + update = old: old + 1; + } + ] { + a.b.c = 0; + + a.b.z = 0; + a.y.z = 0; + x.y.z = 0; + }; + expected = { + a.b.c = 1; + + a.b.z = 0; + a.y.z = 0; + x.y.z = 0; + }; + }; + + # Nested attributes are updated first + testUpdateManyAttrsByPathNestedBeforehand = { + expr = updateManyAttrsByPath [ + { + path = [ "a" ]; + update = old: old // { x = old.b; }; + } + { + path = [ "a" "b" ]; + update = old: old + 1; + } + ] { + a.b = 0; + }; + expected = { + a.b = 1; + a.x = 1; + }; + }; + } diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 48e85b1a5e7..348374026b4 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -468,6 +468,12 @@ freeform type. </para> <para> + The <literal>listeners.*.bind_address</literal> option was + renamed to <literal>bind_addresses</literal> in order to match + the upstream <literal>homeserver.yaml</literal> option name. + It is now also a list of strings instead of a string. + </para> + <para> An example to make the required migration clearer: </para> <para> @@ -528,7 +534,7 @@ listeners = [ { port = 8448; - bind_address = [ + bind_addresses = [ "::" "0.0.0.0" ]; @@ -559,7 +565,14 @@ Additionally a few option defaults have been synced up with upstream default values, for example the <literal>max_upload_size</literal> grew from - <literal>10M</literal> to <literal>50M</literal>. + <literal>10M</literal> to <literal>50M</literal>. For the same + reason, the default <literal>media_store_path</literal> was + changed from <literal>${dataDir}/media</literal> to + <literal>${dataDir}/media_store</literal> if + <literal>system.stateVersion</literal> is at least + <literal>22.05</literal>. Files will need to be manually moved + to the new location if the <literal>stateVersion</literal> is + updated. </para> </listitem> <listitem> @@ -825,6 +838,16 @@ </listitem> <listitem> <para> + The Tor SOCKS proxy is now actually disabled if + <literal>services.tor.client.enable</literal> is set to + <literal>false</literal> (the default). If you are using this + functionality but didn’t change the setting or set it to + <literal>false</literal>, you now need to set it to + <literal>true</literal>. + </para> + </listitem> + <listitem> + <para> The terraform 0.12 compatibility has been removed and the <literal>terraform.withPlugins</literal> and <literal>terraform-providers.mkProvider</literal> diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 2c2008ba123..37ff778dd9b 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -158,6 +158,9 @@ In addition to numerous new and upgraded packages, this release has the followin module (`services.matrix-synapse`) now need to be moved into `services.matrix-synapse.settings`. And while not all options you may use are defined in there, they are still supported, because you can set arbitrary values in this freeform type. + The `listeners.*.bind_address` option was renamed to `bind_addresses` in order to match the upstream `homeserver.yaml` option + name. It is now also a list of strings instead of a string. + An example to make the required migration clearer: Before: @@ -215,7 +218,7 @@ In addition to numerous new and upgraded packages, this release has the followin listeners = [ { port = 8448; - bind_address = [ + bind_addresses = [ "::" "0.0.0.0" ]; @@ -240,7 +243,9 @@ In addition to numerous new and upgraded packages, this release has the followin The secrets in your original config should be migrated into a YAML file that is included via `extraConfigFiles`. - Additionally a few option defaults have been synced up with upstream default values, for example the `max_upload_size` grew from `10M` to `50M`. + Additionally a few option defaults have been synced up with upstream default values, for example the `max_upload_size` grew from `10M` to `50M`. For the same reason, the default + `media_store_path` was changed from `${dataDir}/media` to `${dataDir}/media_store` if `system.stateVersion` is at least `22.05`. Files will need to be manually moved to the new + location if the `stateVersion` is updated. - The MoinMoin wiki engine (`services.moinmoin`) has been removed, because Python 2 is being retired from nixpkgs. @@ -319,6 +324,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `systemd-nspawn@.service` settings have been reverted to the default systemd behaviour. User namespaces are now activated by default. If you want to keep running nspawn containers without user namespaces you need to set `systemd.nspawn.<name>.execConfig.PrivateUsers = false` +- The Tor SOCKS proxy is now actually disabled if `services.tor.client.enable` is set to `false` (the default). If you are using this functionality but didn't change the setting or set it to `false`, you now need to set it to `true`. + - The terraform 0.12 compatibility has been removed and the `terraform.withPlugins` and `terraform-providers.mkProvider` implementations simplified. Providers now need to be stored under `$out/libexec/terraform-providers/<registry>/<owner>/<name>/<version>/<os>_<arch>/terraform-provider-<name>_v<version>` (which mkProvider does). diff --git a/nixos/modules/services/matrix/matrix-synapse.xml b/nixos/modules/services/matrix/matrix-synapse.xml index cdc4b4de1a7..cf33957d58e 100644 --- a/nixos/modules/services/matrix/matrix-synapse.xml +++ b/nixos/modules/services/matrix/matrix-synapse.xml @@ -119,7 +119,7 @@ in { <link linkend="opt-services.matrix-synapse.settings.listeners">listeners</link> = [ { <link linkend="opt-services.matrix-synapse.settings.listeners._.port">port</link> = 8008; - <link linkend="opt-services.matrix-synapse.settings.listeners._.bind_addresses">bind_address</link> = [ "::1" ]; + <link linkend="opt-services.matrix-synapse.settings.listeners._.bind_addresses">bind_addresses</link> = [ "::1" ]; <link linkend="opt-services.matrix-synapse.settings.listeners._.type">type</link> = "http"; <link linkend="opt-services.matrix-synapse.settings.listeners._.tls">tls</link> = false; <link linkend="opt-services.matrix-synapse.settings.listeners._.x_forwarded">x_forwarded</link> = true; @@ -152,10 +152,10 @@ in { <para> If you want to run a server with public registration by anybody, you can - then enable <literal><link linkend="opt-services.matrix-synapse.settings.enable_registration">services.matrix-synapse.enable_registration</link> = + then enable <literal><link linkend="opt-services.matrix-synapse.settings.enable_registration">services.matrix-synapse.settings.enable_registration</link> = true;</literal>. Otherwise, or you can generate a registration secret with <command>pwgen -s 64 1</command> and set it with - <option><link linkend="opt-services.matrix-synapse.settings.registration_shared_secret">services.matrix-synapse.registration_shared_secret</link></option>. + <option><link linkend="opt-services.matrix-synapse.settings.registration_shared_secret">services.matrix-synapse.settings.registration_shared_secret</link></option>. To create a new user or admin, run the following after you have set the secret and have rebuilt NixOS: <screen> diff --git a/nixos/modules/services/networking/pleroma.nix b/nixos/modules/services/networking/pleroma.nix index 9b8382392c0..c6d4c14dcb7 100644 --- a/nixos/modules/services/networking/pleroma.nix +++ b/nixos/modules/services/networking/pleroma.nix @@ -1,6 +1,7 @@ { config, options, lib, pkgs, stdenv, ... }: let cfg = config.services.pleroma; + cookieFile = "/var/lib/pleroma/.cookie"; in { options = { services.pleroma = with lib; { @@ -8,7 +9,7 @@ in { package = mkOption { type = types.package; - default = pkgs.pleroma; + default = pkgs.pleroma.override { inherit cookieFile; }; defaultText = literalExpression "pkgs.pleroma"; description = "Pleroma package to use."; }; @@ -100,7 +101,6 @@ in { after = [ "network-online.target" "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; restartTriggers = [ config.environment.etc."/pleroma/config.exs".source ]; - environment.RELEASE_COOKIE = "/var/lib/pleroma/.cookie"; serviceConfig = { User = cfg.user; Group = cfg.group; @@ -118,10 +118,10 @@ in { # Better be safe than sorry migration-wise. ExecStartPre = let preScript = pkgs.writers.writeBashBin "pleromaStartPre" '' - if [ ! -f /var/lib/pleroma/.cookie ] + if [ ! -f "${cookieFile}" ] || [ ! -s "${cookieFile}" ] then echo "Creating cookie file" - dd if=/dev/urandom bs=1 count=16 | hexdump -e '16/1 "%02x"' > /var/lib/pleroma/.cookie + dd if=/dev/urandom bs=1 count=16 | ${pkgs.hexdump}/bin/hexdump -e '16/1 "%02x"' > "${cookieFile}" fi ${cfg.package}/bin/pleroma_ctl migrate ''; diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 4d356242417..ce295bd4ba3 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -102,17 +102,19 @@ in # Taken from: https://github.com/oauth2-proxy/oauth2-proxy/blob/master/providers/providers.go provider = mkOption { type = types.enum [ - "google" + "adfs" "azure" + "bitbucket" + "digitalocean" "facebook" "github" - "keycloak" "gitlab" + "google" + "keycloak" + "keycloak-oidc" "linkedin" "login.gov" - "bitbucket" "nextcloud" - "digitalocean" "oidc" ]; default = "google"; diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index ddd216ca7fd..a5822c02794 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -910,6 +910,11 @@ in ORPort = mkForce []; PublishServerDescriptor = mkForce false; }) + (mkIf (!cfg.client.enable) { + # Make sure application connections via SOCKS are disabled + # when services.tor.client.enable is false + SOCKSPort = mkForce [ 0 ]; + }) (mkIf cfg.client.enable ( { SOCKSPort = [ cfg.client.socksListenAddress ]; } // optionalAttrs cfg.client.transparentProxy.enable { diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 03fe68fe505..a5db3dd5dd4 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -219,24 +219,7 @@ in session = mkOption { default = []; - type = with types; listOf (submodule ({ ... }: { - options = { - manage = mkOption { - description = "Whether this is a desktop or a window manager"; - type = enum [ "desktop" "window" ]; - }; - - name = mkOption { - description = "Name of this session"; - type = str; - }; - - start = mkOption { - description = "Commands to run to start this session"; - type = lines; - }; - }; - })); + type = types.listOf types.attrs; example = literalExpression '' [ { manage = "desktop"; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b2b35119ce3..423a6bd1e4a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -521,6 +521,7 @@ in telegraf = handleTest ./telegraf.nix {}; teleport = handleTest ./teleport.nix {}; thelounge = handleTest ./thelounge.nix {}; + terminal-emulators = handleTest ./terminal-emulators.nix {}; tiddlywiki = handleTest ./tiddlywiki.nix {}; tigervnc = handleTest ./tigervnc.nix {}; timezone = handleTest ./timezone.nix {}; diff --git a/nixos/tests/pleroma.nix b/nixos/tests/pleroma.nix index bf3623fce38..90a9a251104 100644 --- a/nixos/tests/pleroma.nix +++ b/nixos/tests/pleroma.nix @@ -32,8 +32,7 @@ import ./make-test-python.nix ({ pkgs, ... }: # system one. Overriding this pretty bad default behaviour. export REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt - export TOOT_LOGIN_CLI_PASSWORD="jamy-password" - toot login_cli -i "pleroma.nixos.test" -e "jamy@nixos.test" + echo "jamy-password" | toot login_cli -i "pleroma.nixos.test" -e "jamy@nixos.test" echo "Login OK" # Send a toot then verify it's part of the public timeline @@ -168,21 +167,6 @@ import ./make-test-python.nix ({ pkgs, ... }: cp key.pem cert.pem $out ''; - /* Toot is preventing users from feeding login_cli a password non - interactively. While it makes sense most of the times, it's - preventing us to login in this non-interactive test. This patch - introduce a TOOT_LOGIN_CLI_PASSWORD env variable allowing us to - provide a password to toot login_cli - - If https://github.com/ihabunek/toot/pull/180 gets merged at some - point, feel free to remove this patch. */ - custom-toot = pkgs.toot.overrideAttrs(old:{ - patches = [ (pkgs.fetchpatch { - url = "https://github.com/NinjaTrappeur/toot/commit/b4a4c30f41c0cb7e336714c2c4af9bc9bfa0c9f2.patch"; - sha256 = "sha256-0xxNwjR/fStLjjUUhwzCCfrghRVts+fc+fvVJqVcaFg="; - }) ]; - }); - hosts = nodes: '' ${nodes.pleroma.config.networking.primaryIPAddress} pleroma.nixos.test ${nodes.client.config.networking.primaryIPAddress} client.nixos.test @@ -194,7 +178,7 @@ import ./make-test-python.nix ({ pkgs, ... }: security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ]; networking.extraHosts = hosts nodes; environment.systemPackages = with pkgs; [ - custom-toot + toot send-toot ]; }; diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix new file mode 100644 index 00000000000..60161b80b96 --- /dev/null +++ b/nixos/tests/terminal-emulators.nix @@ -0,0 +1,207 @@ +# Terminal emulators all present a pretty similar interface. +# That gives us an opportunity to easily test their basic functionality with a single codebase. +# +# There are two tests run on each terminal emulator +# - can it successfully execute a command passed on the cmdline? +# - can it successfully display a colour? +# the latter is used as a proxy for "can it display text?", without going through all the intricacies of OCR. +# +# 256-colour terminal mode is used to display the test colour, since it has a universally-applicable palette (unlike 8- and 16- colour, where the colours are implementation-defined), and it is widely supported (unlike 24-bit colour). +# +# Future work: +# - Wayland support (both for testing the existing terminals, and for testing wayland-only terminals like foot and havoc) +# - Test keyboard input? (skipped for now, to eliminate the possibility of race conditions and focus issues) + +{ system ? builtins.currentSystem, + config ? {}, + pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +let tests = { + alacritty.pkg = p: p.alacritty; + + contour.pkg = p: p.contour; + contour.cmd = "contour $command"; + + cool-retro-term.pkg = p: p.cool-retro-term; + cool-retro-term.colourTest = false; # broken by gloss effect + + ctx.pkg = p: p.ctx; + ctx.pinkValue = "#FE0065"; + + darktile.pkg = p: p.darktile; + + eterm.pkg = p: p.eterm; + eterm.executable = "Eterm"; + eterm.pinkValue = "#D40055"; + + germinal.pkg = p: p.germinal; + + gnome-terminal.pkg = p: p.gnome.gnome-terminal; + + guake.pkg = p: p.guake; + guake.cmd = "SHELL=$command guake --show"; + guake.kill = true; + + hyper.pkg = p: p.hyper; + + kermit.pkg = p: p.kermit-terminal; + + kgx.pkg = p: p.kgx; + kgx.cmd = "kgx -e $command"; + kgx.kill = true; + + kitty.pkg = p: p.kitty; + kitty.cmd = "kitty $command"; + + konsole.pkg = p: p.plasma5Packages.konsole; + + lxterminal.pkg = p: p.lxterminal; + + mate-terminal.pkg = p: p.mate.mate-terminal; + mate-terminal.cmd = "SHELL=$command mate-terminal --disable-factory"; # factory mode uses dbus, and we don't have a proper dbus session set up + + mlterm.pkg = p: p.mlterm; + + mrxvt.pkg = p: p.mrxvt; + + qterminal.pkg = p: p.lxqt.qterminal; + qterminal.kill = true; + + roxterm.pkg = p: p.roxterm; + roxterm.cmd = "roxterm -e $command"; + + sakura.pkg = p: p.sakura; + + st.pkg = p: p.st; + st.kill = true; + + stupidterm.pkg = p: p.stupidterm; + stupidterm.cmd = "stupidterm -- $command"; + + terminator.pkg = p: p.terminator; + terminator.cmd = "terminator -e $command"; + + terminology.pkg = p: p.enlightenment.terminology; + terminology.cmd = "SHELL=$command terminology --no-wizard=true"; + terminology.colourTest = false; # broken by gloss effect + + termite.pkg = p: p.termite; + + termonad.pkg = p: p.termonad; + + tilda.pkg = p: p.tilda; + + tilix.pkg = p: p.tilix; + tilix.cmd = "tilix -e $command"; + + urxvt.pkg = p: p.rxvt-unicode; + + wayst.pkg = p: p.wayst; + wayst.pinkValue = "#FF0066"; + + wezterm.pkg = p: p.wezterm; + + xfce4-terminal.pkg = p: p.xfce.xfce4-terminal; + + xterm.pkg = p: p.xterm; + }; +in mapAttrs (name: { pkg, executable ? name, cmd ? "SHELL=$command ${executable}", colourTest ? true, pinkValue ? "#FF0087", kill ? false }: makeTest +{ + name = "terminal-emulator-${name}"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ jjjollyjim ]; + }; + + machine = { pkgsInner, ... }: + + { + imports = [ ./common/x11.nix ./common/user-account.nix ]; + + # Hyper (and any other electron-based terminals) won't run as root + test-support.displayManager.auto.user = "alice"; + + environment.systemPackages = [ + (pkg pkgs) + (pkgs.writeShellScriptBin "report-success" '' + echo 1 > /tmp/term-ran-successfully + ${optionalString kill "pkill ${executable}"} + '') + (pkgs.writeShellScriptBin "display-colour" '' + # A 256-colour background colour code for pink, then spaces. + # + # Background is used rather than foreground to minimize the effect of anti-aliasing. + # + # Keep adding more in case the window is partially offscreen to the left or requires + # a change to correctly redraw after initialising the window (as with ctx). + + while : + do + echo -ne "\e[48;5;198m " + sleep 0.5 + done + sleep infinity + '') + (pkgs.writeShellScriptBin "run-in-this-term" "sudo -u alice run-in-this-term-wrapped $1") + + (pkgs.writeShellScriptBin "run-in-this-term-wrapped" "command=\"$(which \"$1\")\"; ${cmd}") + ]; + + # Helpful reminder to add this test to passthru.tests + warnings = if !((pkg pkgs) ? "passthru" && (pkg pkgs).passthru ? "tests") then [ "The package for ${name} doesn't have a passthru.tests" ] else [ ]; + }; + + # We need imagemagick, though not tesseract + enableOCR = true; + + testScript = { nodes, ... }: let + in '' + with subtest("wait for x"): + start_all() + machine.wait_for_x() + + with subtest("have the terminal run a command"): + # We run this command synchronously, so we can be certain the exit codes are happy + machine.${if kill then "execute" else "succeed"}("run-in-this-term report-success") + machine.wait_for_file("/tmp/term-ran-successfully") + ${optionalString colourTest '' + + import tempfile + import subprocess + + + def check_for_pink(final=False) -> bool: + with tempfile.NamedTemporaryFile() as tmpin: + machine.send_monitor_command("screendump {}".format(tmpin.name)) + + cmd = 'convert {} -define histogram:unique-colors=true -format "%c" histogram:info:'.format( + tmpin.name + ) + ret = subprocess.run(cmd, shell=True, capture_output=True) + if ret.returncode != 0: + raise Exception( + "image analysis failed with exit code {}".format(ret.returncode) + ) + + text = ret.stdout.decode("utf-8") + return "${pinkValue}" in text + + + with subtest("ensuring no pink is present without the terminal"): + assert ( + check_for_pink() == False + ), "Pink was present on the screen before we even launched a terminal!" + + with subtest("have the terminal display a colour"): + # We run this command in the background + machine.shell.send(b"(run-in-this-term display-colour |& systemd-cat -t terminal) &\n") + + with machine.nested("Waiting for the screen to have pink on it:"): + retry(check_for_pink) + ''}''; +} + + ) tests diff --git a/nixos/tests/web-apps/peertube.nix b/nixos/tests/web-apps/peertube.nix index 38b31f6c332..706c598338e 100644 --- a/nixos/tests/web-apps/peertube.nix +++ b/nixos/tests/web-apps/peertube.nix @@ -120,6 +120,9 @@ import ../make-test-python.nix ({pkgs, ...}: # Check if PeerTube is running client.succeed("curl --fail http://peertube.local:9000/api/v1/config/about | jq -r '.instance.name' | grep 'PeerTube\ Test\ Server'") + # Check PeerTube CLI version + assert "${pkgs.peertube.version}" in server.succeed('su - peertube -s /bin/sh -c "peertube --version"') + client.shutdown() server.shutdown() database.shutdown() diff --git a/nixos/tests/wine.nix b/nixos/tests/wine.nix index cc449864c76..8135cb90a59 100644 --- a/nixos/tests/wine.nix +++ b/nixos/tests/wine.nix @@ -3,7 +3,7 @@ }: let - inherit (pkgs.lib) concatMapStrings listToAttrs; + inherit (pkgs.lib) concatMapStrings listToAttrs optionals optionalString; inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; hello32 = "${pkgs.pkgsCross.mingw32.hello}/bin/hello.exe"; @@ -27,6 +27,9 @@ let "bash -c 'wine ${exe} 2> >(tee wine-stderr >&2)'" ) assert 'Hello, world!' in greeting + '' + # only the full version contains Gecko, but the error is not printed reliably in other variants + + optionalString (variant == "full") '' machine.fail( "fgrep 'Could not find Wine Gecko. HTML rendering will be disabled.' wine-stderr" ) @@ -37,5 +40,9 @@ let variants = [ "base" "full" "minimal" "staging" "unstable" "wayland" ]; -in listToAttrs (map (makeWineTest "winePackages" [ hello32 ]) variants - ++ map (makeWineTest "wineWowPackages" [ hello32 hello64 ]) variants) +in +listToAttrs ( + map (makeWineTest "winePackages" [ hello32 ]) variants + ++ optionals pkgs.stdenv.is64bit + (map (makeWineTest "wineWowPackages" [ hello32 hello64 ]) variants) +) diff --git a/pkgs/applications/audio/eteroj.lv2/default.nix b/pkgs/applications/audio/eteroj.lv2/default.nix deleted file mode 100644 index ee95ce43ff5..00000000000 --- a/pkgs/applications/audio/eteroj.lv2/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libuv, lv2 }: - -stdenv.mkDerivation rec { - pname = "eteroj.lv2"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "OpenMusicKontrollers"; - repo = pname; - rev = version; - sha256 = "0lzdk7hlz3vqgshrfpj0izjad1fmsnzk2vxqrry70xgz8xglvnmn"; - }; - - buildInputs = [ libuv lv2 ]; - nativeBuildInputs = [ cmake pkg-config ]; - - meta = with lib; { - description = "OSC injection/ejection from/to UDP/TCP/Serial for LV2"; - homepage = "https://open-music-kontrollers.ch/lv2/eteroj"; - license = licenses.artistic2; - maintainers = with maintainers; [ magnetophon ]; - }; -} diff --git a/pkgs/applications/audio/lv2lint/default.nix b/pkgs/applications/audio/lv2lint/default.nix new file mode 100644 index 00000000000..ada996866c8 --- /dev/null +++ b/pkgs/applications/audio/lv2lint/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchurl, pkg-config, meson, ninja, lv2, lilv, curl, libelf }: + +stdenv.mkDerivation rec { + pname = "lv2lint"; + version = "0.14.0"; + + src = fetchurl { + url = "https://git.open-music-kontrollers.ch/lv2/${pname}/snapshot/${pname}-${version}.tar.xz"; + sha256 = "sha256-yPKM7RToLNBT+AXSjfxxpncESmv89/wcGCt//pnEGqI="; + }; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ lv2 lilv curl libelf ]; + + meta = with lib; { + description = "Check whether a given LV2 plugin is up to the specification"; + homepage = "https://open-music-kontrollers.ch/lv2/${pname}:"; + license = licenses.artistic2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/open-music-kontrollers/eteroj.nix b/pkgs/applications/audio/open-music-kontrollers/eteroj.nix new file mode 100644 index 00000000000..60de97ca3d0 --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/eteroj.nix @@ -0,0 +1,10 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "eteroj"; + version = "0.10.0"; + + sha256 = "18iv1sdwm0g6b53shsylj6bf3svmvvy5xadhfsgb4xg39qr07djz"; + + description = "OSC injection/ejection from/to UDP/TCP/Serial for LV2"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/generic.nix b/pkgs/applications/audio/open-music-kontrollers/generic.nix new file mode 100644 index 00000000000..a5ed7c41eb7 --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/generic.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, fetchurl, pkg-config, meson, ninja, libGLU, lv2, serd, sord, libX11, libXext, glew, lv2lint +, pname, version, sha256, description +, url ? "https://git.open-music-kontrollers.ch/lv2/${pname}.lv2/snapshot/${pname}.lv2-${version}.tar.xz" +, additionalBuildInputs ? [] +, postPatch ? "" +, ... +}: + +stdenv.mkDerivation { + inherit pname; + + inherit version; + + inherit postPatch; + + src = fetchurl { + url = url; + sha256 = sha256; + }; + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ + lv2 + sord + libX11 + libXext + glew + lv2lint + ] ++ additionalBuildInputs; + + meta = with lib; { + description = description; + homepage = "https://open-music-kontrollers.ch/lv2/${pname}:"; + license = licenses.artistic2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/open-music-kontrollers/jit.nix b/pkgs/applications/audio/open-music-kontrollers/jit.nix new file mode 100644 index 00000000000..937a6446a8d --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/jit.nix @@ -0,0 +1,12 @@ +{ callPackage, lv2, fontconfig, libvterm-neovim, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "jit"; + version = "unstable-2021-08-15"; + url = "https://git.open-music-kontrollers.ch/lv2/${pname}.lv2/snapshot/${pname}.lv2-1f5d6935049fc0dd5a4dc257b84b36d2048f2d83.tar.xz"; + sha256 = "sha256-XGICowVb0JgLJpn2h9GtViobYTdmo1LJ7/JFEyVsIqU="; + + additionalBuildInputs = [ lv2 fontconfig libvterm-neovim ]; + + description = "A Just-in-Time C/Rust compiler embedded in an LV2 plugin"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/mephisto.nix b/pkgs/applications/audio/open-music-kontrollers/mephisto.nix new file mode 100644 index 00000000000..de707edd3d9 --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/mephisto.nix @@ -0,0 +1,17 @@ +{ callPackage, faust, fontconfig, cmake, libvterm-neovim, libevdev, libglvnd, fira-code, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "mephisto"; + version = "0.16.0"; + + sha256 = "0vgr3rsvdj4w0xpc5iqpvyqilk42wr9zs8bg26sfv3f2wi4hb6gx"; + + additionalBuildInputs = [ faust fontconfig cmake libvterm-neovim libevdev libglvnd fira-code ]; + + # see: https://github.com/OpenMusicKontrollers/mephisto.lv2/issues/6 + postPatch = '' + sed -i 's/llvm-c-dsp/llvm-dsp-c/g' mephisto.c + ''; + + description = "A Just-in-time FAUST embedded in an LV2 plugin"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/midi_matrix.nix b/pkgs/applications/audio/open-music-kontrollers/midi_matrix.nix new file mode 100644 index 00000000000..cd431d1a1d3 --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/midi_matrix.nix @@ -0,0 +1,10 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "midi_matrix"; + version = "0.30.0"; + + sha256 = "1nwmfxdzk4pvbwcgi3d7v4flqc10bmi2fxhrhrpfa7cafqs40ib6"; + + description = "An LV2 MIDI channel matrix patcher"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/moony.nix b/pkgs/applications/audio/open-music-kontrollers/moony.nix new file mode 100644 index 00000000000..6087e055376 --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/moony.nix @@ -0,0 +1,13 @@ +{ callPackage, cairo, libvterm-neovim, robodoc, cmake, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "moony"; + version = "0.40.0"; + + sha256 = "sha256-9a3gR3lV8xFFTDZD+fJPCALVztgmggzyIpsPZCOw/uY="; + + additionalBuildInputs = [ cairo libvterm-neovim robodoc cmake ]; + + description = "Realtime Lua as programmable glue in LV2"; + +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/orbit.nix b/pkgs/applications/audio/open-music-kontrollers/orbit.nix new file mode 100644 index 00000000000..930fc17760f --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/orbit.nix @@ -0,0 +1,12 @@ +{ callPackage, zlib, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "orbit"; + version = "unstable-2021-04-13"; + url = "https://git.open-music-kontrollers.ch/lv2/${pname}.lv2/snapshot/${pname}.lv2-f4aa620fc8d77418856581a6a955192af15b3860.tar.xz"; + sha256 = "0z8d8h2w8fb2zx84n697jvy32dc0vf60jyiyh4gm22prgr2dvgkc"; + + additionalBuildInputs = [ zlib ]; + + description = "An LV2 time event manipulation plugin bundle"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/patchmatrix.nix b/pkgs/applications/audio/open-music-kontrollers/patchmatrix.nix new file mode 100644 index 00000000000..cc343e0330c --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/patchmatrix.nix @@ -0,0 +1,13 @@ +{ callPackage, libjack2, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "patchmatrix"; + version = "0.26.0"; + + url = "https://git.open-music-kontrollers.ch/lad/${pname}/snapshot/${pname}-${version}.tar.xz"; + sha256 = "sha256-cqPHCnrAhHB6a0xmPUYOAsZfLsqnGpXEuGR1W6i6W7I="; + + additionalBuildInputs = [ libjack2 ]; + + description = "A JACK patchbay in flow matrix style"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/router.nix b/pkgs/applications/audio/open-music-kontrollers/router.nix new file mode 100644 index 00000000000..40d3a5e6fbc --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/router.nix @@ -0,0 +1,11 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "router"; + version = "unstable-2021-04-13"; + + url = "https://git.open-music-kontrollers.ch/lv2/${pname}.lv2/snapshot/${pname}.lv2-7d754dd64c540d40b828166401617715dc235ca3.tar.xz"; + sha256 = "sha256-LjaW5Xdxfjzd6IJ2ptHzmHt7fhU1HQo7ubZ4USVqRE8="; + + description = "An atom/audio/CV router LV2 plugin bundle"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/sherlock.nix b/pkgs/applications/audio/open-music-kontrollers/sherlock.nix new file mode 100644 index 00000000000..c8ae0afd09a --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/sherlock.nix @@ -0,0 +1,12 @@ +{ callPackage, sratom, flex, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "sherlock"; + version = "0.28.0"; + + sha256 = "07zj88s1593fpw2s0r3ix7cj2icfd9zyirsyhr2i8l6d30b6n6fb"; + + additionalBuildInputs = [ sratom flex ]; + + description = "Plugins for visualizing LV2 atom, MIDI and OSC events"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/synthpod.nix b/pkgs/applications/audio/open-music-kontrollers/synthpod.nix new file mode 100644 index 00000000000..9b7964e839b --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/synthpod.nix @@ -0,0 +1,13 @@ +{ callPackage, lilv, libjack2, alsa-lib, zita-alsa-pcmi, libxcb, xcbutilxrm, sratom, gtk2, qt5, libvterm-neovim, robodoc, cmake,... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "synthpod"; + version = "unstable-2021-10-22"; + + url = "https://git.open-music-kontrollers.ch/lv2/synthpod/snapshot/synthpod-6f284bdad882037a522c120af92b96d8abf2de60.tar.xz"; + sha256 = "sha256-59WBlOKum5Pcmq2CfFfRHCNEa8uPCoBk0kSjFlIcypw="; + + additionalBuildInputs = [ lilv libjack2 alsa-lib zita-alsa-pcmi libxcb xcbutilxrm sratom gtk2 qt5.qtbase qt5.wrapQtAppsHook libvterm-neovim robodoc cmake ]; + + description = "Lightweight Nonlinear LV2 Plugin Container"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/vm.nix b/pkgs/applications/audio/open-music-kontrollers/vm.nix new file mode 100644 index 00000000000..8d432d356cf --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/vm.nix @@ -0,0 +1,10 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "vm"; + version = "0.14.0"; + + sha256 = "013gq7jn556nkk1nq6zzh9nmp3fb36jd7ndzvyq3qryw7khzkagc"; + + description = "A programmable virtual machine LV2 plugin"; +}) diff --git a/pkgs/applications/audio/patchmatrix/default.nix b/pkgs/applications/audio/patchmatrix/default.nix deleted file mode 100644 index a5d135ce9d4..00000000000 --- a/pkgs/applications/audio/patchmatrix/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, libjack2 -, lv2 -, meson -, ninja -, pkg-config -, glew -, xorg -}: - -stdenv.mkDerivation rec { - pname = "patchmatrix"; - version = "0.26.0"; - - src = fetchFromGitHub { - owner = "OpenMusicKontrollers"; - repo = pname; - rev = version; - hash = "sha256-rR3y5rGzmib//caPmhthvMelAdHRvV0lMRfvcj9kcCg="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - glew - libjack2 - lv2 - xorg.libX11 - xorg.libXext - ]; - - meta = with lib; { - description = "A JACK patchbay in flow matrix style"; - homepage = "https://github.com/OpenMusicKontrollers/patchmatrix"; - license = licenses.artistic2; - maintainers = with maintainers; [ pennae ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 57c327d429d..2577f61e8d5 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.42"; + version = "1.43"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-CwnEvQsxrYStJ4RxnE0lHt1fBHQEZrjSldnQnTOPaE0="; + sha256 = "sha256-+sHGjgDqizv/9n0dDj8knsl+4MBfO3/pMkmD+MPsuNM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index e95e5d9c6d1..ebddac8c539 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.9.14"; + version = "0.8.9.15"; propagatedBuildInputs = with python3Packages; [ requests @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { owner = "coderholic"; repo = pname; rev = version; - sha256 = "sha256-9q+YsQPFB7Ql5WnXvPj100cD7pGkmr1hHztqbpZStt8="; + sha256 = "sha256-r4T7t8Q46N59jqTkvdKBo6tffkrOYhoO/CZWvkBHOAQ="; }; checkPhase = '' diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index 3d6f3aef9e1..0c80dda703e 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { libgee libnotify libunity - pantheon.elementary-icon-theme pantheon.granite sqlite webkitgtk @@ -73,6 +72,13 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + # Fix build with vala 0.56 + # https://github.com/needle-and-thread/vocal/pull/503 + substituteInPlace src/Vocal.vala \ + --replace "public const OptionEntry[] app_options" "private const OptionEntry[] app_options" + ''; + passthru = { updateScript = nix-update-script { attrPath = pname; diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index 2c8526c6292..28ce7512129 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "alfis"; - version = "0.6.10"; + version = "0.6.11"; src = fetchFromGitHub { owner = "Revertron"; repo = "Alfis"; rev = "v${version}"; - sha256 = "sha256-JJTU3wZ3cG5TmgHYShWJaNAZBA4z3qZXPfb7WUX6/80="; + sha256 = "sha256-vm/JBJh58UaSem18RpJuPUzM2GCy4RfCb6Hr1B7KWQA="; }; - cargoSha256 = "sha256-BsFe1Fp+Q5Gqa1w4xov0tVLDKV7S+6b5fKBl09ggLB0="; + cargoSha256 = "sha256-8ijGO8up0qVQ/kVX5/DveKyovYLh7jm+d7vooS1waAA="; checkFlags = [ # these want internet access, disable them diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index f912ef41677..e8527559c3a 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -6,14 +6,14 @@ let chia = python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; fetchSubmodules = true; - hash = "sha256-eUvZc/7gqGkCB2tNKdwqKOmOgEcG9a/7TSvvyQzhNcQ="; + hash = "sha256-nH6rCzIQu5oWsdEHa+UkvbWeUGjrtpEKVEcLmSoor5k="; }; postPatch = '' @@ -50,6 +50,7 @@ let chia = python3Packages.buildPythonApplication rec { dnslib dnspythonchia fasteners + filelock keyrings-cryptfile pyyaml setproctitle diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 1210caaa251..e008832d4f0 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -8,13 +8,13 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.16"; + version = "0.9.17"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-NXuYUmo80rrBZCcuISKon48SKyyJrkzCEhggxaJNfBM="; + sha256 = "sha256-m47Y4IXGc43XLs5d6ehlD0A53BWC5kO3K2BS/xbYgl8="; # see the comment below on fakeGit for how this is used leaveDotGit = true; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-PIORMTzQbMdlrKwuF4MiGrLlg2nQpgLRsaHHeiCbqrg="; + cargoSha256 = "sha256-JBacioy2woAfKQuK6tXU9as4DNc+3uY3F3GWksCf6WU="; nativeBuildInputs = let diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 2b58ba50bca..510873f200e 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.156.2"; + version = "1.158.2"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-waVTNyK3OHpOvBJrXio+Xjn9q3WmUczbx3E26ChsuKo="; + sha256 = "sha256-YrRG+LaG39q/6Ry3cXo9XUwtvokkBl96XuQfE22QxZI="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 9ae3c1c33ca..5e0f37c78b6 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -1,23 +1,23 @@ { "EncConv": { "owner": "Alexey-T", - "rev": "2021.01.01", - "sha256": "18fp7yz2rl80a6xw7v4bgc4092l74fb6p6z4yf312r7gw7b8naq6" + "rev": "2022.03.02", + "sha256": "sha256-fBN6Ix5CqhzMbNrWGn6nw6+JRDmEfqe6o8JGHERkiPE=" }, "ATBinHex-Lazarus": { "owner": "Alexey-T", - "rev": "2021.07.02", - "sha256": "sha256-XSt2XfHMiF/ZIf07M65u+k5FjacyToL0rWbpcflKcuY=" + "rev": "2021.11.17", + "sha256": "sha256-wdYH0sISFNx42zt07gLn9ANxcyrq3WrbRhWfTFgPQWw=" }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2021.11.11", - "sha256": "sha256-lbRRiA8CHWmosJefTHrP2cTgU8nlK1SmNcppG6Bl54I=" + "rev": "2022.03.17", + "sha256": "sha256-zpirFZcqIT53tZhgxQGdwVB6pA98SQLr1o3f+Lhq2QY=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.02.19", - "sha256": "sha256-cq2dirFNPaWRmZJu0F+CFA//+SuFOOpTH3Q5zL4oPQo=" + "rev": "2022.03.17", + "sha256": "sha256-aJZGHodydkqfe2BJLKWUzIX6vbdiGKs4z5ZqtteM6NU=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -26,13 +26,13 @@ }, "EControl": { "owner": "Alexey-T", - "rev": "2022.02.02", - "sha256": "sha256-T/6SQJHKzbv/PlObDyc9bcpC14krHgcLDQn0v2fNkLM=" + "rev": "2022.03.17", + "sha256": "sha256-sWRKRhUYf07TIrVWRqtpsYPZu0dPm0EhSIqoDLmkG0Y=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2022.02.01", - "sha256": "sha256-FAcq6ixmFPQFBAGG2gqB4T+YGYT+Rh/OlKdGcH/iL3g=" + "rev": "2022.03.17", + "sha256": "sha256-FndLHJuCOyFr0IGUL4zFRjkEvTyNF3tHUO/Wx5IaV2Y=" }, "Python-for-Lazarus": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 54bcc3a7c06..d11ed899bc1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -425,6 +425,21 @@ license = lib.licenses.free; }; }) {}; + buffer-env = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "buffer-env"; + ename = "buffer-env"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/buffer-env-0.2.tar"; + sha256 = "1420qln8ww43d6gs70cnxab6lf10dhmk5yk29pwsvjk86afhwhwf"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/buffer-env.html"; + license = lib.licenses.free; + }; + }) {}; buffer-expose = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -463,10 +478,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "0.6"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cape-0.6.tar"; - sha256 = "0pc0vvdb0pczz9n50wry6k6wkdaz3bqin07nmlxm8w1aqvapb2pr"; + url = "https://elpa.gnu.org/packages/cape-0.7.tar"; + sha256 = "1icgd5d55x7x7czw349v8m19mgq4yrx6j6zhbb666h2hdkbnykbg"; }; packageRequires = [ emacs ]; meta = { @@ -609,6 +624,21 @@ license = lib.licenses.free; }; }) {}; + code-cells = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "code-cells"; + ename = "code-cells"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/code-cells-0.2.tar"; + sha256 = "19v6a7l23646diazl0rzjxjsam12hm08hgyq8hdcc7l3xl840ghk"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/code-cells.html"; + license = lib.licenses.free; + }; + }) {}; coffee-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "coffee-mode"; @@ -711,10 +741,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-0.15.tar"; - sha256 = "0hsmxaiadb8smi1hk90n9napqrygh9rvj7g9a3d9isi47yrbg693"; + url = "https://elpa.gnu.org/packages/consult-0.16.tar"; + sha256 = "172w4d9hbzj98j1gyfhzw2zz4fpw90ak8ccg35fngwjlk9mjdrzk"; }; packageRequires = [ emacs ]; meta = { @@ -741,10 +771,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.19"; + version = "0.20"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.19.tar"; - sha256 = "0jilhsddzjm0is7kqdklpr2ih50k2c3sik2i9vlgcizxqaqss97c"; + url = "https://elpa.gnu.org/packages/corfu-0.20.tar"; + sha256 = "03yycimbqs4ixz7lxp7f1b4fipq6kl2bbjnl87r0n9x8mzfslbdl"; }; packageRequires = [ emacs ]; meta = { @@ -756,10 +786,10 @@ elpaBuild { pname = "coterm"; ename = "coterm"; - version = "1.4"; + version = "1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/coterm-1.4.tar"; - sha256 = "0cs9hqffkzlkkpcfhdh67gg3vzvffrjawmi89q7x9p52fk9rcxp6"; + url = "https://elpa.gnu.org/packages/coterm-1.5.tar"; + sha256 = "1v8cl3bw5z0f36iw8x3gcgiizml74m1kfxfrasyfx8k01nbxcfs8"; }; packageRequires = [ emacs ]; meta = { @@ -921,10 +951,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.30"; + version = "0.31"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.30.tar"; - sha256 = "05yy1hhxd59rhricb14iai71w681222sv0i703yrgg868mphl7sb"; + url = "https://elpa.gnu.org/packages/debbugs-0.31.tar"; + sha256 = "11vdjrn5m5g6pirw8jv0602fbwwgdhazfrrwxxplii8x02gqk0sr"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -1127,16 +1157,16 @@ license = lib.licenses.free; }; }) {}; - dts-mode = callPackage ({ elpaBuild, fetchurl, lib }: + dts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dts-mode"; ename = "dts-mode"; - version = "0.1.1"; + version = "1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dts-mode-0.1.1.tar"; - sha256 = "1hdbf7snfbg3pfg1vhbak1gq5smaklvaqj1y9mjcnxyipqi47q28"; + url = "https://elpa.gnu.org/packages/dts-mode-1.0.tar"; + sha256 = "0ihwqkv1ddysjgxh01vpayv3ia0vx55ny8ym0mi5b4iz95idj60s"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/dts-mode.html"; license = lib.licenses.free; @@ -1236,10 +1266,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20220224"; + version = "20220316"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20220224.tar"; - sha256 = "008750fm7w5k9yrkwyxgank02smxki2857cd2d8qvhsa2qnz6c5n"; + url = "https://elpa.gnu.org/packages/eev-20220316.tar"; + sha256 = "1ax487ca2rsq6ck2g0694fq3z7a89dy4pcns15wd7ygkf3a4sykf"; }; packageRequires = [ emacs ]; meta = { @@ -1354,10 +1384,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-0.15.tar"; - sha256 = "0dr97549xrs9j1fhnqpdspvbfxnzqvzvpi8qc91fd2v4jsfwlklh"; + url = "https://elpa.gnu.org/packages/embark-0.16.tar"; + sha256 = "1fgsy4nqwl1cah287fbabpi9lwmbiyn36c4z918514iwr5hgrmfi"; }; packageRequires = [ emacs ]; meta = { @@ -1374,10 +1404,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "0.4"; + version = "0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-consult-0.4.tar"; - sha256 = "1z0xc11y59lagfsd2raps4iz68hvw132ff0qynbmvgw63mp1w4yy"; + url = "https://elpa.gnu.org/packages/embark-consult-0.5.tar"; + sha256 = "1z4n5gm30yan3gg2aqwb1ygql56v9sg2px1dr0gdl32lgmn9kvg6"; }; packageRequires = [ consult emacs embark ]; meta = { @@ -2419,6 +2449,21 @@ license = lib.licenses.free; }; }) {}; + logos = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "logos"; + ename = "logos"; + version = "0.2.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/logos-0.2.0.tar"; + sha256 = "0cqmgvgyyn656rg60bbnxr2flmnw9h4z5i2w98bsf4krlp3s4i6x"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/logos.html"; + license = lib.licenses.free; + }; + }) {}; map = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "map"; @@ -2438,10 +2483,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "0.12"; + version = "0.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-0.12.tar"; - sha256 = "01dy9dg2ac6s84ffcxn2pw1y75pinkdvxg1j2g3vijwjd5hpfakq"; + url = "https://elpa.gnu.org/packages/marginalia-0.13.tar"; + sha256 = "1d5y3d2plkxnmm4458l0gfpim6q3vzps3bsfakvnzf86hh5nm77j"; }; packageRequires = [ emacs ]; meta = { @@ -3006,6 +3051,21 @@ license = lib.licenses.free; }; }) {}; + org-modern = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "org-modern"; + ename = "org-modern"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/org-modern-0.3.tar"; + sha256 = "14f5grai6k9xbpyc33pcpgi6ka8pgy7vcnqqi77nclzq2yxhl9c1"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org-modern.html"; + license = lib.licenses.free; + }; + }) {}; org-real = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib, org }: elpaBuild { pname = "org-real"; @@ -3025,10 +3085,10 @@ elpaBuild { pname = "org-remark"; ename = "org-remark"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-remark-1.0.2.tar"; - sha256 = "12g9kmr0gfs1pi1410akvcaiax0dswbw09sgqbib58mikb3074nv"; + url = "https://elpa.gnu.org/packages/org-remark-1.0.4.tar"; + sha256 = "1mbsp92vw8p8l2pxs53r7wafrplrwfx0rmfk723cl9hpvghvl9vf"; }; packageRequires = [ emacs org ]; meta = { @@ -3055,10 +3115,10 @@ elpaBuild { pname = "org-translate"; ename = "org-translate"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-translate-0.1.3.el"; - sha256 = "0m52vv1961kf8f1gw8c4n02hxcvhdw3wgzmcxvjcdijfnjkarm33"; + url = "https://elpa.gnu.org/packages/org-translate-0.1.4.tar"; + sha256 = "0dvg3h8mmzlqfg60rwxjgy17sqv84p6nj2ngjdafkp9a4halv0g7"; }; packageRequires = [ emacs org ]; meta = { @@ -3096,6 +3156,21 @@ license = lib.licenses.free; }; }) {}; + osm = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "osm"; + ename = "osm"; + version = "0.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/osm-0.6.tar"; + sha256 = "0p19qyx4gw1rn2f5hlxa7gx1sph2z5vjw7cnxwpjhbbr0430zzwb"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/osm.html"; + license = lib.licenses.free; + }; + }) {}; other-frame-window = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "other-frame-window"; @@ -3220,10 +3295,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.17"; + version = "0.4.19"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.17.tar"; - sha256 = "1j3whjxhjawl1i5449yf56ljbazx90272gr8zfr36s8h8rijfjn9"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.19.tar"; + sha256 = "1l9ivg6x084r235jpd90diaa4v29r1kyfsblzsb8blskb9ka5b56"; }; packageRequires = [ emacs ]; meta = { @@ -4245,10 +4320,10 @@ elpaBuild { pname = "tempel"; ename = "tempel"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tempel-0.2.tar"; - sha256 = "0xn2vqaxqv04zmlp5hpb9vxkbs3bv4dk22xs5j5fqjid2hcv3714"; + url = "https://elpa.gnu.org/packages/tempel-0.3.tar"; + sha256 = "0aa3f3sfvibp3wl401fdlww70axl9hxasbza70i44vqq0y9csv40"; }; packageRequires = [ emacs ]; meta = { @@ -4395,16 +4470,16 @@ license = lib.licenses.free; }; }) {}; - undo-tree = callPackage ({ elpaBuild, fetchurl, lib }: + undo-tree = callPackage ({ elpaBuild, emacs, fetchurl, lib, queue }: elpaBuild { pname = "undo-tree"; ename = "undo-tree"; - version = "0.7.5"; + version = "0.8.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/undo-tree-0.7.5.el"; - sha256 = "00admi87gqm0akhfqm4dcp9fw8ihpygy030955jswkha4zs7lw2p"; + url = "https://elpa.gnu.org/packages/undo-tree-0.8.2.tar"; + sha256 = "0fgir9pls9439zwyl3j2yvrwx9wigisj1jil4ijma27dfrpgm288"; }; - packageRequires = []; + packageRequires = [ emacs queue ]; meta = { homepage = "https://elpa.gnu.org/packages/undo-tree.html"; license = lib.licenses.free; @@ -4605,10 +4680,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "0.20"; + version = "0.21"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-0.20.tar"; - sha256 = "1hg91f74klbwisxzp74d020v42l28wik9y1lg3hrbdspnhlhsdrl"; + url = "https://elpa.gnu.org/packages/vertico-0.21.tar"; + sha256 = "0aw3hkr46zghvyp7s2b6ziqavsf1zpml4bbxcvs4kvm05qa0y1hv"; }; packageRequires = [ emacs ]; meta = { @@ -4933,10 +5008,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-1.4.0.tar"; - sha256 = "1ng03fyhpisa1v99sc96mpr7hna1pmg4gdc61p86r8lka9m5gqfx"; + url = "https://elpa.gnu.org/packages/xref-1.4.1.tar"; + sha256 = "1vbpplw0sngymmawi940nlqmncqznb5vp7zi0ib8v66g3y33ijrf"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 60028dc9950..e385cf63a16 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -258,10 +258,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cider-1.2.0.tar"; - sha256 = "1dkn5mcp4vyk6h4mqrn7fcqjs4h0dx1y1b1pcg2jpyx11mhdpjxf"; + url = "https://elpa.nongnu.org/nongnu/cider-1.3.0.tar"; + sha256 = "10kg30s0gb09l0z17v2hqxy9v5pscnpqp5dng62cjh0x3hdi4i7x"; }; packageRequires = [ clojure-mode @@ -281,10 +281,10 @@ elpaBuild { pname = "clojure-mode"; ename = "clojure-mode"; - version = "5.13.0"; + version = "5.14.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.13.0.tar"; - sha256 = "16xll0sp7mqzwldfsihp7j3dlm6ps1l1awi122ff8w7xph7b0wfh"; + url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.14.0.tar"; + sha256 = "1lirhp6m5r050dm73nrslgzdgy6rdbxn02wal8n52q37m2armra2"; }; packageRequires = [ emacs ]; meta = { @@ -292,6 +292,21 @@ license = lib.licenses.free; }; }) {}; + coffee-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "coffee-mode"; + ename = "coffee-mode"; + version = "0.6.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/coffee-mode-0.6.3.tar"; + sha256 = "1yv1b5rzlj7cpz7gsv2j07mr8z6lkwxp1cldkrc6xlhcbqh8795a"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/coffee-mode.html"; + license = lib.licenses.free; + }; + }) {}; color-theme-tangotango = callPackage ({ color-theme , elpaBuild , fetchurl @@ -688,16 +703,21 @@ license = lib.licenses.free; }; }) {}; - geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib, transient }: + geiser = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , project + , transient }: elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.22.2"; + version = "0.23"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-0.22.2.tar"; - sha256 = "0mva8arcxj1kf6g7s6f6ik70gradmbnhhiaf7rdkycxdd8kdqn7i"; + url = "https://elpa.nongnu.org/nongnu/geiser-0.23.tar"; + sha256 = "1g82jaldq4rxiyhnzyqf82scys1545djc3y2nn9ih292g8rwqqms"; }; - packageRequires = [ emacs transient ]; + packageRequires = [ emacs project transient ]; meta = { homepage = "https://elpa.gnu.org/packages/geiser.html"; license = lib.licenses.free; @@ -782,10 +802,10 @@ elpaBuild { pname = "geiser-guile"; ename = "geiser-guile"; - version = "0.21.2"; + version = "0.23"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.21.2.tar"; - sha256 = "06mr8clsk8fj73q4ln90i28xs8axl4sd68wiyl41kgg9w5y78cb7"; + url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.23.tar"; + sha256 = "0fxn15kpljkdj1vvrv51232km49z2sbr6q9ghpvqwkgi0z9khxz6"; }; packageRequires = [ emacs geiser ]; meta = { @@ -2210,10 +2230,10 @@ elpaBuild { pname = "web-mode"; ename = "web-mode"; - version = "17.1.4"; + version = "17.2.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/web-mode-17.1.4.tar"; - sha256 = "0863p8ikc8yqw0dahswi5s9q7v7rg1hasdxz5jwkd796fh1ih78n"; + url = "https://elpa.nongnu.org/nongnu/web-mode-17.2.0.tar"; + sha256 = "15m7rx7sz7f6h0x90811bcl8gdcpn216ia48nmkqhqrm85synlja"; }; packageRequires = [ emacs ]; meta = { 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 0afde2c5c33..8cab450cb2e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -204,19 +204,19 @@ "repo": "ymarco/auto-activating-snippets", "unstable": { "version": [ - 20220217, - 2054 + 20220301, + 1628 ], - "commit": "1cb08537e255c60a9439e3fea7c5d406e32f5e97", - "sha256": "1mm8c69r9jjs4qr0nha7pj1i8pq03q4nban4pik280swn4c8f3zl" + "commit": "8ce591165e0bdc1a6ea76e78bc10c6b55bab9634", + "sha256": "0v9hw8rf5ypxn7bbwdvv5wrmvdghp691xkfc7kj2zihc0f7vyxak" }, "stable": { "version": [ 1, - 0 + 1 ], - "commit": "3076cefea0f6ae9d7757f13c27b5602e007b58ec", - "sha256": "1psy6qpqxh6dm2ix7pwqdcq0rbiy6hyd830g76jk4wvj4spm5rpf" + "commit": "5d83f76823bc0b86d5270277b57a627f3af427a1", + "sha256": "0vw57jrjds4y37aryjx8lcxs6w6amn2gxhpxlr3ylwi1b6yimvhf" } }, { @@ -273,8 +273,8 @@ 20210923, 950 ], - "commit": "fc0eeb780d22aa1aac337f06cc9b479c51600243", - "sha256": "1vv3p6fkp352chrjm7jwc3frifzfral1jyrkx4m8pfq0cyj2g197" + "commit": "0d6aace2ffd184137618a0c6e7f29826cbd8d1f9", + "sha256": "1rf989ll07xqmamdigzqmamhfscx7wk0xh5yaqam1q3hj13yywm5" } }, { @@ -308,16 +308,16 @@ "repo": "abstools/abs-mode", "unstable": { "version": [ - 20210411, - 1013 + 20220316, + 921 ], "deps": [ "erlang", "flymake", "maude-mode" ], - "commit": "3b332ec1e941874f220897e5c0e0a6df762ca28d", - "sha256": "0m7v87w2akdpgr360gyjiw0p5sc6ms3y9bccwi9j4jz4gnlix6l5" + "commit": "d860ddbbd7cb93c7a77980c78c1a2a7634ef01e1", + "sha256": "03j70vk0gaf96cljkxxk2d1df85b968yn31wa13d465swcaq8wav" }, "stable": { "version": [ @@ -1763,20 +1763,26 @@ "repo": "codesuki/add-node-modules-path", "unstable": { "version": [ - 20210305, - 312 + 20220315, + 340 ], - "commit": "7d9be65b3be062842b7ead862dec15d6f25db4a2", - "sha256": "0za0jjba2qdpqdkcp5bch6ma8crf0vsi7bxj2rasn2icqgxyn89m" + "deps": [ + "s" + ], + "commit": "63f047fd84b825876152743f66de7ee6f9ed203b", + "sha256": "09vf921dh6lawh14rk02gjsvz88x9vd1c68ilf2fzkap5dh61dy5" }, "stable": { "version": [ 1, - 2, - 0 + 3, + 1 ], - "commit": "6f7801b2c41e3711406b7e1654257ad5557f5bb3", - "sha256": "1pfgy1k7vp34k4zb9835y3x4jmf81na60vsf80wlgvfafwk170z6" + "deps": [ + "s" + ], + "commit": "63f047fd84b825876152743f66de7ee6f9ed203b", + "sha256": "09vf921dh6lawh14rk02gjsvz88x9vd1c68ilf2fzkap5dh61dy5" } }, { @@ -1887,25 +1893,25 @@ "repo": "minad/affe", "unstable": { "version": [ - 20211221, - 1304 + 20220308, + 1016 ], "deps": [ "consult" ], - "commit": "4d65f37a22425cf41c02862522a76e5688998591", - "sha256": "051k54mrq03574lni5nqabmhpbcgpjlm0vjn0yi7h4g0wl299ab6" + "commit": "36d8654a8d7e862d2e64f6bece370e664218ab1a", + "sha256": "1wj63vqr5vf2mzwsx1j837ahjkj0p20zn4vkxl52rxdl8m01m2yv" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "consult" ], - "commit": "0ee5e2374339c1a57d36c06818247afeecadc2c5", - "sha256": "0r9ziscf2f4plp740ggd2vh73cgax31xsvzmc1f5w9cy88i9f8nn" + "commit": "0982fbfee5877b2492568cce2d746b263f198db3", + "sha256": "01hmhg3smjni8gpyap4wmqb4ax6dxfn6jnwlpdp76imbvb9m26ma" } }, { @@ -2406,6 +2412,40 @@ } }, { + "ename": "alert-toast", + "commit": "94d83975f0554ee1ce5fcc5a151cb859e0fcaefa", + "sha256": "1bw641qxq4vrnq9q0j7avzqhl988rds92gi5f858q49as5lf5yvr", + "fetcher": "github", + "repo": "gkowzan/alert-toast", + "unstable": { + "version": [ + 20220312, + 229 + ], + "deps": [ + "alert", + "f", + "s" + ], + "commit": "ba931529a266537783cfec2a28c2b8c058364ff2", + "sha256": "07g7ny45gy488iqxfna1mdyc7rq8jjm4zb8krk50bymk5rhnmyar" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "alert", + "f", + "s" + ], + "commit": "96c88c93c1084de681700f655223142ee0eb944a", + "sha256": "1jir8qh87faqlxq1g0yyp5zy3d60615agyddxhsmx6l9a8x91zkn" + } + }, + { "ename": "align-cljlet", "commit": "091dcc3775ec2137cb61d66df4e72aca4900897a", "sha256": "0pnhhv33rvlmb3823xpy9v5h6q99fa7fn38djbwry4rymi4jmlih", @@ -2449,11 +2489,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20220117, - 108 + 20220316, + 1339 ], - "commit": "2c963ebb75f211d2f7ac3d2db5f4a9ee2f3e27da", - "sha256": "1gn5nyyhrvz8w1y5m8lg2khwfir0czjizmdzinr70gd7n8g1xqk9" + "commit": "a040a01ef50bef5bfd1b82f0141221f334310b1d", + "sha256": "070z380816r1adbcz6jzhkqbxnycynrydpx4bdn6gpir0arjjm8h" }, "stable": { "version": [ @@ -2491,14 +2531,14 @@ "repo": "wyuenho/all-the-icons-dired", "unstable": { "version": [ - 20211007, - 1729 + 20220304, + 1638 ], "deps": [ "all-the-icons" ], - "commit": "5e9b097f9950cc9f86de922b07903a4e5fefc733", - "sha256": "0p09rdq97hshg9gaivsqz9zvi2ba2p1a2ja1i8z6f896xv5jqs98" + "commit": "147ed0dfd1034a686795a08dc63e2c293128597e", + "sha256": "1vlwhnvgpjsvrlifczlnf4w02vpzp8rqkfw3mphhzxkfzvif5v53" }, "stable": { "version": [ @@ -2539,14 +2579,14 @@ "repo": "seagle0128/all-the-icons-ibuffer", "unstable": { "version": [ - 20220122, - 2206 + 20220228, + 1513 ], "deps": [ "all-the-icons" ], - "commit": "67a331c94af7670a89cea2cd58a1e7b11b83e8a9", - "sha256": "1aq1g81hj9c8z6h3aw9jdiq9x531kdysdifcr6q7p2bd0vcjd79m" + "commit": "b494b329400dafac5d41ec90d505120559ee589e", + "sha256": "1sf4nx2pq9jlkxbd9gp40hzmar9c6a7fwr4dp04nkh5xkqp69hqp" }, "stable": { "version": [ @@ -2601,28 +2641,28 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20220219, - 1054 + 20220311, + 311 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "2aca118abec76886a0689bcb4b6ba1049ff4e297", - "sha256": "0h6sq20pg3g68p4a0ziy8n41h236q9vfc21wx7qs5g9v6k3pbdng" + "commit": "42dead856fe4647fdc18bc5a8b64440f03026525", + "sha256": "167hwik7mjlvq502r0kx8hcrpizcyv532g5j3jayp5rvv2x6zwki" }, "stable": { "version": [ 1, - 6, - 3 + 7, + 0 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "66824c6468cbe256d7e5012f516f6840b5ab1de9", - "sha256": "19i7gnkwa7v6balx1qhd68rl1bxghl2fy442ymcaxl3yykc2hx9d" + "commit": "a866ed554932d4c52f802b2235e6d5c3382d8a67", + "sha256": "0id821qis6yqaicr0dv2cxyfdy8dh0m5xp7zbfrgnbzk1ah0npd5" } }, { @@ -2675,8 +2715,8 @@ 20220212, 1526 ], - "commit": "583ed2d65310eddcb1d5d82af236c9ed86560447", - "sha256": "1a3xk7cyxp63957mk3msrj166yq61zwyckdc7qd2l9s3spbsdq0j" + "commit": "490f9b781d6aa2be376b01326b4ccdea756ff382", + "sha256": "1bp5rcqni80izky8mzg0bmf8q8n3niwhjix6jsa9w81584kmcaha" }, "stable": { "version": [ @@ -3231,8 +3271,8 @@ 20200914, 644 ], - "commit": "6b13364d36eeb60d8ec15eaf8effe23c73401900", - "sha256": "1mjsxi18rv83wggp53iyh0dzp8y6jy3azqklkr9rmh6xjqb68a30" + "commit": "2816605bfdc24c93d8801016d31beeed7608ad02", + "sha256": "0bq2hdfy86l4yby9nrf84rz521n6y0axfyvl4sw8fg5dpmx062yp" }, "stable": { "version": [ @@ -3701,8 +3741,8 @@ 20210802, 1715 ], - "commit": "00c141bbff46c89a96598b605dee05dd1d89f624", - "sha256": "1d3ssyp90k26282p46c91wj1bvqxpvghcsicp14bnh78llwninvc" + "commit": "9b4b41cac699e85cb36bd0e4ef2cb39f7af1cf3d", + "sha256": "1khbqp8iqm6p5a83bvcvdiykd9qpa4c2545l3sbb5q3qg8js67cn" }, "stable": { "version": [ @@ -3846,17 +3886,17 @@ }, { "ename": "archive-rpm", - "commit": "e5f5653e62afdc022eac30bda3d21bd2d2625d2e", - "sha256": "0s53zbn71lb008gw3f0b5w4q0pw0vgiqbffgnyib24sh03ijl7z7", + "commit": "64c5ca910a8a887165a34d818fe464936df64606", + "sha256": "1s9w02w6crli7cq1082y1vrlj9qmgk2dq7smg21znmi5lch1y193", "fetcher": "github", - "repo": "legoscia/archive-rpm", + "repo": "nbarrientos/archive-rpm", "unstable": { "version": [ - 20180706, - 1232 + 20220314, + 1647 ], - "commit": "59f83caebbd2f92fd634f6968e6d17b50ffa3dc7", - "sha256": "11ssqaax4jl7r3z5agzmc74sjsfvl0m3xvp015ncqzpzysla47g3" + "commit": "379dddfbe4e801df6fdb81a55528fab6c7dbb78e", + "sha256": "1w505zv614xsc0bjc0539fw68x88vfxmd8k9mnp5364pvjfc7g87" }, "stable": { "version": [ @@ -4191,11 +4231,11 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20220104, - 1222 + 20220318, + 1342 ], - "commit": "0d52411d3accc3e11a2c64838703a8ce9755c77c", - "sha256": "0afjx74l0fywjr1gdf023prkbv9xglicjakbfbyw41m7vvlzcvk3" + "commit": "c78bab7506a70a735d2c3deab13fa87bf44a83d3", + "sha256": "1pa0cmphja9flib8m86rlsns7q53g06pn0m4ksdj0ig1xmzj4108" }, "stable": { "version": [ @@ -4296,8 +4336,8 @@ 20201026, 339 ], - "commit": "15ab7db5d188083f09d65163edd5d0ef995c4c30", - "sha256": "05fgd7h75jrzblgs8ydkd30pgjhr16ng4l4k32wr4wwqn213ag97" + "commit": "3f4b12016bd1d0115207013ebc3f02fa7f50917b", + "sha256": "07gf5p6c78kxyji4q89gz2ffyixdccn5h610d7nidiiix1bwvh1p" }, "stable": { "version": [ @@ -4320,8 +4360,8 @@ 20210731, 609 ], - "commit": "da34a3950b80bb43cc1e8b4aa404b761372dd149", - "sha256": "04jjgcs7h2bxxjqhsi65iwgf5jg912lgingfq3yd9dkcbw9nmcfc" + "commit": "7e07005dbbca6a5f409f37af37e5f5f81d057ded", + "sha256": "1mm9xfsk2kgqfy29k27b5z43j12nkpx1ssgp4y9k6bymrgbfx08v" }, "stable": { "version": [ @@ -4621,8 +4661,8 @@ "keytar", "s" ], - "commit": "c7b5893e0d93ac6a653e58161b42dc2b21793711", - "sha256": "1w9i58dg0l23dry0aj3cvb842fd33z9hngq0a7rikacmympz95r9" + "commit": "f235a34306e230dcbf60f63e19fdc3b06425f7cf", + "sha256": "1pa4syiq7ds1hfpi268krlkyi8vl7hfr23md2x16zh0wlnsxnpm2" }, "stable": { "version": [ @@ -4764,8 +4804,8 @@ "cl-lib", "popup" ], - "commit": "71dd984aa45dccea1cb797d336507eafa81b5bf4", - "sha256": "0cayj63jn1dc01bn4z87l783fiis4ixvmbww2pqii1i06mxsqxaw" + "commit": "d515059ea5316c81223f6d969e45b16b47365b5c", + "sha256": "07xp981b1j9igcai930pqfiz16idp9898bpdl623d9175i5dnrjl" }, "stable": { "version": [ @@ -5041,6 +5081,21 @@ } }, { + "ename": "auto-dark", + "commit": "5e0563fc10ad39c0bee64c91c02df54d4880491c", + "sha256": "1lh5jsqkx653p3xbpyg67jfi9n2x6nzlqh0szhawp9rahszjgwym", + "fetcher": "github", + "repo": "LionyxML/auto-dark-emacs", + "unstable": { + "version": [ + 20220318, + 2356 + ], + "commit": "fd07fbdff1d5e370b1714dde882e1ed37dca9936", + "sha256": "10r586w7p3x7axvxmf8qpjfi3mhccahgq2yk6w665j4hj917k5sr" + } + }, + { "ename": "auto-dictionary", "commit": "1711d710ac09fe407fde89ee351ccdcb78555d35", "sha256": "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16", @@ -5092,8 +5147,8 @@ "deps": [ "ht" ], - "commit": "db22c24d13532e80ce02c2f51f41f6c979cf0604", - "sha256": "0z1frm9kicrlb63iyk7wa5dpvy92ygh5vxaw2kv1rvnfbsfmxl7b" + "commit": "939aa7f58c555a05451238e40c34bc8da0150870", + "sha256": "1rqphhfvi91vgqqxahgm2zkxk12dvqxvqgraqgagc75xpqsgw423" }, "stable": { "version": [ @@ -5242,8 +5297,8 @@ 20210805, 1344 ], - "commit": "beb7a4d2b15790502ac52f65588da3d23567f9db", - "sha256": "1pv88hrld0zifd7w52kqlx04fx3vfzrp56kzd2jk0fn3pvqdi5n7" + "commit": "5551157ab81b55322e7787ce16ba84162933aece", + "sha256": "18zrh7s8xn9spr5lg5zasdb3rkldnvmhi31z08d4rxjfpfhikcql" }, "stable": { "version": [ @@ -5511,8 +5566,8 @@ 20190331, 2230 ], - "commit": "842ae4df222bbd6596068814ac1b1e505c2a6b7a", - "sha256": "19j76bgv5hca8i9385f1s66zj31y70fgppmvxdqrws4265zqc11d" + "commit": "09166f32d3ece2b297da036f0abbeba63329580e", + "sha256": "09j3mxa0803piywmfkvxg0jpgbx6qbvibsik8wsms898bg5n3s4d" } }, { @@ -5655,20 +5710,20 @@ "avy", "embark" ], - "commit": "8cb3f7655a7868cebe756c1f6c9f2d07ca4da5d4", - "sha256": "1w1swb8qqqzp0b665bd8pbjykgy0523n1wjxwwd0jbma58c4j5xs" + "commit": "5a74f42bd0031b28ee30b64fcb24717ceae8a030", + "sha256": "15g9mm1k4c0qbf9y3fcgsmkxzi4wh3hi6nb62rim2ackxw9f4ndp" }, "stable": { "version": [ 0, - 15 + 16 ], "deps": [ "avy", "embark" ], - "commit": "7814a7345067da31a1e7af682bb1f6f050527001", - "sha256": "08wj0p3plvblbmfmn4vsanhldr2csrnm1lhk3g1nic5v26yi5l64" + "commit": "5faf1389162dd64bfe3511dfb8f52c18efb5140b", + "sha256": "04xxwhh577aam0fqfmprxqaw0v1l6yidikr6chajcf16mf1wd2gv" } }, { @@ -6879,8 +6934,8 @@ 20210715, 1004 ], - "commit": "e6e73647e4c176ff4f89e09d54dae753f95c7a03", - "sha256": "06r3b4wggam2a0n87cnlkxsn16aam9c0wdi6niw6sainjmk0dw8g" + "commit": "7183369a489a12f4a776f03c8e1a9bfe62d0ab3d", + "sha256": "1fg0w1c1fdvqjf5rki4zw2m8zwdxsc2g43s9vm635v6akb8ryqmy" }, "stable": { "version": [ @@ -7577,26 +7632,26 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20220227, - 1237 + 20220302, + 1936 ], "deps": [ "a" ], - "commit": "44cca9a637c967b8b0b6385f29572bd3b2999a53", - "sha256": "12ccpncf3l5pl5hmn9vaixwm34jy8rpf8iyyn3srj3v8mak3xsa0" + "commit": "0dc1328b8640207ac75a009c690d392f63c44f4d", + "sha256": "1sdgbwv3iiwcw5af7hdk04ab841nl8y8xm854b9qdh9n0micwx3a" }, "stable": { "version": [ 0, 4, - 3 + 4 ], "deps": [ "a" ], - "commit": "44cca9a637c967b8b0b6385f29572bd3b2999a53", - "sha256": "12ccpncf3l5pl5hmn9vaixwm34jy8rpf8iyyn3srj3v8mak3xsa0" + "commit": "0dc1328b8640207ac75a009c690d392f63c44f4d", + "sha256": "1sdgbwv3iiwcw5af7hdk04ab841nl8y8xm854b9qdh9n0micwx3a" } }, { @@ -8596,11 +8651,11 @@ "repo": "astoff/buffer-env", "unstable": { "version": [ - 20210520, - 1616 + 20220316, + 2046 ], - "commit": "32c1cfdf06dfa7bdbd79aba8066064212672e755", - "sha256": "1mbrsakg7mbrr4szi7ha5hcfr88i79p5bn59dh7v6ywa357brmky" + "commit": "d5fbf1d173da54fd8609b2ea10832d871021feec", + "sha256": "02azqjsanpzhzby0sscnnv9jddimmqvl08ijir7172x2n3fws2dk" } }, { @@ -8798,8 +8853,8 @@ 20200924, 345 ], - "commit": "327c378c333156321974ffcf93f19aa9fad59a9e", - "sha256": "02wihnxifb17g9hn0l6ia63whfxvx7351s64ffpvvjjryz8l95fg" + "commit": "1734ee6cadaa8094e6b06876c57dbca5dbd289cf", + "sha256": "0h8da68hclfjrxpq3h84fanldm8vgkriljw0qn2vwpdd5yw5258v" }, "stable": { "version": [ @@ -9197,11 +9252,11 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20210105, - 2255 + 20220309, + 2311 ], - "commit": "1cb7afcb0b6d87a3e623dc26ffcb2c7d4d6dd280", - "sha256": "07f8lxcyi007qfhgq0yvpq1pg8hklzq94pfkzpqq2hb2cvyj2zb5" + "commit": "09459403f54783ddff9337010d9536da25ca7818", + "sha256": "1aaa0a8x1347xhnxsifwrzqk1inhgb6wljvqyibvhy22ap38bxm6" }, "stable": { "version": [ @@ -9700,16 +9755,19 @@ "repo": "chenyanming/calibredb.el", "unstable": { "version": [ - 20210603, - 323 + 20220305, + 1621 ], "deps": [ "dash", + "esxml", + "org", + "request", "s", "transient" ], - "commit": "cb93563d0ec9e0c653210bc574f9546d1e7db437", - "sha256": "10dymcd17ili5r6ydiz7bj0q81y5fh0s1d64m4acfa8xfsi7zx55" + "commit": "20337d39e3abe4baa38cc0ed5a6c65272df9af2d", + "sha256": "08ix2iq17xsl9dcnf0xik12ykpji77kb5xs91y23w1plfl1pl0zj" }, "stable": { "version": [ @@ -9875,19 +9933,19 @@ "repo": "minad/cape", "unstable": { "version": [ - 20220227, - 316 + 20220313, + 58 ], - "commit": "fc7a20be524d0faa848ba2a16a80767a445a1391", - "sha256": "1dwbvixk2zr2k061zrljr933l2gpkx672d1d67gbz5znz4sbjsgh" + "commit": "79e8771c18c76a5bef5fdbf74718527e74b6d702", + "sha256": "1v5q066xppxf0crzcliqa2mya0x18qjmz5xp0mcr2szi1nps8z7s" }, "stable": { "version": [ 0, - 6 + 7 ], - "commit": "92c3168283c6d9faa3fcf2e72d0d71afbfa5d6e1", - "sha256": "1bmxpfp0zs24lbp1mlcc66f4s5gxgrj78001h241mzndc3kaiqfk" + "commit": "51b9bf1276445faebfbad636d9b6a39dc57b22bc", + "sha256": "0731c55bb1vxdh8k7312z1bvf7g8jwr2n04q3ffpqp0fan6ra025" } }, { @@ -9901,8 +9959,8 @@ 20210707, 2310 ], - "commit": "fe82ae30fcd53dbe3c9ae7e14e495a79ac7a9c74", - "sha256": "02z2ss5kqmda32x4pwrjwqly2ia2wyw47pny6hh93mzpc453lmj0" + "commit": "281aacc18003ae103b8a04ea83d7b6f814c97b8b", + "sha256": "0v245k0fv0dsg706v34rg91h36avfvl3yfddll1gp9h87df04hkp" }, "stable": { "version": [ @@ -9952,14 +10010,14 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20220208, - 1933 + 20220311, + 827 ], "deps": [ "markdown-mode" ], - "commit": "841ea7d85edd10c94138339469c4d8bbd03c8a29", - "sha256": "0gnah3bdcii2xrjnwpr9kzl5x8p85dv61yl48j3fizanjmwhan13" + "commit": "8335b5577dfa526c645f7c1839c473f99b9ad1a8", + "sha256": "0dw46rd1naz9z383bn3zzywz2955r4fw6a1v87m1scr3j42i6q4p" }, "stable": { "version": [ @@ -10061,8 +10119,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20211103, - 1654 + 20220316, + 1557 ], "deps": [ "ansi", @@ -10073,14 +10131,14 @@ "s", "shut-up" ], - "commit": "751435bd56c7123d8244d9d156309e21e63cd5c0", - "sha256": "0jxwsaam7hqvqbxrkzd7hy09l87yjsg7z89jikzs6vzc72h02g8x" + "commit": "218433b408b95efdc026081ee3f44e976a3aa36b", + "sha256": "08bniq7hba6438nfwfnmhkvm1yqln5f27239ndq1gbhc3wnnq61q" }, "stable": { "version": [ 0, 8, - 7 + 8 ], "deps": [ "ansi", @@ -10091,8 +10149,8 @@ "s", "shut-up" ], - "commit": "9600dd9a341c61ac006c0a44912e13f3810f3c54", - "sha256": "0aqc3p7i00rbdgj2cjil71c8wqq9ard637fnpdq1ny6wnb8kblm7" + "commit": "9347a4d4459722f0863167bd21001477d76f3dc8", + "sha256": "1i948z6q07mfibs1v7k1cl8hs299m5vlm2brlpz9hm0bkfmmwm2f" } }, { @@ -10271,8 +10329,8 @@ 20210501, 820 ], - "commit": "ac0777ace98b6e8a8a10aa2302d51efeaa6f7893", - "sha256": "0r4ichirlmw6hsgq74kwnw235a85lkn528322rvd1zl1iir0ffsc" + "commit": "5c209e0306364118abf9d9440d7b8b9613183072", + "sha256": "1p7mwlnhsblr9ilns4vbadlbr1bz7w81das54znw6cnv4yjjzdan" } }, { @@ -10320,8 +10378,8 @@ 20200904, 1431 ], - "commit": "ac0777ace98b6e8a8a10aa2302d51efeaa6f7893", - "sha256": "0r4ichirlmw6hsgq74kwnw235a85lkn528322rvd1zl1iir0ffsc" + "commit": "5c209e0306364118abf9d9440d7b8b9613183072", + "sha256": "1p7mwlnhsblr9ilns4vbadlbr1bz7w81das54znw6cnv4yjjzdan" } }, { @@ -10590,8 +10648,8 @@ 20171115, 2108 ], - "commit": "64122d4a77d76689558412b55962cab60524c67c", - "sha256": "1a80pfhys8ja1nh32d3xqab0f7f1k3k5mzsvscnivk90cmsrakhb" + "commit": "9bc6e3d8398112532b14d0c192f19a4046c6baed", + "sha256": "1rk05zqzd0z88pyyks49zc6vnqvigq5nacdmjx1j4dx2jkwxax8p" }, "stable": { "version": [ @@ -10737,11 +10795,27 @@ }, { "ename": "cg", - "commit": "be27e728327016b819535ef8cae10020e5a07c2e", - "sha256": "1xffjilr9f2s3w7j8f3clq7qvsnr0lr8gadlybpzzy8x5fbmk4n3", - "error": "Not in archive", + "commit": "808b19a7c16fa977ecf22006c470cfb8b62b9e5d", + "sha256": "01aqh2xbg0bmj166lhxnl44qvwadsp2fcrm39w4hywccjpgvy94h", "fetcher": "github", - "repo": "emacsmirror/cg" + "repo": "GrammarSoft/cg3", + "unstable": { + "version": [ + 20220318, + 1007 + ], + "commit": "140a63995ca15d393c7e7003cf0e6edddcd4088c", + "sha256": "1ssl0nzm2bs3iyjak9x2gkl3206v5ihbzsspqrvrgijfv3h9yhzr" + }, + "stable": { + "version": [ + 1, + 3, + 6 + ], + "commit": "25afa64a35780b7d870a6c2467a404ea67d6d23f", + "sha256": "0jwyq878bayw4qx25ifc1gabsvg0xilsizg73lkwj06qzag2x0s9" + } }, { "ename": "challenger-deep-theme", @@ -11062,11 +11136,11 @@ "repo": "tuh8888/chezmoi.el", "unstable": { "version": [ - 20220221, - 1556 + 20220310, + 2014 ], - "commit": "0b25d312a84868d6cf76f2016cd0dbc70c9312a0", - "sha256": "0mqrxzk0skkc3wj3b44k10nnrg542jnh8s226v1mx4dbcxws8rdy" + "commit": "781783c483bc8fcdba3a230bb774c3a8a5ebe396", + "sha256": "0il36mnf4c13336sa4hpbfypdc983va5fcd5shcsp7slb9zwm69m" }, "stable": { "version": [ @@ -11408,8 +11482,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20220222, - 1710 + 20220309, + 618 ], "deps": [ "clojure-mode", @@ -11419,26 +11493,25 @@ "sesman", "spinner" ], - "commit": "7a072d8374eb92c8164b436ee271abb5e9e351e3", - "sha256": "098h86i41dqxydmhx9akiyixnz846i7jhl1hcsz7dnwl7ibbz14k" + "commit": "1e27eba570d265bc27317dc2a8f8c98d8b5414e0", + "sha256": "1zx918pkdiihj7s5x9pqy946q9bbjv774z3dkvkrnvj0xv1x34n6" }, "stable": { "version": [ 1, - 2, + 3, 0 ], "deps": [ "clojure-mode", "parseedn", - "pkg-info", "queue", "seq", "sesman", "spinner" ], - "commit": "7869c66f81d8a2b47f2e2d912fcb96934f5aa39a", - "sha256": "1c21hdrf6b7zc65nr7wqjhcyq5a0f4aa91wrxgzx374q81xym2rf" + "commit": "02ca53021682f426323dc7bb4e6b28e6c8f5eb30", + "sha256": "0mxlkxpzn7rzbzpzcw2z9x2ab2zvhrwr8h21kmfn3li3dha73gf1" } }, { @@ -11719,8 +11792,8 @@ "repo": "bdarcus/citar", "unstable": { "version": [ - 20220217, - 1606 + 20220309, + 1552 ], "deps": [ "citeproc", @@ -11728,8 +11801,8 @@ "parsebib", "s" ], - "commit": "b84cb375933053cf3e5408f0386034e8dabca5cb", - "sha256": "0hgyl2akvm5z13x403hmk3xyybbdp40sxbkf97m81k9y8m5fz7lz" + "commit": "02323c6f9bad12aa3a53f6f6b9d7f714ddf6e773", + "sha256": "0izwc82qvssfkjlcp36dg773ggd2fdlflap83fgzyhldlnmf3k6c" }, "stable": { "version": [ @@ -12179,10 +12252,10 @@ }, { "ename": "clj-deps-new", - "commit": "733832bb1f0003cab6ca52ebba6cabc1bdf68659", - "sha256": "16jmdiavl7pg54kflfs1dkpislc6wbmnxxf0qh9idf584kkl1g1m", + "commit": "74d96277724fddaa7dbaa77795a02d4a97e499e6", + "sha256": "0q02wnv7i7bxz782yf5sk7lgisrh6064hagmyngpzx1dw1i29wcp", "fetcher": "github", - "repo": "jpe90/emacs-deps-new", + "repo": "jpe90/emacs-clj-deps-new", "unstable": { "version": [ 20220221, @@ -12203,8 +12276,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20220213, - 1906 + 20220315, + 2251 ], "deps": [ "cider", @@ -12217,14 +12290,14 @@ "seq", "yasnippet" ], - "commit": "542225248e8d27111d6164292b37058ad5194984", - "sha256": "1xzr0yhsp45g4z634h7an5avndz8azz53ggxyyina06xrl1d2845" + "commit": "f368c56c83843396b160440f472a661a3b639862", + "sha256": "0xp17gc5ipm7jzyx8smnq5z3hb7nb36c11f5c637chg3qdhw1r8m" }, "stable": { "version": [ 3, - 3, - 3 + 5, + 2 ], "deps": [ "cider", @@ -12237,8 +12310,8 @@ "seq", "yasnippet" ], - "commit": "542225248e8d27111d6164292b37058ad5194984", - "sha256": "1xzr0yhsp45g4z634h7an5avndz8azz53ggxyyina06xrl1d2845" + "commit": "f368c56c83843396b160440f472a661a3b639862", + "sha256": "0xp17gc5ipm7jzyx8smnq5z3hb7nb36c11f5c637chg3qdhw1r8m" } }, { @@ -12465,20 +12538,20 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20220222, - 827 + 20220307, + 1903 ], - "commit": "4a0b598c340143c5d9d39e36d32cee9693ec0e32", - "sha256": "0rias19vnxpf190mijncbajym07p3pslhxssq3kf1pwbx256aa1w" + "commit": "c339353f9e649b3af084f1bb6ce759e614a2f243", + "sha256": "062vkzp5y8f8afz0rbgagqrsmmfnwmhkg7n9ainqp7m2h52qqzbb" }, "stable": { "version": [ 5, - 13, + 14, 0 ], - "commit": "0e886656c83e6e8771f748ec698bb173adcb0968", - "sha256": "1ikl29rygr1habcsglz07m4ihd4ivi732kkzg8q676ihf367wa9i" + "commit": "b7d08b87f6a116ff47b33ee857926b60c66c3ab7", + "sha256": "0n7v6hx21f8x37gj388wnff38aqpzxxv5g8vxavp74vr3cbagsnn" } }, { @@ -12495,20 +12568,20 @@ "deps": [ "clojure-mode" ], - "commit": "4a0b598c340143c5d9d39e36d32cee9693ec0e32", - "sha256": "0rias19vnxpf190mijncbajym07p3pslhxssq3kf1pwbx256aa1w" + "commit": "c339353f9e649b3af084f1bb6ce759e614a2f243", + "sha256": "062vkzp5y8f8afz0rbgagqrsmmfnwmhkg7n9ainqp7m2h52qqzbb" }, "stable": { "version": [ 5, - 13, + 14, 0 ], "deps": [ "clojure-mode" ], - "commit": "0e886656c83e6e8771f748ec698bb173adcb0968", - "sha256": "1ikl29rygr1habcsglz07m4ihd4ivi732kkzg8q676ihf367wa9i" + "commit": "b7d08b87f6a116ff47b33ee857926b60c66c3ab7", + "sha256": "0n7v6hx21f8x37gj388wnff38aqpzxxv5g8vxavp74vr3cbagsnn" } }, { @@ -12798,8 +12871,8 @@ 20210104, 1831 ], - "commit": "a2513bb55e05bb503f6c0a0122eed17a33aa1354", - "sha256": "0jgjn78y3kmfmzyhvp3j0lclaxfpa8im7d8gvvzr5qv1j83dprdr" + "commit": "c8a3c544443e81e01de6a41ba84abb3efcb509e0", + "sha256": "0rv1hv4d45s1zigd4ayfp6lwf7wz01jyl5hj9q8jvyfzh0wamixv" }, "stable": { "version": [ @@ -12807,10 +12880,10 @@ 23, 0, -1, - 2 + 4 ], - "commit": "352ea99bbacf6e57bca47f43725d98b2a4a0b87d", - "sha256": "1dg1lk5f8qpx0scp33yqvbmwxaci484bawm70l9wkx8q2zjsljsh" + "commit": "66ba460810afdc0e0f65c20b1bc057a204acc82c", + "sha256": "1qyddyxpdmyshzsax7gk8mgkjij5pnvnifd0239s4pr009x4pjyb" } }, { @@ -12962,11 +13035,11 @@ "repo": "astoff/code-cells.el", "unstable": { "version": [ - 20211014, - 738 + 20220305, + 1320 ], - "commit": "f5150fc213da470da2d4fedaa4b86f476167b235", - "sha256": "1p8a4ga6pysqd41frzzpi0a5bv1a0qmn136srfqqkkg60y5rlnl0" + "commit": "8660bdeedee360e5eb632f1eb1356eb09d7dfbee", + "sha256": "0mvfsdlhc3znc0d2p8vm7apkbpvbs688wmwvd0sms33qly53f546" } }, { @@ -12995,8 +13068,8 @@ "repo": "wandersoncferreira/code-review", "unstable": { "version": [ - 20220107, - 1355 + 20220318, + 1429 ], "deps": [ "a", @@ -13009,8 +13082,8 @@ "markdown-mode", "uuidgen" ], - "commit": "ced8a31f331c034b00165d1eb6ac76f5a21db9b6", - "sha256": "1yrgkj634p9hf1jrlcy6f4yydyc4z5ig7pq14yxhfcnw0cf8ksr6" + "commit": "3af92f0259378c2b2c31f7f03bd677fa1017b3a3", + "sha256": "03dqnm50v0ga7d0m8j6f5k73p933b4cjn818cn1qfgjlxbawa8ah" }, "stable": { "version": [ @@ -13210,14 +13283,14 @@ "repo": "ankurdave/color-identifiers-mode", "unstable": { "version": [ - 20210607, - 1842 + 20220318, + 1558 ], "deps": [ "dash" ], - "commit": "fa42b60f9e84995a8109a49798c0b4c618fc1ed3", - "sha256": "12ybgh8yzi62lw0c7yakgvfdx45sr11szyqdlf58n2pbkz9sxkmv" + "commit": "05dfc97b004f1a962313710d81cffae3b2f9c98a", + "sha256": "161mn6b14kbpf4lyqw9ijxqir8qxbz9rr7ydx03z6shjfp7ciz54" }, "stable": { "version": [ @@ -13462,8 +13535,8 @@ "deps": [ "s" ], - "commit": "fd84b0e32a0faa450df6035fb94ce96aa777b237", - "sha256": "0gb30gyadxvc47zrvkjkjil3qj6mxavxagzyp21jlxx7fn3n0fic" + "commit": "d4958edf2a4a8cbe55097320e191045d496847d8", + "sha256": "1yi1ha4iyfb0362x7wk65lksh6377mga0xyva65s035i75r4k05n" }, "stable": { "version": [ @@ -13797,11 +13870,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20220110, - 2248 + 20220310, + 2313 ], - "commit": "c25f1fbc3850e36e6521b77fa1641d5583365d8b", - "sha256": "1ski2dv8ndlrpad08xg1bz9fxy8lj3c27z8i0vlc96x40nc788bh" + "commit": "18a662082948b5aa9bea6b4ad752e027fc12aeb5", + "sha256": "0a53an8q2vgcsfvbcz3cnhpvzkc3ah79vhq16y9yd78x1zdc5wb2" }, "stable": { "version": [ @@ -14041,8 +14114,8 @@ "repo": "cpitclaudel/company-coq", "unstable": { "version": [ - 20210708, - 2357 + 20220314, + 526 ], "deps": [ "cl-lib", @@ -14051,8 +14124,8 @@ "dash", "yasnippet" ], - "commit": "382db93374380e5db56f02934ee32bbe39159019", - "sha256": "1vlbw54a02qy77ad2qgd6sy7y3b6x1y1nm3bjxcd7f67hnncjg0p" + "commit": "a6e349e0131f676a885bd14c908fd26054b2df42", + "sha256": "1qws0a0ia039d6bv2sbjsdl1ry28y9jrv98qnp5jcm7jfb2jmvsp" }, "stable": { "version": [ @@ -14255,8 +14328,8 @@ "emojify", "ht" ], - "commit": "01cbc9bf1b073abc5cf567479a3cf4b6f929d474", - "sha256": "115smqwz19c4pxh3asg046kq0pmdnwj2qz1s36h833kzz1ig3rn2" + "commit": "34f33e4bd1fc11da306c1d159def96cd92e4c00f", + "sha256": "0v6j7xjl5gs513gydxj2hn5f17p6y6fqbf8ik8v5ac5lifhwcn6q" }, "stable": { "version": [ @@ -14359,8 +14432,8 @@ "ht", "s" ], - "commit": "122cdecee0a269b014471875f3eb29cd8af96d6e", - "sha256": "1wnh11m9pqlin58izx5w72a807pi59dj7mfhl5jfvsk7ds29yb04" + "commit": "36e9af842f5d6910a6235eab6c7f815466454e0a", + "sha256": "0207n6jx2fr8k16pp39pxy67n3sycs670i4azwbhri2i4z9mx0ms" }, "stable": { "version": [ @@ -14922,8 +14995,8 @@ "company", "phpactor" ], - "commit": "585862496e8ac9f496c0c99c5b97af456cb1f73c", - "sha256": "1y5g5g2d5g9xiw3vwxqnmz58gyfn9hybpfzcjhyjhnjma74jkqfr" + "commit": "34195f1533209e2ffd0f898a69c7db2bffd1eabe", + "sha256": "1xp4v5dm2x31xp5rq80jii2y8nprqd3jcmzpc0dp9xk3fq9hbq7l" }, "stable": { "version": [ @@ -15144,8 +15217,8 @@ "company-quickhelp", "popup" ], - "commit": "5bafab30e0edb99a3064edf1e9265a416c632a71", - "sha256": "0nbncspzxrqqn7gsaapwy3dqd00gxzzjcf7xl0i8g1glsw4nwabv" + "commit": "fe68967d901ec284022fd67d296866795476e60d", + "sha256": "1586vwl280z463h9yb5ijjhwi3dmizcmwxy54rh2pd8yljgxsjlm" }, "stable": { "version": [ @@ -15317,8 +15390,8 @@ "company", "solidity-mode" ], - "commit": "f0f68b038c5edf16c85fc8ca58537e1c6479738b", - "sha256": "0hfp07bg348ppkgp5wca1sqpcprhc6jyxkpb1pmsm0vrifb3261l" + "commit": "20fb77e089e10187b37ae1a94153017b82ed2a0a", + "sha256": "0lyfhb4lirk08jc73c2vhlskfb496vnh0h906a74wz2pwg84q4m5" }, "stable": { "version": [ @@ -15840,8 +15913,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20211123, - 357 + 20220315, + 1533 ], "deps": [ "dash", @@ -15849,8 +15922,8 @@ "pythonic", "s" ], - "commit": "7a34e06931515d46f9e22154762e06e66cfbc81c", - "sha256": "0n1w3gx7xv84nc5hz8w1ab2ml45g64jx05cwrflf5kqmx496phms" + "commit": "9c28d7a853b4b4bd00215cf7f07856c1563f2ad7", + "sha256": "03r9f2pvxxv6nlxgljnd5cmnlvsykypdl38cfi79iw3spr0lcrxn" }, "stable": { "version": [ @@ -16004,19 +16077,19 @@ "repo": "minad/consult", "unstable": { "version": [ - 20220227, - 1400 + 20220308, + 1010 ], - "commit": "782a90da29568a79259464c1c11854a3e16ea36e", - "sha256": "01f16chhk4s53xmrl6c3a4nac8qmx6cdwlmxkhnc7a032njgd9bi" + "commit": "800824601b610016066991d6e2dde198d4b0ad8f", + "sha256": "1mravx5aapy8bcgk6nvi1jvb5jgl7jsn7pd7br7v7fqadcp225m6" }, "stable": { "version": [ 0, - 15 + 16 ], - "commit": "e1e17965a98515a620c439be1eb28cd125f984a0", - "sha256": "0cfj8h0k05947cazsr95yy75shs0vpy59sa41f31xbw00q9l48q6" + "commit": "800824601b610016066991d6e2dde198d4b0ad8f", + "sha256": "1mravx5aapy8bcgk6nvi1jvb5jgl7jsn7pd7br7v7fqadcp225m6" } }, { @@ -16133,6 +16206,24 @@ } }, { + "ename": "consult-flyspell", + "commit": "1750efda60a7c884f89ef22ed00d89a41d245272", + "sha256": "0n1kby3hs1cn48z5qsc9dh1897rpd0paji8cyx7pssncaz8mzhfy", + "fetcher": "gitlab", + "repo": "OlMon/consult-flyspell", + "unstable": { + "version": [ + 20220227, + 2210 + ], + "deps": [ + "consult" + ], + "commit": "2e7b99dec6c51259d0bffbae3e863f4054dd2346", + "sha256": "1cj3ahxdihi4v4x5qsn1lgacl7dzswy79qli23zrkxaw78x8is0i" + } + }, + { "ename": "consult-ghq", "commit": "513921c684fbab5ff57e47c509a89b15d7d3a5ce", "sha256": "091018x5y28lbffjrb75a5r2cvprlhz0jdj371nlyvrpsdgdfs4f", @@ -16205,27 +16296,27 @@ "url": "https://codeberg.org/jao/consult-notmuch.git", "unstable": { "version": [ - 20211229, - 420 + 20220302, + 229 ], "deps": [ "consult", "notmuch" ], - "commit": "0b7fae73f51bc855078dca9593c8c7f67fe2ed98", - "sha256": "0kiwc7qbhkmaj5hlarxsv3gy3gikykvxklgqkq8f68jjfgb0hdag" + "commit": "883527072b56bb09dd921800bca13860caaa4ffe", + "sha256": "0xzpkpf2sb89qkbqcrwddp4pgnzdjp40bc5da22jq9r4pf67y7qs" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "consult", "notmuch" ], - "commit": "a5509cfd0c9f69327ab63fd18e548b7f39be16c8", - "sha256": "07qbm5p4cfrrwyp8a5sw0wkdhnqbappz4xjlnjil2krhj9g39q78" + "commit": "883527072b56bb09dd921800bca13860caaa4ffe", + "sha256": "0xzpkpf2sb89qkbqcrwddp4pgnzdjp40bc5da22jq9r4pf67y7qs" } }, { @@ -16236,15 +16327,26 @@ "repo": "Qkessler/consult-project-extra", "unstable": { "version": [ - 20220222, - 1825 + 20220228, + 843 ], "deps": [ "consult", "project" ], - "commit": "b2a7062251b101aa9d1ba6c1f3f65c69ebdfd784", - "sha256": "14ji1vjj265j0chn3fk9ncm4l66j6jq0g2nq5qz94qnpk1fadf8s" + "commit": "897f2f71a94ce1b72c3bf823e14791a332befbb7", + "sha256": "1c0nllj6hhgvjf7zzy44iacnl29flg54ahb26r4bi9lip8aw65xs" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "consult" + ], + "commit": "fee931a63317bcc183c34a84b758db561db3f2dd", + "sha256": "1ybgwf56ydfgww1yhbxpipknvi01h2svpjh05b8x825qmplslidp" } }, { @@ -16255,15 +16357,15 @@ "repo": "OlMon/consult-projectile", "unstable": { "version": [ - 20220225, - 1544 + 20220310, + 1840 ], "deps": [ "consult", "projectile" ], - "commit": "758cfc259ae83421d008731642ff1ada41b7b514", - "sha256": "0fsqz88xplbkr6hl8zwmg65s3d8jjfnvf2bdfv795i0n8lsprl3c" + "commit": "df85d0f83c323f4672221c9e78d84027bcb9d96f", + "sha256": "178405z6vasr44p1rg1n1ar4vwbvp04n5fnyma1j327lp8lbppmi" } }, { @@ -16286,13 +16388,13 @@ "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "consult" ], - "commit": "1b21fa157ba40fcfeecd0a10c5c82ecfb87aee53", - "sha256": "0bfvxzvyppkqfdj4cm5haqgkd72wrh5l7x8ldnpycapqyjpv9pip" + "commit": "228306eeda8c57db45609ca068f60ee433367c17", + "sha256": "0rxfxws0d65sdjph91g77a2sy1k90y9hgyps4da0a6kvbm3zprgg" } }, { @@ -16599,6 +16701,24 @@ } }, { + "ename": "corfu-doc", + "commit": "78440eba5512b37243de24364afd5d7f46f8fcca", + "sha256": "0vi12khc9c9gcz8lagw75zkx377f7f6qdlgjr6rg37nd3ip4pkj0", + "fetcher": "github", + "repo": "galeo/corfu-doc", + "unstable": { + "version": [ + 20220318, + 1052 + ], + "deps": [ + "corfu" + ], + "commit": "95fdae5755e6c88cf77b409b555290c36961ec6c", + "sha256": "09lmvb88nj7ivsr6gh93xhbfav80pm69z3dgnifnn1g2gfjnjjka" + } + }, + { "ename": "corral", "commit": "7b0d7e326f0401de0488b77d39af7bd7b8e8fdd4", "sha256": "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da", @@ -17105,8 +17225,8 @@ "dash", "ivy" ], - "commit": "6ba0f2ac7e4e5b8c1baec90296d9f24407d8d632", - "sha256": "1kp83cql4gn9g3d8g5mw3mrmpfj407kzpsi5wmwl1jr1pmw3v3jc" + "commit": "0f790def6ac2b5a84d01eed47a7ee53619a8f5b9", + "sha256": "1p15g5bc1pgibvqv6akp4dmqzysws26dhpnxgswmclrq0hy0qwjx" } }, { @@ -18603,8 +18723,8 @@ 20211111, 1407 ], - "commit": "11a9e73a4e67b162b10d3db70b513b4d14bb7a43", - "sha256": "0dh67z7aq7jq8bjdi1k7j1c3sb2b9xm8p147qv4rlllfgfqxnmig" + "commit": "518cbac89898a1b8c3390c82104c1b250a60a259", + "sha256": "1z130p4ckrp5lshdfw8k979wyj4ch2n654sffbixhcf4fk0xbfb0" }, "stable": { "version": [ @@ -18755,11 +18875,11 @@ "repo": "rails-to-cosmos/danneskjold-theme", "unstable": { "version": [ - 20220214, - 552 + 20220316, + 1101 ], - "commit": "eaf1c6a99cd1697a805a3f04325906412eef8171", - "sha256": "1nb34gmzlypq3yccm4dwii86pn6k75hb9y50ldsyx3x93zwcm3dk" + "commit": "054c0b9bc9cefb53a4065096e66707d20885c461", + "sha256": "1bw9ng01d0y6ri67w42z8ql37kxxra59v4cnra94s00abc212lja" } }, { @@ -19175,11 +19295,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20220208, - 915 + 20220307, + 1807 ], - "commit": "7ae46300df5d22d3941ff9f10bc52d232985b628", - "sha256": "1qv5vffbf0wjymdhabc3jl4h9ib9x38swabsjs23rm3a5jf9b091" + "commit": "d40ceaff2d26f7213eb21f6a39e58c72642ad737", + "sha256": "1fiwnld8cxc98f3syss21wqw1vxf1z8fkxrkcmvp6xsydhx23z7p" }, "stable": { "version": [ @@ -19227,8 +19347,8 @@ "deps": [ "dashboard" ], - "commit": "cde30ac64006f79be71c9e59eda2218d725e2bee", - "sha256": "0272j1wr7399zfpl0vdk397dmi1ll3bqrv5h6rrbwg8vvmfk01vj" + "commit": "08b621b78f193471025c02e4cde348010db754d9", + "sha256": "0fpzk5la94dppxvnf5klvglhy2qvza3yxfkdpm1k1sn282pc1230" }, "stable": { "version": [ @@ -19508,15 +19628,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20220227, - 1955 + 20220305, + 522 ], "deps": [ "ccc", "cdb" ], - "commit": "ac0777ace98b6e8a8a10aa2302d51efeaa6f7893", - "sha256": "0r4ichirlmw6hsgq74kwnw235a85lkn528322rvd1zl1iir0ffsc" + "commit": "5c209e0306364118abf9d9440d7b8b9613183072", + "sha256": "1p7mwlnhsblr9ilns4vbadlbr1bz7w81das54znw6cnv4yjjzdan" } }, { @@ -19701,11 +19821,11 @@ "repo": "sanel/declutter", "unstable": { "version": [ - 20210904, - 2039 + 20220310, + 2101 ], - "commit": "e08195e2f5691ad0ec9090d7edf550608e13fcfa", - "sha256": "1hjdjd0nmknv8yppda89hsgkyvk52zcwz92cdxsng87rlp9hwddv" + "commit": "8ac50a64dc3a12440d98bc1556b5c7727fdf51ed", + "sha256": "0kmkb5gfldim2nqkb4mnjllp1nvkr7c3j1zk84crfyxy45ln7lv4" }, "stable": { "version": [ @@ -19837,8 +19957,8 @@ "s", "wiki-summary" ], - "commit": "70dd874c7cd8fef9de17984f1e360fe1d9f0d3e1", - "sha256": "0q1z1p4wmqaa0jdkw98brnvz7nz7nwgwpfcwa7ildjldl8k8xb06" + "commit": "ba801ce1851a83bad2b962c47aef1f86f56286dd", + "sha256": "0psf7cnps4qkxz48cqvkgqcqyll825d5zdlw297v670rjjxbpclm" }, "stable": { "version": [ @@ -19983,6 +20103,36 @@ } }, { + "ename": "demap", + "commit": "3cede53ed6d8133241ea0a1949f4ba5ed51805c2", + "sha256": "1syza8lkph1p7wp40pcb46pziqbq7nw0jjh6563rcicngqyzhngc", + "fetcher": "gitlab", + "repo": "sawyerjgardner/demap.el", + "unstable": { + "version": [ + 20220317, + 829 + ], + "deps": [ + "dash" + ], + "commit": "cb119fa912699a7697b958a467e21f655b95a741", + "sha256": "027fyjmxjdskamn3js1jsyiqbrkk9c4qp79fnrf3p73xnci9570m" + }, + "stable": { + "version": [ + 1, + 3, + 0 + ], + "deps": [ + "dash" + ], + "commit": "cb119fa912699a7697b958a467e21f655b95a741", + "sha256": "027fyjmxjdskamn3js1jsyiqbrkk9c4qp79fnrf3p73xnci9570m" + } + }, + { "ename": "demo-it", "commit": "1dec5877db00c29d81d76be0ee2504399bad9cc4", "sha256": "063v115xy9mcga4qv16v538k12rn9maz92khzwa35wx56bwz4gg7", @@ -20791,8 +20941,8 @@ 20220218, 1541 ], - "commit": "8db04f40c269127919e1081c658f93bf7fe395f5", - "sha256": "1j6ym1bbld1bys5q5pm0rrx1m9922rr7fw82r2alvzrb78my660i" + "commit": "8f517bbb04411a125860ce4fb169bcea06b364e9", + "sha256": "0frffd2b7q22xdvk9li9vivd810sy6xkw001ajc0q7c70wxj0ksk" }, "stable": { "version": [ @@ -21231,11 +21381,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20211205, - 712 + 20220317, + 1839 ], - "commit": "b4a5341e22efed3c1a261b9b5098d7c429d655d1", - "sha256": "1i0lc6sq87yyg1xzj2qqk3rld9j0mvbl7vhlpdpk75g7nlfi2w8w" + "commit": "72ebbe2b3d2e04dbfda636fa114d4f47835ce044", + "sha256": "0z53ymlbyan542mzsjkgab29czx2zk05qgady99kg40rik78599q" } }, { @@ -21458,15 +21608,15 @@ "repo": "stsquad/dired-rsync", "unstable": { "version": [ - 20210806, - 850 + 20220313, + 1533 ], "deps": [ "dash", "s" ], - "commit": "7940d9154d0a908693999b0e1ea351a6d365c93d", - "sha256": "0fhbpy9y89jm03hjqp317h0aj9iasbdan0h829rhjhga11x8rw2y" + "commit": "b327971d197e95e9b78e7ef92539bd4196a12797", + "sha256": "15bkjvrdyn1bpvj0lpxm370cl7phyypmpswc80qngx2axdqbr0a2" }, "stable": { "version": [ @@ -21489,14 +21639,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20210608, - 2340 + 20220317, + 1546 ], "deps": [ "dired-subtree" ], - "commit": "6be2dad2782e28dae2f50c0cbfd82042b2b6ba8d", - "sha256": "1lqnd64ga7g8dzzgfn2bw00y65hlvlgxnj3bk7j6qr5wzkz6qp52" + "commit": "aed7e44b5a4ef37fa7be6210ddfe73bb724bac6f", + "sha256": "1wc4lb7rpim4npjl7aszc1ddpsqf2an8v7j4dasxlvdq0n2zz6qn" }, "stable": { "version": [ @@ -21834,11 +21984,20 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20220223, - 1713 + 20220318, + 1804 ], - "commit": "9bb39bef29a41162e00a563da4966b6a368e6b5f", - "sha256": "0wgyd66lrvl8i6sn7ar9mvm06lq6h57asm3sfhkiq0qf65w7bwhn" + "commit": "5170e712fecb5b6ef1e537fda3994373f230ff8b", + "sha256": "1syz893g4cvlz3138f7yyazsq4rd9dblwlgckhmwiajl16hl164d" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "f010dc7a081a61588c220fb815f023544f444493", + "sha256": "0nbbj23ha9v03rqxxc6y030cvnyadk9258x287623gvy2s5p3bv0" } }, { @@ -22053,6 +22212,30 @@ } }, { + "ename": "display-wttr", + "commit": "a60a6643b6d8a5691d48b47c31eb560e0f793d26", + "sha256": "1lhnv2cqff22z7d7n2sx7pqvskyg5fbiax2dhfznf2xjmqh22lzi", + "fetcher": "github", + "repo": "josegpt/display-wttr", + "unstable": { + "version": [ + 20220316, + 213 + ], + "commit": "2cb36df32b0ecf381185126a969b7282af5a0e01", + "sha256": "03lb0a9w9rgiqar93crh4h4q3m7d3yk9hn8y5h806h56lzrp54f2" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "commit": "2cb36df32b0ecf381185126a969b7282af5a0e01", + "sha256": "03lb0a9w9rgiqar93crh4h4q3m7d3yk9hn8y5h806h56lzrp54f2" + } + }, + { "ename": "dispwatch", "commit": "580cee72ac9871f8f256069b371f7fb66367a048", "sha256": "1cq5lbh3r9jjwixn2q30gryy4j4l8jb70nkhsjbaln1c3jdwrf9p", @@ -22216,20 +22399,20 @@ "repo": "muffinmad/emacs-django-commands", "unstable": { "version": [ - 20191107, - 1830 + 20220314, + 1545 ], - "commit": "bef7ca848d6d1721ebb22b181c50dcfbef16e434", - "sha256": "1zd98xkbxvikp4sf5nxf6vb2sk7a5s3q9ida0l5f4z4jc48xx5zm" + "commit": "7510c0f068bf214ad012c203d68e03ff4262efdf", + "sha256": "0d27cz3i78n5n4bhmkzr6yg2mz5hrpf0r25m71176d6v0ckq7pwh" }, "stable": { "version": [ 1, - 3, - 3 + 4, + 1 ], - "commit": "bef7ca848d6d1721ebb22b181c50dcfbef16e434", - "sha256": "1zd98xkbxvikp4sf5nxf6vb2sk7a5s3q9ida0l5f4z4jc48xx5zm" + "commit": "7510c0f068bf214ad012c203d68e03ff4262efdf", + "sha256": "0d27cz3i78n5n4bhmkzr6yg2mz5hrpf0r25m71176d6v0ckq7pwh" } }, { @@ -22465,11 +22648,11 @@ "repo": "ideasman42/emacs-doc-show-inline", "unstable": { "version": [ - 20220211, - 548 + 20220314, + 57 ], - "commit": "5705f8d6f5583d50fc0497a88f06fb7c84a9ddb0", - "sha256": "189bahsiyv7j0h1i1nfilr5rp2bihfgi19lipdxmixfmfv8fjy6j" + "commit": "42954390621f281930a70104162db1bb70532a1b", + "sha256": "0nvk10nh2mkw430zdr0m2cnqzvi48ah32k8zay4lh0qgz4jl2kdy" } }, { @@ -22517,8 +22700,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20220225, - 1528 + 20220315, + 715 ], "deps": [ "aio", @@ -22529,8 +22712,8 @@ "tablist", "transient" ], - "commit": "498ffb2ba51fce12cb543caca0ecbc62782620d3", - "sha256": "1ixzi9lsjra01srvkd30jvryhbgxl9s49mspy2f6975zna390m60" + "commit": "674bfb7e24da3f9d0fe926945dd0625e2c15e50a", + "sha256": "1fzlxqff0a4bw3l6vdki4fdw107wd0vp0l6asaqz9kkgv9wlffq0" }, "stable": { "version": [ @@ -22668,8 +22851,8 @@ 20220220, 1439 ], - "commit": "11c43de04b128b7638cd98a1e80be2b661c18fbb", - "sha256": "0nmybfc9qch0jng06qgs2xb41dl9v52ckc9nc20d7hv3x36w555x" + "commit": "b63a3d12b7dea0cb9efc7f78d7ad5672ceab2a3f", + "sha256": "0cnsm9xc5lqfx0vgv0fcqadwr8mnj3s9bqldrh1s6f26q9bapncd" }, "stable": { "version": [ @@ -22732,8 +22915,8 @@ "deps": [ "s" ], - "commit": "49d0e77aa9a1c6a649c0d45030111b26222f960c", - "sha256": "0w1jjm9p2332ql8k32x2i1f51df8wqz68y07dqipz5d3h4ysgwfl" + "commit": "80f534767abf5d9037935bee90653f7bf0b064e6", + "sha256": "028s158fpfg9grdmsf1kw13gq6wl2bfshlp2ax8i8vk33gxw7sx2" }, "stable": { "version": [ @@ -22893,16 +23076,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20220218, - 1547 + 20220313, + 524 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "d9b64bc56283c7816f8124dcb3a5c7ea22732643", - "sha256": "0kk0yxcb26igkgqasrp9h78k0sll9by9m07dydd7lhkpwdg4dd7r" + "commit": "b95340d24a37ac8b76b7934ff9508ff58f577a96", + "sha256": "12f03mpm7iqas25h8miqzd3jpf16flk5kiw3yhmqb6lpinaxijg8" }, "stable": { "version": [ @@ -23200,8 +23383,8 @@ 20220209, 724 ], - "commit": "2c9efdae8b7b9a8e57dfd3aa1c62426a262e9eba", - "sha256": "1wblaspw1yb2xgymlajjqap5rkj6danrsh8hnkhpcd1x9q49llis" + "commit": "e725c9e790c9e9cdaccdb35faaae9d5cb16ddb89", + "sha256": "1hj40c203a5mj9xngsgw5yihd6pcvr91aggqa0kbd4j16fcsvw9j" }, "stable": { "version": [ @@ -23335,16 +23518,16 @@ "repo": "pavpanchekha/dropbox.el", "unstable": { "version": [ - 20190918, - 1629 + 20220314, + 1638 ], "deps": [ "json", "oauth", "request" ], - "commit": "5e0c954a6b819fd3a22b463cce3825984f9ef691", - "sha256": "0z1iw5rzdgipqhx4bvshjbrqqr3wyqy75frwmz34g7s6vll1ip0a" + "commit": "c048faad0be24e8fa31974f08b710a87cf5b668c", + "sha256": "1d43ynlqj60bhc5cc39b02440gdvvbw8hyppg7xs7wcljyb54jxd" } }, { @@ -23462,8 +23645,8 @@ "repo": "dtk01/dtk", "unstable": { "version": [ - 20210926, - 541 + 20220309, + 759 ], "deps": [ "cl-lib", @@ -23471,8 +23654,8 @@ "s", "seq" ], - "commit": "f6a94d86263041f9a172cb7df90e00d1ec44604a", - "sha256": "1q29lpza8rd209zh0n04ia6n359p372czkm57hhmvcd9cmi91fc8" + "commit": "56b339bc76926defa775c406113e306ec6d31b36", + "sha256": "0g33sn95zk4fp1jyh472k3qyvbm062njbxkmnv0qavrbli097q80" } }, { @@ -23632,17 +23815,17 @@ 20210909, 1010 ], - "commit": "c967d8a4880732f2f7cba39d4f283154c5ef914e", - "sha256": "079xxy2569zrfy2r621bb25gw99dlmwmys60qyrxvn01mb9ah9ql" + "commit": "9b8c6cb907d3516014450317304e4ef92853b04a", + "sha256": "1cv856hh3wqzsvw8qbbvm57j7dapldz73h8af5n7dv65gjrvkydg" }, "stable": { "version": [ 3, 0, - 2 + 3 ], - "commit": "f8c75a43bc0a8e190727161c2f67ae643b884542", - "sha256": "1spgn3sjygnwq95ybxaj5dg9s5hyp6v5dwl240w3m4664blilz4z" + "commit": "68c36597dfb99187ccbadf578988deaf690c4e25", + "sha256": "1ndn560fg0fg8n3wplmkg5px69h0g38pyma9wik85cmmqfxry14k" } }, { @@ -24282,26 +24465,26 @@ "repo": "leoliu/easy-kill", "unstable": { "version": [ - 20181114, - 2330 + 20220311, + 1506 ], "deps": [ "cl-lib" ], - "commit": "2a6309d98aa6b71df6bbbcdf15cab3187c521a6b", - "sha256": "1j8hl0f52fqb21775xn94sf9g12yqyg6z0ibgmxzmnl02ir4xr86" + "commit": "f9b450a87c41e5ef616df565ed158cb236aa5189", + "sha256": "05drsb7kaksdsk1v0i5gip255rvlziirl4wcana08cpm9v9p4m21" }, "stable": { "version": [ 0, 9, - 3 + 4 ], "deps": [ "cl-lib" ], - "commit": "e3b2442e2096cefff94ea8656e49af07fee58f47", - "sha256": "0r56nqrj6iaz57ys6hqdq5qkyliv7dj6dv274l228r7x0axrwd9m" + "commit": "2a6309d98aa6b71df6bbbcdf15cab3187c521a6b", + "sha256": "1j8hl0f52fqb21775xn94sf9g12yqyg6z0ibgmxzmnl02ir4xr86" } }, { @@ -24398,14 +24581,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20220121, - 2236 + 20220314, + 2256 ], "deps": [ "parsebib" ], - "commit": "4aed0c3a34e5faa95435e03be043f9a843971560", - "sha256": "13h94383lqfk2gcrfd7czdm46q38zg8bm8dyk8lcbyi7b60rczbg" + "commit": "600b5e3d3dd98ba4017ad257470424b4507b4e59", + "sha256": "0mybyw2hh104z53lnp2pvcm9sg01wdad0hqyxl6msrq12n8pkr4x" }, "stable": { "version": [ @@ -24919,15 +25102,15 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20210830, - 1025 + 20220301, + 332 ], "deps": [ "cl-lib", "nadvice" ], - "commit": "3c03cef3110024016c688553733cdc3694a8a799", - "sha256": "1vyl3i6dgi8y3rc5a4n2hhghiri0914k2j7w7zkji8brpl8i5f0g" + "commit": "1d4acc3ec73609990eabacb59c038708bc401003", + "sha256": "1blx38fyfl1zgfh5k1mgsnxxjlski7f0n890kiyjbaw2ba9zzmgr" }, "stable": { "version": [ @@ -25082,8 +25265,8 @@ "repo": "sebastiw/edts", "unstable": { "version": [ - 20220220, - 1753 + 20220312, + 2132 ], "deps": [ "auto-complete", @@ -25094,8 +25277,8 @@ "popup", "s" ], - "commit": "603e182f8f0a4140e6cbf71c2d73673cd08028ee", - "sha256": "0zvbahgm910sdasq1404lyxxan0mrcpzcjwm64jpzinx2i0bai5j" + "commit": "d815148f22ed194116dcde63a0150919e380ecd6", + "sha256": "11x1607fcpxzrf8kqi364qiiffbpwpwld0w9x0mjfsphyvdpg62g" } }, { @@ -25290,8 +25473,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20220123, - 1406 + 20220318, + 1054 ], "deps": [ "eldoc", @@ -25301,8 +25484,8 @@ "seq", "xref" ], - "commit": "bd6a1cccfe9c0f724772f846d1f4a9300f40f88f", - "sha256": "094kk4xprnfx3x94ij3fxc6sh877m03dwx35qmg1sh8capx28zi3" + "commit": "f77518711507810b779d87190d0ca0183fc02e10", + "sha256": "0jab7f92blc4gh5bpg1vcc42ly5m29zgl7ffymssypk32vbig0sd" }, "stable": { "version": [ @@ -25432,11 +25615,11 @@ "url": "https://forge.chapril.org/hjuvi/eide.git", "unstable": { "version": [ - 20220119, - 2125 + 20220316, + 619 ], - "commit": "b0aab3735f3333ba0b429e669730ff22c9d59da7", - "sha256": "0ms8a4wrkf98p0fjvy4fck0285gx1fdr8nwry0c2p4s1afj48kcn" + "commit": "23c78f4850f44d18eef66c694e7e05882d841ba6", + "sha256": "1icj34anks7f0cjdqc1kgj3bva3bnhily5xc5mzx21w0iciqvpk6" }, "stable": { "version": [ @@ -26007,11 +26190,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20220209, - 2301 + 20220305, + 1234 ], - "commit": "ed8de0e9d218723f45200542b21a68dc8440f278", - "sha256": "0q1vr5ks04qjzml13wzmzkvm1za3faq9m2y5f3g0z254fh82cbbb" + "commit": "70fd716e673b724b30b921f4cfa0033f9c02d0f2", + "sha256": "043516j84q0jx558frk8afavdfr52pvwb23viyb8m54422z1psxl" } }, { @@ -26056,19 +26239,19 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20220221, - 2055 + 20220313, + 1510 ], - "commit": "7be0cb16ce5d9d3139b4ed1724ac6d8292935267", - "sha256": "0yb8rpv6yi47kdk6gaav063zqq3l4jlyb4wk95abwzkgjcmjc4ky" + "commit": "bdc729893ccfc52b2b7369624111cc175e4ce0b9", + "sha256": "1yii555k43v94cqlxv2n9k1d6pz3mjg1sc1zgpbnx5gqhzfk7m5r" }, "stable": { "version": [ - 0, - 11 + 1, + 0 ], - "commit": "f7cfdb8648624917afec0a687c6fa92ce8d7958f", - "sha256": "10l9gdxk6l2zp14zaf6k5aq36c0nbjq8jya727xs4yra0rdg05hl" + "commit": "deaf16e832bbb4665fe5ccf825422566ce489ad6", + "sha256": "1y7ngdj2icn8zw5qpjxqj3j9dry4lb7ixgxa148ss5bgsl8pgqnd" } }, { @@ -26079,11 +26262,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20220220, - 2003 + 20220228, + 631 ], - "commit": "646ae5cdd8ccbf5d78eb0488298b7c5e9c9a18a6", - "sha256": "0y2502b0d0fy2pm7kklv5262maxky2y2y8nw223f4f3bicbymxwy" + "commit": "c0cbb8d9191a1df8a289aafc8cb94a3ebb515d6b", + "sha256": "102z9wl7d563x7i44zhlc81bi7k030rlzfgs5cm8vbmalgqv1c63" }, "stable": { "version": [ @@ -26243,14 +26426,14 @@ "repo": "davidshepherd7/electric-operator", "unstable": { "version": [ - 20220218, - 826 + 20220313, + 911 ], "deps": [ "dash" ], - "commit": "6dbd8f80aee44e2f6ff9995f1bebb8f05575505a", - "sha256": "0a65cin6r2bx9fz3a56iywmsdm5k6i6av0j6ba3s8hm2hdl7ckdq" + "commit": "8bcc6b02722adb21d3698df46db2426718aebf70", + "sha256": "0xh658xwx5bbzak4axdrwx90zv9vmba8lwcma4m7scinzwhnjfx5" }, "stable": { "version": [ @@ -26432,10 +26615,10 @@ }, { "ename": "elfeed-dashboard", - "commit": "339127464845e86419c6a88004fc16b60d675f57", - "sha256": "1ykg8gcsl7gf1w2xvd1wm088fw1l1mbsamx7drrvkdnpwxx6xiga", + "commit": "40ba169fd28e3fee01bc51055a811ae78d4d6eab", + "sha256": "16r2nwlsjlfh48mbgyp3bqnqmxgaj5f4md1i2m8hvvhpyihq7969", "fetcher": "github", - "repo": "Manoj321/elfeed-dashboard", + "repo": "manojm321/elfeed-dashboard", "unstable": { "version": [ 20210727, @@ -26456,18 +26639,18 @@ "repo": "algernon/elfeed-goodies", "unstable": { "version": [ - 20220116, - 1609 + 20220306, + 2253 ], "deps": [ - "ace-jump-mode", "cl-lib", "elfeed", + "link-hint", "popwin", "powerline" ], - "commit": "8e4c1fbfb86226d867b524fd0f8ae78b4b602f1b", - "sha256": "1f8gyzzdfj0x078m8az2n4c4ihxyxg3yrhx5ry9fi0xsglzvrcn0" + "commit": "6711de66c22360f80fcfd9730293e5f3d419f787", + "sha256": "1c2wqa08wjmqq9kax1akyad23664h5cwdan9mcrn68w6pgqd9rv8" } }, { @@ -26881,11 +27064,11 @@ "repo": "elixir-editors/emacs-elixir", "unstable": { "version": [ - 20211013, - 1408 + 20220314, + 1302 ], - "commit": "6f61e04c8537c2e9a807dc29908f619b5202b0f8", - "sha256": "1hcmb3n2av3zdxsh4wk9d1l2x9065mjjgzbf5i3lh3ij1qrgakcm" + "commit": "e0d0466d83ec80ddb412bb1473908a21baad1ec3", + "sha256": "1whi4ni2jcinwq68yrzcl0q23dhp0b5k3jy5j3m89s2kdv3rwsm9" }, "stable": { "version": [ @@ -27274,11 +27457,11 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20220208, - 1726 + 20220228, + 1307 ], - "commit": "6e3a8ef5af192eddcd834efac49866f84e2c73dd", - "sha256": "1p43x7mf14q84armxhp294xaclq5c6mpggq619ravia0kdrqij1w" + "commit": "ecb5e17d37249bc38c25ee278094fb93b63b0a49", + "sha256": "0q2wmsxvcg6c98fbnldk64lc49zlzd42k8zisk03f8g91l12wxac" }, "stable": { "version": [ @@ -27313,8 +27496,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20220220, - 2059 + 20220318, + 2201 ], "deps": [ "company", @@ -27323,8 +27506,8 @@ "s", "yasnippet" ], - "commit": "758c1ab3516b1e38fdc5b978da6252284f4ecade", - "sha256": "0mldrhqppm3cqrdl836g3rzd6l29ynjvz4b747n0z86sj1chgn54" + "commit": "d3df7021adab256eec679b833256352753c07b88", + "sha256": "0wjpj7ddyb6krpqglp4fp4vgys2j7aca22hzfn4sbhjb8mrqvmns" }, "stable": { "version": [ @@ -27853,14 +28036,14 @@ "repo": "cireu/emacsql-sqlite3", "unstable": { "version": [ - 20200914, - 508 + 20220304, + 1014 ], "deps": [ "emacsql" ], - "commit": "209fd0c2649db0c7532e543ec12e7ba881a3325c", - "sha256": "0zr56gwn8rcgvaa9halhfxpxnn0x6yqc66z6r7vqzx5jbj7d6q46" + "commit": "2113618732665f2112cb932a66c0e89c404d8777", + "sha256": "0r8svrd0d4cflx8a8gkynnhafcpv3ksn9rds8dhyx5yibximbzsw" }, "stable": { "version": [ @@ -27979,19 +28162,19 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220225, - 2232 + 20220314, + 2324 ], - "commit": "8cb3f7655a7868cebe756c1f6c9f2d07ca4da5d4", - "sha256": "1w1swb8qqqzp0b665bd8pbjykgy0523n1wjxwwd0jbma58c4j5xs" + "commit": "5a74f42bd0031b28ee30b64fcb24717ceae8a030", + "sha256": "15g9mm1k4c0qbf9y3fcgsmkxzi4wh3hi6nb62rim2ackxw9f4ndp" }, "stable": { "version": [ 0, - 15 + 16 ], - "commit": "7814a7345067da31a1e7af682bb1f6f050527001", - "sha256": "08wj0p3plvblbmfmn4vsanhldr2csrnm1lhk3g1nic5v26yi5l64" + "commit": "5faf1389162dd64bfe3511dfb8f52c18efb5140b", + "sha256": "04xxwhh577aam0fqfmprxqaw0v1l6yidikr6chajcf16mf1wd2gv" } }, { @@ -28002,27 +28185,27 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220219, - 1728 + 20220309, + 1530 ], "deps": [ "consult", "embark" ], - "commit": "8cb3f7655a7868cebe756c1f6c9f2d07ca4da5d4", - "sha256": "1w1swb8qqqzp0b665bd8pbjykgy0523n1wjxwwd0jbma58c4j5xs" + "commit": "5a74f42bd0031b28ee30b64fcb24717ceae8a030", + "sha256": "15g9mm1k4c0qbf9y3fcgsmkxzi4wh3hi6nb62rim2ackxw9f4ndp" }, "stable": { "version": [ 0, - 15 + 16 ], "deps": [ "consult", "embark" ], - "commit": "7814a7345067da31a1e7af682bb1f6f050527001", - "sha256": "08wj0p3plvblbmfmn4vsanhldr2csrnm1lhk3g1nic5v26yi5l64" + "commit": "5faf1389162dd64bfe3511dfb8f52c18efb5140b", + "sha256": "04xxwhh577aam0fqfmprxqaw0v1l6yidikr6chajcf16mf1wd2gv" } }, { @@ -28158,16 +28341,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20220221, - 1445 + 20220315, + 1727 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "6afe1b26d679357586380ecd69c9795985231013", - "sha256": "03cb4v50cxbprl695r9812zl35y5a8sdk7q8byflrlk6arihgrxy" + "commit": "dd1ee74db3325d6a27e14df7ae882b5cbd84989a", + "sha256": "0s50ap75wsjapxdby7x2gk85jnsr6aaf0l1vzpb6ax96ag92d4lm" }, "stable": { "version": [ @@ -28450,8 +28633,8 @@ "emojify", "request" ], - "commit": "c641508772a7a7d455f0917d45c3c508de56e871", - "sha256": "0iam1caa6pyr3x7qf5nl9d2c0js9m5k6q59dbmvq2bwm7l243nxl" + "commit": "8ebfc21d243fc17faf074b36dbc4be6141139906", + "sha256": "1mdh1f3lbng0nbwih3haf7wj4x4mmgviziv5fwki449495mw041q" }, "stable": { "version": [ @@ -29575,8 +29758,8 @@ 20200914, 644 ], - "commit": "6b13364d36eeb60d8ec15eaf8effe23c73401900", - "sha256": "1mjsxi18rv83wggp53iyh0dzp8y6jy3azqklkr9rmh6xjqb68a30" + "commit": "2816605bfdc24c93d8801016d31beeed7608ad02", + "sha256": "0bq2hdfy86l4yby9nrf84rz521n6y0axfyvl4sw8fg5dpmx062yp" }, "stable": { "version": [ @@ -29600,8 +29783,8 @@ 20220215, 1844 ], - "commit": "d469db4ddf72479a42b60f5337504fb53b65079e", - "sha256": "1mp8c7hfrdbxp6h51fkqi3ri3fqxwapgp9qbggw1jfpqlsjga8lm" + "commit": "e3deb7168cc89e391a18b77d6e09abb7c2a13f00", + "sha256": "1jz15kzbk74bbnmb58jdzrq24ajzfd0lqzwy32krcx6971vx8s49" }, "stable": { "version": [ @@ -29764,8 +29947,8 @@ "s", "shut-up" ], - "commit": "c3969c86b5b00087d8b2fcb7147481d5be56f2f7", - "sha256": "0v3ry7aza86pzrjjy9qr07jxn3md1vx324cl0xq3b055mdp6dqv6" + "commit": "80cf4f60ec8c1f04f58054ed8ad2dcfacc17d8b5", + "sha256": "1zxhiy8hpyz1nbi238gnwvs2pyrl1h8pgfyqrjhqwni8bih4kzx7" }, "stable": { "version": [ @@ -31106,15 +31289,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20220217, - 748 + 20220309, + 2216 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "00fca685479e772361765b13de4689099a328c28", - "sha256": "0gpw5hajzlaam3gdqrr8vxdjdghqr29il8zsmn9q77askf64wsbw" + "commit": "3e41a823334abbba9cf16e482855699054d9dfe0", + "sha256": "1ir4ybrnylx9slyb7znrshfjf0gw1xi7f9nf6bryidqxspsn2ri5" }, "stable": { "version": [ @@ -31308,15 +31491,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20220222, - 1104 + 20220314, + 1559 ], "deps": [ "annalist", "evil" ], - "commit": "2dc6b5e56a7c320dba9da1da2c8c491be586eecf", - "sha256": "12rnxyzqna28f9mxw4fhw4wy0lilp5vjfmdvbaz3sldc162vi36q" + "commit": "e55718869252a8cd46e61e350bb514194a37f2f8", + "sha256": "0inq608gk9kn3383qni7ll93qhw3qqy7yi22ympv0y3279n8725b" }, "stable": { "version": [ @@ -31773,14 +31956,14 @@ "repo": "edkolev/evil-lion", "unstable": { "version": [ - 20170811, - 614 + 20220317, + 1030 ], "deps": [ "evil" ], - "commit": "6b03593f5dd6e7c9ca02207f9a73615cf94c93ab", - "sha256": "1a162hynp0jcsn50c1w5a02mrw9w3q05c7lkqzqd25px3d0p772q" + "commit": "4da660e124731ed65e7aaa6c067c30e876619429", + "sha256": "0akhw0a9qsk65lvanb57fqh7hf601xdzkbyi560ximfrsr7f94pi" } }, { @@ -32634,8 +32817,8 @@ "deps": [ "evil" ], - "commit": "00fca685479e772361765b13de4689099a328c28", - "sha256": "0gpw5hajzlaam3gdqrr8vxdjdghqr29il8zsmn9q77askf64wsbw" + "commit": "3e41a823334abbba9cf16e482855699054d9dfe0", + "sha256": "1ir4ybrnylx9slyb7znrshfjf0gw1xi7f9nf6bryidqxspsn2ri5" }, "stable": { "version": [ @@ -32837,15 +33020,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20220204, - 417 + 20220306, + 711 ], "deps": [ "evil", "tree-sitter" ], - "commit": "ff733576d1dc5395c08d8f0e396b7a7073e39674", - "sha256": "1pa6ffz5wssnrs2x81p06w4c7iba4jx4man0h8qgl3qfsl2nkchw" + "commit": "f3b3e9554e5ecae55200454804e183e268b4a6fc", + "sha256": "0aiy0bkffnq5g7a7ay4jwkp7whx211ybnrh590vl5bd9mnasmxxj" } }, { @@ -32874,8 +33057,8 @@ "repo": "ethan-leba/tree-edit", "unstable": { "version": [ - 20220129, - 446 + 20220317, + 29 ], "deps": [ "avy", @@ -32884,8 +33067,8 @@ "tree-edit", "tree-sitter" ], - "commit": "f7d393b5caf601fe20c7543a53fca3d7e74ea09d", - "sha256": "0i8vc5mpwgkf21awnzc4m60paf13lwl0ff4ihks6k6xq65va3rhn" + "commit": "5961b738e30be007cb0fe984a76e406e0854c006", + "sha256": "17lfs5qqm2gjj40s3r6j1438zvrcfbsz6bxwn9z6flz6idj7ca0n" } }, { @@ -33415,15 +33598,15 @@ "repo": "md-arif-shaikh/expenses", "unstable": { "version": [ - 20220215, - 1518 + 20220318, + 842 ], "deps": [ "dash", "ht" ], - "commit": "fb4349fb7dbddcebc189cce52dda25ab42d27b06", - "sha256": "18ihdfm8hbfl0nhk5k02m0f5dni5pmljnv0my87pmhqa4bzi1b38" + "commit": "e668666770858e92de83d8217c7e384de3ba1e34", + "sha256": "0hlm8c1sif4z8fl6k9k9akc26nzxby792ca6wkrqxcjsc65a65zv" }, "stable": { "version": [ @@ -33622,16 +33805,16 @@ "repo": "walseb/exwm-firefox-evil", "unstable": { "version": [ - 20200206, - 2212 + 20220318, + 1958 ], "deps": [ "evil", "exwm", "exwm-firefox-core" ], - "commit": "14643ee53a506ddcb5d2e06cb9f1be7310cd00b1", - "sha256": "12rhsy5f662maip1sma0vi364xb8swb7g59r4dmafjv3b52gxik8" + "commit": "a377326e2e4ac386a0abb3fc9b1b356a0d955b61", + "sha256": "0gn221al5sf6zcpgd7rl3d8kg8c8l6plf9v5ii0z6ib14g0wvpgb" } }, { @@ -34029,19 +34212,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20220219, - 1818 + 20220318, + 2213 ], - "commit": "f32c32711e936ae0397686b38b88a7dd3cc7ad21", - "sha256": "0vkd83bjprwbm02chvm1q8m818f9ngpbdzr078bxbyig5p0332z4" + "commit": "c58c162a2d1284033497feff4bfa8c3210685d9d", + "sha256": "0v5xn0zpc2khy97pbhvhja724hfc9y3rm9fmqf0xzpm6czbgi4xr" }, "stable": { "version": [ 3, - 0 + 1 ], - "commit": "c090f3d3a8a2ddedeffc1f5b5147cb7633dae79e", - "sha256": "1kiaqascf4lh1kpvp79yynjyncakq31xgx0h2bfinji8i7y32pg1" + "commit": "1385058dfe1db579cc5e08bd81ad9b15282f0650", + "sha256": "1ph7myinasxbamr7vpiijihqniq06ng4h58jgh04xb7vvi4b07nx" } }, { @@ -34160,14 +34343,14 @@ "repo": "condy0919/fanyi.el", "unstable": { "version": [ - 20220222, - 1101 + 20220310, + 358 ], "deps": [ "s" ], - "commit": "bf214d3256143c4d18f3ec6060ee141d252424e2", - "sha256": "0wfp54h3wfvvr6sms1fzxpiqdsyhyygnmjkb9jv03gkir3asnpf9" + "commit": "b01cb24209d223ae0e7281c279daab87800ee7f4", + "sha256": "1jaw9xwh58p1n0x943f6fly0scxf6zd6czq87xrb3fnkmv8qdnhk" } }, { @@ -34523,17 +34706,17 @@ }, { "ename": "fennel-mode", - "commit": "cda0732050a17b2dc70b80afd6fc6bb9cf8bb60f", - "sha256": "0lg69rjvbg7zl4jxc88m12r4rgv2mg2xdyz591mdmgvxwr2hfrv9", - "fetcher": "gitlab", - "repo": "technomancy/fennel-mode", + "commit": "6f1dd5342562665d32308d2cf69527a0e491f269", + "sha256": "0fbwd932jvgn7aarv04pbla76ldpdn2gz0z6zjdcjsp5h507ngps", + "fetcher": "git", + "url": "https://git.sr.ht/~technomancy/fennel-mode", "unstable": { "version": [ - 20220131, - 627 + 20220309, + 445 ], - "commit": "824d330c32637d8e0ef349ffaa8e002aca56991a", - "sha256": "1f1i28jlghzm7fa4998izakasmr6jvzghx96shahc6walcr8zb2h" + "commit": "c55eecd7c731a18c40be98684370c4c6903d243d", + "sha256": "1cg21a2p9pqx9dif35k0p393ckz8f433qznwxgircajjmz65b7b2" }, "stable": { "version": [ @@ -34575,8 +34758,8 @@ "f", "s" ], - "commit": "bc8828273e7a01549d6e892bb0f4ca36d59dd964", - "sha256": "0rcxlmic4hh6qc2l041i7p3qxlmncbw8bhh4lzgg59hdhc18ln04" + "commit": "dd51ad1a5a0d85ab3c71e9bd31499d50ec8b1f74", + "sha256": "1qvi1z6w8j94pp71gwvjd8h14m6fnf0wg824iwk7pvfyhfmi3p91" }, "stable": { "version": [ @@ -34679,8 +34862,8 @@ "repo": "knpatel401/filetree", "unstable": { "version": [ - 20220130, - 9 + 20220312, + 1650 ], "deps": [ "dash", @@ -34688,8 +34871,8 @@ "seq", "transient" ], - "commit": "953f0b2d130d3944557d2c909328afd8c8097e8c", - "sha256": "09r3k0ba89iv6vzhyzgl7aa496ycld0ab18z45qvp7m8aqkvf3jw" + "commit": "9125e5b7ebbb99b8c007018fcfd5034e7ac6630d", + "sha256": "1gwx52498q6yg8vyfdw4mrxjj49cbcaf9r95rl2dcms9rb9s5rqv" } }, { @@ -34749,8 +34932,8 @@ 20210707, 354 ], - "commit": "f23ecfc9c6b7a1369f8431ba1bd919a733b3d38e", - "sha256": "0hp3id5fc8z305y5jpbg57nqzdscw5r9yhvmzndiw6ly9pk8868a" + "commit": "466b2314f48aee2bab17810eb4fd7f9b061c9a46", + "sha256": "1dmdmgmb7gw2p62p1i1ii1b4b6wvh0kg1vvvlfpx5jmv2ix01drc" }, "stable": { "version": [ @@ -34943,11 +35126,11 @@ "repo": "muffinmad/emacs-find-file-rg", "unstable": { "version": [ - 20220109, - 2015 + 20220314, + 1540 ], - "commit": "86158409c59f0349e84fb31557cc41f93d2df5d8", - "sha256": "1aghs4411fbxdlfhgy3a2aiq5z2a5slgw5qjd2hs99iqll2zq84v" + "commit": "404b1cc97c2f700d3dc1c66b640f96ed5a268dc3", + "sha256": "18v3wdkh7ld6ap4nfc8p84i44gc99nrvk7v0gyq1zdg0yy20vwaq" } }, { @@ -35018,8 +35201,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20220111, - 1121 + 20220307, + 1527 ], "deps": [ "async", @@ -35030,8 +35213,8 @@ "s", "transient" ], - "commit": "57d3e873a5a5fde4f8dfdd99608780b7020c7b9d", - "sha256": "18li3w3qf9j1lb90p3vsn28wlqqad05rq7nhd988nzf7izxir094" + "commit": "be1ae9bcb1b85d93f138c510dbc16c28af228916", + "sha256": "0jslc8j153sglagfjq5vrcnhgzjjxkf763h3md9735z231svvvk6" }, "stable": { "version": [ @@ -35892,8 +36075,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20210825, - 1804 + 20220314, + 27 ], "deps": [ "dash", @@ -35901,8 +36084,8 @@ "pkg-info", "seq" ], - "commit": "784f184cdd9f9cb4e3dbb997c09d93e954142842", - "sha256": "137zsivwh3i4b757hzwf5mhv5sg8j2jg7kg0cjphplwasqk70qm7" + "commit": "278d0810f05eb03600d835c2bdd67d6b55a58034", + "sha256": "1c722aapkqbkxqchpchd2id9kz4hv2dckyl851x4na3yd7k0dzky" }, "stable": { "version": [ @@ -36696,8 +36879,8 @@ "deps": [ "seq" ], - "commit": "6274e6d5391bcdca46164b3238b045ca21c353a2", - "sha256": "0dr52dqxsgswswbkdbv0dax57k41j58n5wf3gny6yz52626kv8n8" + "commit": "911ffb3498e411c538eebce20c6b20b39d725af6", + "sha256": "1b0g9lqg6kmvhvh4a6g6xmag4jmkx3br6b37z8kb7p7x3wb691f4" } }, { @@ -36818,8 +37001,8 @@ "deps": [ "flycheck" ], - "commit": "65e7d90594b5f624702b3cf6e8867407419980b7", - "sha256": "1s7xgcn10dx4i0l3q1pl33v8r59xjjmgia4a45jmv52schpx53gp" + "commit": "6b76fa9c43834fabe501c7ab1816797af4e4a7d1", + "sha256": "1l2lv9n159c04rk3z044ib5w1kpgld6j1i63106bmr3za3kkkqv6" }, "stable": { "version": [ @@ -36889,16 +37072,16 @@ "repo": "emacs-grammarly/flycheck-grammarly", "unstable": { "version": [ - 20220222, - 638 + 20220228, + 731 ], "deps": [ "flycheck", "grammarly", "s" ], - "commit": "7ded0a4f36b88867ec6b14a791dc4d14baf09bd5", - "sha256": "0q3bhfjb0cr4f0g9dyyz70lgzzzwa3k77ahyhkc1jscmjafsjs5i" + "commit": "2b71f7708798aba0c766768eeb161bd2696d663d", + "sha256": "0vg9gpa4sifzdv6z5ax3cqgmqa1xzaq4g5fqpswsyr55jaxpi5r7" }, "stable": { "version": [ @@ -37276,8 +37459,8 @@ "flycheck", "keg" ], - "commit": "f0a719892aed5b1b4b644f1339d1ace99c656100", - "sha256": "0vk4fdkai0ssq31ycckkz4iwp35ip5d8lnyisv4m3b98jv3pb6k0" + "commit": "944e36144d92a798e1fd0f3d83fc6347d57a976e", + "sha256": "1flri9jmhhhak2zx46sw86jm05mw4banyk1ag2354v1irsc81piv" } }, { @@ -37317,14 +37500,14 @@ "repo": "emacs-languagetool/flycheck-languagetool", "unstable": { "version": [ - 20211107, - 1001 + 20220228, + 737 ], "deps": [ "flycheck" ], - "commit": "c22c4f33cfc1229177fc67b18885363fb8a23af9", - "sha256": "01nshsqjl9vlx06vg2fws0jxd6x2dy5pf2hix0am14v0rk9kh6zk" + "commit": "018b4e12b9b5e80e0169ce044fb2a898a747bd1f", + "sha256": "0v8wf6jax2gzqrsj8lijybc47bkz665mbw87a73iz6dcmlyrxsmy" }, "stable": { "version": [ @@ -38611,8 +38794,8 @@ "deps": [ "flymake" ], - "commit": "0c9f3fa273cf1cea8fd64c2b3c20119e2d5c8f6e", - "sha256": "0vw21na55i7fxrls5b3frf2mml7nk8k6y39936r7gbnmn00dcmam" + "commit": "097c8754367f68ea84eac9f5f31664cecb95eeb9", + "sha256": "1nw2lib8c919bwiljqbj2b098frw6ciamyd66ms131pzm633iplc" }, "stable": { "version": [ @@ -38703,11 +38886,11 @@ "repo": "orzechowskid/flymake-eslint", "unstable": { "version": [ - 20191129, - 1558 + 20220318, + 152 ], - "commit": "6e2d376f84ddf9af593072954c97e9c82ab85331", - "sha256": "1pkigdarkjk2gpqjrfavg68bwihaazjzf1rr9fmrqkgis5hz3zf7" + "commit": "bfcf28259c7d774b259a6ed122f1f0936a5b96b9", + "sha256": "18rvmvaw7jdlrc4xvl9nw9lawwqnd5ahnf7j95qlqfrr3fm2avmw" }, "stable": { "version": [ @@ -38727,14 +38910,14 @@ "repo": "purcell/flymake-flycheck", "unstable": { "version": [ - 20210404, - 2128 + 20220313, + 924 ], "deps": [ "flycheck" ], - "commit": "fd5e801b49a0dd085bc23fd6ea32b0e3be9edea7", - "sha256": "1rvrxnqplwxm2havrsfsv3nrfv0zgz574rh18dkz5ixlbscjcpx7" + "commit": "850a3f2f6908db5d4a3739e385b2c9fb3ad488f9", + "sha256": "1axr0wgmjr58fhhl2zwh5l4wd9x8h66rv2917ynxwq61p955wi87" } }, { @@ -38839,8 +39022,8 @@ "grammarly", "s" ], - "commit": "ae2190f47b8e0792ae936f972081de5a5b796d95", - "sha256": "1k66jv6nqmaazibr212swhkn4y3dkzwrg7f9mvpig19abfima6yn" + "commit": "bb8bae85b0cd5a3d4603bbb35f9237bcd83d250f", + "sha256": "1a2mzmgp6sb0wylcasg764rczlqc0nj09wbxdfmdjghdcl679pr1" }, "stable": { "version": [ @@ -39086,8 +39269,8 @@ "deps": [ "s" ], - "commit": "55df906e4a19d64aa6bc44fd45eb02819c6e77be", - "sha256": "0lxfzib1ipr3nkyjixy49n7g5z1v6hhimp1ff6n87wwz1d55lkjb" + "commit": "330a277f6469f3382fb758bd19117aa4ca5aabf9", + "sha256": "1sgcws103qbj259zi0qrpn5cgjiab36sl2w2nnfs96bky228byc9" }, "stable": { "version": [ @@ -39179,8 +39362,8 @@ "deps": [ "flymake" ], - "commit": "c70eb881d4fb27aeb72c0bf8de6707b9de49bd51", - "sha256": "1w7msjg4sa0h0a4ycl9382agv1bhzcr9z0i6hmhcg7333rd31ilh" + "commit": "dba854423933224f0d983bde8981f7c6b62a7865", + "sha256": "08j9zcj42zxwdlycqcivhh58rr1abafb66vbgcik9h2givnkx2ys" }, "stable": { "version": [ @@ -39268,8 +39451,8 @@ "deps": [ "flymake-easy" ], - "commit": "8e5ab5103c8f40a2ab6c86def6327e480ae93657", - "sha256": "19cggpaj14w3j3q6dgv7ybjqbr2pqbwhingz4yi7wkrr0w6s0lsa" + "commit": "8f6222324e4f205312b51c8a862b24562db0e02e", + "sha256": "1cpfif8v9qrcfiklfy0rvj31f8ixj6npydzkqsn2xjxd8j8266zb" }, "stable": { "version": [ @@ -39407,15 +39590,15 @@ "repo": "mohkale/flymake-rest", "unstable": { "version": [ - 20220109, - 15 + 20220313, + 1311 ], "deps": [ "flymake", "let-alist" ], - "commit": "fd9928801cf601a221cf45508e254f405d19c819", - "sha256": "1paiw6ax6zcqdr2gxj78d8by7glag0nnrp8y489qz6k2y7mwv9s8" + "commit": "6c0f39ae1e8b476b195adfe477b40cf6c4a162b6", + "sha256": "1qmzf49ags9ymdfi7q4mk4amp522ssq2hnrknkrx1sj0lfxkkypw" }, "stable": { "version": [ @@ -39525,11 +39708,11 @@ "repo": "federicotdn/flymake-shellcheck", "unstable": { "version": [ - 20210314, - 2048 + 20220308, + 2218 ], - "commit": "ac534e9ef15c82ac86ae65fe5004d29dbc8c92c7", - "sha256": "04yfb4sy41spjzk9mhm4gy0h8vnjx09p2g6nm1yzgd9a5ph9sqgl" + "commit": "688638177b4e23ecc192975e3062274ca904ada1", + "sha256": "1x5blblaf1h6jz4v6l10w2gy7xkbwzzw2a4s0afdicm0r1wc7v44" } }, { @@ -39609,11 +39792,20 @@ "repo": "shaohme/flymake-yamllint", "unstable": { "version": [ - 20211215, - 1416 + 20220311, + 636 ], - "commit": "22690dd862089f470980cceea06153682a397b7a", - "sha256": "1x3ivvwnbwpsavbypgkh1il7l7vmq8vp4w3y40f60zv3zz06nf16" + "commit": "a93bf9a6697566f0e29fb51a87c5cc7b2a972d2d", + "sha256": "0h1w5b2krdvvr73w2k54bxc3dbgs1kbgb2za0z7wc8w02cl8fg57" + }, + "stable": { + "version": [ + 0, + 1, + 3 + ], + "commit": "a93bf9a6697566f0e29fb51a87c5cc7b2a972d2d", + "sha256": "0h1w5b2krdvvr73w2k54bxc3dbgs1kbgb2za0z7wc8w02cl8fg57" } }, { @@ -39660,8 +39852,8 @@ 20220131, 834 ], - "commit": "e9fde6f93af991b0528d6ed47d44bed470dc70af", - "sha256": "1sjdd9ixvp84fzx2zkz6kxlkwnd7v95jl2ilx5jf5r6l1118iakq" + "commit": "e8027a412262bc04056a5b5440efdb7f370c3320", + "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn" }, "stable": { "version": [ @@ -39688,8 +39880,8 @@ "avy-menu", "flyspell-correct" ], - "commit": "e9fde6f93af991b0528d6ed47d44bed470dc70af", - "sha256": "1sjdd9ixvp84fzx2zkz6kxlkwnd7v95jl2ilx5jf5r6l1118iakq" + "commit": "e8027a412262bc04056a5b5440efdb7f370c3320", + "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn" }, "stable": { "version": [ @@ -39720,8 +39912,8 @@ "flyspell-correct", "helm" ], - "commit": "e9fde6f93af991b0528d6ed47d44bed470dc70af", - "sha256": "1sjdd9ixvp84fzx2zkz6kxlkwnd7v95jl2ilx5jf5r6l1118iakq" + "commit": "e8027a412262bc04056a5b5440efdb7f370c3320", + "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn" }, "stable": { "version": [ @@ -39752,8 +39944,8 @@ "flyspell-correct", "ivy" ], - "commit": "e9fde6f93af991b0528d6ed47d44bed470dc70af", - "sha256": "1sjdd9ixvp84fzx2zkz6kxlkwnd7v95jl2ilx5jf5r6l1118iakq" + "commit": "e8027a412262bc04056a5b5440efdb7f370c3320", + "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn" }, "stable": { "version": [ @@ -39784,8 +39976,8 @@ "flyspell-correct", "popup" ], - "commit": "e9fde6f93af991b0528d6ed47d44bed470dc70af", - "sha256": "1sjdd9ixvp84fzx2zkz6kxlkwnd7v95jl2ilx5jf5r6l1118iakq" + "commit": "e8027a412262bc04056a5b5440efdb7f370c3320", + "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn" }, "stable": { "version": [ @@ -40129,8 +40321,8 @@ 20170305, 1356 ], - "commit": "a743f80bfd53767ca9ee32da34c5ca032172a480", - "sha256": "1mkyd2bbyd9avw2qaidkzkpv8i7lfiv9189bj49dxklg92823sip" + "commit": "b64edc9f350beef07168621933d3e287bce28434", + "sha256": "1yss4akandva0rg05g6vfwjk3q9yj6p0pg85nq5glv1qxdx1rvxn" }, "stable": { "version": [ @@ -40292,8 +40484,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20220225, - 1417 + 20220318, + 2335 ], "deps": [ "closql", @@ -40306,8 +40498,8 @@ "transient", "yaml" ], - "commit": "0f436173d1660321edac761e3e82c40e97709f63", - "sha256": "03iwng2l5gj3mhk8jw72wzz5iji4c0m5p59f2igbiqm79xrxghys" + "commit": "de8856738f5c5d5b77349709c42329c1e23c0da5", + "sha256": "16bchyf9dnax0cd0v45scyw7jwmmdaxaam9ss04gn8grw5drjdvr" }, "stable": { "version": [ @@ -40507,14 +40699,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20220223, - 1041 + 20211223, + 405 ], "deps": [ "seq" ], - "commit": "96dd298a2ee2f62739e4a11281daadd90352df70", - "sha256": "0amxqi4jvc0sr5i6pk72ricjwdc0v0lr0q34vccsab2l8iiwid89" + "commit": "0aab300c0a6225d93087ae112f123eb89048ce1d", + "sha256": "102g7n43ji47ssj7rdyx34frbgl84lgmppww4f3x6wbkvfwa2p6f" }, "stable": { "version": [ @@ -40793,11 +40985,11 @@ "repo": "rnkn/freeze-it", "unstable": { "version": [ - 20210727, - 1535 + 20220301, + 148 ], - "commit": "151d264a0d0593b413b5a984b391023e905a190b", - "sha256": "04cv6p9df7h6w9h2ina3y3mmkp0y1rs6d9wmzari0cbm7q50hz4l" + "commit": "ad92e33a7ebd860905da60d194833516bf61cbf5", + "sha256": "0gvc6f8jdvrfwhm5rlvrjd6lbvw1j84z3pwcfajpgyr1a5y6gx49" }, "stable": { "version": [ @@ -40826,8 +41018,8 @@ "friendly-tramp-path", "with-shell-interpreter" ], - "commit": "ad4ac00662829fa18858be02b322753ad091ffe3", - "sha256": "0xf71bvz4252y2jxkn9dpcmg5fvf9i049bbm8bvs7s9f6bcplba6" + "commit": "e530e359848e8bdad09d26529f17eb25e5558b3e", + "sha256": "0n4p0682k6q7p4kn8khb87zbaa9by36gr7iz218p1bnv3v8c42b8" }, "stable": { "version": [ @@ -40853,16 +41045,16 @@ "repo": "p3r7/friendly-shell", "unstable": { "version": [ - 20201212, - 2302 + 20220309, + 1711 ], "deps": [ "cl-lib", "dash", "with-shell-interpreter" ], - "commit": "ad4ac00662829fa18858be02b322753ad091ffe3", - "sha256": "0xf71bvz4252y2jxkn9dpcmg5fvf9i049bbm8bvs7s9f6bcplba6" + "commit": "e530e359848e8bdad09d26529f17eb25e5558b3e", + "sha256": "0n4p0682k6q7p4kn8khb87zbaa9by36gr7iz218p1bnv3v8c42b8" }, "stable": { "version": [ @@ -40894,8 +41086,8 @@ "dash", "with-shell-interpreter" ], - "commit": "ad4ac00662829fa18858be02b322753ad091ffe3", - "sha256": "0xf71bvz4252y2jxkn9dpcmg5fvf9i049bbm8bvs7s9f6bcplba6" + "commit": "e530e359848e8bdad09d26529f17eb25e5558b3e", + "sha256": "0n4p0682k6q7p4kn8khb87zbaa9by36gr7iz218p1bnv3v8c42b8" }, "stable": { "version": [ @@ -41009,8 +41201,8 @@ "repo": "thefrontside/frontmacs", "unstable": { "version": [ - 20220201, - 2048 + 20220315, + 1057 ], "deps": [ "add-node-modules-path", @@ -41023,8 +41215,8 @@ "tide", "web-mode" ], - "commit": "774b4b3a1f24c46c91f189a2c67d5fcf0785e2be", - "sha256": "0ks55xp65qg96vsj1nsrifbpvfz0k45glis4wsl6wyc7pfiss11y" + "commit": "18816534a977fbd28848389b58c22b6538cfdeec", + "sha256": "1nhsjkp0dm9875a1w86vvfwd1gsssvcmk144wvflvw40br9ss7h1" } }, { @@ -41131,8 +41323,8 @@ "deps": [ "cl-lib" ], - "commit": "3032408bd3b521d761eea9f0e4e89640d5485129", - "sha256": "0y6mralgvay2493vzm6m7m53sxivg9rzhs947flpdyz8xsl0ac4d" + "commit": "1945b8f54cd62c7d6dd811586ee21bf43d6794a6", + "sha256": "1ladvdxi6bbjy5lspvmb0yl8vjnl0j8fq5jrn5wnfwwq3q9fb07p" }, "stable": { "version": [ @@ -41330,8 +41522,8 @@ 20211231, 1837 ], - "commit": "20a76509831b8296bf3c8b389e1f5602c2a88899", - "sha256": "1m4qsb2hfs1v5ffxzc81km5ld0gi8j3hzgnjckw5rlgl0ikrbjg5" + "commit": "9c500225fc1e084935f4865e2117acef8e30c5f5", + "sha256": "1y7439ipgpj57asmxhdgnkjyakh7ijj2242al5ljpswqmb5404kk" }, "stable": { "version": [ @@ -41731,26 +41923,28 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20220223, - 1659 + 20220315, + 2208 ], "deps": [ + "project", "transient" ], - "commit": "ed6d6a1b362fe389acb7f7e1bf6d89ff88e060af", - "sha256": "1zs3ywy81754daygch6nc03wg5z953gm03kclnv5fngxjzjf5xgk" + "commit": "b0ce078b86ea8d52a2608af4217ae80d9bf0cfab", + "sha256": "1lvnk71fb4qkh8a7h7spsdhmc9nnj1lwgp9wr3c2fgzjqsl62kgr" }, "stable": { "version": [ 0, - 22, - 2 + 23, + 1 ], "deps": [ + "project", "transient" ], - "commit": "c1cc4da1edc46b763e0342ab4aa971e54f48658d", - "sha256": "11vc57nkgbsyl1wrjikxs0ixzkp7dksj51p4aa9girsm2hs3bs6v" + "commit": "b0ce078b86ea8d52a2608af4217ae80d9bf0cfab", + "sha256": "1lvnk71fb4qkh8a7h7spsdhmc9nnj1lwgp9wr3c2fgzjqsl62kgr" } }, { @@ -41904,26 +42098,25 @@ "repo": "emacs-geiser/guile", "unstable": { "version": [ - 20220215, - 2320 + 20220316, + 2111 ], "deps": [ "geiser" ], - "commit": "cfd9116dcb246126950d7f2f662f09149684128b", - "sha256": "1k8qgkamzd6ljvk7xiqs1r0fvr4gzffhylpll7c4zjywrbixw3g1" + "commit": "aa48110d69b018f03dbff0aa9e830111fef71da4", + "sha256": "1v9f90smnk41nz1pjy5mwz199y8p4qar3llgaryzxr7s4wg2v9wi" }, "stable": { "version": [ 0, - 21, - 2 + 23 ], "deps": [ "geiser" ], - "commit": "ecd118171a111e04120d11c0d72345ce1d0f8066", - "sha256": "1ri1l203vp5nnl7chmmvvj3b03315fpzjjkisv55m6xs77ig2cl7" + "commit": "aa48110d69b018f03dbff0aa9e830111fef71da4", + "sha256": "1v9f90smnk41nz1pjy5mwz199y8p4qar3llgaryzxr7s4wg2v9wi" } }, { @@ -42232,8 +42425,8 @@ "magit", "s" ], - "commit": "a802be95aea25f500583f72df968c86c6771a3d0", - "sha256": "1ac6d4fxcac4p6dp4nhbqf3bzd0yvgwajrllrh3j0vcdpzmbg95s" + "commit": "bd0349236baacfdcdf82cb33c9ba45f451b9b255", + "sha256": "1ng68lc1z0rs23qprbwi8j1kj1162k0ckj4i9k6kff671i4f7lkm" } }, { @@ -42343,16 +42536,17 @@ "repo": "sigma/gh.el", "unstable": { "version": [ - 20201222, - 438 + 20220302, + 549 ], "deps": [ + "cl-lib", "logito", "marshal", "pcache" ], - "commit": "4b2dd0667ebe9c684c1de5bc96961c2ab0885c07", - "sha256": "11qjlwsiicnmgcy0yvpvagpcl31rrv5qzm18hlh16cyis4z3vngi" + "commit": "27ccc892e94f7e747e5b879eec71119965d9ed6e", + "sha256": "0biljpqw14kjv0njyrahfdgglaphghva0kpfjhiprfwbd0rmmi1k" }, "stable": { "version": [ @@ -42377,11 +42571,11 @@ "repo": "emacsorphanage/gh-md", "unstable": { "version": [ - 20151207, - 1740 + 20220316, + 1432 ], - "commit": "693cb0dcadff70e813e1a9d303d227aff7898557", - "sha256": "0g3bjpnwgqczw6ddh4mv7pby0zyqzqgywjrjz2ib6hwmdqzyp1s0" + "commit": "e721fd5e41e682f47f2dd4ce26ef2ba28c7fa0b5", + "sha256": "1xnfq6bbc5bgkd0mzkr7r66sd85qfn859swpsp6sr0xfl8cq12wm" } }, { @@ -42523,15 +42717,15 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20220216, - 2156 + 20220310, + 1436 ], "deps": [ "let-alist", "treepy" ], - "commit": "2f50383cb35f0cc54599c54cc9794bf25387c050", - "sha256": "1ph96pqhizaq2vkvmkbzilacsbyx69g2bbsb3z8kqafrhg0khajj" + "commit": "bd6e02b884368f26aeef9fd67107809f355c2c3d", + "sha256": "0qaz0p7178xd4rs5wxw01804dhnzg9c0dbxlvddm66s6l31baij5" }, "stable": { "version": [ @@ -42896,8 +43090,8 @@ "transient", "with-editor" ], - "commit": "0f96d398346293b4d1f60dd878a490c25917cd8a", - "sha256": "1q948ihwfr55spa81vpg3lih6bc0vappl0xlgdagh7m55mg561bm" + "commit": "0b3b18452cf7b72e067451a453c55c44cf1d8c89", + "sha256": "0g8p4pjvijrkwj4x9wqkjqr63l92nfz6cbfxlw67xjlfilclmjlj" }, "stable": { "version": [ @@ -42994,7 +43188,7 @@ 20211222, 913 ], - "commit": "9174c74cd607e297d7f14c0595d4c20ebb53847d", + "commit": "abe65ed3937fe038123549b948f37a3bbf1c4029", "sha256": "1jkhvxlk4lkfjgd5vlfjy8z7w6n7j91rxqr48ricyzzl62p4v2wr" }, "stable": { @@ -43491,11 +43685,20 @@ "repo": "Justintime50/github-dark-vscode-emacs-theme", "unstable": { "version": [ - 20211122, - 1800 + 20220313, + 2033 + ], + "commit": "2123bcd08fe42094b07180632be2cd2af606ee21", + "sha256": "1n41px99cs6q53lfs2dn9h7ml6hc4yz7mbjlg30hp4l8a3j74lz3" + }, + "stable": { + "version": [ + 0, + 3, + 1 ], - "commit": "092324ecb9c0909da2ba2751cb21a994b4e09536", - "sha256": "1zr116c9zphm5kgacqxmll7gzd1h5583xy0asg46dzyn4gn0bmhv" + "commit": "2123bcd08fe42094b07180632be2cd2af606ee21", + "sha256": "1n41px99cs6q53lfs2dn9h7ml6hc4yz7mbjlg30hp4l8a3j74lz3" } }, { @@ -43540,23 +43743,46 @@ "repo": "TxGVNN/github-explorer", "unstable": { "version": [ - 20211216, - 749 + 20220305, + 1450 ], "deps": [ "graphql" ], - "commit": "069e25c3e72290adc5d32c380999840ba42ccd78", - "sha256": "1c8hsh2jb9670dwhnrcyk1jcbkji1zrgr5g9ra170ya5gi16cann" + "commit": "49e5c350169b556deaabdcb67e9440bd4d5b4f8b", + "sha256": "08d2s9a8sa6r67dirj5nn1hi1k5hivsjm4yz5gawww30v4w6cwil" }, "stable": { "version": [ 1, - 0, + 1, 0 ], - "commit": "e6bdc500dd9b580ed12a54d18600f5db541b38b8", - "sha256": "1a9hnmx1q7fxyyxn0ji2mcam6wz8rwxi7a71f5542l65ah20gg1r" + "deps": [ + "graphql" + ], + "commit": "d7198dd81afc4ee2001606be821707a9ff4f31da", + "sha256": "0gjzm4h813b065nvf4hvfji67jvygvfgzv5yhmpw5ddj1h6rz43m" + } + }, + { + "ename": "github-linguist", + "commit": "8876af18b9e797ab7521a087278a046e0cecb7bc", + "sha256": "0r77axj20qf4x2gf1c0n5xfia7sfyir9cm5kwkn85w4bgb2179dd", + "fetcher": "github", + "repo": "akirak/github-linguist.el", + "unstable": { + "version": [ + 20220311, + 827 + ], + "deps": [ + "async", + "map", + "project" + ], + "commit": "3f3f5c93f80ec664d7ffadbeb9d30bd4c2741fa4", + "sha256": "10sw9i6r07f5d23qdsy2yk2a29mvzcsrlhnbv8wk1iw8691pkd69" } }, { @@ -43956,14 +44182,14 @@ "repo": "xuchunyang/gitter.el", "unstable": { "version": [ - 20180122, - 856 + 20220316, + 138 ], "deps": [ "let-alist" ], - "commit": "11cb9b4b45f67bdc24f055a9bfac21d2bd19ea1a", - "sha256": "14ri86kxqz9qfhcr0bkgfyggy4bgg9imk9akhw6dfzqkl90gn2gy" + "commit": "49327c91eb50cfea633af8fd32b0643691d75cb7", + "sha256": "0m8np2pxmgziirmprs70jbflilc98b7zlx1g07i6mhp39xw1sx98" }, "stable": { "version": [ @@ -45595,8 +45821,8 @@ "go-mode", "s" ], - "commit": "298335fab797d0465516ed396f6e2acbe8f2ed93", - "sha256": "12sn06c4gw5jddmdaw73djlraj01f57z9plnyf1gxss4gnch6kmd" + "commit": "78be56c0f210224b1e3a7d58239e2a32f8f84bf4", + "sha256": "0xkvw0wy4p8viib2s7anh322lvwm8p30g4hsjr9x0j8sqiq838ds" }, "stable": { "version": [ @@ -45648,8 +45874,8 @@ 20210323, 332 ], - "commit": "5da95c2b6d555155189c54b6857ceaafa2b72e8a", - "sha256": "07hapzb7h2rbvxzn1ml4dmzcj1ihdcsw365nirvhjfbipr1y7xkn" + "commit": "573a53f070c71e02d89866f4cdc2ba5ccdc9cecb", + "sha256": "1am0l056dyi71wwzv7viigia9qybdh9b19w4ql1fkrr80zr5m0v3" }, "stable": { "version": [ @@ -45735,8 +45961,8 @@ 20210323, 422 ], - "commit": "921f7b729fff82924c539d96feb47e299c07e7a1", - "sha256": "1v73qzgf1bfkw7j295nmlpqaims8ry5b0vszfxajz2p09011hw12" + "commit": "27fcc9e7062c9d672a513ba306fd32f7736dab78", + "sha256": "1zmpmv7121cv2v5sm3pg5jz7rfhikj8351isx2qa2z165b3ixssz" }, "stable": { "version": [ @@ -45765,8 +45991,8 @@ "magit-popup", "s" ], - "commit": "a41644562f5977dc76f2a385ab77432bfc21c993", - "sha256": "16q09nrsxnwyylfk0zdk0smxqwr31n13hww1i4f5gpw232b5lbck" + "commit": "4cce99f9ab081fd98e4e39733b0bfe2269c83de1", + "sha256": "0vlxzywqnp4wl12kv6i07ipxl8ba3cvi3mx35d88g2q4hs8jzvs0" }, "stable": { "version": [ @@ -46000,8 +46226,8 @@ "s", "websocket" ], - "commit": "b340f523caa88534a89f5fa9fd0fae502e56a12c", - "sha256": "0f8nr981n7ndc7zvj21hsfqiy4h1ry5r1vz004lggphb2lzpzgyn" + "commit": "067c58d79a90071a0d70012fa1722c5c79abdc01", + "sha256": "1w3mj1izjs0y7xpbpy7vrkj7ljpbiz7ivkv4h17847q6w79y92wa" }, "stable": { "version": [ @@ -46194,11 +46420,11 @@ "repo": "ppareit/graphviz-dot-mode", "unstable": { "version": [ - 20220117, - 1537 + 20220309, + 1336 ], - "commit": "a1b7d66f5c20404a1e59c2ee5e841022622535b8", - "sha256": "1xzpj81zzasj4ys9zypl4svgcikz4d32fvmzxdp8gq67bkwdlb6h" + "commit": "6e96a89762760935a7dff6b18393396f6498f976", + "sha256": "04p8x4lwbp2qwlsr5xlzjn3a25bg0rsnk3nqfvvz66zv0srz62mn" }, "stable": { "version": [ @@ -46410,11 +46636,11 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20220104, - 1419 + 20220311, + 1034 ], - "commit": "1fd737f7f1e34e27b6d317ba16507bbbe0d2588c", - "sha256": "1b1cams272ppzs00gbcmaxihgsjym96qp399hardiw7j8byav7fz" + "commit": "d49af7a21a1f81d809566755085679bbc7d794a5", + "sha256": "08n9bv5dxygkk8yxm58sha5ds6bcg3zhw4fradwcxs7pcdjlpabi" }, "stable": { "version": [ @@ -47381,14 +47607,15 @@ "repo": "otavioschwanck/harpoon.el", "unstable": { "version": [ - 20220220, - 839 + 20220301, + 607 ], "deps": [ - "f" + "f", + "hydra" ], - "commit": "2e252559667ebe27485aa990a5ec062f94b67835", - "sha256": "0s2ags1ashr1mk5g5x467xh0ffxzkmyhr9w86qgmjnq37r0iw5zi" + "commit": "331eea2ed64e34cdbea024fa0fd6ba930b60d95f", + "sha256": "0clfdvsw08hb68iq9rhhlfb8rzp1dd81yx5k0d7zs0nqbldr71av" } }, { @@ -47517,11 +47744,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20220208, - 1821 + 20220312, + 1521 ], - "commit": "f13b6db78bc880e680c320e015ae232f525e0a27", - "sha256": "06amab8n56nv8a1fnd9x3ic0s36g6q4c4m5mh6sxcngaqjvvz4pa" + "commit": "5750f74d892ecc8f34ad8c73e75f78bfb3a86303", + "sha256": "1ivizlymkz4ciyyyd8l6y0cdrj72qbymagzmqivq8gxak9wyh71p" }, "stable": { "version": [ @@ -47687,8 +47914,8 @@ 20210108, 1835 ], - "commit": "f6ed4b77cdd775d53a7b824c21fd14e0eec5e3c7", - "sha256": "0314x9y3v8nmknmdw0gbl4njanxiqbh5h5m0kvnph6r6v0cz7m4s" + "commit": "b6daf4c8bfd7fa6ba7b4bdbfe03c0be7704add04", + "sha256": "0g4xp5z6wqhfivyls6asjnqdxmafbyl24fvcqk2s5zd9j94x6649" }, "stable": { "version": [ @@ -47827,15 +48054,15 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220226, - 2016 + 20220313, + 937 ], "deps": [ "helm-core", "popup" ], - "commit": "f030e584b7f2c8679297ce960cedbdf0f7e7e86e", - "sha256": "0y1d8kh0swpgplqji5cmpd2xpaywd3zr3qc4msdw9lvylnrkrdgn" + "commit": "46008f69fded4fe7e3cba942a8c7ce91a3cf1187", + "sha256": "1447v3f2r0qyd0hkqcl1mp7xm82d31bdf0h2r3km7gf9sfvlhfl9" }, "stable": { "version": [ @@ -47935,8 +48162,8 @@ "deps": [ "helm" ], - "commit": "7cfed5d3e861717466ae6d3f76c759548a9fad04", - "sha256": "0j1l9ifssd2xmdiif0c922dsdii143kjp8ifygqigb9m4wbsz8ax" + "commit": "9109208978bc739fb8fdae760abcea4225048dd1", + "sha256": "0cm1r1qmmmvdmr0sshsndvi9s99n52y4nkirq7cs8alg86iyiyrk" }, "stable": { "version": [ @@ -48740,8 +48967,8 @@ "deps": [ "async" ], - "commit": "f030e584b7f2c8679297ce960cedbdf0f7e7e86e", - "sha256": "0y1d8kh0swpgplqji5cmpd2xpaywd3zr3qc4msdw9lvylnrkrdgn" + "commit": "46008f69fded4fe7e3cba942a8c7ce91a3cf1187", + "sha256": "1447v3f2r0qyd0hkqcl1mp7xm82d31bdf0h2r3km7gf9sfvlhfl9" }, "stable": { "version": [ @@ -49073,16 +49300,16 @@ "repo": "emacs-helm/helm-emms", "unstable": { "version": [ - 20201205, - 1635 + 20220314, + 1633 ], "deps": [ "cl-lib", "emms", "helm" ], - "commit": "43d387504a292b36e4e4246abdc9090c1717a561", - "sha256": "0pgrjqhw1xjl5xy329621idg517bfaafvqb3f5wxci6fhm4x46gc" + "commit": "aefa44ab77808626c4951be2df49a2eab7820805", + "sha256": "07ric1lghxdccq30jr3nfzkqa0mpx61kp4mjyi0zsxqcwfyz7zx3" }, "stable": { "version": [ @@ -49298,8 +49525,8 @@ "deps": [ "helm" ], - "commit": "2eb2ad4f3f456fadfb6a0ec044acfef2f2e7af5c", - "sha256": "0z0ssmi8l6x2fca7xfnpkyvfmyc4zgbf925ms3bvgjzwm5q23zmk" + "commit": "6a1d1fefad4b7f3723220da2edaef0b7d6f09a0e", + "sha256": "0wzq9pj1gbyv7cyar0r4hgmskwmksq7xfpjldibw30vzrpiqapas" }, "stable": { "version": [ @@ -49563,8 +49790,8 @@ "flx", "helm" ], - "commit": "6cbdb15094354262a2f5f793b66694e3f2c86e0b", - "sha256": "1gdjczi601586f7qzdxs65vhi9im6zymmqqp02ayz0nbmkijvqxj" + "commit": "e0cf739c0765c3f0186b9d5f691c2c7750a484c2", + "sha256": "1kkcnczk295aib8r37qfl0bcvrvki12wi0r5aqjc1g8vklaf9vbp" }, "stable": { "version": [ @@ -49910,8 +50137,8 @@ "deps": [ "helm" ], - "commit": "a15fe1dd272d252ad933d8129db1dce02fd41adb", - "sha256": "1kc1jzk10nfd2v20g8dwnb6a944afrwdwnkzl06w4ba8k4yim7gi" + "commit": "06255ec6347efb8f1884b4a844f40f94239137bb", + "sha256": "1yp1l6na6mf91wym28pnmc06zwbhg2i3p9i1z7kx9wf3mc3982gn" }, "stable": { "version": [ @@ -50833,8 +51060,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20210922, - 615 + 20220318, + 1529 ], "deps": [ "dash", @@ -50842,13 +51069,14 @@ "org-ql", "s" ], - "commit": "31aeb0a2505acf8044c07824888ddec7f3e529c1", - "sha256": "1jfm4ahh58x3a3njigrbfzd86fnbyybbcgca2mgmxddcy6bszfp1" + "commit": "46f523d94a376b168176c75bbd0e3e0d00e61170", + "sha256": "0vrk7lx4n4imvsnqv50w6fmqnndr48x89gcmm375fw6zgy2m90bl" }, "stable": { "version": [ 0, - 6 + 6, + 1 ], "deps": [ "dash", @@ -50856,8 +51084,8 @@ "org-ql", "s" ], - "commit": "31aeb0a2505acf8044c07824888ddec7f3e529c1", - "sha256": "1jfm4ahh58x3a3njigrbfzd86fnbyybbcgca2mgmxddcy6bszfp1" + "commit": "f666fe150f1bf3c3ce43d0e15f90b20d43c2e772", + "sha256": "1mpq3v8lxqllnb4afqh7p9av0p9bha8ld7741zaw4hxb1252xgm2" } }, { @@ -51735,8 +51963,8 @@ "s", "searcher" ], - "commit": "40f0db0a94ad45fe1bdb8928a884784a5adb2bd8", - "sha256": "0kprf6c06bghs4iw4y5w8ar8l2zg2511qdc46h6dpsglrp6d79pa" + "commit": "fedb0c735270764a0fd38cebcd2b3c32612fd455", + "sha256": "0jv8qbffr5wckblkdy2ka0rryczr72m8kgmg5y2is1jajnxsfwam" }, "stable": { "version": [ @@ -52216,8 +52444,8 @@ "deps": [ "helm-core" ], - "commit": "244121903650c2d25a233d12b378060cf8b010e7", - "sha256": "0ii70wn3vadx8a36q2frmsvrmlpz1w58qgn2w3knjivj195knliw" + "commit": "c1d5f9a2ccdb133aaf6122632166ba4b6fbc188b", + "sha256": "05vd7gxa21lg49hhs0pg0skpidav9qmhcijkjakzi4v8p29qjg72" }, "stable": { "version": [ @@ -53618,11 +53846,11 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20210909, - 1114 + 20220317, + 2321 ], - "commit": "42f744ffb513cf2b95517144c64dbf3fc69f711a", - "sha256": "1f84d4wms8q2kcj5mb6ih6b5ni35fwqvckp2j3mcdznms759j7li" + "commit": "e0ba3e1829aedece7fd54a3c53d4d94376c3e707", + "sha256": "1p008l5va3fzdg3yzsz5bd9hc1p5nqa74rryl88d7qyxaq1bxm80" }, "stable": { "version": [ @@ -54223,8 +54451,8 @@ 20200929, 559 ], - "commit": "4dc29dcae47afa740f001f04ad7f7b77169ea8a6", - "sha256": "1sfbd0a6lgipcd1i8a843433pwf8rfspim13qx0lwghwzva0f7bl" + "commit": "a221c1af3d0a2bdc849adabd4044bb3f63895b54", + "sha256": "1warqfy5gq56mxypkpzd29k280yka2zzi131rrm1j2rr49ipj6dq" }, "stable": { "version": [ @@ -54405,11 +54633,11 @@ "repo": "humanoid-colors/emacs-humanoid-themes", "unstable": { "version": [ - 20220112, - 1138 + 20220305, + 930 ], - "commit": "3871746b51772c95b4419e978af069570c914f95", - "sha256": "1gbhz35chwzy75l514niw3sih3hwj68sn3zavvw8yzsn5yfzqd7j" + "commit": "5828705bcc3eab9af9dd36fd7dc96d48c3020d85", + "sha256": "1aij86pi2p1dy0dakbnm0a8mwy5vffayfk8y05jx3v1cishp324s" }, "stable": { "version": [ @@ -56079,8 +56307,8 @@ "deps": [ "impatient-mode" ], - "commit": "38ece99b3d566c48d9ba011a234869bc1b6f9a1e", - "sha256": "1za9rsf77f1qv2pqhw5myih8lgpdsa8n61pzj5z4lk5isj10cykw" + "commit": "8376bcfc2bbb3762e26dfc1bb8866c452f7935fe", + "sha256": "01g5r3sh1qma3vpyzzhixpw62y0kvphznpnfd80w4a5a3gbwp5m2" }, "stable": { "version": [ @@ -56220,8 +56448,8 @@ 20220227, 653 ], - "commit": "73682aac9aff60937a5f0187b1896c8f78f1b9cc", - "sha256": "195mpasf89jwr35q3gbcq286hx2siv9asyki4bz5wx175yp3yjjk" + "commit": "c6373bdfaf43255141983aea245571364f04d3cb", + "sha256": "0iphkl27ihnv2dmjaj1b3292xsx8g8m11r7hjikh421n9f1p5xy0" }, "stable": { "version": [ @@ -56426,14 +56654,14 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20220208, - 1627 + 20220315, + 1102 ], "deps": [ "clojure-mode" ], - "commit": "e47684de78da1ee470d42ae2a411909b2cf61d50", - "sha256": "0ngkhp4i3qgl6lgld5qbnrk8grd8r18mabrsana8z2pmy58hxz73" + "commit": "f511dcad0e0684c9609c7526930e88d11da989ab", + "sha256": "1xxjqf3j2k92sj4zwhkjywc6yr5x183r8n33lba2v3w5hcfgahd0" }, "stable": { "version": [ @@ -56525,11 +56753,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20220203, - 153 + 20220228, + 208 ], - "commit": "f892e6e74ffdf9f80019cf85f4e128dc66359266", - "sha256": "09kzmw9i4d77qjz1i37v40g683d9q7rw79bnxkj56acpd7h9dvk0" + "commit": "dbf4386bac12f1733257db6105e3f1fca05ffb79", + "sha256": "0sb72prfcglkjvpsgadyql5s9r28dbiihby3szl500lv7cfpc6ds" }, "stable": { "version": [ @@ -57456,8 +57684,8 @@ "deps": [ "f" ], - "commit": "68271c7784d9ef7eee61d1f55dc050225d3448e9", - "sha256": "1dzjldfljbmxfwvh3krfkjww6rxff55bwgah9ixmcrlw73gsz1h1" + "commit": "1ccf7219c2f78485aa23174e46aa8cd77a98a6a0", + "sha256": "0bws8fiqysqjcyw1y1ng1dic7nv7g1syml9hldb9gf7b0xan35yz" }, "stable": { "version": [ @@ -57967,8 +58195,8 @@ "ivy", "s" ], - "commit": "044aef3c5f9302cdf326f88b785a355fdeea6336", - "sha256": "1x9gw5xh390naa258xany93w1p37zbwmg87ikjvhxp4zidypwrr2" + "commit": "eb358d8460b944bf764cb6c01f205e6af94c4861", + "sha256": "07lazz8ca9sshrgswl47zz8gvc0niwyi397m3x3vrn5738qd0bf9" }, "stable": { "version": [ @@ -58132,16 +58360,16 @@ "repo": "ROCKTAKEY/ivy-migemo", "unstable": { "version": [ - 20210425, - 613 + 20220309, + 605 ], "deps": [ "ivy", "migemo", "nadvice" ], - "commit": "b91f341d1b70175baf989f0c6eee6573bf781a27", - "sha256": "0svvh14zhym9ssc0dc7wyr1pw0rhiirn2s7a0xk43wl2r0c36cgj" + "commit": "f31a2b314b81e328ce0222d8796b808230ddaa0e", + "sha256": "07l6x4aysxzrwlva7df5mdmb8kir1w9jpk7jqc5823zd00dmd6hf" }, "stable": { "version": [ @@ -58421,8 +58649,8 @@ "s", "searcher" ], - "commit": "55f5cf2ecc268686e7e124251f3c46c5065368d8", - "sha256": "1fahbnkg12dknkyrcszqm6c848rbalg0sgrxfanq7p9n7wpvskd8" + "commit": "63d55b3c333881d3c9d1e3f1ee50a72e79fd9e0e", + "sha256": "1mydy1akn25xb9wy8y08vmk997h2nvqdm48fnxldxbkli2d0zv1j" }, "stable": { "version": [ @@ -58570,8 +58798,8 @@ "ivy", "request" ], - "commit": "849b6db7ef02b080a86c1b887488e2935c31059a", - "sha256": "0f90dq8qhmsnm2hvnvzyb20nq0vmgnqzqa693scq69dv5rdjgwyj" + "commit": "273788e0d22a06cca1050eb1205d3fbc2245d001", + "sha256": "0w0aifinr8v0sdbj0gasqacwh5gmsb0rcg6jwi8ppga944wlkb2y" }, "stable": { "version": [ @@ -59428,11 +59656,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20211027, - 1852 + 20220312, + 1945 ], - "commit": "647cae28087529d18367f895d7ef689c7f64c6bd", - "sha256": "086h53mmdjx30093zazwylx3fg7jvbcjy63q4ph63ybizsbiy5lg" + "commit": "44280538a2b780536c56ee2a51b7a5b03d376a2e", + "sha256": "1x5k9d1iq33ds8cszcyl2bhbr8hkldq6hph1b77zayqyg00pnly4" } }, { @@ -59798,14 +60026,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20211229, - 135 + 20220316, + 1506 ], "deps": [ "cl-lib" ], - "commit": "997cac4c80a03062145b541b006c51cc91ee0c24", - "sha256": "1wcz3xji7viqxa5is81jd7in7x1fya6rzybm8qj9rwgdc8camvyb" + "commit": "b9ed9e406d59661bb099cb2307dfbfcc1d47beae", + "sha256": "15c5smxfh2dgk6da012fsvjz9c075cxfp2q8fglbalazplzwv4zc" }, "stable": { "version": [ @@ -60362,8 +60590,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20220218, - 512 + 20220313, + 633 ], "deps": [ "dash", @@ -60372,8 +60600,8 @@ "spinner", "vterm" ], - "commit": "fc67e4d603907160766cf22e8ef16029238e78d3", - "sha256": "04nh37izz04lxkvkxhsig8khbrrgdl4p6pkjsv5bxymnp84zwlw7" + "commit": "388c4c9ff915dfd5ded6906b62b76f97d59ada94", + "sha256": "1wpaspl09zrj27hw1d4mk935cdhn2cs8jrg53vx7smfppip3ddb3" }, "stable": { "version": [ @@ -60613,8 +60841,8 @@ "repo": "psibi/justl.el", "unstable": { "version": [ - 20220226, - 1619 + 20220312, + 1104 ], "deps": [ "f", @@ -60622,13 +60850,13 @@ "transient", "xterm-color" ], - "commit": "73cb3a8f519dd555f73b981ac9c803b7489ce25b", - "sha256": "0d68zhzclvnhyxvb0l6a841mvbfawvzryrpck36x06wy3899jn5l" + "commit": "9f77366aaf2227bb0cbd3cdc0f78088032f2e873", + "sha256": "17l4lh9511dw4ri7csvp8258q59brhgrkir60kqmzxglrpmgjj6s" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "f", @@ -60636,8 +60864,8 @@ "transient", "xterm-color" ], - "commit": "73cb3a8f519dd555f73b981ac9c803b7489ce25b", - "sha256": "0d68zhzclvnhyxvb0l6a841mvbfawvzryrpck36x06wy3899jn5l" + "commit": "9f77366aaf2227bb0cbd3cdc0f78088032f2e873", + "sha256": "17l4lh9511dw4ri7csvp8258q59brhgrkir60kqmzxglrpmgjj6s" } }, { @@ -60969,15 +61197,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20220131, - 1652 + 20220317, + 1238 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "ff7f31b100421328b6b8c57a5b640a26b9d914c2", - "sha256": "066iqbyvapc7i41xlci2jlnvdkdhkv7c8rj4ambz8rbj6i2sjb5s" + "commit": "78df90fa411c0d24d884abd47bf63a167231a84c", + "sha256": "05z7w4ig17w5vxz3g4waghkq8ay9cdjc22aihn34h3q7h1vlv5dd" }, "stable": { "version": [ @@ -61013,10 +61241,10 @@ }, { "ename": "kapacitor", - "commit": "db1f8cfcda2fa2b9be74a6cd9f95608e8b3f50bb", - "sha256": "108b3y71p7s3lcwbqxp7hy2l304yj4hxm2nq8iv7ljr8av1q7kn6", + "commit": "afb7ebaf3b1b1b3ce0162de9b8d586d699fdeac9", + "sha256": "0yccmgzmhwjnnzlqhyq326adnxkf3s27gg67g1w1hba1ippg7l60", "fetcher": "github", - "repo": "Manoj321/kapacitor-el", + "repo": "manojm321/kapacitor-el", "unstable": { "version": [ 20190414, @@ -61119,11 +61347,11 @@ "repo": "conao3/keg.el", "unstable": { "version": [ - 20211105, - 316 + 20220309, + 647 ], - "commit": "f0a719892aed5b1b4b644f1339d1ace99c656100", - "sha256": "0vk4fdkai0ssq31ycckkz4iwp35ip5d8lnyisv4m3b98jv3pb6k0" + "commit": "944e36144d92a798e1fd0f3d83fc6347d57a976e", + "sha256": "1flri9jmhhhak2zx46sw86jm05mw4banyk1ag2354v1irsc81piv" } }, { @@ -61134,11 +61362,11 @@ "repo": "conao3/keg.el", "unstable": { "version": [ - 20200601, - 333 + 20220307, + 829 ], - "commit": "f0a719892aed5b1b4b644f1339d1ace99c656100", - "sha256": "0vk4fdkai0ssq31ycckkz4iwp35ip5d8lnyisv4m3b98jv3pb6k0" + "commit": "944e36144d92a798e1fd0f3d83fc6347d57a976e", + "sha256": "1flri9jmhhhak2zx46sw86jm05mw4banyk1ag2354v1irsc81piv" } }, { @@ -61543,8 +61771,8 @@ 20220222, 639 ], - "commit": "f0f8b04f9f8e7863bdd3459d6ee6fd88ecd55dcf", - "sha256": "0vkaz5ifqasn2q51hnx024pdbr48xvx07g1rclfpw26990ah6yqa" + "commit": "33e5e50b795a48315d869d9545c650b7641eed0a", + "sha256": "12zkfsbsbf3s5ifyfrbv5xyyrif59rkk89in83ghys03qp5kmybs" }, "stable": { "version": [ @@ -61799,19 +62027,17 @@ 20210318, 2106 ], - "commit": "71aca81024898c9c6ef88962bddc5462a93ffa0c", - "sha256": "05w51blhz9527idrky4c9j24vqlk7dnygws4ynsp78icn3lmixx6" + "commit": "06c15c1f7567c6dbc97248c85467bdfd2fcf3cf8", + "sha256": "0w36wggnmf7dq0kqkkm66zq9adq2r1f8zrdjw6qnbg7b9bdxwxik" }, "stable": { "version": [ 2, 1, - 0, - -1, - 1 + 0 ], - "commit": "87b60702e0bf8eee929ba9ac4db725d12274d7ba", - "sha256": "0ppy54rvknghjcxrbja72n45yn5ljcqbvddb3rvn8pfpzih6j1pg" + "commit": "023bd79b90f9831b45bb8eb449346648aa5fe5f8", + "sha256": "0q0hn1q5l1pg3ma2x922m93vpfax7x9cmm8psy3qw7b5pf4cillk" } }, { @@ -61822,14 +62048,14 @@ "url": "https://repo.or.cz/kiwix.el.git", "unstable": { "version": [ - 20220210, - 1403 + 20220316, + 847 ], "deps": [ "request" ], - "commit": "d21cbe30d697fa6720d016c52a807c8502719d4d", - "sha256": "0yapgm2fp9igc39did3h1kf3m236683h08n6615kldq8wxd5w774" + "commit": "444f686a7f75db788d54f544b923a3532732eb8b", + "sha256": "1pdm69ghdfzv738c5y1b61d12cfafkvcmmjf0v4m3qai2xxqk4sn" }, "stable": { "version": [ @@ -61875,18 +62101,18 @@ } }, { - "ename": "kmacro-mc", - "commit": "08973ee8f00035da7092e9eb8b850323ae83a916", - "sha256": "0ysgfrv0y4i4v6nppcs3gflx5qyx3jnkgygv0y24f833qnrnjgkd", + "ename": "kmacro-x", + "commit": "207d9fb6f29a426ce1aeac517ae31d69aa1f4d8a", + "sha256": "06q9lv3a4jsn6a9xfp0aw980pl938h817bagqq5xkh0q169f34qm", "fetcher": "github", - "repo": "vifon/kmacro-mc.el", + "repo": "vifon/kmacro-x.el", "unstable": { "version": [ - 20220123, - 2254 + 20220317, + 307 ], - "commit": "c7fe2f8200ae993787246ad6c8a5021b4946b118", - "sha256": "0q3gwf42fsii6c1ql8imjryv0a47gam72yw5gbqsrhwiqr81lyll" + "commit": "f9df322d0c894129ac96e9a4fba03077957157be", + "sha256": "10gvrj5qsi6nvldl4rnxxqbwr92b2y53gsx8lk67ljrcq70vqgd1" } }, { @@ -62116,8 +62342,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20220104, - 2320 + 20220318, + 2124 ], "deps": [ "dash", @@ -62125,8 +62351,8 @@ "transient", "yaml-mode" ], - "commit": "68d2925c7942039e3fb3eb6c113adec5369c6c72", - "sha256": "173ympabfa14rc6y4f3rjxapj7py0dsnzp8zg7q2gkyxv1iwhh55" + "commit": "6ce4a13b1de666a90f5acfdfd8c78f6ea2013c60", + "sha256": "16xam2yhj77mj388hrzbh2ah8y1k5sbfacavjmriaxrnn5c8v16d" }, "stable": { "version": [ @@ -62151,15 +62377,15 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20210922, - 2325 + 20220318, + 2124 ], "deps": [ "evil", "kubel" ], - "commit": "68d2925c7942039e3fb3eb6c113adec5369c6c72", - "sha256": "173ympabfa14rc6y4f3rjxapj7py0dsnzp8zg7q2gkyxv1iwhh55" + "commit": "6ce4a13b1de666a90f5acfdfd8c78f6ea2013c60", + "sha256": "16xam2yhj77mj388hrzbh2ah8y1k5sbfacavjmriaxrnn5c8v16d" }, "stable": { "version": [ @@ -62313,6 +62539,21 @@ } }, { + "ename": "kuronami-theme", + "commit": "f1fe04f11b3ab6ee00a36d2d171d7042aebe3115", + "sha256": "00f5lxhpqy1p7nlaw7nka90hy95dqrg7flfv5i9f8nrx9r3r7rpp", + "fetcher": "github", + "repo": "super3ggo/kuronami", + "unstable": { + "version": [ + 20220309, + 604 + ], + "commit": "910e8fa56a0cfe89dae888522f9fec4045d017fb", + "sha256": "0pghi50ffzlp7igvq81dmrbrwyj9ivl5kkxm47hff7qgb9rvx8n1" + } + }, + { "ename": "kv", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0c10r7mhg517p62lc87ccqypsjrm28xh3bgv4f01fnx569jqgzgp", @@ -62380,29 +62621,29 @@ "repo": "tecosaur/LaTeX-auto-activating-snippets", "unstable": { "version": [ - 20220108, - 1536 + 20220301, + 1629 ], "deps": [ "aas", "auctex", "yasnippet" ], - "commit": "14c6cc2ff8c0c6b20b83fb075b94a8661a985249", - "sha256": "1vz0q7z3n6iv2m3xiw5m5f17ifig47c08zz2sm3svqwjq328pnwh" + "commit": "b372f9a44bea03cce09b20cd2409e3ae3fa2d651", + "sha256": "1f2cfvc4iz71x43z8f7v24cnfdvn249685qqz9lz16j2sga9f3y1" }, "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "aas", "auctex", "yasnippet" ], - "commit": "e9bc939237bed4ce50d3d403120f7206c835ea4a", - "sha256": "1z2r52x9fsjm1y2m8n0fm9ymd0dx798iw5b3x79fkhnrrw4wfq0s" + "commit": "b372f9a44bea03cce09b20cd2409e3ae3fa2d651", + "sha256": "1f2cfvc4iz71x43z8f7v24cnfdvn249685qqz9lz16j2sga9f3y1" } }, { @@ -62513,13 +62754,13 @@ "highlight", "math-symbol-lists" ], - "commit": "df2081b207ddef0fe1b83d8a2405858d8e361bcf", - "sha256": "0v2xj6x6g11g77lxzj4j777ajkwf448h0a71xzy6zggq16hvw9ma" + "commit": "c73645f35868bf436f9b50dc81a75b58c7e10806", + "sha256": "0bpyzm71b1fh48yp73m4vh99c7q4sd69lynkww6c8yrjdqlwbb27" }, "stable": { "version": [ 2, - 1, + 2, 0 ], "deps": [ @@ -62527,8 +62768,8 @@ "highlight", "math-symbol-lists" ], - "commit": "215a0e2434811f026c357f92ca15652e31a945a5", - "sha256": "026vp7h5i6yqvafap9n1g3sh0a3zz8pgbxy4nkhnfg7spdr29svm" + "commit": "0476fbec66e99750abe9d60c3aa9cb9a52189bea", + "sha256": "0bpyzm71b1fh48yp73m4vh99c7q4sd69lynkww6c8yrjdqlwbb27" } }, { @@ -63295,11 +63536,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20211214, - 1449 + 20220307, + 854 ], - "commit": "f47df6a18060002b47352b9c4b502556204df61b", - "sha256": "0g7qxl8b6cazp4vlqr8r6pksmm9vlrl92142k18vmfbabnjgfdm9" + "commit": "b55384d9cd14aa0ba3eb100660f929cfa6674558", + "sha256": "0wn9v7qarciq16hhcl8dy8yp1hcdhmircqkla59g5khv3qybjphs" }, "stable": { "version": [ @@ -63791,19 +64032,19 @@ "repo": "buzztaiki/lice-el", "unstable": { "version": [ - 20220215, - 303 + 20220312, + 2215 ], - "commit": "b15230dbfc66cc92bbde8f9fd369522d7666c0c7", - "sha256": "0xpjcp4b76lc0d5jpry055d572rdp93vkbm8ck5yh97wy1y2837w" + "commit": "0b69ba54057146f1473e85c0760029e584e3eb13", + "sha256": "06plnrxj6kgnl9mjcbc48mgagpa60yyyyribwicmcgg9pgrs0wad" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "69f2d87984f3f3d469db35e241fbbe979384cd03", - "sha256": "0hi8s20vw4a5i5n5jlm5dzgsl1qpfyqbpskqszjls1xrrf3dd4zl" + "commit": "0b69ba54057146f1473e85c0760029e584e3eb13", + "sha256": "06plnrxj6kgnl9mjcbc48mgagpa60yyyyribwicmcgg9pgrs0wad" } }, { @@ -63838,8 +64079,8 @@ "deps": [ "request" ], - "commit": "19a77b73e655d4ed5de50674ad0f8c44c8f6f7b1", - "sha256": "0a7fzbapygdq6jrwbiy0cmqyf19hdzrzv7xd1f1pwa8vknhzjn7m" + "commit": "52fcd8efc293694af1b23ea401a2991f8554dbbc", + "sha256": "1cp0301l3byhzd4gyil9p7iljfgkjn2c93ilc9b88b1kj7cvbp2z" }, "stable": { "version": [ @@ -63880,17 +64121,17 @@ 20220209, 755 ], - "commit": "35d666b3e14c69eeb968f16ca8635a57b908d8ff", - "sha256": "0bywj3y3cz2wd0xzdl3plghpzh2an8wkl07brrkkhpfy9mcrfv0p" + "commit": "ce20b1a708224cc01dc267f3f7b76b04b0ee9548", + "sha256": "0h81778qq5j18gq8vyynb4x41zczvvprvvnis0xjl1mhpi5z2l72" }, "stable": { "version": [ 1, - 0, - 2 + 2, + 3 ], - "commit": "7032d39df69b5d727215c1f31e5bbc29970a30a1", - "sha256": "0bywj3y3cz2wd0xzdl3plghpzh2an8wkl07brrkkhpfy9mcrfv0p" + "commit": "8fcf8424cbfb06d3b5a89b2ce60826a5e4bf76f4", + "sha256": "0h81778qq5j18gq8vyynb4x41zczvvprvvnis0xjl1mhpi5z2l72" } }, { @@ -63901,16 +64142,17 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20220206, - 1919 + 20220309, + 848 ], "deps": [ "fringe-helper", "ht", - "indicators" + "indicators", + "ov" ], - "commit": "c2e3b1411665f882337adbaf53af831ee10e3034", - "sha256": "1x81saxhzlaf32hhjaah1z6s7vn7jcdxxpckj4na3zx3ncg1r5jp" + "commit": "d60c0d498f12d550200d505cd8b43f953eff2ae4", + "sha256": "1kx2k2fsygf9qq9wq9cs6h7c4lr58ip781l9yrffj2vhhhmrg5kj" }, "stable": { "version": [ @@ -64155,8 +64397,8 @@ 20211004, 1429 ], - "commit": "87241398f185a134940680c1f0d0f24951dabed3", - "sha256": "0i26bzba5ysvscghgc8lih8y3vvyl6jbmlny9m7790fgy9zkps1g" + "commit": "08e6da70e485307b7c5777caeb60737de183d228", + "sha256": "0d5vkm5cpnl38zfbjfhbl6wffmrlxx4bxkh4w4f04pr97i899n9z" }, "stable": { "version": [ @@ -64660,14 +64902,14 @@ "repo": "Atreyagaurav/litex-mode", "unstable": { "version": [ - 20220225, - 2010 + 20220308, + 1707 ], "deps": [ "cl-lib" ], - "commit": "533a0c0777e25134d2782917648b6e8d8274a3ac", - "sha256": "0pspw0w0w8jzi97hhsrgniwjymf7ri59kqkjv9lrxycxddaccc5q" + "commit": "59ef93dca6618c42db1b61fe0a44bdc8faf04506", + "sha256": "08i5v97azfxkp4aqsg2kijyy2w5swxhkplvp40v1bswyy3kn176v" }, "stable": { "version": [ @@ -64749,8 +64991,8 @@ 20220208, 308 ], - "commit": "0070f01c244bd103b935052356f16b9c5d1d7387", - "sha256": "0l0w9p6vk6cjm07cmblrsk7f6vnz9b3i39yg6bzklzzqiwaskj7g" + "commit": "38864c22bf68c7a8975d1d5b2ba4881f75ac2442", + "sha256": "0lwnsxpggp5rwn7z55sgq1ibwzkb61avpna74q3gfjq2ncfx03jr" }, "stable": { "version": [ @@ -65145,8 +65387,8 @@ "ht", "s" ], - "commit": "ab124ae3b38e77f5fb14c8902928d7b010b00b41", - "sha256": "1fsx0lyfj05wqnl0i8dw1slxndcg0b2p1fmcdhxvmsa5k4l11v2y" + "commit": "b5ca8bd44a900fb85636fec9b326d0c117d3b8a6", + "sha256": "1ay81g4s02jkwwy62s2c3218b5z9z012nyrqihlx44fyglyi27b1" }, "stable": { "version": [ @@ -65318,11 +65560,11 @@ "repo": "petermao/look-mode", "unstable": { "version": [ - 20220213, - 126 + 20220313, + 2103 ], - "commit": "c6e7baedd652a9a2b7e6b9418039e8f4922e0baf", - "sha256": "0r6yp86nbbxv6m4mzh7xya2mqxrq77s3qpzf5w5aj9hlnx1p5psl" + "commit": "4ab32794b07f77b1d243dc07239c417f20cab7b8", + "sha256": "0k7mnwqkd07lwwbb7vn5bfncrp6alfggv9m07bzk7c1v4s9fqwhw" } }, { @@ -65356,11 +65598,11 @@ "repo": "0x60df/loophole", "unstable": { "version": [ - 20220227, - 1436 + 20220311, + 1130 ], - "commit": "ac0e295080f08797b6a161ff1df550ff78e9c759", - "sha256": "11ngiihl3daynk03z9ndl3ivkgxbx0k4pg4qynw1n1j6pxasb0b1" + "commit": "bd93fcd42fc2db76bf6bc3fbb4eb7401444bd04d", + "sha256": "15q0y594k5k9n96dygscc4a6jyslwri5z8sf1kg1shpkwyj3bjyz" }, "stable": { "version": [ @@ -65500,8 +65742,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20220212, - 27 + 20220313, + 1835 ], "deps": [ "dap-mode", @@ -65511,8 +65753,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "40aa90d8ad0ec6d5f9682e135eefb794b675dc9a", - "sha256": "0dbbfsspwfx654y8gkn12whf5942lchcma8ki6jy06h7pbx4wgm8" + "commit": "01b58674842197eb565fdbaa723e9e536ae6d6ab", + "sha256": "1damw69qmgrw7rbsgk7mkni1isgargg17y68s7c4r5x0hg42wksy" }, "stable": { "version": [ @@ -65604,8 +65846,8 @@ "request", "s" ], - "commit": "f54d1a7ec9ee1b7bd4fd71490038064d49caa1b5", - "sha256": "0vjwwfl54lm0szsrr40mjzk3r10j0cmiks2gbwhf1aa948lwda82" + "commit": "20112b40fd3f6cbd20c659ef43a6da6635e610df", + "sha256": "1p3f90f0gsa8mj9pv905f51zb1ymyfbhz20171hv69klz4hlqfsn" }, "stable": { "version": [ @@ -65632,14 +65874,14 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20220226, - 1437 + 20220307, + 2312 ], "deps": [ "lsp-mode" ], - "commit": "69ddd5d32d6d7d658ec3f89c8ec6280e912e6be8", - "sha256": "080k3ghhrnlnlq8dzqki6jwnxg3dvg2kzcsx8214k7sfp47qfkwn" + "commit": "7cf64944ab3a25ea5d6f8d5e0cd33124182df991", + "sha256": "037wcvan0185bhzzhi4phw9z245a28s29zvyfik04c27n0bhm2xf" } }, { @@ -65862,8 +66104,8 @@ "deps": [ "lsp-mode" ], - "commit": "daad61dbdbdac83267c6de04a13f8e2ecde3226d", - "sha256": "1aky40r4850d4203wj1wxgx3xq0pb8rdvcv3b957nclvn8fmzvzw" + "commit": "435128d5cdc8822ccf1bb58f45184cdd9fb8589f", + "sha256": "197drh6lwghdcf52hdk7kc315jlpxlaz8cj76b4q28s0g63bh8bc" }, "stable": { "version": [ @@ -65888,8 +66130,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20220218, - 1105 + 20220314, + 1111 ], "deps": [ "dap-mode", @@ -65901,8 +66143,8 @@ "scala-mode", "treemacs" ], - "commit": "5891149014308e73faf025bf40cd099cc185277b", - "sha256": "165040pm6g8sm1afcdp6x6jciqpix12cskn7jhy21vr5ff0awsiz" + "commit": "b7fe3ade85d020560947f1a4f4913130c9dd1809", + "sha256": "0dq18p5bqqyf36mqck0iprydjm77y29k8n2d25xz26i64s3pkykq" }, "stable": { "version": [ @@ -65932,8 +66174,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20220227, - 2032 + 20220318, + 1246 ], "deps": [ "dash", @@ -65943,8 +66185,8 @@ "markdown-mode", "spinner" ], - "commit": "2d640a146ad164f87c7796826791d7bcb85a8e7a", - "sha256": "0j7c5m7n7g7d16ldcqicw1f12dwcbak9gx5606qm8q8nlhk76mnm" + "commit": "c6482c1bbfa366a1fc52c32c03164ac77f297022", + "sha256": "0nxjjl7hcbf7br919rkl4q5zixy7r75s08ag98mksbwrfr2mmgm1" }, "stable": { "version": [ @@ -66141,15 +66383,15 @@ "repo": "jjlee/lsp-rescript", "unstable": { "version": [ - 20210519, - 1101 + 20220314, + 1957 ], "deps": [ "lsp-mode", "rescript-mode" ], - "commit": "aac9673855314a1f34037eb785bccbd3f66d7695", - "sha256": "0jyn471mdklhw1il6bbnv5drrl0raiyh17p1qi6rdn20ywi1dbx7" + "commit": "7baf9adf10234cf964feefae99050268e9bc5681", + "sha256": "09jh4q3i0b71srfpsr4w0jk5rn9rz359v8k1pk80636g7448k8gl" } }, { @@ -66218,8 +66460,8 @@ "deps": [ "lsp-mode" ], - "commit": "dc4d5246afe8620cdffaff1a362529f5d63b1ef5", - "sha256": "1sb7apaqxv3mf601v3wxnx3v9jb71avh5m0dw4r80wbkxcgi65f2" + "commit": "010318052021ec041727e58e41752af094c8827a", + "sha256": "1rwszx7qza3nshcwvgq0lq3bnrggyq45k4363bhcqf95fbjl5jxl" }, "stable": { "version": [ @@ -66278,16 +66520,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20220104, - 1635 + 20220311, + 1634 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "21ce926eedd41ef305c2d89412506ce59b1a7eac", - "sha256": "0v58imgrcgqs4fla1cncsd3wk6a8d5v7j014nn0pirypwfznyq0j" + "commit": "96b1ecbfbf87a775f05b5f0b55253376a3bd61e7", + "sha256": "0xjskdws354zbs906frcmx37862xldpai09sicdk8jy2sdwhamk6" }, "stable": { "version": [ @@ -66493,14 +66735,14 @@ "repo": "emacs-pe/lyrics.el", "unstable": { "version": [ - 20180812, - 1841 + 20220206, + 116 ], "deps": [ "seq" ], - "commit": "d0b920be634a5be81ad49418cfaada0f0a57d6cd", - "sha256": "0926avnlxi8qkr1faplk1aj4lji0ixa4lv81badi5zsmpyyrwmm7" + "commit": "c3d42f1e039941f32f49252e1b1610de337b4470", + "sha256": "02b0b68bh4jymx08zy2dsgs134mknk1ygb10mpqmyy1z88785ybd" } }, { @@ -66774,11 +67016,11 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20220204, - 1229 + 20220311, + 1219 ], - "commit": "0168a410ea2e25c1e98c9be6381ba0872d1e1ae1", - "sha256": "19v5902fij5q6cfzxx8b9lsm5kkgrzsd9lccj7di1aj2yf02n4jx" + "commit": "86f1ca9f0f45e61a1ac7b96c809a85defc4ca665", + "sha256": "0scg4n7p9k7kj18w2v73f3w5f6xwf7fpjvf0sa253jwpdk6ln5b8" }, "stable": { "version": [ @@ -66798,8 +67040,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220227, - 1341 + 20220318, + 1627 ], "deps": [ "dash", @@ -66808,8 +67050,8 @@ "transient", "with-editor" ], - "commit": "0f96d398346293b4d1f60dd878a490c25917cd8a", - "sha256": "1q948ihwfr55spa81vpg3lih6bc0vappl0xlgdagh7m55mg561bm" + "commit": "0b3b18452cf7b72e067451a453c55c44cf1d8c89", + "sha256": "0g8p4pjvijrkwj4x9wqkjqr63l92nfz6cbfxlw67xjlfilclmjlj" }, "stable": { "version": [ @@ -66836,15 +67078,15 @@ "repo": "magit/magit-annex", "unstable": { "version": [ - 20211004, - 2314 + 20220302, + 1725 ], "deps": [ "cl-lib", "magit" ], - "commit": "018e8eebd2b1e56e9e8c152c6fb249f4de52e2d8", - "sha256": "1amr2c08mq1nnn6k66mgz4rzyni4np7gxm96g4qyla2cbfbachgk" + "commit": "efe484644666c6b7c544b0fb7b87e30703fa9425", + "sha256": "1n2q9px8b3s3732a6yiz9gvfxbya7sa2qnxidzcn4gdp867l103c" }, "stable": { "version": [ @@ -66888,14 +67130,14 @@ "repo": "ideasman42/emacs-magit-commit-mark", "unstable": { "version": [ - 20220211, - 548 + 20220315, + 250 ], "deps": [ "magit" ], - "commit": "4845e535a38da2dae1b2dd857cef9eb15abefb41", - "sha256": "0vnp1xn7s447waa1319bix8xnvwbbz0vshplzl37zdjyh1myf33k" + "commit": "f0fff86ffb669357b0897132d386c4c19dbf300e", + "sha256": "0l9fg19izp4f4ph9by1zz6nwpxpvgdl77kcbxykphf22wx5j0jyr" } }, { @@ -67105,14 +67347,14 @@ "repo": "magit/magit-imerge", "unstable": { "version": [ - 20211004, + 20220306, 2311 ], "deps": [ "magit" ], - "commit": "1ee213d7fa1536c86c128d09946b44ededbfac9c", - "sha256": "1virc4ps25nwv8jkyvlb4ylxpcz676bfw449izaly97f2f2a91hk" + "commit": "37bca48218dc32cad964e01e0f9936a90f634fba", + "sha256": "064mq1xp970gk23l1rpshs1a4spqq4q61b8jjlc6jps7ls888v6j" }, "stable": { "version": [ @@ -67135,15 +67377,15 @@ "repo": "Ailrun/magit-lfs", "unstable": { "version": [ - 20210918, - 2000 + 20220314, + 1957 ], "deps": [ "dash", "magit" ], - "commit": "ee005580c1441cce4251734dd239c84d9e88639e", - "sha256": "1mv5rw65gn2rsk654q1ccp7hdg6jfap123b652cf9chwxy6c6nrk" + "commit": "8ebe246f20f4ab5c9f191c38137833c7f01a0432", + "sha256": "08ild7xc9m8pvkb23x5kxdc7ar7gz7470fng1f0zjlk4izbf1nh5" }, "stable": { "version": [ @@ -67174,8 +67416,8 @@ "libgit", "magit" ], - "commit": "0f96d398346293b4d1f60dd878a490c25917cd8a", - "sha256": "1q948ihwfr55spa81vpg3lih6bc0vappl0xlgdagh7m55mg561bm" + "commit": "0b3b18452cf7b72e067451a453c55c44cf1d8c89", + "sha256": "0g8p4pjvijrkwj4x9wqkjqr63l92nfz6cbfxlw67xjlfilclmjlj" }, "stable": { "version": [ @@ -67237,14 +67479,14 @@ "repo": "dickmao/magit-patch-changelog", "unstable": { "version": [ - 20220209, - 1857 + 20220313, + 1229 ], "deps": [ "magit" ], - "commit": "e792755514cb5a98b94fcd1c5eacd487f7e04d7b", - "sha256": "1x6663ycyvxmacww7cdq82cxbjkpgjpwcvxgaqgh6pfc2wwqiwml" + "commit": "96936d2bd92c8bbf87f65bc293f3246014bc2764", + "sha256": "1k0674f9c0h468nl791nrvngymgbdljnsrwapnki5b3zvaxglckc" } }, { @@ -67323,14 +67565,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220223, - 2013 + 20220311, + 1044 ], "deps": [ "dash" ], - "commit": "0f96d398346293b4d1f60dd878a490c25917cd8a", - "sha256": "1q948ihwfr55spa81vpg3lih6bc0vappl0xlgdagh7m55mg561bm" + "commit": "0b3b18452cf7b72e067451a453c55c44cf1d8c89", + "sha256": "0g8p4pjvijrkwj4x9wqkjqr63l92nfz6cbfxlw67xjlfilclmjlj" }, "stable": { "version": [ @@ -67393,26 +67635,26 @@ "repo": "magit/magit-tbdiff", "unstable": { "version": [ - 20220204, - 455 + 20220306, + 2311 ], "deps": [ "magit" ], - "commit": "5fc67d0ca96d5db8f51ed9f2d9e3a7f69e7cd497", - "sha256": "1gzv5d1iar53b020qy17hrvqc5h0phx4hz22lkdmw0br554vyzgl" + "commit": "ae9345d867539a4c5c635be04df2e26468444da8", + "sha256": "1klns192jlp0ba9gklkkjjhl33k7dha0ircpm4d11y8vcy3c3zh3" }, "stable": { "version": [ 1, 1, - 0 + 1 ], "deps": [ "magit" ], - "commit": "fef1b7772fe192c434089b67644ff93765e384d4", - "sha256": "1g5nsg6zb3jrm7w1ssawv109ai2l7dpnd1dqrjsry2dnx1mxd212" + "commit": "ae9345d867539a4c5c635be04df2e26468444da8", + "sha256": "1klns192jlp0ba9gklkkjjhl33k7dha0ircpm4d11y8vcy3c3zh3" } }, { @@ -67436,8 +67678,8 @@ "s", "transient" ], - "commit": "60152d5c4e4b73e72e15f23ca16e8cc7734906bc", - "sha256": "1ri53hnhamp3b9nh9dld6wxjvsxrk883kw900gglvw962ndimx5x" + "commit": "12a7b80dc421804450f01a3f23e39dfb618c8bbd", + "sha256": "08z33zy50b8rmkzdvlf5555r87dmx7ng49kpm12ja46m7mycclcp" }, "stable": { "version": [ @@ -67528,8 +67770,8 @@ "repo": "vermiculus/magithub", "unstable": { "version": [ - 20190512, - 2316 + 20220315, + 117 ], "deps": [ "ghub+", @@ -67538,8 +67780,8 @@ "markdown-mode", "s" ], - "commit": "b75bb92eb5defeb358aac09bc50f6067e3c1d250", - "sha256": "1yxkzxxlbx1bhdxry114r5h6ncipycg6szn8gs8xnzj6yi5niyig" + "commit": "dd62c7057155c0a334e6d9087779a2923d2300b8", + "sha256": "1v8nsv1y4fa3y2skx1w3gbf438zlf00zlmsxkh692kmvbkx4sdf4" }, "stable": { "version": [ @@ -67905,8 +68147,8 @@ 20210108, 1832 ], - "commit": "f4b37fffec7b6608a597e6a3f6900634802807b4", - "sha256": "0shk5n4a88r347h1fhayn0gzi242mc5b7i6b4aw0s63kw2yd4h6r" + "commit": "3a8398de3a79ca03f9fe55f6f31f70f3f62f8999", + "sha256": "1788n96c5h2s0qmwc7xw9anhcw6l0qqfbgx8mrp2n95mdix04n18" }, "stable": { "version": [ @@ -67931,8 +68173,8 @@ "deps": [ "manage-minor-mode" ], - "commit": "e4d748adcf52c6d9483cd9d8bd91a1288c2d7052", - "sha256": "15321wq812plbn81g5hjagxz6pyg7z896zhicgac0v6dv0jz7cyf" + "commit": "492307c6c67c1b397084d85129e2b82cfd2c6556", + "sha256": "1di0m42hxi276a1axqayzvwqalw77zxy89qlnshldh373r5s20ax" }, "stable": { "version": [ @@ -68108,19 +68350,19 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20220226, - 1237 + 20220312, + 1357 ], - "commit": "5767b6ff49e26ecd6aa26f552397d5d2b8213d25", - "sha256": "143d57fy5i5ziwfxxix595k0f98ay5l57x5z69g8lkp6nb7b1rq7" + "commit": "e63d27e6fb24ed16339de9d813c555d40aa1e4ca", + "sha256": "0pfl2h0xgd9jbpzw8b25pa601gad8p4l470yrkhzyzv5hs7774s4" }, "stable": { "version": [ 0, - 12 + 13 ], - "commit": "e9540a7b80f9c4d044748b88720e5cba3e30c20a", - "sha256": "1a4k00g2pp7mk0x5zhqbxvv2igfjdz6bfy2g3hps2ygf4h12wbhg" + "commit": "bd98c02720bc59a5c185c293f60595d06dfd7637", + "sha256": "1qk6j7l39z92h4kvvbwcs85ilyx3d6y0l8zm33iar2pjnyks1kq3" } }, { @@ -68443,8 +68685,8 @@ 20200720, 1034 ], - "commit": "74d9f566a41805cf7f2d49bb69400cca91fe7b8d", - "sha256": "0rmavxh8dvldzbc0glcg9ya2dv5gnv2nfrzc5r9yrj2slkip51qn" + "commit": "9fb36834f151ff47ae4122cc18c341f366f035fc", + "sha256": "0yb4kr5986shjjd8j6sjvynh4ijmq38y4yjy2hmrzk7chd658qnc" }, "stable": { "version": [ @@ -68632,11 +68874,11 @@ "url": "https://git.code.sf.net/p/matlab-emacs/src", "unstable": { "version": [ - 20211122, - 833 + 20220311, + 1955 ], - "commit": "c945bf50251150e0d4ad7ee751c7e9615cb4b3e8", - "sha256": "0f0h73n5zg766aqhd8w0s2lbg71av4nyswzbcxprah7l57yr6kzi" + "commit": "45febb409c474417562f79e90387d3568b4fc024", + "sha256": "0sn4c8gbvf68sn3qh75lq499lqds1rcc7ccifj5zgzxcgaf2x2wf" } }, { @@ -69139,20 +69381,20 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20220218, - 2024 + 20220313, + 809 ], - "commit": "7d3139c9f55ba85c00e5f5b1a396be98fea1762a", - "sha256": "1brw32ghmk0l98wk0n34v8as0g816n87f8drq794y8hkx8iiw6lz" + "commit": "57656a69d3c29ddb0d18697491f80674e1097eaf", + "sha256": "11iz95lm25vpdc3plpm3h1zlmfmfz08xlman8iqk5fa13636v7hj" }, "stable": { "version": [ 1, 4, - 1 + 2 ], - "commit": "b494651e1e02a232c5b9a359d6d4474ade736baa", - "sha256": "1w6586q237c5li8c0rrivissvhn2hic6l199yr9qx92mm9cvic0q" + "commit": "57656a69d3c29ddb0d18697491f80674e1097eaf", + "sha256": "11iz95lm25vpdc3plpm3h1zlmfmfz08xlman8iqk5fa13636v7hj" } }, { @@ -69163,11 +69405,11 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20210720, - 950 + 20220318, + 2012 ], - "commit": "8091fad9953c6b9840a53aa53336fdebe51658b6", - "sha256": "1q8hvj2l7bwswvx6qjbqac7cmi5x6k0kb8gbyih5v2dsbbqlijxs" + "commit": "fb5cfc2a5091ffa77894629538efb0ec953fb6e7", + "sha256": "13g281pyfdid3kcd00x04k12f5b4zyx3xk19h636wah9hn27dyjn" }, "stable": { "version": [ @@ -69195,8 +69437,8 @@ "auto-complete", "merlin" ], - "commit": "8091fad9953c6b9840a53aa53336fdebe51658b6", - "sha256": "1q8hvj2l7bwswvx6qjbqac7cmi5x6k0kb8gbyih5v2dsbbqlijxs" + "commit": "fb5cfc2a5091ffa77894629538efb0ec953fb6e7", + "sha256": "13g281pyfdid3kcd00x04k12f5b4zyx3xk19h636wah9hn27dyjn" }, "stable": { "version": [ @@ -69228,8 +69470,8 @@ "company", "merlin" ], - "commit": "8091fad9953c6b9840a53aa53336fdebe51658b6", - "sha256": "1q8hvj2l7bwswvx6qjbqac7cmi5x6k0kb8gbyih5v2dsbbqlijxs" + "commit": "fb5cfc2a5091ffa77894629538efb0ec953fb6e7", + "sha256": "13g281pyfdid3kcd00x04k12f5b4zyx3xk19h636wah9hn27dyjn" }, "stable": { "version": [ @@ -69290,8 +69532,8 @@ "iedit", "merlin" ], - "commit": "8091fad9953c6b9840a53aa53336fdebe51658b6", - "sha256": "1q8hvj2l7bwswvx6qjbqac7cmi5x6k0kb8gbyih5v2dsbbqlijxs" + "commit": "fb5cfc2a5091ffa77894629538efb0ec953fb6e7", + "sha256": "13g281pyfdid3kcd00x04k12f5b4zyx3xk19h636wah9hn27dyjn" }, "stable": { "version": [ @@ -70711,11 +70953,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20220227, - 1815 + 20220316, + 1159 ], - "commit": "425d428a014125022315c2de69c17700a884d3ea", - "sha256": "0map0cy1p887bgjwswnzjq9qmvgw7r8g82515gvqb8x6xw2pfyj3" + "commit": "87508b4c21343cac910040705fe14f84d2c70d70", + "sha256": "1xliizsbdg6hqkyf0fvl03mg95qspzpcsgvnj54cpc8vbyj9xafd" }, "stable": { "version": [ @@ -70738,8 +70980,8 @@ 20220111, 1220 ], - "commit": "0aad6ff44b9ee496d8c1053c3d7cbc59e11e3999", - "sha256": "0x9x7f53wv02a3i9sjhmkx0bhk93civgq52rfi2maawshh8cwwdd" + "commit": "edf3fe47fb986e283e3b04cba443dcb39fe8720e", + "sha256": "1wr6xd3hhgnqjrr2d8llbrdaagi4wz77zfxh1jg2f2mj28i52ksz" }, "stable": { "version": [ @@ -71164,11 +71406,11 @@ "repo": "Melchizedek6809/morgentau-theme", "unstable": { "version": [ - 20220223, - 1047 + 20220228, + 2214 ], - "commit": "63792c50a1fdfdf85c6ba6d7a8eb9fc3ec0a434a", - "sha256": "0p448x7kl4y9zapkf808x4yxg86ifih95af2rhgzaxxm6ndvkyjl" + "commit": "1efa7fa43f408660fa49a927ff03763354aed5f6", + "sha256": "0kl87pgy3zmz2aav80y07lm21rjwlrm2x0hb14mgq412rci287hd" } }, { @@ -71361,8 +71603,8 @@ 20210306, 1053 ], - "commit": "f4ed28f37281ae0f2318e5f52f46ba49d58c8ebc", - "sha256": "1k1aclfizzypa007x4zrpabjc8s8gpid7phwi1bycd418nhbx5z8" + "commit": "140ccd7ed9ceb6ce7eebf3b4024f2e78b12bdfa6", + "sha256": "111fgfmzdrhin68a0vsr0bf84930af1cscsjc9sc91h2a54lyz6d" }, "stable": { "version": [ @@ -72095,11 +72337,11 @@ "url": "https://hg.osdn.net/view/multi-project/multi-project", "unstable": { "version": [ - 20211230, - 2223 + 20220312, + 2321 ], - "commit": "81262345927d30571d2797a8fb8dbd9eeeb6ccf8", - "sha256": "1ps0dvbms7bgpgbrvy2yajy4xp3nxrscvw94krdxvnb8ycnvdqrk" + "commit": "c0a37d5ee969ca8a783bf6c4a9084c4efeace86d", + "sha256": "0rn0iixl37px4sbkqxrfnfkq6kmb9dsn4x83rbz335dwniqxx5iw" } }, { @@ -72968,11 +73210,11 @@ "repo": "nryotaro/narumi", "unstable": { "version": [ - 20220221, - 313 + 20220228, + 243 ], - "commit": "7a3b3c3a314612d16f89120b13ebeb8a4149d829", - "sha256": "0j47yah1prq9kvgx4nvbyvmvgivzalg6m1zjldsa63w76d8sfpqk" + "commit": "5bfb114adc0e6a2d5aebcd6335d1e6850e3f9722", + "sha256": "1vacijawhk60jqxkyk3malv1z6hd4w5dvzfkpf9nivj1fvhps9f0" } }, { @@ -73343,14 +73585,14 @@ "repo": "SpringHan/netease-cloud-music.el", "unstable": { "version": [ - 20220211, - 1326 + 20220305, + 1224 ], "deps": [ "request" ], - "commit": "0738c875045072c277c85882330778fadd3d29f7", - "sha256": "1rxqgb3fj9zvl5pmfd2pb4hd7jrgl8620pnq455qg6b8ck24gl2i" + "commit": "f238d1d45bbeee32e0a8d169f39de4360be908f4", + "sha256": "0i460vn7plvxrzbzlnfldx36aymy0x666r5w3mak3a5ksyqpbi1c" }, "stable": { "version": [ @@ -73769,8 +74011,8 @@ 20181024, 1439 ], - "commit": "c5e509481f1e53ceedc21d0315e125895b24d68d", - "sha256": "1w0hp5fzj6g6l0x77h3c3phq3hvm7klk7bgnk6c3didnvs47z9w7" + "commit": "f0fd305a5772fe06be9627ddcdcf2950449900b9", + "sha256": "0pl0l9dhmiav2x8qbsi52ph7cskq3z43zmgq5jn0bn6dqwzmxizd" }, "stable": { "version": [ @@ -73868,15 +74110,15 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20220121, - 1723 + 20220228, + 1520 ], "deps": [ "magit-section", "transient" ], - "commit": "00b2b8da57dc411cbaa464521d6f6f5f1dd9eb87", - "sha256": "0rpz1rfvrkw43mjaviy8p865xnsqm76rfmhgs8945wkms54g6qky" + "commit": "20ee8d88900b169831d6b0783bd82d2625e940c7", + "sha256": "0qv5cin9668pxm5cjhrl5sf170g62qqi954q4y2yj7zh3q0qhwpi" }, "stable": { "version": [ @@ -74165,26 +74407,26 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20220227, - 1208 + 20220315, + 2232 ], "deps": [ "cl-lib" ], - "commit": "e0f8daa7c374cd91d9c4e89cbdda6e0e7fe24317", - "sha256": "1098wm46gi15pzh065fpxfjf8lr7jf2sg48yy9yzdi0dwdyz6l4c" + "commit": "13414b7a294fa6f35bbeb535cdcab6b256e39da7", + "sha256": "1grc5fk7ng4d6i8fwfpm3cb2b19s9sbdjbdn8ybchk7cj45kkl24" }, "stable": { "version": [ 1, 2, - 5 + 6 ], "deps": [ "cl-lib" ], - "commit": "f01872a2972450f8d12d84f58f3c5b812c716299", - "sha256": "0rf05lfmr77yq7xqz1nd4bji6d2cipb3hd5ap9lrk6jiv7f72dr2" + "commit": "e0f8daa7c374cd91d9c4e89cbdda6e0e7fe24317", + "sha256": "1098wm46gi15pzh065fpxfjf8lr7jf2sg48yy9yzdi0dwdyz6l4c" } }, { @@ -74433,6 +74675,29 @@ } }, { + "ename": "norns", + "commit": "c40cac0da3033b1e18edd5813deed53c6c831594", + "sha256": "0zsfsg30smi0wi9854ibcakgr6wp9impy7kxdcghqvvs251sjfns", + "fetcher": "github", + "repo": "p3r7/norns.el", + "unstable": { + "version": [ + 20220315, + 1155 + ], + "deps": [ + "dash", + "f", + "osc", + "request", + "s", + "websocket" + ], + "commit": "b70ab2f9a58859243762c633628ad515f5563da8", + "sha256": "0cw0ry30im3b4b70n7rsp8pyv1567kl7byjck3rdlfrl7ll9bzr6" + } + }, + { "ename": "northcode-theme", "commit": "25dcd4dd8189ad0fbf6c31874daa618bf1957863", "sha256": "0x4dryx174kcjzm11z9q5qqlzr1c9zr0p32zwgbvgypgnvjy6i4g", @@ -75031,27 +75296,27 @@ "repo": "douglasdavis/numpydoc.el", "unstable": { "version": [ - 20220214, - 1526 + 20220304, + 1546 ], "deps": [ "dash", "s" ], - "commit": "cfec608e1b95bc834e801bf285b0ff5451ccdf33", - "sha256": "1k05i8xa7c6nzgv0k4kngjnsgcpllvnwj76nl15an4k2jphcd17g" + "commit": "1b8c5ef3301fed5e5c1941817dbb7435188ff417", + "sha256": "0vd8hpirib67zx61zb4abxpm9fq7kahabcizananf4k207zmv66s" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "dash", "s" ], - "commit": "7b803432ce62fc54a5c9d87294e3a499e55381ae", - "sha256": "0vmkfjd16v40gfh6w4lqn84jdljk5rz1rmh7sbb8dnfxfkvh9y9f" + "commit": "1b8c5ef3301fed5e5c1941817dbb7435188ff417", + "sha256": "0vd8hpirib67zx61zb4abxpm9fq7kahabcizananf4k207zmv66s" } }, { @@ -76454,11 +76719,11 @@ "repo": "ocaml-ppx/ocamlformat", "unstable": { "version": [ - 20210923, - 1348 + 20220307, + 1315 ], - "commit": "63e478f1186a03c7e4dfeeb39b3d8fe2ef1cb429", - "sha256": "10vy102a0isd8cg94y61pm4qfgy74d6003dw0qn0bdmbd19r5071" + "commit": "5f9a76290089a5f80b5103879941ebe4a6c35350", + "sha256": "07py859hqci15d7llmjfn2kbdwpy9f2qdzlmnbpv1lvg0272w736" }, "stable": { "version": [ @@ -77398,11 +77663,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20220212, - 356 + 20220312, + 1944 ], - "commit": "7ddf5dfe9e982ee1510ceec36eeb4d8bb802ea73", - "sha256": "0jl9zcpxlz89fzvagvwz73y2qxq0vbmzk7rmqcz37f8r75fz63aw" + "commit": "f2c78c4a6059c5f892e48a3887d4368a547515ff", + "sha256": "1zr3pk1ifvn9j4f4n7g53q4wcd3r4zybjni8kyiil4jadmvsglfl" }, "stable": { "version": [ @@ -77560,30 +77825,30 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20220102, - 1248 + 20220302, + 1706 ], "deps": [ "dash", "promise", "request" ], - "commit": "400f472e7b2e45502cac2b96bdde33830b84ea60", - "sha256": "1qj07k5j6493n76q23f4llmbkv5chf9fr43c2b5a5a8cx8qpp48f" + "commit": "c1790b1cdd2e5733cf64c7507a89da0b6179cf7d", + "sha256": "10r8k14dlm017c4kahim2jv2nkx0898r0dc21z5szp4hw7l1z4n9" }, "stable": { "version": [ 0, 0, - 7 + 9 ], "deps": [ "dash", "promise", "request" ], - "commit": "e6221b1654d34bc3a06500ae4706419bc176b575", - "sha256": "1xnqih87sipqd6q5cvgvw2mpn5m4j605bxhlbmpr4kzhni9vd9sh" + "commit": "c1790b1cdd2e5733cf64c7507a89da0b6179cf7d", + "sha256": "10r8k14dlm017c4kahim2jv2nkx0898r0dc21z5szp4hw7l1z4n9" } }, { @@ -78619,8 +78884,8 @@ "request", "request-deferred" ], - "commit": "f7a3145fac5d7e637a7cc557e5196086061159e0", - "sha256": "0s4nai9c2s237cwy6649zsgqp6z75129ly43v0kibfvf4pgrbkxw" + "commit": "47cb514f1c70015536d15b34779897e931f45e8d", + "sha256": "0il8v92gwqmhkmc64g3qcy43xl3q424j0ig40hrykmibkqa4rgmy" }, "stable": { "version": [ @@ -78765,28 +79030,28 @@ "repo": "marcIhm/org-id-cleanup", "unstable": { "version": [ - 20210714, - 1604 + 20220228, + 1653 ], "deps": [ "dash", "org" ], - "commit": "416c95fc9ad8551f1d9544f2504c866daac5477e", - "sha256": "189zzfi5a1qsjm8ayq5v58s5iagibv2vk6rb6zda4p0hrmnfz2ky" + "commit": "b6bf79465cd31d66b547704903b8ba5fcd6dd108", + "sha256": "0cs69fa36wdz8i6rvdslmr3nlwmaw74s8r5wcbjvh0kjzipyqdyp" }, "stable": { "version": [ 1, 7, - 0 + 1 ], "deps": [ "dash", "org" ], - "commit": "2cb87624238281b438cda67ed375c56403524489", - "sha256": "1xmbrrp1zyvij18v3rqmini6w9i6v7dl4fp103ph6wznav8x0jbl" + "commit": "b6bf79465cd31d66b547704903b8ba5fcd6dd108", + "sha256": "0cs69fa36wdz8i6rvdslmr3nlwmaw74s8r5wcbjvh0kjzipyqdyp" } }, { @@ -78821,16 +79086,16 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20220121, - 1503 + 20220228, + 1651 ], "deps": [ "dash", "org", "s" ], - "commit": "64930ad82c0220ad7d80ec0896b8647a3206d2d3", - "sha256": "0r4kn82jwv6w6ngz5azqq7jyxlfcspjj8lpscq8cnha5112qw7nh" + "commit": "9671cf059b681fac39ce910dd8847b5c7bfad170", + "sha256": "1zygrmihzdsciqnm5kl3j4wgmm796q8ppv7nvgn3d8rv6xky5mx3" }, "stable": { "version": [ @@ -79012,16 +79277,16 @@ "repo": "SqrtMinusOne/org-journal-tags", "unstable": { "version": [ - 20220216, - 801 + 20220305, + 2019 ], "deps": [ "magit-section", "org-journal", "transient" ], - "commit": "f8ad372c5839eeb882d2bd256ddd740e900aad95", - "sha256": "0ky4am88azrnhync6zr3ilq9lf5hknymm6m0cg4iphklx0694v6m" + "commit": "b395f5c90aa06885aa9441217cc0abaaa53ccc11", + "sha256": "1kkf6sryj9xgplxpf69lz3wz1zaifarr1cwgq5if3yc1bb868ax2" }, "stable": { "version": [ @@ -79108,8 +79373,8 @@ "posframe", "s" ], - "commit": "39f22dc98cb8268af67c6df71778ec5784d2b683", - "sha256": "14rjgdl941kja3hndc55q3c65fi7plviirxihffkw498h0vkbyhs" + "commit": "d18e73dbed8ae104699295143a44356fa1029358", + "sha256": "0387n6z3kyqvslv395wajmbsg3p05918wn1wgm2bi4d9kjw6y3qm" } }, { @@ -79344,11 +79609,19 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20220226, - 26 + 20220311, + 1629 ], - "commit": "fdb7b59682b656a998bf8821d112283e1a3edbd8", - "sha256": "1ihzv6n4zwxq51gba6w3bgzb4ws18h79z8k1iw24gpbz6pw0pwww" + "commit": "0b7fc3742000431390a2de6be159f547dc4bd436", + "sha256": "17qj6zchfkx31y4hfg356z4fhqnk9b34yjfqpim3xd9qk0hkld4l" + }, + "stable": { + "version": [ + 0, + 3 + ], + "commit": "64fa67a3e4cc7af4084bb879bd8a0e5380333bcf", + "sha256": "187fxw2rg0kw1d2binpa32ckp67r4v10j6ypr077g9qn6nkmyvvn" } }, { @@ -79776,15 +80049,15 @@ "repo": "marcinkoziej/org-pomodoro", "unstable": { "version": [ - 20190530, - 1445 + 20220318, + 1618 ], "deps": [ "alert", "cl-lib" ], - "commit": "aa07c11318f91219336197e62c47bc7a3d090479", - "sha256": "0nbprh2nhnmb7ngp9ndr6zr37ashcsvpi5slv7a37x1dl7j6w1k4" + "commit": "3f5bcfb80d61556d35fc29e5ddb09750df962cc6", + "sha256": "1x3ny357s0h73129mhah6rjipjd0jw6gh3msr6sahwx36nsdrp4m" }, "stable": { "version": [ @@ -79858,14 +80131,14 @@ "repo": "jakebox/org-preview-html", "unstable": { "version": [ - 20211126, - 2350 + 20220228, + 414 ], "deps": [ "org" ], - "commit": "14e39aec6e29dc15ff40b219b2b7284a9ec0af36", - "sha256": "0qza6ylknsd0d87dhwxk5hyqzs5107n2s8y189nr23lnyvpggn49" + "commit": "cb85524d5090b8189e965cc49d65be04650c17c4", + "sha256": "1ikcsn970pf5m30h6bqshykpnwpn7vwyyi9ymk3fv6pxh772x5wc" } }, { @@ -79970,8 +80243,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20210922, - 615 + 20220318, + 1534 ], "deps": [ "dash", @@ -79985,13 +80258,14 @@ "transient", "ts" ], - "commit": "31aeb0a2505acf8044c07824888ddec7f3e529c1", - "sha256": "1jfm4ahh58x3a3njigrbfzd86fnbyybbcgca2mgmxddcy6bszfp1" + "commit": "46f523d94a376b168176c75bbd0e3e0d00e61170", + "sha256": "0vrk7lx4n4imvsnqv50w6fmqnndr48x89gcmm375fw6zgy2m90bl" }, "stable": { "version": [ 0, - 6 + 6, + 1 ], "deps": [ "dash", @@ -80005,8 +80279,8 @@ "transient", "ts" ], - "commit": "31aeb0a2505acf8044c07824888ddec7f3e529c1", - "sha256": "1jfm4ahh58x3a3njigrbfzd86fnbyybbcgca2mgmxddcy6bszfp1" + "commit": "f666fe150f1bf3c3ce43d0e15f90b20d43c2e772", + "sha256": "1mpq3v8lxqllnb4afqh7p9av0p9bha8ld7741zaw4hxb1252xgm2" } }, { @@ -80085,28 +80359,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20211119, - 624 + 20220315, + 1704 ], "deps": [ "htmlize", "org" ], - "commit": "55fca47c740c50fe04cbf2b8ae90e02174626c0c", - "sha256": "01h1vdg96ml8zxfi78j178w4m33n2rmwgcl6k2cisymcfijcp2c5" + "commit": "e5bae22b9ef63a9fcfbbaa000e087703751eaad0", + "sha256": "1njib0ah1913lk3ma18y8m5k8jqki17i9298cc03k7vvfw3l19wz" }, "stable": { "version": [ 3, 12, - 4 + 5 ], "deps": [ "htmlize", "org" ], - "commit": "ee0417aac3969ec2d776eba1ddc6434d4c61a10d", - "sha256": "0j7394zcbzqfk33g2xdyb3fmw3brxy8v66vvf1j9nqlskfddh7bn" + "commit": "e5bae22b9ef63a9fcfbbaa000e087703751eaad0", + "sha256": "1njib0ah1913lk3ma18y8m5k8jqki17i9298cc03k7vvfw3l19wz" } }, { @@ -80261,8 +80535,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20220212, - 1552 + 20220318, + 2105 ], "deps": [ "avy", @@ -80276,8 +80550,8 @@ "parsebib", "s" ], - "commit": "b7d43f4c66baeea7cf9a1d3af8a3cc874a6abcea", - "sha256": "1hkqaq8ksda60bsp7qlpvpz66syms0qxs5ig693q3py372p6g9pp" + "commit": "ec449195438f815698241f0b01a5395221b3306e", + "sha256": "19hf4lp1z14gczs0d39vi8lcl67bbraz2wkimshk8fwhjc14wf4l" }, "stable": { "version": [ @@ -80353,28 +80627,28 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20220222, - 1041 + 20220310, + 1646 ], "deps": [ "dash", "org" ], - "commit": "777bdff6df36a7b0f4e82a3caa0edd7cf92e888f", - "sha256": "1124ns6d1rvh6p96fkmszpx1b9aiy2rcbffiswa2rmaa188c4d6b" + "commit": "c42078f8601b7f600135f66e75246a53c5f9975f", + "sha256": "1afmv6ncjbm6dalgz459lhh0rif8rlag23n05jwdv7izibwb1dm2" }, "stable": { "version": [ 0, 3, - 8 + 10 ], "deps": [ "dash", "org" ], - "commit": "777bdff6df36a7b0f4e82a3caa0edd7cf92e888f", - "sha256": "1124ns6d1rvh6p96fkmszpx1b9aiy2rcbffiswa2rmaa188c4d6b" + "commit": "c42078f8601b7f600135f66e75246a53c5f9975f", + "sha256": "1afmv6ncjbm6dalgz459lhh0rif8rlag23n05jwdv7izibwb1dm2" } }, { @@ -80400,11 +80674,11 @@ "repo": "unhammer/org-rich-yank", "unstable": { "version": [ - 20201115, - 823 + 20220227, + 2154 ], - "commit": "56d698c2614025538f456479c79073ef40399bc3", - "sha256": "0l20a8ljpg8bk6hw4py5g9wv6kyv6y4nrc06l1w0lr0l808w5gqd" + "commit": "4bcd030f0d736d77c647955739b61fae541417e9", + "sha256": "11j7ywvhsi4a4ayapxqccvag8sraw168pwwq4s3a0f98yzknd9h9" }, "stable": { "version": [ @@ -80424,8 +80698,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20220227, - 2050 + 20220315, + 637 ], "deps": [ "dash", @@ -80434,25 +80708,24 @@ "magit-section", "org" ], - "commit": "65ea325071777030978a85cac73ba6741a3c00a8", - "sha256": "0knk77scs08w2gwkxw8an0d743mz1mip6v8dcg44wh8xwwf2hvg1" + "commit": "3782e88d50f83c5b9fbb4b10df71df3f37e27156", + "sha256": "0c5vxz423lz386dxa9nqyf396jmyb36q79paxf27is1dhq1vwd5w" }, "stable": { "version": [ 2, 2, - 0 + 1 ], "deps": [ "dash", "emacsql", "emacsql-sqlite", - "f", "magit-section", "org" ], - "commit": "6170cc99288e75b8e3f3fd3101b66acc12a9613a", - "sha256": "0q3nhw05wnqh1qgggxsj8wki4ihciqlkic2x7qbcsskjqm73j1r7" + "commit": "3782e88d50f83c5b9fbb4b10df71df3f37e27156", + "sha256": "0c5vxz423lz386dxa9nqyf396jmyb36q79paxf27is1dhq1vwd5w" } }, { @@ -80521,8 +80794,23 @@ "simple-httpd", "websocket" ], - "commit": "df1f9522c5a9cdb248208427fa9df4f2a7666e2a", - "sha256": "03kyg95f012ql0gpzy58kzxgdfksig5zlbr1p9m9ycgqmmxyq4jp" + "commit": "1eb9abd4fccc7be767c5df1e158e2d17982f8193", + "sha256": "16ld8ky0z3fi2bx79h3vrppvhgkhv62k5fymfcif7z0xmcv688kh" + } + }, + { + "ename": "org-ros", + "commit": "a7b6aff1afbd525b43a53229be4e6faf166c6968", + "sha256": "10jfdrrqqk0y43z32w0hsiih1l3rb6yafkqwxj64dgfd0iz4szsx", + "fetcher": "github", + "repo": "LionyxML/ros", + "unstable": { + "version": [ + 20220307, + 2308 + ], + "commit": "bf3c4a3a41ad960ef5d9ae062a20664834e926e9", + "sha256": "1l7h6f2ins9hgxd5yqb608hca5212x6crxwsmyy6025n0rq4yqmd" } }, { @@ -80775,8 +81063,8 @@ "deps": [ "dash" ], - "commit": "2b06b02b8008dde8cfad69b679f89742d80aa4e6", - "sha256": "1x6kcwyyixgi92yq7cmx2bhcbh342acwr1c5nw31mi03v6hczjzk" + "commit": "1d7aeee94667d9277ca5452ff44ebca67888d244", + "sha256": "0qn653fml01m1pyw8gpn7xmbbrk3yvg83q39pxjwsr8rib27jwgp" }, "stable": { "version": [ @@ -80807,8 +81095,8 @@ "org-starter", "swiper" ], - "commit": "2b06b02b8008dde8cfad69b679f89742d80aa4e6", - "sha256": "1x6kcwyyixgi92yq7cmx2bhcbh342acwr1c5nw31mi03v6hczjzk" + "commit": "1d7aeee94667d9277ca5452ff44ebca67888d244", + "sha256": "0qn653fml01m1pyw8gpn7xmbbrk3yvg83q39pxjwsr8rib27jwgp" }, "stable": { "version": [ @@ -80896,8 +81184,8 @@ "s", "ts" ], - "commit": "fb5e2ef277bc811a3b061106c99e4c47b6b86f80", - "sha256": "1sjx5ahyjpxv5xkxaf1x0p64bjls8ralv9knf80w17nb87dk3p91" + "commit": "3108bc3f725818f0e868520d2c243abe9acbef4e", + "sha256": "172kjz03byizc972h8qh5hp5lrjqxp8x7cpcqykzj5j4db670ym1" }, "stable": { "version": [ @@ -81058,15 +81346,15 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20220224, - 358 + 20220315, + 1159 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "c9bfe0d84f1ea6aa18febf098ed47dbf7373782b", - "sha256": "1ldc8calzxszqr8zp3fq5ix72pszg7wjh48a7wmj2kzd6p56akh6" + "commit": "aad66c775e3010f7af2ebd3e0914aa6a57127f1b", + "sha256": "01y53nh9z7y77gns28dg5s2sr672i3sb39vpflx7mhfcijkribzj" } }, { @@ -81493,17 +81781,17 @@ 20220227, 1536 ], - "commit": "604cee9fa5c16ddb2bf3ce163077e718465bbc1b", - "sha256": "035hx2kkwdar9cw12dj32lq8scvkwafswjhq3aiiw3q7v4icicbf" + "commit": "623d596ff02e54d7e090fa30c67a4d0dd4e7fe72", + "sha256": "0cnwrjhbp8jfsbax7v46xiq6xzcp4by73dbkkgw19bjj5mywiqc9" }, "stable": { "version": [ 1, 1, - 3 + 4 ], - "commit": "604cee9fa5c16ddb2bf3ce163077e718465bbc1b", - "sha256": "035hx2kkwdar9cw12dj32lq8scvkwafswjhq3aiiw3q7v4icicbf" + "commit": "623d596ff02e54d7e090fa30c67a4d0dd4e7fe72", + "sha256": "0cnwrjhbp8jfsbax7v46xiq6xzcp4by73dbkkgw19bjj5mywiqc9" } }, { @@ -81602,30 +81890,30 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20211112, - 1600 + 20220228, + 1652 ], "deps": [ "dash", "org", "s" ], - "commit": "729445496d94ea0050706007391817ef84dc0226", - "sha256": "0xa545wbh7kjbpry74x2bkw6rs9dshlajb5i17zc6v8zf400ds4r" + "commit": "25ddd0169eafece581bbb4919427a4d64dab8ae8", + "sha256": "08s9rf57yci4xla6dlkb9av9qd2nwls487vxr4zfyb932j8vdp4h" }, "stable": { "version": [ 2, - 5, - 4 + 6, + 1 ], "deps": [ "dash", "org", "s" ], - "commit": "f5512304dccc152816f9957f5627c814bcb0f683", - "sha256": "0kg2bjwp66fml3836zfr15aadh5d7srg8ai69g0nxk1kmalbxkdv" + "commit": "25ddd0169eafece581bbb4919427a4d64dab8ae8", + "sha256": "08s9rf57yci4xla6dlkb9av9qd2nwls487vxr4zfyb932j8vdp4h" } }, { @@ -81878,8 +82166,8 @@ "ht", "s" ], - "commit": "9570a0d438cd41332e273a057cd697de859a39ec", - "sha256": "1b7wn7b50nrps72v25c644bm19j7z0d2scpdh1bjmk1zz0mdzazx" + "commit": "3cdd1985ec06fe42b81f3029512c7530a33f15c8", + "sha256": "0xg4vikw8k3kzn5vlqcf1jagalnq2xwd4wps8l37fr1iqkpr7wqb" }, "stable": { "version": [ @@ -82288,6 +82576,29 @@ } }, { + "ename": "osm", + "commit": "6836bd94e02dd18c0a865824e1b3f285905aefc4", + "sha256": "12zlr5l8x98gzasz79f1d1i8f486c3djx46v5p0zzabmm06vfhai", + "fetcher": "github", + "repo": "minad/osm", + "unstable": { + "version": [ + 20220318, + 1151 + ], + "commit": "cd3f8e0d05ab453f9dee2527448a53c8a0e5a1cc", + "sha256": "03nw3iv7jyhv5cnjaz56jhxxzlqas55i927b8q5xb4qc8bwclm19" + }, + "stable": { + "version": [ + 0, + 6 + ], + "commit": "f76decfd0e94d5fc030a1d5c3230c213c87b47ef", + "sha256": "0aiq2z9vv4jsl0s0x9vpjgp0mnn27wanhirzj3h80ivgiphzs7l5" + } + }, + { "ename": "osx-browse", "commit": "081aa3e1d50c2c9e5a9b9ce0716258a93279f605", "sha256": "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm", @@ -83045,14 +83356,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20220225, - 358 + 20220318, + 2004 ], "deps": [ "org" ], - "commit": "8503350603c10d1e264f5599ae288fd71725919f", - "sha256": "1a5idw9p83m3jnf8s3f0lg28pw5059n05q1m4j5d92wajxlxf2wv" + "commit": "917bab6cfc05d8c64e299d10f499f69cfd055b08", + "sha256": "1bqdmyaz1jj9xcq1ik8f91g6gbkb91rypwikqzmlk11dgp7fw8qi" }, "stable": { "version": [ @@ -83549,8 +83860,8 @@ 20210118, 536 ], - "commit": "238e05b01dde37fa27a3a8943cc04dcc9b9b83b2", - "sha256": "0949gabr0wfsrzzaf217jsaawkc3gj1lxkrzwp3bigmxngsn4ykn" + "commit": "edb2cdf36db88d233d4103df91357579f4b7650a", + "sha256": "0pcskv3pv6208pb4dx5gchvl1n38maxysihllac4b8avsjha9gc6" } }, { @@ -84159,8 +84470,8 @@ "repo": "r0man/paimon.el", "unstable": { "version": [ - 20220218, - 1904 + 20220304, + 1110 ], "deps": [ "aio", @@ -84172,14 +84483,14 @@ "request", "transient" ], - "commit": "a05e38a6303239d899afb116763f4fa06f2088dc", - "sha256": "08ab0x44fz44gxr9gwyh8zck8sf571snfl7pmj995dwbq27pqbjd" + "commit": "38e6f128dc0a84ba805089808aff9942584db56a", + "sha256": "1dqagd4856dfy8m6ajb66rl9nlr4dyrkpznpkrm5p8xdbkryhb3v" }, "stable": { "version": [ 0, 1, - 1 + 2 ], "deps": [ "aio", @@ -84191,8 +84502,8 @@ "request", "transient" ], - "commit": "a05e38a6303239d899afb116763f4fa06f2088dc", - "sha256": "08ab0x44fz44gxr9gwyh8zck8sf571snfl7pmj995dwbq27pqbjd" + "commit": "38e6f128dc0a84ba805089808aff9942584db56a", + "sha256": "1dqagd4856dfy8m6ajb66rl9nlr4dyrkpznpkrm5p8xdbkryhb3v" } }, { @@ -84709,8 +85020,8 @@ "deps": [ "s" ], - "commit": "fbb88260179dd92264325dee37d7898619407558", - "sha256": "0ysgwj56wj8cbm8lrn24r89rbsxgc3s8idvx9x5apxddcjin80ik" + "commit": "aeeaad3fc5ad98906fcb34ed9b5b33e780b24cc4", + "sha256": "0iwpl5chrq81p1hyz8l9q8w17a15c781vljl39ywr50rwj0f6rl4" }, "stable": { "version": [ @@ -84786,11 +85097,11 @@ "repo": "clojure-emacs/parseclj", "unstable": { "version": [ - 20220207, - 1351 + 20220313, + 1649 ], - "commit": "90595049634549e6d8872f719b13e9555897d17b", - "sha256": "0ifc9gyp7hr97ssnsqxiwrzmldqysz874crlg6jm4iy5l9fyls22" + "commit": "f32c041f2b301e790429fd16677c8cab11645702", + "sha256": "1i3xrhfhdjadq6qyn492r37ayd88cna1yih87b9n3iky1ziryljj" }, "stable": { "version": [ @@ -84950,16 +85261,16 @@ "repo": "zx2c4/password-store", "unstable": { "version": [ - 20200328, - 1214 + 20220306, + 2230 ], "deps": [ "auth-source-pass", "s", "with-editor" ], - "commit": "eea24967a002a2a81ae9b97a1fe972b5287f3a09", - "sha256": "0vsdy989b69widmvaj2hzkmraddwzkpbbnj16gv95bhl51av2582" + "commit": "c4d8a1d815e79ddd89a85d3e36a41d29f0475771", + "sha256": "1gcpnh34ra7ahzmkh6rh4wkp745f8n14jbrdq2mhgg4zvxc2w83w" }, "stable": { "version": [ @@ -85904,14 +86215,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20220225, - 2254 + 20220313, + 716 ], "deps": [ "cl-lib" ], - "commit": "7297dabf6de83642e8242052fe95c79d4233eac7", - "sha256": "0rf28lq8nz3mx7hkcny10wwiaj27ph8hwpvqjji86x89w9w67pqr" + "commit": "14cbdb5460d7ee728d397aace280702866eb880e", + "sha256": "05w69p7qimnidiv08qbcj8pj7y24qj3cs6118m363pprri4yw2pf" }, "stable": { "version": [ @@ -86515,8 +86826,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20220120, - 1919 + 20220310, + 1511 ], "deps": [ "async", @@ -86524,8 +86835,8 @@ "f", "php-runtime" ], - "commit": "585862496e8ac9f496c0c99c5b97af456cb1f73c", - "sha256": "1y5g5g2d5g9xiw3vwxqnmz58gyfn9hybpfzcjhyjhnjma74jkqfr" + "commit": "34195f1533209e2ffd0f898a69c7db2bffd1eabe", + "sha256": "1xp4v5dm2x31xp5rq80jii2y8nprqd3jcmzpc0dp9xk3fq9hbq7l" }, "stable": { "version": [ @@ -87121,11 +87432,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20210123, - 1507 + 20220312, + 1316 ], - "commit": "8a5e95c8514315cb40c47f1acdb68a4ace921497", - "sha256": "1p903a3jbw1jp5l6d6mb50dq5zd8951qxh2b97vy30p3nnl8i0lj" + "commit": "3cbf38c22d783ac77d5dbc69a38afa04e0aa4803", + "sha256": "14ll9z57jlnbvsnzarqi0k0a0bxnkc9y4r52xah1h09v5fmcyi8a" }, "stable": { "version": [ @@ -87156,10 +87467,10 @@ }, { "ename": "plain-theme", - "commit": "e170913006b93f4c235c403c5cde64d274b91e1f", - "sha256": "11hafn2wsj5dskf18q3jd6vqj20nhzii067ll8l38977c070qqlh", + "commit": "c06b0212e521aa168ad4c34c312235d6ad38b004", + "sha256": "0ij63lfpmligzp9m6lvww7jri9cs6gkzhy49wdjqhi5dy63y2xpv", "fetcher": "github", - "repo": "alpakido/plain-theme", + "repo": "sowelisuwi/plain-theme", "unstable": { "version": [ 20171124, @@ -88266,16 +88577,16 @@ "repo": "SqrtMinusOne/pomm.el", "unstable": { "version": [ - 20220208, - 1648 + 20220315, + 2038 ], "deps": [ "alert", "seq", "transient" ], - "commit": "6dc3b5f913908bca8db85e4b2161a1de76c60a58", - "sha256": "1rxlz0l58g2vvlhf0y3s7abfph3nplvm7q4vrymgj1s251kjxmmi" + "commit": "2a2673bdc8e2c2af99040b14e97b39271806bf79", + "sha256": "09w3m2gb0qv3cr3kklv37rgpcaxvyp21sdjmb15c26cf0i8rc86c" }, "stable": { "version": [ @@ -88451,11 +88762,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20220216, - 1906 + 20220309, + 457 ], - "commit": "7b02960025fb89384f78ba12ad03cae0ddf1e411", - "sha256": "0p12zz2lhm10yikhnq52z66xwy64gcvig42bzajv5q7x09qvvna7" + "commit": "60297066e31e012b8087b1b7818febd73e02d2cf", + "sha256": "1ivj61hjg5gqlivb04ynnk2mry8bac9mmf9f473naplzwnd741p1" }, "stable": { "version": [ @@ -88477,8 +88788,8 @@ 20211231, 1823 ], - "commit": "37a04117ac83b3ed24a2cba894443a32795c2f1a", - "sha256": "0vyg6va1wzl0h9sd85a2zy922w6q8za0fq6v07hcq956lhh6wi6y" + "commit": "e112ef1cc6c86151ea97a0bad49026fbbacc768c", + "sha256": "1iwq7p7f1xpiwzlizqqm2jzf2ly0cgaj8zskjrya0lymfz8rw7dx" }, "stable": { "version": [ @@ -88621,8 +88932,8 @@ 20210215, 1849 ], - "commit": "1184368d3610bd0d0ca4a3db4068048c562c2b50", - "sha256": "0inm6wbfkw6b9bwikd77d0zmk6ma9fzfs11acblp5imq202v76ra" + "commit": "8f90c6faeecd77c88883cafc03c37a5cce4b1982", + "sha256": "0zs4z22ib34jg1lblqr5b0gdywb88fp769dk2x53s6sq1gi7cvkp" }, "stable": { "version": [ @@ -88996,8 +89307,21 @@ "repo": "LaurenceWarne/prefab.el", "unstable": { "version": [ - 20220210, - 1658 + 20220314, + 2005 + ], + "deps": [ + "f", + "transient" + ], + "commit": "4d9cac415a4ee86bb5793ce18a350a30f562c2fd", + "sha256": "0f4cm5kvsa14yl93vw750ll51vf1g4b04vl6zivq1nzrb8gjj6zr" + }, + "stable": { + "version": [ + 0, + 1, + 0 ], "deps": [ "f", @@ -89254,11 +89578,11 @@ "repo": "kcyarn/pretty-speedbar", "unstable": { "version": [ - 20220124, - 16 + 20220303, + 1726 ], - "commit": "4153fed2c83faad90803f57a3c9364609eb7b3eb", - "sha256": "0s3mms1lvid47g77pp6681zrnvx1v0s08xyk3272nja5w16fizyh" + "commit": "56dc9f114fcc55843e182cde1fc9d7a14c261c6a", + "sha256": "1hz67jhvg9n9d07lil6zqciqhh512k0fv54dl605p7vi704ma2ir" } }, { @@ -89566,8 +89890,8 @@ 20210715, 1213 ], - "commit": "15b58b2220b6a09922164cedc0892f57ad148785", - "sha256": "1dpx6i0fhkkiqcx4la21grsyhkzcwp02qzpa7j9hc984yv1s1973" + "commit": "7bd4d77808e15bc3845b0ab2421bb31c20e981cc", + "sha256": "16ybwsqlw5j92bynm9x56s351y4mh2s51ycbcfcl3460b9adqsxl" }, "stable": { "version": [ @@ -89723,11 +90047,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20220227, - 551 + 20220313, + 1334 ], - "commit": "2c948f3a8ed378ae5fd800d2c66aece06ba058b8", - "sha256": "1nmdyd8bldgs0zcsdqdjj4c5kq3742019qlxprx2cqs640fi5y2s" + "commit": "3c07cca10713e8212442143b6999a96ca32b68ac", + "sha256": "01i0m3vdp119icak56yqqcg5zh4j8pgrcanfz9jrgfnyyffar6f3" }, "stable": { "version": [ @@ -89844,8 +90168,8 @@ "projectile", "ripgrep" ], - "commit": "40e871dcc4519a70981e9f28acea304692a60978", - "sha256": "0snn12iibz5frsx6yk6c31hb8knvsd568ghw9jjka5vxdjzap7p9" + "commit": "4ed5c741233a81d96115f556784269042070901e", + "sha256": "1bz9srlimpr5lzsjd02jq23h0vg2lnk921m24g0wsrdrccvmfxi2" }, "stable": { "version": [ @@ -90123,17 +90447,17 @@ }, { "ename": "proof-general", - "commit": "135c8f2a04739145b500b8742a697907e398d270", - "sha256": "10zif9ax4d3m8sa9y2xqz7g24xa2r3m2x5l0zqa06wm4afq29p87", + "commit": "5bab170dd89e99f7c8430a11e6a2d8191b60f746", + "sha256": "0fx1avmkwi8ilmv0lxk6pp91hd6saycggca52z8rvjz66h9rmq3c", "fetcher": "github", "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20220209, - 1726 + 20220310, + 2253 ], - "commit": "df19c7ba0eadf9f47e9dd757a7d0350fc967da99", - "sha256": "0xh9x6b4fmbnvs8awdkg74msabchqf7lx9w3z14qwfzn4jjzqwlb" + "commit": "f34a4938399e6b863f14315ba5eeefb5ce047c50", + "sha256": "1cgnjpxjrdwf1sk8a7b76gsdvlsl8p0cwb4yhizvafm5p4276v5s" } }, { @@ -90225,20 +90549,22 @@ "repo": "google/protobuf", "unstable": { "version": [ - 20211013, - 1726 + 20220303, + 1716 ], - "commit": "cbc9826db7a7927956e4c5094427580291f55f47", - "sha256": "0zvlq5lqy5c6bc02v6442ljw8gp377pqnkfv3h4x60xqv0lqpfjm" + "commit": "46c3651c315cf77f1bcf5ad662074f04f095a04a", + "sha256": "0rfcbk445rvickv3ylwhg60lyi7d5snrr38sd4c5k8dv3nnfqxib" }, "stable": { "version": [ 3, - 19, - 4 + 20, + 0, + -1, + 2 ], - "commit": "22d0e265de7d2b3d2e9a00d071313502e7d4cccf", - "sha256": "0vhzy6xy7r7622yid374b4fhnws0x9xpfcnhd1gwp0fmi5g3q54v" + "commit": "854d86bb0922e08ab51eca4dbfd4717d86eb9a58", + "sha256": "0raqjx24rr4vzmgxjp72q0c0qgq2xnl1kf5wsg7g2sk7g294lshq" } }, { @@ -91319,8 +91645,8 @@ 20210411, 1931 ], - "commit": "90dafaef06809eab8fb1dda8bc0955b959fe1e23", - "sha256": "19rxhzbgj5fp0awgij7i7p26ippd5qf4a2c4yzm8vjyjvvmmd5vs" + "commit": "9baa5b228a3c111a42edef026615f3d9584c63df", + "sha256": "0m4a96ghrxbi2bryngs4hvsa5qhjzlv66319cfx4zm49zc4rz0yc" }, "stable": { "version": [ @@ -91530,11 +91856,11 @@ "repo": "glyph/python-docstring-mode", "unstable": { "version": [ - 20190716, - 921 + 20220308, + 22 ], - "commit": "ec253711f2bdcb3848046bb68f6405a7bf9eb0fb", - "sha256": "0m27h2ycjz212r012wh4wsahidclmb74gk9g3v6ym9a2120bk0dh" + "commit": "01d0470498d08ce9d99dd4ce709c567229f857d2", + "sha256": "1573qiqllckd5xbdbll8h786v5znahd0l5hipda9i6ppb1vj3vwg" } }, { @@ -91667,11 +91993,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20220223, - 1329 + 20220315, + 1118 ], - "commit": "b26546ff9d5d112baf822563beffe6f7fdd3c327", - "sha256": "0yx5bq6fq6y1v69cmwxchmxx4lnq5zgc5q0izz392bbpbyha9xzc" + "commit": "29c6815c585c200eda2541b678e499d06c3e14d2", + "sha256": "1b146lq5hwr76fl1abg189xsjdvz8ggaas18n8d3yx4zvjskiqs9" }, "stable": { "version": [ @@ -91700,7 +92026,7 @@ "s", "transient" ], - "commit": "b603c5c7f21d351364deeb78e503d3a54d08a152", + "commit": "ea53891a219659d9339220d5db50a8c525f199af", "sha256": "176c4banbgd474iw49cw17wbvncr13xwgqjsfpvvakd0awpyvzw1" }, "stable": { @@ -91837,6 +92163,24 @@ } }, { + "ename": "pyvenv-auto", + "commit": "ddf36d8974cc527db81d02c4f3792e16d1e5d80a", + "sha256": "141fjkrncmyls064w6kjxgj45zxip71p50scnrf74fizdbw2kn6d", + "fetcher": "github", + "repo": "nryotaro/pyvenv-auto", + "unstable": { + "version": [ + 20220315, + 1606 + ], + "deps": [ + "pyvenv" + ], + "commit": "59ece8554bf249f30984c81c103a5704d2fb27bf", + "sha256": "1f599q5bd89k68s0m9mq08a2f3465j00hklnmbyv0cm3j0majwzm" + } + }, + { "ename": "q-mode", "commit": "fff65433eff01d6239809df4c047f0e4349cc4a9", "sha256": "1vv3hynd6k050nxln83l703ymzyh1kl69cdy4yabdvmkqw4gbshz", @@ -91952,6 +92296,27 @@ } }, { + "ename": "quarto-mode", + "commit": "9534fae4c021b7f9c55175a189156c8658084821", + "sha256": "1cg26blid1kbnk7r1gzlpsd5gqgiqyr63kld0hqpih066xx5kaj5", + "fetcher": "github", + "repo": "quarto-dev/quarto-emacs", + "unstable": { + "version": [ + 20220306, + 2243 + ], + "deps": [ + "markdown-mode", + "poly-markdown", + "polymode", + "request" + ], + "commit": "9250975a4602d7a78efa2b0e477088aa2df5659c", + "sha256": "0n0cqcfmq9d36vdqa47scpny8hpdr975ykw01nf7924zacwgnjfb" + } + }, + { "ename": "quasi-monochrome-theme", "commit": "a9c8498e4bcca19c4c24b2fd0db035c3da477e2a", "sha256": "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0", @@ -92151,8 +92516,8 @@ 20210904, 1553 ], - "commit": "78317951cd3db986d811de616b7035559831749b", - "sha256": "0z7zpsmhfhnzvf1vqpsj5wsnlxmyxgc1z6599xsbvl30fw589y1r" + "commit": "c680f5137c49e352ff3779f9c82a3f1bd4a2d9b6", + "sha256": "1jjvjdig87krjmnwlxmlal56ks0nx4pgwrb5836srkd3aqlir90b" }, "stable": { "version": [ @@ -92310,11 +92675,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20220222, - 1947 + 20220310, + 1610 ], - "commit": "30b5dfdd3a11a513b1c21e448fc8cb1ecc8a71bd", - "sha256": "0fgg2qn5b5d0zm2id80jx9jrdyb4z1fjd8sbn11ajiawsjb9wb3d" + "commit": "e321d8ecfb1bc94c3772ef4d20df0ddf9c9c9d76", + "sha256": "0bnzfr2kz877bpin2xjg53c70npq772lp773ikrvhlj5zvwwk1i7" } }, { @@ -93672,8 +94037,8 @@ "repo": "thanhvg/emacs-reddigg", "unstable": { "version": [ - 20220120, - 2200 + 20220312, + 1339 ], "deps": [ "ht", @@ -93681,8 +94046,8 @@ "promise", "request" ], - "commit": "edabb5df2aa0fee0c0f34b862505977dc13449cc", - "sha256": "0g6kj94904ymsk54y5f6ynh5w562hy6bx9lngnwrqxcga1xydk71" + "commit": "911a1c6310b42226392fd03dc1746a4c6fc4eb95", + "sha256": "0zljjqd1qyxh0p5rjphkljbl4b1kpmjw279axxp8y4hd67rk8fc2" } }, { @@ -94339,8 +94704,8 @@ 20211107, 1907 ], - "commit": "3336eaa97de923f74b90dda3e35985e122d40805", - "sha256": "0jckwy5zhz95d6l3lz8b9b34pppcjjzy97fg1wn8mqzhf3h460ac" + "commit": "c769cf33f2ac0a1a9798b508935c4b260e856ab5", + "sha256": "0dqcg1dlzirmgsgg8ar2csn5mnlpr64y6n5skrqc6wcshzyzp038" }, "stable": { "version": [ @@ -94367,8 +94732,8 @@ "deferred", "request" ], - "commit": "3336eaa97de923f74b90dda3e35985e122d40805", - "sha256": "0jckwy5zhz95d6l3lz8b9b34pppcjjzy97fg1wn8mqzhf3h460ac" + "commit": "c769cf33f2ac0a1a9798b508935c4b260e856ab5", + "sha256": "0dqcg1dlzirmgsgg8ar2csn5mnlpr64y6n5skrqc6wcshzyzp038" }, "stable": { "version": [ @@ -94619,8 +94984,8 @@ "f", "s" ], - "commit": "7f37c27f52049dae3c2630e5383dcf29fd2260d4", - "sha256": "0a8cf6wp918mxmx90z26mafi6gzyh8sj5qdc3jzjm5yzv4a2n3n2" + "commit": "4ff5fd1660eabaccca1fdbec8bdfbe0ad84eeb6a", + "sha256": "18c5gg6cgxg6dijrc6ijiw0mkxfkyb6pw3dd8vzipz17pszf2bjf" }, "stable": { "version": [ @@ -94668,14 +95033,14 @@ "repo": "a13/reverse-im.el", "unstable": { "version": [ - 20211005, - 2158 + 20220309, + 1919 ], "deps": [ "seq" ], - "commit": "380cce8deb1ea7ad79a8b1aaec4a753bd300b6fa", - "sha256": "039y306py7fb3pn4nhlq2mb7rznd6kv2m9bfpd7hbxpfysj7kmi5" + "commit": "50b8376f152916bc200635a112db9439bc3cc9b5", + "sha256": "12lk6k0jwz3y9bjyxyl14g8qys4zcacb80mkc0hgz0bb7797hp3z" }, "stable": { "version": [ @@ -94790,15 +95155,15 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20220116, - 1228 + 20220317, + 1540 ], "deps": [ "transient", "wgrep" ], - "commit": "dcbaa48689d3d73f8a142a1ab5f1e722d7434ff9", - "sha256": "1djccv9fdl0a3jlv3xsflds1hx5kam2n2ghhv7hr2whivlh9wkrb" + "commit": "82105c6ae75af1587884baeaf3668becd9eb5802", + "sha256": "1pnr461nwhi8zv88bba13mb9m8rxg5nwkvd3rl8c2dzxyw6dzaq2" }, "stable": { "version": [ @@ -94822,20 +95187,20 @@ "repo": "ROCKTAKEY/rhq", "unstable": { "version": [ - 20220128, - 1344 + 20220308, + 1254 ], - "commit": "8d7e25de54f0b11df90a21d3fd2f7fd7608607f0", - "sha256": "17qiigk6ikfcyjgwxifmvwkyl8pa6iapyxz2qs0sbskw5d4mhdan" + "commit": "9cd8c2d61c3b8d4c92542a8c7f7493f61a850dc0", + "sha256": "0pj9900jmlid6ygwv5r8nnz1j4axcspyk73hl2vi1xvlna93yxdr" }, "stable": { "version": [ 0, - 5, + 6, 0 ], - "commit": "f554339b7a0be35ba43631a316a797edb888b206", - "sha256": "0pnh1mgv5xi11nrd0w2in5p412pqa29x3xvxj5q24lrwcjpl37lw" + "commit": "32d801fb79d45ef895c4e009884dd82ea3a6e466", + "sha256": "0nfi6mgar27qqf9hr9cnzq9asdisbkrwdlfjq9fzhgdb984xn22x" } }, { @@ -95095,11 +95460,11 @@ "repo": "nlamirault/ripgrep.el", "unstable": { "version": [ - 20190215, - 841 + 20220309, + 1746 ], - "commit": "40e871dcc4519a70981e9f28acea304692a60978", - "sha256": "0snn12iibz5frsx6yk6c31hb8knvsd568ghw9jjka5vxdjzap7p9" + "commit": "4ed5c741233a81d96115f556784269042070901e", + "sha256": "1bz9srlimpr5lzsjd02jq23h0vg2lnk921m24g0wsrdrccvmfxi2" }, "stable": { "version": [ @@ -95356,11 +95721,11 @@ "repo": "DerBeutlin/ros.el", "unstable": { "version": [ - 20220119, - 1543 + 20220314, + 2026 ], - "commit": "815a985d7426d716e9f588f6bbd3a12327c3acdb", - "sha256": "01hsnnxmvmk5vqga9781g1sff1fv2x77a4cmm3v5n94sv29jky4k" + "commit": "5e2bcd808f301b1a92cd583f2799d520bd802480", + "sha256": "0gb5bk1c10n4hr9dbwpgyk17qmd6bfqj9v9l0bmrbdvxafmnii8p" } }, { @@ -95940,8 +96305,8 @@ "repo": "semenInRussia/emacs-run-command-recipes", "unstable": { "version": [ - 20220208, - 1018 + 20220301, + 2010 ], "deps": [ "dash", @@ -95949,8 +96314,8 @@ "run-command", "s" ], - "commit": "e2751673e19e55fa364bc917e150c72b8ccc3294", - "sha256": "178qs6k5z4s74xx4n6r4qadw4svarvm8sfdxm5z964166r8d3x1y" + "commit": "02a4d366e309b7dd6a45f8a94669a25d6fe80ea1", + "sha256": "0j634n2v8sqpybbmd62jayyamz28dzlmvr45bsijbwxn6b4pa8k0" } }, { @@ -96055,8 +96420,8 @@ 20220217, 2009 ], - "commit": "c8ae5dedb3deddaf35f6345da894ae26d156bf27", - "sha256": "01r727n9gp5c7pmgnka53igcaaphfjy7lqb9w8bjjp7db9ccnacd" + "commit": "26ecc903c50b2ffd289bbe981f9ad03626fc0057", + "sha256": "0jr7i85zacpwx3kqg7yb7mbz0ap8w3ydzb8rlf0syccqjiqwslnl" }, "stable": { "version": [ @@ -96099,8 +96464,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20220227, - 1323 + 20220301, + 1958 ], "deps": [ "dash", @@ -96114,8 +96479,8 @@ "spinner", "xterm-color" ], - "commit": "4140ce28ed7beda6b7a1cc6e6cbf242856f1dbb7", - "sha256": "0sd1n4wxw68hj2x87r5vhii3c36p64i36d4mx6ml8f91gxh4nrc6" + "commit": "f4b5c288af2a9833a104bc54850ddabe3996b8be", + "sha256": "0mj94i701k1bdyafvhkl6k8c9sfa50ry9rqnby6i1qk5albxza14" }, "stable": { "version": [ @@ -96624,8 +96989,8 @@ 20200830, 301 ], - "commit": "fef5275f9df821b169bcf5973646c10c9179e876", - "sha256": "1xrwbf4hvm3l33j35q0xii6yrzpqx9v0rvma8p7j41afhhv9fcp0" + "commit": "a6392b3ec6ae2a0390612137f840ca083698929d", + "sha256": "1s598w6zs65jz31w354i734if8bnp377k9b54i1rhmgjkr2p6j2r" } }, { @@ -97093,20 +97458,20 @@ "repo": "t-e-r-m/sculpture-themes", "unstable": { "version": [ - 20210828, - 1634 + 20220311, + 2122 ], - "commit": "cce59d2bcc48d622f3978c583108cf853f21789c", - "sha256": "0f8aqq026j0wxkgs0p3yjq3r1jd30lk79199wrdk58x9120pp6z6" + "commit": "407cbed4145af8feb5232b1161a5f79b6a9878fb", + "sha256": "0x15fwrc53z1g517jrqyjdd8diil8sjdp9qhbhnbm2nsp97f07yk" }, "stable": { "version": [ 1, - 2, - 2 + 3, + 0 ], - "commit": "57fb0022daf5ca753dc77ee9178267c710c318db", - "sha256": "01xw04v22dh60w49i8h72wa2hvhwpqgriv0chy90m8vmn2fz40wz" + "commit": "07d74b29908447ff33365c23686682066549d671", + "sha256": "1azfr5np6m2zg7r3ga172mls3x64gb3m57lcfzwxgb9l8pmjy3an" } }, { @@ -97183,8 +97548,8 @@ "dash", "f" ], - "commit": "65498b584dd074f69e0c3fa61309542f77acd328", - "sha256": "0q27192qvf4p8cy0ks8bifag2zk2ncyz1ig1sjdwdbwx0drinw7p" + "commit": "09ae519ce825affeb6a033dac81bf7af946127ad", + "sha256": "1gprpjnm7r2faj53qcnch7s05s4jjrsh94hiji50kdi3lrwf2rs3" }, "stable": { "version": [ @@ -97421,11 +97786,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20220123, - 27 + 20220305, + 2142 ], - "commit": "26908ea0e88727f5eb6c5ebae7f9fbbe117ef25f", - "sha256": "0fd7nq7nxl9gjb37r14z5rdrk97p9z80z91i9744c1p6x714w702" + "commit": "a1ecc916f190728b574340754f4c1d8cbe37b829", + "sha256": "1mz8vmswfv0mp5b7cpmj46dik16wxmpa2a0cq87kjp1f8d4m9crn" }, "stable": { "version": [ @@ -97882,14 +98247,14 @@ "url": "https://codeberg.org/FelipeLema/session-async.el.git", "unstable": { "version": [ - 20211227, - 1609 + 20220302, + 2008 ], "deps": [ "jsonrpc" ], - "commit": "589eb5a1c6dee345880a9735c37b8b8f5de1813c", - "sha256": "0yj4r6y74w4b8axvljrm4xmd8n4v28s83wkbafsz8k25i1vrm2pj" + "commit": "427238bdfde880106dd39cf5845b559975e52f4f", + "sha256": "0zrcfycfgy87bpfm3jcfzp72ky5marbd5w4xf4rqvnw9spml6sya" } }, { @@ -98145,14 +98510,14 @@ "repo": "sebasmonia/sharper", "unstable": { "version": [ - 20210523, - 1821 + 20220314, + 1527 ], "deps": [ "transient" ], - "commit": "08277b6c30568adfbe438c9f2a1d6c3db4b7ebeb", - "sha256": "1n0nc3g57kl5d4zh0k0gis70kd05yb2pv7kw8akmdp9q7hxs6m93" + "commit": "c3406576ab855daa2e7084000f9797db59251e42", + "sha256": "0jl7jg844a0cjd5s0x0mpl2if2svhaac3hvc1vxzamdwan7qvqx2" } }, { @@ -98599,8 +98964,8 @@ 20210715, 1227 ], - "commit": "b5f6338f381c796a528d399a3fbaa4bb069d185a", - "sha256": "0wagh0jw2pkkq4rqkvcdj6rdnmnsz983r6mc9fsxnl0nwm8d9m7m" + "commit": "ff41a9988523891de92379b611f8c00b44d4127e", + "sha256": "0k29xx6ym2mqcn6rszxl4p05zqfpfvhcwvc3h3cx0bf5b8pnxd3j" }, "stable": { "version": [ @@ -99435,6 +99800,24 @@ } }, { + "ename": "skerrick", + "commit": "bf90740eac9231fe9c1a71f302614b3ed4d1f464", + "sha256": "1y2v9rnlj4hidp1vr4ivsxg90l0cjbwkw6fayh5dgfnk1brck6iq", + "fetcher": "github", + "repo": "anonimitoraf/skerrick", + "unstable": { + "version": [ + 20220306, + 2139 + ], + "deps": [ + "request" + ], + "commit": "fc88e82aa4b0a71b1fbe0217df4020538ebd8cd5", + "sha256": "0cjch25ljjw0pqj69rckp9b0lw1iz41dd1nl794gfagvl86gl92f" + } + }, + { "ename": "sketch-themes", "commit": "d1b2026ff5fe7a2893dd4c71d9089e97c4fd48f1", "sha256": "18n6blkrn72zyjj4ik3f6w2axmn0rwk8lpbcaynl3y7v7ij35m0r", @@ -99661,15 +100044,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20220227, - 1043 + 20220302, + 1215 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "8bdcc23f9b9738dd400b98b4503bb359b7bb43e4", - "sha256": "191rqs073cis7cswjmgxmjp9fw30d8n3kqbw9x8kzqqypw0s577l" + "commit": "6ef28864d4a6b4d9390dbd0cac64f2a56582682d", + "sha256": "0pscgg31slqggdzrjfmkg721lwvqph9qrp833p1j4b7wcc1j8xvv" }, "stable": { "version": [ @@ -99900,11 +100283,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20220131, - 1646 + 20220302, + 1053 ], - "commit": "8074da031ed9d677abc77fb3dab4bb42c6be76c3", - "sha256": "0yp1fzm7kiqd7316v6ndgildf81mslylnmqhx1xn8g8hsp2fl2l6" + "commit": "4513c382f07a2a2cedb3c046231b69eae2f5e6f0", + "sha256": "10bzxhi5d7h18hqclxqy2z857d0sfbsnyxvrhmfkdi0h75zz7m4n" } }, { @@ -101189,8 +101572,8 @@ "flycheck", "solidity-mode" ], - "commit": "f0f68b038c5edf16c85fc8ca58537e1c6479738b", - "sha256": "0hfp07bg348ppkgp5wca1sqpcprhc6jyxkpb1pmsm0vrifb3261l" + "commit": "20fb77e089e10187b37ae1a94153017b82ed2a0a", + "sha256": "0lyfhb4lirk08jc73c2vhlskfb496vnh0h906a74wz2pwg84q4m5" }, "stable": { "version": [ @@ -101214,11 +101597,11 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20220106, - 1055 + 20220308, + 1517 ], - "commit": "f0f68b038c5edf16c85fc8ca58537e1c6479738b", - "sha256": "0hfp07bg348ppkgp5wca1sqpcprhc6jyxkpb1pmsm0vrifb3261l" + "commit": "20fb77e089e10187b37ae1a94153017b82ed2a0a", + "sha256": "0lyfhb4lirk08jc73c2vhlskfb496vnh0h906a74wz2pwg84q4m5" }, "stable": { "version": [ @@ -101440,8 +101823,8 @@ "cl-lib", "deferred" ], - "commit": "8a18f8a62f4fdde80dfa069986aa959091a42472", - "sha256": "18iahla8m9b6bdn63x2yrvr3rzyw5ybipf44q9avyy6s1pqsby2a" + "commit": "323a364d2c220873f935ad46142c05c4fd1dea1d", + "sha256": "1dsb6j2kli0a0y06yn7gj5c72f6qz9fpwqhnvh9glcbqf6vv068r" }, "stable": { "version": [ @@ -101827,11 +102210,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20220225, - 102 + 20220318, + 106 ], - "commit": "fba53cc8d05d768dc7835b06d0fb857d7f13d5ea", - "sha256": "1lmf3zmwain0y6psmdazbbh240p64a4p6cwlj55sngbnzqidf7h1" + "commit": "251b9e7e5ba3a92ea26c3d676b9e76f8c42b2654", + "sha256": "1smrz3zh4cq2f344gm7l2jww5c0lkf9pinw6dvpcsl9sasqkxz0m" } }, { @@ -103019,11 +103402,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20220210, - 1829 + 20220315, + 1458 ], - "commit": "ce7c9805c9030fe28c4f29720bfe413ee4674c2d", - "sha256": "0pspxxpydzb5yhw1lmw5y6lcgrxq9zdrp40ckgjwdq0x49j7166z" + "commit": "ab9debd7ebbf1d8d1575c81743a8dab508338e5e", + "sha256": "0n20pqhy8c429mfsyx7gr01v3y6zzx92acmryxa6wqa295ndj6nl" } }, { @@ -103086,11 +103469,11 @@ "repo": "fosskers/streak", "unstable": { "version": [ - 20211004, - 2025 + 20220311, + 1929 ], - "commit": "32d6e3814df50284466d6d3a69f7f236e3746699", - "sha256": "0a3cn9kqkln4nxln78wjzr2zph3aa5y3hp0kxymniqz26dga29cn" + "commit": "b2206de2fe43f97e754bbcb0abe9b078a419e787", + "sha256": "0v2yvwgkc48kbqh2lx52044b5d7yvg7d24vivqbri1wny5zpriqr" }, "stable": { "version": [ @@ -103260,11 +103643,11 @@ "repo": "stepnem/stripes-el", "unstable": { "version": [ - 20211022, - 2144 + 20220310, + 2237 ], - "commit": "5e7adbd6e19a2d362ba818fdb44ad7744d757df2", - "sha256": "0ikhgqwwfbx1zmbx2scvi9cx7wlzwq91pwjydj2vxsg7c03iadd8" + "commit": "618e40e0a9cf80decea32c8daecb1c9f6eae2991", + "sha256": "0yb8mnix056n6ll17w13afr9rap53bb542xqy5ywcg9ajc1gd4jz" }, "stable": { "version": [ @@ -104043,14 +104426,14 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20211031, - 543 + 20220313, + 542 ], "deps": [ "seq" ], - "commit": "4777c409ba0cd0d02b9a8397ba810e449b5ac213", - "sha256": "0dmrshlkhavzlfxhm2fi37x7rf1h203iiamdqvqb7dqq0axah5r7" + "commit": "0d1ef0ef183398143b13fb8c76c1284df0d5e616", + "sha256": "0s7y6xkvy2lg3bs4508dh7szsfrvmxrihbf22ysijaqgzd69s86j" }, "stable": { "version": [ @@ -104394,14 +104777,14 @@ "repo": "wolray/symbol-overlay", "unstable": { "version": [ - 20220103, - 1747 + 20220304, + 917 ], "deps": [ "seq" ], - "commit": "d08c33dc85a118b199415e71bba0e7c330f87c5b", - "sha256": "1k9x39hv07wxk4hv60ai5gc9rbx0h423zcgj23cvqxj34knklzgi" + "commit": "c439b73a5f9713bb3dce98986b589bb901e22130", + "sha256": "0n2yknbhwbgbrvmgxk2j2hm5gkdh6m9p5y8vpq758bxf5xk6npzm" }, "stable": { "version": [ @@ -105359,15 +105742,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20220221, - 1453 + 20220306, + 2111 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "8402e7e2f016e372585273df35ea8484a7c4854c", - "sha256": "0k9q83xllhl1bmyrraylb38q285s96p43cbiagkq4lghib83d03l" + "commit": "4641f953b1183cd2e2be28d8e91374c0eb04aac2", + "sha256": "0wjivff90zffjw2j7mmcvxm00006vcg09nlvizjmv5r6lcxiyqb2" }, "stable": { "version": [ @@ -105414,16 +105797,16 @@ "repo": "dbordak/telephone-line", "unstable": { "version": [ - 20220218, - 449 + 20220313, + 2218 ], "deps": [ "cl-generic", "cl-lib", "seq" ], - "commit": "aa7b1ec159252f8a25f3c75fcc346fa4b0b3c73d", - "sha256": "0dy3w69rndgvhlfp5mx4axdgn517ip63js219vb8m9514mswhxav" + "commit": "7a0ba06db860dfe9a9ca012c2750b13deec385c6", + "sha256": "1w7b5qhg4nd92hl9whvbzz6nx2cb09m84ixkqqzygmjnrxknqsdl" }, "stable": { "version": [ @@ -105480,19 +105863,19 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20220223, - 2047 + 20220310, + 2211 ], - "commit": "40de509ff635b75d877d83d42d8e36672fdcc47d", - "sha256": "1h9sj8w6yrrlf1gjwv7lxzkbgam78804f8zm8d3knic8qv3h03lk" + "commit": "a725dfc5bcd21423ebc108cd4d5d92fb33becded", + "sha256": "0rvz4g88403qf5vril946a1v6qvazfn3pqv1ch6k1vh5c9xyavak" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "91d19e22f9f77f897c97177601d7f870fbf807cb", - "sha256": "16972j2qq03q65qszgjjkzl52f79hk007kyi249wg1bqhvfa59b6" + "commit": "ee964c24b69579fcd5ec3c7d3d1d84d1ca3d90e4", + "sha256": "1cq7gg4fh105229my57wbb7v72l8mx957pvsg8k3zc1l0hbc796i" } }, { @@ -106174,11 +106557,11 @@ "repo": "Dspil/text-categories", "unstable": { "version": [ - 20211130, - 1719 + 20220310, + 1053 ], - "commit": "b6afe804e23c624eec2af0f2a5c04bdcdfd833b5", - "sha256": "0p63ypxfd4s0ywmja3ynyn0i9mirgv8kyr2wj4a0i20havxd29gz" + "commit": "f046a0e3da5283fdf3046b2f4cf3689a520ae552", + "sha256": "0amx3wa5vr913vvvz7vlyajvg8d5nagjfnc9gmi842nzqcm2699j" } }, { @@ -106503,18 +106886,18 @@ 20200212, 1903 ], - "commit": "6781ecec4ba66950d04180cc0c2adac4f9a1e39f", - "sha256": "0c6ag1yv08xfwh8cmv3jp9i7kr9ppha9sp518vy9pq8cz151xcyw" + "commit": "b1367a39b4e0e09ca290e0d05df2f4a9057b842b", + "sha256": "0wcig0mcppw3r68rjhlj3jjlnvac2y1z4kw2kllmy6rbmqx0irgq" }, "stable": { "version": [ 2022, - 2, - 21, + 3, + 14, 0 ], - "commit": "4d159d0224c848847f37e247b2935dd11ff0cac9", - "sha256": "0yqbl77gvd550k7pcn1vscb4kdkayp410bsya93pzrlxfxnygp90" + "commit": "c2a1b07220f1d5548e83d23f378e179dc7da5b99", + "sha256": "1l599j13s5z0spbpi2fza3fgm8499s32r2y7kqxj5lp1dhwgiix4" } }, { @@ -106594,8 +106977,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20220102, - 441 + 20220314, + 930 ], "deps": [ "cl-lib", @@ -106604,8 +106987,8 @@ "s", "typescript-mode" ], - "commit": "4bd7f35d8aae160b16642aef3ca205adc71539a9", - "sha256": "0zrapfxdarakp3kwp73c2ymjx51fsnfk6azi2y1wb2kgsdxl2yim" + "commit": "b93e555858edc331ba33d1d8bd4582d578c7ca31", + "sha256": "0il0rdg6qk4bdpq86hxzwbv1rgwn028v72i3xh2kg6xsmpil4f0z" }, "stable": { "version": [ @@ -106819,11 +107202,11 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20220126, - 2034 + 20220316, + 2014 ], - "commit": "f0e8cee8caef2f3a411cbf276940dfacfc4d4158", - "sha256": "1rhr7j0gfcxvcgl5dfr4fidyx9m9lxwqyi8vcnvwcz0vnfxbr8x1" + "commit": "3be10cb5c3e17d9babb67190f63500ee68df267c", + "sha256": "04n31pgzn53cnlcs6qagdbspjy85w4dxm3iz6gynwnp50g4y16cv" }, "stable": { "version": [ @@ -106923,11 +107306,11 @@ "repo": "duckwork/titlecase.el", "unstable": { "version": [ - 20220118, - 604 + 20220227, + 1900 ], - "commit": "d82f3d23c166db1c3ea9ae25adaf43d1eeb748dc", - "sha256": "1m1zn8fh68jvh3n7x89bj2v0wgdj0323vrxp7251n9vj3fffnchi" + "commit": "157b2943f4aa5745d64c77c1ac4b76ce6e60c47b", + "sha256": "1bcj3k5gb28dkk8mcyqvm7scdszzf7ydp23piwsmavw0rdfqfhsd" }, "stable": { "version": [ @@ -107050,16 +107433,16 @@ "repo": "abrochard/emacs-todoist", "unstable": { "version": [ - 20220126, - 1813 + 20220318, + 2120 ], "deps": [ "dash", "org", "transient" ], - "commit": "585cd45b2c1442888a465e4e9d538eeb1a7b3c0a", - "sha256": "1m7pxf54l7qazh7fj2b6b0z9h2zfaxspxlx7lyxrfncdmp1bcswz" + "commit": "383d139a4627f4199cdda99f08551ed3237595a2", + "sha256": "1wvf1mq0j7bnjswssvnn2b4vqfxd19hw15v2ch6c7zai0jrqylzh" } }, { @@ -107124,8 +107507,8 @@ "deps": [ "cl-lib" ], - "commit": "842ae4df222bbd6596068814ac1b1e505c2a6b7a", - "sha256": "19j76bgv5hca8i9385f1s66zj31y70fgppmvxdqrws4265zqc11d" + "commit": "09166f32d3ece2b297da036f0abbeba63329580e", + "sha256": "09j3mxa0803piywmfkvxg0jpgbx6qbvibsik8wsms898bg5n3s4d" } }, { @@ -107184,8 +107567,8 @@ 20220222, 1140 ], - "commit": "3e856aa9388af2d5acbc77f4f7be7eb920f26760", - "sha256": "1wgf1xw3fmbzawl8hykxf6sa7gmrp6vx9bpcv31199mh1nzx7iin" + "commit": "b21fe53b70fa2936b052b9db8e2d4704ac40d9f6", + "sha256": "08si1qbdcy36h08256a9fgybifbx3bghx3z9l6j6j1kyz6s1w6gy" } }, { @@ -107286,20 +107669,20 @@ "repo": "trevorpogue/topspace", "unstable": { "version": [ - 20220225, - 1808 + 20220317, + 1843 ], - "commit": "42ee2417302b57ea9e81c1c455841b1578934cbc", - "sha256": "167bs3c2vbvjiafgnkyic8pb538cmv9k2df3phh5ly8bk0jzx17x" + "commit": "97c69d912e36b7f7c2cca8c510be6019f45a9351", + "sha256": "16wm1h0978js0fiwqnmxb8hd1pph2w0ylqq7wzwhi7w9d7gc11d7" }, "stable": { "version": [ 0, 1, - 1 + 2 ], - "commit": "4eb27abaa182e856ba3f3c8e1e84fdd2e1f009af", - "sha256": "0zfc5ix16kk5mwjs5wiqkfaljdhahb5hsb76hmay8nwhg5xsadkj" + "commit": "270b4ace5151f38ee5145689437d2b7a2d52cd96", + "sha256": "1mj5fd7kqmaz7qdx8rdqlri4999np8fd492hgpwli98zr6ha8spc" } }, { @@ -107666,11 +108049,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20220227, - 1751 + 20220314, + 1605 ], - "commit": "7c771c94c8fc31d859c1e083bf32fbce403f4766", - "sha256": "1x4bk5m9s5zag8din004n3paiy8l560p2cwcyfc9y2zjn7h5p42v" + "commit": "017eb7b3cb631bb432066539c459bfa96afa0543", + "sha256": "05389csxv8ggs2gksdv42adddjdjxfhrf3ip9ip1w8ya8n6wh9qr" }, "stable": { "version": [ @@ -107799,8 +108182,8 @@ 20200910, 1636 ], - "commit": "ec3d59c9be9a6ba3b8d4dbfc6f8834c9c3d14f7b", - "sha256": "18mqlcbic82naypgzgr8fw7zjcxp3096c5yhjspz349igqw32y01" + "commit": "8cf1c0d52509fa789870b300f2a7b3564e021104", + "sha256": "0kq5piwrby9xdx4xmqm63nsbg597xa46lzh4v59irkf89irsay49" }, "stable": { "version": [ @@ -107910,8 +108293,8 @@ "repo": "ethan-leba/tree-edit", "unstable": { "version": [ - 20220211, - 1633 + 20220317, + 29 ], "deps": [ "dash", @@ -107921,8 +108304,8 @@ "tree-sitter-langs", "tsc" ], - "commit": "f7d393b5caf601fe20c7543a53fca3d7e74ea09d", - "sha256": "0i8vc5mpwgkf21awnzc4m60paf13lwl0ff4ihks6k6xq65va3rhn" + "commit": "5961b738e30be007cb0fe984a76e406e0854c006", + "sha256": "17lfs5qqm2gjj40s3r6j1438zvrcfbsz6bxwn9z6flz6idj7ca0n" } }, { @@ -107978,15 +108361,15 @@ "url": "https://codeberg.org/FelipeLema/tree-sitter-indent.el.git", "unstable": { "version": [ - 20211128, - 2236 + 20220305, + 1919 ], "deps": [ "seq", "tree-sitter" ], - "commit": "5f80e89b7da2074ea7f083b769448eb7026865dc", - "sha256": "14pi0vv193vpbwd4kb86hsnv1h8j9pcclvipp1wllv3nxw8k2ypk" + "commit": "785b8cb8ab17bffec958e421260746e16b438727", + "sha256": "03c7lbig8rflny20v85w7bpla2x9653dk4azjifcs0m0vpjjghma" }, "stable": { "version": [ @@ -108343,9 +108726,20 @@ "ename": "treemacs-tab-bar", "commit": "fd08b4b2dc7476e39c210207313431e554de9bb9", "sha256": "1j5ch9jki388dhjnc7lsi6drvrsajjrdhxhqr55hq8ns1dhm8gl9", - "error": "Not in archive", "fetcher": "github", - "repo": "Alexander-Miller/treemacs" + "repo": "Alexander-Miller/treemacs", + "unstable": { + "version": [ + 20220221, + 2038 + ], + "deps": [ + "dash", + "treemacs" + ], + "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", + "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" + } }, { "ename": "treepy", @@ -108417,8 +108811,8 @@ 20180904, 2313 ], - "commit": "886232c6d7e92a8e9fe573eef46754ebe321f90d", - "sha256": "10h6p2dwl2k2p35pi3n8y85qh5y0zrr9nhfr4sviwzj1nbqdrvdr" + "commit": "f7cbd4f9283dbb0528445a3ea6d3b291d97065f6", + "sha256": "08l88w680jcl609wnsalydgfjnhrvbwiasgss7sv5r1xa16as942" }, "stable": { "version": [ @@ -108438,11 +108832,11 @@ "repo": "ianyepan/tron-legacy-emacs-theme", "unstable": { "version": [ - 20210420, - 1201 + 20220312, + 1645 ], - "commit": "e7d16ebe4a824e7d7766fb34ffe4ea3b002f3d23", - "sha256": "15njpd9923rl07lq4mxs611glgnw3qyr21wk6xak6n1cminvy81g" + "commit": "d775d9f348a942230ea57b6520e1eb56a5d67569", + "sha256": "03v8izw95ksl104w4zgacy0wpcvl4x3kwzamvd11d7ndlzn3jqpy" }, "stable": { "version": [ @@ -108700,14 +109094,14 @@ "repo": "smallwat3r/tubestatus.el", "unstable": { "version": [ - 20210801, - 1522 + 20220303, + 1736 ], "deps": [ "request" ], - "commit": "eeda4c2647cfdb910de776398037183f48e3fa72", - "sha256": "1fn405rmwcy8y5sa8lh5grq87n5zxbln2b9agxyilfx4jm6rcnpl" + "commit": "c81373f1bc32cbd2e2d642ee10ee1cb31915acb0", + "sha256": "1ili2jfp8ycigq022ws92x6x91k0myq34ipq318b461shd1by4yq" } }, { @@ -108927,24 +109321,6 @@ } }, { - "ename": "twtxt", - "commit": "4627ee00b9439d9dac9971ad1060af4bcf31446c", - "sha256": "0fpq3nz30v0g355xq0pcwf8iqykvn9af1wdx76v5fgzimlrpwy7l", - "fetcher": "github", - "repo": "deadblackclover/twtxt-el", - "unstable": { - "version": [ - 20200824, - 1323 - ], - "deps": [ - "request" - ], - "commit": "e7bafaf92124bb4f2a0be5c1a635b80f9b3a8c87", - "sha256": "1qqc6ykrpq311fwn5mvzc3yl6z48v1c3yq3vi8g9zv63ywj33bbk" - } - }, - { "ename": "typescript-mode", "commit": "94455323364d5a6b00e2786d577134eb350826b4", "sha256": "1abnik2dq0zfnp8pk8x6zy962qww78xadm87xyiwz17559g88d82", @@ -108955,8 +109331,8 @@ 20220223, 1506 ], - "commit": "84ff4228b5d1af287f35c9869e8eb079184a9831", - "sha256": "1kjw7phch5vyxc7gwkcwdl1p0cy3zzg7vyx4k1p5dbvh261k7c6h" + "commit": "88f317f0b6aef8f8d232e912fdbc679799580c56", + "sha256": "0qkqxvam3r21philap71dy4980sbadx32176rz20wwrs10szqnck" }, "stable": { "version": [ @@ -109374,8 +109750,8 @@ 20200719, 618 ], - "commit": "33cb9f541b1f7d4fa675e244822c8a074ebb4c4e", - "sha256": "104170qlxrvg5gr1m3ajfnankvnd3700k46lhrh7i356jl23kh1h" + "commit": "b9069b8af1bfa360d3b7197a7101fe0233c92750", + "sha256": "05873v76z7f7jrhkc78bmkgmqjvbidyaf1dymcccc8cgsc7bixp1" }, "stable": { "version": [ @@ -109469,8 +109845,8 @@ "deps": [ "cl-lib" ], - "commit": "94959e708d5a74913788324893d0b6dabc88ff18", - "sha256": "09gf5bm2kwgfx4b1rbnljarzj9mfbx3f0xiqias3cbj0x0lmwmd1" + "commit": "efb8ac3935635ad0fd731de0ef64b14a23f50b42", + "sha256": "0mvj2jhj2dl4pr4gh7rh3042lawxik9myvvnvqc25zjqa5n4jp8c" }, "stable": { "version": [ @@ -109667,11 +110043,11 @@ "repo": "astoff/unicode-math-input.el", "unstable": { "version": [ - 20210612, - 847 + 20220302, + 1231 ], - "commit": "2788d7824d23749a6e5b33f653c47471455da187", - "sha256": "1kqaqzlgf9gqxf3fzy41m606h7ridp5iik1w5a0dpq86ni23r77c" + "commit": "06bf37d649fc3b41fcd5fa29c0b0eda555aaf8bb", + "sha256": "0i6qyc5jl1151dyp95wjx7f7fs4m0pb7qnlb6skr33rrfl1icmpn" } }, { @@ -110318,8 +110694,8 @@ 20220220, 150 ], - "commit": "b590f6d3643ff70dfde0181abb287d7b24073067", - "sha256": "0zp6zyxk033n8p3ccaz50mrnhrcnb7w40b0xjm1lk4snap3hlihq" + "commit": "fb82a02b6c86e6224482b27caa08662b023b40a1", + "sha256": "1lncgprxmir4czq8iiww9cmpd4si77vipkgksjrv37r9xz5hgyr4" }, "stable": { "version": [ @@ -111448,11 +111824,11 @@ "repo": "thanhvg/emacs-virtual-comment", "unstable": { "version": [ - 20211103, - 209 + 20220301, + 430 ], - "commit": "4effa95c7d6243fc5696597f488653f9d2a5d4a6", - "sha256": "164yiiqqxk2fpjk65y72fr71j05b1330zmvbaxh0w3ww2axkjz68" + "commit": "5205379bcfa1774a745e3dcbaa4ea861ff6a9ad2", + "sha256": "1blgy286id63mqr2gan7xkg88rn2nwj36vqdsyyxq8w2p3f5qh54" } }, { @@ -111771,8 +112147,8 @@ 20220214, 1401 ], - "commit": "6fde70a06788e2b8851e765c75ae76cd1655287d", - "sha256": "10wjd76qrr503rbvpklpcxz74pcx08zvqgn3g6a0qrzpsiigkscd" + "commit": "ac33dc2a4a7c017d2baf03a66c69d8e5c983420e", + "sha256": "1v397idaxzmc8g3a9fjba8xsxhhsdsz589vs6k8v60p7v8j1ivrl" }, "stable": { "version": [ @@ -111794,8 +112170,8 @@ 20220214, 1401 ], - "commit": "6bfe9144b626b98bbb67cbf512f3419c25ae973f", - "sha256": "05rkm1zlxmz65z1k9i3nh1dgd6arn97h0cyv3mbyw0pksfnf0gx7" + "commit": "a1a9dd9f3d6ba2352afaf920c911eaf6b2e7e0c1", + "sha256": "033rgvxas97858969nbg8xzzsx3p2x4a425wk9jvbbhl8aw8xf3d" }, "stable": { "version": [ @@ -112019,8 +112395,8 @@ "org-roam", "s" ], - "commit": "266c491ee2d583648f391803a278e8c5befbd8bd", - "sha256": "1dw05c0kfrjv09lqdkwg8i6hkxd3g2zaclixfhfzgs2976a9r23k" + "commit": "ba44342aea6a81c7b7ca6fcaae9a537701789b5e", + "sha256": "0avqxd264dpbyh8cza0pv8miflyaaqlx27xdjix4xj42wq8k6rzm" }, "stable": { "version": [ @@ -112045,14 +112421,14 @@ "repo": "embed-me/vunit-mode", "unstable": { "version": [ - 20220121, - 1644 + 20220316, + 1812 ], "deps": [ "hydra" ], - "commit": "13311cc9fba6e73cf859dd5defefd330cc41b489", - "sha256": "0k7xj2a0xdc4g0bi1fxmwy1bl1ha9z68f7l1qc296r8q3hq8ghi9" + "commit": "5643460a7011d6bc13c2d4762f329d19f6c7d46b", + "sha256": "1zzlfscnzvck658ylsmqwk30jdf9qnrnmhvghd3xinlhglnmwrp7" } }, { @@ -112250,16 +112626,16 @@ "repo": "abrochard/walkman", "unstable": { "version": [ - 20201229, - 1811 + 20220318, + 2122 ], "deps": [ "json-mode", "org", "transient" ], - "commit": "0cb9c2fef6e611b4389f7df7fcccc17744053e9b", - "sha256": "1fv4bn6c04kv39jv25r09pvxc5hz5gwwbj16fhxs5930rf77ikqb" + "commit": "3118dd4f493caffcc2849058833572dfc0c0e0a9", + "sha256": "03hyz3bhbisymm0gzqzsrmvyzkkgh73zbqgra6m70jka8sv065xs" }, "stable": { "version": [ @@ -112787,14 +113163,14 @@ "repo": "emacs-love/weblorg", "unstable": { "version": [ - 20210919, - 1547 + 20220312, + 2008 ], "deps": [ "templatel" ], - "commit": "0f8ec7e9065b2962c93209ee30b46f91843e2815", - "sha256": "0jiq879m74ysl0gb9wh1qmxyxi79nhnr2b1slq33mwf98r1nzcbg" + "commit": "b2bb79ed2c532cad5b03455d8cae887ddb803db3", + "sha256": "0xz9f7vz3h82hksz0swf5ykdh1fwh6dyk7dadjvral7iqjz4pjmf" }, "stable": { "version": [ @@ -112855,8 +113231,8 @@ "deps": [ "cl-lib" ], - "commit": "fda4455333309545c0787a79d73c19ddbeb57980", - "sha256": "1ga4m9xgiczb6sv7dhmy4841rd9wxsirrvi8va34srpzlq51iq65" + "commit": "82b370602fa0158670b1c6c769f223159affce9b", + "sha256": "0bl1hwdy6ign624lhb8dncvahvrs8j96dss4kl5rfxzy5rpva0jp" }, "stable": { "version": [ @@ -113354,9 +113730,16 @@ "ename": "why-this", "commit": "f45e4eabb023673be2dd3c6c46e752085587c0e2", "sha256": "1pb73qc67w73p664kfd0na1qmzbz00dmjz468smrpjjscqmazmp3", - "error": "Not in archive", "fetcher": "git", - "url": "https://codeberg.org/akib/emacs-why-this.git" + "url": "https://codeberg.org/akib/emacs-why-this.git", + "unstable": { + "version": [ + 20220314, + 1329 + ], + "commit": "ca4cf46d6e7b961a0c0fa39ac084fdca3c8c93b2", + "sha256": "14zb4abakpy2s05lfry097i0gg2d3njj0847a62dnwv8hgypsk6c" + } }, { "ename": "wide-column", @@ -113887,11 +114270,11 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20220211, - 2034 + 20220318, + 1640 ], - "commit": "f514f23258af67a10fc8e1c431bfe94702b6e65b", - "sha256": "095gmw87ch8mnwcldyab89a04wr5ahb2hgh0nd0gbhg7mkca17ph" + "commit": "495a545178bc43adf96dc0dd7dd0546e56127d7c", + "sha256": "0dcqim83x73m0gag3gca7cdqn6vjq2gfdvyhlmfvzg2n4153wr0i" }, "stable": { "version": [ @@ -114141,8 +114524,8 @@ 20220225, 1907 ], - "commit": "19be797818be2d9ac5a0a8acf30b43ad38e2f4ed", - "sha256": "13yj1pl9v0345dnxwdpy50b74syrbqhlrf8ldfnxpiww090n7zmq" + "commit": "5a1f9a45c3d1fa58c3de5183c4456572ae861d49", + "sha256": "0jd7lbb7mbjfk66mkzxnhffh3dlj28xma5a8km5hc4lclqlm74sx" } }, { @@ -114272,11 +114655,11 @@ "repo": "pashinin/workgroups2", "unstable": { "version": [ - 20220106, - 249 + 20220308, + 1314 ], - "commit": "d2e1f33001f1777767a7c6e862d5e6a37e688f42", - "sha256": "03lbfbi05g03w1cnys6smaf0yxm6168ckmdbcvkxy0k519ngzyd1" + "commit": "b2c457a720e98dd1c560860e44a6a80372ef07ef", + "sha256": "198bm8l8jf6xvc7djy3d9z7xm437pkabmi9i30pd79g5l2dikj8f" }, "stable": { "version": [ @@ -115370,11 +115753,11 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20210730, - 143 + 20220311, + 332 ], - "commit": "84b88c9ed178af16da18b230c1f61c57cefedf28", - "sha256": "13fjxrr7iyfagbm21p5is5jw1zv56ns2mnac145v8lqli6mrr5gx" + "commit": "34c300b08579b72c7c92aefee1f4b500913f0c85", + "sha256": "1lwhm3c7xmx1j9ggf9ka0whpm7g5p6b11gfv1bxkdx1j8ypvxn0m" }, "stable": { "version": [ @@ -115537,11 +115920,11 @@ "repo": "binjo/yara-mode", "unstable": { "version": [ - 20210520, - 1318 + 20220317, + 935 ], - "commit": "345cf782926414f92f57d7f1b129974dc38a545b", - "sha256": "0n3cnxxwm3rgzpgqy1kkv6fhqzqw3gnj1p9anp5vdhss8fdad7s3" + "commit": "4c959b300ce52665c92e04e524dda5ed051c34f3", + "sha256": "0kb2a4hcmaczn279hbgk0jv88hsjznv1kqpkgkadszd02q53n0cl" } }, { @@ -115616,8 +115999,8 @@ 20220212, 1742 ], - "commit": "d8674bbbc9d4d7bdba374f0c0473ebb1912bcac2", - "sha256": "1nryhfiddak70y1hhhzkpb2afy00kd7vc3vg4ja0frpdvdrl93pz" + "commit": "82772ac2508a4549c75f2aa31d901caea468a0fb", + "sha256": "1ccyf0y9886vq4007xr4g8w05jnw3v8pfzlqxdk7j4babj8kyjw9" }, "stable": { "version": [ @@ -116531,11 +116914,11 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220227, - 1351 + 20220317, + 1147 ], - "commit": "a8785b1e012fa178674d5c9fab014b60ca1ba269", - "sha256": "1fy6mz0f1pgx5m9q76a7803rl9pzg1v5pvxslpsw93qi6xw1wjqv" + "commit": "527ca510d073bcda7746c754935346f531c60b4b", + "sha256": "1zvhd1fk2p9n3gn8bbqsv3lcgc2bmhd6hf0pp4a8z0wv5nkv1235" } }, { @@ -116546,14 +116929,14 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220220, - 1952 + 20220312, + 2211 ], "deps": [ "zk" ], - "commit": "a8785b1e012fa178674d5c9fab014b60ca1ba269", - "sha256": "1fy6mz0f1pgx5m9q76a7803rl9pzg1v5pvxslpsw93qi6xw1wjqv" + "commit": "527ca510d073bcda7746c754935346f531c60b4b", + "sha256": "1zvhd1fk2p9n3gn8bbqsv3lcgc2bmhd6hf0pp4a8z0wv5nkv1235" } }, { @@ -116778,8 +117161,8 @@ 20201205, 1038 ], - "commit": "474ca4723517d95356145950b134652d5dc0c7f7", - "sha256": "0syr88kqzh27ap57v97prk2z0l9wkaysqf1263j7nn9pl4jswppd" + "commit": "1823f8431b36beae112a67f5b102e06afaaa52bf", + "sha256": "0mqz10ngfn2kyhm918gwx185zmmvzj47vha5dvwwkqxx28xcsfq6" }, "stable": { "version": [ @@ -116943,20 +117326,20 @@ "repo": "Vonfry/zoxide.el", "unstable": { "version": [ - 20211223, - 245 + 20220302, + 522 ], - "commit": "29508e94255c34174bc07c93749cad5d04700063", - "sha256": "12y0vqibb5sn9l42aiy1lm0cp0nl8d27zgql86va28glwzpma6s9" + "commit": "ecdcb62847b5e54ccd477d740e4974f28c8f5809", + "sha256": "1f4j53a1bm4kpgmlpfxnqb9zm8q0qxl7frxd8a0nqwfrxrzkqp8p" }, "stable": { "version": [ 1, - 1, + 2, 0 ], - "commit": "29508e94255c34174bc07c93749cad5d04700063", - "sha256": "12y0vqibb5sn9l42aiy1lm0cp0nl8d27zgql86va28glwzpma6s9" + "commit": "1ec22ca486aaa838828ec516e91f8880b478bd19", + "sha256": "1f4j53a1bm4kpgmlpfxnqb9zm8q0qxl7frxd8a0nqwfrxrzkqp8p" } }, { diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index 7d060a972cd..dfdf75627bf 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "ghostwriter"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = version; - hash = "sha256-w4qCJgfBnN1PpPfhdsLdBpCRAWai9RrwU3LZl8DdEcw="; + hash = "sha256-NpgtxYqxMWMZXZRZjujob40Nn6hirsSzcjoqRJR6Rws="; }; nativeBuildInputs = [ qmake pkg-config qttools ]; diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index b98aceddbd4..23538a237e4 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -46,9 +46,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "7.2"; + version = "7.4"; url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz"; - sha256 = "sha256-38ZBUjyNvGZBaLYXREFjPZcSdUVr9n3i3KqZyNql7hU="; + sha256 = "sha256-co6GbW5JzpKioMUUMz6f8Ivb9shvXvTmGAFDuNK31BY="; inherit (stable) gecko32 gecko64 patches; mono = fetchurl rec { @@ -61,7 +61,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-Ec9rienlsDg+2QkJqPrGorDb5NycG1/iGWhnqLZOrwg="; + sha256 = "0vlj3b8bnidyhlgkjrnlbah3878zjy3s557vbp16qka42zjaa51q"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/applications/emulators/wine/vkd3d.nix b/pkgs/applications/emulators/wine/vkd3d.nix index ac7c399cd97..4f06b886e23 100644 --- a/pkgs/applications/emulators/wine/vkd3d.nix +++ b/pkgs/applications/emulators/wine/vkd3d.nix @@ -1,16 +1,18 @@ -{ lib, stdenv, fetchurl, moltenvk, vulkan-headers, spirv-headers, vulkan-loader }: +{ lib, stdenv, fetchurl, moltenvk, vulkan-headers, spirv-headers, vulkan-loader, flex, bison }: #TODO: unstable stdenv.mkDerivation rec { pname = "vkd3d"; - version = "1.2"; + version = "1.3"; src = fetchurl { url = "https://dl.winehq.org/vkd3d/source/vkd3d-${version}.tar.xz"; - sha256 = "0szr1lw3xbgi9qjm13d1q4gyzzwv8i5wfxiwjg6dmwphrc7h6jxh"; + sha256 = "134b347806d34a4d2b39ea29ff1c2b38443793803a3adc50800855bb929fb8b2"; }; + nativeBuildInputs = [ flex bison ]; + buildInputs = [ vulkan-headers spirv-headers ] ++ [ (if stdenv.isDarwin then moltenvk else vulkan-loader) ]; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 12e605f80c4..fba158efacb 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,18 +10,19 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "474"; + version = "477"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-NeTHq8zlgBajw/eogwpabqeU0b7cp83Frqy6kisrths="; + sha256 = "sha256-/Gehlk+eMBPA+OT7xsTri6PDi2PBmzjckMVbqPGXT64="; }; nativeBuildInputs = [ wrapQtAppsHook + python3Packages.mkdocs-material ]; propagatedBuildInputs = with python3Packages; [ @@ -85,6 +86,7 @@ python3Packages.buildPythonPackage rec { # Move the hydrus module and related directories mkdir -p $out/${python3Packages.python.sitePackages} mv {hydrus,static} $out/${python3Packages.python.sitePackages} + mkdocs build -d help mv help $out/doc/ # install the hydrus binaries diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index 8396ba55638..8e864b64096 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "pixinsight"; - version = "1.8.8-12"; + version = "1.8.9"; src = requireFile rec { - name = "PI-linux-x64-${version}-20211229-c.tar.xz"; + name = "PI-linux-x64-${version}-20220313-c.tar.xz"; url = "https://pixinsight.com/"; - sha256 = "7095b83a276f8000c9fe50caadab4bf22a248a880e77b63e0463ad8d5469f617"; + sha256 = "sha256-LvrTB8fofuysxR3OoZ2fkkOQU62yUAu8ePOczJG2uqU="; message = '' PixInsight is available from ${url} and requires a commercial (or trial) license. After a license has been obtained, PixInsight can be downloaded from the software distribution diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index 098001ef4c2..23cbdf28477 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, nixosTests, extra-cmake-modules, kdoctools, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons, ki18n, kiconthemes, kinit, kio, knotifications, @@ -22,5 +22,7 @@ mkDerivation { kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff ]; + passthru.tests.test = nixosTests.terminal-emulators.konsole; + propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; } diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index e80bb82ccec..5f09fba4cb7 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.23.5"; + version = "0.24.0"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-kVM/F0LsIgMtur8jHZzUWkFIcfHe0i8y9Zxe3z5SkVM="; + sha256 = "sha256-QyexUZNn7QGHjXYO/+1kUebTmAzdVpwG9Ile8Uh3i8Q="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index cf1303422d2..9e38a208e17 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -43,6 +43,11 @@ stdenv.mkDerivation rec { ]; postPatch = '' + # Fix build with vala 0.56 + # https://github.com/donadigo/appeditor/pull/122 + substituteInPlace src/Application.vala \ + --replace "private static string? create_exec_filename;" "public static string? create_exec_filename;" + chmod +x meson/post_install.py patchShebangs meson/post_install.py ''; diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index eb17bf5c194..d8fd18f9de4 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.23.0"; + version = "1.24.0"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-MUF57begai6yMYLPC5dnyO9S39uHogB+Ie3qDA46Cn8="; + sha256 = "sha256-Em+WAI8G492h7FJTnTHFj5L7M4xBZhW4qC0MMc2JRUU="; }; vendorSha256 = "sha256-NP+Is7Dxz4LGzx5vpv8pJOJhodAYHia1JXYfhJD54as="; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index ed0e3e72be2..dc5dedbd1ad 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.20.5"; + version = "1.21.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UJAoxRybEYxQY+7l/szSj9fy1J552yaxF3MdaEmDiQQ="; + sha256 = "sha256-D/K+C7IX4VGv+FFYuPQEqwVYSjiDcSeElVunVMiFWI8="; }; propagatedBuildInputs = [ requests yt-dlp ]; diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix index b7eb2367528..2a00cb92b9d 100644 --- a/pkgs/applications/misc/regextester/default.nix +++ b/pkgs/applications/misc/regextester/default.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - pantheon.elementary-icon-theme pantheon.granite glib libgee diff --git a/pkgs/applications/misc/sigi/default.nix b/pkgs/applications/misc/sigi/default.nix index 674432e7a02..62b8dd57659 100644 --- a/pkgs/applications/misc/sigi/default.nix +++ b/pkgs/applications/misc/sigi/default.nix @@ -2,11 +2,11 @@ rustPlatform.buildRustPackage rec { pname = "sigi"; - version = "3.0.2"; + version = "3.0.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-N+8DdokiYW5mHIQJisdTja8xMVGip37X6c/xBYnQaRU="; + sha256 = "sha256-tjhNE20GE1L8kvhdI5Mc90I75q8szOIV40vq2CBt98U="; }; nativeBuildInputs = [ installShellFiles ]; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { installManPage sigi.1 ''; - cargoSha256 = "sha256-vO9ocTDcGt/T/sLCP+tCHXihV1H2liFDjI7OhhmPd3I="; + cargoSha256 = "sha256-0e0r6hfXGJmrc6tgCqq2dQXu2MhkThViZwdG3r3g028="; passthru.tests.version = testVersion { package = sigi; }; diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index f29c471d04b..c11ad8d1e98 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -68,6 +68,11 @@ stdenv.mkDerivation rec { ]; postPatch = '' + # Fix build with vala 0.56 + # https://github.com/bleakgrey/tootle/pull/346 + substituteInPlace src/Application.vala \ + --replace "public const GLib.ActionEntry[] app_entries" "private const GLib.ActionEntry[] app_entries" + chmod +x meson/post_install.py patchShebangs meson/post_install.py ''; diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix index 74074d23242..dad293e51a2 100644 --- a/pkgs/applications/networking/cawbird/default.nix +++ b/pkgs/applications/networking/cawbird/default.nix @@ -23,14 +23,14 @@ }: stdenv.mkDerivation rec { - version = "1.4.2"; + version = "1.5"; pname = "cawbird"; src = fetchFromGitHub { owner = "IBBoard"; repo = "cawbird"; rev = "v${version}"; - sha256 = "17575cp5qcgsqf37y3xqg3vr6l2j8bbbkmy2c1l185rxghfacida"; + sha256 = "sha256-XFN9gfCoQDmYYysg1yrUoPPE0Ow40LttvV5Ltu0DTfI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix index df44c25cdc5..22e596dabf2 100644 --- a/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.15"; + version = "0.6.17"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - sha256 = "sha256-Gf4YxxyNALicb9GPpOW+Kzb2xrwcAU1XYOzXochH0LI="; + sha256 = "sha256-u/YISLlZFYlAUejSlaH7POA2WwKURPN8phFU86/caXU="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 0b8650f3f7d..c55ccfa02fa 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -11,15 +11,15 @@ buildGoModule rec { pname = "werf"; - version = "1.2.74"; + version = "1.2.77"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-Mfgvl6ljmYn9Vu/tWS0JAuH1pzQZ4zoD5+5ejUJF/Lg="; + sha256 = "sha256-JmadwNERjexnJN+fBUjgMkvPtAaTbb7GITPsZlx2vik="; }; - vendorSha256 = "sha256-MsIbuwsb0sKEh3Z7ArtG/8SWFPaXLu+TGNruhsHhtb4="; + vendorSha256 = "sha256-IPQiS1GgNP+k/INv3f3VitoHActC3MrRys905nTSXyI="; proxyVendor = true; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 3a63f98c44c..deac64c903e 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -22,13 +22,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.4.3"; + version = "3.4.4"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-nryoueoqnbBAJaU11OUXKP5PNrYf4515ojBkdMFIEMA="; + sha256 = "sha256-e4me4mpK0N3UyM5MuJP3jxwM5h1dGBd+JzAr5f3BOGQ="; }; patches = [ diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index e23ba5cdf2a..9ebd9db67f9 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -40,8 +40,13 @@ buildGoModule rec { ${rcloneBin}/bin/rclone genautocomplete $shell rclone.$shell installShellCompletion rclone.$shell done - '' + lib.optionalString (enableCmount && !stdenv.isDarwin) '' - wrapProgram $out/bin/rclone --prefix LD_LIBRARY_PATH : "${fuse}/lib" + '' + lib.optionalString (enableCmount && !stdenv.isDarwin) + # use --suffix here to ensure we don't shadow /run/wrappers/bin/fusermount, + # as the setuid wrapper is required as non-root on NixOS. + '' + wrapProgram $out/bin/rclone \ + --suffix PATH : "${lib.makeBinPath [ fuse ] }" \ + --prefix LD_LIBRARY_PATH : "${fuse}/lib" ''; meta = with lib; { diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index 8bd1d8f974b..100818ad249 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - pantheon.elementary-icon-theme pantheon.granite glib libgee diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index 1de5a8b817b..9c716dfd9a4 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { libgee libgudev libsoup - pantheon.elementary-icon-theme pantheon.granite ]; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 6fb8aecbbca..53c61f0d993 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl, wrapGAppsHook, makeDesktopItem +{ lib +, stdenv +, fetchurl +, wrapGAppsHook +, makeDesktopItem , atk , cairo , coreutils @@ -27,7 +31,8 @@ , libXt , libnotify , gnome -, libGLU, libGL +, libGLU +, libGL , nspr , nss , pango @@ -36,55 +41,56 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "5.0.96.3"; + version = "6.0"; src = fetchurl { - url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "sha256-eqSNzmkGNopGJ7VByvUffFEPJz3WHS7b5+jgUAW/hU4="; + url = + "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; + sha256 = "0zkgmmflcj6vbyv8rs51jf3vx1zq8pl7b5d5asgayhrdlwi0qgff"; }; nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs= [ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ]; + buildInputs = + [ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ]; dontConfigure = true; dontBuild = true; dontStrip = true; dontPatchELF = true; - libPath = lib.makeLibraryPath - [ stdenv.cc.cc - atk - cairo - curl - cups - dbus-glib - dbus - fontconfig - freetype - gdk-pixbuf - glib - glibc - gtk3 - libX11 - libXScrnSaver - libXcomposite - libXcursor - libxcb - libXdamage - libXext - libXfixes - libXi - libXinerama - libXrender - libXt - libnotify - libGLU libGL - nspr - nss - pango - ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ - stdenv.cc.cc - ]; + libPath = lib.makeLibraryPath [ + stdenv.cc.cc + atk + cairo + curl + cups + dbus-glib + dbus + fontconfig + freetype + gdk-pixbuf + glib + glibc + gtk3 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libxcb + libXdamage + libXext + libXfixes + libXi + libXinerama + libXrender + libXt + libnotify + libGLU + libGL + nspr + nss + pango + ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; postPatch = '' sed -i '/pref("app.update.enabled", true);/c\pref("app.update.enabled", false);' defaults/preferences/prefs.js diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index 43cf58db258..8d97c8bbedb 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -1,16 +1,18 @@ -{ lib +{ config +, lib , stdenv , fetchFromGitHub , cmake , codec2 +, libpulseaudio , libsamplerate , libsndfile , lpcnetfreedv , portaudio -, pulseaudio , speexdsp , hamlib , wxGTK31-gtk3 +, pulseSupport ? config.pulseaudio or stdenv.isLinux }: stdenv.mkDerivation rec { @@ -33,17 +35,18 @@ stdenv.mkDerivation rec { speexdsp hamlib wxGTK31-gtk3 - ] ++ (if stdenv.isLinux then [ pulseaudio ] else [ portaudio ]); + ] ++ (if pulseSupport then [ libpulseaudio ] else [ portaudio ]); cmakeFlags = [ "-DUSE_INTERNAL_CODEC2:BOOL=FALSE" "-DUSE_STATIC_DEPS:BOOL=FALSE" - ] ++ lib.optionals stdenv.isLinux [ "-DUSE_PULSEAUDIO:BOOL=TRUE" ]; + ] ++ lib.optionals pulseSupport [ "-DUSE_PULSEAUDIO:BOOL=TRUE" ]; meta = with lib; { homepage = "https://freedv.org/"; description = "Digital voice for HF radio"; license = licenses.lgpl21; maintainers = with maintainers; [ mvs ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index aaac288b615..1c613419cc8 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, coreutils, nettools, java, scala, polyml, z3, veriT, vampire, eprover-ho, rlwrap, perl, makeDesktopItem }: +{ lib, stdenv, fetchurl, coreutils, nettools, java, scala, polyml, z3, veriT, vampire, eprover-ho, naproche, rlwrap, perl, makeDesktopItem }: # nettools needed for hostname stdenv.mkDerivation rec { @@ -66,7 +66,8 @@ stdenv.mkDerivation rec { ISABELLE_JDK_HOME=${java} EOF - sed -i -e 's/naproche_server : bool = true/naproche_server : bool = false/' contrib/naproche-*/etc/options + rm contrib/naproche-*/x86*/Naproche-SAD + ln -s ${naproche}/bin/Naproche-SAD contrib/naproche-*/x86*/ echo ISABELLE_LINE_EDITOR=${rlwrap}/bin/rlwrap >>etc/settings diff --git a/pkgs/applications/science/logic/naproche/default.nix b/pkgs/applications/science/logic/naproche/default.nix new file mode 100644 index 00000000000..5e286a9b57e --- /dev/null +++ b/pkgs/applications/science/logic/naproche/default.nix @@ -0,0 +1,38 @@ +{ lib, fetchFromGitHub, haskellPackages, makeWrapper, eprover }: + +with haskellPackages; mkDerivation { + pname = "Naproche-SAD"; + version = "0.1.0.0"; + + src = fetchFromGitHub { + owner = "naproche"; + repo = "naproche"; + rev = "d39cea85ace04d5b3775fde9972a33886799bfe6"; + sha256 = "1zqrldmxkzbyg9bssrbwb00zic29904igcipaz1m9al0456yjnkf"; + }; + + isExecutable = true; + + buildTools = [ hpack makeWrapper ]; + executableHaskellDepends = [ + base array bytestring containers ghc-prim megaparsec mtl network process + split temporary text threads time transformers uuid + ]; + + prePatch = "hpack"; + + checkPhase = '' + export NAPROCHE_EPROVER=${eprover}/bin/eprover + dist/build/Naproche-SAD/Naproche-SAD examples/cantor.ftl.tex -t 60 --tex=on + ''; + + postInstall = '' + wrapProgram $out/bin/Naproche-SAD \ + --set-default NAPROCHE_EPROVER ${eprover}/bin/eprover + ''; + + homepage = "https://github.com/naproche/naproche#readme"; + description = "Write formal proofs in natural language and LaTeX"; + maintainers = with lib.maintainers; [ jvanbruegge ]; + license = lib.licenses.gpl3Only; +} diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index 2fe027365cd..3e7a8b56af1 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { gtk3 gtksourceview libgee - pantheon.elementary-icon-theme pantheon.granite webkitgtk # We add libqalculate's runtime dependencies because nasc has it as a modified subproject. diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 7ba5838faba..4f68eb6ae78 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-l9lR5MVHWiRz5RG/I/nXRY4GQSSaXXP7PlRNoAu9+yo="; + sha256 = "sha256-EOiExp8JBc3SybSiBVbuRxBqTujzLjysWM0v94goups="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index e7730ba4b94..e6762f543cb 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , fetchpatch , rustPlatform +, nixosTests , cmake , gzip @@ -132,6 +133,8 @@ rustPlatform.buildRustPackage rec { dontPatchELF = true; + passthru.tests.test = nixosTests.terminal-emulators.alacritty; + meta = with lib; { description = "A cross-platform, GPU-accelerated terminal emulator"; homepage = "https://github.com/alacritty/alacritty"; diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix index 6ef16a5b9e4..d0def97e46f 100644 --- a/pkgs/applications/terminal-emulators/contour/default.nix +++ b/pkgs/applications/terminal-emulators/contour/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, freetype, libGL, pcre }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, freetype, libGL, pcre, nixosTests }: mkDerivation rec { pname = "contour"; @@ -16,6 +16,8 @@ mkDerivation rec { buildInputs = [ freetype libGL pcre ]; + passthru.tests.test = nixosTests.terminal-emulators.contour; + meta = with lib; { description = "Modern C++ Terminal Emulator"; homepage = "https://github.com/christianparpart/contour"; diff --git a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix index 049452c7e3a..4243502e7fe 100644 --- a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix +++ b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, mkDerivation, qtbase, qtquick1, qmltermwidget -, qtquickcontrols, qtgraphicaleffects, qmake }: +, qtquickcontrols, qtgraphicaleffects, qmake, nixosTests }: mkDerivation rec { version = "1.1.1"; @@ -29,6 +29,8 @@ mkDerivation rec { ln -s $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term $out/bin/cool-retro-term ''; + passthru.tests.test = nixosTests.terminal-emulators.cool-retro-term; + meta = { description = "Terminal emulator which mimics the old cathode display"; longDescription = '' diff --git a/pkgs/applications/terminal-emulators/ctx/default.nix b/pkgs/applications/terminal-emulators/ctx/default.nix index 78c673d035a..420e9b020e9 100644 --- a/pkgs/applications/terminal-emulators/ctx/default.nix +++ b/pkgs/applications/terminal-emulators/ctx/default.nix @@ -8,6 +8,7 @@ , libdrm # Not documented , pkg-config , enableFb ? false +, nixosTests }: stdenv.mkDerivation rec { @@ -43,6 +44,8 @@ stdenv.mkDerivation rec { "PREFIX=${placeholder "out"}" ]; + passthru.tests.test = nixosTests.terminal-emulators.ctx; + meta = with lib; { homepage = "https://ctx.graphics/"; description = "Vector graphics terminal"; diff --git a/pkgs/applications/terminal-emulators/darktile/default.nix b/pkgs/applications/terminal-emulators/darktile/default.nix index f6323294950..17af8457cb1 100644 --- a/pkgs/applications/terminal-emulators/darktile/default.nix +++ b/pkgs/applications/terminal-emulators/darktile/default.nix @@ -12,6 +12,7 @@ , libXext , libXxf86vm , libGL +, nixosTests }: stdenv.mkDerivation rec { @@ -57,6 +58,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.tests.test = nixosTests.terminal-emulators.darktile; + meta = with lib; { description = "A GPU rendered terminal emulator designed for tiling window managers"; homepage = "https://github.com/liamg/darktile"; diff --git a/pkgs/applications/terminal-emulators/eterm/default.nix b/pkgs/applications/terminal-emulators/eterm/default.nix index 328e61f1fe5..769104fea43 100644 --- a/pkgs/applications/terminal-emulators/eterm/default.nix +++ b/pkgs/applications/terminal-emulators/eterm/default.nix @@ -8,6 +8,7 @@ , libXext , libast , pkg-config +, nixosTests }: stdenv.mkDerivation rec { @@ -33,6 +34,8 @@ stdenv.mkDerivation rec { libast ]; + passthru.tests.test = nixosTests.terminal-emulators.eterm; + meta = with lib; { homepage = "https://github.com/mej/Eterm"; # http://www.eterm.org is gone description = "Terminal emulator"; diff --git a/pkgs/applications/terminal-emulators/germinal/default.nix b/pkgs/applications/terminal-emulators/germinal/default.nix index 1bbe87853f7..aef24f675b1 100644 --- a/pkgs/applications/terminal-emulators/germinal/default.nix +++ b/pkgs/applications/terminal-emulators/germinal/default.nix @@ -9,6 +9,7 @@ , tmux , vte , wrapGAppsHook +, nixosTests }: stdenv.mkDerivation rec { @@ -45,6 +46,8 @@ stdenv.mkDerivation rec { runHook postFixup ''; + passthru.tests.test = nixosTests.terminal-emulators.germinal; + meta = with lib; { description = "A minimal terminal emulator"; homepage = "https://github.com/Keruspe/Germinal"; diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index 8c4c6b383d5..cc2dc5c55d6 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -10,6 +10,7 @@ , libutempter , vte , libwnck +, nixosTests }: python3.pkgs.buildPythonApplication rec { @@ -66,6 +67,8 @@ python3.pkgs.buildPythonApplication rec { gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libutempter ]}") ''; + passthru.tests.test = nixosTests.terminal-emulators.guake; + meta = with lib; { description = "Drop-down terminal for GNOME"; homepage = "http://guake-project.org"; diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix index a2b3d13b36a..485c1dead14 100644 --- a/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/pkgs/applications/terminal-emulators/hyper/default.nix @@ -2,7 +2,7 @@ , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver, libxcb, nss, nspr , alsa-lib, cups, expat, udev, libpulseaudio, at-spi2-atk, at-spi2-core, libxshmfence -, libdrm, libxkbcommon, mesa }: +, libdrm, libxkbcommon, mesa, nixosTests}: let libPath = lib.makeLibraryPath [ @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { --replace "/opt/Hyper/hyper" "hyper" ''; + passthru.tests.test = nixosTests.terminal-emulators.hyper; + dontPatchELF = true; meta = with lib; { description = "A terminal built on web technologies"; diff --git a/pkgs/applications/terminal-emulators/kermit-terminal/default.nix b/pkgs/applications/terminal-emulators/kermit-terminal/default.nix index 8a5a7856414..da5342aa683 100644 --- a/pkgs/applications/terminal-emulators/kermit-terminal/default.nix +++ b/pkgs/applications/terminal-emulators/kermit-terminal/default.nix @@ -6,6 +6,7 @@ , pcre , pkg-config , vte +, nixosTests }: stdenv.mkDerivation rec { @@ -31,6 +32,8 @@ stdenv.mkDerivation rec { vte ]; + passthru.tests.test = nixosTests.terminal-emulators.kermit; + meta = with lib; { homepage = "https://github.com/orhun/kermit"; description = "A VTE-based, simple and froggy terminal emulator"; diff --git a/pkgs/applications/terminal-emulators/kgx/default.nix b/pkgs/applications/terminal-emulators/kgx/default.nix index dc5c651d50a..1be9412e8da 100644 --- a/pkgs/applications/terminal-emulators/kgx/default.nix +++ b/pkgs/applications/terminal-emulators/kgx/default.nix @@ -18,6 +18,7 @@ , python3 , sassc , wrapGAppsHook +, nixosTests }: stdenv.mkDerivation { @@ -66,6 +67,8 @@ stdenv.mkDerivation { --replace "Exec=kgx" "Exec=$out/bin/kgx" ''; + passthru.tests.test = nixosTests.terminal-emulators.kgx; + meta = with lib; { description = "Simple user-friendly terminal emulator for the GNOME desktop"; homepage = "https://gitlab.gnome.org/ZanderBrown/kgx"; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 1e6db04dd76..d06c6d937c1 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -22,6 +22,7 @@ , zsh , fish , fetchpatch +, nixosTests }: with python3Packages; @@ -176,6 +177,8 @@ buildPythonApplication rec { runHook postInstall ''; + passthru.tests.test = nixosTests.terminal-emulators.kitty; + meta = with lib; { homepage = "https://github.com/kovidgoyal/kitty"; description = "A modern, hackable, featureful, OpenGL based terminal emulator"; diff --git a/pkgs/applications/terminal-emulators/lxterminal/default.nix b/pkgs/applications/terminal-emulators/lxterminal/default.nix index 25495a68683..13f4e3c4119 100644 --- a/pkgs/applications/terminal-emulators/lxterminal/default.nix +++ b/pkgs/applications/terminal-emulators/lxterminal/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, automake, autoconf, intltool, pkg-config, gtk3, vte, wrapGAppsHook -, libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs +, libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs, nixosTests }: stdenv.mkDerivation rec { @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests.test = nixosTests.terminal-emulators.lxterminal; + meta = { description = "The standard terminal emulator of LXDE"; longDescription = '' diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index d84aa984a33..056a2413844 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, autoconf, makeDesktopItem +{ stdenv, lib, fetchFromGitHub, pkg-config, autoconf, makeDesktopItem, nixosTests , libX11, gdk-pixbuf, cairo, libXft, gtk3, vte , harfbuzz #substituting glyphs with opentype fonts , fribidi, m17n_lib #bidi and encoding @@ -110,6 +110,8 @@ stdenv.mkDerivation rec { startupNotify = false; }; + passthru.tests.test = nixosTests.terminal-emulators.mlterm; + meta = with lib; { description = "Multi Lingual TERMinal emulator"; homepage = "http://mlterm.sourceforge.net/"; diff --git a/pkgs/applications/terminal-emulators/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix index ba6c6ab87c1..006616bd944 100644 --- a/pkgs/applications/terminal-emulators/mrxvt/default.nix +++ b/pkgs/applications/terminal-emulators/mrxvt/default.nix @@ -10,6 +10,7 @@ , freetype , pkg-config , which +, nixosTests }: stdenv.mkDerivation rec { @@ -38,6 +39,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2"; ''; + passthru.tests.test = nixosTests.terminal-emulators.mrxvt; + meta = with lib; { description = "Lightweight multitabbed feature-rich X11 terminal emulator"; longDescription = " diff --git a/pkgs/applications/terminal-emulators/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix index 3e4454726b6..7444a8627b7 100644 --- a/pkgs/applications/terminal-emulators/roxterm/default.nix +++ b/pkgs/applications/terminal-emulators/roxterm/default.nix @@ -1,7 +1,7 @@ { at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, libepoxy, fetchFromGitHub , glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs , libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2 -, pkg-config, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto +, pkg-config, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto, nixosTests }: stdenv.mkDerivation rec { @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { libsepol libxkbcommon libepoxy at-spi2-core libXtst libtasn1 p11-kit ]; + passthru.tests.test = nixosTests.terminal-emulators.roxterm; + meta = with lib; { homepage = "https://github.com/realh/roxterm"; license = licenses.gpl3; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index 1ca84149fdd..0eccceb5a4f 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -7,6 +7,7 @@ , gdkPixbufSupport ? true , unicode3Support ? true , emojiSupport ? false +, nixosTests }: let @@ -102,6 +103,8 @@ stdenv.mkDerivation { cp -r ${desktopItem}/share/applications/ $out/share/ ''; + passthru.tests.test = nixosTests.terminal-emulators.urxvt; + meta = { inherit description; homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html"; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix index 5255d40b9ce..9fe78e30ae3 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix @@ -5,6 +5,7 @@ , rxvt-unicode-unwrapped , rxvt-unicode-plugins , perlPackages +, nixosTests , configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; extraDeps = [ ]; @@ -51,7 +52,10 @@ let --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" ''; - passthru.plugins = plugins; + passthru = { + plugins = plugins; + tests.test = nixosTests.terminal-emulators.urxvt; + }; }; in diff --git a/pkgs/applications/terminal-emulators/sakura/default.nix b/pkgs/applications/terminal-emulators/sakura/default.nix index 8434c233ad4..52b35ad38ae 100644 --- a/pkgs/applications/terminal-emulators/sakura/default.nix +++ b/pkgs/applications/terminal-emulators/sakura/default.nix @@ -9,6 +9,7 @@ , perl , pkg-config , vte +, nixosTests }: stdenv.mkDerivation rec { @@ -43,6 +44,8 @@ stdenv.mkDerivation rec { --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ ''; + passthru.tests.test = nixosTests.terminal-emulators.sakura; + meta = with lib; { homepage = "https://www.pleyades.net/david/projects/sakura"; description = "A terminal emulator based on GTK and VTE"; diff --git a/pkgs/applications/terminal-emulators/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix index 35baec9d0e4..efbdc040589 100644 --- a/pkgs/applications/terminal-emulators/st/default.nix +++ b/pkgs/applications/terminal-emulators/st/default.nix @@ -11,6 +11,7 @@ , conf ? null , patches ? [ ] , extraLibs ? [ ] +, nixosTests }: stdenv.mkDerivation rec { @@ -55,6 +56,8 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; + passthru.tests.test = nixosTests.terminal-emulators.st; + meta = with lib; { homepage = "https://st.suckless.org/"; description = "Simple Terminal for X from Suckless.org Community"; diff --git a/pkgs/applications/terminal-emulators/stupidterm/default.nix b/pkgs/applications/terminal-emulators/stupidterm/default.nix index 554d210fbde..279af55254e 100644 --- a/pkgs/applications/terminal-emulators/stupidterm/default.nix +++ b/pkgs/applications/terminal-emulators/stupidterm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, vte, gtk, pcre2 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, vte, gtk, pcre2, nixosTests }: stdenv.mkDerivation { pname = "stupidterm"; @@ -26,6 +26,8 @@ stdenv.mkDerivation { --replace "Exec=st" "Exec=$out/bin/stupidterm" ''; + passthru.tests.test = nixosTests.terminal-emulators.stupidterm; + meta = with lib; { description = "Simple wrapper around the VTE terminal emulator widget for GTK"; homepage = "https://github.com/esmil/stupidterm"; diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix index 67c7196e24d..04d4af0ccaf 100644 --- a/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/pkgs/applications/terminal-emulators/terminator/default.nix @@ -9,6 +9,7 @@ , libnotify , wrapGAppsHook , vte +, nixosTests }: python3.pkgs.buildPythonApplication rec { @@ -62,6 +63,8 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + passthru.tests.test = nixosTests.terminal-emulators.terminator; + meta = with lib; { description = "Terminal emulator with support for tiling and tabs"; longDescription = '' diff --git a/pkgs/applications/terminal-emulators/termite/default.nix b/pkgs/applications/terminal-emulators/termite/default.nix index 96fd3409dc7..2b05ecdc722 100644 --- a/pkgs/applications/terminal-emulators/termite/default.nix +++ b/pkgs/applications/terminal-emulators/termite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, vte, gtk3, ncurses, pcre2, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, vte, gtk3, ncurses, pcre2, wrapGAppsHook, nixosTests }: let @@ -57,7 +57,10 @@ in stdenv.mkDerivation rec { outputs = [ "out" "terminfo" ]; - passthru = { inherit vte-ng; }; + passthru = { + inherit vte-ng; + tests = nixosTests.terminal-emulators.termite; + }; postInstall = '' mkdir -p $terminfo/share diff --git a/pkgs/applications/terminal-emulators/termonad/default.nix b/pkgs/applications/terminal-emulators/termonad/default.nix index 6a1dd0bec39..111d790c695 100644 --- a/pkgs/applications/terminal-emulators/termonad/default.nix +++ b/pkgs/applications/terminal-emulators/termonad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, haskellPackages, makeWrapper, packages ? (pkgSet: []) }: +{ stdenv, haskellPackages, makeWrapper, packages ? (pkgSet: []), nixosTests }: let termonadEnv = haskellPackages.ghcWithPackages (self: [ self.termonad ] ++ packages self); @@ -17,6 +17,8 @@ in stdenv.mkDerivation { preferLocalBuild = true; allowSubstitutes = false; + passthru.tests.test = nixosTests.terminal-emulators.termonad; + meta = haskellPackages.termonad.meta // { mainProgram = "termonad"; }; diff --git a/pkgs/applications/terminal-emulators/tilda/default.nix b/pkgs/applications/terminal-emulators/tilda/default.nix index 1ea50cfff7a..01cc4f527a9 100644 --- a/pkgs/applications/terminal-emulators/tilda/default.nix +++ b/pkgs/applications/terminal-emulators/tilda/default.nix @@ -9,6 +9,7 @@ , pcre2 , vte , makeWrapper +, nixosTests }: stdenv.mkDerivation rec { @@ -42,6 +43,8 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; + passthru.tests.test = nixosTests.terminal-emulators.tilda; + meta = with lib; { description = "A Gtk based drop down terminal for Linux and Unix"; homepage = "https://github.com/lanoxx/tilda/"; diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix index 0538a2060ae..917b179490c 100644 --- a/pkgs/applications/terminal-emulators/tilix/default.nix +++ b/pkgs/applications/terminal-emulators/tilix/default.nix @@ -17,6 +17,7 @@ , wrapGAppsHook , libunwind , appstream +, nixosTests }: stdenv.mkDerivation rec { @@ -66,6 +67,8 @@ stdenv.mkDerivation rec { --replace "Exec=tilix" "Exec=$out/bin/tilix" ''; + passthru.tests.test = nixosTests.terminal-emulators.tilix; + meta = with lib; { description = "Tiling terminal emulator following the Gnome Human Interface Guidelines"; homepage = "https://gnunn1.github.io/tilix-web"; diff --git a/pkgs/applications/terminal-emulators/wayst/default.nix b/pkgs/applications/terminal-emulators/wayst/default.nix index f3751e39881..eeb258f48c4 100644 --- a/pkgs/applications/terminal-emulators/wayst/default.nix +++ b/pkgs/applications/terminal-emulators/wayst/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , pkg-config +, nixosTests , freetype , fontconfig , libGL @@ -78,6 +79,8 @@ stdenv.mkDerivation rec { install -D icons/wayst.svg $out/share/icons/hicolor/scalable/apps/wayst.svg ''; + passthru.tests.test = nixosTests.terminal-emulators.wayst; + meta = with lib; { description = "A simple terminal emulator"; mainProgram = "wayst"; diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index fc12b1addf6..6d1276035c1 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -22,11 +22,12 @@ , Cocoa , Foundation , libiconv +, nixosTests }: rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20220101-133340-7edc5b5a"; + version = "20220319-142410-0fcdea07"; outputs = [ "out" "terminfo" ]; @@ -35,7 +36,7 @@ rustPlatform.buildRustPackage rec { repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-UZCvKbZdZ7K4RtvVLmr44M612tqd4rkrjF2tys0JHNM="; + sha256 = "sha256-KmIlfzSbVY003WesodN5srJ7qEQaU93izmrZW1MobCo="; }; postPatch = '' @@ -45,7 +46,7 @@ rustPlatform.buildRustPackage rec { rm -r wezterm-ssh/tests ''; - cargoSha256 = "1imil15n9mf1r71qdp4cb4q7kzrrc2cspml0d54825yqaq8vjhsc"; + cargoSha256 = "sha256-+Iu6/pd14O1QIsLkHe7fTP30XyI+8J0GiRY8cnRPS5I="; nativeBuildInputs = [ pkg-config @@ -99,6 +100,8 @@ rustPlatform.buildRustPackage rec { ln -s $out/bin/{wezterm,wezterm-mux-server,wezterm-gui,strip-ansi-escapes} "$OUT_APP" ''; + passthru.tests.test = nixosTests.terminal-emulators.wezterm; + meta = with lib; { description = "A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust"; homepage = "https://wezfurlong.org/wezterm"; diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 3530b2d1d2f..278332ca6a3 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -76,7 +76,10 @@ stdenv.mkDerivation rec { ''; passthru = { - tests = { inherit (nixosTests) xterm; }; + tests = { + customTest = nixosTests.xterm; + standardTest = nixosTests.terminal-emulators.xterm; + }; updateScript = let # Tags that end in letters are unstable diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 462ff47afd7..73f84f7e9ef 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.8.2", - "repo_hash": "1pl528qxsbg75l5nny7cw8hcsd0zs50hhn0ngdrf3gjpd6y7pzcc", - "yarn_hash": "0dlhslkhiha4jyfzm0k8i9cgwdk12r5m67i2rznxbrkl38gk9c1x", + "version": "14.8.4", + "repo_hash": "0ra4d324all26crz84iys9xb40ykpiaqj4z2790zaw1s45wakmgj", + "yarn_hash": "106js1j6wii2axh1dxvlfr7mqhvsnsb5qs0danp9c3h1ihd4nz91", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.8.2-ee", + "rev": "v14.8.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.8.2", + "GITALY_SERVER_VERSION": "14.8.4", "GITLAB_PAGES_VERSION": "1.54.0", "GITLAB_SHELL_VERSION": "13.23.2", - "GITLAB_WORKHORSE_VERSION": "14.8.2" + "GITLAB_WORKHORSE_VERSION": "14.8.4" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index b5a05dde1b4..877e0ace9fa 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "14.8.2"; + version = "14.8.4"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -23,7 +23,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-GgQscKxxYpvzU2M99gmvGj0HM/oD+2Ke24FRzUxv6HM="; + sha256 = "sha256-3doXqYj1XsOifAr78ds5ioa6gUfw8uyUwn7JzqlMVSE="; }; vendorSha256 = "sha256-Qw9/nlo1eB5dPcldXe9doy4QA4DDVUDad3o4kbdNu34="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 76273acdff2..3533bccea98 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.8.2"; + version = "14.8.4"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index bef284ea534..462744641e3 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,5 +1,6 @@ { lib , fetchurl +, fetchpatch , gettext , itstool , python3 @@ -27,6 +28,16 @@ python3.pkgs.buildPythonApplication rec { sha256 = "cP6Y65Ms4h1nFw47D2pzF+gT6GLemJM+pROYLpoDMgI="; }; + patches = [ + # Pull upstream fix for meson-0.60: + # https://gitlab.gnome.org/GNOME/meld/-/merge_requests/78 + (fetchpatch { + name = "meson-0.60.patch"; + url = "https://gitlab.gnome.org/GNOME/meld/-/commit/cc7746c141d976a4779cf868774fae1fe7627a6d.patch"; + sha256 = "sha256-4uJZyF00Z6svzrOebByZV1hutCZRkIQYC4rUxQr5fdQ="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index c479542f771..87bb16ab833 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -10,7 +10,7 @@ rec { , containerdRev, containerdSha256 , tiniRev, tiniSha256, buildxSupport ? true, composeSupport ? true # package dependencies - , stdenv, fetchFromGitHub, buildGoPackage + , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage , makeWrapper, installShellFiles, pkg-config, glibc , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose_2 @@ -79,6 +79,16 @@ rec { extraUserPath = optionals (stdenv.isLinux && !clientOnly) (makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]); + patches = [ + # This patch incorporates code from a PR fixing using buildkit with the ZFS graph driver. + # It could be removed when a version incorporating this patch is released. + (fetchpatch { + name = "buildkit-zfs.patch"; + url = "https://github.com/moby/moby/pull/43136.patch"; + sha256 = "1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8="; + }) + ]; + postPatch = '' patchShebangs hack/make.sh hack/make/ ''; diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index eb62da715ce..67762e747f4 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "22.04.1"; + version = "22.04.2"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - sha256 = "sha256-5mB5eTIPw4CqYSQm675MKbRwsYLpg+5WJrLDkbc6nKs="; + sha256 = "sha256-oW5OOJPhC3OB3GIQWTQxPgqE7p4bAO1TyVbyKUHnyD0="; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; diff --git a/pkgs/desktops/enlightenment/terminology/default.nix b/pkgs/desktops/enlightenment/terminology/default.nix index a2e4f717f48..7b3ffe2f112 100644 --- a/pkgs/desktops/enlightenment/terminology/default.nix +++ b/pkgs/desktops/enlightenment/terminology/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl, nixosTests }: stdenv.mkDerivation rec { pname = "terminology"; @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { patchShebangs data/colorschemes/*.py ''; + passthru.tests.test = nixosTests.terminal-emulators.terminology; + meta = with lib; { description = "Powerful terminal emulator based on EFL"; homepage = "https://www.enlightenment.org/about-terminology"; diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index 69fb69261f9..588d6e3ced3 100644 --- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -23,6 +23,7 @@ , pcre2 , libxslt , docbook-xsl-nons +, nixosTests }: stdenv.mkDerivation rec { @@ -82,6 +83,8 @@ stdenv.mkDerivation rec { }; }; + passthru.tests.test = nixosTests.terminal-emulators.gnome-terminal; + meta = with lib; { description = "The GNOME Terminal Emulator"; homepage = "https://wiki.gnome.org/Apps/Terminal"; diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index e93e404762a..9412506385b 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -8,6 +8,7 @@ , qttools , qtx11extras , lxqtUpdateScript +, nixosTests }: mkDerivation rec { @@ -35,6 +36,8 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.tests.test = nixosTests.terminal-emulators.qterminal; + meta = with lib; { homepage = "https://github.com/lxqt/qterminal"; description = "A lightweight Qt-based terminal emulator"; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 19fa5697f96..fcae87a869e 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, mate-desktop, dconf, vte, pcre2, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, mate-desktop, dconf, vte, pcre2, wrapGAppsHook, mateUpdateScript, nixosTests }: stdenv.mkDerivation rec { pname = "mate-terminal"; @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.tests.test = nixosTests.terminal-emulators.mate-terminal; + meta = with lib; { description = "MATE desktop terminal emulator"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 93c10d07292..bfbfb6d53d3 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -5,7 +5,6 @@ , appstream-glib , dbus , desktop-file-utils -, elementary-icon-theme , fetchFromGitHub , fetchpatch , flatpak @@ -65,7 +64,6 @@ stdenv.mkDerivation rec { buildInputs = [ appstream - elementary-icon-theme flatpak glib granite diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 2356d362f6b..703913998a4 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -13,7 +13,6 @@ , granite , libgee , libhandy -, elementary-icon-theme , appstream , wrapGAppsHook }: @@ -42,7 +41,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-icon-theme granite gtk3 libgee diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 70b092d3f2c..f3bd37b00e0 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -11,7 +11,6 @@ , vala , wrapGAppsHook , clutter -, elementary-icon-theme , evolution-data-server , folks , geoclue2 @@ -48,7 +47,6 @@ stdenv.mkDerivation rec { buildInputs = [ clutter - elementary-icon-theme evolution-data-server folks geoclue2 diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 94bbc69047d..31dfa369818 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -13,7 +13,6 @@ , python3 , vala , wrapGAppsHook -, elementary-icon-theme , glib , granite , gst_all_1 @@ -57,7 +56,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-icon-theme glib granite gtk3 diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 4087168feb0..f1cd335459e 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -13,7 +13,6 @@ , vala , wrapGAppsHook , editorconfig-core-c -, elementary-icon-theme , granite , gtk3 , gtksourceview4 @@ -61,7 +60,6 @@ stdenv.mkDerivation rec { buildInputs = [ editorconfig-core-c - elementary-icon-theme granite gtk3 gtksourceview4 diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index 6d9fe808d8d..f589f4234ca 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -13,7 +13,6 @@ , granite , libgee , libhandy -, elementary-icon-theme , gettext , wrapGAppsHook , appstream @@ -51,7 +50,6 @@ stdenv.mkDerivation rec { buildInputs = [ appstream - elementary-icon-theme granite gtk3 libgee diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 4314e74d5af..9147324b886 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -22,7 +22,6 @@ , sqlite , zeitgeist , glib-networking -, elementary-icon-theme , libcloudproviders , libgit2-glib , wrapGAppsHook @@ -57,7 +56,6 @@ stdenv.mkDerivation rec { buildInputs = [ bamf elementary-dock - elementary-icon-theme glib granite gtk3 diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 4a003d6c5ab..e56f85005de 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -17,7 +17,6 @@ , libgdata , sqlite , granite -, elementary-icon-theme , evolution-data-server , appstream , wrapGAppsHook @@ -57,7 +56,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-icon-theme evolution-data-server folks granite diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index 84383042776..f43234faa40 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -10,7 +10,6 @@ , python3 , vala , wrapGAppsHook -, elementary-icon-theme , glib , granite , gst_all_1 @@ -61,7 +60,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-icon-theme glib granite gtk3 diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index e5a8523014d..48cfda3df76 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -28,7 +28,6 @@ , libwebp , appstream , wrapGAppsHook -, elementary-icon-theme }: stdenv.mkDerivation rec { @@ -63,7 +62,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-icon-theme geocode-glib gexiv2 granite diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix index 7629da0f734..48a68860dd9 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix @@ -14,7 +14,6 @@ , libgee , libhandy , libcanberra -, elementary-icon-theme , wrapGAppsHook }: @@ -49,7 +48,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-icon-theme granite gtk3 libcanberra diff --git a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix index f220db8868d..c101e57e1ac 100644 --- a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix @@ -11,7 +11,6 @@ , vala , wrapGAppsHook , clutter-gtk -, elementary-icon-theme , evolution-data-server , granite , geoclue2 @@ -48,7 +47,6 @@ stdenv.mkDerivation rec { buildInputs = [ clutter-gtk - elementary-icon-theme evolution-data-server granite geoclue2 diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index e796a2a344a..fe6e5a40fa4 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -16,7 +16,6 @@ , libnotify , vte , libgee -, elementary-icon-theme , appstream , pcre2 , wrapGAppsHook @@ -55,7 +54,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-icon-theme granite gtk3 libgee diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index cb1ea291225..d4c03a07657 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -15,7 +15,6 @@ , clutter-gst , clutter-gtk , gst_all_1 -, elementary-icon-theme , wrapGAppsHook }: @@ -43,7 +42,6 @@ stdenv.mkDerivation rec { buildInputs = [ clutter-gst clutter-gtk - elementary-icon-theme granite gtk3 libgee diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index 6069fb85478..11ce2048ae4 100644 --- a/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -2,7 +2,6 @@ , stdenv , desktop-file-utils , nix-update-script -, elementary-icon-theme , fetchFromGitHub , flatpak , gettext @@ -43,7 +42,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-icon-theme flatpak glib granite diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index 209fa1202f3..ee43903a00a 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -13,7 +13,6 @@ , libhandy , granite , gettext -, elementary-icon-theme , wrapGAppsHook }: @@ -39,7 +38,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-icon-theme granite gtk3 libgee diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 45a8f119ee0..06fbfdc078e 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -60,7 +60,6 @@ stdenv.mkDerivation rec { buildInputs = [ accountsservice clutter-gtk # else we get could not generate cargs for mutter-clutter-2 - elementary-gtk-theme elementary-icon-theme gnome-settings-daemon gdk-pixbuf @@ -91,8 +90,11 @@ stdenv.mkDerivation rec { # for the compositor --prefix PATH : "$out/bin" - # the theme is hardcoded + # the GTK theme is hardcoded --prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share" + + # the icon theme is hardcoded + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ) ''; diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index 3355ee09299..fa4ff7edf12 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -13,7 +13,6 @@ , glib , granite , libgee -, elementary-icon-theme , elementary-settings-daemon , gettext , libhandy @@ -56,7 +55,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-icon-theme elementary-settings-daemon # settings schema glib granite diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index 1d4a1cb7414..3cf7cd365f1 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -14,7 +14,6 @@ , granite , libgee , libhandy -, elementary-icon-theme , wrapGAppsHook }: @@ -49,7 +48,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-icon-theme glib granite gtk3 diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 5a5af9ca5b9..75447adf4a2 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -19,7 +19,6 @@ , gnome-desktop , mutter , clutter -, elementary-icon-theme , gnome-settings-daemon , wrapGAppsHook , gexiv2 @@ -67,7 +66,6 @@ stdenv.mkDerivation rec { buildInputs = [ bamf clutter - elementary-icon-theme gnome-settings-daemon gexiv2 gnome-desktop diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 2e3f51b4a6a..b996fdfdd6e 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-gtk-theme elementary-icon-theme gala granite @@ -64,8 +63,11 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - # this theme is required + # this GTK theme is required --prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share" + + # the icon theme is required + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ) ''; diff --git a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix index 4d887f96ffd..65611f73a1d 100644 --- a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix @@ -1,4 +1,4 @@ -{ lib, mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2, libxslt, docbook_xml_dtd_45, docbook_xsl }: +{ lib, mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2, libxslt, docbook_xml_dtd_45, docbook_xsl, nixosTests }: mkXfceDerivation { category = "apps"; @@ -11,6 +11,8 @@ mkXfceDerivation { buildInputs = [ gtk3 libxfce4ui vte xfconf pcre2 ]; + passthru.tests.test = nixosTests.terminal-emulators.xfce4-terminal; + meta = with lib; { description = "A modern terminal emulator"; maintainers = with maintainers; [ ] ++ teams.xfce.members; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 86f29e73113..80dc94af4df 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -384,6 +384,18 @@ in package-set { inherit pkgs lib callPackage; } self // { # for the "shellFor" environment (ensuring that any test/benchmark # dependencies for "foo" will be available within the nix-shell). , genericBuilderArgsModifier ? (args: args) + + # Extra dependencies, in the form of cabal2nix build attributes. + # + # An example use case is when you have Haskell scripts that use + # libraries that don't occur in your packages' dependencies. + # + # Example: + # + # extraDependencies = p: { + # libraryHaskellDepends = [ p.releaser ]; + # }; + , extraDependencies ? p: {} , ... } @ args: let @@ -474,7 +486,7 @@ in package-set { inherit pkgs lib callPackage; } self // { # See the Note in `zipperCombinedPkgs` for what gets filtered out from # each of these dependency lists. packageInputs = - pkgs.lib.zipAttrsWith (_name: zipperCombinedPkgs) cabalDepsForSelected; + pkgs.lib.zipAttrsWith (_name: zipperCombinedPkgs) (cabalDepsForSelected ++ [ (extraDependencies self) ]); # A attribute set to pass to `haskellPackages.mkDerivation`. # @@ -514,7 +526,7 @@ in package-set { inherit pkgs lib callPackage; } self // { # pkgWithCombinedDepsDevDrv :: Derivation pkgWithCombinedDepsDevDrv = pkgWithCombinedDeps.envFunc { inherit withHoogle; }; - mkDerivationArgs = builtins.removeAttrs args [ "genericBuilderArgsModifier" "packages" "withHoogle" "doBenchmark" ]; + mkDerivationArgs = builtins.removeAttrs args [ "genericBuilderArgsModifier" "packages" "withHoogle" "doBenchmark" "extraDependencies" ]; in pkgWithCombinedDepsDevDrv.overrideAttrs (old: mkDerivationArgs // { nativeBuildInputs = old.nativeBuildInputs ++ mkDerivationArgs.nativeBuildInputs or []; diff --git a/pkgs/development/haskell-modules/package-list.nix b/pkgs/development/haskell-modules/package-list.nix index 64f4be3a772..688844bcc46 100644 --- a/pkgs/development/haskell-modules/package-list.nix +++ b/pkgs/development/haskell-modules/package-list.nix @@ -1,10 +1,16 @@ { runCommand, haskellPackages, lib, all-cabal-hashes, writeShellScript }: let + # Checks if the version looks like a Haskell PVP version which is the format + # Hackage enforces. This will return false if the version strings is empty or + # we've overridden the package to ship an unstable version of the package + # (sadly there's no good way to show something useful on hackage in this case). + isPvpVersion = v: builtins.match "([0-9]+)(\\.[0-9]+)*" v != null; + pkgLine = name: pkg: let version = pkg.version or ""; in - if version != "" then + if isPvpVersion version then ''"${name}","${version}","http://hydra.nixos.org/job/nixpkgs/trunk/haskellPackages.${name}.x86_64-linux"'' else ""; all-haskellPackages = builtins.toFile "all-haskellPackages" (lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.mapAttrsToList pkgLine haskellPackages))); diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index c4abb634ca8..aaa7c9e048b 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "5.1.0"; + version = "5.1.10"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-h+JeyZSXCuV6MtOrWxvpg7v3BXks5T70Cy2gP+If0A8="; + sha256 = "sha256-BOJ/NUJnoTeDuURH8Lx6S4RlNZPfsQX4blJkpUdraBg="; }; # Do not build static libraries diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index 12253427424..740dbeee648 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "belcard"; - version = "5.0.55"; + version = "5.1.10"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-5KHmyNplrVADVlD2IBPwEe3vbEjAMNlz+p5aIBHb6kI="; + sha256 = "sha256-ZxO0Y4R04T+3K+08fEJ9krWfYSodQLrjBZYbGrKOrXI="; }; buildInputs = [ bctoolbox belr ]; diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix index c841b6d3e48..05d6573beb8 100644 --- a/pkgs/development/libraries/belr/default.nix +++ b/pkgs/development/libraries/belr/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "belr"; - version = "5.0.55"; + version = "5.1.3"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-P3oDlaT3rN1lRhpKjbGBk7a0hJAQGQcWydFM45GMUU4="; + sha256 = "sha256-0JDwNKqPkzbXqDhgMV+okPMHPFJwmLwLsDrdD55Jcs4="; }; buildInputs = [ bctoolbox ]; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index f352714d237..7a79e597beb 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DEXIV2_ENABLE_NLS=ON" "-DEXIV2_BUILD_DOC=ON" + "-DEXIV2_ENABLE_BMFF=ON" ]; buildFlags = [ diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 3e5ae303dd7..bfa1c75b483 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -7,13 +7,13 @@ with lib; stdenv.mkDerivation rec { pname = "gdal"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${version}"; - sha256 = "11rjdaxmsp9n3r9xhmgd7ksy8bh5fazwsxdj0xvl4hsy6bcn4n97"; + sha256 = "sha256-bE55VV0SrG8nxCLdpODRalnuAkn+olRdMLUjduavj6M="; }; sourceRoot = "source/gdal"; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index bb70ffcd32a..55132d15523 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "sha256-aRHwkdAbM164diIAIyBp1Kt6u/GLyCWTtwF4eFaWbGU="; + sha256 = "sha256-P3mb5HEj9gHq2mABdIRxF6ZukrPd70sy0DRLT0qKDqk="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 7a2718c0153..1ad63db733d 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -86,12 +86,8 @@ let }; in { - libressl_3_2 = generic { - version = "3.2.7"; - sha256 = "112bjfrwwqlk0lak7fmfhcls18ydf62cp7gxghf4gklpfl1zyckw"; - }; libressl_3_4 = generic { - version = "3.4.2"; - sha256 = "sha256-y4LKfVRzNpFzUvvSPbL8SDxsRNNRV7MngCFOx0GXs84="; + version = "3.4.3"; + sha256 = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0="; }; } diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix index 6d6e8c519de..7e7edff6bff 100644 --- a/pkgs/development/libraries/lime/default.nix +++ b/pkgs/development/libraries/lime/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "lime"; - version = "5.0.0"; + version = "5.0.53"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-11vvvA+pud/eOyYsbRKVvGfiyhwdhNPfRQSfaquUro8="; + sha256 = "sha256-M+KdauIVsN3c+cEPw4CaMzXnQZwAPNXeJCriuk9NCWM="; }; buildInputs = [ bctoolbox soci belle-sip sqlite boost ]; diff --git a/pkgs/development/libraries/lpcnetfreedv/default.nix b/pkgs/development/libraries/lpcnetfreedv/default.nix index ac12d3a5fd6..33b295b9a1e 100644 --- a/pkgs/development/libraries/lpcnetfreedv/default.nix +++ b/pkgs/development/libraries/lpcnetfreedv/default.nix @@ -30,5 +30,6 @@ in stdenv.mkDerivation rec { description = "Experimental Neural Net speech coding for FreeDV"; license = licenses.bsd3; maintainers = with maintainers; [ mvs ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index 62bd7cea1a1..32987d64992 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -1,27 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, openssl, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, openssl +, cmake +}: stdenv.mkDerivation rec { pname = "mysocketw"; - version = "3.10.27"; + version = "3.11.0"; src = fetchFromGitHub { owner = "RigsOfRods"; repo = "socketw"; rev = version; - sha256 = "0xqcgwb1lyc2d8834sq5adbmggyn6vvb26jw20862sxa15j0qfd4"; + hash = "sha256-mpfhmKE2l59BllkOjmURIfl17lAakXpmGh2x9SFSaAo="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl ]; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + openssl + ]; postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace src/Makefile \ --replace -Wl,-soname, -Wl,-install_name,$out/lib/ ''; - meta = { + meta = with lib; { description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.all; + homepage = "https://github.com/RigsOfRods/socketw"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index bf5251d1aed..eea7c146ca3 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "6.2.2"; + version = "6.2.5"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "sha256-uSPE7uFiG4xbsAeo/UmOP5Ns+3yZ7kKL2bNxzd8mzP8="; + sha256 = "sha256-N4yFlTxV+lVz70PSHPuWEEFLp0dpsImXYDLUYEo2JQI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index eae934a4ebb..aae30390ee4 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -22,6 +22,7 @@ , icu , systemd , systemdSupport ? stdenv.hostPlatform.isLinux +, nixosTests }: stdenv.mkDerivation rec { @@ -91,6 +92,9 @@ stdenv.mkDerivation rec { packageName = pname; versionPolicy = "odd-unstable"; }; + tests = { + inherit (nixosTests.terminal-emulators) gnome-terminal lxterminal mlterm roxterm sakura stupidterm terminator termite xfce4-terminal; + }; }; meta = with lib; { diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/development/libraries/yder/default.nix index 49544a37468..9dd55482300 100644 --- a/pkgs/development/libraries/yder/default.nix +++ b/pkgs/development/libraries/yder/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "yder"; - version = "1.4.14"; + version = "1.4.15"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4FSUBFqrxTbqg2EKYuXv4gUeE40ViNZRk5gHv+C2p9o="; + sha256 = "sha256-hPAL1UngodNbQCCdKulaF5faI0JOjmWdz3q8oyPH7C4="; }; patches = [ diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 94c47ab62a0..ef606a027d0 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.1.11752"; + version = "9.1.12332"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-UbcPxYEyuX8W0uZXeCu00yBshdcPBAQKzZqhAYXTf+8="; + hash = "sha256-qWKvNhiOAonUi0qpOWtwbNZa2lgBQ+gaGrAHMgDdr4Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index ef39f451d59..01066c127be 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.1.1"; + version = "2.1.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2+mrmXhRwkWLB6hfaCvizPNdZ51d4Pj1cSKfdArXunE="; + sha256 = "sha256-AP1/Q8wEhNjtJ0/QvkkqoWp/6medvqlqYCu3IspMLSI="; }; # relax version constraints: aiobotocore works with newer botocore versions diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 93a4b22f5dd..1881da62f50 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.1.11752"; + version = "9.1.12332"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-4DUM1c3M/naJFqN/gdrX/NnJrY3ElUEOQ34cwcpSC+s="; + hash = "sha256-GaW1XyFOnjU28HqptFC6+Fe41zYZMR716Nsq0dPy660="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 21eeeb2369d..8164190cd49 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.1.11752"; + version = "9.1.12332"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-nZGAuWp07VMpOvqw38FGSiUhaFjJOfCzOaam4Ex7qbY="; + hash = "sha256-lhwlZ7eHaEMaTW7c+WCRSeGSIQ5IeEx6XALyYJH+Ey0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index add8e72d8e7..f9affcddd12 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , nose , pythonOlder @@ -8,7 +9,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.1.11752"; + version = "9.1.12332"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-D1YssHa14q2jxn4HtOYZlTdwGPkiiMhWuOh08fj87ic="; + hash = "sha256-nv/hwQZgKv/cM8fF6GqI8zY9GAe8aCZ/AGFOmhz+bMM="; }; checkInputs = [ @@ -25,6 +26,15 @@ buildPythonPackage rec { pytestCheckHook ]; + patches = [ + # Make archinfo import without installing pyvex, https://github.com/angr/archinfo/pull/113 + (fetchpatch { + name = "fix-import-issue.patch"; + url = "https://github.com/angr/archinfo/commit/d29c108f55ffd458ff1d3d65db2d651c76b19267.patch"; + sha256 = "sha256-9vi0QyqQLIPQxFuB8qrpcnPXWOJ6d27/IXJE/Ui6HhM="; + }) + ]; + pythonImportsCheck = [ "archinfo" ]; diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix index 839429bc948..4ecf5fbc5f0 100644 --- a/pkgs/development/python-modules/argon2_cffi/default.nix +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -23,7 +23,8 @@ buildPythonPackage rec { sha256 = "d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b"; }; - propagatedBuildInputs = [ cffi six ] ++ lib.optional (!isPy3k) enum34; + propagatedBuildInputs = [ cffi six argon2-cffi-bindings ] + ++ lib.optional (!isPy3k) enum34; propagatedNativeBuildInputs = [ argon2-cffi-bindings diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index db168c9b325..0aac1e71e7c 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.13.0"; + version = "1.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "v${version}"; - sha256 = "sha256-t04g65TPeOYgEQw6kPJrlJN1ssQrsN9kl7g69J4pPwo="; + sha256 = "sha256-ypzo0cYvP8LV74cQMzHIFDk3LH0bbEB4UxPxRuqe2fc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 9a128d81348..b7d330e6eff 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 , aiodns , aiohttp , flask @@ -51,7 +51,18 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/" ]; # disable tests which touch network - disabledTests = [ "aiohttp" "multipart_send" "response" "request" "timeout" ]; + disabledTests = [ + "aiohttp" + "multipart_send" + "response" + "request" + "timeout" + # disable 8 tests failing on some darwin machines with errors: + # azure.core.polling.base_polling.BadStatus: Invalid return status 403 for 'GET' operation + # azure.core.exceptions.HttpResponseError: Operation returned an invalid status 'Forbidden' + ] ++ lib.optional stdenv.isDarwin [ + "location_polling_fail" + ]; disabledTestPaths = [ # requires testing modules which aren't published, and likely to create cyclic dependencies "tests/test_connection_string_parsing.py" diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix index 097971c9ce3..8aeda35741c 100644 --- a/pkgs/development/python-modules/beartype/default.nix +++ b/pkgs/development/python-modules/beartype/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "beartype"; - version = "0.10.2"; + version = "0.10.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Lo1AUxj+QR7N2Tdif58zGBMSp5Pr0jmz2nacRDnLS5g="; + hash = "sha256-JOxp9qf05ul69APQjeJw3vMkhRgGAycJXSOxxN9kvyo="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/broadlink/default.nix b/pkgs/development/python-modules/broadlink/default.nix index dc1e4f37f3c..ba635a39257 100644 --- a/pkgs/development/python-modules/broadlink/default.nix +++ b/pkgs/development/python-modules/broadlink/default.nix @@ -2,22 +2,26 @@ , buildPythonPackage , fetchPypi , cryptography +, pythonOlder }: buildPythonPackage rec { pname = "broadlink"; - version = "0.18.0"; + version = "0.18.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "c66b3e4a097d6549f0fcc9ccdf289bd88f73f647ad9449e1c4e2958301ad1b04"; + hash = "sha256-KMfL1mY4th87gjPrdhvzQjdXucgwSChsykOCO3cPAD8="; }; propagatedBuildInputs = [ cryptography ]; - # no tests available + # Module has no tests doCheck = false; pythonImportsCheck = [ @@ -28,5 +32,6 @@ buildPythonPackage rec { description = "Python API for controlling Broadlink IR controllers"; homepage = "https://github.com/mjg59/python-broadlink"; license = licenses.mit; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 10f5762f0c4..9816ff3782b 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.1.11752"; + version = "9.1.12332"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z50oKwS0MZVBEUeXfj9cgtPYXFAYf4i7QkgJiXdWrxo="; + sha256 = "sha256-YrR8OkDoop6kHAuk4cM4STYYOjjaMLZCQuE07/5IXqs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index e1b1b3b0bf4..6c8126172c0 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.1.11752"; + version = "9.1.12332"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-pnbFnv/te7U2jB6gNRvE9DQssBkFsara1g6Gtqf+WVo="; + hash = "sha256-xcj6Skzzmw5g+0KsBMLNOhRyXQA7nbgnc9YyfJLteCM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index 92e5a71ee80..03203550600 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "1.33.7"; + version = "1.42.3"; format = "wheel"; src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - sha256 = "sha256-KNm2O2kZg+YzjtebsBoL7BOHCuffDELXm2k8vIFtKdk="; + sha256 = "sha256-P0QuKkyFk3jvYJwtul0/eUTrDyj2QKAjU/Ac+4VCYYk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/coqui-trainer/default.nix b/pkgs/development/python-modules/coqui-trainer/default.nix index 5ff53b8eb75..de04e444e83 100644 --- a/pkgs/development/python-modules/coqui-trainer/default.nix +++ b/pkgs/development/python-modules/coqui-trainer/default.nix @@ -4,7 +4,7 @@ , coqpit , fsspec -, pytorch-bin +, pytorch , pytestCheckHook , soundfile @@ -14,7 +14,7 @@ let pname = "coqui-trainer"; - version = "0.0.4"; + version = "0.0.5"; in buildPythonPackage { inherit pname version; @@ -23,21 +23,19 @@ buildPythonPackage { src = fetchFromGitHub { owner = "coqui-ai"; repo = "Trainer"; - # https://github.com/coqui-ai/Trainer/issues/4 - rev = "776eba829231543d3207927fc69b321d121e527c"; - hash = "sha256-ICveftJjBNsCgegTmd/ewd/Y6XGMg7YOvchx640RFPI="; + rev = "v${version}"; + hash = "sha256-NsgCh+N2qWmRkTOjXqisVCP5aInH2zcNz6lsnIfVLiY="; }; propagatedBuildInputs = [ coqpit fsspec - pytorch-bin + pytorch soundfile tensorboardx ]; - # tests are failing; tests require the clearml library - # https://github.com/coqui-ai/Trainer/issues/5 + # only one test and that requires training data from the internet doCheck = false; checkInputs = [ diff --git a/pkgs/development/python-modules/discogs-client/default.nix b/pkgs/development/python-modules/discogs-client/default.nix index f4940cf7c61..0295735abd7 100644 --- a/pkgs/development/python-modules/discogs-client/default.nix +++ b/pkgs/development/python-modules/discogs-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "discogs-client"; - version = "2.3.13"; + version = "2.3.14"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "joalla"; repo = "discogs_client"; rev = "v${version}"; - sha256 = "sha256-TOja0pCJv8TAI0ns8M/tamZ5Pp8k5sSKDnvN4SeKtW8="; + sha256 = "sha256-HJxqTwZ9byjZxdftQPTkVo0Ufio9gNGH69q5Q2gYR00="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flake8-blind-except/default.nix b/pkgs/development/python-modules/flake8-blind-except/default.nix index c3974d0e007..ee3f46d078c 100644 --- a/pkgs/development/python-modules/flake8-blind-except/default.nix +++ b/pkgs/development/python-modules/flake8-blind-except/default.nix @@ -1,16 +1,32 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +}: buildPythonPackage rec { pname = "flake8-blind-except"; - version = "0.2.0"; + version = "0.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "02a860a1a19cb602c006a3fe0778035b0d14d3f57929b4b798bc7d6684f204e5"; + hash = "sha256-8lpXWp3LPus8dgv5wi22C4taIxICJO0fqppD913X3RY="; }; - meta = { - homepage = "https://github.com/elijahandrews/flake8-blind-except"; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "flake8_blind_except" + ]; + + meta = with lib; { description = "A flake8 extension that checks for blind except: statements"; - maintainers = with lib.maintainers; [ johbo ]; - license = lib.licenses.mit; + homepage = "https://github.com/elijahandrews/flake8-blind-except"; + license = licenses.mit; + maintainers = with maintainers; [ johbo ]; }; } diff --git a/pkgs/development/python-modules/graphql-subscription-manager/default.nix b/pkgs/development/python-modules/graphql-subscription-manager/default.nix index 660a6f51688..2ca6a134ee2 100644 --- a/pkgs/development/python-modules/graphql-subscription-manager/default.nix +++ b/pkgs/development/python-modules/graphql-subscription-manager/default.nix @@ -8,7 +8,8 @@ buildPythonPackage rec { pname = "graphql-subscription-manager"; - version = "0.5.4"; + version = "0.5.5"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "PyGraphqlWebsocketManager"; rev = version; - sha256 = "sha256-J3us0xZN1jOFRcvUQg8PQP6AVHa/swGjKU8IivmfjQE="; + hash = "sha256-7MqFsttMNnWmmWKj1zaOORBTDGt6Wm8GU7w56DfPl2c="; }; propagatedBuildInputs = [ @@ -27,7 +28,9 @@ buildPythonPackage rec { # no tests implemented doCheck = false; - pythonImportsCheck = [ "graphql_subscription_manager" ]; + pythonImportsCheck = [ + "graphql_subscription_manager" + ]; meta = with lib; { description = "Python3 library for graphql subscription manager"; diff --git a/pkgs/development/python-modules/gruut-ipa/default.nix b/pkgs/development/python-modules/gruut-ipa/default.nix index ad1da8b2917..f0824670731 100644 --- a/pkgs/development/python-modules/gruut-ipa/default.nix +++ b/pkgs/development/python-modules/gruut-ipa/default.nix @@ -1,32 +1,33 @@ { lib , buildPythonPackage , fetchFromGitHub -, pkgs +, espeak +, numpy , python }: buildPythonPackage rec { pname = "gruut-ipa"; - version = "0.12.0"; + version = "0.13.0"; format = "setuptools"; src = fetchFromGitHub { owner = "rhasspy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6pMdBKbp++/5321rc8A2euOSXZCHzHg+wmaEaMZ0egw="; + sha256 = "sha256-Q2UKELoG8OaAPxIrZNCpXgeWZ2fCzb3g3SOVzCm/gg0="; }; postPatch = '' - patchShebangs bin/speak-ipa + patchShebangs bin/* substituteInPlace bin/speak-ipa \ --replace '${"\${src_dir}:"}' "$out/lib/${python.libPrefix}/site-packages:" \ - --replace "do espeak" "do ${pkgs.espeak}/bin/espeak" + --replace "do espeak" "do ${espeak}/bin/espeak" ''; - postInstall = '' - install -m0755 bin/speak-ipa $out/bin/speak-ipa - ''; + propagatedBuildInputs = [ + numpy + ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix index f1e490a65cb..5078c6fdb39 100644 --- a/pkgs/development/python-modules/gruut/default.nix +++ b/pkgs/development/python-modules/gruut/default.nix @@ -36,14 +36,14 @@ let in buildPythonPackage rec { pname = "gruut"; - version = "2.2.0"; + version = "2.2.3"; format = "setuptools"; src = fetchFromGitHub { owner = "rhasspy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9vj3x2IjTso8ksN1cqe5frwg0Y3GhOB6bPWvaBSBOf8="; + sha256 = "sha256-B5fPUW4YaMzDDXxncfrWwxGdUizuaxnPImNMf1ZZJ/I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 96d79c36763..be9be54a79a 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.37.4"; + version = "0.38.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-Mb6ruBFM3IiU5EUwOTiWEL3qt7p/n7QIgI5+j0mrOkw="; + sha256 = "sha256-oyO4+zxyhr2azUdeNfw0WjgN6LFxi3+svJ/B/tUEqjQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 85456fcc15f..226d43b2bc4 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.26.0"; + version = "1.27.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "v${version}"; - hash = "sha256-9MI6AgFTEw9dnBWdry3FnPERXnXZJhbYX4tXj9sGMkg="; + hash = "sha256-M0Ob3HjIhlYSIWXGM54NXiEMSCmZzNLLNsCRyxAcjMc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index d197ba9691b..c50563f5500 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage , fetchPypi , pytest -, six , tqdm , pyyaml , docopt @@ -10,25 +9,25 @@ , args , schema , responses -, backports_csv -, isPy3k , lib , glibcLocales , setuptools , urllib3 +, pythonOlder }: buildPythonPackage rec { pname = "internetarchive"; - version = "2.3.0"; + version = "3.0.0"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "fa89dc4be3e0a0aee24810a4a754e24adfd07edf710c645b4f642422c6078b8d"; + sha256 = "sha256-fRcqsT8p/tqXUpU2/9lAEF1IT8Cy5KK0+jKaeVwZshI="; }; propagatedBuildInputs = [ - six tqdm pyyaml docopt @@ -38,7 +37,7 @@ buildPythonPackage rec { schema setuptools urllib3 - ] ++ lib.optionals (!isPy3k) [ backports_csv ]; + ]; checkInputs = [ pytest responses glibcLocales ]; diff --git a/pkgs/development/python-modules/itemadapter/default.nix b/pkgs/development/python-modules/itemadapter/default.nix index 5d85ad71952..b082387e23c 100644 --- a/pkgs/development/python-modules/itemadapter/default.nix +++ b/pkgs/development/python-modules/itemadapter/default.nix @@ -1,25 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "itemadapter"; - version = "0.4.0"; + version = "0.5.0"; + format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f05df8da52619da4b8c7f155d8a15af19083c0c7ad941d8c1de799560ad994ca"; + hash = "sha256-BbanndMaepk9+y6Dhqkcl+O4xs8otyVT6AjmJeC4fCA="; }; - doCheck = false; # infinite recursion with Scrapy + # Infinite recursion with Scrapy + doCheck = false; - pythonImportsCheck = [ "itemadapter" ]; + pythonImportsCheck = [ + "itemadapter" + ]; meta = with lib; { description = "Common interface for data container classes"; homepage = "https://github.com/scrapy/itemadapter"; changelog = "https://github.com/scrapy/itemadapter/raw/v${version}/Changelog.md"; license = licenses.bsd3; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 34665bb8275..332cac3133c 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -19,7 +19,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.3.3"; + version = "0.3.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,8 +27,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "google"; repo = pname; - rev = "${pname}-v${version}"; - sha256 = "12k5kzgs2cxf9nvcc10a9ldl4zn68b5cnkhchfj1s7f61abx6nq3"; + rev = "jax-v${version}"; + sha256 = "sha256-RZqSJP2vtt8U6nmftV2VzfkMGkkk3100QqsjI7PpQbc="; }; patches = [ diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 0467790c297..27550c30dbf 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2022.2.3"; + version = "2022.3.17"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Jc11hS+WrRnjgYOUpc+GdkRoNV/DUJhQK6rI2lUkEIA="; + hash = "sha256-sSZFbEDlkc+F0PIwvseVEBoQQZVTFypW2nvLmPDD4u0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index aa40394dab6..9671c43df08 100644 --- a/pkgs/development/python-modules/meilisearch/default.nix +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.18.0"; + version = "0.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; rev = "v${version}"; - hash = "sha256-iIFTZKORCXr4mNeWBtbOPWXwORuTV/IKhLYkqFgd3Hw="; + hash = "sha256-Rd2GmomNzW0+oI2QEGcPY4g8H+4FN7eLKY1ljcibsLw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix new file mode 100644 index 00000000000..16a81580916 --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -0,0 +1,41 @@ +{ lib, callPackage, buildPythonApplication, fetchFromGitHub +, jinja2 +, markdown +, mkdocs +, mkdocs-material-extensions +, pygments +, pymdown-extensions +}: + +buildPythonApplication rec { + pname = "mkdocs-material"; + version = "8.2.5"; + + src = fetchFromGitHub { + owner = "squidfunk"; + repo = pname; + rev = version; + sha256 = "0v30x2cgc5i307p0hsy5h58pfd8w6xpnvimsb75614xlmx3ycaqd"; + }; + + propagatedBuildInputs = [ + jinja2 + markdown + mkdocs + mkdocs-material-extensions + pygments + pymdown-extensions + ]; + + # No tests for python + doCheck = false; + + pythonImportsCheck = [ "mkdocs" ]; + + meta = with lib; { + description = "Material for mkdocs"; + homepage = "https://squidfunk.github.io/mkdocs-material/"; + license = licenses.mit; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix b/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix new file mode 100644 index 00000000000..2d03c8fa8c5 --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildPythonPackage }: + +buildPythonPackage rec { + pname = "mkdocs-material-extensions"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "facelessuser"; + repo = pname; + rev = version; + sha256 = "1mvc13lz16apnli2qcqf0dvlm8mshy47jmz2vp72lja6x8jfq2p3"; + }; + + doCheck = false; # Circular dependency + + pythonImportsCheck = [ "materialx" ]; + + meta = with lib; { + description = "Markdown extension resources for MkDocs Material"; + homepage = "https://github.com/facelessuser/mkdocs-material-extensions"; + license = licenses.mit; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix index 567eeaf6969..10f5713754b 100644 --- a/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/pkgs/development/python-modules/myfitnesspal/default.nix @@ -8,11 +8,11 @@ , measurement , python-dateutil , requests -, six , rich , pytestCheckHook , mock , nose +, pythonOlder }: # TODO: Define this package in "all-packages.nix" using "toPythonApplication". @@ -20,12 +20,14 @@ buildPythonPackage rec { pname = "myfitnesspal"; - version = "1.16.6"; + version = "1.17.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "ac07369ede3ca4c6d673e02f2b9e0893b17d079f3085e36fdfdbdd1cba9f37db"; + sha256 = "sha256-UXFvKQtC44EvscYWXK7KI/do3U0wTWI3zKwvsRdzKrs="; }; propagatedBuildInputs = [ @@ -36,7 +38,6 @@ buildPythonPackage rec { measurement python-dateutil requests - six rich ]; diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index ed672b7d01c..a268f34cc71 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "13.4.0"; + version = "13.4.1"; src = fetchFromGitHub { owner = "jbarlow83"; @@ -39,7 +39,7 @@ buildPythonPackage rec { extraPostFetch = '' rm "$out/.git_archival.txt" ''; - sha256 = "sha256-LgHhF+vztXPCn71d87OMn0umLvps7We6vyjdRJZw+3E="; + sha256 = "sha256-gxgeEwm3cYNllcmRTZhdyIWWGKXTewyVW314k732swE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index 725fb9ab9f9..6d2b0adcf41 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -1,8 +1,8 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, nose, sortedcontainers }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, pytestCheckHook }: buildPythonPackage rec { pname = "pdfminer_six"; - version = "20201018"; + version = "20220319"; disabled = !isPy3k; @@ -10,10 +10,10 @@ buildPythonPackage rec { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - sha256 = "1a2fxxnnjqbx344znpvx7cnv1881dk6585ibw01inhfq3w6yj2lr"; + sha256 = "sha256-sjO7jmHSe4EDmJ1rfiXx+lsHxc+DfKeMet37Nbg03WQ="; }; - propagatedBuildInputs = [ chardet cryptography sortedcontainers ]; + propagatedBuildInputs = [ chardet cryptography ]; postInstall = '' for file in $out/bin/*.py; do @@ -21,10 +21,7 @@ buildPythonPackage rec { done ''; - checkInputs = [ nose ]; - checkPhase = '' - nosetests - ''; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "PDF parser and analyzer"; diff --git a/pkgs/development/python-modules/pyaussiebb/default.nix b/pkgs/development/python-modules/pyaussiebb/default.nix index 9788860cdd6..0a88f6b0743 100644 --- a/pkgs/development/python-modules/pyaussiebb/default.nix +++ b/pkgs/development/python-modules/pyaussiebb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyaussiebb"; - version = "0.0.12"; + version = "0.0.13"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "yaleman"; repo = "aussiebb"; rev = "v${version}"; - hash = "sha256-4B+eq863G+iVl8UnxDumPVpkj9W8kX5LK0wo4QIYo4w="; + hash = "sha256-8DX7GwSnpiqUO20a6oLMMTkpTUxWTb8LMD4Uk0lyAOY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyclip/default.nix b/pkgs/development/python-modules/pyclip/default.nix index ac79eb8293f..7d317120ed8 100644 --- a/pkgs/development/python-modules/pyclip/default.nix +++ b/pkgs/development/python-modules/pyclip/default.nix @@ -3,19 +3,23 @@ , fetchFromGitHub , buildPythonPackage , pytest +, pythonOlder , xclip , xvfb-run }: buildPythonPackage rec { pname = "pyclip"; - version = "0.5.4"; + version = "0.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "spyoungtech"; repo = pname; rev = "v${version}"; - sha256 = "19ff9cgnfx03mbmy5zpbdi986ppx38a5jf97vkqnic4g5sd1qyrn"; + hash = "sha256-NCWmCp4VGwwvubqN8FUUJ0kcZbXjOEyB6+BfGky1Kj4="; }; postPatch = '' @@ -23,7 +27,12 @@ buildPythonPackage rec { --replace docs/README.md README.md ''; - checkInputs = [ pytest ] ++ lib.optionals stdenv.isLinux [ xclip xvfb-run ]; + checkInputs = [ + pytest + ] ++ lib.optionals stdenv.isLinux [ + xclip + xvfb-run + ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index e658ca40be7..1c6d9b45c56 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pysaml2"; - version = "7.1.1"; + version = "7.1.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "IdentityPython"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uRfcn3nCK+tx6ol6ZFarOSrDOh0cfC9gZXBZ7EICQzw="; + sha256 = "sha256-nyQcQ1OO9PuuQROg+km2vIRF1sZ22MZhiHpmVXWl+is="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-console-scripts/default.nix b/pkgs/development/python-modules/pytest-console-scripts/default.nix index 6bc6fb22b03..32ccd22c969 100644 --- a/pkgs/development/python-modules/pytest-console-scripts/default.nix +++ b/pkgs/development/python-modules/pytest-console-scripts/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-console-scripts"; - version = "1.3"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-w8rb9nz7MKHrHMHp5py23kTDpkhCbxub9j6F2XNX/H8="; + hash = "sha256-XGw9qunPn77Q5lUHISiThgAZPcACpc8bGHJIZEugKFc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/python-crfsuite/default.nix b/pkgs/development/python-modules/python-crfsuite/default.nix index cd2adc48c6f..a357df95a43 100644 --- a/pkgs/development/python-modules/python-crfsuite/default.nix +++ b/pkgs/development/python-modules/python-crfsuite/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonAtLeast }: buildPythonPackage rec { @@ -32,5 +33,6 @@ buildPythonPackage rec { homepage = "https://github.com/scrapinghub/python-crfsuite"; license = licenses.mit; maintainers = teams.tts.members; + broken = pythonAtLeast "3.10"; # https://github.com/scrapinghub/python-crfsuite/issues/130 }; } diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index 4f484a84540..b41ddf01a8e 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-smarttub"; - version = "0.0.29"; + version = "0.0.30"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mdz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-utUpNuemyS8XEVhfhLgOwTRkPFqCBXyK1s1LWemywmU="; + sha256 = "sha256-PzmE0j/sas1Dc/U022dS3krROm292xJlL37+EWPEs+g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 595b4c35737..e3a810be916 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.1.11752"; + version = "9.1.12332"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-DI+Jc5MtDd2XXfjIDtPd8qt4/eQ/3nwbDUqWE2haUhM="; + hash = "sha256-e1lruHgppQ8mJbTx6xsUDSkLCYQISqM9c1vsjdQU4eI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiling/default.nix b/pkgs/development/python-modules/qiling/default.nix index 51c762c8107..72995432814 100644 --- a/pkgs/development/python-modules/qiling/default.nix +++ b/pkgs/development/python-modules/qiling/default.nix @@ -8,18 +8,22 @@ , multiprocess , pefile , pyelftools +, pythonOlder , python-registry +, pyyaml , unicorn }: buildPythonPackage rec { pname = "qiling"; - version = "1.4.1"; + version = "1.4.2"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "e72dc5856cbda975f962ddf063063a32bd6c3b825f75e0795e94ba6840a7d45f"; + hash = "sha256-myUGzNP4bf90d2gY5ZlYbVlTG640dj/Qha8/aMydvuw="; }; propagatedBuildInputs = [ @@ -30,14 +34,10 @@ buildPythonPackage rec { pefile pyelftools python-registry + pyyaml unicorn ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pefile==2021.5.24" "pefile>=2021.5.24" - ''; - # Tests are broken (attempt to import a file that tells you not to import it, # amongst other things) doCheck = false; diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index 1237fd09ea4..391e8d36139 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -1,12 +1,12 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchPypi , capstone , filebytes , pytest }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "ropper"; version = "1.13.6"; diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix index f7d0e62ff15..700fb05bc67 100644 --- a/pkgs/development/python-modules/sasmodels/default.nix +++ b/pkgs/development/python-modules/sasmodels/default.nix @@ -8,33 +8,53 @@ , docutils , pyopencl , opencl-headers +, pythonOlder }: buildPythonPackage rec { pname = "sasmodels"; - version = "1.0.5"; + version = "1.0.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "SasView"; repo = "sasmodels"; rev = "v${version}"; - sha256 = "19h30kcgpvg1qirzjm0vhgvp1yn60ivlglc8a8n2b4d9fp0acfyd"; + hash = "sha256-RVEPu07gp1ScciJQmjizyELcOD2WSjIlxunj5LnmXdw="; }; - buildInputs = [ opencl-headers ]; + buildInputs = [ + opencl-headers + ]; + + propagatedBuildInputs = [ + docutils + matplotlib + numpy + scipy + pyopencl + ]; + # Note: the 1.0.5 release should be compatible with pytest6, so this can # be set back to 'pytest' at that point - checkInputs = [ pytest ]; - propagatedBuildInputs = [ docutils matplotlib numpy scipy pyopencl ]; + checkInputs = [ + pytest + ]; checkPhase = '' HOME=$(mktemp -d) py.test -c ./pytest.ini ''; - meta = { + pythonImportsCheck = [ + "sasmodels" + ]; + + meta = with lib; { description = "Library of small angle scattering models"; - homepage = "http://sasview.org"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ rprospero ]; + homepage = "https://github.com/SasView/sasmodels"; + license = licenses.bsd3; + maintainers = with maintainers; [ rprospero ]; }; } diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index d8240fd8333..803daeb2ab3 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.11"; + version = "0.4.12"; format = "pyproject"; # fetch from github as we want the data files @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "v${version}"; - sha256 = "18r5nk8d5y79ihzjkjm5l0hiw2sjgj87px7vwb0bxbs73f5v353b"; + sha256 = "sha256-ZnsOmsajW4dDv53I/Cuu97mPJywGiwFhNGpT1WRfxSw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index c26ec74ac31..073059aec62 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -22,6 +22,7 @@ , service-identity , sybil , testfixtures +, tldextract , twisted , w3lib , zope_interface @@ -29,13 +30,13 @@ buildPythonPackage rec { pname = "scrapy"; - version = "2.5.1"; + version = "2.6.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "Scrapy"; - sha256 = "13af6032476ab4256158220e530411290b3b934dd602bb6dacacbf6d16141f49"; + sha256 = "56fd55a59d0f329ce752892358abee5a6b50b4fc55a40420ea317dc617553827"; }; nativeBuildInputs = [ @@ -54,6 +55,7 @@ buildPythonPackage rec { pyopenssl queuelib service-identity + tldextract twisted w3lib zope_interface @@ -68,22 +70,6 @@ buildPythonPackage rec { testfixtures ]; - patches = [ - # Require setuptools, https://github.com/scrapy/scrapy/pull/5122 - (fetchpatch { - name = "add-setuptools.patch"; - url = "https://github.com/scrapy/scrapy/commit/4f500342c8ad4674b191e1fab0d1b2ac944d7d3e.patch"; - sha256 = "14030sfv1cf7dy4yww02b49mg39cfcg4bv7ys1iwycfqag3xcjda"; - }) - # Make Twisted[http2] installation optional, https://github.com/scrapy/scrapy/pull/5113 - (fetchpatch { - name = "remove-h2.patch"; - url = "https://github.com/scrapy/scrapy/commit/c5b1ee810167266fcd259f263dbfc0fe0204761a.patch"; - sha256 = "0sa39yx9my4nqww8a12bk9zagx7b56vwy7xpxm4xgjapjl6mcc0k"; - excludes = [ "tox.ini" ]; - }) - ]; - LC_ALL = "en_US.UTF-8"; preCheck = '' diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index f18b05e1071..0323c965ecd 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.10.3"; + version = "3.10.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-K2zBEGzagQ6lOWIPkop1YYqB2/KZIj2beUJUu2Garno="; + sha256 = "sha256-GtdxStdWtioRgf/Y2/broyYElqIJ2RxP3otgROw3epI="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index ea5092cb2ae..6e903b68407 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "typed-settings"; - version = "0.11.1"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gcyOeUyRAwU5s+XoQO/yM0tx7QHjDsBeyoe5HRZHtIs="; + sha256 = "sha256-c+iOb1F8+9IoRbwpMTdyDfOPW2ZEo4xDAlbzLAxgSfk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 1fc7dd5f9b6..eecf45c82fa 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2021.3.5"; + version = "2021.3.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/vjeI47pUTWVIimiojv7h71j1abIWYEGpGz89I8Gnqg="; + sha256 = "sha256-dFR/2Q2NirTx7t86NEp9GG2XSGlziV+BIhpxLh4s2ZM="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index d28f01b128b..d6d7f752a7a 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.27.13"; + version = "2.27.14"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zwZGAx3WMHETs3gU90PATwcHozVzeMK7Eyb4SEEvW6k="; + sha256 = "sha256-BFee4WT3wmWb5GlQ48L41RoIGtJS7xsB1LEvq6XDgQs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-tabulate/default.nix b/pkgs/development/python-modules/types-tabulate/default.nix index 9e5c9b628b2..6d7ceade85c 100644 --- a/pkgs/development/python-modules/types-tabulate/default.nix +++ b/pkgs/development/python-modules/types-tabulate/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-tabulate"; - version = "0.8.5"; + version = "0.8.6"; src = fetchPypi { inherit pname version; - hash = "sha256-A/KDvzhOoSG3tqWK+zj03vl/MHBPyhOg2mhpNrDzkqw="; + hash = "sha256-P037eVRJwheO1cIU7FEUwESx7t1xrQoQA7xnDwnYcQo="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix index 94234b2626e..14e81df65fc 100644 --- a/pkgs/development/python-modules/wrf-python/default.nix +++ b/pkgs/development/python-modules/wrf-python/default.nix @@ -1,14 +1,27 @@ -{lib, fetchFromGitHub, pythonOlder, buildPythonPackage, gfortran, mock, xarray, wrapt, numpy, netcdf4, setuptools}: +{lib +, fetchFromGitHub +, pythonOlder +, buildPythonPackage +, gfortran +, xarray +, wrapt +, numpy +, netcdf4 +, setuptools +}: buildPythonPackage rec { pname = "wrf-python"; - version = "1.3.2.6"; + version = "1.3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "NCAR"; repo = "wrf-python"; rev = version; - sha256 = "046kflai71r7xrmdw6jn0ifn5656wj9gpnwlgxkx430dgk7zbc2y"; + hash = "sha256-+v4FEK0FVE0oAIb18XDTOInHKfxXyykb1ngk9Uxwf0c="; }; propagatedBuildInputs = [ @@ -24,9 +37,8 @@ buildPythonPackage rec { checkInputs = [ netcdf4 - ] ++ lib.optional (pythonOlder "3.3") mock; + ]; - doCheck = true; checkPhase = '' runHook preCheck cd ./test/ci_tests @@ -34,10 +46,14 @@ buildPythonPackage rec { runHook postCheck ''; - meta = { + pythonImportsCheck = [ + "wrf" + ]; + + meta = with lib; { description = "WRF postprocessing library for Python"; homepage = "http://wrf-python.rtfd.org"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ mhaselsteiner ]; + license = licenses.asl20; + maintainers = with maintainers; [ mhaselsteiner ]; }; } diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index efdb40cd6f8..5a47fc90f67 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -1,34 +1,53 @@ { lib +, arabic-reshaper , buildPythonPackage -, fetchPypi -, pillow +, fetchFromGitHub , html5lib -, pypdf2 -, reportlab -, six +, pillow +, pypdf3 +, pytestCheckHook , python-bidi -, arabic-reshaper -, setuptools +, pythonOlder +, reportlab +, svglib }: buildPythonPackage rec { pname = "xhtml2pdf"; - version = "0.2.5"; + version = "0.2.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-EyIERvAC98LqPTMCdwWqTkm1RiMhikscL0tnMZUHIT8="; + }; propagatedBuildInputs = [ - pillow html5lib pypdf2 reportlab six - setuptools python-bidi arabic-reshaper + arabic-reshaper + html5lib + pillow + pypdf3 + python-bidi + reportlab + svglib ]; - src = fetchPypi { - inherit pname version; - sha256 = "6797e974fac66f0efbe927c1539a2756ca4fe8777eaa5882bac132fc76b39421"; - }; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "xhtml2pdf" + ]; meta = with lib; { description = "A PDF generator using HTML and CSS"; homepage = "https://github.com/xhtml2pdf/xhtml2pdf"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/quickemu/default.nix b/pkgs/development/quickemu/default.nix index aa9906c77ec..7aa5b1602c3 100644 --- a/pkgs/development/quickemu/default.nix +++ b/pkgs/development/quickemu/default.nix @@ -43,17 +43,16 @@ in stdenv.mkDerivation rec { pname = "quickemu"; - version = "3.11"; + version = "3.14"; src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; rev = version; - sha256 = "1xwf9vwbr57wmyxfcqzl1jnmfx3ffh7sfqf0zcdq41wqkm8s106n"; + sha256="sha256-7zaXazGzb36Nwk/meJ3lGD+l+fylWZYnhttDL1CXN9s="; }; patches = [ - ./efi_vars_ensure_writable.patch ./input_overrides.patch ]; diff --git a/pkgs/development/quickemu/efi_vars_ensure_writable.patch b/pkgs/development/quickemu/efi_vars_ensure_writable.patch deleted file mode 100644 index e146d0ba768..00000000000 --- a/pkgs/development/quickemu/efi_vars_ensure_writable.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/quickemu b/quickemu -index a9a60a5..1a932ac 100755 ---- a/quickemu -+++ b/quickemu -@@ -197,7 +197,7 @@ function efi_vars() { - - if [ ! -e "${VARS_OUT}" ]; then - if [ -e "${VARS_IN}" ]; then -- cp "${VARS_IN}" "${VARS_OUT}" -+ cp "${VARS_IN}" "${VARS_OUT}" && chmod +w "${VARS_OUT}" - else - echo "ERROR! ${VARS_IN} was not found. Please install edk2." - exit 1 diff --git a/pkgs/development/quickemu/input_overrides.patch b/pkgs/development/quickemu/input_overrides.patch index 228624edcf1..42e4d2e1829 100644 --- a/pkgs/development/quickemu/input_overrides.patch +++ b/pkgs/development/quickemu/input_overrides.patch @@ -1,20 +1,29 @@ diff --git a/quickemu b/quickemu -index 1a932ac..ab2f752 100755 +index 24e1007..39cd5e4 100755 --- a/quickemu +++ b/quickemu +@@ -196,7 +196,7 @@ function efi_vars() { + + if [ ! -e "${VARS_OUT}" ]; then + if [ -e "${VARS_IN}" ]; then +- cp "${VARS_IN}" "${VARS_OUT}" ++ cp "${VARS_IN}" "${VARS_OUT}" && chmod +w "${VARS_OUT}" + else + echo "ERROR! ${VARS_IN} was not found. Please install edk2." + exit 1 @@ -383,7 +383,10 @@ function vm_boot() { # https://bugzilla.redhat.com/show_bug.cgi?id=1929357#c5 case ${secureboot} in on) -- if [ -e "/usr/share/OVMF/OVMF_CODE_4M.secboot.fd" ]; then +- if [ -e "/usr/share/OVMF/OVMF_CODE_4M.secboot.fd" ]; then + if [[ ${ENV_EFI_CODE_SECURE} && ${ENV_EFI_CODE_SECURE-x} ]] && [[ ${ENV_EFI_VARS_SECURE} && ${ENV_EFI_VARS_SECURE-x} ]]; then -+ EFI_CODE="${ENV_EFI_CODE_SECURE}" -+ efi_vars "${ENV_EFI_VARS_SECURE}" "${EFI_VARS}" ++ EFI_CODE="${ENV_EFI_CODE_SECURE}" ++ efi_vars "${ENV_EFI_VARS_SECURE}" "${EFI_VARS}" + elif [ -e "/usr/share/OVMF/OVMF_CODE_4M.secboot.fd" ]; then EFI_CODE="/usr/share/OVMF/OVMF_CODE_4M.secboot.fd" efi_vars "/usr/share/OVMF/OVMF_VARS_4M.fd" "${EFI_VARS}" elif [ -e "/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd" ]; then -@@ -402,7 +405,10 @@ function vm_boot() { +@@ -408,7 +411,10 @@ function vm_boot() { fi ;; *) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index a3d787ad8e9..485def66de3 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -550,14 +550,6 @@ in "--with-libvirt-include=${libvirt}/include" "--with-libvirt-lib=${libvirt}/lib" ]; - dontBuild = false; - postPatch = '' - # https://gitlab.com/libvirt/libvirt-ruby/-/commit/43543991832c9623c00395092bcfb9e178243ba4 - substituteInPlace ext/libvirt/common.c \ - --replace 'st.h' 'ruby/st.h' - substituteInPlace ext/libvirt/domain.c \ - --replace 'st.h' 'ruby/st.h' - ''; }; ruby-lxc = attrs: { diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index a09d8ba3242..a025abf1e34 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.971"; + version = "2.0.975"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-4iY0/pCU7ezf2llSNxnUB/Sky+salpEC6N80C2Pbt6k="; + hash = "sha256-vzq6HKugjM9LBaklv0IlMauSAl3bqHOikDCzrhVBVPA="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 6ef9806bf37..2d97b64b11e 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.173.0"; + version = "0.174.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-F0t85/sq9p+eNEf2XAGxw+ZWeRgUbkhrKFdGASijuAs="; + sha256 = "sha256-lfj6KyB9QYvUy4Ybo8f30omAg4K/jT5MEERJPm0aJ7U="; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix index c4cdf85a7d8..9b15cdd148d 100644 --- a/pkgs/development/tools/analysis/rizin/default.nix +++ b/pkgs/development/tools/analysis/rizin/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config meson ninja cmake (python3.withPackages (ps: [ ps.setuptools ])) ]; - # meson's find_library seems to not use our compiler wrapper if static paraemter + # meson's find_library seems to not use our compiler wrapper if static parameter # is either true/false... We work around by also providing LIBRARY_PATH preConfigure = '' LIBRARY_PATH="" diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 6e79bee6a24..21209638c85 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - hash = "sha256:hYQOmnJjsOIIri5H0/B5LhixwfiLxxpVoN4ON1NUkWg="; + hash = "sha256-lx5saJdGsMS7DLaUngoauzFS1UG4QYvrELEvTjIa1oQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix index f9e7d215f32..2eadc6b877f 100644 --- a/pkgs/development/tools/cask/default.nix +++ b/pkgs/development/tools/cask/default.nix @@ -20,20 +20,22 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild + emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el + runHook postBuild ''; installPhase = '' runHook preInstall + mkdir -p $out/bin - mkdir -p $out/templates - mkdir -p $out/share/emacs/site-lisp/cask/bin - install -Dm644 *.el *.elc $out/share/emacs/site-lisp/cask - install -Dm755 bin/cask $out/share/emacs/site-lisp/cask/bin - install -Dm644 templates/* $out/templates/ + dir=$out/share/emacs/site-lisp/cask + install -Dm444 -t $dir *.el *.elc + install -Dm555 -t $dir/bin bin/cask touch $out/.no-upgrade - ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask + ln -s $dir/bin/cask $out/bin/cask + runHook postInstall ''; @@ -48,7 +50,7 @@ stdenv.mkDerivation rec { homepage = "https://cask.readthedocs.io/en/latest/index.html"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ flexw ]; platforms = platforms.all; - maintainers = [ maintainers.flexw ]; }; } diff --git a/pkgs/development/tools/circup/default.nix b/pkgs/development/tools/circup/default.nix index b620fa20e46..71ac08d2676 100644 --- a/pkgs/development/tools/circup/default.nix +++ b/pkgs/development/tools/circup/default.nix @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { ''; pythonImportsCheck = [ - " circup " + "circup" ]; meta = with lib; { diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index f1f44a57775..719e13a5e12 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.11.0"; + version = "0.11.3"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G1RQEKb3vK8lg0jakCtIMgQXmWqfsq0QWHwU8TAbBbE="; + sha256 = "sha256-iMPTRPsULrwXbx1xQ9db1s0p9a6YejXkwp7sqZ1ayYU="; }; vendorSha256 = "sha256-McCbogZvgm9pnVjay9O2CxAh+653JnDMcU4CHD0PTPI="; diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 222ffb0688f..c8513d004af 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -43,13 +43,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.288.1"; + version = "2.289.1"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-bP+6aAKnu6PxN9eppFXsqOSVSGQ6Lv+gEF2MdEz52WE="; + hash = "sha256-5TS/tW1hnDvPZQdR659rw+spLq98niyUms3BrixaKRE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/continuous-integration/github-runner/deps.nix b/pkgs/development/tools/continuous-integration/github-runner/deps.nix index 5b9c1851d9a..0db94420732 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/deps.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/deps.nix @@ -3,17 +3,14 @@ (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.4"; sha256 = "00fkczf69z2rwarcd8kjjdp47517a0ca6lggn72qbilsp03a5scj"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "1jpw4s862j4aa7b7wchi03gxcy02j6hhpbsfbcayiyx6ry788i15"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0rrrfgkr7rzhlnsnajvzb1ijkybp99d992bqxy9pbawmq7d60bdk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "09whyl3i9mzy10n5zxlq66lj3l4p29hm75igmdip2fb376zxyam3"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "5.2.1"; sha256 = "1gpka9jm2gl6f07pcwzwvaxw9xq1a19i9fskn0qs921c5grhlp3g"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "5.2.1"; sha256 = "03v6145vr1winq8xxfikydicds4f10qmy1ybyz2gfimnzzx51w00"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.3"; sha256 = "1swbrmpsayy99ycwaq68dx9ydd5h3qv9brwig6ryff1xfn1llndq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.3"; sha256 = "1py3nrfvllqlnb9mhs0qwgy7c14n33b2hfb0qc49rx22sqv8ylbp"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "0gjj6p2nnxzhyrmmmwiyrll782famhll9lbgj8cji1i93amxq1pb"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0f04srx6q0jk81a60n956hz32fdngzp0xmdb2x7gyl77gsq8yijj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "0180ipzzz9pc6f6l17rg5bxz1ghzbapmiqq66kdl33bmbny6vmm9"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1-rc2-24027"; sha256 = "1a0w5fv8slfr4q7m3mh78lb9awdwyz4zv3bb73vybkyq1f6z7lx8"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 0e88e1c4926..d7667538e8e 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.71.0"; + version = "1.71.1"; vendorSha256 = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-cj2+DmJyLa6kFkH9JflaR3yFFXBaVZHO6czJGLEH7L0="; + sha256 = "sha256-Y6YabrpM1WcNGp5ksvq3SBuAS6KEUVzEfxsPmBDS+Io="; }; meta = with lib; { diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 477b28b6a1f..63555284296 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "earthly"; - version = "0.6.10"; + version = "0.6.11"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-CzVcoIvf9sqomua5AJtNpCnGfPmCNJMwex/l7p+hEfw="; + sha256 = "sha256-awlE+k4Oa64Z2n+XbeDuezea+5D0ol7hyscVY6j52gI="; }; vendorSha256 = "sha256-uUx9C7uEdXjhDWxehGHuhuFQXdUjZAXK3qogESkRm8E="; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 6334c00fc0b..e651cd82b1d 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.44.2"; + version = "1.45.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-RMZZLvCJcTMzHOzUfT6aEC21T5dCwu1YOUuQ9PLS3fc="; + sha256 = "sha256-nIkDtWUGKSeuGLCgyAYzrIhEk2INX0gZUCOmq+BKbDY="; }; - vendorSha256 = "sha256-X2hZ4BQgYHI1mx/Ywky0oo7IMtrppu+rLq2LRLPH3fY="; + vendorSha256 = "sha256-ruthLNtMYMi2q3fuxOJSsJw5w3uqZi88yJ3BFgNCAHs="; doCheck = false; diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/development/tools/ko/default.nix index 3f0f6f6a4cf..ca187dea93d 100644 --- a/pkgs/development/tools/ko/default.nix +++ b/pkgs/development/tools/ko/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ko"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MT/68znsRPwRnT7150kzE74MunSzyMBftTA50b9ZS3M="; + sha256 = "sha256-VtPry8sF+W46gc2lI3uiE4wqilo1WhH+940QKPZ5cyI="; }; vendorSha256 = null; @@ -40,8 +40,9 @@ buildGoModule rec { postInstall = '' installShellCompletion --cmd ko \ - --bash <($out/bin/ko completion) \ - --zsh <($out/bin/ko completion --zsh) + --bash <($out/bin/ko completion bash) \ + --fish <($out/bin/ko completion fish) \ + --zsh <($out/bin/ko completion zsh) ''; meta = with lib; { diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 73fdb3dff8f..08bfa727758 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.44.0"; + version = "0.45.0"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "1l2pmvqw8rjl2xmsdp31j8015clshab6p81i3i05h40rjjz57mvr"; + sha256 = "sha256-M6M1hYA13QTcX4btcni+GB1NEJYEEeuITIpmY2qS9CM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix index 8a36c52e7ae..aa991e8ea97 100644 --- a/pkgs/development/tools/misc/lit/default.nix +++ b/pkgs/development/tools/misc/lit/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "lit"; - version = "13.0.0"; + version = "14.0.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "4da976f3d114e4ba6ba06cbe660ce1393230f4519c4df15b90bc1840f00e4195"; + sha256 = "45e08ce87b0ea56ab632aa02fa857418a5dd241a711c7c756878b73a130c3efe"; }; passthru = { diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index de928d35fa0..e85e014368a 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.25.2"; + version = "0.26.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dFmXROqh1HYPthzmOE07oyZglaQyx7JqxqYDlLpysrM="; + sha256 = "sha256-Xq9HojFjUrdThXvQ4M8o4LLmxopVErnN3WGUgI79BCw="; }; - vendorSha256 = "sha256-5g/s8WDzxobORFY12YdDQ6rDmr9gQzViv1FFrVwrVIE="; + vendorSha256 = "sha256-iSgK+FOD9olVN4bR2jmtWndaRHrh9pfo/42COTiIh9c="; ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ]; diff --git a/pkgs/development/tools/misc/terraformer/default.nix b/pkgs/development/tools/misc/terraformer/default.nix index d4609db2d34..ccd7c703366 100644 --- a/pkgs/development/tools/misc/terraformer/default.nix +++ b/pkgs/development/tools/misc/terraformer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraformer"; - version = "0.8.18"; + version = "0.8.19"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "sha256-F+OmeXCb0Q2Qqu0T+dqdxvUYszg4ED/zoayH9iO6PCM="; + sha256 = "sha256-h6hqgAHyMNnE7AXNPTUM2srgHW9WGcGmO8d30U2IbSo="; }; - vendorSha256 = "sha256-fCovSA3ZbKn9DrDlb/SXoe8iQTTEAiiDZFSpHUPmxzo="; + vendorSha256 = "sha256-bT6+fH0VJfcgehiiLIDTEYyWgVHIMUGuRaebzm2st60="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/pulumictl/default.nix b/pkgs/development/tools/pulumictl/default.nix index b9538235c46..baa9734d340 100644 --- a/pkgs/development/tools/pulumictl/default.nix +++ b/pkgs/development/tools/pulumictl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pulumictl"; - version = "0.0.29"; + version = "0.0.30"; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumictl"; rev = "v${version}"; - sha256 = "sha256-2jTxtgEg+x/NY/LTWT5+9K9bilOw2bLTUIctjd+qwLE="; + sha256 = "sha256-xAlc6dYD73JZqV0QDhvqPmtGF99mqhvdBbDhWlY/4PI="; }; vendorSha256 = "sha256-xalfnLc6bPBvm2B42+FzpgrOH541HMWmNHChveI792s="; diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 740e60c5e15..2fb0f1ebbeb 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "1.73.1"; + version = "1.74.2"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-Er23OxFblRby9Vu4GvuPGJ4W0H/poRF5DbN1VXxHPJU="; + sha256 = "sha256-1A/c5HiXtT6xUTxVInv9DbbCsqpu8iCJ7I0A9wFeaQ0="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-gWE/rl7XsRjLq0PVVCpcIA9zwJknU8e3TXcj0gy40aI="; + cargoSha256 = "sha256-z++t+Zt40az11z/xhobvvbbSNUBpnMzqlRzoOuYgY2U="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; diff --git a/pkgs/development/tools/toml2json/default.nix b/pkgs/development/tools/toml2json/default.nix new file mode 100644 index 00000000000..0287b75b362 --- /dev/null +++ b/pkgs/development/tools/toml2json/default.nix @@ -0,0 +1,20 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "toml2json"; + version = "1.3.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-TxTxKHf5g+mBXDq147T5tuwCqyfyoz6Mj55g1tlgRDY="; + }; + + cargoHash = "sha256-EYp30TMIpzSCkPIqqdc7sGpfaWs9OLi9ey7DoPE4jzI="; + + meta = with lib; { + description = "A very small CLI for converting TOML to JSON"; + homepage = "https://github.com/woodruffw/toml2json"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ rvarago ]; + }; +} diff --git a/pkgs/development/tools/vagrant/gemset_libvirt.nix b/pkgs/development/tools/vagrant/gemset_libvirt.nix index 2d59b4c2cf8..0cec878d304 100644 --- a/pkgs/development/tools/vagrant/gemset_libvirt.nix +++ b/pkgs/development/tools/vagrant/gemset_libvirt.nix @@ -14,10 +14,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1759s0rz6qgsw86dds1z4jzb3fvizqsk11j5q6z7lc5n404w6i23"; + sha256 = "1yff4s5b8wcrk9ldils2k84l46m9nxr0my0wxchzdmgjbjdfsvww"; type = "gem"; }; - version = "0.79.0"; + version = "0.92.0"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -25,10 +25,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bwqm9n69y5y0a5iickr358z7w4hml3flqwfz8b7cnj1ldabhnjn"; + sha256 = "06m6hxq8vspx9h9bgc2s19m56jzasvl45vblrfv1q5h1qg1k6amw"; type = "gem"; }; - version = "2.2.3"; + version = "2.3.0"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s62ihwxlwgp84xw32wg6hwcx4422v20c7g7azd0xslb91y1ln1r"; + sha256 = "1s8b3bsajwjyrjs53h0nrfrpzzgi8igsrslprhr6fgl80ig3plld"; type = "gem"; }; - version = "0.8.0"; + version = "0.9.0"; }; fog-xml = { dependencies = ["fog-core" "nokogiri"]; @@ -58,30 +58,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "043lwdw2wsi6d55ifk0w3izi5l1d1h0alwyr3fixic7b94kc812n"; + sha256 = "1vyyb2429xqzys39xyk2r3fal80qqn397aj2kqsjrgg2y6m59i41"; type = "gem"; }; - version = "0.1.3"; + version = "0.1.4"; }; formatador = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0"; + sha256 = "1l06bv4avphbdmr1y4g0rqlczr38k6r65b3zghrbj2ynyhm3xqjl"; type = "gem"; }; - version = "0.2.5"; + version = "1.1.0"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; + sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz"; type = "gem"; }; - version = "2.5.1"; + version = "2.6.1"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -89,30 +89,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; + sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; type = "gem"; }; - version = "3.3.1"; + version = "3.4.1"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi"; + sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; type = "gem"; }; - version = "3.2021.0225"; + version = "3.2022.0105"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; type = "gem"; }; - version = "2.5.0"; + version = "2.8.0"; }; multi_json = { groups = ["default"]; @@ -130,40 +130,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b51df8fwadak075cvi17w0nch6qz1r66564qp29qwfj67j9qp0p"; + sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; type = "gem"; }; - version = "1.11.2"; + version = "1.13.3"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; type = "gem"; }; - version = "1.5.2"; + version = "1.6.0"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; }; ruby-libvirt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d754d6pgdqyq52pl9hp0x38q1vn3vf9nz4nm5gqdj5i4fw7pba6"; + sha256 = "0rnmbfhdz270fky0cm8w1i73gkrnlf3s1hdkm5yxjkdbvapwvjsd"; type = "gem"; }; - version = "0.7.1"; + version = "0.8.0"; }; vagrant-libvirt = { - dependencies = ["fog-core" "fog-libvirt" "nokogiri"]; + dependencies = ["fog-core" "fog-libvirt" "nokogiri" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07j30w23syvzrhznad9dkh1ks4lzxzi7ak2966b7i7wr4kz8x1hp"; + sha256 = "07fhsgqx9iyni41z1lhfmm4wq6cbiyydkmvmib28jbgyznlxjmzv"; type = "gem"; }; - version = "0.4.0"; + version = "0.7.0"; }; } diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 50d29cb4a1d..0e39a714ccd 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yarn"; - version = "1.22.17"; + version = "1.22.18"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "1skzlyv2976bl1063f94422jbjy4ns1nxl622biizq31z4821yvj"; + sha256 = "sha256-gI4v/WPWrNa2i2oct8Ns7bpDzmDCy+c86pGKpNznhh0="; }; buildInputs = [ nodejs ]; diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index e8cd2a134fd..4a37a4ac91f 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.22.1"; + version = "4.23.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-+yVf9pSK2cH/d5fdaGSBrjce8vVqE9XMpZSI8s4xoJI="; + sha256 = "sha256-vYitX3Gvffo/MbSYAJv5HV74IcYZK7hIEd1xRQf/COU="; }; - vendorSha256 = "sha256-F11FnDYJ59aKrdRXDPpKlhX52yQXdaN1sblSkVI2j9w="; + vendorSha256 = "sha256-R40zU0jOc/eIFVDsWG3+4o51iro7Sd7jwtyH/fpWVZs="; doCheck = false; diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index f353fa9bbc6..e2db169bad3 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.22.10"; - sha256 = "sha256-rUyIkdVKLJu2r0NpVt7q1ZhrlpiwbmxtYW3kKc+1OTo="; + version = "12.22.11"; + sha256 = "sha256-XoHaJv1bH4lxRIOrqmjj2jBFI+QzTHjEm/p6A+541vE="; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 270592d6dc3..e2a65ace381 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -7,7 +7,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.19.0"; - sha256 = "sha256-6S6EYwDmEXVH036o1b0yJEwZsvzvyznhQgpHY39FAww="; + version = "14.19.1"; + sha256 = "sha256-4a4J3YYas5rwRIO7XA+lTd2CtrFVQ76aJ+pnBKi6ndk="; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 864672b12de..7f3dce2d70c 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "16.14.0"; - sha256 = "sha256-BetkGT45H6iiwVnA9gwXGCRxUWX4DGf8q528lE4wxiM="; + version = "16.14.2"; + sha256 = "sha256-6SLiFcxo61+U0z6KC2HiyGO3cxzIYAq5VdOCLakP+NE="; patches = [ ./disable-darwin-v8-system-instrumentation.patch # Fixes node incorrectly building vendored OpenSSL when we want system OpenSSL. diff --git a/pkgs/development/web/nodejs/v17.nix b/pkgs/development/web/nodejs/v17.nix index 9540919b017..20d76246020 100644 --- a/pkgs/development/web/nodejs/v17.nix +++ b/pkgs/development/web/nodejs/v17.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchpatch, python3, enableNpm ? true }: +{ callPackage, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -7,15 +7,9 @@ let in buildNodejs { inherit enableNpm; - version = "17.5.0"; - sha256 = "sha256-myTmgwV2xX7ja6SDM974vldSMph7Tak5Vot7ifdzzcM="; + version = "17.7.2"; + sha256 = "sha256-OuXnTgsWIoz37faIU1mp0uAZrIQ5BsXgGUjXRvq6Sq8="; patches = [ ./disable-darwin-v8-system-instrumentation.patch - # Fixes node incorrectly building vendored OpenSSL when we want system OpenSSL. - # https://github.com/nodejs/node/pull/40965 - (fetchpatch { - url = "https://github.com/nodejs/node/commit/65119a89586b94b0dd46b45f6d315c9d9f4c9261.patch"; - sha256 = "sha256-dihKYEdK68sQIsnfTRambJ2oZr0htROVbNZlFzSAL+I="; - }) ]; } diff --git a/pkgs/development/web/shopify-cli/Gemfile b/pkgs/development/web/shopify-cli/Gemfile new file mode 100644 index 00000000000..ec10d4a0346 --- /dev/null +++ b/pkgs/development/web/shopify-cli/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'shopify-cli' diff --git a/pkgs/development/web/shopify-cli/Gemfile.lock b/pkgs/development/web/shopify-cli/Gemfile.lock new file mode 100644 index 00000000000..a137dbdfaa8 --- /dev/null +++ b/pkgs/development/web/shopify-cli/Gemfile.lock @@ -0,0 +1,39 @@ +GEM + remote: https://rubygems.org/ + specs: + ast (2.4.2) + bugsnag (6.24.2) + concurrent-ruby (~> 1.0) + concurrent-ruby (1.1.9) + ffi (1.15.5) + liquid (5.2.0) + listen (3.7.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + mini_portile2 (2.8.0) + nokogiri (1.13.3) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) + parser (3.1.1.0) + ast (~> 2.4.1) + racc (1.6.0) + rb-fsevent (0.11.1) + rb-inotify (0.10.1) + ffi (~> 1.0) + shopify-cli (2.14.0) + bugsnag (~> 6.22) + listen (~> 3.7.0) + theme-check (~> 1.10.1) + theme-check (1.10.2) + liquid (>= 5.1.0) + nokogiri (>= 1.12) + parser (~> 3) + +PLATFORMS + ruby + +DEPENDENCIES + shopify-cli + +BUNDLED WITH + 2.2.33 diff --git a/pkgs/development/web/shopify-cli/default.nix b/pkgs/development/web/shopify-cli/default.nix new file mode 100644 index 00000000000..a3ec7ff3f31 --- /dev/null +++ b/pkgs/development/web/shopify-cli/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, ruby }: + +let + rubyEnv = bundlerEnv { + name = "shopify-cli"; + gemdir = ./.; + }; +in +stdenv.mkDerivation rec { + pname = "shopify-cli"; + version = (import ./gemset.nix).shopify-cli.version; + + nativeBuildInputs = [ makeWrapper ]; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${rubyEnv}/bin/shopify $out/bin/shopify + wrapProgram $out/bin/shopify \ + --prefix PATH : ${lib.makeBinPath [ ruby ]} + ''; + + passthru.updateScript = bundlerUpdateScript "shopify-cli"; + + meta = with lib; { + description = "CLI which helps you build against the Shopify platform faster"; + homepage = "https://github.com/Shopify/shopify-cli"; + license = licenses.mit; + platforms = ruby.meta.platforms; + maintainers = with maintainers; [ onny ]; + }; +} + diff --git a/pkgs/development/web/shopify-cli/gemset.nix b/pkgs/development/web/shopify-cli/gemset.nix new file mode 100644 index 00000000000..1c6d7e89198 --- /dev/null +++ b/pkgs/development/web/shopify-cli/gemset.nix @@ -0,0 +1,149 @@ +{ + ast = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; + type = "gem"; + }; + version = "2.4.2"; + }; + bugsnag = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vlsqawqy8jn6cy03zcqw944p323zmr2lgadbw00m5r4lqc3bll4"; + type = "gem"; + }; + version = "6.24.2"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + type = "gem"; + }; + version = "1.1.9"; + }; + ffi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + type = "gem"; + }; + version = "1.15.5"; + }; + liquid = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16aqzbvhvm254hbl274l4883h38j8wlwkcarmg09c7wzgpi0jnl1"; + type = "gem"; + }; + version = "5.2.0"; + }; + listen = { + dependencies = ["rb-fsevent" "rb-inotify"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v"; + type = "gem"; + }; + version = "3.7.1"; + }; + mini_portile2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + type = "gem"; + }; + version = "2.8.0"; + }; + nokogiri = { + dependencies = ["mini_portile2" "racc"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; + type = "gem"; + }; + version = "1.13.3"; + }; + parser = { + dependencies = ["ast"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c"; + type = "gem"; + }; + version = "3.1.1.0"; + }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + type = "gem"; + }; + version = "1.6.0"; + }; + rb-fsevent = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06c50pvxib7wqnv6q0f3n7gzfcrp5chi3sa48hxpkfxc3hhy11fm"; + type = "gem"; + }; + version = "0.11.1"; + }; + rb-inotify = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + type = "gem"; + }; + version = "0.10.1"; + }; + shopify-cli = { + dependencies = ["bugsnag" "listen" "theme-check"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fjqahhvmvqvmpfwa337ran9hhn9wk0ylm502qvcy5i4xy5hvd2r"; + type = "gem"; + }; + version = "2.14.0"; + }; + theme-check = { + dependencies = ["liquid" "nokogiri" "parser"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0314f49fg354wgqavvipfaf6a03090kqrgv48qvkb0ikhvqawpdr"; + type = "gem"; + }; + version = "1.10.2"; + }; +} diff --git a/pkgs/os-specific/linux/nixos-rebuild/default.nix b/pkgs/os-specific/linux/nixos-rebuild/default.nix index 08bba5a428d..58712835d60 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/default.nix +++ b/pkgs/os-specific/linux/nixos-rebuild/default.nix @@ -5,6 +5,7 @@ , gnugrep , nix , lib +, nixosTests }: let fallback = import ./../../../../nixos/modules/installer/tools/nix-fallback-paths.nix; @@ -19,4 +20,9 @@ substituteAll { nix_i686_linux = fallback.i686-linux; nix_aarch64_linux = fallback.aarch64-linux; path = lib.makeBinPath [ coreutils gnused gnugrep ]; + + # run some a simple installer tests to make sure nixos-rebuild still works for them + passthru.tests = { + simple-installer-test = nixosTests.installer.simple; + }; } diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 5f950eb8b76..e7c6bd01604 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -31,6 +31,7 @@ profile=/nix/var/nix/profiles/system buildHost=localhost targetHost= remoteSudo= +verboseScript= # comma separated list of vars to preserve when using sudo preservedSudoVars=NIXOS_INSTALL_BOOTLOADER @@ -71,7 +72,11 @@ while [ "$#" -gt 0 ]; do j="$1"; shift 1 extraBuildFlags+=("$i" "$j") ;; - --show-trace|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*|-L|--print-build-logs|--refresh|--no-net|--offline|--impure) + --show-trace|--keep-failed|-K|--keep-going|-k|--fallback|--repair|--no-build-output|-Q|-j*|-L|--print-build-logs|--refresh|--no-net|--offline|--impure) + extraBuildFlags+=("$i") + ;; + --verbose|-v|-vv|-vvv|-vvvv|-vvvvv) + verboseScript="true" extraBuildFlags+=("$i") ;; --option) @@ -143,30 +148,45 @@ if [ "$buildHost" = localhost ]; then buildHost= fi +# log the given argument to stderr if verbose mode is on +logVerbose() { + if [ -n "$verboseScript" ]; then + echo "$@" >&2 + fi +} + +# Run a command, logging it first if verbose mode is on +runCmd() { + logVerbose "$" "$@" + "$@" +} + buildHostCmd() { if [ -z "$buildHost" ]; then - "$@" + runCmd "$@" elif [ -n "$remoteNix" ]; then - ssh $SSHOPTS "$buildHost" "${maybeSudo[@]}" env PATH="$remoteNix":'$PATH' "$@" + runCmd ssh $SSHOPTS "$buildHost" "${maybeSudo[@]}" env PATH="$remoteNix":'$PATH' "$@" else - ssh $SSHOPTS "$buildHost" "${maybeSudo[@]}" "$@" + runCmd ssh $SSHOPTS "$buildHost" "${maybeSudo[@]}" "$@" fi } targetHostCmd() { if [ -z "$targetHost" ]; then - "${maybeSudo[@]}" "$@" + runCmd "${maybeSudo[@]}" "$@" else - ssh $SSHOPTS "$targetHost" "${maybeSudo[@]}" "$@" + runCmd ssh $SSHOPTS "$targetHost" "${maybeSudo[@]}" "$@" fi } copyToTarget() { if ! [ "$targetHost" = "$buildHost" ]; then if [ -z "$targetHost" ]; then - NIX_SSHOPTS=$SSHOPTS nix-copy-closure "${copyClosureFlags[@]}" --from "$buildHost" "$1" + logVerbose "Running nix-copy-closure with these NIX_SSHOPTS: $SSHOPTS" + NIX_SSHOPTS=$SSHOPTS runCmd nix-copy-closure "${copyClosureFlags[@]}" --from "$buildHost" "$1" elif [ -z "$buildHost" ]; then - NIX_SSHOPTS=$SSHOPTS nix-copy-closure "${copyClosureFlags[@]}" --to "$targetHost" "$1" + logVerbose "Running nix-copy-closure with these NIX_SSHOPTS: $SSHOPTS" + NIX_SSHOPTS=$SSHOPTS runCmd nix-copy-closure "${copyClosureFlags[@]}" --to "$targetHost" "$1" else buildHostCmd nix-copy-closure "${copyClosureFlags[@]}" --to "$targetHost" "$1" fi @@ -174,9 +194,12 @@ copyToTarget() { } nixBuild() { + logVerbose "Building in legacy (non-flake) mode." if [ -z "$buildHost" ]; then - nix-build "$@" + logVerbose "No --build-host given, running nix-build locally" + runCmd nix-build "$@" else + logVerbose "buildHost set to \"$buildHost\", running nix-build remotely" local instArgs=() local buildArgs=() local drv= @@ -206,9 +229,10 @@ nixBuild() { esac done - drv="$(nix-instantiate "${instArgs[@]}" "${extraBuildFlags[@]}")" + drv="$(runCmd nix-instantiate "${instArgs[@]}" "${extraBuildFlags[@]}")" if [ -a "$drv" ]; then - NIX_SSHOPTS=$SSHOPTS nix-copy-closure --to "$buildHost" "$drv" + logVerbose "Running nix-copy-closure with these NIX_SSHOPTS: $SSHOPTS" + NIX_SSHOPTS=$SSHOPTS runCmd nix-copy-closure --to "$buildHost" "$drv" buildHostCmd nix-store -r "$drv" "${buildArgs[@]}" else echo "nix-instantiate failed" @@ -218,12 +242,13 @@ nixBuild() { } nixFlakeBuild() { + logVerbose "Building in flake mode." if [[ -z "$buildHost" && -z "$targetHost" && "$action" != switch && "$action" != boot ]] then - nix "${flakeFlags[@]}" build "$@" + runCmd nix "${flakeFlags[@]}" build "$@" readlink -f ./result elif [ -z "$buildHost" ]; then - nix "${flakeFlags[@]}" build "$@" --out-link "${tmpDir}/result" + runCmd nix "${flakeFlags[@]}" build "$@" --out-link "${tmpDir}/result" readlink -f "${tmpDir}/result" else local attr="$1" @@ -255,9 +280,10 @@ nixFlakeBuild() { esac done - drv="$(nix "${flakeFlags[@]}" eval --raw "${attr}.drvPath" "${evalArgs[@]}" "${extraBuildFlags[@]}")" + drv="$(runCmd nix "${flakeFlags[@]}" eval --raw "${attr}.drvPath" "${evalArgs[@]}" "${extraBuildFlags[@]}")" if [ -a "$drv" ]; then - NIX_SSHOPTS=$SSHOPTS nix "${flakeFlags[@]}" copy --derivation --to "ssh://$buildHost" "$drv" + logVerbose "Running nix with these NIX_SSHOPTS: $SSHOPTS" + NIX_SSHOPTS=$SSHOPTS runCmd nix "${flakeFlags[@]}" copy --derivation --to "ssh://$buildHost" "$drv" buildHostCmd nix-store -r "$drv" "${buildArgs[@]}" else echo "nix eval failed" @@ -291,11 +317,11 @@ if [[ -n $upgrade && -z $_NIXOS_REBUILD_REEXEC && -z $flake ]]; then channel_name=$(basename "$channelpath") if [[ "$channel_name" == "nixos" ]]; then - nix-channel --update "$channel_name" + runCmd nix-channel --update "$channel_name" elif [ -e "$channelpath/.update-on-nixos-rebuild" ]; then - nix-channel --update "$channel_name" + runCmd nix-channel --update "$channel_name" elif [[ -n $upgrade_all ]] ; then - nix-channel --update "$channel_name" + runCmd nix-channel --update "$channel_name" fi done fi @@ -320,9 +346,9 @@ fi # Re-execute nixos-rebuild from the Nixpkgs tree. # FIXME: get nixos-rebuild from $flake. if [[ -z $_NIXOS_REBUILD_REEXEC && -n $canRun && -z $fast && -z $flake ]]; then - if p=$(nix-build --no-out-link --expr 'with import <nixpkgs/nixos> {}; config.system.build.nixos-rebuild' "${extraBuildFlags[@]}"); then + if p=$(runCmd nix-build --no-out-link --expr 'with import <nixpkgs/nixos> {}; config.system.build.nixos-rebuild' "${extraBuildFlags[@]}"); then export _NIXOS_REBUILD_REEXEC=1 - exec "$p/bin/nixos-rebuild" "${origArgs[@]}" + runCmd exec "$p/bin/nixos-rebuild" "${origArgs[@]}" exit 1 fi fi @@ -348,13 +374,13 @@ fi # Find configuration.nix and open editor instead of building. if [ "$action" = edit ]; then if [[ -z $flake ]]; then - NIXOS_CONFIG=${NIXOS_CONFIG:-$(nix-instantiate --find-file nixos-config)} + NIXOS_CONFIG=${NIXOS_CONFIG:-$(runCmd nix-instantiate --find-file nixos-config)} if [[ -d $NIXOS_CONFIG ]]; then NIXOS_CONFIG=$NIXOS_CONFIG/default.nix fi - exec ${EDITOR:-nano} "$NIXOS_CONFIG" + runCmd exec ${EDITOR:-nano} "$NIXOS_CONFIG" else - exec nix "${flakeFlags[@]}" edit "${lockFlags[@]}" -- "$flake#$flakeAttr" + runCmd exec nix "${flakeFlags[@]}" edit "${lockFlags[@]}" -- "$flake#$flakeAttr" fi exit 1 fi @@ -403,19 +429,19 @@ prebuiltNix() { if [[ -n $buildNix && -z $flake ]]; then echo "building Nix..." >&2 nixDrv= - if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root "$tmpDir/nix.drv" --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then - if ! nixDrv="$(nix-instantiate '<nixpkgs>' --add-root "$tmpDir/nix.drv" --indirect -A nix "${extraBuildFlags[@]}")"; then - if ! nixStorePath="$(nix-instantiate --eval '<nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix>' -A "$(nixSystem)" | sed -e 's/^"//' -e 's/"$//')"; then + if ! nixDrv="$(runCmd nix-instantiate '<nixpkgs/nixos>' --add-root "$tmpDir/nix.drv" --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then + if ! nixDrv="$(runCmd nix-instantiate '<nixpkgs>' --add-root "$tmpDir/nix.drv" --indirect -A nix "${extraBuildFlags[@]}")"; then + if ! nixStorePath="$(runCmd nix-instantiate --eval '<nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix>' -A "$(nixSystem)" | sed -e 's/^"//' -e 's/"$//')"; then nixStorePath="$(prebuiltNix "$(uname -m)")" fi - if ! nix-store -r "$nixStorePath" --add-root "${tmpDir}/nix" --indirect \ + if ! runCmd nix-store -r "$nixStorePath" --add-root "${tmpDir}/nix" --indirect \ --option extra-binary-caches https://cache.nixos.org/; then echo "warning: don't know how to get latest Nix" >&2 fi # Older version of nix-store -r don't support --add-root. [ -e "$tmpDir/nix" ] || ln -sf "$nixStorePath" "$tmpDir/nix" if [ -n "$buildHost" ]; then - remoteNixStorePath="$(prebuiltNix "$(buildHostCmd uname -m)")" + remoteNixStorePath="$(runCmd prebuiltNix "$(buildHostCmd uname -m)")" remoteNix="$remoteNixStorePath/bin" if ! buildHostCmd nix-store -r "$remoteNixStorePath" \ --option extra-binary-caches https://cache.nixos.org/ >/dev/null; then @@ -442,8 +468,8 @@ fi # Update the version suffix if we're building from Git (so that # nixos-version shows something useful). if [[ -n $canRun && -z $flake ]]; then - if nixpkgs=$(nix-instantiate --find-file nixpkgs "${extraBuildFlags[@]}"); then - suffix=$($SHELL "$nixpkgs/nixos/modules/installer/tools/get-version-suffix" "${extraBuildFlags[@]}" || true) + if nixpkgs=$(runCmd nix-instantiate --find-file nixpkgs "${extraBuildFlags[@]}"); then + suffix=$(runCmd $SHELL "$nixpkgs/nixos/modules/installer/tools/get-version-suffix" "${extraBuildFlags[@]}" || true) if [ -n "$suffix" ]; then echo -n "$suffix" > "$nixpkgs/.version-suffix" || true fi diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix index ba525c1a387..deb3e06ca49 100644 --- a/pkgs/os-specific/linux/pflask/default.nix +++ b/pkgs/os-specific/linux/pflask/default.nix @@ -1,18 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, python2, wafHook }: +{ lib, stdenv, fetchFromGitHub, python3, wafHook }: stdenv.mkDerivation rec { pname = "pflask"; - version = "unstable-2015-12-17"; + version = "unstable-2018-01-23"; src = fetchFromGitHub { owner = "ghedo"; - repo = "pflask"; - rev = "599418bb6453eaa0ccab493f9411f13726c1a636"; - hash = "sha256-0RjitZd2JUK7WUEJuw4qhUx3joY5OI0Hh74mTzp7GmY="; + repo = pname; + rev = "9ac31ffe2ed29453218aac89ae992abbd6e7cc69"; + hash = "sha256-bAKPUj/EipZ98kHbZiFZZI3hLVMoQpCrYKMmznpSDhg="; }; - nativeBuildInputs = [ wafHook ]; - buildInputs = [ python2 ]; + nativeBuildInputs = [ python3 wafHook ]; + + postInstall = '' + mkdir -p $out/bin + cp build/pflask $out/bin + ''; meta = { description = "Lightweight process containers for Linux"; diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix index b2636382aec..6308b83b600 100644 --- a/pkgs/os-specific/linux/smem/default.nix +++ b/pkgs/os-specific/linux/smem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2 }: +{ lib, stdenv, fetchurl, python3 }: stdenv.mkDerivation rec { pname = "smem"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "19ibv1byxf2b68186ysrgrhy5shkc5mc69abark1h18yigp3j34m"; }; - buildInputs = [ python2 ]; + buildInputs = [ python3 ]; makeFlags = [ "smemcap" ]; diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 014fbedf643..7880c529c73 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.21.0"; + version = "8.22.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "sha256-AJWEm6JBHINca9l0R6dILLMkPGzFVuVjOqD/4AaO5nI="; + sha256 = "sha256-swEq8g/A1Ok1P7JtceUDId7kG0GRtBPGblY09xt81Ys="; }; buildPhase = '' diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 2601266f4d7..81722805e27 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.18.0"; + version = "9.18.1"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-VlJb9crwH9j9nZCRCIDMD4qQonqX0WkYfWUdTs8MQRw="; + sha256 = "sha256-V8ev2HFpTWFctN77HBvW7QIzUJQ9dFhBTbjUk+9WBCc="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 4d12a6d7172..d47b5a3e6a3 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -17,11 +17,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.4.4"; + version = "5.5.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "588964319e943679d391cc9c886d40ef858ecd9b33ae160023b4e2b5182b2cea"; + sha256 = "4e6f48c74d955f143d603f6072670cb41ab9acdd95d4455d6e74b6908562c55a"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 2b7ed9e1c9c..b6dd99edfdd 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-GZYaFK6g26gbVa3sHwTZ4fNGMFWBWevqcfJc/3SC890="; + sha256 = "sha256-LJsiZeKgetFTqX58I82jDr8fIgYJCDVhb44yg8uc/8w="; rev = "v${version}"; }; - vendorSha256 = "sha256-uV5pnnvVYviw2LnceQUiTJXva3WI51pgW6IeZzVhULc="; + vendorSha256 = "sha256-088VEntNx3ZX2p6EiAZ6nSeWmM32XLAOmqXu2sd9QG4="; doCheck = false; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 865c4490a04..69e891fe595 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.671"; + version = "0.20.709"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "AoOaBryZHkqp5SabfKeW5E1YoJCwGhg2luK8SQvabow="; + sha256 = "Gx1VHjs37XBcvw20pQNrA/meLuVmogdGIzroRXvTv5Q="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/jackett/deps.nix b/pkgs/servers/jackett/deps.nix index 3b0fb8cb78b..022c604d0a9 100644 --- a/pkgs/servers/jackett/deps.nix +++ b/pkgs/servers/jackett/deps.nix @@ -152,6 +152,9 @@ (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) (fetchNuGet { pname = "Microsoft.Extensions.WebEncoders"; version = "2.2.0"; sha256 = "1mhnichccw6mjf37d38q2i1kr7qp485m7apa1b872ji0q16yy1y3"; }) + (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.1.0"; sha256 = "1a02bll0flsin9grd3jxbi76ycl42qamynalbp7qbqcsprabw3ai"; }) + (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.2.0"; sha256 = "0w6lrk9z67bcirq2cj2ldfhnizc6id77ba6i30hjzgqjlyhh1gx5"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) @@ -159,9 +162,6 @@ (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.0"; sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; }) (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.0"; sha256 = "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1"; }) - (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.1.0"; sha256 = "1a02bll0flsin9grd3jxbi76ycl42qamynalbp7qbqcsprabw3ai"; }) - (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.2.0"; sha256 = "0w6lrk9z67bcirq2cj2ldfhnizc6id77ba6i30hjzgqjlyhh1gx5"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.0.0"; sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.0.0"; sha256 = "06mn31cgpp7d8lwdyjanh89prc66j37dchn74vrd9s588rq0y70r"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) @@ -185,8 +185,8 @@ (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "4.14.0"; sha256 = "1q2v44inp4xjynncxpv432k2qjkfara1bpipmv3p3in0yv14l3wg"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.2"; sha256 = "00bkjgarkwbj497da9d7lajala1ns67h1kx53w4bapwkf32jlcvn"; }) - (fetchNuGet { pname = "NUnit3TestAdapter"; version = "4.1.0"; sha256 = "1z5g15npmsjszhfmkrdmp4ds7jpxzhxblss2rjl5mfn5sihy4cww"; }) (fetchNuGet { pname = "NUnit.ConsoleRunner"; version = "3.12.0"; sha256 = "00ihk6i3wzqndrn6yyh1csh4b3h226x5kwdp3716p75p4nljs1ik"; }) + (fetchNuGet { pname = "NUnit3TestAdapter"; version = "4.1.0"; sha256 = "1z5g15npmsjszhfmkrdmp4ds7jpxzhxblss2rjl5mfn5sihy4cww"; }) (fetchNuGet { pname = "Polly"; version = "7.2.2"; sha256 = "0s15n5zwj44i6sw3v40ca8l6j0ijydxcakvad49j52rp49iwrmkn"; }) (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix index 6d5ebbb76c0..d8ae7ca61d9 100644 --- a/pkgs/servers/misc/virtiofsd/default.nix +++ b/pkgs/servers/misc/virtiofsd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "virtiofsd"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitLab { owner = "virtio-fs"; repo = "virtiofsd"; rev = "v${version}"; - sha256 = "010xf482qip91mv91wy9zjdsq0gfg1fd6iclrcry0nfnwlbigbwd"; + sha256 = "sha256-WB0zu2M/5enBOoOUUSXnNAkbsA+JzDgtoLncE1YcDLs="; }; - cargoSha256 = "0bfvqbmvkf17slra5k0nnva6j6w07769k226qnbzb3947zf4x2ga"; + cargoSha256 = "sha256-uRPmZE/xc0yeurBZ4rnrZua5d4lbPwStMUacFgbquuk="; buildInputs = [ libcap_ng libseccomp ]; diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix index 64105c9c58f..c2f90322850 100644 --- a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix @@ -2,18 +2,16 @@ buildGoModule rec { pname = "apcupsd-exporter"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "mdlayher"; repo = "apcupsd_exporter"; rev = "v${version}"; - sha256 = "0gjj23qdjs7rqimq95rbfw43m4l6g73j840svxjlmpd1vzzz2v2q"; + sha256 = "sha256-c0LsUqpJbmWQmbmSGdEy7Bbk20my6iWNLeqtU5BjYlw="; }; - vendorSha256 = "09x8y8pmgfn897hvnk122ry460y12b8a7y5fafri5wn9vxab9r82"; - - doCheck = false; + vendorSha256 = "sha256-bvLwHLviIAGmxYY1O0wFDWAMginEUklicrbjIbbPuUw="; passthru.tests = { inherit (nixosTests.prometheus-exporters) apcupsd; }; diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 1dbb3179627..61cf36f882d 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wireguard-exporter"; - version = "3.5.0"; + version = "3.6.2"; src = fetchFromGitHub { owner = "MindFlavor"; repo = "prometheus_wireguard_exporter"; rev = version; - sha256 = "sha256-LHhqQ0p2qt6ZAdkpY1SEAcGXH47TPhHvlDv+eL8GC58="; + sha256 = "sha256-eVGyBynKZLGlsaLwUOx7cJWdRHl65S0Wk1K5c9T8ysQ="; }; - cargoSha256 = "sha256-lNFsO7FSmH1+DLM7ID0vn6234qTdtUoaLSnqKcbHoXE="; + cargoSha256 = "sha256-JbFoaMTs6TPYq2qgBkT7WX1itMXohgcWbC1UvaXOi8o="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/servers/owncast/default.nix b/pkgs/servers/owncast/default.nix index 68591f45823..774f51bc0f6 100644 --- a/pkgs/servers/owncast/default.nix +++ b/pkgs/servers/owncast/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "owncast"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "owncast"; repo = "owncast"; rev = "v${version}"; - sha256 = "sha256-OcolQ4KnZbSgS1dpphbCML40jlheKAxbac7rjRul6Oc="; + sha256 = "sha256-SVe7CH+qx3hFZ/cay6Hh5+vx0ncHACiNSM6k7fCDH18="; }; - vendorSha256 = "sha256-NARHYeOVT7sxfL1BdJc/CPCgHNZzjWE7kACJvrEC71Y="; + vendorSha256 = "sha256-19FTfUCG1omk5y1HC2yb7/0CM2x6k5BGSM+sZwlKrxY="; propagatedBuildInputs = [ ffmpeg ]; diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index 9961e9d581a..558c21c6cd1 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -6,13 +6,13 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then "linux-x64" else throw "Unsupported architecture: ${stdenv.hostPlatform.system}"; - version = "4.1.0"; + version = "4.1.1"; source = fetchFromGitHub { owner = "Chocobozzz"; repo = "PeerTube"; rev = "v${version}"; - sha256 = "sha256-gW/dzWns6wK3zzNjbW19HrV2jqzjdXR5uMMNXL4Xfdw="; + sha256 = "sha256-yBRontvkcVU3BNUIB6WfH2a5blU9u3CNyHrou16h42s="; }; yarnOfflineCacheServer = fetchYarnDeps { @@ -27,7 +27,7 @@ let yarnOfflineCacheClient = fetchYarnDeps { yarnLock = "${source}/client/yarn.lock"; - sha256 = "sha256-wniMvtz7i3I4pn9xyzfNi1k7gQuzDl1GmEO8LqPBMKg="; + sha256 = "sha256-cBa0lNq9JsYi34EJzl0pPbDXSYL9a8g6MmiL6Ge65ms="; }; bcrypt_version = "5.0.1"; @@ -75,10 +75,15 @@ in stdenv.mkDerivation rec { cd ~ # Build PeerTube server - npm run build:server + npm run tsc -- --build ./tsconfig.json + npm run resolve-tspaths:server + cp -r "./server/static" "./server/assets" "./dist/server" + cp -r "./server/lib/emails" "./dist/server/lib" # Build PeerTube tools + cp -r "./server/tools/node_modules" "./dist/server/tools" npm run tsc -- --build ./server/tools/tsconfig.json + npm run resolve-tspaths:cli # Build PeerTube client npm run build:client diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index ec7de2ac57c..dd4025a76c0 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -1,7 +1,8 @@ { lib, beamPackages , fetchFromGitHub, fetchFromGitLab -, file, cmake +, file, cmake, bash , nixosTests, writeText +, cookieFile ? null , ... }: @@ -17,6 +18,34 @@ beamPackages.mixRelease rec { sha256 = "sha256-RcqqNNNCR4cxETUCyjChkpq+cQ1QzNOHHzdqBLtOc6g="; }; + preFixup = if (cookieFile != null) then '' + # There's no way to use a subprocess to cat the content of the + # file cookie using wrapProgram: it gets escaped (by design) with + # a pair of backticks :( + # We have to come up with our own custom wrapper to do this. + function wrapWithCookie () { + local hidden + hidden="$(dirname "$1")/.$(basename "$1")"-wrapped + while [ -e "$hidden" ]; do + hidden="''${hidden}_" + done + mv "$1" "''${hidden}" + + cat > "$1" << EOF + #!${bash}/bin/bash + export RELEASE_COOKIE="\$(cat "${cookieFile}")" + exec -a "\$0" "''${hidden}" "\$@" + EOF + chmod +x "$1" + } + + for f in "$out"/bin/*; do + if [[ -x "$f" ]]; then + wrapWithCookie "$f" + fi + done + '' else ""; + mixNixDeps = import ./mix.nix { inherit beamPackages lib; overrides = (final: prev: { diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 764c61356f3..5f12ae0ee95 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -24,14 +24,14 @@ let ]); path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "3.5.2"; + version = "3.5.3"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-dGmZxnrxuUj6HwFI5QkSy9FnGYQpsNPFbUKXoJWpDfM="; + sha256 = "sha256-pdYTTahdn9YVFreU5KhMGlUzQxHviN5G4TxWKKRBxOc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/sql/materialize/default.nix b/pkgs/servers/sql/materialize/default.nix index ce91c322af1..9dcfb8fe3e5 100644 --- a/pkgs/servers/sql/materialize/default.nix +++ b/pkgs/servers/sql/materialize/default.nix @@ -40,17 +40,17 @@ let in rustPlatform.buildRustPackage rec { pname = "materialize"; - version = "0.15.0"; - MZ_DEV_BUILD_SHA = "f79f63205649d6011822893c5b55396b2bef7b0b"; + version = "0.17.0"; + MZ_DEV_BUILD_SHA = "9f8cf75b461d288335cb6a7a73aaa670bab4a466"; src = fetchFromGitHub { owner = "MaterializeInc"; repo = pname; rev = "v${version}"; - hash = "sha256-/A6+0fehBa8XEB8P8QUV5Lsl9Lwfz4FhQLgotvBG1Gw="; + hash = "sha256-wKYU5S77VoOX7UA9/d21Puz9NYs/om08eNM69/m3Orc="; }; - cargoHash = "sha256-NJvAIy9b39HWJaG860Mlf3WasanUnz+Nq39k4WpddB0="; + cargoHash = "sha256-GTkn/fUprkpsDeQxtzdmS7Fub9QODO5/4nh9ERswOY0="; nativeBuildInputs = [ cmake perl pkg-config ] # Provides the mig command used by the krb5-src build script @@ -71,9 +71,6 @@ rustPlatform.buildRustPackage rec { "--skip test_client_subject_and_references" "--skip test_no_block" "--skip test_safe_mode" - # this test is broken on 0.15.0 - # TODO: re-add it in a subsequent release - "--skip test_threads" "--skip test_tls" ]; diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index c0d05fc1769..d4085b00ec5 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-XE669KfHEyY5TghMUC0GcIqdPTsdAs04pA/t84k+i2E="; + sha256 = "sha256-Auw9dBS2JVvnsJM00PCfLeDl1M+HOYJRCbD0Bro6dlg="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 8decb2f4d29..7c7bb84e15b 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.22.1"; + version = "1.22.2"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-VUML5GwHrRYPd9lnOZuMA3T1SfdC0rVLP5m1yf+SA0A="; + sha256 = "sha256-W4BcUDMxUZKFXueSI/Xlml17Jabi/hnnOyXgitao76A="; }; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 343a1c345c6..1e6b40865ee 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.9"; + version = "5.9.2"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-RVg45GvS0wqEka6b0lv3Acgu1p28fImAbioTCGjG/7c="; + sha256 = "sha256-d2Xy3SpWzpIHmXh8x5BKWF9jNlvKK6D3uwbqIGDGn4s="; }; installPhase = '' diff --git a/pkgs/test/haskell/shellFor/default.nix b/pkgs/test/haskell/shellFor/default.nix index 04f5e045361..aa06ff6e52f 100644 --- a/pkgs/test/haskell/shellFor/default.nix +++ b/pkgs/test/haskell/shellFor/default.nix @@ -2,6 +2,7 @@ (haskellPackages.shellFor { packages = p: [ p.constraints p.linear ]; + extraDependencies = p: { libraryHaskellDepends = [ p.releaser ]; }; nativeBuildInputs = [ cabal-install ]; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; unpackPhase = '' @@ -16,6 +17,16 @@ export HOME=$(mktemp -d) mkdir -p $HOME/.cabal touch $HOME/.cabal/config + + # Check extraDependencies.libraryHaskellDepends arg + ghci <<EOF + :m + Releaser.Primitives + :m + System.IO + writeFile "done" "done" + EOF + [[ done == $(cat done) ]] + + # Check packages arg cabal v2-build --offline --verbose constraints linear --ghc-options="-O0 -j$NIX_BUILD_CORES" ''; installPhase = '' diff --git a/pkgs/tools/X11/jumpapp/default.nix b/pkgs/tools/X11/jumpapp/default.nix index c152a72a23d..cce6ced7573 100644 --- a/pkgs/tools/X11/jumpapp/default.nix +++ b/pkgs/tools/X11/jumpapp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jumpapp"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "mkropat"; repo = "jumpapp"; rev = "v${version}"; - sha256 = "1jrk4mm42sz6ca2gkb6w3dad53d4im4shpgsq8s4vr6xpl3b43ry"; + sha256 = "sha256-9sh0+zpDxwqRGC1jUgGTDdSDRdAFsL12mQ/Opwh/UBc="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 035dfe183e6..0bde787bfe5 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.87.0"; + version = "0.88.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-909cInKo6X8yzpXlumDYIi8yCYLqr1CVcsGgYSd2pnQ="; + sha256 = "sha256-HngpmCJ2oT+6LKtYGaDmQYjB6ibeIr8AaTZp8w8gftc="; }; - vendorSha256 = "sha256-3pEKG5YW83YMSkAjiJQDW1eQbMl6SkokHTXn+kJ/3l4="; + vendorSha256 = "sha256-hF7G5Bh87gf2gpaorBh7aICfhq4jPXj6Zay/qMC+cmU="; doCheck = false; diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 6cb52ccd135..f1a420b0c10 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.51.2"; + version = "1.52.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Nx9lASZOEetkADVEs2JxPRi9SCrb4SLnEpLpzcpp/Is="; + sha256 = "sha256-uaJt1QS4nDVliIFo11OhQYvOxJMeda0QGuaGZCPRoWk="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index f726e5669e3..55267651c9f 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -11,13 +11,13 @@ buildGoPackage rec { pname = "lxd"; - version = "4.23"; + version = "4.24"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"; - sha256 = "sha256-bPzH9MRirgl3b/wkkYIRhEvryvy/5M2Y9LLPqD4IL8U="; + sha256 = "sha256-l/rhWhgmvHOkXL+Omt93X9lwIkiGO4pZl95UlOquslI="; }; postPatch = '' diff --git a/pkgs/tools/admin/trinsic-cli/default.nix b/pkgs/tools/admin/trinsic-cli/default.nix index d8e084218d4..d280fac0733 100644 --- a/pkgs/tools/admin/trinsic-cli/default.nix +++ b/pkgs/tools/admin/trinsic-cli/default.nix @@ -2,11 +2,11 @@ rustPlatform.buildRustPackage rec { pname = "trinsic-cli"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { url = "https://github.com/trinsic-id/sdk/releases/download/v${version}/trinsic-cli-vendor-${version}.tar.gz"; - sha256 = "4ec8a02cf7cd31822668e97befe96f0a7a32b1103abfe27c1bff643d3bf16588"; + sha256 = "sha256-Dxmjbd1Q2JNeET22Fte7bygd+oH3ZfovRTJh5xforuw="; }; cargoVendorDir = "vendor"; diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/tools/misc/broadlink-cli/default.nix index b71b5b444e3..ee99e643b1f 100644 --- a/pkgs/tools/misc/broadlink-cli/default.nix +++ b/pkgs/tools/misc/broadlink-cli/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "broadlink-cli"; - version = "0.18.0"; + version = "0.18.1"; # the tools are available as part of the source distribution from GH but # not pypi, so we have to fetch them here. @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { owner = "mjg59"; repo = "python-broadlink"; rev = version; - sha256 = "0nh9rn1zpc44qsc50360ycg02gwbgq59784mnkp01nhavnwwwx10"; + sha256 = "sha256-x7RVCu5xOwhUOxXIHP7ZAe1/9F9ecf9RgL9I53e9Mcw="; }; format = "other"; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 7f1655b9843..17f57d31ab8 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec { xz zip zstd ] ++ (with python3Packages; [ - argcomplete black debian defusedxml jsondiff jsbeautifier libarchive-c + argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c python_magic progressbar33 pypdf2 rpm tlsh ]) ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ] @@ -66,20 +66,19 @@ python3Packages.buildPythonApplication rec { installManPage doc/diffoscope.1 ''; - # Disable flaky test and a failing one disabledTests = [ + # Disable flaky test and a failing one "test_android_manifest" "test_sbin_added_to_path" "test_diff_meta" "test_diff_meta2" "test_obj_no_differences" - # Failing because of file-v5.40 has a slightly different output. - # Upstream issue: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/271 - "test_text_proper_indentation" - # fails because it fails to determine llvm version "test_item3_deflate_llvm_bitcode" + + # disable formatting tests because they can break on black updates + "test_code_is_black_clean" ] ++ lib.optionals stdenv.isDarwin [ # Disable flaky tests on Darwin "test_non_unicode_filename" diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix index b9bf5f0ae5f..5971939da17 100644 --- a/pkgs/tools/misc/hashit/default.nix +++ b/pkgs/tools/misc/hashit/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libgee - pantheon.elementary-icon-theme pantheon.granite ]; diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index 860a9758d4f..d5e77d4461d 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -22,8 +22,15 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-16oiZAyj6haBk6mgUT25pPDUrCMd7pGo2kAQ0gTe2kM="; }; - # enable pkg-config feature of zstd - cargoPatches = [ ./zstd-pkg-config.patch ]; + cargoPatches = [ + # enable pkg-config feature of zstd + ./zstd-pkg-config.patch + # fix flaky test + (fetchpatch { + url = "https://github.com/o2sh/onefetch/commit/2c1f2f0b2c666f6ce94af0299f88048dd1d83484.patch"; + sha256 = "sha256-pI3yCFYkqOmLgKnCwexv1LcCrCkhi44zhEAx0szaMkg="; + }) + ]; cargoSha256 = "sha256-6wnfn33mfye5o/vY1JQX1Lc4+jzHiKKgGsSLxeJWyFc="; diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index cfdb2b79c6d..74fc37800e9 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "steampipe"; - version = "0.13.0"; + version = "0.13.2"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-+QtZmrPE3R98UVSwrC8xoehNKwd0Exg+AZ2BJxBIrfY="; + sha256 = "sha256-Ty8yCcxdPa/z1k9xMv8iCybRXfvJKRJIT+oH7MbLWmw="; }; - vendorSha256 = "sha256-rRp8pR2cpW88o0KPwuvgSkE263S5oGK/4df4CQSOlRo="; + vendorSha256 = "sha256-0jixQcgSXQJAd899EWOUKde5OXZcSZwQfH7LRdQlm7c="; proxyVendor = true; # tests are failing for no obvious reasons diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 03962f1e9e2..df6a6315937 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGo118Module, fetchFromGitHub, nixosTests }: -buildGoModule rec { +buildGo118Module rec { pname = "corerad"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "sha256-23f+WJcTf+x9GW+hGUU3/j4Qi9MfcsfQuS7aEU4uGU4="; + sha256 = "sha256-2XPWexpr3xGwnvjT08BVq6uf1haPuZGwKswiy/1Z8vE="; }; - vendorSha256 = "sha256-SSa+yBZjZ+5vRfzfCtNhF+kRyJ/VMgd9uWqKPwIi8+Y="; + vendorSha256 = "sha256-+9KjgbKuAJexdGEKu9hIsHfHsVbKeB5ZtSgFzM2/bOI="; doCheck = false; diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index c90ba9cfc64..c4a0baf3160 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "minio-client"; - version = "2022-03-13T22-34-00Z"; + version = "2022-03-17T20-25-06Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-NIhowfkG2bFIcCNXUQ3cETHsR5/NLvIHQ9LeftgSyd0="; + sha256 = "sha256-+MfRosEyIaQ5RndpAeK5AXm8EHX2ND7VJcr1NVFs5TI="; }; vendorSha256 = "sha256-Wdw9mZ3UupoJ4yDwS4f3mOmCn+7TvHmx4aRu+96pHM4="; diff --git a/pkgs/tools/networking/openapi-generator-cli/unstable.nix b/pkgs/tools/networking/openapi-generator-cli/unstable.nix index 33eb33e10b0..9af28b3e09e 100644 --- a/pkgs/tools/networking/openapi-generator-cli/unstable.nix +++ b/pkgs/tools/networking/openapi-generator-cli/unstable.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation rec { - version = "6.0.0-2021-01-18"; # Also update the fetchurl link + version = "6.0.0-2022-03-18"; # Also update the fetchurl link pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -11,8 +11,8 @@ let this = stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/6.0.0-SNAPSHOT/openapi-generator-cli-6.0.0-20210118.082537-4.jar"; - sha256 = "1ji3yw9dp4srlgqxvb21vrcp2bzj4himxsmp8l8zid9nxsc1m71x"; + url = "https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/6.0.0-SNAPSHOT/openapi-generator-cli-6.0.0-20220318.042704-93.jar"; + sha256 = "1h126kpbnpbrsnjrxb09hzb796dwl4g58d6wrh1hhv8svwy5p0bl"; }; dontUnpack = true; diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index e2805f0ccf0..9200bc3f30e 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -32,7 +32,7 @@ let inherit version; src = fetchurl { - url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz"; + url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.gz"; inherit sha256; }; @@ -78,12 +78,12 @@ let in { openvpn_24 = generic { - version = "2.4.11"; - sha256 = "06s4m0xvixjhd3azrzbsf4j86kah4xwr2jp6cmcpc7db33rfyyg5"; + version = "2.4.12"; + sha256 = "1vjx82nlkxrgzfiwvmmlnz8ids5m2fiqz7scy1smh3j9jnf2v5b6"; }; openvpn = generic { - version = "2.5.5"; - sha256 = "sha256-EZvWn6AhCDj2zaonNpbcc476IA9FTb4R6237dd+2ADs="; + version = "2.5.6"; + sha256 = "0gdd88rcan9vfiwkzsqn6fxxdim7kb1bsxrcra59c5xksprpwfik"; }; } diff --git a/pkgs/tools/networking/tinyssh/default.nix b/pkgs/tools/networking/tinyssh/default.nix index ddd2d460f73..36518357e60 100644 --- a/pkgs/tools/networking/tinyssh/default.nix +++ b/pkgs/tools/networking/tinyssh/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tinyssh"; - version = "20220305"; + version = "20220311"; src = fetchFromGitHub { owner = "janmojzis"; repo = "tinyssh"; rev = version; - sha256 = "sha256-d49saN0I22DZixx5AdvQmx3WM7yzQH5lOKnKbzhlls0="; + sha256 = "sha256-+lmPPc2UsNtOfuheWEZHAzmKBilNQ3kNh8ixzDnRjRc="; }; preConfigure = '' diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index dc877ee2d81..8b03779ae7d 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.14.0"; + version = "2.15.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KZeamXMhTX8CbPR66f4ij29GsIvzSbDUZtla+EXPRG4="; + sha256 = "sha256-z9jGivdO7LduJuHbyKr4sl8xg+FGVvKwCm+RgVQPxJQ="; }; - vendorSha256 = "sha256-j4ebzVOzlmQwSkP8epDGClT7fhSUtC6uWdcoo+tFbnc="; + vendorSha256 = "sha256-guJgLjmB29sOLIzs2+gKNp0WTWC3zS9Sb5DD5IistKY="; doCheck = false; @@ -20,7 +20,7 @@ buildGoModule rec { meta = with lib; { description = "A simple deb and rpm packager written in Go"; homepage = "https://github.com/goreleaser/nfpm"; - maintainers = [ maintainers.marsam ]; - license = licenses.mit; + maintainers = with maintainers; [ marsam techknowlogick ]; + license = with licenses; [ mit ]; }; } diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index bdecd4e0a94..90c0d3987cd 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.32" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.34" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 6855f10bb48..080eefa6e2b 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: f7cd9896b753377c4c663188b6c26500b7850f41 - ref: refs/tags/6.1.32 + revision: e1ab1599c07319d2732645b003c038ffa4dad7cd + ref: refs/tags/6.1.34 specs: - metasploit-framework (6.1.32) + metasploit-framework (6.1.34) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -98,25 +98,25 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (6.1.4.6) - actionview (= 6.1.4.6) - activesupport (= 6.1.4.6) + actionpack (6.1.5) + actionview (= 6.1.5) + activesupport (= 6.1.5) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.4.6) - activesupport (= 6.1.4.6) + actionview (6.1.5) + activesupport (= 6.1.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (6.1.4.6) - activesupport (= 6.1.4.6) - activerecord (6.1.4.6) - activemodel (= 6.1.4.6) - activesupport (= 6.1.4.6) - activesupport (6.1.4.6) + activemodel (6.1.5) + activesupport (= 6.1.5) + activerecord (6.1.5) + activemodel (= 6.1.5) + activesupport (= 6.1.5) + activesupport (6.1.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -128,13 +128,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.563.0) - aws-sdk-core (3.128.0) + aws-partitions (1.568.0) + aws-sdk-core (3.130.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.302.0) + aws-sdk-ec2 (1.303.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.68.0) @@ -149,7 +149,7 @@ GEM aws-sigv4 (~> 1.4) aws-sigv4 (1.4.0) aws-eventstream (~> 1, >= 1.0.2) - bcrypt (3.1.16) + bcrypt (3.1.17) bcrypt_pbkdf (1.1.0) bindata (2.4.10) bson (4.14.1) @@ -221,7 +221,7 @@ GEM io-console (0.5.11) irb (1.3.6) reline (>= 0.2.5) - jmespath (1.6.0) + jmespath (1.6.1) jsobfu (0.4.2) rkelly-remix json (2.6.1) @@ -229,7 +229,7 @@ GEM logging (2.3.0) little-plugger (~> 1.1) multi_json (~> 1.14) - loofah (2.14.0) + loofah (2.15.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) metasm (1.0.5) @@ -298,7 +298,7 @@ GEM hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.3.3) + pg (1.3.4) public_suffix (4.0.6) puma (5.6.2) nio4r (~> 2.0) @@ -313,11 +313,11 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - railties (6.1.4.6) - actionpack (= 6.1.4.6) - activesupport (= 6.1.4.6) + railties (6.1.5) + actionpack (= 6.1.5) + activesupport (= 6.1.5) method_source - rake (>= 0.13) + rake (>= 12.2) thor (~> 1.0) rake (13.0.6) rb-readline (0.5.5) @@ -339,7 +339,7 @@ GEM metasm rex-arch rex-text - rex-exploitation (0.1.28) + rex-exploitation (0.1.29) jsobfu metasm rex-arch @@ -347,7 +347,7 @@ GEM rex-text rexml rex-java (0.1.6) - rex-mime (0.1.6) + rex-mime (0.1.7) rex-text rex-nop (0.1.2) rex-arch @@ -409,11 +409,11 @@ GEM ttfunk (1.7.0) tzinfo (2.0.4) concurrent-ruby (~> 1.0) - tzinfo-data (1.2021.5) + tzinfo-data (1.2022.1) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext - unf_ext (0.0.8) + unf_ext (0.0.8.1) unix-crypt (1.3.0) warden (1.2.9) rack (>= 2.0.9) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 11215cd3dde..99d801482af 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.32"; + version = "6.1.34"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-UoH+tp3I9YTXXNXDaYne1E9Zpoj9fbr7mnIQws6TXJs="; + sha256 = "sha256-6rGELJYmddWoR6qIuXKoCT5RpMASIzssWG9Y0Xtx+Z8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 0104412d350..0d0271cca4b 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d4nxv0p3wv4w0pf89nmxzg10balny5rwbchwsscgiminzh3mg7y"; + sha256 = "0kk8c6n94lg5gyarsy33wakw04zbmdwgfr7zxv4zzmbnp1yach0w"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.5"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cmxc80gg7pm6d9y7ah5qr4ymzks8rp51jv0a2qdq2m9p6llzlkk"; + sha256 = "16w7pl8ir253g1dzlzx4mwrjsx3v7fl7zn941xz53zb4ld286mhi"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.5"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0izra8g3g1agv3mz72b0474adkj4ldszj3nwk3l0szgrln7df0lv"; + sha256 = "16anyz7wqwmphzb6w1sgmvdvj50g3zp70s94s5v8hwxj680f6195"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.5"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15v0dwp2122yzwlw8ca0lgx5qbw8fsasbn8zzcks1mvmc9afisss"; + sha256 = "0jl6jc9g9jxsljfnnmbkxrgwrz86icw6g745cv6iavryizrmw939"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.5"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vrz4vgqz4grr2ykwkd8zhhd0rg12z89n89zl6aff17zrdhhad35"; + sha256 = "0jmqndx3a46hpwz33ximqch27018n3mk9z19azgpylm33w7xpkx4"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.5"; }; addressable = { groups = ["default"]; @@ -104,30 +104,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l4f97kmsz1niicj52bm88ggbq3lvn41w0cckfwksh4yikjh20wv"; + sha256 = "1ap27g6hxcczpb5dj7v0wzxrvywfa2kf3zx69xnjz1qvxf3plw54"; type = "gem"; }; - version = "1.563.0"; + version = "1.568.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xpqx000gq1j0n211c9bch5b2rc48a54kxk87m6y8z844c0wlqk7"; + sha256 = "14ymvp06k46gvkpvz5zaqvbvr6wd8vdka5iq25q0wd0fzdx7aivm"; type = "gem"; }; - version = "3.128.0"; + version = "3.130.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13x9rwkykyw873prd2k9pqwrjkf9jsqih9aksbf9fn8hfnsv6db8"; + sha256 = "12k3gjsagdb11crg2gx7373qn1zhglkkija9d6558v0slcza8m3j"; type = "gem"; }; - version = "1.302.0"; + version = "1.303.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -174,10 +174,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02r1c3isfchs5fxivbq99gc3aq4vfyn8snhcy707dal1p8qz12qb"; + sha256 = "1rakdhrnlclrpy7sihi9ipwdh7fjkkvzga171464lq6rzp07cf65"; type = "gem"; }; - version = "3.1.16"; + version = "3.1.17"; }; bcrypt_pbkdf = { groups = ["default"]; @@ -594,10 +594,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gjrr5pdcl3l3skhp9d0jzs4yhmknpv3ldcz59b339b9lqbqasnr"; + sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; jsobfu = { groups = ["default"]; @@ -644,10 +644,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z8bdcmw66j3dy6ivcc02yq32lx3n9bavx497llln8qy014xjm4w"; + sha256 = "1yp1h1j7pdkqvnx8jl6bkzlajav3h5mhqzihgs9p6y3c8927mw23"; type = "gem"; }; - version = "2.14.0"; + version = "2.15.0"; }; metasm = { groups = ["default"]; @@ -684,12 +684,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "f7cd9896b753377c4c663188b6c26500b7850f41"; - sha256 = "16swjg7c443jkbxvlzgxi2k5jkylvs4nkhymbkbq9xf8knvgx0aj"; + rev = "e1ab1599c07319d2732645b003c038ffa4dad7cd"; + sha256 = "17zrf5xx2n3gb0n3n8qjq2j52gh9m1rbk25a8yldax96jqn89cga"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.32"; + version = "6.1.34"; }; metasploit-model = { groups = ["default"]; @@ -977,10 +977,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qqky1q9xhji017q1apx9w81qdlwpm6ix3amhikjy416hxxmhcj1"; + sha256 = "090c3kazlmiizp25las7dgi8wlc11s29nrs2gy3qrp1z8qikgcmb"; type = "gem"; }; - version = "1.3.3"; + version = "1.3.4"; }; public_suffix = { groups = ["default"]; @@ -1067,10 +1067,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1snhwpbnmsyhr297qmin8i5i631aimjca1hiazi128i1355255hb"; + sha256 = "1fdqhv8qhk2dspkrr9f5dj3806g52cb0l1chh2hx8v81y218cl93"; type = "gem"; }; - version = "6.1.4.6"; + version = "6.1.5"; }; rake = { groups = ["default"]; @@ -1167,10 +1167,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08v5nam0xp6f8qi3nyqzh97sz07hy59w82y213jz919mrgpb70vc"; + sha256 = "0asx13g0xqb8wnslrmsld2l1w2qpl6kjrcbfl945kw1nm7k5bwxb"; type = "gem"; }; - version = "0.1.28"; + version = "0.1.29"; }; rex-java = { groups = ["default"]; @@ -1187,10 +1187,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wzw1qcdgbn3iyskppy5038mcdrzplyai45pilm5qjj4fwvjdl6m"; + sha256 = "00qpd5i8naw601q6aij652gw8x6my5d5drf63lq9fridjrqj0nja"; type = "gem"; }; - version = "0.1.6"; + version = "0.1.7"; }; rex-nop = { groups = ["default"]; @@ -1497,10 +1497,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w1iyvw0m2xvdr4654jnn1g27jwj84y94dvaj1k2p3lcrvndm698"; + sha256 = "0yvfyxz70r45j65763fzy0p5j8cxlhnpn1n5lcxj4is7hp8v5i23"; type = "gem"; }; - version = "1.2021.5"; + version = "1.2022.1"; }; unf = { groups = ["default"]; @@ -1517,10 +1517,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jmbimpnpjdzz8hlrppgl9spm99qh3qzbx0b81k3gkgwba8nk3yd"; + sha256 = "0bf120xbq23zjyf8zi8h1576d71g58srr8rndig0whn10w72vrxz"; type = "gem"; }; - version = "0.0.8"; + version = "0.0.8.1"; }; unix-crypt = { groups = ["default"]; diff --git a/pkgs/tools/system/goreman/default.nix b/pkgs/tools/system/goreman/default.nix index 9613ab8d650..8257e930779 100644 --- a/pkgs/tools/system/goreman/default.nix +++ b/pkgs/tools/system/goreman/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "goreman"; - version = "0.3.9"; - rev = "df1209e7cdbad10aecc0aa75d332bc32822925f5"; + version = "0.3.11"; + rev = "6006c6e410ec5a5ba22b50e96227754a42f2834d"; src = fetchFromGitHub { owner = "mattn"; repo = "goreman"; rev = "v${version}"; - sha256 = "1irjf5i5ybdchyn42bamfq8pj3w00p633h1gg202n0vsr39h0bxw"; + sha256 = "sha256-TbJfeU94wakI2028kDqU+7dRRmqXuqpPeL4XBaA/HPo="; }; ldflags = [ @@ -18,7 +18,7 @@ buildGoModule rec { "-X main.revision=${builtins.substring 0 7 rev}" ]; - vendorSha256 = "sha256-+RFh6Ppxxs7P7DWqOBeEJTvPsBgOfopMjx22hPEI1/U="; + vendorSha256 = "sha256-87aHBRWm5Odv6LeshZty5N31sC+vdSwGlTYhk3BZkPo="; doCheck = false; diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index 7102977e8ee..a83135b5024 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -56,8 +56,6 @@ stdenv.mkDerivation rec { json-glib xorg.libXtst pantheon.granite - pantheon.elementary-gtk-theme - pantheon.elementary-icon-theme ]; doCheck = true; diff --git a/pkgs/tools/text/tab/default.nix b/pkgs/tools/text/tab/default.nix index 096e0b04c69..18d3e3d004a 100644 --- a/pkgs/tools/text/tab/default.nix +++ b/pkgs/tools/text/tab/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromBitbucket, python3 }: +{ lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { - version = "8.0"; + version = "9.0"; pname = "tab"; - src = fetchFromBitbucket { - owner = "tkatchev"; + src = fetchFromGitHub { + owner = "ivan-tkatchev"; repo = pname; rev = version; - sha256 = "sha256-RcDvghTiqIdH79khwDIo8PhvmcObmix8WBrHToLwcw4="; + sha256 = "sha256-2keVGPRYV2KCeJ+LgAcl74cjW5wvp6Rmy7VNMtdliBE="; }; checkInputs = [ python3 ]; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 91ac9ae2e12..9ecd7f44cfa 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.15.2"; + version = "2.15.3"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "sha256-4KP4/mfuHTYxOwWqHOa2RNHgElOg6YNAEFmiuF/sHa8="; + sha256 = "sha256-vhsn72xCe1wC4YRdo2m49iUj/3nVl0cyfeSmWRfESaY="; }; - vendorSha256 = "sha256-2vYe943HHybOLcP8nDJe7RimMRIJdND2UPwtwB2mttE="; + vendorSha256 = "sha256-/0H35PGFFPch4jDnQ/ggctyHZJ5W/C1PNlkT5zzvI3M="; postInstall = '' mkdir -p $data/share/vale diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 734ba58e693..8230768e997 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -29,6 +29,7 @@ let requests = changeVersionHash super.requests.overridePythonAttrs "2.26.0" "sha256-uKpY+M95P/2HgtPYyxnmbvNverpDU+7IWedGeLAbB6c="; six = changeVersion super.six.overridePythonAttrs "1.14.0" "02lw67hprv57hyg3cfy02y3ixjk3nzwc0dx3c4ynlvkfwkfdnsr3"; wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "1wf5ycjx8s066rdvr0fgz4xds9a8zhs91c4jzxvvymm1c8l8cwzf"; + semantic-version = changeVersion super.semantic-version.overridePythonAttrs "2.8.5" "d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54"; pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { version = "5.4.1"; checkPhase = '' diff --git a/pkgs/tools/wayland/swaykbdd/default.nix b/pkgs/tools/wayland/swaykbdd/default.nix index 4584018596d..e4f480dba8e 100644 --- a/pkgs/tools/wayland/swaykbdd/default.nix +++ b/pkgs/tools/wayland/swaykbdd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "swaykbdd"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "artemsen"; repo = "swaykbdd"; rev = "v${version}"; - sha256 = "101mbf7pvm4ykmkh29g5xswrzdhdwq0rslzxqqfd5ksf1fphzgxd"; + sha256 = "sha256-umYPVkkYeu6TyVkjDsVBsRZLYh8WyseCPdih85kTz6A="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c30baaac945..1df589661cf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -308,6 +308,7 @@ mapAliases ({ epoxy = libepoxy; # Added 2021-11-11 esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12 etcdctl = throw "'etcdctl' has been renamed to/replaced by 'etcd'"; # Converted to throw 2022-02-22 + eteroj.lv2 = throw "'eteroj.lv2' has been renamed to/replaced by 'open-music-kontrollers.eteroj'"; # Added 2022-03-09 euca2tools = throw "euca2ools has been removed because it is unmaintained upstream and still uses python2"; # Added 2022-01-01 evilvte = throw "evilvte has been removed from nixpkgs for being unmaintained with security issues and dependant on an old version of vte which was removed"; # Added 2022-01-14 evolution_data_server = throw "'evolution_data_server' has been renamed to/replaced by 'evolution-data-server'"; # Converted to throw 2022-02-22 @@ -602,6 +603,7 @@ mapAliases ({ libqrencode = throw "'libqrencode' has been renamed to/replaced by 'qrencode'"; # Converted to throw 2022-02-22 librdf = lrdf; # Added 2020-03-22 librecad2 = throw "'librecad2' has been renamed to/replaced by 'librecad'"; # Converted to throw 2022-02-22 + libressl_3_2 = throw "'libressl_3_2' has reached end-of-life "; # Added 2022-03-19 librsync_0_9 = throw "librsync_0_9 has been removed"; # Added 2021-07-24 libseat = seatd; # Added 2021-06-24 libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it"; # Added 2019-12-10 @@ -854,6 +856,7 @@ mapAliases ({ parity = openethereum; # Added 2020-08-01 parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # Added 2022-01-10 parquet-cpp = throw "'parquet-cpp' has been renamed to/replaced by 'arrow-cpp'"; # Converted to throw 2022-02-22 + patchmatrix = throw "'patchmatrix' has been renamed to/replaced by 'open-music-kontrollers.patchmatrix'"; # Added 2022-03-09 pass-otp = throw "'pass-otp' has been renamed to/replaced by 'pass.withExtensions'"; # Converted to throw 2022-02-22 pdfmod = throw "pdfmod has been removed"; # Added 2022-01-15 pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # Added 2021-07-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d6d4d210f7..674039a3706 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3594,6 +3594,8 @@ with pkgs; mrkd = with python3Packages; toPythonApplication mrkd; + naproche = callPackage ../applications/science/logic/naproche { }; + nautilus-open-any-terminal = callPackage ../tools/misc/nautilus-open-any-terminal { }; n2n = callPackage ../tools/networking/n2n { }; @@ -9838,6 +9840,8 @@ with pkgs; shocco = callPackage ../tools/text/shocco { }; + shopify-cli = callPackage ../development/web/shopify-cli { }; + shopify-themekit = callPackage ../development/web/shopify-themekit { }; shorewall = callPackage ../tools/networking/shorewall { }; @@ -10556,6 +10560,8 @@ with pkgs; tokio-console = callPackage ../development/tools/tokio-console { }; + toml2json = callPackage ../development/tools/toml2json { }; + toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { }; topgrade = callPackage ../tools/misc/topgrade { @@ -19550,11 +19556,8 @@ with pkgs; openvdb = callPackage ../development/libraries/openvdb {}; inherit (callPackages ../development/libraries/libressl { }) - libressl_3_2 libressl_3_4; - # Please keep this pointed to the latest version. See also - # https://discourse.nixos.org/t/nixpkgs-policy-regarding-libraries-available-in-multiple-versions/7026/2 libressl = libressl_3_4; boringssl = callPackage ../development/libraries/boringssl { }; @@ -25505,8 +25508,6 @@ with pkgs; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; - eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { }; - etebase-server = with python3Packages; toPythonApplication etebase-server; etesync-dav = callPackage ../applications/misc/etesync-dav {}; @@ -27379,6 +27380,8 @@ with pkgs; lv2bm = callPackage ../applications/audio/lv2bm { }; + lv2lint = callPackage ../applications/audio/lv2lint/default.nix { }; + lv2-cpp-tools = callPackage ../applications/audio/lv2-cpp-tools { }; lxi-tools = callPackage ../tools/networking/lxi-tools { }; @@ -28189,6 +28192,20 @@ with pkgs; openjump = callPackage ../applications/misc/openjump { }; + open-music-kontrollers = lib.recurseIntoAttrs { + eteroj = callPackage ../applications/audio/open-music-kontrollers/eteroj.nix { }; + jit = callPackage ../applications/audio/open-music-kontrollers/jit.nix { }; + mephisto = callPackage ../applications/audio/open-music-kontrollers/mephisto.nix { }; + midi_matrix = callPackage ../applications/audio/open-music-kontrollers/midi_matrix.nix { }; + moony = callPackage ../applications/audio/open-music-kontrollers/moony.nix { }; + orbit = callPackage ../applications/audio/open-music-kontrollers/orbit.nix { }; + patchmatrix = callPackage ../applications/audio/open-music-kontrollers/patchmatrix.nix { }; + router = callPackage ../applications/audio/open-music-kontrollers/router.nix { }; + sherlock = callPackage ../applications/audio/open-music-kontrollers/sherlock.nix { }; + synthpod = callPackage ../applications/audio/open-music-kontrollers/synthpod.nix { }; + vm = callPackage ../applications/audio/open-music-kontrollers/vm.nix { }; + }; + openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { }; openscad = libsForQt5.callPackage ../applications/graphics/openscad {}; @@ -28290,8 +28307,6 @@ with pkgs; capture = callPackage ../tools/misc/capture {}; - patchmatrix = callPackage ../applications/audio/patchmatrix { }; - pbrt = callPackage ../applications/graphics/pbrt { }; pcloud = callPackage ../applications/networking/pcloud { }; @@ -34304,7 +34319,6 @@ with pkgs; wasm-pack = callPackage ../development/tools/wasm-pack { inherit (darwin.apple_sdk.frameworks) Security; - libressl = libressl_3_2; }; wavegain = callPackage ../applications/audio/wavegain { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92da9eec9a6..0f4a3a9fba5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3601,7 +3601,9 @@ in { gruut = callPackage ../development/python-modules/gruut { }; - gruut-ipa = callPackage ../development/python-modules/gruut-ipa { }; + gruut-ipa = callPackage ../development/python-modules/gruut-ipa { + inherit (pkgs) espeak; + }; gsd = callPackage ../development/python-modules/gsd { }; @@ -5157,6 +5159,8 @@ in { mizani = callPackage ../development/python-modules/mizani { }; mkdocs = callPackage ../development/python-modules/mkdocs { }; + mkdocs-material = callPackage ../development/python-modules/mkdocs-material { }; + mkdocs-material-extensions = callPackage ../development/python-modules/mkdocs-material/mkdocs-material-extensions.nix { }; mkl-service = callPackage ../development/python-modules/mkl-service { }; |