diff --git a/.github/workflows/manual-rendering.yml b/.github/workflows/manual-rendering.yml index 6c4a9507c5ca..4f5486f2acff 100644 --- a/.github/workflows/manual-rendering.yml +++ b/.github/workflows/manual-rendering.yml @@ -44,6 +44,7 @@ jobs: - name: Compare DocBook and MD manuals id: check run: | + export NIX_PATH=nixpkgs=$(pwd) .github/workflows/compare-manuals.sh \ docbook/share/doc/nixos/options.html \ md/share/doc/nixos/options.html diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index ec0e60389155..087e593086f0 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -8,7 +8,7 @@ Loading can be deferred; see examples. At the moment we support two different methods for managing plugins: - Vim packages (*recommended*) -- vim-plug +- vim-plug (vim only) ## Custom configuration {#custom-configuration} @@ -196,20 +196,8 @@ vim_configurable.customize { } ``` -For Neovim the syntax is: +Note: this is not possible anymore for Neovim. -```nix -neovim.override { - configure = { - customRC = '' - # your custom configuration goes here! - ''; - plug.plugins = with pkgs.vimPlugins; [ - vim-go - ]; - }; -} -``` ## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs} @@ -227,7 +215,7 @@ Sometimes plugins require an override that must be changed when the plugin is up To add a new plugin, run `./update.py --add "[owner]/[name]"`. **NOTE**: This script automatically commits to your git repository. Be sure to check out a fresh branch before running. -Finally, there are some plugins that are also packaged in nodePackages because they have Javascript-related build steps, such as running webpack. Those plugins are not listed in `vim-plugin-names` or managed by `update.py` at all, and are included separately in `overrides.nix`. Currently, all these plugins are related to the `coc.nvim` ecosystem of the Language Server Protocol integration with vim/neovim. +Finally, there are some plugins that are also packaged in nodePackages because they have Javascript-related build steps, such as running webpack. Those plugins are not listed in `vim-plugin-names` or managed by `update.py` at all, and are included separately in `overrides.nix`. Currently, all these plugins are related to the `coc.nvim` ecosystem of the Language Server Protocol integration with Vim/Neovim. ## Updating plugins in nixpkgs {#updating-plugins-in-nixpkgs} @@ -243,10 +231,27 @@ Alternatively, set the number of processes to a lower count to avoid rate-limiti ./pkgs/applications/editors/vim/plugins/update.py --proc 1 ``` -## Important repositories {#important-repositories} +## How to maintain an out-of-tree overlay of vim plugins ? -- [vim-pi](https://bitbucket.org/vimcommunity/vim-pi) is a plugin repository - from VAM plugin manager meant to be used by others as well used by +You can use the updater script to generate basic packages out of a custom vim +plugin list: + +``` +pkgs/applications/editors/vim/plugins/update.py -i vim-plugin-names -o generated.nix --no-commit +``` + +with the contents of `vim-plugin-names` being for example: + +``` +repo,branch,alias +pwntester/octo.nvim,, +``` + +You can then reference the generated vim plugins via: + +```nix +myVimPlugins = pkgs.vimPlugins.extend ( + (pkgs.callPackage generated.nix {}) +); +``` -- [vim2nix](https://github.com/MarcWeber/vim-addon-vim2nix) which generates the - .nix code diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1779f614e80b..d6bc60ea36bf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2780,6 +2780,12 @@ githubId = 34543609; name = "creator54"; }; + crinklywrappr = { + email = "crinklywrappr@pm.me"; + name = "Daniel Fitzpatrick"; + github = "crinklywrappr"; + githubId = 56522; + }; cript0nauta = { email = "shareman1204@gmail.com"; github = "cript0nauta"; @@ -4310,6 +4316,12 @@ githubId = 7670450; name = "Federico Beffa"; }; + fbergroth = { + email = "fbergroth@gmail.com"; + github = "fbergroth"; + githubId = 1211003; + name = "Fredrik Bergroth"; + }; fbrs = { email = "yuuki@protonmail.com"; github = "cideM"; @@ -8617,6 +8629,13 @@ githubId = 71893; name = "Michael Maclean"; }; + mglolenstine = { + email = "mglolenstine@gmail.com"; + github = "MGlolenstine"; + githubId = 9406770; + matrix = "@mglolenstine:matrix.org"; + name = "MGlolenstine"; + }; mgregoire = { email = "gregoire@martinache.net"; github = "M-Gregoire"; @@ -15308,4 +15327,10 @@ githubId = 7775707; name = "RB"; }; + bpaulin = { + email = "brunopaulin@bpaulin.net"; + github = "bpaulin"; + githubId = 115711; + name = "bpaulin"; + }; } diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index e41e8a162546..650a7d94c4de 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -1,6 +1,6 @@ name,src,ref,server,version,luaversion,maintainers alt-getopt,,,,,,arobyn -bit32,,,,5.3.0-1,lua5_1,lblasc +bit32,,,,5.3.0-1,5.1,lblasc argparse,https://github.com/luarocks/argparse.git,,,,, basexx,https://github.com/teto/basexx.git,,,,, binaryheap,https://github.com/Tieske/binaryheap.lua,,,,,vcunat @@ -12,20 +12,20 @@ cosmo,,,,,,marsam coxpcall,,,,1.17.0-1,, cqueues,,,,,,vcunat cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,, -digestif,https://github.com/astoff/digestif.git,,,0.2-1,lua5_3, +digestif,https://github.com/astoff/digestif.git,,,0.2-1,5.3, dkjson,,,,,, fifo,,,,,, fluent,,,,,,alerque -gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,lua5_1, +gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1, http,,,,0.3-0,,vcunat inspect,,,,,, ldbus,,,http://luarocks.org/dev,,, ldoc,https://github.com/stevedonovan/LDoc.git,,,,, lgi,,,,,, linenoise,https://github.com/hoelzro/lua-linenoise.git,,,,, -ljsyscall,,,,,lua5_1,lblasc -lmathx,,,,,lua5_3,alexshpilkin -lmpfrlib,,,,,lua5_3,alexshpilkin +ljsyscall,,,,,5.1,lblasc +lmathx,,,,,5.3,alexshpilkin +lmpfrlib,,,,,5.3,alexshpilkin loadkit,,,,,,alerque lpeg,,,,,,vyp lpeg_patterns,,,,,, @@ -45,7 +45,7 @@ lua-resty-jwt,,,,,, lua-resty-openidc,,,,,, lua-resty-openssl,,,,,, lua-resty-session,,,,,, -lua-subprocess,https://github.com/0x0ade/lua-subprocess,,,,lua5_1,scoder12 +lua-subprocess,https://github.com/0x0ade/lua-subprocess,,,,5.1,scoder12 lua-term,,,,,, lua-toml,,,,,, lua-zlib,,,,,,koral @@ -63,7 +63,7 @@ luaexpat,,,,1.4.1-1,,arobyn flosse luaffi,,,http://luarocks.org/dev,,, luafilesystem,,,,1.7.0-2,,flosse lualogging,,,,,, -luaossl,,,,,lua5_1, +luaossl,,,,,5.1, luaposix,,,,34.1.1-1,,vyp lblasc luarepl,,,,,, luasec,,,,,,flosse @@ -71,22 +71,25 @@ luasocket,,,,,, luasql-sqlite3,,,,,,vyp luassert,,,,,, luasystem,,,,,, -luaunbound,,,,, +luaunbound,,,,,, luaunit,,,,,,lockejan luautf8,,,,,,pstn luazip,,,,,, lua-yajl,,,,,,pstn luuid,,,,,, luv,,,,1.43.0-0,, +lush.nvim,https://github.com/rktjmp/lush.nvim,,,,,teto lyaml,,,,,,lblasc markdown,,,,,, mediator_lua,,,,,, mpack,,,,,, moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn nvim-client,https://github.com/neovim/lua-client.git,,,,, +nvim-cmp,,,,, penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque -plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,lua5_1, +plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,5.1, rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,, +rest.nvim,,,,,5.1,teto readline,,,,,, say,https://github.com/Olivine-Labs/say.git,,,,, serpent,,,,,,lockejan diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index cab63ca44e38..f34aa53626da 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -161,7 +161,10 @@ def generate_pkg_nix(plug: LuaPlugin): custom_env = os.environ.copy() custom_env['LUAROCKS_CONFIG'] = LUAROCKS_CONFIG - cmd = [ "luarocks", "nix"] + # we add --dev else luarocks wont find all the "scm" (=dev) versions of the + # packages + # , "--dev" + cmd = [ "luarocks", "nix" ] if plug.maintainers: cmd.append(f"--maintainers={plug.maintainers}") @@ -185,13 +188,7 @@ def generate_pkg_nix(plug: LuaPlugin): cmd.append(f"--only-server={plug.server}") if plug.luaversion: - with CleanEnvironment(): - local_pkgs = str(ROOT.resolve()) - cmd2 = ["nix-build", "--no-out-link", local_pkgs, "-A", f"{plug.luaversion}"] - - log.debug("running %s", ' '.join(cmd2)) - lua_drv_path=subprocess.check_output(cmd2, text=True).strip() - cmd.append(f"--lua-dir={lua_drv_path}/bin") + cmd.append(f"--lua-version={plug.luaversion}") log.debug("running %s", ' '.join(cmd)) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 1e9e28d4213d..b38a90099925 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -487,6 +487,12 @@ instead. + + + Neovim can not be configured with plug anymore (still works + for vim). + + k3s no longer supports docker as runtime diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index abd3a739e6c2..0426d8e7055a 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -168,7 +168,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `paperless` module now defaults `PAPERLESS_TIME_ZONE` to your configured system timezone. - (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden. -Use `configure.packages` instead. + Use `configure.packages` instead. +- Neovim can not be configured with plug anymore (still works for vim). - `k3s` no longer supports docker as runtime due to upstream dropping support. diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index 45aee7c97339..a58c792d8c5f 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -52,10 +52,11 @@ let { type = lib.types.commas; default = ""; description = lib.mdDoc '' - A comma-separated list of capabilities to be given to the wrapper - program. For capabilities supported by the system check the - {manpage}`capabilities(7)` - manual page. + A comma-separated list of capability clauses to be given to the + wrapper program. The format for capability clauses is described in the + “TEXTUAL REPRESENTATION” section of the {manpage}`cap_from_text(3)` + manual page. For a list of capabilities supported by the system, check + the {manpage}`capabilities(7)` manual page. ::: {.note} `cap_setpcap`, which is required for the wrapper diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index 9b3922c70af3..b3361d2014ca 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -96,10 +96,8 @@ let }; } cfg.extraConfig; - configFile = pkgs.runCommandLocal "config.toml" { - nativeBuildInputs = [ pkgs.remarshal ]; - } '' - remarshal -if json -of toml \ + configFile = pkgs.runCommandLocal "config.toml" { } '' + ${pkgs.buildPackages.remarshal}/bin/remarshal -if json -of toml \ < ${pkgs.writeText "config.json" (builtins.toJSON configOptions)} \ > $out ''; diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix index 8cac87f53266..3f0bd585371f 100644 --- a/nixos/modules/services/misc/mediatomb.nix +++ b/nixos/modules/services/misc/mediatomb.nix @@ -362,7 +362,9 @@ in { in mkIf cfg.enable { systemd.services.mediatomb = { description = "${cfg.serverName} media Server"; - after = [ "network.target" ]; + # Gerbera might fail if the network interface is not available on startup + # https://github.com/gerbera/gerbera/issues/1324 + after = [ "network.target" "network-online.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig.ExecStart = "${binaryCommand} --port ${toString cfg.port} ${interfaceFlag} ${configFlag} --home ${cfg.dataDir}"; serviceConfig.User = cfg.user; diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 0a62af95f8f1..b3b1d265c19e 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -16,13 +16,13 @@ let PAPERLESS_MEDIA_ROOT = cfg.mediaDir; PAPERLESS_CONSUMPTION_DIR = cfg.consumptionDir; GUNICORN_CMD_ARGS = "--bind=${cfg.address}:${toString cfg.port}"; - } // ( - lib.mapAttrs (_: toString) cfg.extraConfig - ) // optionalAttrs (config.time.timeZone != null) { - PAPERLESS_TIME_ZONE = lib.mkDefault config.time.timeZone; + } // optionalAttrs (config.time.timeZone != null) { + PAPERLESS_TIME_ZONE = config.time.timeZone; } // optionalAttrs enableRedis { PAPERLESS_REDIS = "unix://${redisServer.unixSocket}"; - }; + } // ( + lib.mapAttrs (_: toString) cfg.extraConfig + ); manage = let setupEnv = lib.concatStringsSep "\n" (mapAttrsToList (name: val: "export ${name}=\"${val}\"") env); diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 16ed34515c67..0876007a6e73 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -529,6 +529,8 @@ in { }; systemd.services = { + # upstream reference: + # https://github.com/syncthing/syncthing/blob/main/etc/linux-systemd/system/syncthing%40.service syncthing = mkIf cfg.systemService { description = "Syncthing service"; after = [ "network.target" ]; @@ -540,7 +542,7 @@ in { wantedBy = [ "multi-user.target" ]; serviceConfig = { Restart = "on-failure"; - SuccessExitStatus = "2 3 4"; + SuccessExitStatus = "3 4"; RestartForceExitStatus="3 4"; User = cfg.user; Group = cfg.group; diff --git a/nixos/modules/services/system/cachix-agent/default.nix b/nixos/modules/services/system/cachix-agent/default.nix index 2972e02b46cf..5b529c1789e2 100644 --- a/nixos/modules/services/system/cachix-agent/default.nix +++ b/nixos/modules/services/system/cachix-agent/default.nix @@ -29,6 +29,12 @@ in { description = lib.mdDoc "Profile name, defaults to 'system' (NixOS)."; }; + host = mkOption { + type = types.str; + default = null; + description = lib.mdDoc "Cachix uri to use."; + }; + package = mkOption { type = types.package; default = pkgs.cachix; @@ -63,7 +69,10 @@ in { KillMode = "process"; Restart = "on-failure"; EnvironmentFile = cfg.credentialsFile; - ExecStart = "${cfg.package}/bin/cachix ${lib.optionalString cfg.verbose "--verbose"} deploy agent ${cfg.name} ${if cfg.profile != null then profile else ""}"; + ExecStart = '' + ${cfg.package}/bin/cachix ${lib.optionalString cfg.verbose "--verbose"} ${lib.optionalString (cfg.host != null) "--host ${cfg.host}"} \ + deploy agent ${cfg.name} ${if cfg.profile != null then cfg.profile else ""} + ''; }; }; }; diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index a076ea24a422..38f8b6fd87c2 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -148,6 +148,7 @@ let + optionalString dev.bypassWorkqueues " --perf-no_read_workqueue --perf-no_write_workqueue" + optionalString (dev.header != null) " --header=${dev.header}"; cschange = "cryptsetup luksChangeKey ${dev.device} ${optionalString (dev.header != null) "--header=${dev.header}"}"; + fido2luksCredentials = dev.fido2.credentials ++ optional (dev.fido2.credential != null) dev.fido2.credential; in '' # Wait for luksRoot (and optionally keyFile and/or header) to appear, e.g. # if on a USB drive. @@ -417,7 +418,7 @@ let } ''} - ${optionalString (luks.fido2Support && (dev.fido2.credential != null)) '' + ${optionalString (luks.fido2Support && fido2luksCredentials != []) '' open_with_hardware() { local passsphrase @@ -433,7 +434,7 @@ let echo "Please move your mouse to create needed randomness." ''} echo "Waiting for your FIDO2 device..." - fido2luks open${optionalString dev.allowDiscards " --allow-discards"} ${dev.device} ${dev.name} ${dev.fido2.credential} --await-dev ${toString dev.fido2.gracePeriod} --salt string:$passphrase + fido2luks open${optionalString dev.allowDiscards " --allow-discards"} ${dev.device} ${dev.name} "${builtins.concatStringsSep "," fido2luksCredentials}" --await-dev ${toString dev.fido2.gracePeriod} --salt string:$passphrase if [ $? -ne 0 ]; then echo "No FIDO2 key found, falling back to normal open procedure" open_normally @@ -444,7 +445,7 @@ let # commands to run right before we mount our device ${dev.preOpenCommands} - ${if (luks.yubikeySupport && (dev.yubikey != null)) || (luks.gpgSupport && (dev.gpgCard != null)) || (luks.fido2Support && (dev.fido2.credential != null)) then '' + ${if (luks.yubikeySupport && (dev.yubikey != null)) || (luks.gpgSupport && (dev.gpgCard != null)) || (luks.fido2Support && fido2luksCredentials != []) then '' open_with_hardware '' else '' open_normally @@ -695,6 +696,17 @@ in description = lib.mdDoc "The FIDO2 credential ID."; }; + credentials = mkOption { + default = []; + example = [ "f1d00200d8dc783f7fb1e10ace8da27f8312d72692abfca2f7e4960a73f48e82e1f7571f6ebfcee9fb434f9886ccc8fcc52a6614d8d2" ]; + type = types.listOf types.str; + description = lib.mdDoc '' + List of FIDO2 credential IDs. + + Use this if you have multiple FIDO2 keys you want to use for the same luks device. + ''; + }; + gracePeriod = mkOption { default = 10; type = types.int; diff --git a/nixos/tests/mediatomb.nix b/nixos/tests/mediatomb.nix index b7a126a01ad5..9c84aa3e92a5 100644 --- a/nixos/tests/mediatomb.nix +++ b/nixos/tests/mediatomb.nix @@ -1,81 +1,44 @@ -import ./make-test-python.nix ({ pkgs, ... }: - -{ +import ./make-test-python.nix { name = "mediatomb"; nodes = { - serverGerbera = - { ... }: - let port = 49152; - in { - imports = [ ../modules/profiles/minimal.nix ]; - services.mediatomb = { - enable = true; - serverName = "Gerbera"; - package = pkgs.gerbera; - interface = "eth1"; # accessible from test - openFirewall = true; - mediaDirectories = [ - { path = "/var/lib/gerbera/pictures"; recursive = false; hidden-files = false; } - { path = "/var/lib/gerbera/audio"; recursive = true; hidden-files = false; } - ]; - }; + server = { + services.mediatomb = { + enable = true; + serverName = "Gerbera"; + interface = "eth1"; + openFirewall = true; + mediaDirectories = [ + { + path = "/var/lib/gerbera/pictures"; + recursive = false; + hidden-files = false; + } + { + path = "/var/lib/gerbera/audio"; + recursive = true; + hidden-files = false; + } + ]; }; + systemd.tmpfiles.rules = [ + "d /var/lib/gerbera/pictures 0770 mediatomb mediatomb" + "d /var/lib/gerbera/audio 0770 mediatomb mediatomb" + ]; + }; - serverMediatomb = - { ... }: - let port = 49151; - in { - imports = [ ../modules/profiles/minimal.nix ]; - services.mediatomb = { - enable = true; - serverName = "Mediatomb"; - package = pkgs.mediatomb; - interface = "eth1"; - inherit port; - mediaDirectories = [ - { path = "/var/lib/mediatomb/pictures"; recursive = false; hidden-files = false; } - { path = "/var/lib/mediatomb/audio"; recursive = true; hidden-files = false; } - ]; - }; - networking.firewall.interfaces.eth1 = { - allowedUDPPorts = [ 1900 port ]; - allowedTCPPorts = [ port ]; - }; - }; - - client = { ... }: { }; + client = {}; }; - testScript = - '' + testScript = '' start_all() - port = 49151 - serverMediatomb.succeed("mkdir -p /var/lib/mediatomb/{pictures,audio}") - serverMediatomb.succeed("chown -R mediatomb:mediatomb /var/lib/mediatomb") - serverMediatomb.wait_for_unit("mediatomb") - serverMediatomb.wait_for_open_port(port) - serverMediatomb.succeed(f"curl --fail http://serverMediatomb:{port}/") - page = client.succeed(f"curl --fail http://serverMediatomb:{port}/") - assert "MediaTomb" in page and "Gerbera" not in page - serverMediatomb.shutdown() + server.wait_for_unit("mediatomb") + server.wait_until_succeeds("nc -z 192.168.1.2 49152") + server.succeed("curl -v --fail http://server:49152/") - port = 49152 - serverGerbera.succeed("mkdir -p /var/lib/mediatomb/{pictures,audio}") - serverGerbera.succeed("chown -R mediatomb:mediatomb /var/lib/mediatomb") - # service running gerbera fails the first time claiming something is already bound - # gerbera[715]: 2020-07-18 23:52:14 info: Please check if another instance of Gerbera or - # gerbera[715]: 2020-07-18 23:52:14 info: another application is running on port TCP 49152 or UDP 1900. - # I did not find anything so here I work around this - serverGerbera.succeed("sleep 2") - serverGerbera.wait_until_succeeds("systemctl restart mediatomb") - serverGerbera.wait_for_unit("mediatomb") - serverGerbera.succeed(f"curl --fail http://serverGerbera:{port}/") - page = client.succeed(f"curl --fail http://serverGerbera:{port}/") + client.wait_for_unit("multi-user.target") + page = client.succeed("curl -v --fail http://server:49152/") assert "Gerbera" in page and "MediaTomb" not in page - - serverGerbera.shutdown() - client.shutdown() ''; -}) +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index dd91eff37072..9a22dbb68332 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -159,10 +159,10 @@ elpaBuild { pname = "aircon-theme"; ename = "aircon-theme"; - version = "0.0.5"; + version = "0.0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/aircon-theme-0.0.5.tar"; - sha256 = "0k9nsm64szi2hvngx9ciyjn8ic9qprfm3gmwp33f0kakq05ykpd1"; + url = "https://elpa.gnu.org/packages/aircon-theme-0.0.6.tar"; + sha256 = "09yjjx9gy1x2i8xk7jlblzk6gkx7cgglb0pwxbl8n6aj19ba40nd"; }; packageRequires = [ emacs ]; meta = { @@ -234,10 +234,10 @@ elpaBuild { pname = "async"; ename = "async"; - version = "1.9.5"; + version = "1.9.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/async-1.9.5.tar"; - sha256 = "02f43vqlggy4qkqdggkl9mcg3rvagjysj45xgrx41jjx6cnjnm19"; + url = "https://elpa.gnu.org/packages/async-1.9.6.tar"; + sha256 = "0qyf1niqjhzaphb50q1znkwqzpdvqw3drivkzrqxrs747k7pm3my"; }; packageRequires = [ emacs ]; meta = { @@ -249,10 +249,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.1.3"; + version = "13.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.1.3.tar"; - sha256 = "0v9rxwz6ngnwrgvzgdki861s136gq30lqhy2gcd9q0a36gb6zhwk"; + url = "https://elpa.gnu.org/packages/auctex-13.1.4.tar"; + sha256 = "1r9qysnfdbiblq3c95rgsh7vgy3k4qabnj0vicqhdkca0cl2b2bj"; }; packageRequires = [ emacs ]; meta = { @@ -354,10 +354,10 @@ elpaBuild { pname = "blist"; ename = "blist"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/blist-0.1.tar"; - sha256 = "0p9jx7m05ynfi3bnd91jghw7101ym8qzm5r42rb1vy85pcf9lbad"; + url = "https://elpa.gnu.org/packages/blist-0.2.tar"; + sha256 = "1gsrj6clsfw36i7pdayfip615r80543j3iph6zm93p88wgwqigrq"; }; packageRequires = []; meta = { @@ -493,10 +493,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "0.8"; + version = "0.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cape-0.8.tar"; - sha256 = "03zc1c2r8h3p9aqk2y8pwysiawbx0f5vgz7582d9qnixdygni117"; + url = "https://elpa.gnu.org/packages/cape-0.9.tar"; + sha256 = "0bjzm1jf3554q83mbmyj584v29cgb0s5wpj74y4p9iyy40g739rw"; }; packageRequires = [ emacs ]; meta = { @@ -628,10 +628,10 @@ elpaBuild { pname = "cobol-mode"; ename = "cobol-mode"; - version = "1.0.0"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cobol-mode-1.0.0.el"; - sha256 = "1zmcfpl7v787yacc7gxm8mkp53fmrznp5mnad628phf3vj4kwnxi"; + url = "https://elpa.gnu.org/packages/cobol-mode-1.1.tar"; + sha256 = "1ivp0pghrkflhr2md34a6a86gwns867bnl30nqzwq8m4qc5xqjra"; }; packageRequires = [ cl-lib ]; meta = { @@ -771,10 +771,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "28.1.2.0"; + version = "28.1.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/compat-28.1.2.0.tar"; - sha256 = "0gm2drvxdlmc3fjlapb5z8k1ymr6q7mrj9z7mb686jfy931b9mwr"; + url = "https://elpa.gnu.org/packages/compat-28.1.2.2.tar"; + sha256 = "1jymfbadvnbjfyml6lri7hc7gz4f97nadn7a7ifpcncm9mhi13bp"; }; packageRequires = [ emacs nadvice ]; meta = { @@ -786,10 +786,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.18"; + version = "0.19"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-0.18.tar"; - sha256 = "0nvi8f0jrji26sjmji8f7rvc8gr1zq49kliq39z7h970d8p10cx2"; + url = "https://elpa.gnu.org/packages/consult-0.19.tar"; + sha256 = "11dac6cl40xyg05wzxanxsc74f1kgnnkqlgf5gqlkq24gwmlgvyk"; }; packageRequires = [ compat emacs ]; meta = { @@ -801,10 +801,10 @@ elpaBuild { pname = "consult-recoll"; ename = "consult-recoll"; - version = "0.6.2"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-recoll-0.6.2.tar"; - sha256 = "0ngisaxdsfmjcincxdjrpgj6q6vh4dav7b2bpfls9a7107rb2ycp"; + url = "https://elpa.gnu.org/packages/consult-recoll-0.7.tar"; + sha256 = "12a1qhp7yz6r5pblm68wp1zis0xnvsn2rm12rz9fircq8p3ff3j7"; }; packageRequires = [ consult emacs ]; meta = { @@ -831,10 +831,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.26"; + version = "0.27"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.26.tar"; - sha256 = "13wsb0llrnmk65m27drnyaqzv9qicnxbpvqcanj0k90iv411kw21"; + url = "https://elpa.gnu.org/packages/corfu-0.27.tar"; + sha256 = "1i8nl94aaa5p4bp0idsmph3z61lccg9a7plbsnpicy0klsaj69r2"; }; packageRequires = [ emacs ]; meta = { @@ -842,16 +842,16 @@ license = lib.licenses.free; }; }) {}; - coterm = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + coterm = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "coterm"; ename = "coterm"; - version = "1.5"; + version = "1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/coterm-1.5.tar"; - sha256 = "1v8cl3bw5z0f36iw8x3gcgiizml74m1kfxfrasyfx8k01nbxcfs8"; + url = "https://elpa.gnu.org/packages/coterm-1.6.tar"; + sha256 = "0ikfm1acdsckflv1hcy9lmssyac2099x2yybhvb6vkghcgy99p00"; }; - packageRequires = [ emacs ]; + packageRequires = [ compat emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/coterm.html"; license = lib.licenses.free; @@ -906,10 +906,10 @@ elpaBuild { pname = "crdt"; ename = "crdt"; - version = "0.3.0"; + version = "0.3.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/crdt-0.3.0.tar"; - sha256 = "0fmrmpjqyzxcmx38kwl6mifq412qfgm9ak7j4f54j33kbp10hjj7"; + url = "https://elpa.gnu.org/packages/crdt-0.3.3.tar"; + sha256 = "12xdqdp4zwd163wc19cjakabgjyzm4l4xg4bns6q1p60zgynbkx8"; }; packageRequires = []; meta = { @@ -966,10 +966,10 @@ elpaBuild { pname = "cursory"; ename = "cursory"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cursory-0.2.1.tar"; - sha256 = "12q1icz1npan9fjn0sy2zfs3d0iz6b34hqsfggm187igq4zj3rrb"; + url = "https://elpa.gnu.org/packages/cursory-0.3.0.tar"; + sha256 = "1mgvdncqgf0ll2mn5zp47lvvbzrzgdga9dbbjwqaapzy6llfg51x"; }; packageRequires = [ emacs ]; meta = { @@ -1041,10 +1041,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.32"; + version = "0.33"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.32.tar"; - sha256 = "1xp3mj3ndaljma0g7x9abziphgi2a6j8k1v52sb8xwgn4p5gdvby"; + url = "https://elpa.gnu.org/packages/debbugs-0.33.tar"; + sha256 = "1s4p3jf9yrm8pn5pljpkrw05n2p9v6fpl141rh1df7f7l0w80qbk"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -1071,10 +1071,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "0.4.0"; + version = "0.6.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-0.4.0.tar"; - sha256 = "031ia1k5fqzq154jhi4icvivhdg8yn7zfkwy81yf0ivcsivri54s"; + url = "https://elpa.gnu.org/packages/denote-0.6.1.tar"; + sha256 = "1yxfnwq2b32xrl52g61a9g3i53m94iybx0n8hh6nbmcv5x4y43ya"; }; packageRequires = [ emacs ]; meta = { @@ -1086,10 +1086,10 @@ elpaBuild { pname = "detached"; ename = "detached"; - version = "0.7"; + version = "0.8.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/detached-0.7.tar"; - sha256 = "1a2w6cmzy7c861rih9k2qbnmizyybrs1kwqp6lbz3wfs2h0zisrw"; + url = "https://elpa.gnu.org/packages/detached-0.8.1.tar"; + sha256 = "03riybjk2yls8wjkp1sqd30p0jpvrlz3qlj8r04cx7s1nn1kn9g3"; }; packageRequires = [ emacs ]; meta = { @@ -1131,10 +1131,10 @@ elpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "1.8.8"; + version = "1.9.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/diff-hl-1.8.8.tar"; - sha256 = "10g1333xvki8aw5vhyijkpjn62jh9k3n4a5sh1z69hsfvxih5lqk"; + url = "https://elpa.gnu.org/packages/diff-hl-1.9.0.tar"; + sha256 = "00mqknqyibbqyfcvdvk1m7nwipfpsw3afbvipqmghh5zm2n7wjr4"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1386,10 +1386,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20220626"; + version = "20220828"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20220626.tar"; - sha256 = "0n09dws1qy23a31s5iv75dzl6xy8m5m7qy9gf7sk1b3133ly4sf5"; + url = "https://elpa.gnu.org/packages/eev-20220828.tar"; + sha256 = "0znsimjq61p67c2q3qbia5qrimy847xy6gjpl1jgyrdlpgm9hv6r"; }; packageRequires = [ emacs ]; meta = { @@ -1397,6 +1397,21 @@ license = lib.licenses.free; }; }) {}; + ef-themes = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "ef-themes"; + ename = "ef-themes"; + version = "0.4.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ef-themes-0.4.2.tar"; + sha256 = "0ik9kzdv5r1q7hw81nh3raiychpmwi61034y12pqvbq24njp0y72"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ef-themes.html"; + license = lib.licenses.free; + }; + }) {}; eglot = callPackage ({ eldoc , elpaBuild , emacs @@ -1535,6 +1550,38 @@ license = lib.licenses.free; }; }) {}; + ement = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , map + , plz + , svg-lib + , taxy + , taxy-magit-section + , transient }: + elpaBuild { + pname = "ement"; + ename = "ement"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ement-0.1.2.tar"; + sha256 = "1n5k3rcgdq625b9fjhl53nl5zbis4dw0d00h4dk16m61nk98ra2l"; + }; + packageRequires = [ + emacs + map + plz + svg-lib + taxy + taxy-magit-section + transient + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ement.html"; + license = lib.licenses.free; + }; + }) {}; emms = callPackage ({ cl-lib ? null , elpaBuild , fetchurl @@ -1774,10 +1821,10 @@ elpaBuild { pname = "fontaine"; ename = "fontaine"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/fontaine-0.3.0.tar"; - sha256 = "0ixi48w3d0yvmw1103gj7iq2acj90p0qlyhna4hpfhnwa247lp2k"; + url = "https://elpa.gnu.org/packages/fontaine-0.4.0.tar"; + sha256 = "1phbni32zgwml5mwldbqmqmkbhbdj4vf4bs98wj0my6d902x6lbw"; }; packageRequires = [ emacs ]; meta = { @@ -2208,10 +2255,10 @@ elpaBuild { pname = "inspector"; ename = "inspector"; - version = "0.5"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/inspector-0.5.tar"; - sha256 = "19f2a0fw0zcrfirjhq7my910jiqxqkishyjprj87cahpksdp4cp9"; + url = "https://elpa.gnu.org/packages/inspector-0.7.tar"; + sha256 = "0cwfbg7bx4ni0xadba9v5jbkivz2slqwxcy7q8s3zipb4m578xbk"; }; packageRequires = [ emacs ]; meta = { @@ -2438,10 +2485,10 @@ elpaBuild { pname = "kind-icon"; ename = "kind-icon"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/kind-icon-0.1.6.tar"; - sha256 = "0ac53qrz217b054z51244r7whvjmyrq4941ld0bgl9crssrhb588"; + url = "https://elpa.gnu.org/packages/kind-icon-0.1.7.tar"; + sha256 = "02imi2qj329yrqvs23d4z7fv8bbaz0fvya6zdswb38blpdri4cn1"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -2543,10 +2590,10 @@ elpaBuild { pname = "lin"; ename = "lin"; - version = "0.4.0"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/lin-0.4.0.tar"; - sha256 = "1fynn3fpf3c2yamlpp9j6rakgd21ivyvqrx0hmsgcyr115q5afm4"; + url = "https://elpa.gnu.org/packages/lin-1.0.0.tar"; + sha256 = "0b090g2l8mvm3b6k7s31v9lw48qjcvcif2p201wlqgipddm6s180"; }; packageRequires = [ emacs ]; meta = { @@ -2633,10 +2680,10 @@ elpaBuild { pname = "logos"; ename = "logos"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/logos-0.4.0.tar"; - sha256 = "12yypzfd6lf71qyix0a1088vkamh9ilq8inpmv2882w3r5dii345"; + url = "https://elpa.gnu.org/packages/logos-0.5.0.tar"; + sha256 = "026nzkgkfs96m9qxpng7h0kqvhxfah883pv4i08fz0950lrsxynd"; }; packageRequires = [ emacs ]; meta = { @@ -2663,10 +2710,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "0.13"; + version = "0.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-0.13.tar"; - sha256 = "1d5y3d2plkxnmm4458l0gfpim6q3vzps3bsfakvnzf86hh5nm77j"; + url = "https://elpa.gnu.org/packages/marginalia-0.14.tar"; + sha256 = "0y1mz9688h56knyly7by3gl6v37q437c3lp5bsx6jajysb8v69xw"; }; packageRequires = [ emacs ]; meta = { @@ -2693,10 +2740,10 @@ elpaBuild { pname = "math-symbol-lists"; ename = "math-symbol-lists"; - version = "1.2.1"; + version = "1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/math-symbol-lists-1.2.1.el"; - sha256 = "015q44qg9snrpz04syz89f9f79pzg5h7w88nh84p38klynkx2f86"; + url = "https://elpa.gnu.org/packages/math-symbol-lists-1.3.tar"; + sha256 = "0h330j7vxmb56z66xgynqlxkr5bnp5id25j0w4ikyms407sdyrbs"; }; packageRequires = []; meta = { @@ -2862,10 +2909,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-2.5.0.tar"; - sha256 = "0j2mx47fpbqvpwhkdskgrnyj5nzg25sqgxwsdvrvw22c7gxhirxn"; + url = "https://elpa.gnu.org/packages/modus-themes-2.6.0.tar"; + sha256 = "0i4y69rrdcm64mvqs5z7dmgx1xk0x7g5978q5gjblczlfka444k4"; }; packageRequires = [ emacs ]; meta = { @@ -3130,10 +3177,10 @@ elpaBuild { pname = "num3-mode"; ename = "num3-mode"; - version = "1.4"; + version = "1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/num3-mode-1.4.tar"; - sha256 = "01cl5wc5xzf4milq6r5ps2f4ikpkdbdidk880svby9mhiw6agydh"; + url = "https://elpa.gnu.org/packages/num3-mode-1.5.tar"; + sha256 = "0i01v0sl0wi98xvc3wkk2lwc3nxmnhhpyrhr9gn88x5ygc0p4rdw"; }; packageRequires = []; meta = { @@ -3235,10 +3282,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.5.4"; + version = "9.5.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.5.4.tar"; - sha256 = "1rcr1kyvd2l5h1i22z40x998jm4b6vk47i77y376blcrcx2dp26m"; + url = "https://elpa.gnu.org/packages/org-9.5.5.tar"; + sha256 = "13sykrkhb192vnmj5nlws5jc5a4fr7ynmyxpzanqlzx1gbdxv32p"; }; packageRequires = [ emacs ]; meta = { @@ -3655,10 +3702,10 @@ elpaBuild { pname = "pulsar"; ename = "pulsar"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pulsar-0.4.0.tar"; - sha256 = "027kpywdjfd1xm1fxkprbc04iq96lnyzw2f3499wyrfj4vxk2dn2"; + url = "https://elpa.gnu.org/packages/pulsar-0.5.0.tar"; + sha256 = "1bs6f8j1a7vypwm087zsrccv5kbahxyg3nhc65ffgpwrnxfp4v96"; }; packageRequires = [ emacs ]; meta = { @@ -3670,10 +3717,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "5.2.3"; + version = "5.2.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-5.2.3.tar"; - sha256 = "189r0qkd8nv5zjg2ljbzbj086jb8xbl4yd1jliz4azaprv8fhqv0"; + url = "https://elpa.gnu.org/packages/pyim-5.2.4.tar"; + sha256 = "1dzl4xaf31nyjb5hnwwf29i75x0i8dakpmmagbn4ks5hi3jl2ig0"; }; packageRequires = [ async emacs xr ]; meta = { @@ -4181,10 +4228,10 @@ elpaBuild { pname = "shell-command-plus"; ename = "shell-command+"; - version = "2.3.2"; + version = "2.4.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.3.2.tar"; - sha256 = "03hmk4gr9kjy3238n0ys9na00py035j9s0y8d87c45f5af6c6g2c"; + url = "https://elpa.gnu.org/packages/shell-command+-2.4.1.tar"; + sha256 = "1pbv5g58647gq83vn5pg8c6kjhvjn3lj0wggz3iz3695yvl8aw4i"; }; packageRequires = [ emacs ]; meta = { @@ -4730,14 +4777,29 @@ license = lib.licenses.free; }; }) {}; + topspace = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "topspace"; + ename = "topspace"; + version = "0.3.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/topspace-0.3.1.tar"; + sha256 = "1c2raqmbyv5bd48gimh6dazfb6dmipjmf1j0w53vyrs48dx6kskq"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/topspace.html"; + license = lib.licenses.free; + }; + }) {}; tramp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.3.1"; + version = "2.5.3.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.3.1.tar"; - sha256 = "0dqc5gmp20isrlanccvj6nhalmmsfg7bmm690gxfgrbqcc2vj69a"; + url = "https://elpa.gnu.org/packages/tramp-2.5.3.2.tar"; + sha256 = "1jcicb9f7c1nmaqg20yy2j4wd0qfch4llc26ga7q3ckhx41pvbiw"; }; packageRequires = [ emacs ]; meta = { @@ -5045,10 +5107,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "0.25"; + version = "0.26"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-0.25.tar"; - sha256 = "1v0icwqp4ppa2j1k1fk4fc5zdzqb4hcdc7khjc1c31q0gad6l3xy"; + url = "https://elpa.gnu.org/packages/vertico-0.26.tar"; + sha256 = "070dkw7ii5lfg4m0bwl9blbyq3rgqs212my142ri69ig1fz9x5ad"; }; packageRequires = [ emacs ]; meta = { @@ -5462,4 +5524,19 @@ license = lib.licenses.free; }; }) {}; + zuul = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }: + elpaBuild { + pname = "zuul"; + ename = "zuul"; + version = "0.4.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/zuul-0.4.0.tar"; + sha256 = "1bm91g001q3n5m9ihxc719siiiy23pkpfkhplwi9p1i4i9zrpx5g"; + }; + packageRequires = [ emacs project ]; + meta = { + homepage = "https://elpa.gnu.org/packages/zuul.html"; + license = lib.licenses.free; + }; + }) {}; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 07ffad496c74..05b70b5728e3 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -135,21 +135,16 @@ license = lib.licenses.free; }; }) {}; - autothemer = callPackage ({ cl-lib ? null - , dash - , elpaBuild - , emacs - , fetchurl - , lib }: + autothemer = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "autothemer"; ename = "autothemer"; - version = "0.2.5"; + version = "0.2.14"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.5.tar"; - sha256 = "1g07j8fmyqhhas0ci2f9l7i5l238cpb02vr93gyn2a3r3lq6wn4d"; + url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.14.tar"; + sha256 = "14y8b807d75qym1qviiqy1s85495z9g7jvvfqqz42ngdnk87l3qb"; }; - packageRequires = [ cl-lib dash emacs ]; + packageRequires = [ dash emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/autothemer.html"; license = lib.licenses.free; @@ -219,10 +214,10 @@ elpaBuild { pname = "buttercup"; ename = "buttercup"; - version = "1.25"; + version = "1.26"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/buttercup-1.25.tar"; - sha256 = "1iadgn56sfakv927g9bk7fq7yjg0f3r10ygrmjpy46vgvfz0fqs6"; + url = "https://elpa.nongnu.org/nongnu/buttercup-1.26.tar"; + sha256 = "1ddzk6h4cxrl7mn8vr2qp4xjj2al3h5s3kwqxpdwd3zn6wqgyqm4"; }; packageRequires = [ emacs ]; meta = { @@ -245,16 +240,16 @@ license = lib.licenses.free; }; }) {}; - cdlatex = callPackage ({ auctex, elpaBuild, fetchurl, lib }: + cdlatex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "cdlatex"; ename = "cdlatex"; - version = "4.12"; + version = "4.14"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cdlatex-4.12.tar"; - sha256 = "1m8liqxz76r8f3b8hvyyn7kqgq0fkk5pv4pqgdscbgw36vpcbkry"; + url = "https://elpa.nongnu.org/nongnu/cdlatex-4.14.tar"; + sha256 = "114g2afnq86c6662ychd0v64aam7nhk3hacbwx1cavhg1k2l7kci"; }; - packageRequires = [ auctex ]; + packageRequires = []; meta = { homepage = "https://elpa.gnu.org/packages/cdlatex.html"; license = lib.licenses.free; @@ -273,10 +268,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cider-1.4.1.tar"; - sha256 = "0l36pqmjqzv6ykmw593h6qd24pygq7171qfinvlp2fh8897ac2nj"; + url = "https://elpa.nongnu.org/nongnu/cider-1.5.0.tar"; + sha256 = "0vggh2l92m8hm2wqzcyka439fs0kzbbfknfgyn79hf2f2f405534"; }; packageRequires = [ clojure-mode @@ -793,6 +788,21 @@ license = lib.licenses.free; }; }) {}; + focus = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "focus"; + ename = "focus"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/focus-1.0.0.tar"; + sha256 = "0gicqiw7npcf18rfb99hm1s054m9l4izzcqzij2kpnc544aqgf9y"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/focus.html"; + license = lib.licenses.free; + }; + }) {}; forth-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "forth-mode"; @@ -832,10 +842,10 @@ elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.24"; + version = "0.26.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-0.24.tar"; - sha256 = "14qnni8ridrg3afh1wy9nvchbk0drn0h7ww5xgc6s03ivvmy7a71"; + url = "https://elpa.nongnu.org/nongnu/geiser-0.26.1.tar"; + sha256 = "1fq68gvyyrplxw8i0yma4q0yqmrzp00v1v7izlc5r7h58wryy39a"; }; packageRequires = [ emacs project transient ]; meta = { @@ -922,10 +932,10 @@ elpaBuild { pname = "geiser-guile"; ename = "geiser-guile"; - version = "0.23.2"; + version = "0.26.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.23.2.tar"; - sha256 = "1z2khagg425y5cfja694zxrj3lyw3awsmqd86b2hpqhrylrb8jaa"; + url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.26.1.tar"; + sha256 = "1ay7v2qsl0kr9zvf6j1sss3gxniwrqp8xgxhxf7nhlkmkgcfp1wk"; }; packageRequires = [ emacs geiser ]; meta = { @@ -1123,10 +1133,10 @@ elpaBuild { pname = "gruvbox-theme"; ename = "gruvbox-theme"; - version = "1.27.0"; + version = "1.30.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/gruvbox-theme-1.27.0.tar"; - sha256 = "0p36b2rrhizfrj8i86zm810bh0w7qikb5cwpyn106yfvgcv39jl8"; + url = "https://elpa.nongnu.org/nongnu/gruvbox-theme-1.30.1.tar"; + sha256 = "19r3ffkyq779jjz0jvyxdf2zhm1yd1lax9sh0qsj1r5xrcmb15l7"; }; packageRequires = [ autothemer ]; meta = { @@ -1345,10 +1355,10 @@ elpaBuild { pname = "inf-ruby"; ename = "inf-ruby"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.6.1.tar"; - sha256 = "0z57wwpm7wh04yp7za8fmv4ib56np629kmk4djs8qaz5bv494znr"; + url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.6.2.tar"; + sha256 = "09p9pny4p0bfw6lw5pf17spyd77jb0pliapp3mfn7r3w8l8wi8xc"; }; packageRequires = [ emacs ]; meta = { @@ -1723,10 +1733,10 @@ elpaBuild { pname = "org-auto-tangle"; ename = "org-auto-tangle"; - version = "0.5.1"; + version = "0.6.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-auto-tangle-0.5.1.tar"; - sha256 = "12sy30yr8r3g7gmvcdsrrmy62lhvajg3gp62gj7p836kh9xllpsl"; + url = "https://elpa.nongnu.org/nongnu/org-auto-tangle-0.6.0.tar"; + sha256 = "07g1cwsr8j1sd8whshi9y2b69qx10g9vd77pmwki9ba4sy0m7b0p"; }; packageRequires = [ async emacs ]; meta = { @@ -1944,10 +1954,10 @@ elpaBuild { pname = "php-mode"; ename = "php-mode"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/php-mode-1.24.0.tar"; - sha256 = "158850zdmz5irjy6cjai1i8j7qs1vwp95a2dli9f341lbpv2jvzp"; + url = "https://elpa.nongnu.org/nongnu/php-mode-1.24.1.tar"; + sha256 = "0ixm7z2bq4aacbwyzx53alfnqwbdn36i5ixdi3qjhr8rh5k48vg1"; }; packageRequires = [ emacs ]; meta = { @@ -2338,10 +2348,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.0.7.tar"; - sha256 = "0js48yar8xgj3wjmlkv3k5208q1zvv74sg4lhk6asiy4cq3pqjia"; + url = "https://elpa.nongnu.org/nongnu/subed-1.0.8.tar"; + sha256 = "05dx4ywma7n73d0cihf4v8ayihm7gmfqpzvdycq4yk0zkxb958z1"; }; packageRequires = [ emacs ]; meta = { @@ -2614,10 +2624,10 @@ elpaBuild { pname = "web-mode"; ename = "web-mode"; - version = "17.2.3"; + version = "17.3.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/web-mode-17.2.3.tar"; - sha256 = "1fvkr3yvhx67wkcynid7xppaci3m1d5ggdaii3d4dfp57wwz5c13"; + url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.1.tar"; + sha256 = "0xlpxk9qscxip93lqyl1l5bzv6nxgq5yb8r05s4jslcipbbfil1d"; }; packageRequires = [ emacs ]; meta = { @@ -2712,10 +2722,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "17.19.20220806194323"; + version = "17.22.20220909110152"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.19.20220806194323.tar"; - sha256 = "1cflsvp1cpyr3zsj2dij3mc36lprwjdhrvxx2k8ilavhzi4dn64v"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.22.20220909110152.tar"; + sha256 = "1d8xkwcyd6dcxp926mwb8kgcpdqrcpmdv62ybdhx7izx0abia95y"; }; 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 48f2183fcb80..2d254503e8ab 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -1139,8 +1139,8 @@ "auto-complete", "rtags" ], - "commit": "c628efc9b485470a48aec2692d79f7c140bc5b92", - "sha256": "03avv7brbrj69368riq3xg4qh65yzl5cyjn9wc2rbyx4jw2q3p4p" + "commit": "b9c680e7ca003c103687e790f740d86daa6b4b17", + "sha256": "01f1vv71gimhsm6bzh0fxfmap54qs4wqnc5zj9barr9zvwpqmrbn" }, "stable": { "version": [ @@ -1846,8 +1846,8 @@ "deps": [ "markup-faces" ], - "commit": "e0d08ee6d29289a475796e22b2298b028c02b408", - "sha256": "1dp3av91rwq87vfgwpgi622imbv0z79znnfx0r6f5i06xn1ag5bv" + "commit": "00c59c8d952c92c547cb18ba57dff0f673866670", + "sha256": "1bs1kcdfkmhaajbrazj12qghgqv4m11jq0w6bpy8cahlpyhk4f4h" }, "stable": { "version": [ @@ -2008,11 +2008,11 @@ "repo": "Malabarba/aggressive-indent-mode", "unstable": { "version": [ - 20210701, - 2224 + 20220817, + 9 ], - "commit": "cb416faf61c46977c06cf9d99525b04dc109a33c", - "sha256": "1mlvdxs4jbxxfj57h2hc6yapgz4zzqj80k4psds116kpp0y2r5ja" + "commit": "70b3f0add29faff41e480e82930a231d88ee9ca7", + "sha256": "1wxr1z0w5lx5pk1lr7ycss38knar8vb655njlqidlhh1cwbw991v" }, "stable": { "version": [ @@ -2062,11 +2062,11 @@ "url": "https://bitbucket.org/agriggio/ahg", "unstable": { "version": [ - 20220529, - 1200 + 20220825, + 1006 ], - "commit": "d93cc73f79f6c29d533c468112181cd4c7b11935", - "sha256": "1jq411g0ryxkqw4wig6mlm0dpjzx87cw3x277bcj796s3nxl95ln" + "commit": "0e1bb428e1501155dba3f1cbcd789267263ba264", + "sha256": "0qavisfyaza5wsg6lksd85y4izy46lyz4vh7wk6m3y4bjxv6rbyn" } }, { @@ -2228,25 +2228,26 @@ "repo": "wlemuel/alarm-clock", "unstable": { "version": [ - 20191204, - 716 + 20220819, + 1538 ], "deps": [ "f" ], - "commit": "644f331071f8b09a898fae490541908b5054d2e6", - "sha256": "0yf2mikpxnfl673rv0w7xp1cvlkgvlmzgaixva3ppz6f0wg3vgz6" + "commit": "2ca4e5177d2ca9a21fa52f4b4b75711617d5424c", + "sha256": "08wdycs32krva7y9pbb24rj6srp4s302nlld5003idd5h5ds3xcv" }, "stable": { "version": [ 1, - 0 + 0, + 1 ], "deps": [ "f" ], - "commit": "2621d3a492d7f4e10a34d9d1d4af015df55a2b1b", - "sha256": "1l1q9hkip9yikvppxscf6vy6wls16ryhgyp1x8640v81xh1jy8jb" + "commit": "ec41b150ef5ecdd23e732ff41c14c4d6158bacf9", + "sha256": "11afq6lnlqdzbll015fx3031bslwfaz5362qgk2ipgqlk872559h" } }, { @@ -2371,16 +2372,16 @@ "repo": "jwiegley/alert", "unstable": { "version": [ - 20220808, - 510 + 20220818, + 1606 ], "deps": [ "cl-lib", "gntp", "log4e" ], - "commit": "fb92919739b35ec6e9e6db56ca7c10cf7ef1329d", - "sha256": "1yik54ksk1al4kb2m0nc1xmcz8333h45c5w9qfg1w23mfg52g11y" + "commit": "c39ce68ed8d80fb996fb78eafc06481a54bf27ce", + "sha256": "09qcql44d0pkmr4hnql4al269q2naxpybalkqq0zj3x5zbhy7zs0" }, "stable": { "version": [ @@ -2489,11 +2490,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20220801, - 1541 + 20220823, + 1719 ], - "commit": "6f876fa11ef64af20d9b2a44fdabac6446de51ba", - "sha256": "1n975ziy5wyfnmmpak1vsj7nqzm5ciw811pcg7rdmc2ljlc90n5p" + "commit": "4a4d6269b8b85b0b15954f063e6ce378630d80c0", + "sha256": "0y1dpxv8hha8pcxssayy0gaa7jd15ad0hwpmpixg164xzjn0cnb6" }, "stable": { "version": [ @@ -2641,15 +2642,15 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20220625, - 1332 + 20220810, + 2027 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "616a39f71484b15d21d89ca40cd174e0ca15b8f4", - "sha256": "0k3lg23jd83cav74rvpmwv3v7b7700ih4jgs2hilwszs8kq2kn5g" + "commit": "5b20fd336f248104a9ab1f8cb37c21d636ea2974", + "sha256": "1za64mbaaymasc6rxvvly417n3ar6ks412rx3xz2xnd2a088b2dp" }, "stable": { "version": [ @@ -2715,8 +2716,8 @@ 20220704, 644 ], - "commit": "cd007b1627afc450a30183da82e50d611afe6b8e", - "sha256": "19fw0ayfha9py11bn564knbi6yzf3cjvzn4pg183mk4lb8h3964h" + "commit": "6ba4b3cc6c7891adff408e58e9ed399d9effbea9", + "sha256": "1ziqc129n7pvmwpa4s14d2f7d0xs5b4hy3kajsbqdkvfjy1cd3ql" }, "stable": { "version": [ @@ -2988,10 +2989,10 @@ }, { "ename": "ancient-one-dark-theme", - "commit": "df6184184228dfdb0b0e4a770c30c67d05a9bf94", - "sha256": "064yiab7ll7nwls7p8cyh8glmzr4msmdhl4vvvy45ll5diyfbkfa", + "commit": "28c4d0f2fb9519f4d40eea0b11a0404fb8b6c9dd", + "sha256": "1rjchaq292x17w0l1zck6h0nl495nb7gwvzxr4hyjk0llkjkln0y", "fetcher": "github", - "repo": "holodata/ancient-one-dark-emacs", + "repo": "sigvt/ancient-one-dark-emacs", "unstable": { "version": [ 20211030, @@ -3009,11 +3010,14 @@ "repo": "fernando-jascovich/android-env.el", "unstable": { "version": [ - 20200722, - 1403 + 20220810, + 1449 ], - "commit": "5c6a6d9449f300eec4f374a5410edc1cbab02e40", - "sha256": "182b3fd85q3x5ynnfnjb01phhq1glf1wxj5rz8zx43ddnzz9ahmn" + "deps": [ + "s" + ], + "commit": "d2890f1156ed184314adbfcf01cdceb6ea79b10d", + "sha256": "1innx53w0vrsg6b7h4kiyy97kjjlcwx080h3hlrfrvnmmmawwfl5" } }, { @@ -3271,8 +3275,8 @@ 20200914, 644 ], - "commit": "5d2d77abbc0c97f5b23d7089797c3ef8796508dc", - "sha256": "1ayprcd7alryqz89p5gi3wawbc72210r7j8jw7naind7wwkjz386" + "commit": "b382d7d376fad3429940de2fa0d399519e172cfc", + "sha256": "1z3nlvpj5m51hb207niqhclsg8i2g138ynsng20ik8ifwm72a1bj" }, "stable": { "version": [ @@ -3627,8 +3631,8 @@ }, { "ename": "apel", - "commit": "4976446a8ae40980d502186615902fc05c15ec7c", - "sha256": "0zrm8m66p3aqr0108s3cj6z4xqbg2hx37z1pam4c65bqlhh74s8y", + "commit": "746947a065c8fd26bfb540c96d869d05a0bd9b53", + "sha256": "0cxd1k4xzv1dad402kkhng9k3rjhmiymdih4z4vsg0alngcrdndm", "fetcher": "github", "repo": "wanderlust/apel", "unstable": { @@ -3648,11 +3652,11 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20220620, - 2151 + 20220821, + 2221 ], - "commit": "12804a50206c708570104637472411288d6133f5", - "sha256": "1dw9d1xm1c1l528bbrm0gckg0qnn9364g37fi41mi10cg6fvi04c" + "commit": "04366a90dfc1063c4a22ea2e4ccaa48303a457e0", + "sha256": "15zkq1jwsmpapck5njm4dgb8nqpjacpsrbp4c51jmgggys75phcx" }, "stable": { "version": [ @@ -3808,11 +3812,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20220612, - 1555 + 20220817, + 235 ], - "commit": "17ec6fc0f43f7c0bcb970e2b71b8674891a464c7", - "sha256": "1w6y3j5r1ngjx08ymqkfp7xjlycrij9bmcnn6pw2jpih3zgzsyny" + "commit": "07265cc0122d3bde62615e8f5671e271598d95da", + "sha256": "18kdrnx264bf2k59b6355b1fbpqd02c5rjr9sfhafpgwg0265d6h" }, "stable": { "version": [ @@ -3942,8 +3946,8 @@ 20210511, 653 ], - "commit": "a93de7e8fef202163df4657f2ab522b57f70f202", - "sha256": "1jmwjz1ldr0lgh3vvpn8y6qzpqzavmdqcgf9jz4sx0v8nd5hr4pn" + "commit": "603f9f4d7d9cb37b005b8f10e5105636dc559217", + "sha256": "0qip4pcl0mdlymapvksg7853xmqs8v322d6wjk7p2vbh8vb1qp21" } }, { @@ -4067,15 +4071,15 @@ "repo": "slotThe/arxiv-citation", "unstable": { "version": [ - 20220706, - 706 + 20220816, + 542 ], "deps": [ "dash", "s" ], - "commit": "a10af07419b66559569362ea57d897d988c17760", - "sha256": "05109ci3nccisjrn1ycx642zdas126g4vfvszbafb758777x9a02" + "commit": "e41d5b90a00b79849cd2fd405b2af75a53b15abe", + "sha256": "1j5cgkiksmgl6slacs5q7wrzyd8bqh3q1yn0rivvfn2v2fxzd5fk" } }, { @@ -4274,20 +4278,20 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20220807, - 1541 + 20220820, + 530 ], - "commit": "6d164db151c4ab68242662342f71741b8594762f", - "sha256": "08njlpivli93jc8z5sklwas6m1mjizsn8m46dfsswwnxpsl3zsd7" + "commit": "73f825fd739875e4b8e10d47d497df402bbb61e7", + "sha256": "0rha8s43hx1angz37a80d38m9hlwwl900hy8cljfy2a4cx16h67r" }, "stable": { "version": [ 1, 9, - 4 + 6 ], - "commit": "67c369555de998eaabd60056dead038c6c50b8fd", - "sha256": "0hhpyxb3d531jb2f3wvzx25183f0anm8nxv6mh0p825q2gkm6ly7" + "commit": "370ead445f5d0fc21b7338e05a64830c410368a3", + "sha256": "1q480ss2jgijdpy6pa4xrjni9pf5q6dwf8hv052fhdpi55bmfdn2" } }, { @@ -4298,15 +4302,15 @@ "repo": "chuntaro/emacs-async-await", "unstable": { "version": [ - 20200117, - 828 + 20220825, + 946 ], "deps": [ "iter2", "promise" ], - "commit": "deef2bb343463f5196545f1dd8c2a32d0cb3b146", - "sha256": "0aav9qdswnw7ynqlzn0sm34as5fj2d85syxgg8zjabzp6646ay29" + "commit": "46cd65bdac59c85ce54e3bf3ce6ea2849a0331d4", + "sha256": "1x4i5rbp2srv7cwdm4nm7xkli56r9j7rdlbn5khp6fgaiwzldj6i" }, "stable": { "version": [ @@ -4379,8 +4383,8 @@ 20220704, 644 ], - "commit": "074183f5d4fe77c9b5f1d0c90287a41aaa3e5eff", - "sha256": "08dc48b4phwgll55qmc8ha8wakckpv7nraacnzlx589hbjd2dsvx" + "commit": "5ddd52c752fc60096ed3cf939d773b60f781e325", + "sha256": "0c7lybh5bz21yppjp9vx58vzg3swa0l267hv2pdli7l3cdczbkw6" }, "stable": { "version": [ @@ -4403,8 +4407,8 @@ 20220704, 644 ], - "commit": "14639839f5e206b315c800ab4dc09d2d1693fa0b", - "sha256": "0iry5q6vh0528npf50nxxvdv7hzfsb8sni83mnhk1nckldsbwv05" + "commit": "e5047b5fd68b540e2653aa5915da80c70201544d", + "sha256": "0ascwmiia56b24vshx9kcr54gk4vlz06gdajgjja7y9wj9cq2b1w" }, "stable": { "version": [ @@ -4495,8 +4499,8 @@ "repo": "jyp/attrap", "unstable": { "version": [ - 20220124, - 1253 + 20220822, + 1348 ], "deps": [ "dash", @@ -4504,8 +4508,8 @@ "flycheck", "s" ], - "commit": "19a520ecb99529790906a1fb5599acdf2b4f005f", - "sha256": "15jv6bng8xnkng005n1qbbg5lngjyq7mb5q6x3j77bkb3l8pnr9d" + "commit": "62fbd5f2665f0001f9c6a2dd0622edda7f4431da", + "sha256": "0b1vzhq5s10wifad7x1m5yiwrry9zwxqhpdvkkvyhbzdlf9c2668" }, "stable": { "version": [ @@ -4704,8 +4708,8 @@ "keytar", "s" ], - "commit": "c69176b476c9424a42d19ef8c200fcf2dc850749", - "sha256": "10wv8g2m4kvr3yj04v3rs6c65wcqy2n83ql362sn32kh4lp01g4l" + "commit": "1f38686e5818eba4d570ce3dec1e2130adc2a648", + "sha256": "0zl977a8rsqg4ka8nqnp9fwfh8q1v0lj4s1r62mhiw09gn06nh1k" }, "stable": { "version": [ @@ -4848,8 +4852,8 @@ "cl-lib", "popup" ], - "commit": "8f33bc4fecb653d48d70a4902078f9d493eb882f", - "sha256": "03vsf4n150bgvqsrk07pjzfh6g5hlzgn842mqa4nxlzy70xqqdzx" + "commit": "561e010b6b5e7df60e59309464d2793ef2c8cd40", + "sha256": "0dyb663ja5bdlla4a1dyzvqba5pq3g4dvx99698awnhnf2nxjdpr" }, "stable": { "version": [ @@ -5191,8 +5195,8 @@ "deps": [ "ht" ], - "commit": "616c1391646da49aa3b5a6034d0f8d6a987d5e8c", - "sha256": "1nw96894f4aylh4rljk15s0wfq0skmcj76b8hpmf3kf51jwq09bq" + "commit": "b0cf431f3020c91988cc807a7088b44354935539", + "sha256": "1f0wmxrs054ixkr506s02p9bbw0z1adggls20xwh8zjnwvc7718i" }, "stable": { "version": [ @@ -5341,8 +5345,8 @@ 20220704, 639 ], - "commit": "955a25bf371fe7edc7c1c5fdda0578731273c108", - "sha256": "00rz98vm2hr7vhqsfyz0fdp82vnq34cpnw8hgp02dv232amldlra" + "commit": "7e47763d127ccebcf58aa5fce5daf14260b5d55b", + "sha256": "0fjb171qz9jpsr3kjlhm38rxg196r2s4cwajmvbj7x9scfrmqnlq" }, "stable": { "version": [ @@ -5640,28 +5644,26 @@ "repo": "jasonm23/autothemer", "unstable": { "version": [ - 20220809, - 906 + 20220824, + 2009 ], "deps": [ - "cl-lib", "dash" ], - "commit": "3223cd8867fb75a109e41ccce98ab0e89d0a4f1b", - "sha256": "1rwz8hdmycmvak1w5sriwf1pwahham77vyab6jngdw8x9ngxabnx" + "commit": "378f8707bdd944f19b6fd4544359e993c9113752", + "sha256": "1p7ii7f0w607zxyqnr8ivi0n0sg2p93pi6dpd9kjqywdagqyrnw1" }, "stable": { "version": [ 0, 2, - 5 + 9 ], "deps": [ - "cl-lib", "dash" ], - "commit": "3223cd8867fb75a109e41ccce98ab0e89d0a4f1b", - "sha256": "1rwz8hdmycmvak1w5sriwf1pwahham77vyab6jngdw8x9ngxabnx" + "commit": "378f8707bdd944f19b6fd4544359e993c9113752", + "sha256": "1p7ii7f0w607zxyqnr8ivi0n0sg2p93pi6dpd9kjqywdagqyrnw1" } }, { @@ -6320,11 +6322,11 @@ "repo": "base16-project/base16-emacs", "unstable": { "version": [ - 20220725, - 353 + 20220821, + 127 ], - "commit": "36cd6ed044ee37e399fc5d0db8070ae79fb06800", - "sha256": "1v0i80iydmzrd8z1ri1dmg9bqj13xvr21lwvaqpq9jxh7iq1b9a8" + "commit": "d70a96152a3d2d66776012ec7e578f93d7c6aa2c", + "sha256": "0cn3pbsjyksi1a8hvvm1s3xyanbv5yw71l4ik349ilf7k9l7n23d" }, "stable": { "version": [ @@ -6424,14 +6426,14 @@ "repo": "dykstrom/basic-mode", "unstable": { "version": [ - 20210316, - 1253 + 20220823, + 1148 ], "deps": [ "seq" ], - "commit": "eaa5f24d2fb303d9e5d7de2a28c7c18b01532ab6", - "sha256": "1qvrf6mdrxzzd66888saddjrg5008rrgk0shg6vsyd39gk2bai22" + "commit": "8d7f66ba38d003d7ee6ff271482edfabf146963c", + "sha256": "0aq1rkd4bwzwfdbzv19m038akj91476l3d1wsmrndbqsnrpj7ngr" }, "stable": { "version": [ @@ -6788,14 +6790,11 @@ "repo": "Titan-C/cardano.el", "unstable": { "version": [ - 20220718, - 1440 + 20220810, + 1529 ], - "deps": [ - "dash" - ], - "commit": "40d04a0baf5c3d1087b18cc03595c573a1b5891d", - "sha256": "1z2kvv5im24h7hqmz2yhpar6d6cp4hzhzk6kxgrdrwgywpaf0bdx" + "commit": "5e1bf8b8ffa4c75bece7a93feab9858f0e7d676e", + "sha256": "0n2zf8pqaylrjy9w2qdir9hch7zhmrkcxnajnrbjswn1cwk8l2mm" } }, { @@ -6838,11 +6837,11 @@ "repo": "DamienCassou/beginend", "unstable": { "version": [ - 20220803, - 1431 + 20220824, + 1605 ], - "commit": "eb77d82dc88846c5715353b7fd99c9030a2e2ee7", - "sha256": "0xswh4wfrnwzwsrxmfsvfm1bcdviwfs2hhdark62l37s5xx6dcc9" + "commit": "d0aec04c05911a0d47b34625959e1950ead4e4bd", + "sha256": "17m0dv2z8yf3cnc9fbvxcbg6mbk9vycws38rw6x5b05dg4vpi1pf" }, "stable": { "version": [ @@ -7002,8 +7001,8 @@ 20220704, 645 ], - "commit": "9ec8cb24751784cc114263728d7565fd473facd7", - "sha256": "1dvl99px3y1wv275ygrm224kpnwaalfdxqwwkx4qbgb8lgmbmha7" + "commit": "6ca5c402757710eba2c20c382ea532aa10f054a2", + "sha256": "07rfq5ms5ddyc2nb1abcc0xc3yrwcjyzs3xxh96z2n57wbp45y8p" }, "stable": { "version": [ @@ -7387,8 +7386,8 @@ "bind-key", "key-chord" ], - "commit": "e5f64cc6d9d0df3721b319eeecca1f4f49ea86a3", - "sha256": "1108x07jf9cfgi5wyy18v0dr6vjpssl19032q9g0vci5mpi5k123" + "commit": "e2d173b1200865a9efd5c2066831a230497582c0", + "sha256": "1m5987l96xlpxz0aiczc1nifrsjh33z9z7biryb47khdgizhy931" }, "stable": { "version": [ @@ -7412,11 +7411,11 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20220809, - 42 + 20220815, + 1925 ], - "commit": "e5f64cc6d9d0df3721b319eeecca1f4f49ea86a3", - "sha256": "1108x07jf9cfgi5wyy18v0dr6vjpssl19032q9g0vci5mpi5k123" + "commit": "e2d173b1200865a9efd5c2066831a230497582c0", + "sha256": "1m5987l96xlpxz0aiczc1nifrsjh33z9z7biryb47khdgizhy931" }, "stable": { "version": [ @@ -8023,8 +8022,8 @@ "deps": [ "cl-lib" ], - "commit": "af929c164c4ffaee0c33ba97c06733f0ce9431d4", - "sha256": "0qq3a48650brpif3j8kwg9lm2bk5izv1bm9ff1mk7x0anjkcv1hy" + "commit": "449c17b5f25513398173f265b272fc1f9178a6e2", + "sha256": "15b4jc1zyv333llar95mq9hwim5izkvxz7jldz55y7d29jax92x6" }, "stable": { "version": [ @@ -8106,8 +8105,8 @@ "repo": "boogie-org/boogie-friends", "unstable": { "version": [ - 20220726, - 1637 + 20220815, + 1808 ], "deps": [ "cl-lib", @@ -8116,8 +8115,8 @@ "flycheck", "yasnippet" ], - "commit": "0a736ab6e9669e755141db5afefbfe8cd5df6961", - "sha256": "0mg5w8zvavw4g9iaivsbg1r42vzjjcbzq0zprwl0x09p8z23drga" + "commit": "986458f66a4f306e4697b71806c9a797940cf92c", + "sha256": "0pzrf6by8nkm4gy1vlramanxiwpxa4jhh6hfxdbmipmjwci1vkq9" } }, { @@ -8190,16 +8189,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20220502, - 1850 + 20220822, + 1348 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "db7b6083d390e3febf82f9af5782e1a36d30093c", - "sha256": "1i6wff18rlhdncm8qaz5zmrl4g5bl4h13yw9y635nlzzailmjjvj" + "commit": "ccf3e5c0c92f0f73d20f14cad0337e4cb0907a9b", + "sha256": "0b1dyi9l2cjqpkc22vv0r7bx5k2imv61zsq5dn93yzrz5sab4kg1" }, "stable": { "version": [ @@ -8223,15 +8222,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20220803, - 1958 + 20220812, + 1139 ], "deps": [ "epkg", "magit" ], - "commit": "47122b6559f4990c03e0b26d6e123e7f9f46525b", - "sha256": "00ihsfsinjy0cvgb64chixffv6afb5qj5sidq6699g79xpvdhp1i" + "commit": "d3cdc176ee72e3e3feac6dd6b527cff5dcf788eb", + "sha256": "0nw1vnw60h366a4i97gp2vjly2n4bvj5y645f6wqaabqxbglz463" }, "stable": { "version": [ @@ -8722,14 +8721,14 @@ "repo": "astoff/buffer-env", "unstable": { "version": [ - 20220728, - 1835 + 20220811, + 1159 ], "deps": [ "compat" ], - "commit": "7c176d043445ea94fe924a715158c25b91ec4776", - "sha256": "0badxbj4whqcz8pkwzhp2fxppgcfqrrf0cciwnxy1nyamcrf0y7z" + "commit": "9ccfbd07c4b2e2af38fe315ce7e3d905298d2fdd", + "sha256": "1hsf5r96pd3j4s90xym3dkrsnxqg8pwlmrj93p0xvdr493gms2a4" } }, { @@ -8849,20 +8848,20 @@ }, { "ename": "buffer-sets", - "commit": "61d07bbe7201fc991c7ab7ee6299a89d63ddb5e5", - "sha256": "1xj9fn2x4kbx8kp999wvz1j68znp7j81zl6rnbaipbx7hjpqrsin", + "commit": "1fb027a2f96f47ca0f06d78e37049042fe56b413", + "sha256": "0i66zjk6krr9i8y7day535yaa996ipj73lfsiibhv0nz2xzknpjy", "fetcher": "git", - "url": "https://git.flintfam.org/swf-projects/buffer-sets.git", + "url": "https://git.sr.ht/~swflint/buffer-sets", "unstable": { "version": [ - 20170718, - 340 + 20220821, + 1413 ], "deps": [ "cl-lib" ], - "commit": "bc84c2f79a33609cccf3c996101125859b2e26ab", - "sha256": "0xw3fs8v3ciw0kvdb2nvs4wk5fjpl012hisv9ypx0nhszzyggrs6" + "commit": "d0e4c86960d0a36cabdc34d860722fd304646a88", + "sha256": "03c3msy03130glqg1mxcrj1acy6cgvmz8931p2970i5zn3sys7yc" } }, { @@ -8930,8 +8929,8 @@ 20220704, 646 ], - "commit": "8be8508ad5570b1487d9d2fc1b5aa71558f2d0f5", - "sha256": "19k4xxalcirxis6s8gci9hyp8l6vw1dx9z31nnvihb3yd932816i" + "commit": "b0c18216904581d6223e76626821a266355830da", + "sha256": "1l7rdx7q13v6l1x5brw28whv546hr3k1hqhhrf9qdxygwwyib42d" }, "stable": { "version": [ @@ -9329,19 +9328,19 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20220629, - 2119 + 20220814, + 2150 ], - "commit": "62176a39ee6aa990c96e97c13ee4992355f0a122", - "sha256": "0j9qaa45r14kyqv44jhnygc03xzvw2k7rfaai99v7xl6a6aj4p8k" + "commit": "e2b77ac49cc61c32566f22b84ba304a5703ff7b3", + "sha256": "1xymh8nywhb00ylggjfmad1vxqrzw59mzxhd0jhy5c9z8qsvms44" }, "stable": { "version": [ 1, - 25 + 26 ], - "commit": "ba62f80555d46faf49dc451c0ad20f39f6a170ab", - "sha256": "0fsysvsypda6b7azc15bpaprq3bwx4gb6rlq2mj6f8rgwdqc8153" + "commit": "9022546ebf2f492e9f3ce92e02ed893bcecab027", + "sha256": "1zr9lczdr9dfh99n079d5advxm9p32a8f984dx14f3jn5mx750b1" } }, { @@ -9670,6 +9669,21 @@ "sha256": "04yg0rf6i95s913hs6zn01rajpbc1gk2hcpzkxyjy3mj1lqhh45s" } }, + { + "ename": "calc-prog-utils", + "commit": "bd54f7a1085278bfda388607096917c80095349c", + "sha256": "0pihlnh74rclp9qjz1nsf9cgcj3glp4vkbvr2gz48sf83yaa7379", + "fetcher": "github", + "repo": "Jesse-Millwood/calc-prog-utils", + "unstable": { + "version": [ + 20220820, + 1855 + ], + "commit": "190acfda56660a2d75df2d9eac5b14edaccccd80", + "sha256": "0p2wl4c5rqr7hfwzb22hx8mj6c2wbk9rlzm41h8h4z8qqhfvv2lr" + } + }, { "ename": "calendar-norway", "commit": "c5d01230027d5cec9da2545a9ce9270a611f6567", @@ -10010,11 +10024,11 @@ "repo": "minad/cape", "unstable": { "version": [ - 20220804, - 2211 + 20220819, + 1710 ], - "commit": "ab2f4ec9ec778d256c7e4b3490ecd50269c422f0", - "sha256": "1ivhf9xvhxz8k53fk2m03s4967hcyghacgrbg7sc0mywhdf0ba1f" + "commit": "f360464007386b36952b4c3ba0a977f056d0ee19", + "sha256": "1chf8yqpi4hjd98gm27gzx72j7grhy7zf447cynhphl1lvp9fa96" }, "stable": { "version": [ @@ -10036,8 +10050,8 @@ 20210707, 2310 ], - "commit": "a41bf576b2d4f27696e9366e69072359138612c2", - "sha256": "03ag1lzclyx0khz5cai4x1a0zqkllp1xmhgyfj27lla8qr18y8vg" + "commit": "577e258e754426ffb731af139de745bce8b44312", + "sha256": "0bqcxa4hqfr9a5am0bmb0ixna50009n3gm3zhhq6ngiassqr2dwy" }, "stable": { "version": [ @@ -10102,8 +10116,8 @@ "yaml-mode", "yasnippet" ], - "commit": "40d04a0baf5c3d1087b18cc03595c573a1b5891d", - "sha256": "1z2kvv5im24h7hqmz2yhpar6d6cp4hzhzk6kxgrdrwgywpaf0bdx" + "commit": "5e1bf8b8ffa4c75bece7a93feab9858f0e7d676e", + "sha256": "0n2zf8pqaylrjy9w2qdir9hch7zhmrkcxnajnrbjswn1cwk8l2mm" } }, { @@ -10124,8 +10138,8 @@ "yaml", "yaml-mode" ], - "commit": "40d04a0baf5c3d1087b18cc03595c573a1b5891d", - "sha256": "1z2kvv5im24h7hqmz2yhpar6d6cp4hzhzk6kxgrdrwgywpaf0bdx" + "commit": "5e1bf8b8ffa4c75bece7a93feab9858f0e7d676e", + "sha256": "0n2zf8pqaylrjy9w2qdir9hch7zhmrkcxnajnrbjswn1cwk8l2mm" } }, { @@ -10467,14 +10481,14 @@ "repo": "Titan-C/cardano.el", "unstable": { "version": [ - 20220802, - 1008 + 20220810, + 1600 ], "deps": [ "dash" ], - "commit": "40d04a0baf5c3d1087b18cc03595c573a1b5891d", - "sha256": "1z2kvv5im24h7hqmz2yhpar6d6cp4hzhzk6kxgrdrwgywpaf0bdx" + "commit": "5e1bf8b8ffa4c75bece7a93feab9858f0e7d676e", + "sha256": "0n2zf8pqaylrjy9w2qdir9hch7zhmrkcxnajnrbjswn1cwk8l2mm" } }, { @@ -10564,11 +10578,11 @@ "repo": "cdominik/cdlatex", "unstable": { "version": [ - 20220808, - 1414 + 20220823, + 747 ], - "commit": "6fc8a1f2949b1b58b2ef9a56b3417490f1ca3b61", - "sha256": "1364prn41fypbr7j985mpbdr0ra4p8niwmrc5xi2s6sr367a2dki" + "commit": "6f734db8ab87f11dffb77c33a445140baeb723c4", + "sha256": "0pcfv8vhqxpcwmbsyvhy08dk4cbj4kzz05c2c9pfnkbbakxfalvk" }, "stable": { "version": [ @@ -10846,8 +10860,8 @@ 20171115, 2108 ], - "commit": "72e8af1887116a7ee609b1d5f24ecd459388349f", - "sha256": "1j9zf96mlk5yw8xcc0inkxcqwn6iyhvp169di05y3i87qdwv3wmr" + "commit": "c854fca2bef6929487f5dc828d6a08529f69f47a", + "sha256": "0ki9zhssxk1gih9ndndrp8gzg2fmnz1gc94ys65b9cn6y0qyycgf" }, "stable": { "version": [ @@ -11002,8 +11016,8 @@ 20220318, 1007 ], - "commit": "2b930905c23f1cd2fcf3ecad558fde5b708ea1a8", - "sha256": "0rjaj1y2nax40j41b8wz32lx0znhr1vvx6x9cf477c8rd9sbfxhj" + "commit": "86e04b7182b1205769b03281e56d4f2d53e9fee9", + "sha256": "1lc3w8qr79l314v17q3z2lqg3isa49rf51ijbb7fldmzzdzn303s" }, "stable": { "version": [ @@ -11680,8 +11694,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20220808, - 1329 + 20220824, + 759 ], "deps": [ "clojure-mode", @@ -11691,14 +11705,14 @@ "sesman", "spinner" ], - "commit": "9577dbbdae8cffe023442427b97f963b4447983a", - "sha256": "01f1is17zkz2gzgf8bpismxk5050syk7yacfyp9ihln27h1hlb4f" + "commit": "5bba4856fb42636bd52d1a1ebb4997a8806df759", + "sha256": "0v45bj46y0y8v3mi69zak827qpxhhci7ij72nr6p3ij4h24m7980" }, "stable": { "version": [ 1, - 4, - 1 + 5, + 0 ], "deps": [ "clojure-mode", @@ -11708,8 +11722,8 @@ "sesman", "spinner" ], - "commit": "11156e7b0cab470f4aab39d3af5ee3cb1e0b09d0", - "sha256": "08635ln514nrglx6qyhaq1x7y7lw4mcd659ba8zs071yjiariarm" + "commit": "700ded1d6c245e01fca7f364db1561ad1e1bb595", + "sha256": "1ih902n8p3pl1apprprkyrlnrp2dxli86y5k09zahy9mglfz2z5n" } }, { @@ -11990,16 +12004,16 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20220809, - 1305 + 20220820, + 1409 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "9d7088c1fe82e9cfa508ead7ef7738c732556644", - "sha256": "1n69lkp7298gasm9hlbx9nhgp9ggh8w8ffyvi1rmbj96lcnpsyi9" + "commit": "731c0ae81aecca94f7dcc4f2dad51a0cd1c3de68", + "sha256": "0ng128j689h6q2hqfizrcnj5b927br363qajnqg2n194s5k997zc" }, "stable": { "version": [ @@ -12030,8 +12044,8 @@ "citar", "embark" ], - "commit": "9d7088c1fe82e9cfa508ead7ef7738c732556644", - "sha256": "1n69lkp7298gasm9hlbx9nhgp9ggh8w8ffyvi1rmbj96lcnpsyi9" + "commit": "731c0ae81aecca94f7dcc4f2dad51a0cd1c3de68", + "sha256": "0ng128j689h6q2hqfizrcnj5b927br363qajnqg2n194s5k997zc" }, "stable": { "version": [ @@ -12046,6 +12060,37 @@ "sha256": "1n69lkp7298gasm9hlbx9nhgp9ggh8w8ffyvi1rmbj96lcnpsyi9" } }, + { + "ename": "citar-org-roam", + "commit": "87aefd56251d20a2a832d27e3170a3e39e39870d", + "sha256": "0pxpag791kgyd4hs0jf1dyrc88dhln1303x3san0j55kfmr5hdrs", + "fetcher": "github", + "repo": "emacs-citar/citar-org-roam", + "unstable": { + "version": [ + 20220815, + 114 + ], + "deps": [ + "citar", + "org-roam" + ], + "commit": "4325e648c228269e519c322d696846a6c1f42f99", + "sha256": "0rr5sbl1fcd286h4vbg1b3q1r74l26670bhdx0pialr7rxp67i57" + }, + "stable": { + "version": [ + 0, + 3 + ], + "deps": [ + "citar", + "org-roam" + ], + "commit": "0ad9639d133011d9d94cdd0496d38f5aa88f2881", + "sha256": "1ldfs7g7ixnrwj23draiph4vy6xq7qgw18vhi7vbw6wvkh9fcv9r" + } + }, { "ename": "citeproc", "commit": "20aa56e9a4809cee1082224b1b4e65921a48bda1", @@ -12054,8 +12099,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20220717, - 729 + 20220816, + 1732 ], "deps": [ "dash", @@ -12066,8 +12111,8 @@ "s", "string-inflection" ], - "commit": "406bd9964f1ce531fc45beddcf9ccc44d3456129", - "sha256": "0rkwqn9pcimfcyq19wlrcij0kcjyhbwisla7vwbhjj8ang0bq9rm" + "commit": "36c4ecdc485a2f264297bb60f82c0afe1a1d64d3", + "sha256": "1wcwm6cwmy7zxf9s841q6y3nz11a55ymvbgmp8cd8j24aydn3qpn" }, "stable": { "version": [ @@ -12530,8 +12575,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20220729, - 543 + 20220821, + 1956 ], "deps": [ "cider", @@ -12544,14 +12589,14 @@ "seq", "yasnippet" ], - "commit": "1bd7b09976c05ebd1ff1ee3d5c882af303780b67", - "sha256": "0ygq2s9g63lk8v5m4mbkf2411li656wlq9nisadmhlahxk1vs26x" + "commit": "cd97626fd952f824564808a2f21b40bfcb59ff0f", + "sha256": "1bvy3s953qlca9k8pvd1npl5nbpsbzbp8y41k3h6w588hjdwarsi" }, "stable": { "version": [ 3, 5, - 5 + 6 ], "deps": [ "cider", @@ -12564,8 +12609,8 @@ "seq", "yasnippet" ], - "commit": "1bd7b09976c05ebd1ff1ee3d5c882af303780b67", - "sha256": "0ygq2s9g63lk8v5m4mbkf2411li656wlq9nisadmhlahxk1vs26x" + "commit": "cd97626fd952f824564808a2f21b40bfcb59ff0f", + "sha256": "1bvy3s953qlca9k8pvd1npl5nbpsbzbp8y41k3h6w588hjdwarsi" } }, { @@ -12844,11 +12889,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20220729, - 2246 + 20220824, + 1801 ], - "commit": "ad322e989e56c10c05bb286e5b55a82b1e031d62", - "sha256": "12m3yjhy4q0x3ri4xxb9raqg9lmw4hk4jgn436d9zvsk4fr3h1nd" + "commit": "52f3e1f981af2adb007ddbf178c9e5625fdc63b6", + "sha256": "0qh3k62v3wh9sv666pjm4v4skwmsz2130sqglkmvjf3c6rwj0z5r" }, "stable": { "version": [ @@ -12874,8 +12919,8 @@ "deps": [ "clojure-mode" ], - "commit": "ad322e989e56c10c05bb286e5b55a82b1e031d62", - "sha256": "12m3yjhy4q0x3ri4xxb9raqg9lmw4hk4jgn436d9zvsk4fr3h1nd" + "commit": "52f3e1f981af2adb007ddbf178c9e5625fdc63b6", + "sha256": "0qh3k62v3wh9sv666pjm4v4skwmsz2130sqglkmvjf3c6rwj0z5r" }, "stable": { "version": [ @@ -12995,15 +13040,15 @@ "repo": "emacscollective/closql", "unstable": { "version": [ - 20220422, - 1601 + 20220821, + 1814 ], "deps": [ "compat", "emacsql-sqlite" ], - "commit": "87d2edae8bc3d390bcfc5e909e9c13ff9fce994a", - "sha256": "1grxpxrjzziqad840cw5ivp4xym0p3y0p3jwrf1j4dkbp670c75d" + "commit": "46b3020acf6655fd8abb4ef60e090629ee33e8c3", + "sha256": "1zgn8mg9l7nymc72bii2677lwin63x15avssz47w04j0g3ii6dwz" }, "stable": { "version": [ @@ -13176,20 +13221,20 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20220617, - 1532 + 20220823, + 1201 ], - "commit": "f7a13beaa4e7ef262004e37997ffc5d856fc26f2", - "sha256": "0ni5y55h6d6mfa23hkicvkrrk8axh9577w1ipm1zmbrc70ln2rd0" + "commit": "9d1ecd72fb45af722da7668d0c7482b7a0b1876f", + "sha256": "07a9lj4bklndkg96b2l6a0s8918qgnaxdhn9hn1la83gmhy12183" }, "stable": { "version": [ 3, 24, - 0 + 1 ], - "commit": "4be24f031a4829db75b85062cc67125035d8831e", - "sha256": "1ylp6i2q9lkhcl5kng3sl48dqb4ci1fvl2sj89jm1q4sq0xyl8vf" + "commit": "c3793b41573ee584e572ea546527b9350f46a05d", + "sha256": "1sq08rxldwv6wq203b5fp3za31fg0ql1qsirqlm0ffsclgvw3za8" } }, { @@ -13475,6 +13520,29 @@ "sha256": "1xdkm1f04z1h3ivd6zm8hckf3n3fbi5rwybg4dwi5mim6w84i7j9" } }, + { + "ename": "codespaces", + "commit": "385b9c079904e3548dc9ecaf6daf78cd737349fd", + "sha256": "0iln27y69zz7d9ls5ddbhh8jax3spjg3pfclpajwfgwncwkl8qgz", + "fetcher": "github", + "repo": "patrickt/codespaces.el", + "unstable": { + "version": [ + 20220824, + 1816 + ], + "commit": "43cf115189b27c7b348b8bb22ef74160d2c942e7", + "sha256": "0kw9w8viizb4dmmd21ajpldaxp63hqcradgv1y6qh358q42p2cqd" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "c4757e73e845895e8368fe621fa2bb2bd5a6d49c", + "sha256": "0yg2v8q7w5siyrq5jfsdjm8a4jx9mqlqyw6k69snsj95kzgj11g6" + } + }, { "ename": "codic", "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", @@ -13842,8 +13910,8 @@ "deps": [ "s" ], - "commit": "bda336544e61b45e24927d8850fdb28d4b7c267e", - "sha256": "1w4chg2d152sr82mqkxiibf06qh1fbxylzd5asjx9712gy33fy69" + "commit": "f54c2ba98d4e73d5504152ae8d61071ed467e39f", + "sha256": "1zci73gmzyl3x6rb733b0lxzdzvqsyc60jwza9by8jr7ma6v3c0p" }, "stable": { "version": [ @@ -14177,11 +14245,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20220731, - 2333 + 20220825, + 1044 ], - "commit": "f1877a370ca76d5cd6614c527635b2d6983188af", - "sha256": "1nis7561w9lbis3bz84is40fychg1gz3i9q3m2h0ml1x0m4ss6lh" + "commit": "35408c0ac3a730908fbce0810f8d159eb353c1d5", + "sha256": "0chh9zbb7hj64lx2sb7bid2wbyk4qaadkzghslfqybxmsdsizyik" }, "stable": { "version": [ @@ -14635,8 +14703,8 @@ "emojify", "ht" ], - "commit": "cc3ae96fbafa51d71fde802fa3c1e5fad9402158", - "sha256": "0hw2pzg1prcjysrxrki0qsfzfqr0gp0mh606lakr33hzkib447xx" + "commit": "f877614d3395ba3f2a678b50d79bac6d392c2d2b", + "sha256": "1lz7dvkfw5667v2xkak00d3d47dr6dm2jz2hamr8rpw2jh3svpqi" }, "stable": { "version": [ @@ -14739,8 +14807,8 @@ "ht", "s" ], - "commit": "91b76fc475f7eb17a0ae8b94a42625dfb546cc01", - "sha256": "1yabv0g07xpj1kfm95ygxa21zgq8r0lq0iyavdv9s56q1aiwpkpq" + "commit": "7b54f88d2241073986b0e3d109012ee396cfdb3f", + "sha256": "070ysb9cwp6rfash85d633h8ig1rmwdd7x7a4vwrhzhlggidy34l" }, "stable": { "version": [ @@ -15092,8 +15160,8 @@ "maxima", "seq" ], - "commit": "1334f44725bd80a265de858d652f3fde4ae401fa", - "sha256": "1h1lqrl3p9qgkicds8v44vdry19g53rya56hdj3cz5q8xj1nisn1" + "commit": "1913ee496bb09430e85f76dfadf8ba4d4f95420f", + "sha256": "1milqql0p9gp4dn9phn4fw1izf37wizpirvmzh5s71rwzrr6a9ix" }, "stable": { "version": [ @@ -15249,8 +15317,8 @@ "company", "org" ], - "commit": "29a2edb35e18c2627dcfa0641852a55d9639263c", - "sha256": "14qvxypgc1cj6ijvkkybl7x5p00435v4rdaw7pvvlf58lc422492" + "commit": "4d96750beba7f90478dbf5f4d52eb9c21d538f4a", + "sha256": "0k3zhy2173wr8j8m92zik150qiq5y9cd12hpbfrkksybgdpmmaf1" } }, { @@ -15486,15 +15554,15 @@ "repo": "company-mode/company-quickhelp", "unstable": { "version": [ - 20211115, - 1335 + 20220825, + 1037 ], "deps": [ "company", "pos-tip" ], - "commit": "3ca2708b4e5190205aca01d65fe1b391963a53f9", - "sha256": "120kvdrzbxs7idrqwz8rz59ic3ymq1b586l0qi27y7bdy2pg6njw" + "commit": "6660a1b380b9599af9ef1cc617168db83f24b9b7", + "sha256": "175zw6jnkr6cf3nl9gvyjj69pzv4w1p19gjid9dkhqy38wyslkr9" }, "stable": { "version": [ @@ -15525,8 +15593,8 @@ "company-quickhelp", "popup" ], - "commit": "70c8a979d82e436dca8595e3ec049c733246f338", - "sha256": "1ym333y58b7xadxcf4p3aj8p3yns98q4w20xv3nz2vn58j5ha7ym" + "commit": "4968de67d0db8ddae29a03719b31f1be0434cb9f", + "sha256": "1i9wwgjsh4akhss924lc0fh776zr2c5ha7ipqka8i0by135mysfh" }, "stable": { "version": [ @@ -15632,8 +15700,8 @@ "company", "rtags" ], - "commit": "c628efc9b485470a48aec2692d79f7c140bc5b92", - "sha256": "03avv7brbrj69368riq3xg4qh65yzl5cyjn9wc2rbyx4jw2q3p4p" + "commit": "b9c680e7ca003c103687e790f740d86daa6b4b17", + "sha256": "01f1vv71gimhsm6bzh0fxfmap54qs4wqnc5zj9barr9zvwpqmrbn" }, "stable": { "version": [ @@ -15656,30 +15724,29 @@ "repo": "Alexander-Miller/company-shell", "unstable": { "version": [ - 20211013, - 1725 + 20220822, + 2014 ], "deps": [ "cl-lib", "company", "dash" ], - "commit": "a77f4de75912aa87314cde92c603b831d5050246", - "sha256": "1mh93l6xn9frfvw86vbvs1fz544c7ylja118iaccfl42gr2ypsw9" + "commit": "024c2172a0cc8f1b35f173e42fff5f2d938920fc", + "sha256": "06nfq2va9vwf5wiqdfrjziv3hjkj36w8p91bicfb92ggv1afg9ra" }, "stable": { "version": [ 1, - 2, - 1 + 3 ], "deps": [ "cl-lib", "company", "dash" ], - "commit": "acdbf8cba6ad9831d81a77bab7bbfd50f19edd86", - "sha256": "1dk927da7g4a39sva9bda978bx6hpiz5kf341fj8sb7xhryvh5r2" + "commit": "024c2172a0cc8f1b35f173e42fff5f2d938920fc", + "sha256": "06nfq2va9vwf5wiqdfrjziv3hjkj36w8p91bicfb92ggv1afg9ra" } }, { @@ -16221,8 +16288,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20220724, - 1857 + 20220814, + 1919 ], "deps": [ "dash", @@ -16230,8 +16297,8 @@ "pythonic", "s" ], - "commit": "a65ed0084876366fd1b238bb2b8b36ee75ac98d8", - "sha256": "0w4fb615019w8bav5v67a5y6rb4bs2fbh3kggs3pya96ncr475cr" + "commit": "e7f7e72cc058318b9c11499c38c3b0125322e6d6", + "sha256": "1vqgqap06zaspl0wy30fn1mxf6g181b6isp59nidbackksn8z6fc" }, "stable": { "version": [ @@ -16391,8 +16458,8 @@ "deps": [ "compat" ], - "commit": "e4546edb6f1268c4a13ac3dd1dec8c9b28d7df51", - "sha256": "0i5s6hndk7d45fl2idmbqrrddaf1vjcg2qvycm9gs6f568ld1s0m" + "commit": "90536f39db3bd9085971998308ee42176613d68f", + "sha256": "071dp9dj0xrjbk13mrss1h3as4x04i6lf0cnw1kq3ckaihjw0lar" }, "stable": { "version": [ @@ -16671,6 +16738,26 @@ "sha256": "14dyclspkf1a34nvjj800ckz1phsizq07ps8k4x0ah6ik0hfhy1w" } }, + { + "ename": "consult-notes", + "commit": "bd01544509dfe92d007d1edd47cfff0686a057f5", + "sha256": "0s13l1xdbihyp48k9nkflfw257q008imhv2zpfa86g9j04n4h0rz", + "fetcher": "github", + "repo": "mclear-tools/consult-notes", + "unstable": { + "version": [ + 20220822, + 158 + ], + "deps": [ + "consult", + "dash", + "s" + ], + "commit": "fd4091dd3655fdbbbb3fa15cfa96babe17c8b8b5", + "sha256": "0q8hg6290gxchqwic4290jnkhg9pd03pd8gj6fxi9n7k72rx418i" + } + }, { "ename": "consult-notmuch", "commit": "e61a3f8cba4e5e303379f80c9fdd773fdde66406", @@ -16778,26 +16865,25 @@ "url": "https://codeberg.org/jao/consult-recoll.git", "unstable": { "version": [ - 20220808, - 9 + 20220823, + 1338 ], "deps": [ "consult" ], - "commit": "2bd1ed98b23c2b72617fcef11aba7eb969b94ffa", - "sha256": "185crk09jyv2hxkkc3xl9fny9w4aa3nnnma1rrwp5lkm6ypr0j03" + "commit": "b3724c704b0d7d942c095dedd9e0ce064a8847c9", + "sha256": "1f6lmx2brp47f0rqxjpbw3acr9zz3liwp3y68sqq80flssy10msw" }, "stable": { "version": [ 0, - 6, - 2 + 7 ], "deps": [ "consult" ], - "commit": "8299efb610178a73ea809de74f87d724ee6183d6", - "sha256": "0k0796sqqbl66s8i8i6icdqj21xghjphsibkakp2nwy65cn5snx7" + "commit": "714810486a13bb6adba5be0eaaca7eabe3298927", + "sha256": "0353j98ql2nzwq1ffx721b9qv1jgxljx2z3h3z7hyygkc7r95q07" } }, { @@ -17452,14 +17538,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20220728, - 1351 + 20220825, + 259 ], "deps": [ "counsel" ], - "commit": "b109dff190db6706e32ad08deb64b77fc8ad75c7", - "sha256": "0qgdhqwhw4pf2aclb602p0hirym28fh38ykmdnhzang2027l16p5" + "commit": "e38b12771183fd43fb94c9fa562b20b5efeefc1b", + "sha256": "0r4mq4kxbj2kfg3nwni0canp1nvzl7j9jvpi523bj0apfrab1p9v" }, "stable": { "version": [ @@ -18089,26 +18175,26 @@ "repo": "emacsfodder/emacs-theme-creamsody", "unstable": { "version": [ - 20220808, - 518 + 20220819, + 754 ], "deps": [ "autothemer" ], - "commit": "f7155dd7a9f53050fcfcaadbec5e0d3511d8c33c", - "sha256": "1kk3iis4h26xmrsw579yzz4ici53ci5khysxkp4afi5rc8frz6x9" + "commit": "0823101e9886cc31cc48f2d79f354a4fd2c2b9f3", + "sha256": "0z81b1xgyalkws9l4dqncmssm98n8c3rzbkhcxisfhv65qpyzci0" }, "stable": { "version": [ + 1, 0, - 3, - 16 + 5 ], "deps": [ "autothemer" ], - "commit": "f7155dd7a9f53050fcfcaadbec5e0d3511d8c33c", - "sha256": "1kk3iis4h26xmrsw579yzz4ici53ci5khysxkp4afi5rc8frz6x9" + "commit": "cc16c7ce5d733c5e77ea67342dc655ab8f920684", + "sha256": "0wzp3qlahkxic924sslaj8v9npqcjcw3ff87mr0d697z2g1kbwdh" } }, { @@ -18427,11 +18513,11 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20220704, - 1242 + 20220819, + 1351 ], - "commit": "396b5e9b32bb58c9f984a03f5075455af87f7307", - "sha256": "07arvkrmg86kzyxyxzmxarb46g2l94q5inzhp4r05xaxhz6jqfp4" + "commit": "6e9d1f6b9900d3b8aa4106abf84a89311dfed85f", + "sha256": "1shyv3lkilbglqlg0mzaz9aslx3xg9gjp63phdvhsgafvwzpi254" }, "stable": { "version": [ @@ -18866,20 +18952,20 @@ "repo": "russell/cue-mode", "unstable": { "version": [ - 20220809, - 1942 + 20220811, + 1938 ], - "commit": "ebc50a881c6fbce429b0ec6bef8ea91a8310cf46", - "sha256": "1n8fx8xkyw9aq8hy02wdm7qdfmv5qj4cq5xdp9vniak3x5r3gwwp" + "commit": "31c671d56e7884fa87ad0f1d27d0bb439dc65380", + "sha256": "19f71kwdpv5zrzl96wyc9w516cq1naigvyv7g3n7093yzmgwyj4w" }, "stable": { "version": [ 1, 0, - 10 + 11 ], - "commit": "ebc50a881c6fbce429b0ec6bef8ea91a8310cf46", - "sha256": "1n8fx8xkyw9aq8hy02wdm7qdfmv5qj4cq5xdp9vniak3x5r3gwwp" + "commit": "31c671d56e7884fa87ad0f1d27d0bb439dc65380", + "sha256": "19f71kwdpv5zrzl96wyc9w516cq1naigvyv7g3n7093yzmgwyj4w" } }, { @@ -19011,6 +19097,36 @@ "sha256": "0507acyr9h4646scx316niq27vir6hl2gsgz7wdbiw0cb2drfkd1" } }, + { + "ename": "cyanometric-theme", + "commit": "a7162105818602f33eb929d0b598272ae1c638ae", + "sha256": "0jx3v8n64i7nag8ax3szfs3w537vpzrdqwqsz52v85cmll15n3b0", + "fetcher": "github", + "repo": "emacsfodder/emacs-theme-cyanometric", + "unstable": { + "version": [ + 20220822, + 301 + ], + "deps": [ + "autothemer" + ], + "commit": "9b20e33a8cc2c76bfe6ad45916be6881386707f5", + "sha256": "0hhwm9dwzf7dqzacxppgq0c64abjn29h0lyf620q40wvhq79qkwj" + }, + "stable": { + "version": [ + 1, + 0, + 2 + ], + "deps": [ + "autothemer" + ], + "commit": "9b20e33a8cc2c76bfe6ad45916be6881386707f5", + "sha256": "0hhwm9dwzf7dqzacxppgq0c64abjn29h0lyf620q40wvhq79qkwj" + } + }, { "ename": "cyberpunk-2019-theme", "commit": "1821a436d3d9f7c46cbd198f93951aa35bbf6ad7", @@ -19165,8 +19281,8 @@ 20211111, 1407 ], - "commit": "b721a96d13b43f7018ed6f697715e829d0e5a9af", - "sha256": "0k19shxpnx4gn34qns83jpdcp1amgrchbcjydx87zrabb1zhbapg" + "commit": "3424926e9c8f03061b55516d2516a9f98999399e", + "sha256": "15rr4vc241ckg75klf0spwhfn9ws9n0q0ybv5wai8i56sk5nmhxk" }, "stable": { "version": [ @@ -19373,8 +19489,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20220802, - 617 + 20220824, + 623 ], "deps": [ "bui", @@ -19387,8 +19503,8 @@ "posframe", "s" ], - "commit": "e2a37cc0a4ec2da858022badd33ccc086b283075", - "sha256": "0a9wb4wasdc8k9bpqx4hs8s9yhhr3lk1wrnbrq160b2iiayk4qss" + "commit": "b5a617ff916ea6c50d6d7a6b5584d51a2ea197a0", + "sha256": "1pncc3np5gbn3f9bwfbzrl1sm89n2k50liq05vxl5ai0hy7zhaxq" }, "stable": { "version": [ @@ -19545,26 +19661,26 @@ "repo": "emacsfodder/emacs-theme-darktooth", "unstable": { "version": [ - 20220808, - 620 + 20220819, + 754 ], "deps": [ "autothemer" ], - "commit": "7ea1435cc2867fcc4f8a133739cdd506f6ac9a2d", - "sha256": "19ivnwpmjzg6bgjrpc47symw13c1ipdjx2fif3p4m7r4sbig0412" + "commit": "d6f3876d686b9af5a5eb80bc55ae3d17f8ec42b8", + "sha256": "1gkkrnz8q6jdp6f46b3dpfxnj7f63xa0icva2m8gy2jiz2v67h4z" }, "stable": { "version": [ + 1, 0, - 4, - 1 + 0 ], "deps": [ "autothemer" ], - "commit": "7ea1435cc2867fcc4f8a133739cdd506f6ac9a2d", - "sha256": "19ivnwpmjzg6bgjrpc47symw13c1ipdjx2fif3p4m7r4sbig0412" + "commit": "980071d47c8577613e8777d9290919d0a09700dc", + "sha256": "0y9mcgsxbsbil9z8ai89pq1l0r30clxpvnyz5q5681kjmkbg7qn5" } }, { @@ -19741,8 +19857,8 @@ 20220809, 1358 ], - "commit": "49e5603cac7d028bfc4c679161a20ca40327956c", - "sha256": "0hs4hq9rj3xrjcm98gd9b6vyvakhq97gqym4z19h1wkrnhf3rpv0" + "commit": "f6ac4a2ba87bd669d196bd4f53ac59191b789dcd", + "sha256": "02xmycxlgf4w7wvlj9mf9fi5jjx9clz782n6fx6cnbs50jwbp2ky" }, "stable": { "version": [ @@ -19790,8 +19906,8 @@ "deps": [ "dashboard" ], - "commit": "62cc1aa84c9f5a6657fcd5032574a7670eac5aa0", - "sha256": "06mc82ibz0rgplhh93g7zjagrwfbn3alrbpy1qw89rphhc4v13n0" + "commit": "1f8c66c7d05c3d350f6986841adaa3294f1699d2", + "sha256": "0pxg880yv1nb08z60jv3j097xxb6qwvcmgl9rfh2gd6nk6bn297v" }, "stable": { "version": [ @@ -20402,8 +20518,8 @@ "s", "wiki-summary" ], - "commit": "de026f399d5b7fa9286f7733b2e3416c6f234372", - "sha256": "1dhf64sb0ja5bs7zfbzkwk40ccqmb35kv3cdhshlmdf9d9fj9jv0" + "commit": "c2ca045c76a63ebea45da3808bf1c1df791beae8", + "sha256": "1ra0yqzh2ak8zkzis908yy7sh906d6n7d26qrwqygbmz92nbrbqj" }, "stable": { "version": [ @@ -20775,11 +20891,11 @@ "url": "https://git.sr.ht/~niklaseklund/detached.el", "unstable": { "version": [ - 20220718, - 1501 + 20220823, + 2025 ], - "commit": "d8e657cc569da2ad0f1916aa0b5dbc444f0675ff", - "sha256": "092j3d7f4fvdb2dz35133wi284q6b02m8d95nnczlwcsrh1ssryp" + "commit": "8a76055290aae3e9b555a055498e71591032e995", + "sha256": "0mgxd82p8yqj1gdbck30yjv5pa2kggpsc9p9r93m4w9q6inczk11" }, "stable": { "version": [ @@ -20813,11 +20929,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20220729, - 923 + 20220811, + 703 ], - "commit": "60099be5fc5c90d5adc2795b3bfacb492a0adb88", - "sha256": "0hxyanl0vy3ajyzrjqgcybp388jxdk139wgwbb0kzw05blr0jzxv" + "commit": "61ce83b79dc64e2f99d7f016a09b97e14b331459", + "sha256": "1dbffni30h8bx04j4hmia3a6xhzrgxx53yhhvymrrr7144x6i3ap" } }, { @@ -21066,8 +21182,8 @@ "deps": [ "cl-lib" ], - "commit": "dabb7be6283488abd8d232ea8ce590d502713ed8", - "sha256": "0j9xq8r4ar6rv6a3gnakm2bzr43r7sqnbgczriifr3ybkssnpzp0" + "commit": "283aa2b9df68ed125090d66a0ae664e1fc196b74", + "sha256": "1pj49l7d7hb8j46sfpbax98kcbsq4bnyclxi770h35bj41br5i01" }, "stable": { "version": [ @@ -21422,8 +21538,8 @@ 20220704, 648 ], - "commit": "6521793eb1a33d56c78bb1e8e579cdeafd224ed7", - "sha256": "06p6aa8k21n975ii6s4aigwm232qibyk5hva4i3y3l7idv6ildn6" + "commit": "ace41c25a6ec8bce755a0d83b3abef22db7ea641", + "sha256": "03wyfy0k02365m21wjpkxafv2vs64ri9sp22ma81ll689ly436hw" }, "stable": { "version": [ @@ -21443,11 +21559,11 @@ "repo": "gonewest818/dimmer.el", "unstable": { "version": [ - 20211123, - 1536 + 20220817, + 122 ], - "commit": "2f915b100044e09dd647b22085e1696249c4b115", - "sha256": "00y6645zjary1sz7517qy5pjwfm5ipsc46sypmdygin65hbbc8wg" + "commit": "a5b697580e5aed6168b571ae3d925753428284f8", + "sha256": "1lj7pgsyzmd547yq33k4r75vfz3pdqafvnrxcv110hmb7mj3dvr4" }, "stable": { "version": [ @@ -22359,14 +22475,14 @@ "repo": "wbolster/emacs-direnv", "unstable": { "version": [ - 20220513, - 656 + 20220812, + 956 ], "deps": [ "dash" ], - "commit": "416ed17efa93503b37eba196a14f967e0899bce4", - "sha256": "0s8p96w6jvlcv2fqf3f3a3fkpk0b6a6znj6xr5nwl49xvdivlaw7" + "commit": "268536f564b7eba99264a89a9149268eb4bc67ac", + "sha256": "1rfr6cby7syshs3fbk83hhb3s4mjp0pfxb4dkznm5sdp259s4rqs" }, "stable": { "version": [ @@ -22481,14 +22597,14 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20220809, - 1208 + 20220824, + 1107 ], "deps": [ "transient" ], - "commit": "2715ecfaa0147078318d3bcc74e95e0086786045", - "sha256": "10vpk2hcbij4rpa4z33w2xwg24w1n82n4vd0nk2fyqqm575h7wmi" + "commit": "880f426fb780acdd19f932ba99e581c2f276d744", + "sha256": "1a8kbav07wcl9bs3rg14ms5h7k6cs7idnkxzxv7qkkfzv7q3zwi4" }, "stable": { "version": [ @@ -23358,19 +23474,19 @@ "repo": "spotify/dockerfile-mode", "unstable": { "version": [ - 20220806, - 1709 + 20220822, + 2021 ], - "commit": "c7e4e2541deb66d266f58c364e33a4a10cefbc2b", - "sha256": "0hmzwh8m72rj6cwaxfypnv3fmjrs11iqr15vsdw1rw7m55xi675f" + "commit": "52c6c00da1d31c0b6c29c74335b3af63ed6bf06c", + "sha256": "0yj80bcrpckdbhfl64r78q0hmk4hd3ry42lx70ky4h8h7f7l1gra" }, "stable": { "version": [ 1, - 7 + 8 ], - "commit": "c7e4e2541deb66d266f58c364e33a4a10cefbc2b", - "sha256": "0hmzwh8m72rj6cwaxfypnv3fmjrs11iqr15vsdw1rw7m55xi675f" + "commit": "73a8bcc25547b874e1983a75901f6c31708cd104", + "sha256": "0bv19mii4h47jllps72h69nwrlbfvwxgca1cl4cdxvpx0zkr6qx7" } }, { @@ -23391,8 +23507,8 @@ "s", "transient" ], - "commit": "a7f5b4a8b1a43552067ce27bce6080a509c92cff", - "sha256": "0dr0m5rrk0vhz1sq3d28pxijlkj030ckxc5mhqv3jpq2xfjwd2gv" + "commit": "525b5d42c51995f52f0f82fb41ba8e1d246532d1", + "sha256": "05dicql51iaa17qk1ydap8rv276sv1p51w3bbvb3rgbdgz501z0m" }, "stable": { "version": [ @@ -23449,11 +23565,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20220713, - 1659 + 20220812, + 443 ], - "commit": "15974ad8d4d7baa071b5ea33877e9dc117c4153e", - "sha256": "0cz0anbp286pcm9ymjlax5p42ifnkkmpcf9q396zl20vgm8xgdib" + "commit": "506c22f365b75f5423810c4933856802554df464", + "sha256": "03a8z9cwfg87144b0g4ggilr925l561hgmgra9wchxwydixrlnml" } }, { @@ -23545,8 +23661,8 @@ 20220720, 1218 ], - "commit": "824eae7ecf1cce08fa41f6762a27670815b7f786", - "sha256": "0jvq6k9qlyk5g9gvs8yhmq27hgdygplvqn94rcjw77gwsgr568p6" + "commit": "f2307b883d6b94b741662dcd160fb7ee24588314", + "sha256": "11nad1722fvws02bp02jsh1xbh9h116lzkzjspnqw6rravf5g5cm" } }, { @@ -23586,15 +23702,15 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20220805, - 1037 + 20220816, + 1627 ], "deps": [ "compat", "shrink-path" ], - "commit": "1b7463832f21369377bf0a3d8f402241ad8102cb", - "sha256": "08cj22njp8xc9mk02wzjvgsxs9w2gvcrr393xqw452x95n59fnr5" + "commit": "acac2409e2debfeabcc81a17b6ae67f9622d72ae", + "sha256": "1bb9xyvvqzf3im8zikhnz1pcvfvsbp6d9zgjq24pmwjids2japqj" }, "stable": { "version": [ @@ -23863,11 +23979,11 @@ "repo": "david-christiansen/dr-racket-like-unicode", "unstable": { "version": [ - 20200513, - 1642 + 20220810, + 2000 ], - "commit": "70bc1caea6b277e49e1cb29e1926a7b0c83c5ebc", - "sha256": "1an4hk9cjg1lhis0japdr371mnf1p4pl5mzl0l1cfkvprbxhzy65" + "commit": "d09b9be289e91e25c941107be5e8f52e7c8f0065", + "sha256": "06h15xfqh8s58m3dn1vxrwwfg129001s7j3jpfik98prjh7n0d0m" }, "stable": { "version": [ @@ -23887,11 +24003,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20220804, - 618 + 20220821, + 1717 ], - "commit": "37b3979b91b06a0520a0d326bc323b4dda280123", - "sha256": "1z4zk38agf2j36gbrj3wmngmk617mc6id8y4c11kvva2fd7l60am" + "commit": "fdf057f5e80037814098dc8bb67888886c89a761", + "sha256": "1v9p120aaa71x30xixxwglvgfwp7pf5y4503zd6rlj98rmidj96w" }, "stable": { "version": [ @@ -24129,8 +24245,8 @@ "repo": "dtk01/dtk", "unstable": { "version": [ - 20220808, - 1529 + 20220821, + 2228 ], "deps": [ "cl-lib", @@ -24138,8 +24254,8 @@ "s", "seq" ], - "commit": "2a76bd06d95ef0b07cad235b01107051616a5387", - "sha256": "1g29af3ds8c0jqk16bnay93z95brnimynp20p7w4n29n7kqfjmhx" + "commit": "a9dce9b7639c2b011f42c04820472a9c0717546b", + "sha256": "0ghq66dv6acc9z9d04443sq5g50hgc1nqplgcdyrxpfmvxg51cg3" } }, { @@ -24299,8 +24415,8 @@ 20220805, 1652 ], - "commit": "dcde9174164aa82708d3108eef40287b363cc8ea", - "sha256": "18ghh62273ybmzklzccy7qg6xasdfk75906qn06yw4xhkwbxlldg" + "commit": "7ce9e8eaf7b65645879c8974dc4f2c5e06876ffa", + "sha256": "1hzcbkqcsdni00nhqxp8gy1s0ywk2q92334n1rhs979xrgj2w0d4" }, "stable": { "version": [ @@ -24403,11 +24519,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20220809, - 738 + 20220820, + 1006 ], - "commit": "f89b831f6f66326f63905b800d95bda233bf9765", - "sha256": "1msnbqwj9czclndgmgi8mf05lbl4qwi5knq9zsw3ydr262gjaiqq" + "commit": "ed5aff8f1176de141cadbd1be6771ef1ce2795f4", + "sha256": "0p62iymjklb2a3ch0pyc9gy97as2d60zvy7sqz746xavqv4lm2i4" } }, { @@ -25081,14 +25197,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20220711, - 1845 + 20220822, + 1725 ], "deps": [ "parsebib" ], - "commit": "36b487b798cb432a52c2d5d14c3aec74fc7eece9", - "sha256": "1h3s236drhcpgxxs8pkq2g3wvw6avk0wp9gr2n5d53pmqhdki63x" + "commit": "e1a230b49cb84b2cc8518a8a287cb2291692e68f", + "sha256": "1xl5b9sb07l7vldwl1dd62d7zwjbwaljblc4syaz4in0qc0vcp8s" }, "stable": { "version": [ @@ -25411,11 +25527,11 @@ "url": "https://repo.or.cz/edebug-inline-result.git", "unstable": { "version": [ - 20220210, - 1357 + 20220820, + 2240 ], - "commit": "9fb3c48434da24f800833a5ee3419452d5fb83cb", - "sha256": "09rqvs1vj6h8k93xi5h2r1vba2hj5dl7bk7x9ry6mcr3m0c2z6di" + "commit": "90e401ae3e7b3c85da8b24af940fd97f5e744625", + "sha256": "0mg1cnkxn78dnbkdhcm4pg1c0ac8fz8d2d8cpp80lk3xf0axc0jh" } }, { @@ -26781,20 +26897,19 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20220807, - 1244 + 20220816, + 1746 ], - "commit": "a9d5607372b0935fb1b84a81bfcbdf60a7bf7ca8", - "sha256": "1159kz63fsw116bl42vhfgnzck1g5x6vj41pwz7jl2cx4fgcc7pc" + "commit": "067134a9bfe6326de258f0af666a53e13a9b4a93", + "sha256": "1w44rhs5m3s85jrc1fhrry214f3d3ffw7yrgrlzmpalyg8mng39m" }, "stable": { "version": [ 1, - 1, - 3 + 2 ], - "commit": "45ab1502619c8aa389aeaa25b37f40648e697fcb", - "sha256": "1dgbwaar8l8nl79mlzf5g1n49f1j9yj4772yfmim9vv8ppxnzbqk" + "commit": "df63962605f06f9914b0d33c138000cb583f65c8", + "sha256": "1dmi05ry62nszy9w6zyvzh2q5ii57vdyc7mwv3dyfhwx4hqbngs4" } }, { @@ -26969,14 +27084,14 @@ "repo": "davidshepherd7/electric-operator", "unstable": { "version": [ - 20220417, - 809 + 20220814, + 1439 ], "deps": [ "dash" ], - "commit": "f567f03da4a55d6eafa0e6e148ca4884d5370498", - "sha256": "1km5ghqldd0avbxr9drps6pik51yfkh2dj2gg4z7jkyvi8i0cxkm" + "commit": "281abdae033559fa9a8878ed1dd05a7ade118cfd", + "sha256": "1jsmbibas0jsvlv6zi788f6c16qwr2si0wwj038qdq552q4ckvc2" }, "stable": { "version": [ @@ -27314,21 +27429,33 @@ }, { "ename": "elfeed-tube", - "commit": "4676a25e2739917f61e6721724ee064d8addca4b", - "sha256": "1499aks5whs1vy4lzwhvdgh6fd25va7v7lqcrgkpn8i4nfq4bbg7", + "commit": "d3e742cf4b9901f6372679b917cff64e067c8fda", + "sha256": "1yimx812wfvcng26k433pc4i3n78qzzmir2z6kpg2y1dn4v3yr72", "fetcher": "github", "repo": "karthink/elfeed-tube", "unstable": { "version": [ - 20220716, - 1217 + 20220823, + 238 ], "deps": [ "aio", "elfeed" ], - "commit": "a048950b9dc6d33741ed3224d6d8440fe4408742", - "sha256": "0a8fj2wy9y2k0qrszd4vbizlgpwywjrkjz1vs7x4smbf9cj5mxaw" + "commit": "18d89f19203423b9e2df59a556c1240746903d8f", + "sha256": "0h32bpq8w1j3rbwfqlfj10vvlw21j9rcpqjpp45pw8z6xxb2q0lp" + }, + "stable": { + "version": [ + 0, + 15 + ], + "deps": [ + "aio", + "elfeed" + ], + "commit": "7e1409e41628d61d8197ca248d910182ae4fc520", + "sha256": "1vsrsnvz0ysd36a99zk7n2giv0gxznlnls8zq6lcc0hwqw78i5cq" } }, { @@ -27339,15 +27466,27 @@ "repo": "karthink/elfeed-tube", "unstable": { "version": [ - 20220704, - 1952 + 20220814, + 42 ], "deps": [ "elfeed-tube", "mpv" ], - "commit": "a048950b9dc6d33741ed3224d6d8440fe4408742", - "sha256": "0a8fj2wy9y2k0qrszd4vbizlgpwywjrkjz1vs7x4smbf9cj5mxaw" + "commit": "18d89f19203423b9e2df59a556c1240746903d8f", + "sha256": "0h32bpq8w1j3rbwfqlfj10vvlw21j9rcpqjpp45pw8z6xxb2q0lp" + }, + "stable": { + "version": [ + 0, + 15 + ], + "deps": [ + "elfeed-tube", + "mpv" + ], + "commit": "7e1409e41628d61d8197ca248d910182ae4fc520", + "sha256": "1vsrsnvz0ysd36a99zk7n2giv0gxznlnls8zq6lcc0hwqw78i5cq" } }, { @@ -27677,11 +27816,11 @@ "repo": "elixir-editors/emacs-elixir", "unstable": { "version": [ - 20220314, - 1302 + 20220811, + 353 ], - "commit": "e0d0466d83ec80ddb412bb1473908a21baad1ec3", - "sha256": "1whi4ni2jcinwq68yrzcl0q23dhp0b5k3jy5j3m89s2kdv3rwsm9" + "commit": "d495ed87a9c507f5939a51c740f119950c83e2ff", + "sha256": "1cqiqairhx7chs3n72ii9iqx926hslz9av4m0k1cr52ldnxz1s80" }, "stable": { "version": [ @@ -29282,8 +29421,8 @@ "emojify", "request" ], - "commit": "caaa3a10a9c44aba74f4964b04169b0adedeb2f9", - "sha256": "0hk872z33ghv3ppddis83q37qz2iyc3asvw67fr5sfi891hfrswk" + "commit": "01d4a14f06d76b6d121be897dea8bc92dad50ee6", + "sha256": "0lbfdwyzfbvs584y8ff73fsb7lvr2q0557my0abmr350s0dvrq3w" }, "stable": { "version": [ @@ -29763,15 +29902,15 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20220510, - 2036 + 20220822, + 1221 ], "deps": [ "closql", "compat" ], - "commit": "4524f9a8f19717c4afb84a184db7841b4ffcbf56", - "sha256": "01j2190srr9mkc68f1l9rcpxvqadn4qprddamj351n97079jw4cs" + "commit": "f4dc72d130eae2ad4f479671339d1cdebda62811", + "sha256": "1jl201pg2sack59bbmwf0rbka6jl1b1lxw45w34zkcwgx54xgjfi" }, "stable": { "version": [ @@ -30417,8 +30556,8 @@ 20200914, 644 ], - "commit": "5d2d77abbc0c97f5b23d7089797c3ef8796508dc", - "sha256": "1ayprcd7alryqz89p5gi3wawbc72210r7j8jw7naind7wwkjz386" + "commit": "b382d7d376fad3429940de2fa0d399519e172cfc", + "sha256": "1z3nlvpj5m51hb207niqhclsg8i2g138ynsng20ik8ifwm72a1bj" }, "stable": { "version": [ @@ -30442,17 +30581,17 @@ 20220215, 1844 ], - "commit": "c58471e58117409c9470a04f9dc1de6c765aa86d", - "sha256": "1xhbxcpcvc9vy66qp4ap26cg44dx2j7zarljmmw801ckcmv3ff84" + "commit": "95fe8c4fcf670d6b2aff8a23cd7dad034d2c9b67", + "sha256": "177wa08fx78dvxaci4j7x72a8p6lmqm3hdn1h6nqifcjbvxs6rbx" }, "stable": { "version": [ 25, 0, - 3 + 4 ], - "commit": "89c04fb1836fb865565125a4d5880b93e784d856", - "sha256": "0zchcm7gv52j30fq5p658h9c593ziirq09kkah6mpsvjfdsmvmgl" + "commit": "c028b855ee3f12c835ff3538a90ac5dbc155631b", + "sha256": "0bkl08hp80zcsp6sjm8nh9f40nbwi8vp010b77zs2xi38fn7fbvc" } }, { @@ -31054,11 +31193,11 @@ "repo": "akreisher/eshell-syntax-highlighting", "unstable": { "version": [ - 20210429, - 413 + 20220816, + 2017 ], - "commit": "8e3a685fc6d97af79e1046e5b24385786d8e92f6", - "sha256": "15m084kk3ikw85pw9dg5xwc1abbv51a2f0k421vks0bhi37ba1wd" + "commit": "1ba39a9ffb2298cd716a4314cf3f369028c7bafe", + "sha256": "0w2f5a9cxa365hcc92c24b3kq5dwry3prig57jgnicwmjn5nkqlz" }, "stable": { "version": [ @@ -31166,20 +31305,20 @@ "repo": "DamienCassou/eslint-disable-rule", "unstable": { "version": [ - 20220328, - 354 + 20220811, + 1006 ], - "commit": "7d4cc05d336fbc465f91a87b38bf360efaf76fcf", - "sha256": "08428v3w80v16c8a57gd6abfz2jafvrh0sbscsxm07ykcsp7y2cf" + "commit": "642ead124172dd470e8ab59fd0645597dc9d8e66", + "sha256": "1s7dhc26pbqxkaahr6cag6xk29bdi1iivd3qmkylz1w0zrl33rvk" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "7d4cc05d336fbc465f91a87b38bf360efaf76fcf", - "sha256": "08428v3w80v16c8a57gd6abfz2jafvrh0sbscsxm07ykcsp7y2cf" + "commit": "642ead124172dd470e8ab59fd0645597dc9d8e66", + "sha256": "1s7dhc26pbqxkaahr6cag6xk29bdi1iivd3qmkylz1w0zrl33rvk" } }, { @@ -31397,11 +31536,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20220727, - 1131 + 20220815, + 2020 ], - "commit": "b8167727d3c51f7adee6ebcad698ab566b68a55e", - "sha256": "1g3bih73fr8vinasw19kag28f1d2z9isxa5n9jk52vi0rcspmsb1" + "commit": "9675bf58bd7237e2762e24501ccc5a6b4e031333", + "sha256": "127nrx9sd251yr0dg53rra49p4wzgsrxb5f6h5bx29wmfwb7xb67" }, "stable": { "version": [ @@ -32015,15 +32154,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20220809, - 2107 + 20220825, + 745 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "87a1fc7fdf75feaac1b0fd163ca60694eda1834e", - "sha256": "0lp9h23ymzz8xqxr5rxaan8jzj4lynmvcvrc459xvh7dv2j2wl83" + "commit": "691d0cd36e6c09ecbc18537b7721dcb6d775e873", + "sha256": "043x68j8g0prv71xbpakw781jb56ywsg55bpf7b14lbb36v0mqvz" }, "stable": { "version": [ @@ -32216,15 +32355,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20220809, - 650 + 20220810, + 1901 ], "deps": [ "annalist", "evil" ], - "commit": "c1ede88de9b09f280e4a37c671b6dd540bf1028a", - "sha256": "1zx14vm9a7gf38vm4fzby0rg9dgwryp299k735v8f6xghgvpx0k4" + "commit": "665d5c99e216c7b18856f7ceda7c91ea5669f904", + "sha256": "0vmwd85vc6hcyfzg4zwhsilp6y0kmygnyfn02ham0b6gc2kakz23" }, "stable": { "version": [ @@ -33533,8 +33672,8 @@ "deps": [ "evil" ], - "commit": "87a1fc7fdf75feaac1b0fd163ca60694eda1834e", - "sha256": "0lp9h23ymzz8xqxr5rxaan8jzj4lynmvcvrc459xvh7dv2j2wl83" + "commit": "691d0cd36e6c09ecbc18537b7721dcb6d775e873", + "sha256": "043x68j8g0prv71xbpakw781jb56ywsg55bpf7b14lbb36v0mqvz" }, "stable": { "version": [ @@ -33736,15 +33875,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20220805, - 1520 + 20220819, + 1408 ], "deps": [ "evil", "tree-sitter" ], - "commit": "7ec5835662941ce64201281bc0ed0f31ee34e48a", - "sha256": "10kh8idwlcxa9f7f5jmwg1sykm3v1lv50lf3zqn13k1blj0k0ya0" + "commit": "f0b887faac1eb1f964e11745e63c1ef53398a7a8", + "sha256": "1y2gvf0l6g8gr8kkgy0mi098l5dh2hkmx8nsqid319zr8d4i6cd8" } }, { @@ -34459,11 +34598,11 @@ "url": "https://repo.or.cz/external-dict.el.git", "unstable": { "version": [ - 20220801, - 2349 + 20220816, + 2136 ], - "commit": "aa051548ca850d15f939acfa82b358f756a761f6", - "sha256": "1nnkyy7wi5zkb511bsp8j95p88rd451nfncyvss27ldrscnizjf0" + "commit": "680c37f01e5205805dffeef05be00e2196886a8c", + "sha256": "01rq6xw86q03br55njh51myzl2v1wfb2z6xpapwfs77rcismx616" } }, { @@ -34787,15 +34926,15 @@ "repo": "rejeep/f.el", "unstable": { "version": [ - 20220608, - 943 + 20220814, + 1054 ], "deps": [ "dash", "s" ], - "commit": "d2019d4f9625bcc44349c69fe46d6645fd9ff4ff", - "sha256": "0vml6p19zwab2zrln2g6g2hb31czlz2rqln5wi8lc37h8lgfx7fy" + "commit": "85c91f95f8b98e153fd959ae467b46bf79622c5d", + "sha256": "0rb85v52snsh2532na9p4b98lkfd0zz6646frw44k7ydbp29wnd3" }, "stable": { "version": [ @@ -35290,8 +35429,8 @@ "repo": "jumper047/fb2-reader", "unstable": { "version": [ - 20211214, - 954 + 20220820, + 1607 ], "deps": [ "async", @@ -35300,8 +35439,8 @@ "s", "visual-fill-column" ], - "commit": "9dcc0801a7dd302ee0620781ea17868895d3f082", - "sha256": "1i74nqivp59129w2n81x86zrf0cy4ws6wyxdsw65nib96jrwg683" + "commit": "8138cc3b674c911e92d280b97a5fdbbdf6e3182d", + "sha256": "1qg7ndkr4mv5wfgss05iq3gnj2s9nx6pmikli0s3m3cilxp6c53k" } }, { @@ -35519,8 +35658,8 @@ "f", "s" ], - "commit": "fad2f5ce83800b7ddcd5927bd84d377990446981", - "sha256": "08mcbxiqq445cgbgib39c701216ifp9dsk8m4gdbbn9iam3vj3bx" + "commit": "24fc776c9647859031fdc44d737aee5b96d2bf51", + "sha256": "0gybszfhlndpgw1sidif0ksmlnrw6pfm835j5vxwggkkvk5bn6wz" }, "stable": { "version": [ @@ -35693,8 +35832,8 @@ 20220704, 650 ], - "commit": "7da1dc1259c1b15e28736d27d87f4cef40a3a18d", - "sha256": "1ryxay5pdwvcdz85wwmxsdpi1cjr38ybfawgg2pxcbyqizydlyry" + "commit": "84f3ba47d7864e9a5ba9fa83770e3f3919751380", + "sha256": "0jsc1svbwvlh14ccrabgdpkjv2lx6yiaxzgh3syd89r677da4cwk" }, "stable": { "version": [ @@ -36836,8 +36975,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20220729, - 1039 + 20220823, + 1254 ], "deps": [ "dash", @@ -36845,8 +36984,8 @@ "pkg-info", "seq" ], - "commit": "8541a61053bba1f2f31d0791e597cd3c78a21456", - "sha256": "1rh76xwiikcq2pbq5i2nf5dx1dsgaqlgmjpcm011w99m0nzg7bvi" + "commit": "600b3bffda3862121d96bbc5c1f8990fa9033a82", + "sha256": "0nv8ln8mr63kn1c41amj88isl8f3imqhb0bqrpl6g6frm2rfwxkm" }, "stable": { "version": [ @@ -37762,8 +37901,8 @@ "deps": [ "flycheck" ], - "commit": "93c5b26ec55d0df54bc230e2de0890fe074f35d3", - "sha256": "0f0713a0d9l92cy6xc5y1cg4pg88kq58krlz37bkfq3s20yfz097" + "commit": "8a7293dedc6245830580260d2dc70e1001a0ff29", + "sha256": "0aqyzv7kz8b75s640dml83a2ckwkjw9s6bmzfkfjjcbxh8jn9d0r" }, "stable": { "version": [ @@ -37804,25 +37943,25 @@ "url": "https://git.umaneti.net/flycheck-grammalecte/", "unstable": { "version": [ - 20210705, - 1656 + 20220822, + 2307 ], "deps": [ "flycheck" ], - "commit": "59b37e09923290da1c8458e507da43f403f555d2", - "sha256": "1l0rq2g9dn90xr75cjz64cyai90m5cayr2b2fdrkkrz70g00pqlr" + "commit": "314de13247710410f11d060a214ac4f400c02a71", + "sha256": "0xxg98mny4f5x9j9s05an668v0b4d6r6f87nmsfni8wjf3f404zy" }, "stable": { "version": [ 2, - 0 + 1 ], "deps": [ "flycheck" ], - "commit": "fab1b5071b7fe7a34869ffb8672abad38948c047", - "sha256": "040mb9djj4cxpjsjch9i30pi36a2z7grkhnsnfdi5qyh341p4pq0" + "commit": "314de13247710410f11d060a214ac4f400c02a71", + "sha256": "0xxg98mny4f5x9j9s05an668v0b4d6r6f87nmsfni8wjf3f404zy" } }, { @@ -37841,8 +37980,8 @@ "grammarly", "s" ], - "commit": "fccdba6a6bfb043031a43c62b3c5b635d52bf723", - "sha256": "0f26x7ssvagpilv30hn7wc106m4jbf6qha26jzym4ymyfwj0b503" + "commit": "73308f79d98dbb12ae68e2823970edc84a7149ca", + "sha256": "1bvrfrnslfsys2q9x9cvfh4q9qnnqi3gsxmnjard03h7h80vqbfa" }, "stable": { "version": [ @@ -38267,8 +38406,8 @@ "deps": [ "flycheck" ], - "commit": "53b3e46d47a0e70fd2e5c49fea9134ee9aa41793", - "sha256": "1di51jp20ymqkp777rsvwkqzr9vpnpi90b8bd4db5v2ji46xrkjf" + "commit": "f267f3075298ef715406f16efc1aba23f53a37ad", + "sha256": "06igrpsicszsn4jv094ripb4qn4y2n193ikhlsyjmr9wij1r4l4g" }, "stable": { "version": [ @@ -38480,8 +38619,8 @@ "deps": [ "flycheck" ], - "commit": "0a86156fad0d6f02e8e6b4c5594f7173c96d6481", - "sha256": "122j1imz755lhfhlnzl4gggghbvpqyq6r6iix3qq60kzb3hpq1b2" + "commit": "3b08af9f502d64db26c7e6fea3510155d7e6d185", + "sha256": "1f240kpnzwp6qzrj640592vwjs3mgjy6r6n61s7x5flxqhn911c7" }, "stable": { "version": [ @@ -39025,8 +39164,8 @@ "flycheck", "rtags" ], - "commit": "c628efc9b485470a48aec2692d79f7c140bc5b92", - "sha256": "03avv7brbrj69368riq3xg4qh65yzl5cyjn9wc2rbyx4jw2q3p4p" + "commit": "b9c680e7ca003c103687e790f740d86daa6b4b17", + "sha256": "01f1vv71gimhsm6bzh0fxfmap54qs4wqnc5zj9barr9zvwpqmrbn" }, "stable": { "version": [ @@ -39184,8 +39323,8 @@ "deps": [ "flycheck" ], - "commit": "54193175c87a4c0bbf7ed16a3e76d6daff35c76f", - "sha256": "000fp4qzmc4kbjji03lxwafyvv32r4i7adf29j9s7v7dmdljpndl" + "commit": "d52d7edd51e0b06e174b6744e5aa12ab15602cfa", + "sha256": "056qqrkrr0slxw8dck5xwxx8xf52j08s2jgh87sb8qn6naq7byz6" }, "stable": { "version": [ @@ -39575,8 +39714,8 @@ "deps": [ "flymake" ], - "commit": "d3c632f26a2d13fb288252c288faaf8107b3d86a", - "sha256": "1xylljq1j71xr7xmykk2pl816f8lkxf0314ghmhlfx0pxir9xpih" + "commit": "238d872c40b2a5ea26710845369cbb15dd37f351", + "sha256": "1f0qc8vz9bgwyzavcd06sg02g7q98a9ynprwxa5mn1zhfavmawxh" }, "stable": { "version": [ @@ -39803,8 +39942,8 @@ "grammarly", "s" ], - "commit": "7ad726f27031fbe816885632155851cc2cfcd522", - "sha256": "0yzandkqkwnsqm3mahq03l6ki45v8g5hz9fz6krnyg82n5bx32zh" + "commit": "2e3c0851b322c21e4147c92f05d2488687eccd8e", + "sha256": "0g11iv48ya9dlw5mslqkz1iray90k9c7jbfxhw7imk479x0954ln" }, "stable": { "version": [ @@ -40059,14 +40198,14 @@ "repo": "emacs-languagetool/flymake-languagetool", "unstable": { "version": [ - 20220704, - 637 + 20220814, + 550 ], "deps": [ "s" ], - "commit": "857f4f94a7615d7de5305a40045b2b85ae1ff760", - "sha256": "1kmqk7hq07lclnbcmwhwnsbrn4qj4qkbq9kimfc0vy7fcd7qb79p" + "commit": "0860650caa5538ccb679b5149dffb9b4992cfa75", + "sha256": "1v71cdyy836ls9cl7is7cqcg9hvi7fldl33h3c95p5z6vis44djr" }, "stable": { "version": [ @@ -40182,8 +40321,8 @@ "deps": [ "flymake" ], - "commit": "394b961b27b1fddc3c7107046a53d47f58757300", - "sha256": "0rv1i02lg9x5iidmx6bhf6qw22xv8gmnrd3pspnv6xc7p3bq4gwl" + "commit": "a0bc983c6187c03b72a93e78371c391a28321b81", + "sha256": "1b0bzbzlqcnr3q3lrcmrvys8azhbvla34f6bmk2gqngavd0jckyh" }, "stable": { "version": [ @@ -40271,8 +40410,8 @@ "deps": [ "flymake-easy" ], - "commit": "433fd05b608f06a40bb209fbea76117d896449ed", - "sha256": "149yk0l55p2fcvcgy0pqv3iw8mgbskycmb84bqvjg8227a38bks8" + "commit": "dca5d00fa1fb3f25d2108e9cbbd0c74b71d8dc64", + "sha256": "1gzqgjxvsynzng1aiax484442vx14fj8409f09nmd4prbff3m1zg" }, "stable": { "version": [ @@ -41329,8 +41468,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20220622, - 1929 + 20220821, + 2143 ], "deps": [ "closql", @@ -41344,8 +41483,8 @@ "transient", "yaml" ], - "commit": "ed8abdafd8b15852538bbe064fef037345772627", - "sha256": "0kdj2x3sj7iy9xs2qzw0p7vm2hi7r0brcnqyjwirjj4x5jr6ag61" + "commit": "6a820a424465900b0cc7bc54ccdad6491764e581", + "sha256": "07y3001wjslc8qzsg7vrr6yndmxh5icdgvwzff239hkgqr9a1ag9" }, "stable": { "version": [ @@ -41400,15 +41539,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20220806, - 702 + 20220815, + 632 ], "deps": [ "inheritenv", "language-id" ], - "commit": "7e375c01eeaacdf33a27b59f6cf1849bb6a0caa5", - "sha256": "1xh6bbwcgx6bs78vfmfv5cy16ng7i9k37kr1cpdxfchjl3ylyhw1" + "commit": "f5e97b4feaba46be2cde825f22094e4b6e595850", + "sha256": "0k02m7h94h31mynkki1gasa4ch176cm0mg05x8zafp2161dhz49n" }, "stable": { "version": [ @@ -42179,8 +42318,8 @@ "deps": [ "cl-lib" ], - "commit": "b0badd157101d4b6b184f06726b456a00171b801", - "sha256": "11vpvjyh860j0k7rcysa0ssgggrai8fq6q33hqw2wz66pf2xn6bv" + "commit": "cda1e5f9ad1d6b55077b7a88f18e89e882e8ffef", + "sha256": "06am0vp9c19axd4zjjvpsp7wshrj9b08m3l6zz40fzb215sam7ki" }, "stable": { "version": [ @@ -42333,25 +42472,25 @@ "repo": "jojojames/fussy", "unstable": { "version": [ - 20220723, - 1500 + 20220817, + 1234 ], "deps": [ "flx" ], - "commit": "d789dd9eb292ef2ff8a0959dc015f2edc67af6f7", - "sha256": "1h08kbd7i1g84rxmwn50rq9h67xmi615wg0yzjzdi0x4f2y56xgi" + "commit": "fa62f9624a6847dac594ab9f9a3154105ba2e3ef", + "sha256": "16ra07ry0gnkimab125971q32aza1zrc4yw4f73cvvphv4ri9f9m" }, "stable": { "version": [ 1, - 4 + 5 ], "deps": [ "flx" ], - "commit": "4526f81bb76b5af3af13e540ff7a5f1ac0d8ed4f", - "sha256": "0mk31kf9aj0mmdynv42h3lwzd4x9ys1d9s1r9qyy0kdi8y8vcs21" + "commit": "d59703fb6f1e1fcba6c5e1a607cadcceff763621", + "sha256": "10pbi6v5xy5fahxl28p244pcnmx6ym7vwzbrkza06szpl7fjv5k9" } }, { @@ -42362,14 +42501,14 @@ "repo": "diku-dk/futhark-mode", "unstable": { "version": [ - 20220425, - 1144 + 20220824, + 828 ], "deps": [ "cl-lib" ], - "commit": "7fd0a3c6c96ed8afd0249ab0734d9b63d4fd1cb1", - "sha256": "06y66lzhw2vl5y3lpcmgn71rpshq07ljah2p2ksgml87qml29r3s" + "commit": "adf92a6c38b059f8ead65a08ccebdc5855cf9d1b", + "sha256": "0d3inzi0m87qcql0xlppxxprzjn4k8crvds6vmqv7b7wvk86rdjn" } }, { @@ -42407,8 +42546,8 @@ 20211231, 1837 ], - "commit": "74867a4c991b98cf636ff1a2b81c2a6b41ebbcb9", - "sha256": "0rw59nga6phhrzlskq03qwg4k3l4pyn9cdzcmg3vjf1nvssa13g1" + "commit": "c848480e81028a29c634c43b8162230cc3601b32", + "sha256": "1zvwj0py6148hzdjfdrlzbq7hah4sxlniprkk1w8wdsab4p9hmmg" }, "stable": { "version": [ @@ -42641,11 +42780,11 @@ "repo": "gvol/gap-mode", "unstable": { "version": [ - 20220503, - 1555 + 20220815, + 2355 ], - "commit": "99237f714c28981142674e8cfeb155863c834858", - "sha256": "0bjrrjz6k7a83gxad9grmynr14s6mig4cihd21nk6x499fn3ssia" + "commit": "afa70e8e396ce15f348612f09146650795fe58f8", + "sha256": "1y4djgqnhy7yrv8az0bgpdyhlpgbxz1j9b84bfg95flrwfbbjiy9" } }, { @@ -42811,28 +42950,28 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20220802, - 1327 + 20220825, + 46 ], "deps": [ "project", "transient" ], - "commit": "bd3d4ab6d7dffd9f8565af32471dc58aaf5a2214", - "sha256": "1kz8sl1iyrxx5lrfj4rkzm4xcmgvxwkvxdpw37id2jh0d986x0ql" + "commit": "621642856832dff4f80ad60153b240991299d419", + "sha256": "10pv8c09hhzbsiq7gvcgaqjcn1sapql841vsky359dzd5nx0jzld" }, "stable": { "version": [ 0, - 23, - 2 + 25, + 1 ], "deps": [ "project", "transient" ], - "commit": "bc0dde310492de733f9ec528d7aeddd57093d05e", - "sha256": "1gxa5ba5n7k169klg3zyrl8ywyljmcp006x2fql3s7awz0c98rw0" + "commit": "ecfbef1c771f3a5c34f46fb2b387b9669c661d2f", + "sha256": "0qm43qkf0rpcbsf5wb7b51m79jvn2fkl19f49acbzjpavx66vn3n" } }, { @@ -43306,16 +43445,16 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20220809, - 928 + 20220812, + 2150 ], "deps": [ "dash", "magit", "s" ], - "commit": "eaedb6a200bf76d5add77e4cb00b8b9fd57fd087", - "sha256": "0ygdfycpipk3g51kmw419b2r5i4240v1i3hk5xjps0ni4x87i26i" + "commit": "4de561d1295d4c86ca9b159ab0c746bedc2d0380", + "sha256": "1k1gr6hnb9warbaglhfzarm145afsrv55xdkq6wq6s0imac742ba" } }, { @@ -43606,16 +43745,16 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20220624, - 803 + 20220810, + 1157 ], "deps": [ "compat", "let-alist", "treepy" ], - "commit": "94f5aa2ddecc6426ebc69a0c67934ccba6ae9797", - "sha256": "11ylxrc6hrzzw0z2wd9h375fmg42q637c5nf1n8yxmqfx3skj5bm" + "commit": "4e5bb75305a763ef9ccfc1971b3cba4520f290d7", + "sha256": "11a5r5bvjh5d1iwiijwvrd1iq5yvlhqjq00n0ral1vwx1f273zba" }, "stable": { "version": [ @@ -43906,15 +44045,15 @@ "repo": "walseb/git-backup-ivy", "unstable": { "version": [ - 20220412, - 1914 + 20220816, + 30 ], "deps": [ "git-backup", "ivy" ], - "commit": "c53e1bc800963c0d826226c37c22e36f2353c70d", - "sha256": "02ilrrgb2vijhd7sylj8dxdbpxh83zxhkkb8m9kqn8mqxpj0ii1g" + "commit": "ad6434bcd540de8e3cd9953035680f0a745040d5", + "sha256": "1c3ycd4if2ykd7pl7zxlrh6cqgrz158nlx9ynq3cddqglqb0jw6l" } }, { @@ -43981,8 +44120,8 @@ "transient", "with-editor" ], - "commit": "8a0cc83eff98489d3685b8585afdcebbb47c1393", - "sha256": "0hf3zyxwhknnkgcms5phwf5qrbzjkj5c8kpmynzb9bwr6ba8yf6p" + "commit": "712be4632b0ddc7899ca90db8f9be20d90b4326f", + "sha256": "08dk0vdvsxc2pvvk5h3xf2pxb572scsjd4mcj19lqhrzkcwnxgsd" }, "stable": { "version": [ @@ -46776,8 +46915,8 @@ 20220704, 630 ], - "commit": "104a04c3228b3cde2432ae802d739859f96c8509", - "sha256": "1akd9bvz736sgwf9wbi97yjaipw6kkrmfz7azb78jl0kwngfzqcc" + "commit": "b4c6f5ef2f0b2449d29e45e6fb95fe3b0f3c8bb6", + "sha256": "0cv6b9xyx6l59syrxj71xnjjrr8b8inhldxa6ra8sb79q26yag1h" }, "stable": { "version": [ @@ -46839,17 +46978,17 @@ }, { "ename": "goto-last-point", - "commit": "20148869e301d236bbf335e8545131488ad57f27", - "sha256": "0lns0w7zvi8afsr64kcyn68arrjf7bqmpadw12zj100nnnvs40lh", - "fetcher": "github", - "repo": "manuel-uberti/goto-last-point", + "commit": "5b8fb98e7825176e4661675e064296e98c2b0d8b", + "sha256": "0m3ywjxk0p2z5b0q49jz5nddig24f0knqs7yyxzjxil9gq5q2jkr", + "fetcher": "git", + "url": "https://git.sr.ht/~gitmux/goto-last-point", "unstable": { "version": [ - 20190525, - 1855 + 20220816, + 153 ], - "commit": "6218441a0e644c23e247594aece004e80775d307", - "sha256": "1rhf5llw9k6r05wrr870c2m1d6jalz7xz1rsgl1fp01pb4jwq82i" + "commit": "0a006c70719f479bc4e3ae75dd2fc84cbb15f049", + "sha256": "013nh9lwh22v858bkhwj3mqzwg378ncmjp7y4m2hhbv4ap0ay3vd" } }, { @@ -46863,8 +47002,8 @@ 20220704, 630 ], - "commit": "b58af255e822b6bb226085592ca471dee6027b95", - "sha256": "03cxm3hlxzf2nz30p360jpskiw6279frr8v6jw42ismm6ryvlw4d" + "commit": "162f6f3e410365399efed4122321eec23d482e22", + "sha256": "1r8sql7cv1a9nf8l31vdygvrjx9vs3k1jbywrswcdpwb4njmxlar" }, "stable": { "version": [ @@ -46893,8 +47032,8 @@ "magit-popup", "s" ], - "commit": "f036314826293cb5df72f124a20b175d17e6daa4", - "sha256": "0g1s1rhndb35d9g3p2kbgj6pw022xqijhl61x8k4csgy0fyj1g9b" + "commit": "cf96cab7e22d0f7e3dcfaaf6d079b9491d8af7a9", + "sha256": "0j90ir14amhigh2rb31n47zhajcm67ymw7svc31y9z744q2gjb6b" }, "stable": { "version": [ @@ -47128,8 +47267,8 @@ "s", "websocket" ], - "commit": "1242c4f26c70697ed2447b7fca41645e8f9daf96", - "sha256": "1kwkihvkhrl2ibqjpdy04df0vryqfhn55kpizydhw5hxwipq85i4" + "commit": "fa7463ff3692581112c6aadade570744028ecc91", + "sha256": "054bna6d2pzvvx7jf0v54v9lpjrd0r4k3yynzvbp92a48dhnap8j" }, "stable": { "version": [ @@ -47523,11 +47662,11 @@ "repo": "gugod/grey-paper-theme", "unstable": { "version": [ - 20220711, - 2241 + 20220811, + 2301 ], - "commit": "10e243316000e85a10b49729745ccd4262d21cda", - "sha256": "14hyq5hh4z6lmrh94hc07pdxarw4wy510p55vb7czfmh98z6nl5f" + "commit": "760e8d26f5b2aeaa56b91bf435e42b1e5d6f69d7", + "sha256": "0wlf35yxd04xfjyyq2xp7bw6bqqz9l8b5cgq897rknjglwk867py" } }, { @@ -47746,26 +47885,26 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20220808, - 302 + 20220822, + 1711 ], "deps": [ "autothemer" ], - "commit": "9c31dda03e386dbbf7ad206f401528261942fbb3", - "sha256": "108xr16kzfqsvwp07xwas93j6pmpwgsshdlj26l8qkfvqz1fvwj5" + "commit": "74e8dc88b7fa15bba964f4f1ce1fccd76f523bfd", + "sha256": "0i9mgfym6rsdj5kgaz3l9bdif6hbv22l3axxp3cnfhm937spqbvq" }, "stable": { "version": [ 1, - 29, + 30, 0 ], "deps": [ "autothemer" ], - "commit": "5cc7e7354a778d5e9df5ee6850e2fdd8e02851d1", - "sha256": "0ydwr2l3jhqbs3gk5qajirl54vfb8i65qrlzrs04jnsj1pkzq5xa" + "commit": "e9f8e6ee52727f6008c125b71a26c80cfa59c0af", + "sha256": "1dzaivis9cpqzb53qmkmhijr5l4hl2l3yr2412jxrz2jmqi3q4c5" } }, { @@ -48055,11 +48194,11 @@ "repo": "Overdr0ne/gumshoe", "unstable": { "version": [ - 20211229, - 152 + 20220816, + 2254 ], - "commit": "2366f1c65cdcf09c6b98ca466110842cd88c9db3", - "sha256": "01ha47h7ylkkplxz2bm6h5d773lvvjdgmqh3b9r5asjiyma8zn31" + "commit": "5e30a68f1cd80c8bdf67c06afa1fe7642decbef7", + "sha256": "1vw7p92qq5ahvzql4pcbza0nzf2rxfxc6i5g64ldv1hgzih0cv56" } }, { @@ -48194,14 +48333,14 @@ "repo": "hhvm/hack-mode", "unstable": { "version": [ - 20211224, - 19 + 20220825, + 127 ], "deps": [ "s" ], - "commit": "a522f61c088ee2a13ab17f289a3131329e59badf", - "sha256": "0nz3mcrdkjjmnj0b1n3hs9hy2kbn004w64j2v6f2i8np2k2il6sd" + "commit": "26f06ffe82574f98e7da381e48202eceb8ef0793", + "sha256": "0sbrrwlr64dkb1dnfblx5l8ypwmcjxwbzf7ppqjnw0n2wx466751" }, "stable": { "version": [ @@ -48407,14 +48546,14 @@ "repo": "alphapapa/hammy.el", "unstable": { "version": [ - 20220808, - 1841 + 20220818, + 2115 ], "deps": [ "ts" ], - "commit": "0151ac98064f1b7d2dc542598cc0f6711c065800", - "sha256": "1mimgkfywpr9mqahj4r52sj3dp7p8xnb8wir514c3xc2frbgwkff" + "commit": "81e0316a98c4788375bc0e50e5d6ba9dd440e586", + "sha256": "11nzlnc5dfdpkf6cg0njxjm15p5gfih4v8jbwd7zwah8mm3cci4n" } }, { @@ -48780,26 +48919,26 @@ "repo": "purplg/hass", "unstable": { "version": [ - 20220612, - 2151 + 20220813, + 1717 ], "deps": [ "request" ], - "commit": "9de26718ba6f369c9f161957cbc5136382fc51e1", - "sha256": "0jb38idqrh16mfn5hkvl1q96njd4s9s0a6phqjhfs8vpg53f27f9" + "commit": "c6d9bd2e29fc2c4f37c0c72f3d136e43f34addbc", + "sha256": "0km3gcsd9vn4w9700rzfyfw4vj47sbd39xxn42lgqjw0h1bywdkw" }, "stable": { "version": [ 2, 2, - 2 + 3 ], "deps": [ "request" ], - "commit": "9de26718ba6f369c9f161957cbc5136382fc51e1", - "sha256": "0jb38idqrh16mfn5hkvl1q96njd4s9s0a6phqjhfs8vpg53f27f9" + "commit": "c6d9bd2e29fc2c4f37c0c72f3d136e43f34addbc", + "sha256": "0km3gcsd9vn4w9700rzfyfw4vj47sbd39xxn42lgqjw0h1bywdkw" } }, { @@ -48990,15 +49129,15 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220807, - 734 + 20220822, + 659 ], "deps": [ "helm-core", "popup" ], - "commit": "1d066466feb786f3477f1e6b3278d6af54666177", - "sha256": "0rgwvav867k7y7nx850nzxq14y10bjf1344m8lk8qs9f4kzy2mnh" + "commit": "4e99cc8ef66aac2d824c456f58abe833be26c99d", + "sha256": "0lldprrgmr7gbnqfp0g7n342hgp3aqbfzv4n9dc51sg1fsdivpz4" }, "stable": { "version": [ @@ -49896,14 +50035,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220809, - 1446 + 20220824, + 1925 ], "deps": [ "async" ], - "commit": "1d066466feb786f3477f1e6b3278d6af54666177", - "sha256": "0rgwvav867k7y7nx850nzxq14y10bjf1344m8lk8qs9f4kzy2mnh" + "commit": "4e99cc8ef66aac2d824c456f58abe833be26c99d", + "sha256": "0lldprrgmr7gbnqfp0g7n342hgp3aqbfzv4n9dc51sg1fsdivpz4" }, "stable": { "version": [ @@ -50460,8 +50599,8 @@ "deps": [ "helm" ], - "commit": "c7584ce5e75c7f1b7b31c820fcd30bde4614c663", - "sha256": "0spzwm0g2fq3f8fnr23l2vndlbbwa77s1554fmx7ck14qj7l9jfa" + "commit": "20656a0c222708101f7738490ace67d822f482f0", + "sha256": "0a35gan19b7j3kswl083k37q4ipysmnrnyrv6ncav5my8xgrjj0j" }, "stable": { "version": [ @@ -50725,8 +50864,8 @@ "flx", "helm" ], - "commit": "6098cee7fb274a814e539db85b7a4924d56493e8", - "sha256": "05mr4rxa84bpgkbq6yxjg51rffbcfph7q9377mcy1n1fmfxxm1hk" + "commit": "a716d266f0042aa2164d51f82aa76932119748fe", + "sha256": "1bag2ada7k99znn46f8apg7gz4bm93ya1p645jpgamhc98g3hi08" }, "stable": { "version": [ @@ -51526,14 +51665,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20220727, - 505 + 20220818, + 553 ], "deps": [ "helm" ], - "commit": "9d91c25c7d1776d137fd126f241d0272b6e5f90e", - "sha256": "0bxmhi1dr553v1grspig5b16ldwl74dzflf6xqi8kk7wdpk1ir3k" + "commit": "fc44fc1015bbc75d16e7d7aa5d971ff1ad85e9e1", + "sha256": "1im54c10nv5i0bncdcw8x6mnyy1jh6w9dxg09rkxvy0vjjpv17pr" }, "stable": { "version": [ @@ -51796,14 +51935,14 @@ "repo": "emacs-helm/helm-mu", "unstable": { "version": [ - 20210816, - 913 + 20220825, + 1025 ], "deps": [ "helm" ], - "commit": "b85019d01815a4b58d6016c3a30fefa60d8363f2", - "sha256": "0dld66r7z525y1b22liq2j8fz248ghj8pxfid66508jpxhh71np3" + "commit": "85714ac9a9db6619035c40f5b5a2cae948561b01", + "sha256": "1rvq7jbc2a0r2ab6ffxp9rbd907hjppyj4j29mjvm9f5frb2w7f7" } }, { @@ -52004,8 +52143,8 @@ "org-ql", "s" ], - "commit": "06f1e1be6ff5ef7e2c8c05dc1954bcedcbb6eb0b", - "sha256": "0qn3ww9hp08xbmjicd451zcqm3za84wvizjwlzmxi6hqsaxmzpfm" + "commit": "d7ada532c7d06e91d6e07800ca22d5fbdb970e3e", + "sha256": "0nj1dvg30wj84ayqkjifxi1h0g1kjkm6nhhq59w13pkl2q0w5ygw" }, "stable": { "version": [ @@ -52365,16 +52504,16 @@ "repo": "bbatsov/helm-projectile", "unstable": { "version": [ - 20220807, - 350 + 20220820, + 826 ], "deps": [ "cl-lib", "helm", "projectile" ], - "commit": "6dcc543815984f7f40e99050b1ee3b68a088e160", - "sha256": "0xhf56p3svl9bs2gc2sj1i3k6y3wrcbrrh3jfr09pxziffj0300z" + "commit": "5813f7286533990783546c9c39c184faa034d1f1", + "sha256": "1qrdms3lmr7wspqhd0ygqmyznlc6spy2lnn1n8p4v495nzdygzdh" }, "stable": { "version": [ @@ -52763,8 +52902,8 @@ "helm", "rtags" ], - "commit": "c628efc9b485470a48aec2692d79f7c140bc5b92", - "sha256": "03avv7brbrj69368riq3xg4qh65yzl5cyjn9wc2rbyx4jw2q3p4p" + "commit": "b9c680e7ca003c103687e790f740d86daa6b4b17", + "sha256": "01f1vv71gimhsm6bzh0fxfmap54qs4wqnc5zj9barr9zvwpqmrbn" }, "stable": { "version": [ @@ -52898,8 +53037,8 @@ "s", "searcher" ], - "commit": "521326e61b878bce0db7e1a862ffc890bd59122f", - "sha256": "0fxd61k1ry4xwkam965yk0vs5h9l6v918lka7fna92hfww3wz4ik" + "commit": "4219ee9e6d173caef7f8a4a586966b054f55d8e2", + "sha256": "11w5d2qmbwk7ph6yb2xfdi8waiyvp44yhqqcgz80c071kjjay3s1" }, "stable": { "version": [ @@ -54323,8 +54462,8 @@ }, { "ename": "highlight-parentheses", - "commit": "40bb1119bea79bb9e91378c99e2aa60936de013a", - "sha256": "0ly9d01ja517psf1sqg12wyljykixi5c6qbhahyjy7n331kkpkmr", + "commit": "746947a065c8fd26bfb540c96d869d05a0bd9b53", + "sha256": "0zb23w53izwbxdsxfia6ja97jcd4yxl9hf7a9ip46d7m7ncmgkr4", "fetcher": "git", "url": "https://git.sr.ht/~tsdh/highlight-parentheses.el", "unstable": { @@ -54735,6 +54874,21 @@ "sha256": "0fwb64ja5ij97308pnd7g6l5mascavcp7jcar8igxv9yyqnw6pfi" } }, + { + "ename": "hl-indent-scope", + "commit": "40d598ab57e33b1fe5838ed89077e2d6668f6ff5", + "sha256": "1mm8bgj6qjbkqf9h4mc6hi556byigj9xll5sr9vx5yw3fav4yc1g", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-hl-indent-scope.git", + "unstable": { + "version": [ + 20220816, + 426 + ], + "commit": "243b6e4202502439f39ab2a485e4ecf8ea50edbe", + "sha256": "14mlpddh5hkxk2db2b46a526df2aap7y4hi9kf70gcz63yjhn07w" + } + }, { "ename": "hl-prog-extra", "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", @@ -55180,8 +55334,8 @@ }, { "ename": "howdoyou", - "commit": "eb5356c3e094e93c09398bfd628b1594c7e3ec20", - "sha256": "0dnlhkpnjag6vk7qyfgzc7p0fs1b01pc3dnm6bgw19ghdp1wvp8y", + "commit": "746947a065c8fd26bfb540c96d869d05a0bd9b53", + "sha256": "1p9nq6n7y8ldv3acim5nwm0mz9fb510y246ikvpcnx3zqwa0l0wd", "fetcher": "github", "repo": "thanhvg/emacs-howdoyou", "unstable": { @@ -55206,14 +55360,14 @@ "url": "https://scm.osdn.net/gitroot/howm/howm.git", "unstable": { "version": [ - 20211230, - 1221 + 20220815, + 1125 ], "deps": [ "cl-lib" ], - "commit": "c381e50f0c771c38306bda37bd972a37a36a5db5", - "sha256": "1azzsbvnjbd5y0isl2bq9yjaqbbiivmswkrvyx3mgmq7rw6xvn61" + "commit": "9982e74e212014bc8ed67bbe780eb6ca55dc5298", + "sha256": "05dfd8sqvv51miwkr82hym5z7byiiv38zsx47b7sqr8kkqj9jcf5" } }, { @@ -55388,8 +55542,8 @@ 20220704, 652 ], - "commit": "aeabbb7606e033bccbb70d2a1c463ba8a733a4e9", - "sha256": "1khzdwyi6qdpazhpbr749wbcybak2x5gqjqyman002dnpwaxy2fb" + "commit": "31ebfdaa333c6ef7d5d249de9d859030bfb3cb82", + "sha256": "1ldfzkr5v4v2ri0mv84ph9l0hg2kk624b2z42rv5965zsky45n2j" }, "stable": { "version": [ @@ -57262,8 +57416,8 @@ "deps": [ "impatient-mode" ], - "commit": "501d8eb255022d832bb30178db154d0004eac18c", - "sha256": "0qqg84yyfxc7kb1fxn0kpnsjgi7kphh7cvq9avabl1yiy1s51gq8" + "commit": "3d07d3377d8e5cec93f113d57e656f76d2f52afe", + "sha256": "03qq2falmnpaz6llay6r6v8gdx8y85awsrcnk902g4b980pflnpy" }, "stable": { "version": [ @@ -57376,11 +57530,11 @@ "repo": "flashcode/impostman", "unstable": { "version": [ - 20220102, - 1856 + 20220818, + 1845 ], - "commit": "5b122f3d5a3421aa2d89bdc9dc4aafaf19cf85d4", - "sha256": "095g54cxicd5ysxpw2zaw4i92yxmr3inwacbla34aa0l62lqy5ig" + "commit": "16ee00e35e9ee82bb06c6feafb148d98165f822f", + "sha256": "1ghwrg7w9b3xhfj2yjxzd9ysbgrb81pkg6gqhiq3n2zsia18i87p" }, "stable": { "version": [ @@ -57403,8 +57557,8 @@ 20220704, 652 ], - "commit": "9d4474980f6955187a0800fd1f5669e3ba291915", - "sha256": "0cav7jaa32sslp0db8l59qfiml221i0j7jc6z0m03fahz7z4cvb9" + "commit": "3f992c8d4bfcdd92a936621058f677ee0a0ef5a9", + "sha256": "0bwdjcb3jn04jp6w31zxj0yjs99bf9n9av6kxcvaagkq9r7w4ajh" }, "stable": { "version": [ @@ -57708,11 +57862,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20220804, - 18 + 20220811, + 949 ], - "commit": "7dfc779dc6038125c516c7c7746994a54b96e409", - "sha256": "0jfc3slm0yxd7l533x5x575h8f6hzmzkf0iya6g1sdhw6kibs66h" + "commit": "eb7bf95d5b03bdb9b28647c89ea0a73e35fe0ad1", + "sha256": "1n7zdjf80saj0mwrlcfalk2s04d1cwsy13swp0dlj17cmjndzp66" }, "stable": { "version": [ @@ -58060,11 +58214,11 @@ "url": "https://codeberg.org/ideasman42/emacs-theme-inkpot.git", "unstable": { "version": [ - 20220731, - 435 + 20220819, + 28 ], - "commit": "a8a09d1c4f9044f89b480fcfec9cc9cd868190e5", - "sha256": "0dd6w7ffhhj2z3p1y2gy14byyvhcd7cfg4bvjzbjfd3xq1zb8g0g" + "commit": "4a488ddf2cd47949ee627af03743f66ee91177cd", + "sha256": "1byl4lrd82y7wr98c3bljfv9q1cpi44j7r7cjx37wmkfp464gq68" } }, { @@ -58654,8 +58808,8 @@ "deps": [ "f" ], - "commit": "08b1102c1f55011952aff818261a9478175a5b92", - "sha256": "0fsqa970gqxdrvjkgp468f1shpb7alzh50j1r5bpvkfx9ifdx40h" + "commit": "a8c9a9f71c34ba35f9754621ce4f70d19381e807", + "sha256": "02i5v16kxfx3zwvrwsb8k3xvzxq7qfqbfvpa0sr9bbqwhkcam2df" }, "stable": { "version": [ @@ -59165,8 +59319,8 @@ "ivy", "s" ], - "commit": "3b78a194298290babd1a35ed689f333a271471b6", - "sha256": "18k03gp52qykkphh53sj4q33lbw5mhqraqp0ng0md39cwfdwrxsd" + "commit": "30af5edfe6ce27738233050774356f9ab15d05d0", + "sha256": "10ln9dvxn2sm1dljxkb442qs685bihwzjh6n20c1zm4kfgw9nml1" }, "stable": { "version": [ @@ -59587,8 +59741,8 @@ "ivy", "rtags" ], - "commit": "c628efc9b485470a48aec2692d79f7c140bc5b92", - "sha256": "03avv7brbrj69368riq3xg4qh65yzl5cyjn9wc2rbyx4jw2q3p4p" + "commit": "b9c680e7ca003c103687e790f740d86daa6b4b17", + "sha256": "01f1vv71gimhsm6bzh0fxfmap54qs4wqnc5zj9barr9zvwpqmrbn" }, "stable": { "version": [ @@ -59620,8 +59774,8 @@ "s", "searcher" ], - "commit": "fcaa8087a0cb9e61bedc2102f47c8b9754968288", - "sha256": "00k8xn2jclq27f7y7k5mlqxjn6x3c1jzzsz88cjrrv12ifg698s6" + "commit": "0779b4122553375c169ba7a53001c55c9f6e42f9", + "sha256": "006df1wdvn5bc1hrkdpffcprvqz1qknhkb6538qz6nbr6kmxs5fr" }, "stable": { "version": [ @@ -59761,16 +59915,16 @@ "repo": "squiter/ivy-youtube", "unstable": { "version": [ - 20181126, - 1039 + 20220818, + 2146 ], "deps": [ "cl-lib", "ivy", "request" ], - "commit": "273788e0d22a06cca1050eb1205d3fbc2245d001", - "sha256": "0w0aifinr8v0sdbj0gasqacwh5gmsb0rcg6jwi8ppga944wlkb2y" + "commit": "3ef64d912a6b8e239a07d4fb67d6cbc7b3af2223", + "sha256": "1h5gr4na6y195s6cwqickxir0irjhl83xgjhfjqvi22rc4xgk07l" }, "stable": { "version": [ @@ -59859,24 +60013,6 @@ "sha256": "08q0hbm4pvp8sf261w1ihqa93sg8blfybfkhq7wrnvgs6kasgwvq" } }, - { - "ename": "jabber-otr", - "commit": "9219f685c18c8e799cae3dc43cc1c740c0f67733", - "sha256": "114z5bwhkza03yvfa4nmicaih2jdq83lh6micxjimpddsc8fjgi0", - "fetcher": "github", - "repo": "legoscia/emacs-jabber-otr", - "unstable": { - "version": [ - 20150918, - 1144 - ], - "deps": [ - "jabber" - ], - "commit": "2692b1530234e0ba9a0d6c1eaa1cbe8679f193c0", - "sha256": "0yv86nadp6dfzl05vhk8c1kahg2pcrhfmd3mnfjrngp7ksac5lyf" - } - }, { "ename": "jack-connect", "commit": "c0f5c5f8051f3046baebb08f41b0ca0bf0d73c85", @@ -60627,11 +60763,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20220524, - 2327 + 20220812, + 145 ], - "commit": "5e8eb048dd398597378eaf20842e410398bd5b55", - "sha256": "0qhp1p49b8mjnyr8lxlvwjdhnl36l5byyzb9psnf1iid7f306rki" + "commit": "75e484849a43e4ee844c1a63258e9ff1979cd06f", + "sha256": "1lpb46vw5gp4fyi0ax7v4gjlrfbsfyjsbdd2380ps347v6z1x2pi" } }, { @@ -61219,14 +61355,14 @@ "repo": "taku0/json-par", "unstable": { "version": [ - 20220723, - 829 + 20220815, + 1101 ], "deps": [ "json-mode" ], - "commit": "2c13ad1bc3c2a62141d3312501d2c2012555972b", - "sha256": "1f0aj6dl5f0gjsgkh12rk79akbrrf6whn79jpgmjc0pa22k1v66p" + "commit": "4f1fffd2595be3e3af0b5fb1e0c499ecee698273", + "sha256": "06wz6kd7y7yiawffkz348q8fw7lqdgh3y6j7waq0fnb6bg4drg9q" }, "stable": { "version": [ @@ -61576,8 +61712,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20220722, - 547 + 20220812, + 2248 ], "deps": [ "dash", @@ -61587,8 +61723,8 @@ "spinner", "vterm" ], - "commit": "d275f8a070431d2ce669a2844a28e5a65ee0c430", - "sha256": "0bzqgwhc2ks3gblbs78hgbyvxqc5qwvq426l3appx1srh52chizz" + "commit": "d411c022b9259d4e31055fc33323f878d07c6b7e", + "sha256": "19d8bvh8c6fd7flnl0idfnw54rzvnvd1wqak2ryk2lhpr17jm5zx" }, "stable": { "version": [ @@ -61615,14 +61751,14 @@ "repo": "shg/julia-vterm.el", "unstable": { "version": [ - 20220720, - 1410 + 20220825, + 554 ], "deps": [ "vterm" ], - "commit": "698ca35da04d99f25c8f075e8342015434f6a662", - "sha256": "0n6nif6vci5dxq1s9vv2awf953pa2g5snpzg61jxbqsv533rn01y" + "commit": "a82419796dbd2faf70b7cb41f484ccf36e6ae5dd", + "sha256": "1m2i9r02lk2inz87v5sk6zjhr0wkf8fbjwvzk80w1srga7f3ml4j" }, "stable": { "version": [ @@ -62074,10 +62210,10 @@ }, { "ename": "kaleidoscope-evil-state-flash", - "commit": "148d47626879be1608f35827ef82a28274ff4de3", - "sha256": "17a4nmdi6h0z4va3kiw4ivaywiisblz6cicypk9d3g9sl92drcvq", - "fetcher": "github", - "repo": "algernon/kaleidoscope.el", + "commit": "54f7c5e02f28bdf04be147fb2994cb589c77cfdf", + "sha256": "10vjkin1qcwyi21cbqhph3gxbbyknwzdfm1kncbbbcrqi6dj0a1f", + "fetcher": "git", + "url": "https://git.madhouse-project.org/algernon/kaleidoscope.el", "unstable": { "version": [ 20170728, @@ -62136,8 +62272,8 @@ 20160826, 1139 ], - "commit": "eda4f8666486689d36317db7dbda54fb73d3e3d2", - "sha256": "1m0s1kdgz1psiidpxcrzm8qmvmrmk5g2k8lz1lq357z482l4i7ll" + "commit": "9785fdca081a44ebb9869347b26130c4c3c4474e", + "sha256": "0awck4wgz21x0pcpv12s5ryvj10190hfnkrbhzsrs3fvc1gk4dgp" } }, { @@ -62759,8 +62895,8 @@ 20220704, 626 ], - "commit": "4b874662b2eb19d31426faa061d1307359f10013", - "sha256": "1frbnm2zsag28yz84zpsm17lfm623awx826n3b6ycy24j3vkibkp" + "commit": "ecbc2677de1cb68bb8b8e405304d7dfe6bce5668", + "sha256": "151aaxlh4v3h7yak0qljqi4dbxmzbjh0v7g81an42zail1825gn6" }, "stable": { "version": [ @@ -63015,8 +63151,8 @@ 20210318, 2106 ], - "commit": "714f4935085d4ac0c220fdf7183fb35175f8bcad", - "sha256": "0kmsqg6z490sywvkqmiz13r6cikbzg20rnxhis7xv6swfncq7w6d" + "commit": "2d9755ad8a82ba0777299cbc1666bed25278db94", + "sha256": "0bly219vmhxwvkaahgq4d92qr03davqdk0w84g3c3spl4iwhigsx" }, "stable": { "version": [ @@ -63506,26 +63642,26 @@ "repo": "emacsfodder/kurecolor", "unstable": { "version": [ - 20220808, - 1456 + 20220818, + 1336 ], "deps": [ "s" ], - "commit": "e4f4ee32f54c0c71551dbe5e4419d2c2727130bf", - "sha256": "04rck57mri2r0w9i69fyhwql0ka9g8vcicqjz1k9pl7a5lb5f6vc" + "commit": "e4b02142bb955e7f3f621b405520a42f9dd35aec", + "sha256": "1a3pq1px5876yps22gp71pb35qprma60nwm8sfzaxwi4s596h4az" }, "stable": { "version": [ 1, - 3, - 2 + 4, + 3 ], "deps": [ "s" ], - "commit": "2016973e92651f25518e130405155bb8728339e3", - "sha256": "0n6lgh3y6qx8rym74ll1z26cc7hihdxb3qny4ymrcyycywh2kmnq" + "commit": "528aefe83362b7d41fa7fe212033328b7a1577ef", + "sha256": "1bl9g0d3wzg7zqq3i24hfk7p3bpxl928hm7p00pp6sikncdz1sy9" } }, { @@ -63692,19 +63828,19 @@ "repo": "zakudriver/lacquer", "unstable": { "version": [ - 20220809, - 635 + 20220811, + 649 ], - "commit": "676919f5fc301451fcfb8553c3f8262a65c36192", - "sha256": "09irbdnw4crpp572hpv29hdcjp31l1a3rvhdz01v1i5hzbq59p9n" + "commit": "70650105be1b4c1ade34c0a1c3263d80b2388593", + "sha256": "0rzdc2v9gfj3mh2dvpb90ikvyk67cbmd6snadpraawypajgr7vyc" }, "stable": { "version": [ 1, - 1 + 2 ], - "commit": "71bf9e8464ae240db17204dd2b968260a9c4c305", - "sha256": "1y2vdypmr0bbmfm4xh6ss8r6rq41mpxgkrlrcfmxdlal1qzx93vy" + "commit": "70650105be1b4c1ade34c0a1c3263d80b2388593", + "sha256": "0rzdc2v9gfj3mh2dvpb90ikvyk67cbmd6snadpraawypajgr7vyc" } }, { @@ -63893,11 +64029,11 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20220702, - 529 + 20220810, + 1351 ], - "commit": "1d05bb74075879351a33fedc363a5f375a18b8e5", - "sha256": "0msirbjyf5daaycq3zvwsl4gxhk5lw1nxd492wzj4rb1m7dm4wk4" + "commit": "ba65c244ac931dbf9e8569f080dedffed88fb029", + "sha256": "1lyx8ywra09fw0pmlkzx3hbb7wqhxl2dmzdkj90f7wz2da1q1568" }, "stable": { "version": [ @@ -64020,15 +64156,15 @@ "repo": "Malabarba/latex-extra", "unstable": { "version": [ - 20170817, - 147 + 20220817, + 5 ], "deps": [ "auctex", "cl-lib" ], - "commit": "82d99b8b0c2db20e5270749582e03bcc2443ffb5", - "sha256": "15m7zvdhg5z7d8alrw66p703wdp5r57lxrgq3zz7xc4hscwghlb1" + "commit": "a81e7588448f85c5fcc3f3fc71cf957d0928a656", + "sha256": "0sajg5vmygnkcnmkrpf8r7c4b8v95hgsv1y6pz868jpznmldnxkb" }, "stable": { "version": [ @@ -64889,11 +65025,11 @@ "repo": "rvirding/lfe", "unstable": { "version": [ - 20220709, - 1956 + 20220822, + 911 ], - "commit": "d10af0a774d6d9c41ea78fe0185fdd0065a05d66", - "sha256": "1v9xawdmbbrqcax1n47dgysjr14nv1db63kmrjs8qq0ci9jb66dc" + "commit": "f7cfdd30620448df1b058467ac160b34d4b8105b", + "sha256": "07xccdww2bsz5jgd19xj7kn9drgqncamvl6px31qw6h2799x81g1" }, "stable": { "version": [ @@ -65035,11 +65171,11 @@ "repo": "andyetitmoves/libmpdee", "unstable": { "version": [ - 20160117, - 2301 + 20220821, + 1554 ], - "commit": "a6ca3b7d6687f3ba60996b9b5044ad1d3b228290", - "sha256": "039awlam3nrgkxrarcapfyc2myvc77aw7whrkcsjjybzylpzv0pr" + "commit": "cbc92f7245a80803851c36669b5275868d4cdd17", + "sha256": "1csmrw0dlmqnghs0cqgw9g88q83x85pk9jj4531bjf9cjg40b22f" } }, { @@ -65139,8 +65275,8 @@ "deps": [ "request" ], - "commit": "8182fa959477388b61c3a5d226e88e63ca2e87d3", - "sha256": "1azzb9cyc4k9sj0gab22d5qx2jfbxzzs89185jzhabappyf4zj5z" + "commit": "a926f07abc7b4daa22944f0e9ce393fe45094a5f", + "sha256": "1x6sb9r3bskjlksxdh65pqrk0saixb8ixjah30iwcyxhliammb9x" }, "stable": { "version": [ @@ -65155,6 +65291,21 @@ "sha256": "1z6qd4bcpwdpvi6w9yrkrnk2ypllhm6k4zjl8v1p8k0j93dbn3ny" } }, + { + "ename": "ligature", + "commit": "cab410fbe3e418503ed9e8262ad5fcf8e3967455", + "sha256": "0j0mm7aj194cpwwkjb4gm1raxj24j1dlvfjpaqxr36hzp23jfipw", + "fetcher": "github", + "repo": "mickeynp/ligature.el", + "unstable": { + "version": [ + 20220808, + 1225 + ], + "commit": "5eb950ada991705fdda4456970b0321241ee2bfa", + "sha256": "0dv58y4mifx9in3cfwk5d92aggyv5y1kymp94kxz1k8kdki8pa53" + } + }, { "ename": "light-soap-theme", "commit": "053be1123bb934d80b4d6db0e7e39b59771be035", @@ -65181,8 +65332,8 @@ 20220209, 755 ], - "commit": "5c772aac623b4216d06de5c73683402fd43f34ed", - "sha256": "1ly7p0503ydx364r2pnvwjwn4r86crmr8xmvlmifnwks79pb45hh" + "commit": "9642210b1ad3eecf9b273a3a70657841b35681b8", + "sha256": "0rj29m3k7s611k90nd4k7im135gcj4q8x5z9kj2063pz742iwi9k" }, "stable": { "version": [ @@ -65211,8 +65362,8 @@ "indicators", "ov" ], - "commit": "1b2dfa899409f4af2896fce6b9acbe98072abd59", - "sha256": "1xxmvdgqfj3lv33vn4pw3rdrxjmqypf09hh5w1jr69xbyl2ahzzp" + "commit": "3928cf1ba8492b8c0d79340ad7ba5bb5badb5374", + "sha256": "08y4l4qh6np8fvpipd2dfr81q0xiz7x3ra67c47ljayhxmz6056j" }, "stable": { "version": [ @@ -65472,8 +65623,8 @@ 20220704, 654 ], - "commit": "2d8df67f62b3aba0ea3c1dcdd41d83e39e3d8f8f", - "sha256": "1x8allkw2az7g6nz9fbak917rd0gydhvcaqs66xx61qhz26sfr0z" + "commit": "e2d62849a2295dbc9d457cfcfadca3769ee62199", + "sha256": "08mvh4magjqqn018p6j5bz3nv0yi2i9a8c5968gw5m8db0hvlhfp" }, "stable": { "version": [ @@ -65588,8 +65739,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20220804, - 1946 + 20220817, + 1839 ], "deps": [ "ace-window", @@ -65598,8 +65749,8 @@ "swiper", "zoutline" ], - "commit": "cdb7d32f2195ca2ed8df237aa6826bbd177b2813", - "sha256": "000f87v26fdy3ydqiisa53xhrnpf8phkjqxr60wyr8s7r6ng69y9" + "commit": "887a5a0a296fb361bdc6bb56974a5ac901c5ad21", + "sha256": "180p3930kfmdr5isxi3wsslqjb2i1a2sdjf1a1ing8x9f0iplvg9" }, "stable": { "version": [ @@ -65977,14 +66128,11 @@ "repo": "Atreyagaurav/litex-mode", "unstable": { "version": [ - 20220415, - 1704 + 20220823, + 2231 ], - "deps": [ - "cl-lib" - ], - "commit": "5d5750af2990c050c8d36baa4b8e7a45850d5a6a", - "sha256": "0kfij90iqslc6lnlpvj0hmfhfrfhp28ljd4zj6gv8wz02aldkjgd" + "commit": "c4a1071fcf6d2bec9eb367ede8c33b190e9ff802", + "sha256": "0bm3zx2ylrcs8apid2g6a6m5f27ahkvavqbprld5d0mfb1m42lw2" }, "stable": { "version": [ @@ -66066,8 +66214,8 @@ 20220518, 204 ], - "commit": "a700f04e9865cbb6da498681a09d7ea607b3883c", - "sha256": "0wmaxghjq6vmky0spfdgynmpkz748j5q9lx9nlqqylp60gw334nc" + "commit": "351820438f6f416ac9bc991a4d120cd6a4720158", + "sha256": "015f36bnhpkpsc8ig9ap3drwsv6w8vp8byksmjgl82lf396gzjza" }, "stable": { "version": [ @@ -66462,8 +66610,8 @@ "ht", "s" ], - "commit": "c5c2e8c3850417d8c1b0733b77a364002805863c", - "sha256": "0ifjv4c13jd2cgq3l3n88bsca2nayk40wm3v08a86ywmr9bpfrfb" + "commit": "7c110d94a7d17c55fc1fac489f307f2e6055d82e", + "sha256": "0cijmmqx66ar092mqnpmqn804qmnh8bqs7vv4wpg1pk6dq8k9mqp" }, "stable": { "version": [ @@ -66697,15 +66845,15 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20220731, - 202 + 20220821, + 1746 ], "deps": [ "map", "seq" ], - "commit": "10a9be5f0b143dee454bb64d2b5146e4509553d6", - "sha256": "0khsnpr1x834zm453ff8ri2i7kyhgxrn782nkzhc4blk6bjljr5p" + "commit": "e3835d4013da423cbdabbeac889a9a2a70ef17c7", + "sha256": "0ipj3927wdhdl8m7rmwills0337bs6j8wlk2n5ws31sjfhlqpfhw" }, "stable": { "version": [ @@ -66736,8 +66884,8 @@ "dash", "loopy" ], - "commit": "10a9be5f0b143dee454bb64d2b5146e4509553d6", - "sha256": "0khsnpr1x834zm453ff8ri2i7kyhgxrn782nkzhc4blk6bjljr5p" + "commit": "e3835d4013da423cbdabbeac889a9a2a70ef17c7", + "sha256": "0ipj3927wdhdl8m7rmwills0337bs6j8wlk2n5ws31sjfhlqpfhw" }, "stable": { "version": [ @@ -66799,14 +66947,14 @@ "repo": "abo-abo/lpy", "unstable": { "version": [ - 20201027, - 1425 + 20220818, + 1613 ], "deps": [ "lispy" ], - "commit": "076ce9acb68f6ac1b39127b634a91ffd865d13d8", - "sha256": "10sab50wmr3zn7jgzx93201ymhmacqacn3m2qllsqkfw2gpsi6dn" + "commit": "ce78a4613458790cc785c1687af7eed8f0d8d66c", + "sha256": "1vxrjy6k030hcbclblgcaaw7h6k17kl3n9zla08527525c0gma01" } }, { @@ -66817,15 +66965,15 @@ "repo": "LaurenceWarne/lsp-cfn.el", "unstable": { "version": [ - 20220707, - 824 + 20220822, + 1545 ], "deps": [ "lsp-mode", "yaml-mode" ], - "commit": "8228864e0b16f7107300fb6b8ba595bb84f016fd", - "sha256": "1gshnby7682ymqk6n10n6sr42grlbbwny1n887s5w348z6vlxq93" + "commit": "55203d41d767c091511599fca236c1f9c39cd58a", + "sha256": "0xmv3aqlfp4qk9vmahzmn58m8m0i7929x1mwy2rh33jx08v67xv3" } }, { @@ -66940,8 +67088,8 @@ "request", "s" ], - "commit": "ece2c7d8c119213d4622deca756f4affedbabc42", - "sha256": "1yfvmdcpa9qr2vmh6lkxip5vmxj5z7rb9k4fn1xvbw5hbdljpmgx" + "commit": "1fa44a3f9ccffb09021bf05a5e7d905061fe5a95", + "sha256": "0rsx9aysb3a2h0yp48ij58dfzh2hb106f9kxmz3124xx6xs5f0mq" }, "stable": { "version": [ @@ -67037,8 +67185,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20220623, - 455 + 20220825, + 450 ], "deps": [ "dap-mode", @@ -67050,8 +67198,8 @@ "request", "treemacs" ], - "commit": "a1aff851bcf4f397f2a968557d213db1fede0c8a", - "sha256": "1qbgs2r92fbrhwxdpwzmfmac7vhcfc26i90a23pxk50dbh5byyyb" + "commit": "13b92b097f91f9296ca65a1dc3eda992315c67ea", + "sha256": "1dzcrlwdsnvm1l0jiwqn2q48nzx792dhrvab5jhfqlva4ivw5h0x" }, "stable": { "version": [ @@ -67198,8 +67346,8 @@ "deps": [ "lsp-mode" ], - "commit": "18b0e8608408f9e913d89075e78c2b4e3f69cf1c", - "sha256": "1a0vlcnw7dzaz3ypav7ws5nfs8p8rg7rfjm302fbf8sz167rb2xq" + "commit": "b673fce2c46d00da216a32a6c04558c3cbb68939", + "sha256": "02l5hy10rvqnzjx7hfp5g2cn4cggq10bj31j7q9n66qy76smbi5a" }, "stable": { "version": [ @@ -67268,8 +67416,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20220808, - 1239 + 20220824, + 721 ], "deps": [ "dash", @@ -67279,8 +67427,8 @@ "markdown-mode", "spinner" ], - "commit": "ece9bcdc01953c794533b734b24931485c0070fb", - "sha256": "11xn75rxlgm9xfwbfb9mdk8snh9rnlvyyncvlb54mc3y7xdqhy9q" + "commit": "9c47b6d44f6fd78410f13e496d83682dbd52da0e", + "sha256": "0gn63a5bmnf8l3ddq7rw2afmy3r7i5z92zy7zfkprq92322ibzks" }, "stable": { "version": [ @@ -67594,15 +67742,15 @@ "repo": "merrickluo/lsp-tailwindcss", "unstable": { "version": [ - 20220601, - 1509 + 20220816, + 1602 ], "deps": [ "f", "lsp-mode" ], - "commit": "09377d5bbb742f11c458481905ddbb022dd2b0da", - "sha256": "090ymnd24cd2665b9kb32yxwvbbrcxc884s68b9g1x59z7wmw42g" + "commit": "6cff7196d0742a359a58c21a719a2cd436006e12", + "sha256": "0sxs6p4sglk753q6q2ysqbfr7gbybqc5l76y8f4ima6i66sjn4jm" }, "stable": { "version": [ @@ -67661,16 +67809,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20220723, - 1213 + 20220823, + 1626 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "8d4fa5a14f5b5c6f57bc69f454eba6861ed2ba9f", - "sha256": "1z3gfv6ca1ssyyaggzpaljybzrilh77lzqrixm9napzfv3aa795w" + "commit": "d8cce7dc154aa3216c080dd5c6fb827bdba9a312", + "sha256": "0b7gfyrrzxr3x6vr7mcl3ha60ssmhk77fc250impxqg62ckr2nbx" }, "stable": { "version": [ @@ -68005,14 +68153,14 @@ "repo": "amake/macports.el", "unstable": { "version": [ - 20220808, - 41 + 20220820, + 1110 ], "deps": [ "transient" ], - "commit": "4e5e80721df474d1a4fa8c8ad4123d6435b8b4ac", - "sha256": "1wb56g1xd0avby1hqxk7q71fbdnaxqhaq1gmc8zcxlr3adip4lna" + "commit": "771f1a71ac9e93b4328089ec133ef2dd0f287b0c", + "sha256": "1hzv2i7dn6q1wyal12s72rd74zxfrxs69ic0bhh40a11089zjll3" } }, { @@ -68199,8 +68347,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220806, - 702 + 20220821, + 1819 ], "deps": [ "compat", @@ -68210,8 +68358,8 @@ "transient", "with-editor" ], - "commit": "8a0cc83eff98489d3685b8585afdcebbb47c1393", - "sha256": "0hf3zyxwhknnkgcms5phwf5qrbzjkj5c8kpmynzb9bwr6ba8yf6p" + "commit": "712be4632b0ddc7899ca90db8f9be20d90b4326f", + "sha256": "08dk0vdvsxc2pvvk5h3xf2pxb572scsjd4mcj19lqhrzkcwnxgsd" }, "stable": { "version": [ @@ -68577,8 +68725,8 @@ "libgit", "magit" ], - "commit": "8a0cc83eff98489d3685b8585afdcebbb47c1393", - "sha256": "0hf3zyxwhknnkgcms5phwf5qrbzjkj5c8kpmynzb9bwr6ba8yf6p" + "commit": "712be4632b0ddc7899ca90db8f9be20d90b4326f", + "sha256": "08dk0vdvsxc2pvvk5h3xf2pxb572scsjd4mcj19lqhrzkcwnxgsd" }, "stable": { "version": [ @@ -68628,9 +68776,37 @@ "ename": "magit-p4", "commit": "e6c16a59ca48a0b17cae90354e8929d31a5eef1f", "sha256": "1c5qv1f2d8c114a5z21j0nkw285k3gx787l0c3cd9ls7awxfp1is", - "error": "Not in archive", "fetcher": "github", - "repo": "emacsorphanage/magit-p4" + "repo": "emacsorphanage/magit-p4", + "unstable": { + "version": [ + 20220822, + 2022 + ], + "deps": [ + "cl-lib", + "magit", + "magit-popup", + "p4" + ], + "commit": "0fd0f882eb14510714393c15c2ccb8d2c259f01e", + "sha256": "0wdclkkqlfswqbsg8ld1gqji1rnxpl8s00ym7imgqdf1is961qj1" + }, + "stable": { + "version": [ + 1, + 2, + 1 + ], + "deps": [ + "cl-lib", + "magit", + "magit-popup", + "p4" + ], + "commit": "0fd0f882eb14510714393c15c2ccb8d2c259f01e", + "sha256": "0wdclkkqlfswqbsg8ld1gqji1rnxpl8s00ym7imgqdf1is961qj1" + } }, { "ename": "magit-patch-changelog", @@ -68726,15 +68902,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220803, - 2341 + 20220810, + 1158 ], "deps": [ "compat", "dash" ], - "commit": "8a0cc83eff98489d3685b8585afdcebbb47c1393", - "sha256": "0hf3zyxwhknnkgcms5phwf5qrbzjkj5c8kpmynzb9bwr6ba8yf6p" + "commit": "712be4632b0ddc7899ca90db8f9be20d90b4326f", + "sha256": "08dk0vdvsxc2pvvk5h3xf2pxb572scsjd4mcj19lqhrzkcwnxgsd" }, "stable": { "version": [ @@ -68753,9 +68929,33 @@ "ename": "magit-stgit", "commit": "72a38bbc5bba53dfb971f17213287caf0d190db0", "sha256": "1spli6yq258zwx95y16s27hr7hlc2h0kc9mjnvjjl13y2l6shm0i", - "error": "Not in archive", "fetcher": "github", - "repo": "emacsorphanage/magit-stgit" + "repo": "emacsorphanage/magit-stgit", + "unstable": { + "version": [ + 20220822, + 2023 + ], + "deps": [ + "magit", + "magit-popup" + ], + "commit": "cd1e04e63002ea47f7b858dbe475e90150ae6c00", + "sha256": "01s16dwmbm3yiibd09i39dqabh1bga1lccyyww689jis5iz1jd09" + }, + "stable": { + "version": [ + 2, + 2, + 1 + ], + "deps": [ + "magit", + "magit-popup" + ], + "commit": "cd1e04e63002ea47f7b858dbe475e90150ae6c00", + "sha256": "01s16dwmbm3yiibd09i39dqabh1bga1lccyyww689jis5iz1jd09" + } }, { "ename": "magit-svn", @@ -68765,15 +68965,15 @@ "repo": "emacsorphanage/magit-svn", "unstable": { "version": [ - 20210426, - 2114 + 20220314, + 1451 ], "deps": [ "magit", "transient" ], - "commit": "350493217afdb7637564e089f475909adecd9208", - "sha256": "1v1y4fir1plz4kj0cvkcd29wibli4dw7vp4fmbxq4df76d8iy8yd" + "commit": "b8277081db90977247ae3900ea6afeb0ca644d36", + "sha256": "1ywwylxasgyk6gldypvbn6hlbmkp24rx6kcd0qvxsp39bbd0in50" }, "stable": { "version": [ @@ -68827,8 +69027,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20220326, - 519 + 20220822, + 2224 ], "deps": [ "async", @@ -68840,8 +69040,8 @@ "s", "transient" ], - "commit": "67fd80c2f10aec4d5b2a24b5d3d53c08cc1f05dc", - "sha256": "00hs3a9hpxmwsrd8xxwn9cpxk69x5ghmxq205aqpr7mjigcg7n2d" + "commit": "c5030cc27c7c1a48db52b0134bf2648a59a43176", + "sha256": "0j32zslcbiaq2a6ppyzdq4x59payya5hzd2kpw3mdj0p479byz19" }, "stable": { "version": [ @@ -69335,8 +69535,8 @@ "deps": [ "manage-minor-mode" ], - "commit": "e47d0e1856f0a9eb9935abdaf6e14e67ef2ab4cc", - "sha256": "1aqmm5r0wqdfvac3nqwpali2b8lk7vwjs9fww5dhcwmsna8mr9vk" + "commit": "dd1c23ecaeaabba8d72f2a0822eefd6a2df9fcb7", + "sha256": "0zf0fga88sl34dnzfmdv5161wp8y7avrr4phka984gmjghplmkpc" }, "stable": { "version": [ @@ -69881,8 +70081,8 @@ 20220704, 753 ], - "commit": "14f490b8683bdce53a6272fcc28a9b4137f86a24", - "sha256": "0vkf98hbcla6gl4xvy0wln87msjh5wf9dhnyscbqavgwql6m07k9" + "commit": "8a54972a893d28ba79dcd832d55c446a8db43d62", + "sha256": "14p382gz8fkx8r34v3b1p460i3c2wx79q34l08rjskg5511zgaf5" }, "stable": { "version": [ @@ -69962,15 +70162,15 @@ "url": "https://codeberg.org/martianh/mastodon.el", "unstable": { "version": [ - 20220808, - 1410 + 20220820, + 1427 ], "deps": [ "request", "seq" ], - "commit": "3ff8f250c3a0e0ab0670cf7af72a2607950e4b5e", - "sha256": "1w3mk7y37jw8m69c1vsjx7z0d4qvzsys1022x070dfjxvis1s8r7" + "commit": "003fada37fee8e2e0b627f10356fcfd64c86a616", + "sha256": "12iw8alzmvm11pbrj353zpm4c7gk9p6vg7nn4k24h7qz32naalbc" }, "stable": { "version": [ @@ -70017,16 +70217,16 @@ "repo": "matsievskiysv/math-preview", "unstable": { "version": [ - 20220604, - 1107 + 20220812, + 430 ], "deps": [ "dash", "json", "s" ], - "commit": "a7254ba89a524f30c1acfdbde07a179271f02658", - "sha256": "1d1s1ff49xb5rdmphgx2g5n5mmjrkrdi38wqijlkr6jj15d5lrig" + "commit": "226f2be25d74f6f8224eb7aa96dfb1985aeac722", + "sha256": "0bl28b7pb80jbjvqjc1ir1had5yr5p4nr09zbj3mdxm6nxwz7p9w" }, "stable": { "version": [ @@ -70179,8 +70379,8 @@ "s", "test-simple" ], - "commit": "1334f44725bd80a265de858d652f3fde4ae401fa", - "sha256": "1h1lqrl3p9qgkicds8v44vdry19g53rya56hdj3cz5q8xj1nisn1" + "commit": "1913ee496bb09430e85f76dfadf8ba4d4f95420f", + "sha256": "1milqql0p9gp4dn9phn4fw1izf37wizpirvmzh5s71rwzrr6a9ix" }, "stable": { "version": [ @@ -70623,8 +70823,8 @@ 20220630, 1249 ], - "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", - "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" + "commit": "60518062c77e1d27a7d135a24a7c31bbf27290ba", + "sha256": "0sqmp7gsjdlh8jdi8sp17smx3da9pl6r45888r6j2g8ivh3x0zbh" }, "stable": { "version": [ @@ -70652,8 +70852,8 @@ "auto-complete", "merlin" ], - "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", - "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" + "commit": "60518062c77e1d27a7d135a24a7c31bbf27290ba", + "sha256": "0sqmp7gsjdlh8jdi8sp17smx3da9pl6r45888r6j2g8ivh3x0zbh" }, "stable": { "version": [ @@ -70685,8 +70885,8 @@ "company", "merlin" ], - "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", - "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" + "commit": "60518062c77e1d27a7d135a24a7c31bbf27290ba", + "sha256": "0sqmp7gsjdlh8jdi8sp17smx3da9pl6r45888r6j2g8ivh3x0zbh" }, "stable": { "version": [ @@ -70747,8 +70947,8 @@ "iedit", "merlin" ], - "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", - "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" + "commit": "60518062c77e1d27a7d135a24a7c31bbf27290ba", + "sha256": "0sqmp7gsjdlh8jdi8sp17smx3da9pl6r45888r6j2g8ivh3x0zbh" }, "stable": { "version": [ @@ -70981,20 +71181,21 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20210422, - 326 + 20220824, + 148 ], - "commit": "68695ed0e012379556d57f9564ac5ad8cd68fbb8", - "sha256": "1qk9kshi4hyy0fni3gb383m0yvj4fmgidiab6vhnms5zgghj4kl7" + "commit": "b641fbcf33ac2b8a0de7b80536b42ce035428625", + "sha256": "0wy98gfj7vfmw8rj2zal1jrywsi7p8k4jr5m9rnwhj8v8ld1cw7d" }, "stable": { "version": [ 1, 1, - 11 + 12, + 1 ], - "commit": "c1b386f3522054f063f4ac60730397ed1f724478", - "sha256": "0d0s9hxjvv39n1rik894yh7d20aw120r6cadyp4hqw4n24j8cs5q" + "commit": "b641fbcf33ac2b8a0de7b80536b42ce035428625", + "sha256": "0wy98gfj7vfmw8rj2zal1jrywsi7p8k4jr5m9rnwhj8v8ld1cw7d" } }, { @@ -71076,8 +71277,8 @@ "repo": "danielsz/meyvn-el", "unstable": { "version": [ - 20220723, - 1800 + 20220821, + 2242 ], "deps": [ "cider", @@ -71087,8 +71288,8 @@ "projectile", "s" ], - "commit": "20878c2c059d1302b169f6c0252641a176a3f327", - "sha256": "1lhds8k74rcqqd71j02y4n2ci3sh4xyc6d0475qj8sam3j6f329w" + "commit": "43b2061f907dda533abd3136dccdb1ce467ec6c0", + "sha256": "0jrqxk0sf6360sm7b78cbmdkhi4ihgdjsyxgw5qn8xl81n41xas1" }, "stable": { "version": [ @@ -71110,8 +71311,8 @@ 20220806, 306 ], - "commit": "3cea4223657cdbb32fcb0afc54bb736388dfbd5e", - "sha256": "018spmlvb30x8qxvsr8avbngvcn0qcvzyh5520jwrm0q0yhnvb4x" + "commit": "d547c39a164a7de0c7d2dee800f565313a6c53a6", + "sha256": "0ydbdxj9y528f95xi97ji1d0pi67s90gk2b56z8s0dy2gw4zklcw" }, "stable": { "version": [ @@ -71281,11 +71482,11 @@ "repo": "erikbackman/mindre-theme", "unstable": { "version": [ - 20220725, - 1404 + 20220819, + 1 ], - "commit": "b8a2942524c75aa94505ee05c82ecfb803f04f7f", - "sha256": "0svnmxmr1wip6f6aq6j8mg4w155znmkm8mmk70k4kl92dc9l2f6i" + "commit": "9fd58e5d60d786451bf2d2836947d0c7ab25c896", + "sha256": "10dvknibjk79as96j8ghxv4zy4s44p9v4v4465912wlzari29zs8" } }, { @@ -72189,26 +72390,26 @@ }, { "ename": "modus-themes", - "commit": "efe3a60d8d9f467713e928b3890233c1224c3128", - "sha256": "1j4vp4j6z916mh0b2g5rzii0h9xnl1ambiaqvl5i8jycmwd38gg0", + "commit": "746947a065c8fd26bfb540c96d869d05a0bd9b53", + "sha256": "09mbsb1l80mzkyk16ixx3dn3zdwz4lyw8n1pcphiiv0b7d6q0l25", "fetcher": "git", "url": "https://git.sr.ht/~protesilaos/modus-themes", "unstable": { "version": [ - 20220809, - 1644 + 20220823, + 1919 ], - "commit": "2b0c31b94ddb82307181dcf0078cee2f3c187aec", - "sha256": "14lm9vn2w3nm5iszi2ghsdzw6krf3lp28l91hn2xhijv8364v3pd" + "commit": "777089c0ffaabadc10cefead3737fabe24b9004c", + "sha256": "16n87jns4i72369zm5xsa7skqcrq6bf5w1bxwn7q5w4h1694ry2g" }, "stable": { "version": [ 2, - 5, + 6, 0 ], - "commit": "64f9378a5114399f3a47c9d23136af677c25e513", - "sha256": "0ng85240zabw87ac53xnrlrafp10ns5wn6dgv9d1jxvnq40p7zqz" + "commit": "976f52b34a23b9d42cbc94f2a31636af5771a5d6", + "sha256": "1zl1gd3jlkanjmlsxmwhqaiwyblp6kzznfjnw9cq8ah2390y9n1c" } }, { @@ -72851,8 +73052,8 @@ 20210306, 1053 ], - "commit": "d1f5657f9b43fdf06852424cfb4f1a6fe2bc5171", - "sha256": "0hwdas1njbf8iy5shhr4ijblq2ksznby83mz8q793qrbfxi1d2dy" + "commit": "72f91f31936afa9b8f0bece819bb767915a7f14d", + "sha256": "044zpskdi84c6i0spn5502svpgvlhabiadmc6l57144m7k383djh" }, "stable": { "version": [ @@ -73712,14 +73913,14 @@ "repo": "magnars/multiple-cursors.el", "unstable": { "version": [ - 20220613, - 2122 + 20220821, + 932 ], "deps": [ "cl-lib" ], - "commit": "225fc0e889e094bfd2913cfd448084cb49211ac6", - "sha256": "0j0958ziik1wpdxb4clyxcl1fzs6ar51vlk8rrqdzwb8if8h9z21" + "commit": "1e4842d1297241a5277bfd5c7bfab9e8711da60a", + "sha256": "0qrkgbihbax422x0y0hhdx9aflplp4cbc089ry3dbzyl09s7mwfl" }, "stable": { "version": [ @@ -73924,15 +74125,15 @@ "repo": "agzam/mw-thesaurus.el", "unstable": { "version": [ - 20220629, - 2024 + 20220822, + 2112 ], "deps": [ "dash", "request" ], - "commit": "39d27eb4511588160b72078b67e11ce645dc76ee", - "sha256": "0nrql6vlbibymrq12pcwa65qqqw922lqf71xh228wcgnj94mhxhl" + "commit": "bae48760b09f750359ef702875fdde783be2ce4d", + "sha256": "1adi97y6qx5shn3mfx0f420ad051wx641f3y78s4sr2qgd2y0787" } }, { @@ -74192,11 +74393,11 @@ "repo": "kenranunderscore/emacs-naga-theme", "unstable": { "version": [ - 20220724, - 2023 + 20220824, + 2032 ], - "commit": "c5ef0baf1d2e95bc613e99700c38a1227cabe187", - "sha256": "133d871a1rrapnkjv5nhll1gc14ih3n045v5brmmr642w97ri9dh" + "commit": "5f22695256f909667ee416d5f26abc1bc809daf9", + "sha256": "13g3r32xxcskcdbxjpmj5q8dks4pzil53q9hvg3j0h4622519y5c" } }, { @@ -74778,8 +74979,8 @@ 20220514, 2039 ], - "commit": "77f33fc765decce01d5ad7905e908ccbf2233307", - "sha256": "1cz04p6lh4wrr8b8f09qfp98mghvzw9bbabd73xqhiyzx969948c" + "commit": "2e08696672f64fcacfa148c45f255c8c1bd441f8", + "sha256": "1ca5nw713n38cv550d706d70rphzvxnvgf9wrf16xyadqd766lfd" }, "stable": { "version": [ @@ -75317,8 +75518,8 @@ 20181024, 1439 ], - "commit": "d4017a2b1ea642f12dabe05ec99b2a16c93e99aa", - "sha256": "1clg0v1kl6aspwssw90qdrzdvd3dw9d86ffh6wydl45v6mylq0d1" + "commit": "b5f521a16173f51995523da436d1fe5bbd4dbd46", + "sha256": "17f0jqiaqwaj794z8svz2k4r4q0cwhygkxj9qj48whkjlgzi1wkg" }, "stable": { "version": [ @@ -75478,11 +75679,11 @@ "repo": "jwiegley/nix-update-el", "unstable": { "version": [ - 20220809, - 412 + 20220816, + 2212 ], - "commit": "1dd1434a2fcc054ad0046cca0563a292e890d59b", - "sha256": "10h6q8j6p9pvhja6ldpbh1s57lq0wpzy11wcbqknsyv0wpbrcpwk" + "commit": "aab70a38165575a9cb41726f1cc67df60fbf2832", + "sha256": "01cc86wvlwl5sy758vcjhwwh1has4ng6sqyrsd5y610qahs8cbib" } }, { @@ -75758,16 +75959,16 @@ "repo": "thomp/noaa", "unstable": { "version": [ - 20220803, - 1427 + 20220812, + 1535 ], "deps": [ "kv", "request", "s" ], - "commit": "beacb05f7298228dce4d494fb41c73d26991e15c", - "sha256": "1ak7c2qy80idk1izs3xjw7nlsd9hjvig5qxqf1bwmiqrrdbcqsgs" + "commit": "c691e770da0f1ed5b83c656087dfbc2ff231bef7", + "sha256": "01whmrfikxmxz2dmg1hy7myp68cvnblvb9blvk872k30y8yv074n" } }, { @@ -75989,8 +76190,8 @@ "repo": "p3r7/norns.el", "unstable": { "version": [ - 20220707, - 1006 + 20220821, + 1614 ], "deps": [ "dash", @@ -75999,8 +76200,8 @@ "s", "websocket" ], - "commit": "fea64be77d413ef3d8442a9699b3bfc53859ae80", - "sha256": "0wllc4qmfc7jc2jlri7bwbkpm5745g8fzpjp6k9pawja5yl0rw7y" + "commit": "022b433334cd1db4f83e77f055cd89e9f857076d", + "sha256": "0bbzna234f5ldmjn9nfh1msxi8m8fs31zl8fswsk20cdgd58mba2" } }, { @@ -76056,19 +76257,19 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20220807, - 1005 + 20220811, + 1025 ], - "commit": "6d6d2a5fe7a04cc8de43d6b27844c50f02d749ed", - "sha256": "0rv19isfggcxzwd7d071i1rh4mix4hf7bnj21w20c6kvryfpfr2b" + "commit": "76c3147613d0cb624573a5ba1ac7d0a5f81113bc", + "sha256": "029rw79niz8r50h1nfv9v5j7ckvkp0i99nwac23v9cfdwkb439n4" }, "stable": { "version": [ 0, - 36 + 37 ], - "commit": "a9b5f8959a20bbce774dec8a65a8b207555e52bd", - "sha256": "0dxvavdn97gicsjdfbrfbx1qz140ri3qdyfyxs5xxmmmc3c6gxjd" + "commit": "c864b59942d510a4f6a1a46db1b8e13b7f40f7ee", + "sha256": "1ql0rm8krsrg4lrcs164j338kr357051arwn9y3rw5bmv6jvxkq4" } }, { @@ -77685,14 +77886,14 @@ "repo": "alf/ob-restclient.el", "unstable": { "version": [ - 20220618, - 2139 + 20220819, + 2228 ], "deps": [ "restclient" ], - "commit": "3ac834b02b8276aae1b760312612c3b940598f90", - "sha256": "10x1ll090ihgjgzr76194mfc1z7yh3sr19dh0h561910gy97w2wk" + "commit": "1b021ce1c67c97fa1aa4d2c0816edb7add129e48", + "sha256": "1bcjj01q5n9w2cch6brbz8pzwnwsmdlgaa4sf5s97b9frmqb2ffg" } }, { @@ -77721,11 +77922,11 @@ "repo": "micanzhang/ob-rust", "unstable": { "version": [ - 20210204, - 244 + 20220824, + 1923 ], - "commit": "30fe7e7181f44443d02e905dda77f83ec4944e76", - "sha256": "103j84iblzw87p12w1vjinfsq6zif47lvmjzs0456d8kwli0hpkp" + "commit": "be059d231fafeb24a658db212a55ccdc55c0c500", + "sha256": "0r6ckhnyr824s4isz8z6hbd7ix9fyg9pha115km9pvafhcw05xdn" } }, { @@ -77938,8 +78139,8 @@ "org", "swift-mode" ], - "commit": "31cfe991eb171bb0d2f53cf621be1b9d91573ac3", - "sha256": "1l2n4ijf3sfgj05xzvnb1cd9k24ynh2cg36yj386bq7kadamympc" + "commit": "0a568c309eb2601b6e832e6c1661fdc908d761ca", + "sha256": "1pdppwfg1j07pisxakphyj9zys4b2dz61wy435386h53cil9408b" } }, { @@ -78160,36 +78361,35 @@ "repo": "licht1stein/obsidian.el", "unstable": { "version": [ - 20220808, - 2351 + 20220824, + 1728 ], "deps": [ - "company", "dash", "elgrep", "markdown-mode", - "org", - "s" + "s", + "yaml" ], - "commit": "49b4712b407a3542bbba50d3f74e1bb45025e255", - "sha256": "1x9y6mq72f3p53fcp6p2jv48xjph1i704d7q46gn1hvxbpryvhzz" + "commit": "324d614d36c2dc9dd5326952b7c44d40453b2b9d", + "sha256": "0lv7j3l8fkfpvpm7367cildjvs1khkw05918hrz5ssyljsvp49pq" }, "stable": { "version": [ 1, 1, - 0 + 2 ], "deps": [ - "company", "dash", "elgrep", "markdown-mode", "org", - "s" + "s", + "yaml" ], - "commit": "ef5f4174acdc8c6ef38707103f2a05223ad4481b", - "sha256": "1l88ixp3nyi7j4302pdkgi02vmyqm7amk46cz5pkwh8lf74pk9jc" + "commit": "0952bcbac335a8eebe6f7d40458eb3342474ab42", + "sha256": "0x7z9jvz1fa0b8wjsaxmcb8snf4l1s1z4va80ivn4wck0an4f9c9" } }, { @@ -78218,8 +78418,8 @@ 20220707, 751 ], - "commit": "9cbd8150c28f70ba6315c347a833a4ac8c85c481", - "sha256": "071fsdl67c0wis521i2w7mw85ijavxc7c458minanwqamabjvsck" + "commit": "aabb34f3eced86d1b834b6bbcbb258816f540508", + "sha256": "00ryzyq4w140nsjm784f6r3raab3rz5ip8cb9hsx0azxihqp72yy" }, "stable": { "version": [ @@ -78773,8 +78973,8 @@ }, { "ename": "omnisharp", - "commit": "e327c483be04de32638b420c5b4e043d12a2cd01", - "sha256": "0gh0wwdpdx2cjf95pcagj52inf7mrmiq7x8p0x5c7lvl4pfzhh87", + "commit": "746947a065c8fd26bfb540c96d869d05a0bd9b53", + "sha256": "1h6va10yyz21vp3h6z1g49gxd7s9h70pi6cmq93zycc6h8gnj0g4", "fetcher": "github", "repo": "OmniSharp/omnisharp-emacs", "unstable": { @@ -79134,6 +79334,36 @@ "sha256": "12q09kdcgv6hl1hmgarl73j4g9gi4h7sj865655mdja0ns9n1pdb" } }, + { + "ename": "orangey-bits-theme", + "commit": "b32596675ebc0c403abdad2cda8b1eba7d548765", + "sha256": "17rcbjxd5v8qkzzmh6nskxzs4n9d9jnd93dnr8z7n7xyawjzkvlw", + "fetcher": "github", + "repo": "emacsfodder/emacs-theme-orangey-bits", + "unstable": { + "version": [ + 20220822, + 324 + ], + "deps": [ + "autothemer" + ], + "commit": "b3b8844c41792e08b65342f9479e1738d4e329c2", + "sha256": "0wx8cdvdqsx2z41x515drywgh78xlbrdqap2pz8jv56nq3mj63s1" + }, + "stable": { + "version": [ + 1, + 0, + 2 + ], + "deps": [ + "autothemer" + ], + "commit": "533856d399cb4098300bcaf4a2d20920395746f8", + "sha256": "0a7xs9rwj2n44zny3fw9h65lz721bql4jdzanj9z7fx544r54x46" + } + }, { "ename": "orca", "commit": "f4d9cf89c58a9b36b7c2a42de2aecb3b60001908", @@ -79322,30 +79552,30 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20220712, - 1916 + 20220817, + 655 ], "deps": [ "dash", "promise", "request" ], - "commit": "4c3b27efe8eed9a9c8b5636fb15b86975ef7e00e", - "sha256": "19vig86ivx4gycfa54yi8k66zkp45sp8b082673xkmhrvvnnjm0a" + "commit": "4ed63cbebb35d7427d92652df209b0450655e5ac", + "sha256": "0zsrvkp4cp65yzqhhx5bzj6bskrjwzvgnsf9nxpf0m0wdcpqxvv6" }, "stable": { "version": [ 1, 0, - 4 + 5 ], "deps": [ "dash", "promise", "request" ], - "commit": "4c3b27efe8eed9a9c8b5636fb15b86975ef7e00e", - "sha256": "19vig86ivx4gycfa54yi8k66zkp45sp8b082673xkmhrvvnnjm0a" + "commit": "4ed63cbebb35d7427d92652df209b0450655e5ac", + "sha256": "0zsrvkp4cp65yzqhhx5bzj6bskrjwzvgnsf9nxpf0m0wdcpqxvv6" } }, { @@ -79386,11 +79616,11 @@ "repo": "bkaestner/org-arbeitszeit", "unstable": { "version": [ - 20220328, - 1951 + 20220816, + 1447 ], - "commit": "60e6adfe457bcc4ee47e3e5805b6b40544f98ee0", - "sha256": "0m93d60bybw2sjw75h65y76r9aspdfpv846pwm6xvjph9v614dgy" + "commit": "b22ae3292b24772aa37dd5a54cd551f7312b6213", + "sha256": "0ns1s0n0nckwkr6akrk2sdwwc0xj636qry1jvvys3rp2irjh6g0s" } }, { @@ -79439,26 +79669,26 @@ "repo": "yilkalargaw/org-auto-tangle", "unstable": { "version": [ - 20220809, - 1711 + 20220812, + 2327 ], "deps": [ "async" ], - "commit": "69c4aa39f33c157f124db81050928838aee54704", - "sha256": "04i7clcsalq56raw356cn5fis5ghc3dlcrmvs375pd6gwv85rlks" + "commit": "2494a6f78c9db5311123abc7cad119851a29a55c", + "sha256": "1kn1jsbv97ps280lcdx19d6hs7pvz7q9ng67xlb1kwjb680pa7rl" }, "stable": { "version": [ 0, - 5, - 1 + 6, + 0 ], "deps": [ "async" ], - "commit": "bce665c79fc29f1e80f1eae7db7e91c56b0788fc", - "sha256": "0gj3sqzg5zzqb84vbf08wyqkynyz0zzs4hy5q83zgz02mwwjbv01" + "commit": "2494a6f78c9db5311123abc7cad119851a29a55c", + "sha256": "1kn1jsbv97ps280lcdx19d6hs7pvz7q9ng67xlb1kwjb680pa7rl" } }, { @@ -79486,8 +79716,8 @@ }, { "ename": "org-babel-eval-in-repl", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0brqp0w9s28ibws4idlm1rw09lsfa98l5wbpwm64rvlixhs6zlnx", + "commit": "746947a065c8fd26bfb540c96d869d05a0bd9b53", + "sha256": "00glg9sscvzkfyp0gf989yqwqz67y607n545x4rchz2bnqw8w2wa", "fetcher": "github", "repo": "diadochos/org-babel-eval-in-repl", "unstable": { @@ -80772,8 +81002,8 @@ "dash", "request" ], - "commit": "93629335727d855e8795470e78282c9dc532c839", - "sha256": "050sf6i8y28hl0d90y0hr4p5gzmsf3v728ghrj7y0hfvq0r3bhwj" + "commit": "f6e9b905ff3c6212aca8182764e1371fb71c309f", + "sha256": "17kasngsy8pyxlwy264bs62hix0npjb49klrfmfkax7mxlkzx152" }, "stable": { "version": [ @@ -80843,16 +81073,16 @@ "repo": "SqrtMinusOne/org-journal-tags", "unstable": { "version": [ - 20220805, - 1001 + 20220815, + 1604 ], "deps": [ "magit-section", "org-journal", "transient" ], - "commit": "66b4dcd6084242008a430aedb27e5834671b5f99", - "sha256": "1l352pqpmhld74qgkzq9i6inkppgiy145cmr0zyjk0803gry0g67" + "commit": "c7db858aef69501b2878a7c2aed4ad0447842b4e", + "sha256": "142wrq9k494aks4lxbq80pkm39nqkbdpfw69mlh33skmwvsfzzsf" }, "stable": { "version": [ @@ -80951,14 +81181,14 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20220701, - 359 + 20220822, + 1337 ], "deps": [ "all-the-icons" ], - "commit": "ee06be6d82d36330cf0f96544e7cfcfdc1b7bb02", - "sha256": "1dnlnk1gin48bc36798y9swj0q96gnsyrdf6sjq7asfm821zv68k" + "commit": "5309895a7616e04a55a9dd397100adfe35fcec60", + "sha256": "0fzd65p38s1xr3xcji2gficl1lxrb1ip9hnd7hlrab955www2ip7" } }, { @@ -81198,11 +81428,11 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20220730, - 827 + 20220821, + 1927 ], - "commit": "c82b50a61d04571e11c242fb91944753d8bf945c", - "sha256": "0x6i69balwp5gzalgfcnb0m6gz78ca6vdj7qlx354awnxsd70nhz" + "commit": "23347906b826656c5054b8e35714a1c3d74bdcc4", + "sha256": "1mqzyrs400yfpss1mrfw4yn9fp1rskklzd7wlcg533l1cvggsp25" }, "stable": { "version": [ @@ -81832,8 +82062,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20220718, - 1844 + 20220819, + 838 ], "deps": [ "dash", @@ -81847,8 +82077,8 @@ "transient", "ts" ], - "commit": "06f1e1be6ff5ef7e2c8c05dc1954bcedcbb6eb0b", - "sha256": "0qn3ww9hp08xbmjicd451zcqm3za84wvizjwlzmxi6hqsaxmzpfm" + "commit": "d7ada532c7d06e91d6e07800ca22d5fbdb970e3e", + "sha256": "0nj1dvg30wj84ayqkjifxi1h0g1kjkm6nhhq59w13pkl2q0w5ygw" }, "stable": { "version": [ @@ -82124,8 +82354,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20220808, - 1445 + 20220818, + 1215 ], "deps": [ "avy", @@ -82140,8 +82370,8 @@ "parsebib", "s" ], - "commit": "4c9128f8cff3f5393efecf9c7547c630331a0299", - "sha256": "10kmkwyrfklzllgq5a5j5531whsjlq2mba2mh1cd14fvha5dwvd9" + "commit": "a65e3020759ca695c843965295f43d5f3e4fe6c3", + "sha256": "14aakjacj296rd2cqm4v2vgwykaaxwr0zgh33y20rygrjx10q18z" }, "stable": { "version": [ @@ -82217,28 +82447,28 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20220731, - 1246 + 20220824, + 1824 ], "deps": [ "dash", "org" ], - "commit": "e53d0fde875d137eeb03eddd6b50d3c827f9947f", - "sha256": "1syksy6c914d1z57zjiyqfmfpi6lpw2nfyw321mc4fr3m2l8wzzv" + "commit": "5794fd8d1aa7bf89abb37f79574118951ad036a6", + "sha256": "1p29f9svvzlf2l8pr23azdgrqg4ab8b2jlhx4gz0z0xxmf8yd6iy" }, "stable": { "version": [ 0, 3, - 13 + 14 ], "deps": [ "dash", "org" ], - "commit": "e53d0fde875d137eeb03eddd6b50d3c827f9947f", - "sha256": "1syksy6c914d1z57zjiyqfmfpi6lpw2nfyw321mc4fr3m2l8wzzv" + "commit": "311a8bff2fa0a6ccf83311c648d2cd045d765bc6", + "sha256": "1427w3bv5rsaq07877lb3w9v5b0il6hgzdg52yf9kx22z5f7qgqr" } }, { @@ -82384,8 +82614,8 @@ "simple-httpd", "websocket" ], - "commit": "c75fc7506ee7f03840a9a93ed9336d7ed24551aa", - "sha256": "0mkcd2622np8s5qz2zvx7lch6dc586xqmn6914gi4ym7nvklf3zy" + "commit": "16a8da9e5107833032893bc4c0680b368ac423ac", + "sha256": "0l5cbd0al5idc9pckl4885vp3449awvz5sgz0r998say5xxsajii" } }, { @@ -82756,8 +82986,8 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20210928, - 916 + 20220817, + 2351 ], "deps": [ "dash", @@ -82766,8 +82996,8 @@ "s", "ts" ], - "commit": "3108bc3f725818f0e868520d2c243abe9acbef4e", - "sha256": "172kjz03byizc972h8qh5hp5lrjqxp8x7cpcqykzj5j4db670ym1" + "commit": "fcc860190682274989fef15385c37c02895078df", + "sha256": "1yk2rw6k7cb34j2n0wc0jkdsx8y1aacp865dmjja3jk8n7ab2rrz" }, "stable": { "version": [ @@ -82943,15 +83173,15 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20220723, - 758 + 20220820, + 102 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "b9c6ffcc206ffaeafbe6e3ef9561ce6a8e0f30ad", - "sha256": "1apxxhjmz04myl99fm88la941n69a5sw6pkcxaz7svga1cnpdj9l" + "commit": "28eceb17131a4a5de79ce06f867bce49d1a04b78", + "sha256": "0smsww8k9vpz0i0sxlw1ys49zrdgl88yxz4iw832p3c6k0hpp0sd" } }, { @@ -83543,14 +83773,14 @@ "repo": "ymherklotz/emacs-zettelkasten", "unstable": { "version": [ - 20220727, - 859 + 20220819, + 2335 ], "deps": [ "org" ], - "commit": "edba7bcfdc054ad0ff1952bb525f5709a687db25", - "sha256": "06rb7frgw1vja7azsd9cxzkbvlr7xpzapgqypsc777szncz06xhi" + "commit": "505fd41dea012e743962c3a376c1e63e7a1e127e", + "sha256": "13pf2ygyizqk3axfl7s246an9w1ih38jq1knzy5f4qn2pf5k2zjs" }, "stable": { "version": [ @@ -83573,8 +83803,8 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20210929, - 17 + 20220824, + 148 ], "deps": [ "htmlize", @@ -83582,14 +83812,15 @@ "metaweblog", "xml-rpc" ], - "commit": "68695ed0e012379556d57f9564ac5ad8cd68fbb8", - "sha256": "1qk9kshi4hyy0fni3gb383m0yvj4fmgidiab6vhnms5zgghj4kl7" + "commit": "b641fbcf33ac2b8a0de7b80536b42ce035428625", + "sha256": "0wy98gfj7vfmw8rj2zal1jrywsi7p8k4jr5m9rnwhj8v8ld1cw7d" }, "stable": { "version": [ 1, 1, - 11 + 12, + 1 ], "deps": [ "htmlize", @@ -83597,8 +83828,8 @@ "metaweblog", "xml-rpc" ], - "commit": "c1b386f3522054f063f4ac60730397ed1f724478", - "sha256": "0d0s9hxjvv39n1rik894yh7d20aw120r6cadyp4hqw4n24j8cs5q" + "commit": "b641fbcf33ac2b8a0de7b80536b42ce035428625", + "sha256": "0wy98gfj7vfmw8rj2zal1jrywsi7p8k4jr5m9rnwhj8v8ld1cw7d" } }, { @@ -83763,8 +83994,8 @@ "ht", "s" ], - "commit": "1f422f6f3fa569a6c238ac34aec0320934f06208", - "sha256": "06d71kkn5kasfg9x977vdcd6pbnj44jzalp9igwm6qh5k7krklr3" + "commit": "9a35d8d3d660ac9d4f0a8d15b78cca4d7ed35f74", + "sha256": "0wpxygjwa0m981lm3rjyxp5hlv7fn9zfwg1jx3mjnnzrmw6v6q6y" }, "stable": { "version": [ @@ -83967,8 +84198,8 @@ 20220715, 16 ], - "commit": "9fba876c51d070832e15c888bf81609c4145f233", - "sha256": "0pck6pgyr55xf8g0kwrshal7jm64nxclhdm9ys8wx6vi7mvdqnb7" + "commit": "f72980693976648cfdaef32b51b78f1209683d0e", + "sha256": "1ffc6ikf15267q904ds8qf209xpgz61lx3665n3v7pfk64c5s0q0" }, "stable": { "version": [ @@ -84439,6 +84670,26 @@ "sha256": "1pry1xw2p01b18ks5n0xs895qqqci7v2nrwjiil2vr3m1ys92ymc" } }, + { + "ename": "ouroboros", + "commit": "b505d4228b84bf8656dd9b20e0783be8924cbc12", + "sha256": "19lzv8gmy1s88vr4cg3hlk6pd3p2ap1qw3kw9vpm20vi0imyamdy", + "fetcher": "github", + "repo": "Titan-C/cardano.el", + "unstable": { + "version": [ + 20220810, + 1617 + ], + "deps": [ + "bech32", + "cbor", + "dash" + ], + "commit": "5e1bf8b8ffa4c75bece7a93feab9858f0e7d676e", + "sha256": "0n2zf8pqaylrjy9w2qdir9hch7zhmrkcxnajnrbjswn1cwk8l2mm" + } + }, { "ename": "outline-magic", "commit": "a98ad2ef680eef541ee82e8a65ed73e524df98a1", @@ -84624,8 +84875,8 @@ 20200425, 1601 ], - "commit": "e02b835a08919ead079d7221d513348ac02ba92e", - "sha256": "0fy8739fbhmixgjxgd1j5v2rjkwhsqac5kczx3mdjlfd2w55k3h7" + "commit": "4fea116272aa16593d4bf23cdbd2998074a593a7", + "sha256": "1b7v66yzgck7wxpi4wbap9a6w9w3afd3x3n8flz63x1mzd986ywi" }, "stable": { "version": [ @@ -85811,11 +86062,11 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20220625, - 1438 + 20220815, + 1311 ], - "commit": "0a47905f0cefac5a4043c923efe6d80b03a79551", - "sha256": "0w4l189pcbx9a511w8fflq481ryg4l6q4q7i2rk10b9kg3v00zkb" + "commit": "b137f76ae76dd7c2e9648a352a679099f1b0f101", + "sha256": "11h62pmnisp4va4gf0pdwgyrvzm2ikbgkh000fbap1g04a6jx076" }, "stable": { "version": [ @@ -86390,16 +86641,16 @@ "repo": "atgreen/paperless", "unstable": { "version": [ - 20201130, - 1241 + 20220819, + 226 ], "deps": [ "cl-lib", "f", "s" ], - "commit": "2db39586a2914f78f345379511d0e8cea4c96b86", - "sha256": "03ckcbhpiys3p0jambrlcapba6sv7jn101kikvj2jp66vygdnsn0" + "commit": "f230acbc01588bb2ec99426832099b7fb7bad6c0", + "sha256": "1glxxmm28w7yklr86m743mg068k24hbnvfx6xyb48d3fq568r2d0" } }, { @@ -87462,16 +87713,16 @@ "repo": "vedang/pdf-tools", "unstable": { "version": [ - 20220723, - 2329 + 20220823, + 513 ], "deps": [ "let-alist", "nadvice", "tablist" ], - "commit": "bb0b71f5bafd81d0b5647c4ec48fafa0bb6f6c21", - "sha256": "1j6aj6sxw82n8pvwylwcnrgi95d6n5fpa0g75lphfgkaqk9nbgmw" + "commit": "1a0a30c54dc3effdba4781a2983115d4b6993260", + "sha256": "1gy7d25iplix02h9kqxxvfrxfwr2gm11xdmmx9ckbj3q51b5gi1r" }, "stable": { "version": [ @@ -88868,14 +89119,14 @@ "repo": "xuchunyang/pinyin.el", "unstable": { "version": [ - 20180620, - 1241 + 20220815, + 1239 ], "deps": [ "cl-lib" ], - "commit": "e5508e5aa1ad4cfa05a7f4d299e5a155b288ec4c", - "sha256": "1bzs6i88b5d7bk9pg2q654kvbychz27rl1srhkq9lvqx91g8zbz2" + "commit": "b7a0aad8ff35e50d1c536df4c0e73fc7e9d06700", + "sha256": "1cbs4mhf9bxhz8552dfdfr09v8abi6ppvm9arykwp7s5pnj7c705" } }, { @@ -90267,30 +90518,30 @@ "repo": "SqrtMinusOne/pomm.el", "unstable": { "version": [ - 20220315, - 2038 + 20220815, + 824 ], "deps": [ "alert", "seq", "transient" ], - "commit": "2a2673bdc8e2c2af99040b14e97b39271806bf79", - "sha256": "09w3m2gb0qv3cr3kklv37rgpcaxvyp21sdjmb15c26cf0i8rc86c" + "commit": "42f03d6ff29109038b31a8647f1acdc80fb867be", + "sha256": "19laxxwjcxbz1jsh19w5871jlj93ar0h071bi6syx2xf2n3yza6j" }, "stable": { "version": [ 0, - 1, - 4 + 2, + 0 ], "deps": [ "alert", "seq", "transient" ], - "commit": "596eed778fa30e7b33910f015543eda13abd1888", - "sha256": "0arhl9x9d4d1s4x5qcf1kn9hkwgsrs6sjn0rky10pgja7gqh6214" + "commit": "0942131ac3f2d20cc1004eecdb99ec0db1271c31", + "sha256": "1d302d5ffin1ckgbbj041rd9dwadh88n03ax0ja4gg03g2r3y5ci" } }, { @@ -90478,8 +90729,8 @@ 20211231, 1823 ], - "commit": "c65905aa1a3ac32d1dbc8c1060605621e6143f80", - "sha256": "1bvw8fwjwsrhx2z8mmlsmzxmjqin1yrg045sn2pma2gxls85bqv8" + "commit": "34c2684a6fb9a98683951b4a68f542622d17952f", + "sha256": "0svgyyrzfgyb05ki738b99n7cyzhvrsgb6v2cslz3nd2lipq4q6b" }, "stable": { "version": [ @@ -90807,6 +91058,30 @@ "sha256": "112s6qb80sn44b1cxggqfci89wymxvvwkwl7nknfnr2dzd58lzzy" } }, + { + "ename": "power-mode", + "commit": "bc58af06aa1973d1a3fdad0c8a150b26f82bd35b", + "sha256": "0mvjngp90gx2qpvi6w2baf6ngw2jrkh8q5rnmy81d54bk0d19dfv", + "fetcher": "github", + "repo": "elizagamedev/power-mode.el", + "unstable": { + "version": [ + 20220817, + 429 + ], + "commit": "1641a01ecca254db4094e166893a073b7f9288d0", + "sha256": "0z3wbj1skialwm2s0rzyzqlj364gx6ryi29x2wk1jhrvvdjnbgwr" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "313698d9c7766c17b077a70b31a2d0f52496d767", + "sha256": "1nkqn8jmnv4l2ydj9jipk3mz76kbz1gfk3iz986wgj8h2317vbzy" + } + }, { "ename": "powerline", "commit": "f805053cd4dd9ed53ee0df17ad69429bc62325bb", @@ -90968,8 +91243,8 @@ "repo": "blahgeek/emacs-pr-review", "unstable": { "version": [ - 20220629, - 1556 + 20220815, + 1610 ], "deps": [ "ghub", @@ -90977,8 +91252,8 @@ "magit-section", "markdown-mode" ], - "commit": "e4db206f2ca9baf65ca7757234bc2baf5634d8cb", - "sha256": "0fl69419hiifmpvphfyhh6z9h7b5qcgpsm6r8z8c0ysang7l7y26" + "commit": "8033aed0f6c16464b822489b137ba2f3ffe787de", + "sha256": "1c2gxvxv1fyqdabbhv859axq90xjwaf8c573z3db61iq97hvcvxc" } }, { @@ -91651,8 +91926,8 @@ 20220704, 658 ], - "commit": "5c35af3e456f1300f0e170d74da87e563b6cc222", - "sha256": "190g3iqzb2kv3z59b4zbf110g8yzxx64ml1c6ix194w76faghxix" + "commit": "8ce8f7cf2b228795dc76af0128cc66c7d7aac3be", + "sha256": "1lrspsfn4q9c1zfrpw9kbkjf4c47xhgs08qb3f88dscz84yawdxp" }, "stable": { "version": [ @@ -91709,8 +91984,8 @@ 20220720, 2110 ], - "commit": "509ac9a01cd344ee9bfa1bfebed6565dd4cfedd7", - "sha256": "0a256hcjyl7qlx08bfqcsacl3kpwgzdf458p4r1sxrwd0b1lz1g9" + "commit": "a8809cc1a50cfdedaf7bed2810249ae262884716", + "sha256": "0bmx9a1g199axj9ypqisvfyf1517czw23zg96x1wdzqrpw3cb7cx" } }, { @@ -91811,8 +92086,8 @@ 20220720, 2109 ], - "commit": "2d348279876f3073176048d903f9672f3c933ca5", - "sha256": "05in97rym6nc91nyshbdk4i1g013gsgzgs5r5nhsshpa9glwpv55" + "commit": "2bc01068d532ca338d3e24b1793e7ba69fadf419", + "sha256": "01d4crfii9hxmxrmdljkm80v16lfqqmpm35g3rs20z1wbjsjy8hy" } }, { @@ -92223,8 +92498,8 @@ }, { "ename": "proof-general", - "commit": "5bab170dd89e99f7c8430a11e6a2d8191b60f746", - "sha256": "0fx1avmkwi8ilmv0lxk6pp91hd6saycggca52z8rvjz66h9rmq3c", + "commit": "746947a065c8fd26bfb540c96d869d05a0bd9b53", + "sha256": "0kphsh3gl6g0lisxh9yqpxk5s3kgwvlwgcfv32mc30ddzs8p7mvj", "fetcher": "github", "repo": "ProofGeneral/PG", "unstable": { @@ -92336,8 +92611,8 @@ 20220303, 1716 ], - "commit": "e83492d94a8ce8ef529b829da0df4e458ee05908", - "sha256": "1b42aaj76vdhangx9awwi8lv1vr5kh4m956mzzcbn0ydgml7zxp5" + "commit": "cde4f478772edd5e8f0d80255d7d85067ed7c515", + "sha256": "1lrrgk7yynn49mh1491gxw2ii7d3pdzc49hl2bl2i67giq4wcxx6" }, "stable": { "version": [ @@ -93404,8 +93679,8 @@ 20210411, 1931 ], - "commit": "50f369047078810311f11c7d8cc2ad98fad7ea67", - "sha256": "1mpdn680jrg783857xdrcrvjc6hcw502b92jqf8hfywa12qcylm8" + "commit": "32116ae72cff8cec0d57160c6505a1c6ec43fc7e", + "sha256": "1cc5p5bx0mriv8h1sbybzxxrcmvsl35vcwjagh0c7s1sbjsrnq0c" }, "stable": { "version": [ @@ -93752,11 +94027,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20220726, - 1741 + 20220817, + 2017 ], - "commit": "23f8f55d3e5ce34b19f74c78928a43914df38696", - "sha256": "1ar1x8k3pl05zffbz6aj239j22523vgxiiikdxj5515w0rddk06k" + "commit": "765af4569eaf93c07c6aecdf7f134022677f9620", + "sha256": "0hfkncpz7vl9d2qi8ab9zfdrvjqsw69cw33nwcd2pn1qm08l7zw7" }, "stable": { "version": [ @@ -94136,8 +94411,8 @@ "leaf", "quelpa" ], - "commit": "bd306aed20349ac96472a05da096c584f9c17408", - "sha256": "1ridwj8svsx7mg33nwk5qh0g5cwvf1hb67h99pcs3i5a17vmycdx" + "commit": "e7e610662018fe187697b3be3b4fe3a0aae49e73", + "sha256": "1y82gfnwygiws2brpl8jdw5srpa2w9nfi4ivbgn49fwlg3afywng" }, "stable": { "version": [ @@ -94434,11 +94709,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20220809, - 1724 + 20220818, + 1323 ], - "commit": "194fe14888fb653219ed6e605377884673fb6308", - "sha256": "1simri1lrg32qpxhzpxgj7g6zms6j5l442pdk9yf95x6fxxwc24i" + "commit": "56df0bdf81070a45a524c94cbfe6354ad613dcbe", + "sha256": "1hyh7incbncf7a01blwm89qwy3nzjmnf4x3z3x9idpwqd2pg485d" } }, { @@ -95132,8 +95407,8 @@ 20220711, 911 ], - "commit": "40d04a0baf5c3d1087b18cc03595c573a1b5891d", - "sha256": "1z2kvv5im24h7hqmz2yhpar6d6cp4hzhzk6kxgrdrwgywpaf0bdx" + "commit": "5e1bf8b8ffa4c75bece7a93feab9858f0e7d676e", + "sha256": "0n2zf8pqaylrjy9w2qdir9hch7zhmrkcxnajnrbjswn1cwk8l2mm" } }, { @@ -95182,16 +95457,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20211107, - 2210 + 20220818, + 1750 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "45f7e4409470abf964c7cb1d526248e4fa7078e0", - "sha256": "1xb1k6cl8xvjy1l16r4l0f2s0isac579apizyly6p8d7y45kzdky" + "commit": "aff03aeef1e40d2abb244240bab9787f4b3e6035", + "sha256": "15i0x5brbmhh6fif9djnc27gpx5fyh3wnljcxhhy6qrp4whj3van" }, "stable": { "version": [ @@ -96431,11 +96706,11 @@ "repo": "canatella/repo-el", "unstable": { "version": [ - 20191201, - 38 + 20220820, + 1554 ], - "commit": "7b3ce731f1209d74113cb65a2d6aa6f54ce8ed27", - "sha256": "0jgiawdnzjlrpx2j1y6djwbqncdpmyfd31q1qf1890049y8ppxnb" + "commit": "e504aa831bfa38ddadce293face28b3c9d9ff9b7", + "sha256": "1clmh8khr7i95zw1m64pjch8zwnr8gd7vcrzz5rx0xlqrd3hd3d7" }, "stable": { "version": [ @@ -96490,11 +96765,11 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20220614, - 1604 + 20220814, + 2158 ], - "commit": "38ed1d2e64138eb16a9d8ed2987cff2e01b4a93b", - "sha256": "0c8jmw4jif6vcizz2ba9yvh334ci45q7alhsayij0rwmwawgykgc" + "commit": "91313f1e00302b7e60d2043d8104bccf72aae80b", + "sha256": "1n0idvr3akfawb71a1p20i9984r9gn6y1pnl8k6ffk7lmhpfa0zr" }, "stable": { "version": [ @@ -96521,8 +96796,8 @@ "deferred", "request" ], - "commit": "38ed1d2e64138eb16a9d8ed2987cff2e01b4a93b", - "sha256": "0c8jmw4jif6vcizz2ba9yvh334ci45q7alhsayij0rwmwawgykgc" + "commit": "91313f1e00302b7e60d2043d8104bccf72aae80b", + "sha256": "1n0idvr3akfawb71a1p20i9984r9gn6y1pnl8k6ffk7lmhpfa0zr" }, "stable": { "version": [ @@ -96792,8 +97067,8 @@ "f", "s" ], - "commit": "ccc5d8c61d386bb817863624fea0dba1273e7255", - "sha256": "1rmxpw3an4kdjmzv3qbh1gb1anc3pb5a0zxl6mh2yrppwggyh29c" + "commit": "3d9a05c0bd3a80600a0544f420b77eba9a1f86c4", + "sha256": "03smgdqa7lvq1ycdxqsnawkv51ljfax8nxffx4b65nzzgb3iyq5l" }, "stable": { "version": [ @@ -96909,11 +97184,11 @@ "repo": "kmuto/review-el", "unstable": { "version": [ - 20220809, - 1250 + 20220817, + 1010 ], - "commit": "d0ec3357ae80e745e3a2b00012dd577e276b88d0", - "sha256": "13lcwhy47p4d6fk6x0xh726q8ka5l41hzqri00rbdafz0dzflbj4" + "commit": "2b24db8d85a1c40dbd67be195caa79c9df1e0f4b", + "sha256": "0hw8spbhdwgaaggf8vrmkpg5zdy9s71ygcj8rlp4acw7cfcp6sbx" } }, { @@ -97707,11 +97982,11 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20211101, - 2149 + 20220818, + 1535 ], - "commit": "c628efc9b485470a48aec2692d79f7c140bc5b92", - "sha256": "03avv7brbrj69368riq3xg4qh65yzl5cyjn9wc2rbyx4jw2q3p4p" + "commit": "b9c680e7ca003c103687e790f740d86daa6b4b17", + "sha256": "01f1vv71gimhsm6bzh0fxfmap54qs4wqnc5zj9barr9zvwpqmrbn" }, "stable": { "version": [ @@ -97736,8 +98011,8 @@ "deps": [ "rtags" ], - "commit": "c628efc9b485470a48aec2692d79f7c140bc5b92", - "sha256": "03avv7brbrj69368riq3xg4qh65yzl5cyjn9wc2rbyx4jw2q3p4p" + "commit": "b9c680e7ca003c103687e790f740d86daa6b4b17", + "sha256": "01f1vv71gimhsm6bzh0fxfmap54qs4wqnc5zj9barr9zvwpqmrbn" } }, { @@ -98149,11 +98424,11 @@ "repo": "bard/emacs-run-command", "unstable": { "version": [ - 20210529, - 1505 + 20220821, + 1421 ], - "commit": "ce2d69feeffb9ef9815ef5b5e32f236763197a10", - "sha256": "132gsmgqnfzx8q0f4gchjzhm3wqm5frjrsb8q9cmqsa5y2g7qjmf" + "commit": "0ac25bc1acae652ffb58c48a3853cd1dcd7b40a4", + "sha256": "0c455f4jv0c2mmvk37s3cs56gbxbw3h6lbc53q76xnm16hg8b0nv" } }, { @@ -98277,11 +98552,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20220626, - 1126 + 20220819, + 1203 ], - "commit": "01ba44166cf16d9b78d99f2fa0c3c54c0f206894", - "sha256": "1mcvalgsilg1lsmnxpsg6qjd4z0k2d5dfij92gdqhzgc3188ad1p" + "commit": "894487d44c1664a9005cafd625fa99b54ff66c85", + "sha256": "0dwxf634d1wsnw85iyrxdcbbrqvcsk313bh53mhzmpljsyhinzzw" }, "stable": { "version": [ @@ -98324,8 +98599,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20220715, - 1010 + 20220824, + 858 ], "deps": [ "dash", @@ -98339,13 +98614,13 @@ "spinner", "xterm-color" ], - "commit": "baef1faba8c73587455f8582ee6ba3ef32077a69", - "sha256": "0vbwcbslbmrh3jmwb2m2jk394s0jnbsw26lmcg0fs17byxfzssv4" + "commit": "e279b7d60fa87b54264a8ba6c05604b8178e0d01", + "sha256": "0lj3wgiyrv3mma49k1ijlfhaj3d16fg0brdb9bshz0kizjlwzjx4" }, "stable": { "version": [ 3, - 2 + 3 ], "deps": [ "dash", @@ -98359,8 +98634,8 @@ "spinner", "xterm-color" ], - "commit": "0bd7932ebe30c19068b8c4fc154e00787a678200", - "sha256": "000awxvnwxg2hmhhn6yd9pnvflr91npfs2v1p5y7hcwg1d6mmvgk" + "commit": "868757f5675e602d924a15ca7f716fdfd4a873f2", + "sha256": "088g6arlbq7czxyg5f31zmcm0gla7qh4vapaaskf6866yyqhizvb" } }, { @@ -98429,11 +98704,11 @@ "repo": "magnars/s.el", "unstable": { "version": [ - 20210616, - 619 + 20220816, + 956 ], - "commit": "08661efb075d1c6b4fa812184c1e5e90c08795a9", - "sha256": "02hcjnf8n0nzqysqi9g7kqykxmn8nwhsx1scrq6wj1iibc16nh0p" + "commit": "07c57d3562da534d1b18a0fb21e12cd6ae6ff4d7", + "sha256": "1mlb0wjsjrsm1qrr0kymzqx14qzalqyawh0b4jxgpsdaidlvfnp6" }, "stable": { "version": [ @@ -98570,6 +98845,30 @@ "sha256": "18c6l36sdc3any2fccm49wiyrda97pnd07jdir22wfl5wba7xnj8" } }, + { + "ename": "sakura-theme", + "commit": "0009711939d1e18e8543be0a1c318f3cdc3024c4", + "sha256": "18xxsdxhbmg0cq4fi00pk05d6dqic2hc6lj988hlz1f0p0h2w30s", + "fetcher": "github", + "repo": "emacsfodder/emacs-theme-sakura", + "unstable": { + "version": [ + 20220822, + 254 + ], + "commit": "49f6fbb9f0f5d0129c2fc23c09be2c6bfc7ada0a", + "sha256": "1hkglja81k7qgvai35bq3169hizgwc9ci0h0s7g3sz1p9q4bdx2h" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "commit": "d78648632a94dd5354d2fed0f94fcb7aece29132", + "sha256": "0nxj6gx5virv95sfxbasvr2mh427w5srzjsfawhf58ixif8wkhd0" + } + }, { "ename": "salesforce-utils", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -99413,8 +99712,8 @@ "dash", "f" ], - "commit": "6debf99431a5cb4d1db55e5379453c6a181a133f", - "sha256": "18jl7ccv7b4p9gr9dkqpidkwazqly7nic99x29av0f8vicmg00w3" + "commit": "54330eabcc5c47019b9ab51d6b3fc035deebbab0", + "sha256": "1mkcr2jgczrgbyrv8db3ghc8h1lba8wx6nc6m3lmzi44niacm06d" }, "stable": { "version": [ @@ -100393,11 +100692,11 @@ "repo": "qhga/shanty-themes", "unstable": { "version": [ - 20220623, - 1528 + 20220816, + 1830 ], - "commit": "906104f6a6b185efc19285fcc3bc943f094fb594", - "sha256": "1gxb0sgq2ng9l7nfjbwjzc0ylxdgms018srs6550d779mi5gc8b7" + "commit": "9ddd8ccd94b51ad5b19ee7097dcfccb3588b5eef", + "sha256": "0j0vf6v4cw9v661zk1hcm3cnxl0lgfk5bpd7xwdah8v38mb02k8w" } }, { @@ -100798,11 +101097,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20220809, - 115 + 20220823, + 543 ], - "commit": "a8e2e5c7b7576afd7b097b40c6ca39e5717f97a5", - "sha256": "0vqq69jkx11d8m9g9v2m4zvpq3khkdhvgzvpcszvic4fvaa65jpc" + "commit": "e185b54d13fb7eac7d045daf6a83731d9ef79231", + "sha256": "0mbv68g1q98dysjvhdxwf3gcwwmihy6ni3b4r4kz6klyfr2jwqim" } }, { @@ -100877,8 +101176,8 @@ 20220704, 659 ], - "commit": "1a332666192f377dca933b0da71e6528b288fc09", - "sha256": "166af5nmhskkaih955prgbdyqhl3gms20x9wlaj2ckhqapdgikdk" + "commit": "61e8b5f867b3b139bdaa8a0079fe11447b5ca886", + "sha256": "002mr608yrir3krillg6y9h8l3hwx0mq8wg07a7jhqbx32zhsgjz" }, "stable": { "version": [ @@ -101269,8 +101568,8 @@ 20220806, 401 ], - "commit": "3e1889daa10ea6950b130e29991296d150fd9679", - "sha256": "0579qmb3sspk438v2qrp3gkfn0cwydp3x7s3lvya7lfs4ywmqcpv" + "commit": "c76ed684e36f1a81914cd8dfcfe7efe2d061468e", + "sha256": "1i7jbvnhm7pvbqa2yswd92ixpyfqydr1lgbgpjpca613s278kn8n" }, "stable": { "version": [ @@ -101297,8 +101596,8 @@ "sideline", "vc-msg" ], - "commit": "574592a8ecc171112d4ac2575f9cac51ff5eb184", - "sha256": "08msa23fgwhfwnyl8dmakv32qa8fkzqfspcgc0bliqrxh6dpcjr5" + "commit": "b0db4abe5c1c74e15c0844f60a94e8bcb1e29d11", + "sha256": "1m8bmf8ymrsfrmws8964sx9b4z2jswy84gcn11ph7z8kiisr7dd6" }, "stable": { "version": [ @@ -101330,8 +101629,8 @@ "ht", "sideline" ], - "commit": "7f11c14c938a88a35728b04add991903486ddd31", - "sha256": "0y30iw3psllf0g8llvzm8sd0kkhazhn433fwq0nq6hy21rm4r12x" + "commit": "72e94b34c58e9497abb4f997d2de9f5978b50fa3", + "sha256": "1vizkq0c4vjwjbcbwvpza3i2apnynqk40hvn4kk3bl7sw2flcfnm" }, "stable": { "version": [ @@ -101361,8 +101660,8 @@ "deps": [ "sideline" ], - "commit": "a6c6e9e4e64a12040adadaf351f3e83a0e2954e6", - "sha256": "1gf0jfs4gnvp2n4d1nix84sqr3a8np0hf05f1prhk0z2sr4ils8k" + "commit": "d105be829dc621bbc50158da3dbed7a5e304f8a8", + "sha256": "1hy6sckfwy51lw1mi3r6bxvb0kfwh688d0rx6a092nzwrnj4f6q7" }, "stable": { "version": [ @@ -101395,8 +101694,8 @@ "s", "sideline" ], - "commit": "b340c1e9a6d26ad4b3afe6aa660d62e8cebd66c8", - "sha256": "00y2jsvk0a1jjp0jw6r49pqmcbmrgrsrrhjkxvh13765i89x3fck" + "commit": "4495fd9c7d926b0caf2d041c8deb7833f4be06be", + "sha256": "01sl6admcylr93gn6si4hgngnyr3b1kr5s4hdfzxgsxw8qahvms9" }, "stable": { "version": [ @@ -102307,17 +102606,17 @@ }, { "ename": "slow-keys", - "commit": "5d16756967dd9077399b92cde2ddd7784739b693", - "sha256": "03p0qx8a3g8mapjhdf9pjp3n0ng2pxmizpqn87wk8mbc8cmlwk2w", - "fetcher": "github", - "repo": "manuel-uberti/slow-keys", + "commit": "5e0cbc811ff757c3e0ae349ceb047dfa8515f396", + "sha256": "1zjdq087xqnpx2hpyz0zr0ld0pz0c7l7wll5fvxp9y73k33jf640", + "fetcher": "git", + "url": "https://git.sr.ht/~gitmux/slow-keys", "unstable": { "version": [ - 20180831, - 459 + 20220807, + 1425 ], - "commit": "b89b4fbddb4b6b95fcc7301ec543ea535b2cc4d7", - "sha256": "06gr15dlz910azxzlwwbqimy2pvpncw2p3iixm6r4kbb41ycpn87" + "commit": "ec69a853a40bc5650c1b30cd866acb16e0a2dd8a", + "sha256": "1b6rz830chirjirs0ish2r6kphy16nv4pr285rkcdpbk700kbw0n" } }, { @@ -103306,8 +103605,8 @@ "deps": [ "transient" ], - "commit": "0dfeaff6079558c39081c2c078c41369da01903b", - "sha256": "0mir9ic4ywhyhhsn7y2qwy2s5h4qlrxz11mrs6680d2ki1bnyc81" + "commit": "849a74c24597c72818f194cf410087fc7c07f3d1", + "sha256": "1ri4g5a0cw7ldmznqkr78zvd033mazki01m0x7g1xisc181s57rb" }, "stable": { "version": [ @@ -103795,11 +104094,26 @@ "repo": "emacsfodder/emacs-soothe-theme", "unstable": { "version": [ - 20141027, - 1441 + 20220825, + 729 ], - "commit": "0786fe70c6c1b4ddcfb932fdc6862b9611cfc09b", - "sha256": "10gh1hvxq9gm29r6qzlnva7vjidd7n4kih4z2ihyvbvy9za20xqw" + "deps": [ + "autothemer" + ], + "commit": "36c3a8be287d59a1514e59674ed2ebc9c936eb1d", + "sha256": "038268wccb5l36cdnhhlcivc1hvpm33rh1a9igm83kyc7y6l6k2x" + }, + "stable": { + "version": [ + 2, + 0, + 3 + ], + "deps": [ + "autothemer" + ], + "commit": "36c3a8be287d59a1514e59674ed2ebc9c936eb1d", + "sha256": "038268wccb5l36cdnhhlcivc1hvpm33rh1a9igm83kyc7y6l6k2x" } }, { @@ -104191,19 +104505,19 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20220430, - 2248 + 20220817, + 1546 ], - "commit": "bd376f705d6eb7afd9a1dfa0c1bd407e869d1e9f", - "sha256": "1kxnnmnj7pbli7lybxvhhd63q376i65il8zxnjig0p13pyh5j1mv" + "commit": "e04d1f21107a1565861625209bb9c46a7aa43cc5", + "sha256": "1yz8xg9ni9290nly5b93djkzk9235q6k4lhb5ghs6snr0r39157n" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "b45fcdcd47a10362a782f27370b2f54714ad9f62", - "sha256": "15l9hb8f08nkxsaj8pxbg2mip4pp2msnrl0nvlq22zg40gh7pqsn" + "commit": "e04d1f21107a1565861625209bb9c46a7aa43cc5", + "sha256": "1yz8xg9ni9290nly5b93djkzk9235q6k4lhb5ghs6snr0r39157n" } }, { @@ -104274,14 +104588,14 @@ "repo": "ljos/sparql-mode", "unstable": { "version": [ - 20210701, - 1202 + 20220824, + 1323 ], "deps": [ "cl-lib" ], - "commit": "ceb370b3879841f8809cc3f9b1b87e898f10562f", - "sha256": "05vbsfyck0nxa0bsg7jjshjzh7719gx6z6i9i4ayxcfygh3wh6xz" + "commit": "15960092e8ce8ebe6a6afd82202ccf47cb306e76", + "sha256": "1wlwn2f6r00fj7wk1pymrha2rpfrd3b2ggmcjsz74f7ixc0y4c2k" }, "stable": { "version": [ @@ -104319,11 +104633,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20220803, - 148 + 20220824, + 154 ], - "commit": "cefebe6215b4065827553f2e0cb87c31c5893e5e", - "sha256": "060nbh6bq55d1vv0ln67kdp6am7fad6i6zpjvfdf5252gsz63lds" + "commit": "3e9b59dbdb81a8ade36f21ae57690df5922a67b5", + "sha256": "1c01v5mdqvsn01pxcd7h7qrr2cqxl6hgpisz8m3gigabj0lx1r6d" } }, { @@ -104376,22 +104690,19 @@ "repo": "dakra/speed-type", "unstable": { "version": [ - 20220809, - 1119 + 20220815, + 1458 ], - "commit": "e2fda90683945d9fff9f5b48ee080eebe3994fb9", - "sha256": "0cngw8v8n7byskiyyjq2lxz95kz34xr5gb5z8m42rwk780mn6hz2" + "commit": "304cb8cd6c30d07577d7d864fd32858a29a73dba", + "sha256": "0n7rcb0bfw5d22fmy0kb14i4z88z0p4k23zxq5i23srcskihbkl8" }, "stable": { "version": [ 1, - 2 + 3 ], - "deps": [ - "cl-lib" - ], - "commit": "5ef695f7159aa1f20c7c9e55f0c39bcdacce8d21", - "sha256": "17xh7f1ps6bfs55a08d0jjma2hs117fv4j90w4xif0n2h49m4pjp" + "commit": "657946280a540587831494415b16df3194ae7c52", + "sha256": "0nnvk3qnn61hg5rgwpiy1dqg6sqfh1m5256sbsk2pwrdmk54k85k" } }, { @@ -104447,11 +104758,11 @@ "url": "https://codeberg.org/ideasman42/emacs-spell-fu.git", "unstable": { "version": [ - 20220802, - 1151 + 20220822, + 2347 ], - "commit": "bfd017fd1985418a1b101c1e497510ce24bb0348", - "sha256": "1gv2596kq06x90cscc5bhwsisrm3pipiwh5gmq11j28dj0mih3pf" + "commit": "2288af944af74f03f4fdb298d0aa7e62ed805c04", + "sha256": "048akpwrfnhl0r4sx8g422x0pv71980kwa0ny84isxjc4xqjc97l" } }, { @@ -105055,11 +105366,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20220724, - 11 + 20220812, + 2051 ], - "commit": "10c36b101cadfdded4d7b78d920fc2919a7d674e", - "sha256": "0y2rc30k1dn4w3s2s75789f33vn6r9v1g2i7agkihjyp4sc4zmsa" + "commit": "a17dabd0c45c4481de48e00ce390f5968d95111d", + "sha256": "0031xdisf7s57mpqv44f6lwnqmhb51xg25hy2r30x801mz0v8caw" }, "stable": { "version": [ @@ -105490,11 +105801,11 @@ "repo": "stacked-git/stgit", "unstable": { "version": [ - 20200606, - 1308 + 20220822, + 1637 ], - "commit": "1d829904702be42f057e89686cfc07e7051d7b05", - "sha256": "1vcbjg0hrndrcs6mmdnynv2ly9cl4gwp3zqbp2av9w95lx8ynqif" + "commit": "af04cf8247f7b2adc71e618dbff6006faca1af5a", + "sha256": "01jax58bq7m5z67ikdblzyyh6sibq23hmyi7y3z5k08ikvjkxbj9" }, "stable": { "version": [ @@ -105543,11 +105854,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20220808, - 1150 + 20220823, + 919 ], - "commit": "9c8391cbc69bb44576b333af5caec84221d7b596", - "sha256": "1fwmns83vlbin272zy4nnwbbjlr3zjlh0shb661jlxvbqbi25p9p" + "commit": "fc9f685fee717f52a249a72189bbdccb225bc122", + "sha256": "0a40ddrpqd3ylf1ylnaxvmrr966z8qqv8xh796nacmr5klbmzc6i" } }, { @@ -105714,11 +106025,11 @@ "repo": "akicho8/string-inflection", "unstable": { "version": [ - 20210918, - 419 + 20220812, + 1259 ], - "commit": "fd7926ac17293e9124b31f706a4e8f38f6a9b855", - "sha256": "0wskrp3v5gi3b3s9471ijkdncnfd888qd50c72rv2p8846174paj" + "commit": "f848c68221f0c474a4f060884d8f7a86f44f42d4", + "sha256": "188qlhaisrfbhh9646gqvmz0ksqd00vrbc3lb2gfhigadyfzm15j" }, "stable": { "version": [ @@ -106791,11 +107102,11 @@ "repo": "dimitri/switch-window", "unstable": { "version": [ - 20210808, - 742 + 20220812, + 2137 ], - "commit": "8d9fe251d8d38b223d643df975876356ddfc1b98", - "sha256": "0qc004gpyzf0hpsjr1xhsnfnn0g2jkpfxzvysa05p9nwglfpsn09" + "commit": "71ef2f54c97f3fd2e7ff7964d82e6562eb6282f7", + "sha256": "186100j93in5dm1h3xl1sg892yfz8nvssap2hsy5kh6aw1am412y" }, "stable": { "version": [ @@ -107027,8 +107338,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20220705, - 1558 + 20220811, + 235 ], "deps": [ "evil", @@ -107040,8 +107351,8 @@ "seq", "undo-tree" ], - "commit": "533eb8ad0ce43c6a7667a2c8a9a8fd6ae275c820", - "sha256": "1al6d586rip99q42farhh117li0d14in0vvy4dy2lm68nk7b095n" + "commit": "adebb7aa1dedac88585bd1077ac81f97df3bd7d5", + "sha256": "0bhm3nvnhmnr2djsig9vqzpsk5plsx6q1zv5hbnwyjcrawm6d9rs" }, "stable": { "version": [ @@ -107740,17 +108051,17 @@ }, { "ename": "tangonov-theme", - "commit": "a9595a5239a1f1003a269e7c7b52804ccb692d30", - "sha256": "13dlllb7j03sigydwm3j6p4fh5dp7pi9bywvrarhnxrhh6wmdizv", - "fetcher": "github", - "repo": "trev-dev/tangonov-theme", + "commit": "76cd5a26b05fdba0bf979e7d34a0a3ab981de47c", + "sha256": "01fap05nfx28zbj72661z55bl7x7jmvgcwq2lgwaaa8m08si883k", + "fetcher": "git", + "url": "https://git.sr.ht/~trevdev/tangonov-theme", "unstable": { "version": [ - 20220808, - 1727 + 20220816, + 2316 ], - "commit": "fdef90a7795549181276d51d679eacb6e8e74e74", - "sha256": "09izx2k8kpcck63qpwjpsbb5952zzynsa9cdbh3irmkkck9i3bnp" + "commit": "18c0c07b03a963b0c625f66c77f1f0755a0ca22a", + "sha256": "0xy0p5h5s3rzxs97q9l66a1kv0z0gzzlfn76dp61rkaqgpclakwf" } }, { @@ -107985,21 +108296,21 @@ }, { "ename": "telega", - "commit": "e5d96e72c0fb942e001f3001ce907be0117705a7", - "sha256": "1qn6gw8dqh335am0wx6dnfc7qxw8djypvvzbk5sl1zmzsg562sbq", + "commit": "746947a065c8fd26bfb540c96d869d05a0bd9b53", + "sha256": "15k4nl78fp7nl6nr6wf49ngbpx8659mx3ypfwq7b3pfmanawp7wp", "fetcher": "github", "repo": "zevlg/telega.el", "unstable": { "version": [ - 20220713, - 2342 + 20220819, + 506 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "11c0c785ed9e479b65514a10022d5c34984aab59", - "sha256": "0g4lk0lp4hj05hvl7pyxfc9lpmaknlr85h71sawpnvkr8853v2as" + "commit": "42a0dd0e30a82a8e34eaccf6e7a1366f4621d49d", + "sha256": "1psgkb2k5w1f3r6ik4gby9w5qinhwdimb6yhsqz06y9a2d9g97rm" }, "stable": { "version": [ @@ -108471,11 +108782,11 @@ "repo": "davidshepherd7/terminal-here", "unstable": { "version": [ - 20220519, - 552 + 20220814, + 2056 ], - "commit": "c16a500926416c09cd2faee6ab9541686b51e34f", - "sha256": "1iv1c2mbvhn00ha46c6f98j9syc71xhjpk8m5wa5p32sk4wcc9f4" + "commit": "3cc7c57599630036714183b973b47d559fa46a9a", + "sha256": "0kzr1y2731hnqbx1qq894my8vnl42zlnkwssm24lnxdcb6qbd616" }, "stable": { "version": [ @@ -108519,8 +108830,8 @@ "cl-lib", "json" ], - "commit": "ef50c6f0269a6fd9ce742d0a87647d60a0ef850f", - "sha256": "1c3zamvcambi9l91vilc0sbyzn21jj89n9j02simza4ffyn9xix9" + "commit": "5f1f83b1689d4954d62e794d9a89c57709099c27", + "sha256": "1chpq59hrxlf5bnjcahmlm6k896jxi74mafj5i5q3d82i88qv8m6" }, "stable": { "version": [ @@ -108552,8 +108863,8 @@ "cl-lib", "tern" ], - "commit": "ef50c6f0269a6fd9ce742d0a87647d60a0ef850f", - "sha256": "1c3zamvcambi9l91vilc0sbyzn21jj89n9j02simza4ffyn9xix9" + "commit": "5f1f83b1689d4954d62e794d9a89c57709099c27", + "sha256": "1chpq59hrxlf5bnjcahmlm6k896jxi74mafj5i5q3d82i88qv8m6" }, "stable": { "version": [ @@ -109018,8 +109329,8 @@ "deps": [ "cl-lib" ], - "commit": "e6e8efd740df0b68db89805ba72492818dba61ab", - "sha256": "1cy1s9iyv2c4c2kld42aricar4s5d0irdhsqb8rsbbriif50vpvd" + "commit": "617c3674193c38d34e5b01d5d936318cc421eedd", + "sha256": "0351l334h0wsnjp61ldahcax06hrjiv5m2yswfgwppg78j0lpsb6" }, "stable": { "version": [ @@ -109155,18 +109466,18 @@ 20200212, 1903 ], - "commit": "8d346673d83b8019c1637e8396ed4635d5c2ddb0", - "sha256": "06zhd2v80j6flxiqdavpyq87v8yvnixjv98agpsabh1lrvl4cday" + "commit": "1e2c611272f9943c85286275151a4a81ce59e52f", + "sha256": "1zxqirgk6fw6ps8jx2ln1mqr8nylyia0yq0wpzzlxr0ifhpk6jk9" }, "stable": { "version": [ 2022, 8, - 8, + 22, 0 ], - "commit": "68ac4169a6e95bb94540f222cd6b3f9f2ed3f868", - "sha256": "1nb9waad0ijgd1ah2d9jipwjplx9mdn61bsxcpvqcpswy326ymad" + "commit": "27f978d8a30a7499377854a25e1f0dab64ae0152", + "sha256": "1vspyssn5kacbpzxl69x9v0mry1rsmd96vc8rhf8n3z6i4bdjhrj" } }, { @@ -109222,8 +109533,8 @@ "deps": [ "haskell-mode" ], - "commit": "4356f6309a3686cbb5e4d298f265baadb855b945", - "sha256": "07syq66z3b4nnxf67zljsvnmmd0im76vd24kw660qcls5fj4k3ps" + "commit": "22cb3d3ebd7fb7acec349e040f977495e44aec8b", + "sha256": "0iy9qckjv9zbyg7bacqhihk8m4ws1kf6pd93vclsa1p6aa30jps7" }, "stable": { "version": [ @@ -109311,6 +109622,24 @@ "sha256": "1qxhrm852j93sqi1lznlrjn7s0vscsixm48g46ja70gl320chyzm" } }, + { + "ename": "time-block", + "commit": "9f7b6f0801b42358e021ec13897b1146e0f8c4e4", + "sha256": "10p61y2897n873x986f30kghiq60b72jz98lbzarwx55vf1l63hc", + "fetcher": "git", + "url": "https://git.sr.ht/~swflint/time-block-command", + "unstable": { + "version": [ + 20220821, + 1431 + ], + "deps": [ + "ts" + ], + "commit": "4ac663b5196567326b82fe76c9930c116bed5596", + "sha256": "0w1iqzdy0zf885wcag77jb21snx2k5wy4m3ckdj24gnjsa6r6inj" + } + }, { "ename": "time-ext", "commit": "f8e4328cae9b4759a75da0b26ea8b68821bc71af", @@ -109871,14 +110200,14 @@ "repo": "nagy/tokei.el", "unstable": { "version": [ - 20220422, - 2234 + 20220823, + 2058 ], "deps": [ "magit-section" ], - "commit": "181021cd881eecd604a546d4a717866a81c7a511", - "sha256": "0gcjlcfxd4bg123gjf7d0vfvfd6zpd0da8svynglca1qhp77jkx1" + "commit": "86fbca422f580a95eb30247e46891184f3ac5c18", + "sha256": "0nn8v9x0dczw0ingibclc1v8fnhjiwl14vm1qjcng9dcr2pbp7mq" }, "stable": { "version": [ @@ -109990,20 +110319,20 @@ "repo": "trevorpogue/topspace", "unstable": { "version": [ - 20220803, - 2258 + 20220824, + 134 ], - "commit": "fa67b67e1ae41adb44de0e5180a6cab922da6bb0", - "sha256": "1v78pmv6554qb9b4s2i19vvxncsp914qblyyv95zbq8id3k3v606" + "commit": "4f090520174cab0fa752765b7c18885efb6cce11", + "sha256": "1qx4ablzj4w16780g6lk97lyhsmip6s2yjlb3nwpivn9979py9m4" }, "stable": { "version": [ 0, 3, - 0 + 1 ], - "commit": "6ed32d242666b4a38276de433aca9f6387dd867b", - "sha256": "1yxcig19wkr0592iips3bh7mj1g9yhv0v2yaw19jaxqg1rzg3hip" + "commit": "33c2a6f0a11d1d88cdb2065c5a897e33507f4c86", + "sha256": "16jcw01nh09lcd3xmq88iw0sq77ginyvnpkcjwds1bixmyl1frw1" } }, { @@ -110376,8 +110705,8 @@ "deps": [ "compat" ], - "commit": "3b267425c0fe93a518a703d814cff3cf6a304a97", - "sha256": "04xdaap7hqx42mpwwxdvlmmsffbdv107jqkvy6pifwjl2mmz2p5v" + "commit": "6b9c93af9c1d1646be4445656c46ee9390c9f129", + "sha256": "1kvjn30cy03729ma74qzplr6lcwcqgh2lbvj409jhq1ksmzbh35a" }, "stable": { "version": [ @@ -110530,8 +110859,8 @@ 20220704, 640 ], - "commit": "9f3c5ef4029f992fe94b70d54b8d00f0a4cbce1c", - "sha256": "19ail8y13ywp0rzl1r78iyg7176nijlqjw348is83kdv6qbf8fcc" + "commit": "7a8dc6ac88536e4ce7bdaf47bd2da06a77336f5a", + "sha256": "0di5amih9sskglj30nlhrkggda7vix32zvck2mjg7bwx4r4kz6ns" }, "stable": { "version": [ @@ -110779,26 +111108,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20220508, - 636 + 20220821, + 1313 ], "deps": [ "tree-sitter" ], - "commit": "deb2d8674be8f777ace50e15c7c041aeddb1d0b2", - "sha256": "1p2zbb6ac7wi6x6zpbczcmpkb2p45md2csd2bj43d8s56ckzw5mp" + "commit": "5c6900a66a6b3a5d4ae6bde5199b5288c09af43b", + "sha256": "0arj78dbinvki0yvgmj4p4blf9gb2c140sgphddnzfh134lvpkl9" }, "stable": { "version": [ 0, 12, - 0 + 1 ], "deps": [ "tree-sitter" ], - "commit": "deb2d8674be8f777ace50e15c7c041aeddb1d0b2", - "sha256": "1p2zbb6ac7wi6x6zpbczcmpkb2p45md2csd2bj43d8s56ckzw5mp" + "commit": "5c6900a66a6b3a5d4ae6bde5199b5288c09af43b", + "sha256": "0arj78dbinvki0yvgmj4p4blf9gb2c140sgphddnzfh134lvpkl9" } }, { @@ -110858,8 +111187,8 @@ "pfuture", "s" ], - "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", - "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" + "commit": "89ade54c0e96f1c6f6abe5c5373c46c3355c91be", + "sha256": "1qhxh88p20l9yhxv0w98rvb5g4ldlgzqy3034kl8jgaqfhwvr2i7" }, "stable": { "version": [ @@ -110895,8 +111224,8 @@ "all-the-icons", "treemacs" ], - "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", - "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" + "commit": "89ade54c0e96f1c6f6abe5c5373c46c3355c91be", + "sha256": "1qhxh88p20l9yhxv0w98rvb5g4ldlgzqy3034kl8jgaqfhwvr2i7" }, "stable": { "version": [ @@ -110926,8 +111255,8 @@ "evil", "treemacs" ], - "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", - "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" + "commit": "89ade54c0e96f1c6f6abe5c5373c46c3355c91be", + "sha256": "1qhxh88p20l9yhxv0w98rvb5g4ldlgzqy3034kl8jgaqfhwvr2i7" }, "stable": { "version": [ @@ -110956,8 +111285,8 @@ "deps": [ "treemacs" ], - "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", - "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" + "commit": "89ade54c0e96f1c6f6abe5c5373c46c3355c91be", + "sha256": "1qhxh88p20l9yhxv0w98rvb5g4ldlgzqy3034kl8jgaqfhwvr2i7" }, "stable": { "version": [ @@ -110987,8 +111316,8 @@ "pfuture", "treemacs" ], - "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", - "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" + "commit": "89ade54c0e96f1c6f6abe5c5373c46c3355c91be", + "sha256": "1qhxh88p20l9yhxv0w98rvb5g4ldlgzqy3034kl8jgaqfhwvr2i7" }, "stable": { "version": [ @@ -111020,8 +111349,8 @@ "persp-mode", "treemacs" ], - "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", - "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" + "commit": "89ade54c0e96f1c6f6abe5c5373c46c3355c91be", + "sha256": "1qhxh88p20l9yhxv0w98rvb5g4ldlgzqy3034kl8jgaqfhwvr2i7" }, "stable": { "version": [ @@ -111053,8 +111382,8 @@ "perspective", "treemacs" ], - "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", - "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" + "commit": "89ade54c0e96f1c6f6abe5c5373c46c3355c91be", + "sha256": "1qhxh88p20l9yhxv0w98rvb5g4ldlgzqy3034kl8jgaqfhwvr2i7" }, "stable": { "version": [ @@ -111085,8 +111414,8 @@ "projectile", "treemacs" ], - "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", - "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" + "commit": "89ade54c0e96f1c6f6abe5c5373c46c3355c91be", + "sha256": "1qhxh88p20l9yhxv0w98rvb5g4ldlgzqy3034kl8jgaqfhwvr2i7" }, "stable": { "version": [ @@ -111116,8 +111445,8 @@ "dash", "treemacs" ], - "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", - "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" + "commit": "89ade54c0e96f1c6f6abe5c5373c46c3355c91be", + "sha256": "1qhxh88p20l9yhxv0w98rvb5g4ldlgzqy3034kl8jgaqfhwvr2i7" }, "stable": { "version": [ @@ -111325,15 +111654,15 @@ "repo": "alphapapa/ts.el", "unstable": { "version": [ - 20210813, - 1617 + 20220822, + 2313 ], "deps": [ "dash", "s" ], - "commit": "3fee71ceefac71ba55eb34829d7e94bb3df37cee", - "sha256": "1041zwlslj70rfjmpcxbib4h05rclhykr7i7pckvz7smsh4w3p2i" + "commit": "552936017cfdec89f7fc20c254ae6b37c3f22c5b", + "sha256": "18lif159zndl19ddz9rfq12l90770858yasfns21ryl1yrq3aifr" }, "stable": { "version": [ @@ -111744,11 +112073,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20220805, - 2008 + 20220815, + 1954 ], - "commit": "d1123e0e96da3535a22380e9345249730e756966", - "sha256": "0lp2mbfzpvcr08kgk2mgrlmpzxkq4kbaj53qsv6jbkfdcbv48x3i" + "commit": "d79551c67ff5f2bd5f651eb411cdc66ceeb787e3", + "sha256": "0r57nxcwdpjckpv6lrk310p3hjivnlyfvqpfg9jd86y37bbaw8fa" }, "stable": { "version": [ @@ -112175,8 +112504,8 @@ 20220616, 1950 ], - "commit": "6bc351c4cb49ccc7210801e6b54ecc2993289b92", - "sha256": "0vvz0s5jq2a9dlqbnq18mlkh4dkpp8kizkjyn7jk38npqy4syyv1" + "commit": "ee8a3cff8abadbfcd1b3c51e8622d32a104c99c4", + "sha256": "04lcbxjrclnijannx1hdkkcg6vyvm16jkns8ix89bk3sj0j3wgk0" }, "stable": { "version": [ @@ -112930,14 +113259,14 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20220809, - 42 + 20220819, + 553 ], "deps": [ "bind-key" ], - "commit": "e5f64cc6d9d0df3721b319eeecca1f4f49ea86a3", - "sha256": "1108x07jf9cfgi5wyy18v0dr6vjpssl19032q9g0vci5mpi5k123" + "commit": "e2d173b1200865a9efd5c2066831a230497582c0", + "sha256": "1m5987l96xlpxz0aiczc1nifrsjh33z9z7biryb47khdgizhy931" }, "stable": { "version": [ @@ -112969,8 +113298,8 @@ "key-chord", "use-package" ], - "commit": "e5f64cc6d9d0df3721b319eeecca1f4f49ea86a3", - "sha256": "1108x07jf9cfgi5wyy18v0dr6vjpssl19032q9g0vci5mpi5k123" + "commit": "e2d173b1200865a9efd5c2066831a230497582c0", + "sha256": "1m5987l96xlpxz0aiczc1nifrsjh33z9z7biryb47khdgizhy931" }, "stable": { "version": [ @@ -113032,8 +113361,8 @@ "system-packages", "use-package" ], - "commit": "e5f64cc6d9d0df3721b319eeecca1f4f49ea86a3", - "sha256": "1108x07jf9cfgi5wyy18v0dr6vjpssl19032q9g0vci5mpi5k123" + "commit": "e2d173b1200865a9efd5c2066831a230497582c0", + "sha256": "1m5987l96xlpxz0aiczc1nifrsjh33z9z7biryb47khdgizhy931" }, "stable": { "version": [ @@ -113119,8 +113448,8 @@ 20220704, 700 ], - "commit": "6473227e4e26896db099d54bd2ba1d05619395bc", - "sha256": "1mf2r3c6dhx39j5kr2nv5mc7nh99hi2bz361al0kw5r5shk0mvid" + "commit": "9fd4d37c3fce9d0f3743172f50ed7c4cb17b822d", + "sha256": "06fl5baxdylgsdfn97823ljmwyk3ly6rxirgw6wrf62qx5kz0a3i" }, "stable": { "version": [ @@ -113898,6 +114227,36 @@ "sha256": "0w8v0ivwq3i42mxfxk5zvlx1lz4di06dpd93j2j13ns5h46vxhc0" } }, + { + "ename": "vegetative-theme", + "commit": "5fcab9f039aae62707ab953440dbb4a65f6964db", + "sha256": "1m1wgas1qfb53lfd1jbmys9x1bn4qyyi3nw211d060dmj9dggp01", + "fetcher": "github", + "repo": "emacsfodder/emacs-theme-vegetative", + "unstable": { + "version": [ + 20220822, + 353 + ], + "deps": [ + "autothemer" + ], + "commit": "db60ce0fe327ae7e4371545179ed94483b1132a8", + "sha256": "1cqrrkp8dhwh73ypfhw3hzn2siy7s23kfafn61y6qgkxm2hnhj0j" + }, + "stable": { + "version": [ + 1, + 0, + 2 + ], + "deps": [ + "autothemer" + ], + "commit": "db60ce0fe327ae7e4371545179ed94483b1132a8", + "sha256": "1cqrrkp8dhwh73ypfhw3hzn2siy7s23kfafn61y6qgkxm2hnhj0j" + } + }, { "ename": "verb", "commit": "3802b91f39ef7800afd49589d398182cb191b756", @@ -114622,11 +114981,11 @@ "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20220703, - 809 + 20220817, + 733 ], - "commit": "87b1b300375bb9f06f92e253c6941113b9bce5b4", - "sha256": "1za8p2xj5drn71xx1yvy8k96576z3rfgfcjgj4h697ldlsbz3xgi" + "commit": "bf0e9d763ccff2add31f441261903986f9cbc702", + "sha256": "02a73gnw3c92pslyis7p2yq4lz8h5pk970izvml5ifpf86raqcnq" }, "stable": { "version": [ @@ -114645,11 +115004,11 @@ "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20220703, - 806 + 20220817, + 737 ], - "commit": "af9c8ee7e99ec4ffb20d15512efafc49d509f5db", - "sha256": "1cvvhckf3s21v7bs20jgza57dazm6ck6k8lzlmj6f3fmhif27hvx" + "commit": "38c45512dc74b1221ad3364c560c2eb65ced8ff4", + "sha256": "0ydzsfbq4mkfmah4h6n4mb48f0pzfdjflqhrza5sniymgjw2mv56" }, "stable": { "version": [ @@ -114722,11 +115081,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20220613, - 1614 + 20220822, + 1158 ], - "commit": "3155a477b43c1567d754768f5be79296440ebaf8", - "sha256": "1pki7ih33n09k0q23053xc6vwn9gcvas91g3z5y19b9c5nr9b1sr" + "commit": "f104e3a11c9ff33ccc0e086cffaadc9549e9e8b1", + "sha256": "1pcqj1w3gi5bqwwb45z30zmhd2klrq76w1vbxf7l9kq9j5m590x9" } }, { @@ -114737,14 +115096,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20220606, - 1524 + 20220820, + 1608 ], "deps": [ "vterm" ], - "commit": "02519323aa0a2e6af641cd205b230f48a04a5ca3", - "sha256": "15na73bil1kfyg3915d1gm7lsl6k4p81x7ybwr79lx8qpw9rlqvg" + "commit": "b94522e3a4ddaae098f4711aadce675e891cdec8", + "sha256": "1glzc23mvfn84h3v8pqpncm67xljxvpn04qkjrzpw982lwgi6bjz" } }, { @@ -114980,11 +115339,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20220805, - 157 + 20220823, + 543 ], - "commit": "a8e2e5c7b7576afd7b097b40c6ca39e5717f97a5", - "sha256": "0vqq69jkx11d8m9g9v2m4zvpq3khkdhvgzvpcszvic4fvaa65jpc" + "commit": "e185b54d13fb7eac7d045daf6a83731d9ef79231", + "sha256": "0mbv68g1q98dysjvhdxwf3gcwwmihy6ni3b4r4kz6klyfr2jwqim" } }, { @@ -115491,11 +115850,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20220615, - 602 + 20220820, + 1935 ], - "commit": "7b5459f58c381f31eed257480b000a9a46209094", - "sha256": "054jawhk1cd3bjr6b320bmbjkmpx3mbp7fyn9l20gm4h5sjs4y70" + "commit": "de9dfa3ac3cd54e6acb4f9d9d1343f8d4eabd363", + "sha256": "0rwifqcn1m5s82vqpi0jk9zx0vz2i2bj5m5jjc1grkgkfhf2psr8" }, "stable": { "version": [ @@ -115732,20 +116091,20 @@ "repo": "xgqt/emacs-websearch", "unstable": { "version": [ - 20220809, - 1338 + 20220823, + 42 ], - "commit": "362bf974532e01c31d4abb340ed3f749da385175", - "sha256": "104ajdhxm9hsc7zrs1lxzqscnlnd01vs7s7y72fb0n03f5jyg853" + "commit": "9336601462ce29822e6aa14db01d923a4bd1c6ef", + "sha256": "0vwsi1ibmw4947bm7c1yz6jvgphilh7039akckfknc6dpacic2r6" }, "stable": { "version": [ - 1, + 2, 0, 0 ], - "commit": "c20c42177ee9268ac29dc00ab6533719ad5c59bc", - "sha256": "104ajdhxm9hsc7zrs1lxzqscnlnd01vs7s7y72fb0n03f5jyg853" + "commit": "a39858c0b81817e3defd7b02583287a4d020bc25", + "sha256": "0vwsi1ibmw4947bm7c1yz6jvgphilh7039akckfknc6dpacic2r6" } }, { @@ -116054,11 +116413,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20220518, - 1941 + 20220811, + 1616 ], - "commit": "1ab1d0cc88843c9a614ed3226c5a1070e32e4823", - "sha256": "0i4wxihcly3i8pgmw1gv7lriqcyis9q476akvwrdgjwxnn2gmk0w" + "commit": "8093644032854b1cdf3245ce4e3c7b6673f741bf", + "sha256": "1s2c7jdkgxq4rajd1c2n6bkmds7xgkmff1849nviixqsdxxcb0mf" }, "stable": { "version": [ @@ -116825,14 +117184,14 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20220608, - 1017 + 20220810, + 1159 ], "deps": [ "compat" ], - "commit": "cfcbc2731e402b9169c0dc03e89b5b57aa988502", - "sha256": "02kdsksjn76g4fcqxnidzdy1zql25650fpdjjsx2ccdnbyj9fqax" + "commit": "1d5860cfd05d6805018bd071b8f9b56493ba11c6", + "sha256": "1h6ddc9jkhk77yncfzk4pz14idci8a06lc8hl4ipcp9mcdrjikzb" }, "stable": { "version": [ @@ -116852,11 +117211,11 @@ "repo": "twlz0ne/with-emacs.el", "unstable": { "version": [ - 20200210, - 1543 + 20220814, + 444 ], - "commit": "9f99bec56f87e53deb9f33b364eda77677a17eb9", - "sha256": "0ay860skpnbv6a8xid0hhz9vx33ks2vkdicvpm3a4qngp932jvnp" + "commit": "fb9ef454a4bb2d6de3415807b4858a20a9cc0dad", + "sha256": "0dldr2m3lhg68xx6bznkyi2kjfpgbqn849cbh3sdi8njp829vbqb" } }, { @@ -117577,11 +117936,11 @@ "repo": "jobbflykt/x509-mode", "unstable": { "version": [ - 20220705, - 757 + 20220819, + 541 ], - "commit": "49fbab6166d03e5d4c8b856de6ef04b99ba16eb4", - "sha256": "0kjfrqavz76mbiabzl01hywgjgfrn86a28y86kh01dd7f9njll97" + "commit": "a2ec552b454c22f027da5acc44f20f51a531e2e5", + "sha256": "0rxcyvckmwblr44pd7jnxsf8b60zrgnrmryvflnkl79cn2zpdyf9" } }, { @@ -117704,8 +118063,8 @@ "repo": "dandavison/xenops", "unstable": { "version": [ - 20220421, - 1320 + 20220821, + 1111 ], "deps": [ "aio", @@ -117715,8 +118074,8 @@ "f", "s" ], - "commit": "a2c685b3bb2257da49af771caa02325aa41fa699", - "sha256": "12iy5fk3vz4rfyw848nb9dnnc4l338s9wm981w17k73wf37gnv89" + "commit": "4d75c1cd5ee7afba62af3a39a1f43432b295c29c", + "sha256": "11sxypdpf31hmimskqqg9fd6qnycmx9wr2274ghws9l7mn20df60" } }, { @@ -118425,8 +118784,8 @@ "deps": [ "yaml" ], - "commit": "3e698c625c716a1f85e64b9b839241cb56f0db92", - "sha256": "0c0p07g6zjpfnmac368iigw63zl7fylxawx8rbmcwzkb5yrbq4xq" + "commit": "4f2b032a75871b1ece2c465ca41fd54e615e4d25", + "sha256": "070fj01kw672cnmj1mcgzdn2zc63vrnj5d9whzclxssgrmrbs462" }, "stable": { "version": [ @@ -118541,8 +118900,8 @@ 20220317, 935 ], - "commit": "4c959b300ce52665c92e04e524dda5ed051c34f3", - "sha256": "0kb2a4hcmaczn279hbgk0jv88hsjznv1kqpkgkadszd02q53n0cl" + "commit": "8a9738f2d4b3454a01c755ca690cdef881f12843", + "sha256": "1b7cr2jvij66n3rlkicmsjnqak9ff5mfh40zgbcydc1b0ni6wvqy" } }, { @@ -119171,11 +119530,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20220710, - 623 + 20220823, + 442 ], - "commit": "cff73bfea8deef2c97cc1ceac4b03702702c4a83", - "sha256": "1nj4zbf0551whlzgx4gc0p0l5223ag1rwjmjsvk08knvr14jnjm5" + "commit": "2db3a34f50ec4dd6e2cae92bab639ccfc742b3cc", + "sha256": "1iqshfkf4xchymmf340bdh6vl555z50l2wd3r3g063gf03vxsr5a" }, "stable": { "version": [ @@ -119543,14 +119902,14 @@ "repo": "ymherklotz/emacs-zettelkasten", "unstable": { "version": [ - 20220727, - 1137 + 20220819, + 2351 ], "deps": [ "s" ], - "commit": "edba7bcfdc054ad0ff1952bb525f5709a687db25", - "sha256": "06rb7frgw1vja7azsd9cxzkbvlr7xpzapgqypsc777szncz06xhi" + "commit": "505fd41dea012e743962c3a376c1e63e7a1e127e", + "sha256": "13pf2ygyizqk3axfl7s246an9w1ih38jq1knzy5f4qn2pf5k2zjs" }, "stable": { "version": [ @@ -119660,11 +120019,11 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220722, - 1626 + 20220820, + 1139 ], - "commit": "d997b13e7a03f7c3c7411183641bd0dc89526ec9", - "sha256": "04nqd7mhv8s2sp68vk14x4p9gmw4z9gayvyl5zl5ilv1zlchkiwv" + "commit": "843e33acaa8e0a2caa8cd5fbbcc7ab66693efe06", + "sha256": "08ijhxd45gv4glfihv8m6r12ypjmr4gdfpyi09lyn7j3jw2m1wqp" }, "stable": { "version": [ @@ -119683,14 +120042,14 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220723, - 1824 + 20220821, + 1327 ], "deps": [ "zk" ], - "commit": "d997b13e7a03f7c3c7411183641bd0dc89526ec9", - "sha256": "04nqd7mhv8s2sp68vk14x4p9gmw4z9gayvyl5zl5ilv1zlchkiwv" + "commit": "843e33acaa8e0a2caa8cd5fbbcc7ab66693efe06", + "sha256": "08ijhxd45gv4glfihv8m6r12ypjmr4gdfpyi09lyn7j3jw2m1wqp" }, "stable": { "version": [ @@ -119712,15 +120071,15 @@ "repo": "localauthor/zk-luhmann", "unstable": { "version": [ - 20220713, - 1653 + 20220820, + 1643 ], "deps": [ "zk", "zk-index" ], - "commit": "566fa6a5933455a3f42f700bc91f9f9958878861", - "sha256": "15h28v1aljbwril0mx5swk6vy0972qymxiki2y7a6wsczx252zrh" + "commit": "304536486ccae8129dd681265d199062f2026891", + "sha256": "1b4nmf7dicp11hn7sp0p1j5wg5fix9fg32wky29wgr8p3qsnr9wl" } }, { diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay index 052364c803c1..80167084c555 100755 --- a/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay +++ b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay @@ -1,17 +1,37 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p curl nix +#! nix-shell -i bash -p curl nix coreutils set -euxo pipefail -export NIXPKGS_ALLOW_BROKEN=1 - # This script piggybacks on the automatic code generation done by the nix-community emacs overlay # You can use this to avoid running lengthy code generation jobs locally -curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/elpa/elpa-generated.nix -nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages --show-trace -git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacs.pkgs.elpa-packages: $(date --iso)" -- elpa-generated.nix +export NIXPKGS_ALLOW_BROKEN=1 -curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/melpa/recipes-archive-melpa.json +download_change() { + local FILE_LOCATION="$1" + + local BASEURL="https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos" + + curl -s -O "${BASEURL}/${FILE_LOCATION}" +} + +commit_change() { + local MESSAGE="$1" + local FILENAME="$2" + + git diff --exit-code "${FILENAME}" > /dev/null || \ + git commit -m "${MESSAGE}: updated $(date --iso) (from overlay)" -- "${FILENAME}" +} + +download_change "elpa/elpa-generated.nix" +nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages --show-trace +commit_change "elpa-packages" "elpa-generated.nix" + +download_change "melpa/recipes-archive-melpa.json" nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaStablePackages nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaPackages -git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "emacs.pkgs.melpa-packages: $(date --iso)" -- recipes-archive-melpa.json +commit_change "melpa-packages" "recipes-archive-melpa.json" + +download_change "nongnu/nongnu-generated.nix" +nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.nongnuPackages +commit_change "nongnu-packages" "nongnu-generated.nix" diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index e4b6393b67e9..f4d24c018786 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.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = version; - hash = "sha256-Vr1w9bAtjQK1ZevFDWQ7xNsUrdv5qrP+JHe1Cuc2CvE="; + hash = "sha256-YmZrT/KZUa34A0mMDM423GL99BDLrqrio7gNEW833SI="; }; nativeBuildInputs = [ qmake pkg-config qttools ]; diff --git a/pkgs/applications/emulators/pcsx2/default.nix b/pkgs/applications/emulators/pcsx2/default.nix index 5f5579658b13..a4e99b0515bc 100644 --- a/pkgs/applications/emulators/pcsx2/default.nix +++ b/pkgs/applications/emulators/pcsx2/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { pname = "pcsx2"; version = "1.7.3165"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "PCSX2"; diff --git a/pkgs/applications/emulators/yuzu/default.nix b/pkgs/applications/emulators/yuzu/default.nix index b4441cddfd8f..7650ebad343d 100644 --- a/pkgs/applications/emulators/yuzu/default.nix +++ b/pkgs/applications/emulators/yuzu/default.nix @@ -15,13 +15,13 @@ let in { mainline = libsForQt5.callPackage ./generic.nix rec { pname = "yuzu-mainline"; - version = "1137"; + version = "1162"; src = fetchFromGitHub { owner = "yuzu-emu"; repo = "yuzu-mainline"; rev = "mainline-0-${version}"; - sha256 = "sha256-DLU5hmjTnlpRQ6sbcU7as/KeI9dDJAFUzVLciql5niE="; + sha256 = "sha256-1UNgB/3l6RN0OLRrmXqzwcEUgXlWGSE7PvHbZ8YSDro="; fetchSubmodules = true; }; @@ -30,13 +30,13 @@ in { early-access = libsForQt5.callPackage ./generic.nix rec { pname = "yuzu-ea"; - version = "2907"; + version = "2945"; src = fetchFromGitHub { owner = "pineappleEA"; repo = "pineapple-src"; rev = "EA-${version}"; - sha256 = "sha256-spPW2/qeVyd1P1/Z2lcuA69igS3xV4KtcJ59yf9X4JI="; + sha256 = "sha256-/051EtQxhB5oKH/JxZZ2AjnxOBcRxCBIwd4Qr8lq7Ok="; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix index cd92a0d39ec7..546af551de9c 100644 --- a/pkgs/applications/graphics/drawing/default.nix +++ b/pkgs/applications/graphics/drawing/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , meson , ninja , pkg-config @@ -19,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "drawing"; - version = "1.0.0"; + version = "1.0.1"; format = "other"; @@ -27,19 +26,9 @@ python3.pkgs.buildPythonApplication rec { owner = "maoschanz"; repo = pname; rev = version; - sha256 = "sha256-qNaljtuA5E/QaLJ9QILPRQCqOvKmX4ZGq/0z5unA8KA="; + sha256 = "sha256-9nosriI3Kdf1M5/TYFWn1jtQTqNKhBcFh7q3E4Uoq4s="; }; - patches = [ - # Fix build with meson 0.61, can be removed on next update. - # https://github.com/NixOS/nixpkgs/issues/167584 - (fetchpatch { - url = "https://github.com/maoschanz/drawing/commit/6dd271089af76b69322500778e3ad6615a117dcc.patch"; - sha256 = "sha256-4pKWm3LYstVxZ4+gGsZDfM4K+7WBY8EYjylzc/CQZmo="; - includes = [ "data/meson.build" "help/meson.build" ]; - }) - ]; - nativeBuildInputs = [ appstream-glib desktop-file-utils diff --git a/pkgs/applications/graphics/pizarra/default.nix b/pkgs/applications/graphics/pizarra/default.nix new file mode 100644 index 000000000000..6a288bd3bea9 --- /dev/null +++ b/pkgs/applications/graphics/pizarra/default.nix @@ -0,0 +1,49 @@ +{ lib +, fetchFromGitLab +, rustPlatform +, cargo +, pkg-config +, binutils-unwrapped +, gtk3-x11 +, atk +, glib +, librsvg +, gdk-pixbuf +, wrapGAppsHook +}: + +rustPlatform.buildRustPackage rec { + pname = "pizarra"; + version = "1.7.3"; + + src = fetchFromGitLab { + owner = "categulario"; + repo = "pizarra-gtk"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-XP+P2w6s47JQV4spKeMKe/Ktxid7uokGYH4IEJ5VHSc="; + }; + + cargoSha256 = "sha256-JQZ/95tRlmsrb0EJaPlE8G0fMSeEgLnDi3pkLjcJz/o="; + + nativeBuildInputs = [ wrapGAppsHook pkg-config gdk-pixbuf ]; + + buildInputs = [ gtk3-x11 atk glib librsvg ]; + + meta = with lib; { + description = "A simple blackboard written in GTK"; + longDescription = '' + A simple endless blackboard. + Contains various features, such as: + - Pencil + - Rectangle + - Ellipse + - Line + - Text + - Grids + ''; + homepage = "https://pizarra.categulario.tk/en/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ mglolenstine ]; + }; +} diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix index b73e5a1800b0..0cc78c69aec7 100644 --- a/pkgs/applications/kde/kdepim-runtime/default.nix +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -24,6 +24,6 @@ mkDerivation { qca-qt5 qtkeychain qtnetworkauth qtspeech qtxmlpatterns ]; qtWrapperArgs = [ - "--prefix SASL_PATH : ${lib.makeSearchPath "lib/sasl2" [ cyrus_sasl libkgapi ]}" + "--prefix SASL_PATH : ${lib.makeSearchPath "lib/sasl2" [ cyrus_sasl.out libkgapi ]}" ]; } diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 3a88536224dc..d1e67f202e8b 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -23,7 +23,10 @@ buildDotnetModule rec { dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; - nugetDeps = if stdenvNoCC.isAarch64 then ./deps-aarch64-linux.nix else ./deps-x86_64-linux.nix; + nugetDeps = ./deps.nix; + + # Without this dotnet attempts to restore for Windows targets, which it cannot find the dependencies for + dotnetRestoreFlags = [ "--runtime ${dotnetCorePackages.sdk_6_0.systemToDotnetRid stdenvNoCC.targetPlatform.system}" ]; projectFile = "ArchiSteamFarm.sln"; executables = [ "ArchiSteamFarm" ]; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix b/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix deleted file mode 100644 index 8f8a04977d1a..000000000000 --- a/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix +++ /dev/null @@ -1,292 +0,0 @@ -{ fetchNuGet }: [ - (fetchNuGet { pname = "AngleSharp"; version = "0.17.1"; sha256 = "038idg33ydy72362qplsd7y8ldifi9zg02dhjli6wy4p47hyqcph"; }) - (fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.1"; sha256 = "0sdxqjwvyf0l1cp4n4i84g7rly8z7ramq0y7vsgqvf6hzx7dnk5i"; }) - (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; sha256 = "01llfwhra5m3jj1qpa4rj1hbh01drirakzjc2963vkl9iwrzscyl"; }) - (fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; sha256 = "0nikzb92z4a2n969sz747ginwxsbrap5741bcwwxr4r6m2na9jz7"; }) - (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; }) - (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) - (fetchNuGet { pname = "Humanizer.Core.af"; version = "2.14.1"; sha256 = "197lsky6chbmrixgsg6dvxbdbbpis0an8mn6vnwjcydhncis087h"; }) - (fetchNuGet { pname = "Humanizer.Core.ar"; version = "2.14.1"; sha256 = "03rz12mxrjv5afm1hn4rrpimkkb8wdzp17634dcq10fhpbwhy6i5"; }) - (fetchNuGet { pname = "Humanizer.Core.az"; version = "2.14.1"; sha256 = "138kdhy86afy5n72wy12qlb25q4034z73lz5nbibmkixxdnj9g5r"; }) - (fetchNuGet { pname = "Humanizer.Core.bg"; version = "2.14.1"; sha256 = "0scwzrvv8332prijkbp4y11n172smjb4sf7ygia6bi3ibhzq7zjy"; }) - (fetchNuGet { pname = "Humanizer.Core.bn-BD"; version = "2.14.1"; sha256 = "1322kn7ym46mslh32sgwkv07l3jkkx7cw5wjphql2ziphxw536p8"; }) - (fetchNuGet { pname = "Humanizer.Core.cs"; version = "2.14.1"; sha256 = "1zl3vsdd2pw3nm05qpnr6c75y7gacgaghg9sj07ksvsjmklgqqih"; }) - (fetchNuGet { pname = "Humanizer.Core.da"; version = "2.14.1"; sha256 = "10rmrvzwp212fpxv0sdq8f0sjymccsdn71k99f845kz0js83r70s"; }) - (fetchNuGet { pname = "Humanizer.Core.de"; version = "2.14.1"; sha256 = "0j7kld0jdiqwin83arais9gzjj85mpshmxls64yi58qhl7qjzk0j"; }) - (fetchNuGet { pname = "Humanizer.Core.el"; version = "2.14.1"; sha256 = "143q1321qh5506wwvcpy0fj7hpbd9i1k75247mqs2my05x9vc8n0"; }) - (fetchNuGet { pname = "Humanizer.Core.es"; version = "2.14.1"; sha256 = "011kscy671mgyx412h55b0x9a1ngmdsgqzqq1w0l10xhf90y4hc8"; }) - (fetchNuGet { pname = "Humanizer.Core.fa"; version = "2.14.1"; sha256 = "184dxwkf251c27h7gg9y5zciixgcwy1cmdrs0bqrph7gg69kp6yq"; }) - (fetchNuGet { pname = "Humanizer.Core.fi-FI"; version = "2.14.1"; sha256 = "144jlnlipr3pnbcyhbgrd2lxibx8vy00lp2zn60ihxppgbisircc"; }) - (fetchNuGet { pname = "Humanizer.Core.fr"; version = "2.14.1"; sha256 = "0klnfy8n659sp8zngd87gy7qakd56dwr1axjjzk0zph1zvww09jq"; }) - (fetchNuGet { pname = "Humanizer.Core.fr-BE"; version = "2.14.1"; sha256 = "0b70illi4m58xvlqwcvar0smh6292zadzk2r8c25ryijh6d5a9qv"; }) - (fetchNuGet { pname = "Humanizer.Core.he"; version = "2.14.1"; sha256 = "08xkiv88qqd1b0frpalb2npq9rvz2q1yz48k6dikrjvy6amggirh"; }) - (fetchNuGet { pname = "Humanizer.Core.hr"; version = "2.14.1"; sha256 = "12djmwxfg03018j2bqq5ikwkllyma8k7zmvpw61vxs7cv4izc6wh"; }) - (fetchNuGet { pname = "Humanizer.Core.hu"; version = "2.14.1"; sha256 = "0lw13p9b2kbqf96lif5kx59axxiahd617h154iswjfka9kxdw65x"; }) - (fetchNuGet { pname = "Humanizer.Core.hy"; version = "2.14.1"; sha256 = "1bgm0yabhvsv70amzmkvf3mls32lvd7yyr59yxf3xc96msqczgjh"; }) - (fetchNuGet { pname = "Humanizer.Core.id"; version = "2.14.1"; sha256 = "1w0bnyac46f2321l09ckb6vz66s1bxl27skfww1iwrmf03i7m2cw"; }) - (fetchNuGet { pname = "Humanizer.Core.is"; version = "2.14.1"; sha256 = "10w1fprlhxm1qy3rh0qf6z86ahrv8fcza3wrsx55idlmar1x9jyz"; }) - (fetchNuGet { pname = "Humanizer.Core.it"; version = "2.14.1"; sha256 = "1msrmih8cp7r4yj7r85kr0l5h4yln80450mivliy1x322dav8xz2"; }) - (fetchNuGet { pname = "Humanizer.Core.ja"; version = "2.14.1"; sha256 = "04ry6z0v85y4y5vzbqlbxppfdm04i02dxbxaaykbps09rwqaa250"; }) - (fetchNuGet { pname = "Humanizer.Core.ko-KR"; version = "2.14.1"; sha256 = "156641v0ilrpbzprscvbzfha57pri4y1i66n9v056nc8bm10ggbg"; }) - (fetchNuGet { pname = "Humanizer.Core.ku"; version = "2.14.1"; sha256 = "1scz21vgclbm1xhaw89f0v8s0vx46yv8yk3ij0nr6shsncgq9f7h"; }) - (fetchNuGet { pname = "Humanizer.Core.lv"; version = "2.14.1"; sha256 = "1909dsbxiv2sgj6myfhn8lbbmvkp2hjahj0knawypyq3jw9sq86g"; }) - (fetchNuGet { pname = "Humanizer.Core.ms-MY"; version = "2.14.1"; sha256 = "1dmjrxb0kb297ycr8xf7ni3l7y4wdqrdhqbhy8xnm8dx90nmj9x5"; }) - (fetchNuGet { pname = "Humanizer.Core.mt"; version = "2.14.1"; sha256 = "0b183r1apzfa1hasimp2f27yfjkfp87nfbd8qdyrqdigw6nzcics"; }) - (fetchNuGet { pname = "Humanizer.Core.nb"; version = "2.14.1"; sha256 = "12rd75f83lv6z12b5hbwnarv3dkk29pvc836jpg2mzffm0g0kxj2"; }) - (fetchNuGet { pname = "Humanizer.Core.nb-NO"; version = "2.14.1"; sha256 = "1n033yfw44sjf99mv51c53wggjdffz8b9wv7gwm3q7i6g7ck4vv1"; }) - (fetchNuGet { pname = "Humanizer.Core.nl"; version = "2.14.1"; sha256 = "0q4231by40bsr6mjy93n0zs365pz6da32pwkxcz1cc2hfdlkn0vd"; }) - (fetchNuGet { pname = "Humanizer.Core.pl"; version = "2.14.1"; sha256 = "0h2wbwrlcmjk8b2mryyd8rbb1qmripvg0zyg61gg0hifiqfg3cr2"; }) - (fetchNuGet { pname = "Humanizer.Core.pt"; version = "2.14.1"; sha256 = "0pg260zvyhqz8h1c96px1vs9q5ywvd0j2ixsq21mj96dj7bl5fay"; }) - (fetchNuGet { pname = "Humanizer.Core.ro"; version = "2.14.1"; sha256 = "04mr28bjcb9hs0wmpb4nk2v178i0fjr0ymc78dv9bbqkmrzfsmcn"; }) - (fetchNuGet { pname = "Humanizer.Core.ru"; version = "2.14.1"; sha256 = "060abvk7mrgawipjgw0h4hrvizby7acmj58w2g35fv54g43isgcl"; }) - (fetchNuGet { pname = "Humanizer.Core.sk"; version = "2.14.1"; sha256 = "182xiqf71kiqp42b8yqrag6z57wzqraqi10bnhx0crrc1gxq8v0j"; }) - (fetchNuGet { pname = "Humanizer.Core.sl"; version = "2.14.1"; sha256 = "12ygvzyqa0km7a0wz42zssq8qqakvghh96x1ng7qvwcrna3v2rdi"; }) - (fetchNuGet { pname = "Humanizer.Core.sr"; version = "2.14.1"; sha256 = "1ggj15qksyr16rilq2w76x38bxp6a6z75b30c9b7w5ni88nkgc7x"; }) - (fetchNuGet { pname = "Humanizer.Core.sr-Latn"; version = "2.14.1"; sha256 = "0lwr0gnashirny8lgaw0qnbb7x0qrjg8fs11594x8l7li3mahzz3"; }) - (fetchNuGet { pname = "Humanizer.Core.sv"; version = "2.14.1"; sha256 = "1c7yx59haikdqx7k7vqll6223jjmikgwbl3dzmrcs3laywgfnmgn"; }) - (fetchNuGet { pname = "Humanizer.Core.th-TH"; version = "2.14.1"; sha256 = "0kyyi5wc23i2lcag3zvrhga9gsnba3ahl4kdlaqvvg2jhdfarl4m"; }) - (fetchNuGet { pname = "Humanizer.Core.tr"; version = "2.14.1"; sha256 = "0rdvp0an263b2nj3c5v11hvdwgmj86ljf2m1h3g1x28pygbcx6am"; }) - (fetchNuGet { pname = "Humanizer.Core.uk"; version = "2.14.1"; sha256 = "0a2p6mhh0ajn0y7x98zbfasln1l04iiknd50sgf3svna99wybnxd"; }) - (fetchNuGet { pname = "Humanizer.Core.uz-Cyrl-UZ"; version = "2.14.1"; sha256 = "1jfzfgnk6wz5na2md800vq0djm6z194x618yvwxbnk2c7wikbjj2"; }) - (fetchNuGet { pname = "Humanizer.Core.uz-Latn-UZ"; version = "2.14.1"; sha256 = "0vimhw500rq60naxfari8qm6gjmjm8h9j6c04k67fs447djy8ndi"; }) - (fetchNuGet { pname = "Humanizer.Core.vi"; version = "2.14.1"; sha256 = "1yr0l73cy2qypkssmmjwfbbqgdplam62dqnzk9vx6x47dzpys077"; }) - (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "2.14.1"; sha256 = "1k6nnawd016xpwgzdzy84z1lcv2vc1cygcksw19wbgd8dharyyk7"; }) - (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) - (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.1.0"; sha256 = "0lsqpssain0v9i3jhpi1c42r5s329y31cvqk5x7gqvy17f29y002"; }) - (fetchNuGet { pname = "Markdig.Signed"; version = "0.30.2"; sha256 = "094yy2hfwvnlzap919zmnbfc915v86gd1zb9hfcbfvzbly11rd7s"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.6"; sha256 = "1fv3xvqc98l3ma4s8f2g4fklifbj1i24fngcvlhfm4j6s295xjj1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.6"; sha256 = "1z50gqg0jimk98yd0zr2vxn087h3h1qn08fdcqbaxfgpcw30yi87"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0ndah9cqkgswhi60wrnni10j1d2hdg8jljij83lk1wbfqbng86jm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.6"; sha256 = "1qp64z6m7sr5ln3sa5b39vj73yd52zs7asqlsws3a9jpisns6vds"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.6"; sha256 = "0i00xs472gpxbrwx593z520sp8nv3lmqi8z3zrj9cshqckq8knnx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1i66xw8h6qw1p0yf09hdy6l42bkhw3qi8q6zi7933mdkd4r3qr9n"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.0-rc.1.21452.15"; sha256 = "0c3vnaag8gxlxij77n18m3hawpjkjjamsnq5kfjz5cvc7sfg3fwh"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.0-rc.1.21452.15"; sha256 = "1xyx358w4fqzxr9cy358agnm86rjijbnvikiqlngz2msgmldxi2z"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.2.0"; sha256 = "018yl113i037m5qhm3z6csb0c4l8kj412dxw2dagdbj07qbxwikj"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.2.0"; sha256 = "0ncnq378pk1immy2dyf75xjf2xn72r4m5gma1njhc4rvhzx9qz11"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.6"; sha256 = "0kygwac98rxq89g83lyzn21kslvgdkcqfd1dnba2ssw7q056fbgy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.6"; sha256 = "0hlxq0k60ras0wj7d7q94dxd8nzjcry0kixxs6z1hyrbm4q0y3ls"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.6"; sha256 = "1wwwjldbqy6l8x9dlw0512zqac9jplsmnn0rrrwzrlb0p5amz0a4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.6"; sha256 = "12b6ya9q5wszfq6yp38lpan8zws95gbp1vs9pydk3v82gai336r3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.6"; sha256 = "186ammhxnkh4m68f1s70rca23025lwzhxnc7m82wjg18rwz2vnkl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.6"; sha256 = "088ggz1ac5z4ir707xmxiw4dlcaacfgmyvvlgwvsxhnv3fngf8b6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.6"; sha256 = "117rz4gm7ihns5jlc2x05h7kdcgrl0ic4v67dzfbbr9kpra1bmcw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0fjbjh7yxqc9h47ix37y963xi9f9y99jvl26cw3x3kvjlb8x0bgj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.6"; sha256 = "04i4d7zhw7cqhfl84p93hpib8lhvkhmprip1li64sq5zrs36dxpx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.6"; sha256 = "0l15md6rzr2dvwvnk8xj1qz1dcjcbmp0aglnflrj8av60g5r1kwd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1a6hvkiy2z6z7v7rw1q61qqlw7w0hzc4my3rm94kwgjcv5qkpr5k"; }) - (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"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.2.0"; sha256 = "0l05smcgjzdfa5f60f9q5lylap3i21aswxbava92s19bgv46w2rv"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.2.0"; sha256 = "1238hx3hdg22s123cxygdfm89h54abw1jv6az6hl8h76ip39ybdp"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.2.10"; sha256 = "0w6c55n30w6imm0rjafl2sg0x8vf9852xmil9dzqb4h36cs7v6y6"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "2.2.10"; sha256 = "0j5p3p5a0pr3rmzg7va21z3w0lb929zqj5xcdd81iys5vvh1hjiw"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.3"; sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) - (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) - (fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; sha256 = "0sxvmqnv8a94k3pq1w3lh1vgjb8l62h1qamxcjl3pkq634h2fwrl"; }) - (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) - (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) - (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.0.1"; sha256 = "1ln6qxm2kgq8vr4kja41y9b6mhcf2812fi7vbkmbc5q1bivawf1b"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.1"; sha256 = "1z7cp2zdnaiijm6m0449h5q4mpij3985nbpayscwbifsnv8xl9ci"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.1.0"; sha256 = "18jaxjbyaw5q166px5n5hanlwh0swlpw0fbcwh2qhvla7ik11gyk"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) - (fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; }) - (fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) - (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"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "runtime.win.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0k1h8nnp1s0p8rjwgjyj1387cc1yycv0k22igxc963lqdzrx2z36"; }) - (fetchNuGet { pname = "runtime.win.System.Console"; version = "4.3.0"; sha256 = "0x2yajfrbc5zc6g7nmlr44xpjk6p1hxjq47jn3xki5j7i33zw9jc"; }) - (fetchNuGet { pname = "runtime.win.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "16fbn4bcynad1ygdq0yk1wmckvs8jvrrf104xa5dc2hlc8y3x58f"; }) - (fetchNuGet { pname = "runtime.win.System.IO.FileSystem"; version = "4.3.0"; sha256 = "1c01nklbxywszsbfaxc76hsz7gdxac3jkphrywfkdsi3v4bwd6g8"; }) - (fetchNuGet { pname = "runtime.win.System.Net.Primitives"; version = "4.3.0"; sha256 = "1dixh195bi7473n17hspll6i562gghdz9m4jk8d4kzi1mlzjk9cf"; }) - (fetchNuGet { pname = "runtime.win.System.Net.Sockets"; version = "4.3.0"; sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; }) - (fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) - (fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.4.0"; sha256 = "1jkgjnkjcb6dif0lzn7whjwwdd4fi6mzkmkdx8sfmv5cffzq4fvk"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.4.0"; sha256 = "0d01dpl4bcnrxqxyxcx0jhh9v375fqhva9w0siadj5y6m15h1sl5"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.4.0"; sha256 = "0yyh74b8vlngg2mg728ds86467y9vkxys29yszl129g2n8fk5q0m"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.4.0"; sha256 = "1wccx8ig2xc6xcfh774m5z34w6jn0hjffiwc5sq9yl63zkv01vnn"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.4.0"; sha256 = "1k58j6lfqcgrl5f7dw0xnbq6w5bvr42a9fc44vwbzl52kzjdlnh2"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.4.0"; sha256 = "1rxgf0hbkkzywh8z7asky2rrh1gpnrr514v1aj5vnmh49sa31kiz"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) - (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) - (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) - (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) - (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) - (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) - (fetchNuGet { pname = "System.Composition"; version = "6.0.0"; sha256 = "1p7hysns39cc24af6dwd4m48bqjsrr3clvi4aws152mh2fgyg50z"; }) - (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "6.0.0"; sha256 = "1mqrblb0l65hw39d0hnspqcv85didpn4wbiwhfgj4784wzqx2w6k"; }) - (fetchNuGet { pname = "System.Composition.Convention"; version = "6.0.0"; sha256 = "02km3yb94p1c4s7liyhkmda0g71zm1rc8ijsfmy4bnlkq15xjw3b"; }) - (fetchNuGet { pname = "System.Composition.Hosting"; version = "6.0.0"; sha256 = "0big5nk8c44rxp6cfykhk7rxvn2cgwa99w6c3v2a36adc3lj36ky"; }) - (fetchNuGet { pname = "System.Composition.Runtime"; version = "6.0.0"; sha256 = "0vq5ik63yii1784gsa2f2kx9w6xllmm8b8rk0arid1jqdj1nyrlw"; }) - (fetchNuGet { pname = "System.Composition.TypedParts"; version = "6.0.0"; sha256 = "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { pname = "System.Diagnostics.TextWriterTraceListener"; version = "4.3.0"; sha256 = "09db74f36wkwg30f7v7zhz1yhkyrnl5v6bdwljq1jdfgzcfch7c3"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Formatters"; version = "4.3.0"; sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) - (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Overlapped"; version = "4.3.0"; sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) - (fetchNuGet { pname = "zxcvbn-core"; version = "7.0.92"; sha256 = "1pbi0n3za8zsnkbvq19njy4h4hy12a6rv4rknf4a2m1kdhxb3cgx"; }) -] diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix similarity index 90% rename from pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix rename to pkgs/applications/misc/ArchiSteamFarm/deps.nix index 4f276da75c3d..a6fb04a9e7d7 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -55,12 +55,6 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.1.0"; sha256 = "0lsqpssain0v9i3jhpi1c42r5s329y31cvqk5x7gqvy17f29y002"; }) (fetchNuGet { pname = "Markdig.Signed"; version = "0.30.2"; sha256 = "094yy2hfwvnlzap919zmnbfc915v86gd1zb9hfcbfvzbly11rd7s"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.6"; sha256 = "1fv3xvqc98l3ma4s8f2g4fklifbj1i24fngcvlhfm4j6s295xjj1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.6"; sha256 = "1z50gqg0jimk98yd0zr2vxn087h3h1qn08fdcqbaxfgpcw30yi87"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0ndah9cqkgswhi60wrnni10j1d2hdg8jljij83lk1wbfqbng86jm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.6"; sha256 = "1qp64z6m7sr5ln3sa5b39vj73yd52zs7asqlsws3a9jpisns6vds"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.6"; sha256 = "0i00xs472gpxbrwx593z520sp8nv3lmqi8z3zrj9cshqckq8knnx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1i66xw8h6qw1p0yf09hdy6l42bkhw3qi8q6zi7933mdkd4r3qr9n"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.0-rc.1.21452.15"; sha256 = "0c3vnaag8gxlxij77n18m3hawpjkjjamsnq5kfjz5cvc7sfg3fwh"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.0-rc.1.21452.15"; sha256 = "1xyx358w4fqzxr9cy358agnm86rjijbnvikiqlngz2msgmldxi2z"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) @@ -77,17 +71,6 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.2.0"; sha256 = "0ncnq378pk1immy2dyf75xjf2xn72r4m5gma1njhc4rvhzx9qz11"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.6"; sha256 = "0kygwac98rxq89g83lyzn21kslvgdkcqfd1dnba2ssw7q056fbgy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.6"; sha256 = "0hvawclkpp6srhbdl0b1ma2xsvf6yy8k8s1fp4by249qzpy26w7l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.6"; sha256 = "1wwwjldbqy6l8x9dlw0512zqac9jplsmnn0rrrwzrlb0p5amz0a4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.6"; sha256 = "12b6ya9q5wszfq6yp38lpan8zws95gbp1vs9pydk3v82gai336r3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.6"; sha256 = "186ammhxnkh4m68f1s70rca23025lwzhxnc7m82wjg18rwz2vnkl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.6"; sha256 = "088ggz1ac5z4ir707xmxiw4dlcaacfgmyvvlgwvsxhnv3fngf8b6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.6"; sha256 = "117rz4gm7ihns5jlc2x05h7kdcgrl0ic4v67dzfbbr9kpra1bmcw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0fjbjh7yxqc9h47ix37y963xi9f9y99jvl26cw3x3kvjlb8x0bgj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.6"; sha256 = "04i4d7zhw7cqhfl84p93hpib8lhvkhmprip1li64sq5zrs36dxpx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.6"; sha256 = "0l15md6rzr2dvwvnk8xj1qz1dcjcbmp0aglnflrj8av60g5r1kwd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1a6hvkiy2z6z7v7rw1q61qqlw7w0hzc4my3rm94kwgjcv5qkpr5k"; }) (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"; }) @@ -156,13 +139,6 @@ (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "runtime.win.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0k1h8nnp1s0p8rjwgjyj1387cc1yycv0k22igxc963lqdzrx2z36"; }) - (fetchNuGet { pname = "runtime.win.System.Console"; version = "4.3.0"; sha256 = "0x2yajfrbc5zc6g7nmlr44xpjk6p1hxjq47jn3xki5j7i33zw9jc"; }) - (fetchNuGet { pname = "runtime.win.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "16fbn4bcynad1ygdq0yk1wmckvs8jvrrf104xa5dc2hlc8y3x58f"; }) - (fetchNuGet { pname = "runtime.win.System.IO.FileSystem"; version = "4.3.0"; sha256 = "1c01nklbxywszsbfaxc76hsz7gdxac3jkphrywfkdsi3v4bwd6g8"; }) - (fetchNuGet { pname = "runtime.win.System.Net.Primitives"; version = "4.3.0"; sha256 = "1dixh195bi7473n17hspll6i562gghdz9m4jk8d4kzi1mlzjk9cf"; }) - (fetchNuGet { pname = "runtime.win.System.Net.Sockets"; version = "4.3.0"; sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; }) - (fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) (fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.4.0"; sha256 = "1jkgjnkjcb6dif0lzn7whjwwdd4fi6mzkmkdx8sfmv5cffzq4fvk"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.4.0"; sha256 = "0d01dpl4bcnrxqxyxcx0jhh9v375fqhva9w0siadj5y6m15h1sl5"; }) @@ -276,7 +252,6 @@ (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Overlapped"; version = "4.3.0"; sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/update.sh b/pkgs/applications/misc/ArchiSteamFarm/update.sh index 4ff04432040b..f5e79769b3c5 100755 --- a/pkgs/applications/misc/ArchiSteamFarm/update.sh +++ b/pkgs/applications/misc/ArchiSteamFarm/update.sh @@ -1,16 +1,16 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../.. -i bash -p curl gnused jq common-updater-scripts nuget-to-nix -set -euox pipefail +#!nix-shell -I nixpkgs=../../../.. -i bash -p curl gnused jq common-updater-scripts +set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -deps_file="$(realpath ./deps)" +deps_file="$(realpath ./deps.nix)" new_version="$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/releases" | jq -r 'map(select(.prerelease == false)) | .[0].tag_name')" old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" if [[ "$new_version" == "$old_version" ]]; then echo "Already up to date!" - if [[ "$1" != "--deps-only" ]]; then + if [[ "${1-default}" != "--deps-only" ]]; then exit 0 fi fi @@ -22,32 +22,8 @@ nixpkgs_path=$(pwd) if [[ "${1:-}" != "--deps-only" ]]; then update-source-version ArchiSteamFarm "$new_version" fi -store_src="$(nix-build -A ArchiSteamFarm.src --no-out-link)" -platforms="$(nix-instantiate --strict --eval --json -A ArchiSteamFarm.meta.platforms | jq -r .[])" -src="$(mktemp -d /tmp/ArchiSteamFarm-src.XXX)" -trap ' - rm -r "$src" -' EXIT - -cp -rT "$store_src" "$src" -chmod -R +w "$src" - -pushd "$src" - -export DOTNET_NOLOGO=1 -export DOTNET_CLI_TELEMETRY_OPTOUT=1 - -for i in $platforms; do - nix-shell -I nixpkgs="$nixpkgs_path" -p dotnet-sdk_6 --argstr system $i --run " - mkdir ./nuget_pkgs-$i - for project in ArchiSteamFarm/ArchiSteamFarm.csproj ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj; do - dotnet restore \$project --packages ./nuget_pkgs-$i - done; - - nuget-to-nix ./nuget_pkgs-$i > $deps_file-$i.nix" \ - || echo "Did you set up binformat for $i?"; -done; +$(nix-build -A ArchiSteamFarm.fetch-deps --no-out-link) "$deps_file" cd "$asf_path" ./web-ui/update.sh diff --git a/pkgs/applications/misc/tofi/default.nix b/pkgs/applications/misc/tofi/default.nix new file mode 100644 index 000000000000..59b58abe1f46 --- /dev/null +++ b/pkgs/applications/misc/tofi/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, ninja +, meson +, scdoc +, wayland-protocols +, freetype +, harfbuzz +, cairo +, pango +, wayland +, libxkbcommon +}: + +stdenv.mkDerivation rec { + pname = "tofi"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "philj56"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-mSW6o/yvqj3nqkdA9C4waB+b+YcFcEXDPAdRHqYXXhY="; + }; + + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols ]; + buildInputs = [ freetype harfbuzz cairo pango wayland libxkbcommon ]; + + meta = with lib; { + description = "Tiny dynamic menu for Wayland"; + homepage = "https://github.com/philj56/tofi"; + license = licenses.mit; + maintainers = with maintainers; [ fbergroth ]; + platforms = platforms.linux; + broken = stdenv.isAarch64; + }; +} diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix index 17134dcd3892..ff0236af5668 100644 --- a/pkgs/applications/misc/xmind/default.nix +++ b/pkgs/applications/misc/xmind/default.nix @@ -1,17 +1,17 @@ -{ stdenv, lib, fetchzip, fetchurl, gtk2, jre, libXtst, makeWrapper, makeDesktopItem, runtimeShell }: +{ stdenv, lib, fetchzip, fetchurl, gtk3, jre8, libXtst, makeWrapper, makeDesktopItem, runtimeShell }: stdenv.mkDerivation rec { pname = "xmind"; - version = "8-update8"; + version = "8-update9"; src = fetchzip { - url = "https://xmind.net/xmind/downloads/${pname}-${version}-linux.zip"; + url = "https://www.xmind.app/xmind/downloads/${pname}-${version}-linux.zip"; stripRoot = false; - sha256 = "1p68z0b4brgiyybz190alqv716ncql49vsksm41y90mcjd8s4jhn"; + sha256 = "9769c4a9d42d3370ed2c2d1bed5a5d78f1fc3dc5bd604b064b56101fc7f90bb4"; }; srcIcon = fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/xmind.png?h=xmind"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/xmind.png?h=xmind&id=41936c866b244b34d7dfbee373cbb835eed7860b"; sha256 = "0jxq2fiq69q9ly0m6hx2qfybqad22sl42ciw636071khpqgc885f"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; dontStrip = true; - libPath = lib.makeLibraryPath [ gtk2 libXtst ]; + libPath = lib.makeLibraryPath [ gtk3 libXtst ]; desktopItem = makeDesktopItem { name = "XMind"; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { EOF chmod +x $out/bin/XMind - ln -s ${jre} $out/libexec/jre + ln -s ${jre8} $out/libexec/jre ''; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 2bba4816d8f3..fe99787d63dc 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.22.2"; + version = "0.23.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D5NnCJrQQ2Iam9A5rxuiT6XOf00x/LOiwEC8SjSZdt0="; + sha256 = "sha256-WA/jkS6kArc+wZFzIpBekViVOVPafG6o1vPCVqXbBNs="; }; - vendorSha256 = "sha256-5QcltDNvhfyzUsFNbSjVnh0OMTxj+JU0VnDADSWTD48="; + vendorSha256 = "sha256-fR1793YcYMcemOHF6Pj32z1q8fxvwFJTFryDFHLL+Do="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/applications/networking/cluster/node-problem-detector/default.nix index 60411f4d918a..42a35e5c7f52 100644 --- a/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "node-problem-detector"; - version = "0.8.11"; + version = "0.8.12"; src = fetchFromGitHub { owner = "kubernetes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dkOkHsQ1ZfB5rSFuFRlrKf605EIo/7IkyyYz3ZhMggQ="; + sha256 = "sha256-FLOkGeGl2tpLCyJxiGubzo+d2fieF/aNfhNJ2nzOtfw="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/pinniped/default.nix b/pkgs/applications/networking/cluster/pinniped/default.nix new file mode 100644 index 000000000000..9ee8109a94e3 --- /dev/null +++ b/pkgs/applications/networking/cluster/pinniped/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec{ + pname = "pinniped"; + version = "0.17.0"; + + src = fetchFromGitHub { + owner = "vmware-tanzu"; + repo = "pinniped"; + rev = "v${version}"; + sha256 = "sha256-0h7zyKe2gmC1n9EB5FRVI/io7Yj+91ZAtLy+1u3gyO0="; + }; + + subPackages = "cmd/pinniped"; + + vendorSha256 = "sha256-8ohyyciL1ORYOxPu64W0jXASTv+vVZR8StutzbF9N4Y="; + + meta = with lib; { + description = "Tool to securely log in to your Kubernetes clusters"; + homepage = "https://pinniped.dev/"; + license = licenses.asl20; + maintainers = with maintainers; [ bpaulin ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b121b5a06758..9af1b0068c11 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -51,10 +51,10 @@ "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.183.0", - "sha256": "sha256-+bjDSRsQ407um35Qz/xfCtEd4jAjzjROh4T4iYsapmM=", + "rev": "v1.184.0", + "sha256": "sha256-MR0K1IqfTe1eA7F0URHcJtxRtptuiFOhlCU0ZenG0fI=", "vendorSha256": "sha256-kjr93pVmMZgeJgeG8hG86CDWr95gCIAhf93OQ4tJ9kw=", - "version": "1.183.0" + "version": "1.184.0" }, "ansible": { "owner": "nbering", @@ -96,19 +96,19 @@ "owner": "AviatrixSystems", "provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix", "repo": "terraform-provider-aviatrix", - "rev": "v2.23.0", - "sha256": "sha256-ub8SKZC6l1+F2mEP4L6WP0VW/8k1ri80ruUjRvrl55A=", + "rev": "v2.24.0", + "sha256": "sha256-vLB6bMyjiZiebQWmnzSBW7geFW0ghCBba3YTteVzbII=", "vendorSha256": null, - "version": "2.23.0" + "version": "2.24.0" }, "aws": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.29.0", - "sha256": "sha256-hFvDQHiSr+UTSy2ikWM1BzRy139YZ5ulrbv738WQFrs=", - "vendorSha256": "sha256-PiOBkvIQ3X921HDPjUcfy1hcePh8mVVc3np17BnjdhI=", - "version": "4.29.0" + "rev": "v4.30.0", + "sha256": "sha256-MEHjn4F2HQLdewtZSPj3ruy7aHbws1gEmcJUGw6rINg=", + "vendorSha256": "sha256-tjebt9fxGJv5WHQoMyhIu+pqGskH7zAT0KYOFlaUI/I=", + "version": "4.30.0" }, "azuread": { "owner": "hashicorp", @@ -123,10 +123,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.21.1", - "sha256": "sha256-Rsj1DGN3v6rwjSBVRa4bvXP67ZYkJMDoz5ANyYCgf/4=", + "rev": "v3.22.0", + "sha256": "sha256-E7rk78HNX5jaaA2bWaHCOcz4PxAICqxUWaHAfAIyO7I=", "vendorSha256": null, - "version": "3.21.1" + "version": "3.22.0" }, "azurestack": { "owner": "hashicorp", @@ -142,10 +142,10 @@ "owner": "baidubce", "provider-source-address": "registry.terraform.io/baidubce/baiducloud", "repo": "terraform-provider-baiducloud", - "rev": "v1.15.2", - "sha256": "sha256-RQTb1bIDpD5jvAJTOWG+aEVpMrSnJAqG6ZRQ/dOLZ4I=", - "vendorSha256": "sha256-dgcYdfManE48sYaRRMfYMxQ4qX4uqas0yx+bn60kPWU=", - "version": "1.15.2" + "rev": "v1.15.5", + "sha256": "sha256-GJdML2jq3g0HQKcORllEu2FZvBAx6A/deN+0LzIUkz4=", + "vendorSha256": "sha256-HSn4iNASqA1p9fT/poI3XlkyceafhpiS0cg3mL/TLEI=", + "version": "1.15.5" }, "bigip": { "owner": "F5Networks", @@ -225,10 +225,10 @@ "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.22.0", - "sha256": "sha256-K+0S7WSGP/9is7Q89aOPmSfFWZE9InBaS+KfhJKvNYk=", - "vendorSha256": "sha256-OuGc2msPWjczyv2XR8HESAdJd1Ovz0BihI/j6pdd9QY=", - "version": "3.22.0" + "rev": "v3.23.0", + "sha256": "sha256-x1DkYesbiJ362XD1gw8QmXS+hNgWO1J6qQNRT7E4aps=", + "vendorSha256": "sha256-QrBOxWB+Zs+2kMMv3G4qkUTnZbisDBadPbq1CTFr7Ns=", + "version": "3.23.0" }, "cloudfoundry": { "owner": "cloudfoundry-community", @@ -289,10 +289,10 @@ "owner": "DataDog", "provider-source-address": "registry.terraform.io/DataDog/datadog", "repo": "terraform-provider-datadog", - "rev": "v3.14.0", - "sha256": "sha256-ErTbQEC01Vn8hqk2wglam/b+80ybzMELPfExwUE9TUo=", - "vendorSha256": "sha256-jWqkF0pyp2+pZJyC1+UNYMCDP40Tu9DBrX0WLOqpmnE=", - "version": "3.14.0" + "rev": "v3.15.1", + "sha256": "sha256-lHZURLE8woJzFVuuDFxSciyrt7rTAgvR7rF4INEGoVI=", + "vendorSha256": "sha256-X8X3nX+xHAqSb+j0P0PJ366MAFGRvUmcu/qYQqMI+0U=", + "version": "3.15.1" }, "dhall": { "owner": "awakesecurity", @@ -343,10 +343,10 @@ "owner": "kreuzwerker", "provider-source-address": "registry.terraform.io/kreuzwerker/docker", "repo": "terraform-provider-docker", - "rev": "v2.20.3", - "sha256": "sha256-9zYqZ1bKOz2B4INrJqSklztNAl2ol3NGYW2IjPJfFkM=", - "vendorSha256": "sha256-G8gnEd7hT6XAC7cLOw711KsSFKjKvdd1BX/iaYV8a+U=", - "version": "2.20.3" + "rev": "v2.21.0", + "sha256": "sha256-btomRNWLTRf+p4H20b56l2/frYXW/j3p+m49JRISQOI=", + "vendorSha256": "sha256-9dsmWkIYrN+GDd/r7kKYUyj+77hKuVilfpVUMpQMseo=", + "version": "2.21.0" }, "elasticsearch": { "owner": "phillbaker", @@ -361,10 +361,10 @@ "owner": "equinix", "provider-source-address": "registry.terraform.io/equinix/equinix", "repo": "terraform-provider-equinix", - "rev": "v1.8.1", - "sha256": "sha256-eEYNCeft5gCjNRCJLIE58v8pNAdehP+KAQFYlinS9cU=", - "vendorSha256": "sha256-dB0asOYl4JUtsdmcuWhcX2WioqB4DI3MTJf5ynJOMVA=", - "version": "1.8.1" + "rev": "v1.9.0", + "sha256": "sha256-rawuS0k6f727/4zODo2+tWwEvtJ7mU7Fatm1vFVRVkc=", + "vendorSha256": "sha256-mrX0PWvND/DiQ4QruWpG6hx+AimV5I1zfpsyigzWl/8=", + "version": "1.9.0" }, "exoscale": { "owner": "exoscale", @@ -388,10 +388,10 @@ "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v2.2.1", - "sha256": "sha256-Ls5yTkwnvBjvGyJZ9Hr+BE6jFuwoTfl/iFVf3WsduF8=", + "rev": "v2.3.0", + "sha256": "sha256-rnB3GNh5t46ddonej1ofsbmUT3VAkMA8bbFJHhW9HcA=", "vendorSha256": null, - "version": "2.2.1" + "version": "2.3.0" }, "flexibleengine": { "owner": "FlexibleEngineCloud", @@ -435,30 +435,30 @@ "owner": "gitlabhq", "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v3.17.0", - "sha256": "sha256-jVBkrWwBWcRtyfq3Wt9fxoO6OewtYi0vw127iL1/ZJA=", - "vendorSha256": "sha256-0jzM/CvUKz8QECmMHfFirJxBRP8db+mhQxIQ5dTrlNM=", - "version": "3.17.0" + "rev": "v3.18.0", + "sha256": "sha256-eNd1o0UjG6A9OTRmcJfcPLLtWIJmdZ+viDnSZhyHpgY=", + "vendorSha256": "sha256-YrgsycnRIB5UoWGADphfP6lf78M8ZnkJGP0Ti2QJtQ8=", + "version": "3.18.0" }, "google": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.34.0", - "sha256": "sha256-pyp12UM42+dubwbPx7L4qIOYW0OulZ1D5OSgbdOUJQU=", + "rev": "v4.35.0", + "sha256": "sha256-4pp63xRIwJeX9NYTqcUejQoieqMFd4MzhktuOAs1fGo=", "vendorSha256": "sha256-ItetuU8tAzuMcShpS0C5BNmav4+cOrWxbyFvWS2zM9o=", - "version": "4.34.0" + "version": "4.35.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.34.0", - "sha256": "sha256-1Ia2seissoXc98pGj4uvJcMP41eme1K/Tmnmtp8owLA=", + "rev": "v4.35.0", + "sha256": "sha256-e9290ZIfHqh5WelOLm1AYngbzLE3Ur0nwkZu0y0Qo7s=", "vendorSha256": "sha256-ItetuU8tAzuMcShpS0C5BNmav4+cOrWxbyFvWS2zM9o=", - "version": "4.34.0" + "version": "4.35.0" }, "googleworkspace": { "owner": "hashicorp", @@ -473,10 +473,10 @@ "owner": "grafana", "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", - "rev": "v1.28.0", - "sha256": "sha256-j5kLmzPqEQkbn8ikjWs28gt8AXBW5/DAbnMZag0aP+Q=", - "vendorSha256": "sha256-NkGMblM6JB0JLTQJkNQqV90LXI8bEbULcgwwytwCwW4=", - "version": "1.28.0" + "rev": "v1.28.1", + "sha256": "sha256-VBwqjkiEFDgxYOCpmRXvJwHh2NOZMsPcYeIpsZbMXs8=", + "vendorSha256": "sha256-8iiJgAAKMeh/UBxthl9ebLCIcu/GCZZIfmDcerJakew=", + "version": "1.28.1" }, "gridscale": { "owner": "gridscale", @@ -509,10 +509,10 @@ "owner": "heroku", "provider-source-address": "registry.terraform.io/heroku/heroku", "repo": "terraform-provider-heroku", - "rev": "v5.1.2", - "sha256": "sha256-jZGjwJdQ/6j/kQvCmOwVUG+U4HXgQj5ca91hCUYaMGQ=", + "rev": "v5.1.3", + "sha256": "sha256-G0qQboL3GYmYkJg5yqEFJly9Z5PzVLiwz9Z9vG2QPDE=", "vendorSha256": null, - "version": "5.1.2" + "version": "5.1.3" }, "hetznerdns": { "owner": "timohirt", @@ -572,10 +572,10 @@ "owner": "IBM-Cloud", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", - "rev": "v1.44.2", - "sha256": "sha256-rjpuuU456Kfnxxla6GwDnwnPp/EG6C3CMXNLWL5nwAE=", - "vendorSha256": "sha256-ew6aLScFXiBiBb4VbfsCJGG4pvO9yNbo3+IR0s4iH5Q=", - "version": "1.44.2" + "rev": "v1.45.0", + "sha256": "sha256-wKs9WWajz08u3EXNmevVLnXxBIY4FBazLuDYyPBPH3I=", + "vendorSha256": "sha256-FAoRQxnc/vD5KYp0hb6iWGbZiWEtLzEr6R+vdruitKc=", + "version": "1.45.0" }, "icinga2": { "owner": "Icinga", @@ -626,10 +626,10 @@ "owner": "kingsoftcloud", "provider-source-address": "registry.terraform.io/kingsoftcloud/ksyun", "repo": "terraform-provider-ksyun", - "rev": "v1.3.46", - "sha256": "sha256-qaRsja+pj0DgOZX9nNHSnCI2Ew18r3b5F0Ovqj3mR/Q=", + "rev": "v1.3.49", + "sha256": "sha256-cdEnY/pOYMUB6avsoZA/1TyEMOkKVGMSrfNOg6WtF0s=", "vendorSha256": "sha256-nbAEaRFtFtB4ftLgnCv3MmkjFFbcNkCuxZc+G8/ObPE=", - "version": "1.3.46" + "version": "1.3.49" }, "kubectl": { "owner": "gavinbunney", @@ -780,10 +780,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.1.0", - "sha256": "sha256-pcY4SsElHVKHw8rh/ZYMsSqPOZ4XDlzLgwxgF9ivZmw=", + "rev": "v3.2.0", + "sha256": "sha256-t0bns7xtuOc1tankR3izyk97lrz3h87o1m0/CkSF49M=", "vendorSha256": "sha256-PxMw2qjQP+dW1TAb8NxbtmHk/9yXAfM8aMIm4Qw5M1c=", - "version": "3.1.0" + "version": "3.2.0" }, "nomad": { "owner": "hashicorp", @@ -835,10 +835,10 @@ "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.91.0", - "sha256": "sha256-WLmY/vL0r2fQD4OPcWc9Pqs6hV2Fc2dbuTg7ssvwyu0=", + "rev": "v4.92.0", + "sha256": "sha256-uLoIGqVJD6CgQlixUgvhAYf7uUtwNDY6Xd3xqdvyYV4=", "vendorSha256": null, - "version": "4.91.0" + "version": "4.92.0" }, "okta": { "owner": "okta", @@ -898,19 +898,19 @@ "owner": "ovh", "provider-source-address": "registry.terraform.io/ovh/ovh", "repo": "terraform-provider-ovh", - "rev": "v0.19.1", - "sha256": "sha256-lQFiJLKxHfXKGNmwi+5wKO2AezmC/yI7igXHZHRnfak=", + "rev": "v0.20.0", + "sha256": "sha256-58eicQZElv0TVH2rPev/JLSIOkDkjjL3cDaTqV2SsOA=", "vendorSha256": null, - "version": "0.19.1" + "version": "0.20.0" }, "pagerduty": { "owner": "PagerDuty", "provider-source-address": "registry.terraform.io/PagerDuty/pagerduty", "repo": "terraform-provider-pagerduty", - "rev": "v2.6.1", - "sha256": "sha256-yBnxzXPNhibBx+p8od0IUQb9gdIQpgZk+9HEjcoe4fQ=", + "rev": "v2.6.2", + "sha256": "sha256-Kdm6WizssVdMwsTUyV4wUAW6QelUxDE9GZDGvnehFCw=", "vendorSha256": null, - "version": "2.6.1" + "version": "2.6.2" }, "panos": { "owner": "PaloAltoNetworks", @@ -961,19 +961,19 @@ "owner": "rancher", "provider-source-address": "registry.terraform.io/rancher/rancher2", "repo": "terraform-provider-rancher2", - "rev": "v1.24.0", - "sha256": "sha256-rNoz34ogNcthKBO26OL4TkIOyD95amPT2ByC6afqV1w=", - "vendorSha256": "sha256-cSf/peZBChjrElkwAK4eoczll1fyDvfnxm16wF/pqTs=", - "version": "1.24.0" + "rev": "v1.24.1", + "sha256": "sha256-B+GBBjqKw+1rU8Y2SW1ly5ZXBbTxQNc0FewWKe1WaVI=", + "vendorSha256": "sha256-4dhDSaekq9xyhiXtzk5WL3RTL1phrMnwL66mL9ixijA=", + "version": "1.24.1" }, "random": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/random", "repo": "terraform-provider-random", - "rev": "v3.4.2", - "sha256": "sha256-wLppAWv/pgsBUe4tEcP6CB4vHvYYAuugeF0Z+eKyEw8=", - "vendorSha256": "sha256-FBjwsOMtpKk0UhvWam9+7vQB6pIRwEOPD0A9fdiuDN4=", - "version": "3.4.2" + "rev": "v3.4.3", + "sha256": "sha256-oYtvVK0OOHyLUG6amhkvmr6zlbzy0CKoS3DxztoLbdE=", + "vendorSha256": "sha256-CGq2ZjyacXmHq7mPxpQj+eYXGyHGPpqR22tzaYM/Grc=", + "version": "3.4.3" }, "remote": { "owner": "tenstad", @@ -1078,10 +1078,10 @@ "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.81.0", - "sha256": "sha256-UQgN9FTQCtEUvb0OqeQzYrCF/YOZwbvcNkmuyjfkxco=", - "vendorSha256": "sha256-hs6wvdUv4SUa1qYWSoJBaJntEJTCdTY1UeVOAoBUOg0=", - "version": "1.81.0" + "rev": "v1.82.0", + "sha256": "sha256-yCqNGpljTrlfDnKAk0A+rgSWZJGHT4tWl4UY99wzJ98=", + "vendorSha256": "sha256-VmN61ID/tbPtlBhc9lphSKAHZgADyc57ZyTlWsM9ZLA=", + "version": "1.82.0" }, "stackpath": { "owner": "stackpath", @@ -1096,10 +1096,10 @@ "owner": "StatusCakeDev", "provider-source-address": "registry.terraform.io/StatusCakeDev/statuscake", "repo": "terraform-provider-statuscake", - "rev": "v2.0.3", - "sha256": "sha256-QqTHH4wtMMIodOUa2E94L8ICI0G3LddbxWkNEZp5NLU=", - "vendorSha256": "sha256-E6DvzloOaamSX3jLKUQQmIccGiI6sFo4oNwU86td05E=", - "version": "2.0.3" + "rev": "v2.0.4", + "sha256": "sha256-wpDe+mtFh96qIbtfg+uilklvFNftQxqF9DOuudKLMm0=", + "vendorSha256": "sha256-FxTGEeJkElMovd6VGUEGss0gjorZPSPc+whqeHe4s2Y=", + "version": "2.0.4" }, "sumologic": { "owner": "SumoLogic", @@ -1114,10 +1114,10 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.77.6", - "sha256": "sha256-1mdgrYbWy/PRIQ+o3UmTnSWhnP5p8k1D61Wz4U4N32A=", + "rev": "v1.77.8", + "sha256": "sha256-F3Lk7u/ecCduc7M1+pirJZcnHxmxulDLEZBdNUKPpbI=", "vendorSha256": null, - "version": "1.77.6" + "version": "1.77.8" }, "tfe": { "owner": "hashicorp", @@ -1277,9 +1277,9 @@ "owner": "yandex-cloud", "provider-source-address": "registry.terraform.io/yandex-cloud/yandex", "repo": "terraform-provider-yandex", - "rev": "v0.78.0", - "sha256": "sha256-Llp0o/+CtyoWhymgWxVMPncl4C+XT2/5mhXAN4hYDLY=", - "vendorSha256": "sha256-QcFmk/kmhdhvO2HqpnLGDRIkOYu23A1g/mYKjzapIvc=", - "version": "0.78.0" + "rev": "v0.78.2", + "sha256": "sha256-jFeJMtwxytmNvCc4NoOlHXs28eQKYV727N4uWGozEmM=", + "vendorSha256": "sha256-PKWLVh/XMinLjj343fwlgWA7K2K+yVXJQ7M6LRmmdp8=", + "version": "0.78.2" } } diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix index 51dea2755785..e32a4ba0c094 100644 --- a/pkgs/applications/science/misc/sasview/default.nix +++ b/pkgs/applications/science/misc/sasview/default.nix @@ -1,7 +1,6 @@ { lib , python3 , fetchFromGitHub -, which , wrapQtAppsHook }: diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 2d1bf3aa251e..b317913f0e7b 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, buildPythonApplication, fetchPypi, matplotlib, numpy, pymavlink, pyserial -, setuptools, wxPython_4_0, billiard, gnureadline, opencv4 }: +{ stdenv, lib, buildPythonApplication, fetchPypi, lxml, matplotlib, numpy +, opencv4, pymavlink, pyserial, setuptools, wxPython_4_0, billiard +, gnureadline }: buildPythonApplication rec { pname = "MAVProxy"; @@ -16,13 +17,14 @@ buildPythonApplication rec { ''; propagatedBuildInputs = [ + lxml matplotlib numpy + opencv4 pymavlink pyserial setuptools wxPython_4_0 - opencv4 ] ++ lib.optionals stdenv.isDarwin [ billiard gnureadline ]; # No tests diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index f7d7c1e342ce..d4131f64c52a 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.29.1"; + version = "2.29.2"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-odlvhkgIiNB8fsRfVswiqfpAKLtP9EtcoMxd5SmhX8I="; + sha256 = "sha256-995+6AYhSkMkOSm/ZjlInS5zb1od5nbEChvUyS/8RHM="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/video/pipe-viewer/default.nix b/pkgs/applications/video/pipe-viewer/default.nix index 53ffa9bcdc4c..f4d915374b83 100644 --- a/pkgs/applications/video/pipe-viewer/default.nix +++ b/pkgs/applications/video/pipe-viewer/default.nix @@ -38,13 +38,13 @@ let in buildPerlModule rec { pname = "pipe-viewer"; - version = "0.1.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "trizen"; repo = "pipe-viewer"; rev = version; - hash = "sha256-kDlZ3Cl8zvN/naGExh2yVW5yHwc1O04x4s22lNkbCzU="; + hash = "sha256-2Kzo7NYxARPFuOijwf2a3WQxnNumtKRiRhMhjrWA4GY="; }; nativeBuildInputs = [ makeWrapper ] diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix index 9a6bd0a0e3a5..e9409004c8a6 100644 --- a/pkgs/applications/virtualization/distrobox/default.nix +++ b/pkgs/applications/virtualization/distrobox/default.nix @@ -1,28 +1,37 @@ -{ stdenvNoCC, lib, fetchFromGitHub }: +{ stdenvNoCC, lib, fetchFromGitHub, makeWrapper, wget }: stdenvNoCC.mkDerivation rec { pname = "distrobox"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "89luca89"; repo = pname; rev = version; - sha256 = "sha256-7qPEtWDshe3bHUvbf35k31EnL2sQEXeDmMUGBPkiB9U="; + sha256 = "sha256-XYqPwBiMbwG0bTiFRywZRWjp1OabTHcwhmbcx11SgPo="; }; dontConfigure = true; dontBuild = true; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' runHook preInstall - mkdir -p $out/bin - ./install -p $out/bin + # https://github.com/89luca89/distrobox/issues/408 + substituteInPlace ./distrobox-generate-entry \ + --replace 'icon_default="''${HOME}/.local' "icon_default=\"$out" + ./install -P $out runHook postInstall ''; + # https://github.com/89luca89/distrobox/issues/407 + postFixup = '' + wrapProgram "$out/bin/distrobox-generate-entry" \ + --prefix PATH ":" ${lib.makeBinPath [ wget ]} + ''; + meta = with lib; { description = "Wrapper around podman or docker to create and start containers"; longDescription = '' diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index f21afbd55a81..edf7582dd999 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -243,19 +243,19 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.17"; + version = "20.10.18"; rev = "v${version}"; - sha256 = "sha256-YCuohqtE4rbGyboVRyxvpqs93IS1k7aUTPdtHIlkUU8="; + sha256 = "sha256-AyY6xfFEvUv7Kqo3M0gv9/4NoBUDqQyP4ZIcz+oGNys="; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "sha256-7SQubrbMvXSN3blcCW47F9OnjuKZxdXM5O/lE85zx0I="; + sha256 = "sha256-c0A66JVvRPFNT/xCTIsW8k3a/EMIl73d/UlCohjmGMk="; }; - runcRev = "v1.1.2"; - runcSha256 = "sha256-tMneqB81w8lQp5RWWCjALyKbOY3xog+oqb6cYKasG/8="; - containerdRev = "v1.6.6"; - containerdSha256 = "sha256-cmarbad6VzcGTCHT/NtApkYsK/oo6WZQ//q8Fvh+ez8="; + runcRev = "v1.1.4"; + runcSha256 = "sha256-ougJHW1Z+qZ324P8WpZqawY1QofKnn8WezP7orzRTdA="; + containerdRev = "v1.6.8"; + containerdSha256 = "sha256-0UiPhkTWV61DnAF5kWd1FctX8i0sXaJ1p/xCMznY/A8="; tiniRev = "v0.19.0"; tiniSha256 = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/applications/virtualization/krunvm/default.nix index cd2ff0e706f4..8ee3d478497e 100644 --- a/pkgs/applications/virtualization/krunvm/default.nix +++ b/pkgs/applications/virtualization/krunvm/default.nix @@ -3,7 +3,12 @@ , rustPlatform , fetchFromGitHub , asciidoctor +, buildah +, buildah-unwrapped +, libiconv , libkrun +, makeWrapper +, sigtool }: stdenv.mkDerivation rec { @@ -22,17 +27,41 @@ stdenv.mkDerivation rec { hash = "sha256-3WiXm90XiQHpCbhlkigg/ZATQeDdUKTstN7hwcsKm4o="; }; - nativeBuildInputs = with rustPlatform;[ + nativeBuildInputs = with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc asciidoctor + makeWrapper + ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; + + buildInputs = [ libkrun ] ++ lib.optionals stdenv.isDarwin [ + libiconv ]; - buildInputs = [ libkrun ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + postPatch = '' + # do not pollute etc + substituteInPlace src/utils.rs \ + --replace "etc/containers" "share/krunvm/containers" + ''; + + postInstall = '' + mkdir -p $out/share/krunvm/containers + install -D -m755 ${buildah-unwrapped.src}/docs/samples/registries.conf $out/share/krunvm/containers/registries.conf + install -D -m755 ${buildah-unwrapped.src}/tests/policy.json $out/share/krunvm/containers/policy.json + ''; + + # It attaches entitlements with codesign and strip removes those, + # voiding the entitlements and making it non-operational. + dontStrip = stdenv.isDarwin; + + postFixup = '' + wrapProgram $out/bin/krunvm \ + --prefix PATH : ${lib.makeBinPath [ buildah ]} \ + ''; + meta = with lib; { description = "A CLI-based utility for creating microVMs from OCI images"; homepage = "https://github.com/containers/krunvm"; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 65bd4bcecb44..03aba1c41218 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "virt-manager"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-3ycXNBuf91kI2cJCRw0ZzaWkaIVwb/lmkOKeHNwpH9Y="; + hash = "sha256-UgZ58WLXq0U3EDt4311kv0kayVU17In4kwnQ+QN1E7A="; }; nativeBuildInputs = [ @@ -33,16 +33,6 @@ python3.pkgs.buildPythonApplication rec { pygobject3 libvirt libxml2 requests cdrtools ]; - patches = [ - # due to a recent change in setuptools-61, "packages=[]" needs to be included - # this patch can hopefully be removed, once virt-manager has an upstream version bump - (fetchpatch { - name = "fix-for-setuptools-61.patch"; - url = "https://github.com/virt-manager/virt-manager/commit/46dc0616308a73d1ce3ccc6d716cf8bbcaac6474.patch"; - sha256 = "sha256-/RZG+7Pmd7rmxMZf8Fvg09dUggs2MqXZahfRQ5cLcuM="; - }) - ]; - postPatch = '' sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py sed -i "/'install_egg_info'/d" setup.py @@ -80,6 +70,8 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ "testAlterDisk" "test_misc_nonpredicatble_generate" + "test_disk_dir_searchable" # does something strange with permissions + "testCLI0001virt_install_many_devices" # expects /var to exist ]; preCheck = '' diff --git a/pkgs/build-support/coq/extra-lib.nix b/pkgs/build-support/coq/extra-lib.nix index 65b48f511267..3c226b4920b6 100644 --- a/pkgs/build-support/coq/extra-lib.nix +++ b/pkgs/build-support/coq/extra-lib.nix @@ -142,4 +142,52 @@ with builtins; with lib; recursiveUpdate lib (rec { if cl?case then compare cl.case var else all (equal true) (zipListsWith compare cl.cases var); in switch-if (map (cl: { cond = combine cl var; inherit (cl) out; }) clauses) default; + + /* Override arguments to mkCoqDerivation for a Coq library. + + This function allows you to easily override arguments to mkCoqDerivation, + even when they are not exposed by the Coq library directly. + + Type: overrideCoqDerivation :: AttrSet -> CoqLibraryDerivation -> CoqLibraryDerivation + + Example: + + ```nix + coqPackages.lib.overrideCoqDerivation + { + defaultVersion = "9999"; + release."9999".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dbbbhyfkw"; + } + coqPackages.QuickChick; + ``` + + This example overrides the `defaultVersion` and `release` arguments that + are passed to `mkCoqDerivation` in the QuickChick derivation. + + Note that there is a difference between using `.override` on a Coq + library vs this `overrideCoqDerivation` function. `.override` allows you + to modify arguments to the derivation itself, for instance by passing + different versions of dependencies: + + ```nix + coqPackages.QuickChick.override { ssreflect = my-cool-ssreflect; } + ``` + + whereas `overrideCoqDerivation` allows you to override arguments to the + call to `mkCoqDerivation` in the Coq library. + + Note that all Coq libraries in Nixpkgs have a `version` argument for + easily using a different version. So if all you want to do is use a + different version, and the derivation for the Coq library already has + support for the version you want, you likely only need to update the + `version` argument on the library derivation. This is done with + `.override`: + + ```nix + coqPackages.QuickChick.override { version = "1.4.0"; } + ``` + */ + overrideCoqDerivation = f: drv: (drv.override (args: { + mkCoqDerivation = drv_: (args.mkCoqDerivation drv_).override f; + })); }) diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index bc50f1bd090c..2a166089baed 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -1,4 +1,20 @@ -{ lib, stdenvNoCC, linkFarmFromDrvs, callPackage, nuget-to-nix, writeShellScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, mkNugetSource, mkNugetDeps, cacert, srcOnly, symlinkJoin, coreutils }: +{ lib +, stdenvNoCC +, callPackage +, linkFarmFromDrvs +, dotnetCorePackages +, dotnetPackages +, mkNugetSource +, mkNugetDeps +, srcOnly +, writeShellScript +, writeText +, makeWrapper +, nuget-to-nix +, cacert +, symlinkJoin +, coreutils +}: { name ? "${args.pname}-${args.version}" , pname ? name @@ -135,44 +151,73 @@ in stdenvNoCC.mkDerivation (args // { inherit nuget-source; fetch-deps = let - exclusions = dotnet-sdk.passthru.packages { fetchNuGet = attrs: attrs.pname; }; + # Because this list is rather long its put in its own store path to maintain readability of the generated script + exclusions = writeText "nuget-package-exclusions" (lib.concatStringsSep "\n" (dotnet-sdk.passthru.packages { fetchNuGet = attrs: attrs.pname; })); + + runtimeIds = map (system: dotnet-sdk.systemToDotnetRid system) (args.meta.platforms or dotnet-sdk.meta.platforms); + + # Derivations may set flags such as `--runtime ` based on the host platform to avoid restoring/building nuget dependencies they dont have or dont need. + # This introduces an issue; In this script we loop over all platforms from `meta` and add the RID flag for it, as to fetch all required dependencies. + # The script would inherit the RID flag from the derivation based on the platform building the script, and set the flag for any iteration we do over the RIDs. + # That causes conflicts. To circumvent it we remove all occurances of the flag. + flags = + let + hasRid = flag: lib.any (v: v) (map (rid: lib.hasInfix rid flag) (lib.attrValues dotnet-sdk.runtimeIdentifierMap)); + in + builtins.filter (flag: !(hasRid flag)) (dotnetFlags ++ dotnetRestoreFlags); + in writeShellScript "fetch-${pname}-deps" '' set -euo pipefail + export PATH="${lib.makeBinPath [ coreutils dotnet-sdk nuget-to-nix ]}" - cd "$(dirname "''${BASH_SOURCE[0]}")" + case "''${1-}" in + --help|-h) + echo "usage: $0 [--help]" + echo " The path to write the lockfile to" + echo " --help Show this help message" + exit + ;; + esac - export HOME=$(mktemp -d) - deps_file="''${1:-/tmp/${pname}-deps.nix}" + deps_file="$(realpath "''${1:-$(mktemp -t "XXXXXX-${pname}-deps.nix")}")" + export HOME=$(mktemp -td "XXXXXX-${pname}-home") + mkdir -p "$HOME/nuget_pkgs" store_src="${srcOnly args}" - src="$(mktemp -d /tmp/${pname}.XXX)" + src="$(mktemp -td "XXXXXX-${pname}-src")" cp -rT "$store_src" "$src" chmod -R +w "$src" - trap "rm -rf $src $HOME" EXIT - pushd "$src" + + cd "$src" + echo "Restoring project..." export DOTNET_NOLOGO=1 export DOTNET_CLI_TELEMETRY_OPTOUT=1 - mkdir -p "$HOME/nuget_pkgs" - - for project in "${lib.concatStringsSep "\" \"" ((lib.toList projectFile) ++ lib.optionals (testProjectFile != "") (lib.toList testProjectFile))}"; do - dotnet restore "$project" \ - ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - --packages "$HOME/nuget_pkgs" \ - ${lib.optionalString (dotnetRestoreFlags != []) (builtins.toString dotnetRestoreFlags)} \ - ${lib.optionalString (dotnetFlags != []) (builtins.toString dotnetFlags)} + for rid in "${lib.concatStringsSep "\" \"" runtimeIds}"; do + for project in "${lib.concatStringsSep "\" \"" ((lib.toList projectFile) ++ lib.optionals (testProjectFile != "") (lib.toList testProjectFile))}"; do + dotnet restore "$project" \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --packages "$HOME/nuget_pkgs" \ + --runtime "$rid" \ + ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \ + ${lib.optionalString (flags != []) (toString flags)} + done done - echo "${lib.concatStringsSep "\n" exclusions}" > "$HOME/package_exclusions" + echo "Succesfully restored project" echo "Writing lockfile..." - nuget-to-nix "$HOME/nuget_pkgs" "$HOME/package_exclusions" > "$deps_file" + echo -e "# This file was automatically generated by passthru.fetch-deps.\n# Please dont edit it manually, your changes might get overwritten!\n" > "$deps_file" + nuget-to-nix "$HOME/nuget_pkgs" "${exclusions}" >> "$deps_file" echo "Succesfully wrote lockfile to: $deps_file" ''; } // args.passthru or {}; + + meta = { + platforms = dotnet-sdk.meta.platforms; + } // args.meta or {}; }) diff --git a/pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper.sln b/pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper.sln index f2e7d4cf8b2c..7e4c934c9bed 100644 --- a/pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper.sln +++ b/pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper.sln @@ -1,20 +1,20 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wrapper", "Wrapper\Wrapper.csproj", "{D01B3597-E85E-42F4-940A-EF5AE712942F}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x86 = Debug|x86 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D01B3597-E85E-42F4-940A-EF5AE712942F}.Debug|x86.ActiveCfg = Debug|x86 - {D01B3597-E85E-42F4-940A-EF5AE712942F}.Debug|x86.Build.0 = Debug|x86 - {D01B3597-E85E-42F4-940A-EF5AE712942F}.Release|x86.ActiveCfg = Release|x86 - {D01B3597-E85E-42F4-940A-EF5AE712942F}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wrapper", "Wrapper\Wrapper.csproj", "{D01B3597-E85E-42F4-940A-EF5AE712942F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D01B3597-E85E-42F4-940A-EF5AE712942F}.Debug|x86.ActiveCfg = Debug|x86 + {D01B3597-E85E-42F4-940A-EF5AE712942F}.Debug|x86.Build.0 = Debug|x86 + {D01B3597-E85E-42F4-940A-EF5AE712942F}.Release|x86.ActiveCfg = Release|x86 + {D01B3597-E85E-42F4-940A-EF5AE712942F}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index f8cf3d302ec4..05bbcd092857 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -105,8 +105,18 @@ stdenv.mkDerivation rec { export DOTNET_CLI_TELEMETRY_OPTOUT=1 ''; - passthru = { + passthru = rec { inherit icu packages; + + runtimeIdentifierMap = { + "x86_64-linux" = "linux-x64"; + "aarch64-linux" = "linux-arm64"; + "x86_64-darwin" = "osx-x64"; + "aarch64-darwin" = "osx-arm64"; + }; + + # Convert a "stdenv.hostPlatform.system" to a dotnet RID + systemToDotnetRid = system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); }; meta = with lib; { diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index d3edb3936d6f..eab95e2de8c7 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -44,6 +44,10 @@ stdenv.mkDerivation rec { makeFlags = [ "PYTHON=python" "STATIC_BUILD=${toString stdenv.hostPlatform.isStatic}" ]; installFlags = [ "INSTALL=install" "PREFIX=$(out)" "SETUP_PREFIX=$(out)" ]; + postFixup = lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/libfdt.dylib $out/lib/libfdt-${version}.dylib + ''; + # Checks are broken on aarch64 darwin # https://github.com/NixOS/nixpkgs/pull/118700#issuecomment-885892436 doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/compilers/julia/1.8-bin.nix b/pkgs/development/compilers/julia/1.8-bin.nix index bd942d1bfe5f..b0b8351efc89 100644 --- a/pkgs/development/compilers/julia/1.8-bin.nix +++ b/pkgs/development/compilers/julia/1.8-bin.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "julia-bin"; - version = "1.8.0"; + version = "1.8.1"; src = { x86_64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "sha256-6A1zLMt/eeAA15jLi2Vtw2QatZUW1uTlLhZ2UBeJKgA="; + sha256 = "sha256-MwVO5kfuik+1T8BREOB+C1PgRZH+U9Cky0x+16BekfE="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 6c579373f5dc..7c78a784575a 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -83,7 +83,6 @@ in inherit CoreFoundation Security; }; clippy = self.callPackage ./clippy.nix { inherit Security; }; - rls = self.callPackage ./rls { inherit CoreFoundation Security SystemConfiguration; }; }); }; } diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix deleted file mode 100644 index 036031d98fae..000000000000 --- a/pkgs/development/compilers/rust/rls/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, makeWrapper, fetchFromGitHub, rustPlatform -, openssh, openssl, pkg-config, cmake, zlib, curl, libiconv -, CoreFoundation, Security, SystemConfiguration }: - -rustPlatform.buildRustPackage rec { - pname = "rls"; - inherit (rustPlatform.rust.rustc) src version; - - # changes hash of vendor directory otherwise - dontUpdateAutotoolsGnuConfigScripts = true; - - cargoVendorDir = "vendor"; - buildAndTestSubdir = "src/tools/rls"; - - preBuild = '' - # client tests are flaky - rm ${buildAndTestSubdir}/tests/client.rs - ''; - - # a nightly compiler is required unless we use this cheat code. - RUSTC_BOOTSTRAP=1; - - # As of rustc 1.45.0, these env vars are required to build rls - # (due to https://github.com/rust-lang/rust/pull/72001) - CFG_RELEASE = "${rustPlatform.rust.rustc.version}-nightly"; - CFG_RELEASE_CHANNEL = "nightly"; - - # rls-rustc links to rustc_private crates - CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null; - - nativeBuildInputs = [ pkg-config cmake makeWrapper ]; - buildInputs = [ openssh openssl curl zlib libiconv rustPlatform.rust.rustc.llvm ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security SystemConfiguration ]; - - doCheck = true; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/rls --version - ''; - - RUST_SRC_PATH = rustPlatform.rustLibSrc; - postInstall = '' - wrapProgram $out/bin/rls --set-default RUST_SRC_PATH ${rustPlatform.rustLibSrc} - ''; - - meta = with lib; { - description = "Rust Language Server - provides information about Rust programs to IDEs and other tools"; - homepage = "https://github.com/rust-lang/rls/"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ symphorien ]; - }; -} diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix index 903b3518e5d6..52e69e90d135 100644 --- a/pkgs/development/coq-modules/gappalib/default.nix +++ b/pkgs/development/coq-modules/gappalib/default.nix @@ -6,7 +6,8 @@ with lib; mkCoqDerivation { owner = "gappa"; domain = "gitlab.inria.fr"; inherit version; - defaultVersion = if versions.range "8.8" "8.15" coq.coq-version then "1.5.1" else null; + defaultVersion = if versions.range "8.8" "8.16" coq.coq-version then "1.5.2" else null; + release."1.5.2".sha256 = "sha256-A021Bhqz5r2CZBayfjIiWrCIfUlejcQAfbTmOaf6QTM="; release."1.5.1".sha256 = "1806bq1z6q5rq2ma7d5kfbqfyfr755hjg0dq7b2llry8fx9cxjsg"; release."1.5.0".sha256 = "1i1c0gakffxqqqqw064cbvc243yl325hxd50jmczr6mk18igk41n"; release."1.4.5".sha256 = "081hib1d9wfm29kis390qsqch8v6fs3q71g2rgbbzx5y5cf48n9k"; diff --git a/pkgs/development/dotnet-modules/python-language-server/updater.sh b/pkgs/development/dotnet-modules/python-language-server/updater.sh index 3e82ad842132..33ab153aee26 100755 --- a/pkgs/development/dotnet-modules/python-language-server/updater.sh +++ b/pkgs/development/dotnet-modules/python-language-server/updater.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p gnused jq common-updater-scripts nuget-to-nix dotnet-sdk_3 nix-prefetch-git +#!nix-shell -I nixpkgs=./. -i bash -p gnused jq common-updater-scripts nix-prefetch-git set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -19,23 +19,5 @@ if [[ $new_rev == $old_rev ]]; then fi pushd ../../../.. - update-source-version python-language-server "$new_version" "$new_hash" --rev="$new_rev" -store_src="$(nix-build -A python-language-server.src --no-out-link)" -src="$(mktemp -d /tmp/pylang-server-src.XXX)" -cp -rT "$store_src" "$src" -chmod -R +w "$src" - -pushd "$src" - -export DOTNET_NOLOGO=1 -export DOTNET_CLI_TELEMETRY_OPTOUT=1 - -mkdir ./nuget_pkgs -dotnet restore src/LanguageServer/Impl/Microsoft.Python.LanguageServer.csproj --packages ./nuget_pkgs - -nuget-to-nix ./nuget_pkgs > "$deps_file" - -trap '' - rm -r "$src" -'' EXIT +$(nix-build -A python-language-server.fetch-deps --no-out-link) "$deps_file" diff --git a/pkgs/development/interpreters/starlark/default.nix b/pkgs/development/interpreters/starlark/default.nix index c61e511102d7..2b9932716c21 100644 --- a/pkgs/development/interpreters/starlark/default.nix +++ b/pkgs/development/interpreters/starlark/default.nix @@ -1,25 +1,16 @@ { stdenv, lib, fetchFromGitHub, buildGoModule, fetchpatch }: buildGoModule rec { pname = "starlark"; - version = "unstable-2022-03-02"; + version = "unstable-2022-08-17"; src = fetchFromGitHub { owner = "google"; repo = "starlark-go"; - rev = "5411bad688d12781515a91cc032645331b4fc302"; - sha256 = "sha256-JNsGyGlIVMS5w0W4jHVsrPqqNms3Xfpa4n/XcEWqt6I="; + rev = "f738f5508c12fe5a9fae44bbdf07a94ddcf5030e"; + sha256 = "sha256-nkQxwdP/lXEq5iiGy17mUTSMG6XiKAUJYfMDgbr10yM="; }; - vendorSha256 = "sha256-lgL5o3MQfZekZ++BNESwV0LeoTxwEZfziQAe99zm4RY="; - - patches = [ - # Fix floating point imprecision issue in the test suite. - # https://github.com/google/starlark-go/pull/409 - (fetchpatch { - url = "https://github.com/google/starlark-go/commit/be6ed3bfcc376e5bf6fe2257ae89ddfb00d14e2c.patch"; - sha256 = "sha256-A0tHPso6SfFn73kICcA9/5n3JHd7hMdQMGty+4L6T4k="; - }) - ]; + vendorSha256 = "sha256-Kcjtaef//7LmUAIViyKv3gTK7kjynwJ6DwgGJ+pdbfM="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/interpreters/tinyscheme/01-remove-macOS-main.patch b/pkgs/development/interpreters/tinyscheme/01-remove-macOS-main.patch new file mode 100644 index 000000000000..3fedec98f383 --- /dev/null +++ b/pkgs/development/interpreters/tinyscheme/01-remove-macOS-main.patch @@ -0,0 +1,24 @@ +diff --git a/scheme.c b/scheme.c +index 6186ef0..5a43592 100644 +--- a/scheme.c ++++ b/scheme.c +@@ -4949,19 +4949,7 @@ pointer scheme_eval(scheme *sc, pointer obj) + + #if STANDALONE + +-#if defined(__APPLE__) && !defined (OSX) +-int main() +-{ +- extern MacTS_main(int argc, char **argv); +- char** argv; +- int argc = ccommand(&argv); +- MacTS_main(argc,argv); +- return 0; +-} +-int MacTS_main(int argc, char **argv) { +-#else + int main(int argc, char **argv) { +-#endif + scheme sc; + FILE *fin; + char *file_name=InitFile; diff --git a/pkgs/development/interpreters/tinyscheme/02-use-toolchain-env-vars.patch b/pkgs/development/interpreters/tinyscheme/02-use-toolchain-env-vars.patch new file mode 100644 index 000000000000..f23ad8d02ef5 --- /dev/null +++ b/pkgs/development/interpreters/tinyscheme/02-use-toolchain-env-vars.patch @@ -0,0 +1,26 @@ +diff --git a/makefile b/makefile +index aeb2fcd..4c111a1 100644 +--- a/makefile ++++ b/makefile +@@ -18,7 +18,7 @@ + #AR= echo + + # Unix, generally +-CC = gcc -fpic -pedantic ++CC := $(CC) -fpic -pedantic + DEBUG=-g -Wall -Wno-char-subscripts -O + Osuf=o + SOsuf=so +@@ -27,10 +27,10 @@ EXE_EXT= + LIBPREFIX=lib + OUT = -o $@ + RM= -rm -f +-AR= ar crs ++AR := $(AR) crs + + # Linux +-LD = gcc ++LD := $(CC) + LDFLAGS = -shared + DEBUG=-g -Wno-char-subscripts -O + SYS_LIBS= -ldl -lm diff --git a/pkgs/development/interpreters/tinyscheme/03-macOS-SOsuf.patch b/pkgs/development/interpreters/tinyscheme/03-macOS-SOsuf.patch new file mode 100644 index 000000000000..479ff369b80b --- /dev/null +++ b/pkgs/development/interpreters/tinyscheme/03-macOS-SOsuf.patch @@ -0,0 +1,13 @@ +diff --git a/makefile b/makefile +index 4c111a1..8d9e02e 100644 +--- a/makefile ++++ b/makefile +@@ -21,7 +21,7 @@ + CC := $(CC) -fpic -pedantic + DEBUG=-g -Wall -Wno-char-subscripts -O + Osuf=o +-SOsuf=so ++SOsuf=dylib + LIBsuf=a + EXE_EXT= + LIBPREFIX=lib diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/development/interpreters/tinyscheme/default.nix index 5c7ed9d27ead..000b0534a104 100644 --- a/pkgs/development/interpreters/tinyscheme/default.nix +++ b/pkgs/development/interpreters/tinyscheme/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, dos2unix +, runCommand +, tinyscheme +}: stdenv.mkDerivation rec { pname = "tinyscheme"; @@ -9,27 +15,68 @@ stdenv.mkDerivation rec { sha256 = "sha256-F7Cxv/0i89SdWDPiKhILM5A50s/aC0bW/FHdLwG0B60="; }; - patchPhase = '' + nativeBuildInputs = [ dos2unix ]; + + prePatch = "dos2unix makefile"; + patches = [ + # The alternate macOS main makes use of `ccommand` which seems to be + # `MetroWerks CodeWarrier` specific: + # https://ptgmedia.pearsoncmg.com/imprint_downloads/informit/downloads/9780201703535/macfix.html + # + # In any case, this is not needed to build on macOS. + ./01-remove-macOS-main.patch + + # We want to have the makefile pick up $CC, etc. so that we don't have + # to unnecessarily tie this package to the GCC stdenv. + ./02-use-toolchain-env-vars.patch + ] ++ lib.optionals stdenv.targetPlatform.isDarwin [ + # On macOS the library suffix is .dylib: + ./03-macOS-SOsuf.patch + ]; + postPatch = '' substituteInPlace scheme.c --replace "init.scm" "$out/lib/init.scm" ''; installPhase = '' mkdir -p $out/bin $out/lib cp init.scm $out/lib + cp libtinyscheme* $out/lib cp scheme $out/bin/tinyscheme ''; + passthru.tests = { + # Checks that the program can run and exit: + simple = runCommand "${pname}-simple-test" {} '' + ${tinyscheme}/bin/tinyscheme <<<"(quit 0)" + echo "success" > $out + ''; + fileIo = runCommand "${pname}-file-io-test" {} '' + ${tinyscheme}/bin/tinyscheme < $out || : + [[ "$(cat $out)" =~ ^Usage: ]] + ''; + }; + meta = with lib; { - broken = stdenv.isDarwin; description = "Lightweight Scheme implementation"; longDescription = '' TinyScheme is a lightweight Scheme interpreter that implements as large a subset of R5RS as was possible without getting very large and complicated. ''; homepage = "http://tinyscheme.sourceforge.net/"; + changelog = "http://tinyscheme.sourceforge.net/CHANGES"; license = licenses.bsdOriginal; + mainProgram = pname; maintainers = [ maintainers.ebzzry ]; platforms = platforms.unix; - badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/libraries/libixp/default.nix b/pkgs/development/libraries/libixp/default.nix index cc6c468bede5..c4f06b3ea77d 100644 --- a/pkgs/development/libraries/libixp/default.nix +++ b/pkgs/development/libraries/libixp/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { hash = "sha256-S25DmXJ7fN0gXLV0IzUdz8hXPTYEHmaSG7Mnli6GQVc="; }; + postPatch = lib.optionalString stdenv.cc.isClang '' + substituteInPlace mk/ixp.mk \ + --replace "©" "C " + ''; + postConfigure = '' sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk ''; @@ -19,7 +24,6 @@ stdenv.mkDerivation rec { buildInputs = [ txt2tags ]; meta = { - broken = stdenv.isDarwin; homepage = "https://github.com/0intro/libixp"; description = "Portable, simple C-language 9P client and server libary"; maintainers = with lib.maintainers; [ kovirobi ]; diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix index 21be0c8437ae..779f6790c558 100644 --- a/pkgs/development/libraries/libkrun/default.nix +++ b/pkgs/development/libraries/libkrun/default.nix @@ -1,11 +1,15 @@ { lib , stdenv , fetchFromGitHub +, fetchurl , rustPlatform , pkg-config +, dtc , glibc , openssl +, libiconv , libkrunfw +, Hypervisor , sevVariant ? false }: @@ -13,11 +17,14 @@ stdenv.mkDerivation rec { pname = "libkrun"; version = "1.3.0"; - src = fetchFromGitHub { + src = if stdenv.isLinux then fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; hash = "sha256-qVyEqiqaQ8wfZhL5u+Bsaa1yXlgHUitSj5bo7FJ5Y8c="; + } else fetchurl { + url = "https://github.com/containers/libkrun/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz"; + hash = "sha256-RBqeGUhB6Sdt+JujyQBW/76mZwnT0LNs9AMYr8+OCVU="; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -25,21 +32,30 @@ stdenv.mkDerivation rec { hash = "sha256-jxSzhj1iU8qY+sZEVCYTaUqpaA4egjJi9qxrapASQF0="; }; - nativeBuildInputs = with rustPlatform;[ + nativeBuildInputs = with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ] ++ lib.optional sevVariant pkg-config; buildInputs = [ + (libkrunfw.override { inherit sevVariant; }) + ] ++ lib.optionals stdenv.isLinux [ glibc glibc.static - (libkrunfw.override { inherit sevVariant; }) + ] ++ lib.optionals stdenv.isDarwin [ + libiconv + Hypervisor + dtc ] ++ lib.optional sevVariant openssl; makeFlags = [ "PREFIX=${placeholder "out"}" ] ++ lib.optional sevVariant "SEV=1"; + postFixup = lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/libkrun.dylib $out/lib/libkrun.${version}.dylib + ''; + meta = with lib; { description = "A dynamic library providing Virtualization-based process isolation capabilities"; homepage = "https://github.com/containers/libkrun"; diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/development/libraries/libkrunfw/default.nix index 10ff37460496..8769cf6913ba 100644 --- a/pkgs/development/libraries/libkrunfw/default.nix +++ b/pkgs/development/libraries/libkrunfw/default.nix @@ -15,11 +15,14 @@ stdenv.mkDerivation rec { pname = "libkrunfw"; version = "3.3.0"; - src = fetchFromGitHub { + src = if stdenv.isLinux then fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; hash = "sha256-ay+E5AgJeA0i3T4JDosDawwtezDGquzAvYEWHGbPidg="; + } else fetchurl { + url = "https://github.com/containers/libkrunfw/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz"; + hash = "sha256-9Wp93PC+PEqUpWHIe6BUnfDMpFvYL8rGGjTU2nWSUVY="; }; kernelSrc = fetchurl { @@ -28,14 +31,18 @@ stdenv.mkDerivation rec { }; preBuild = '' - substituteInPlace Makefile --replace 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s $(kernelSrc) $(KERNEL_TARBALL)' + substituteInPlace Makefile \ + --replace 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s $(kernelSrc) $(KERNEL_TARBALL)' \ + --replace 'gcc' '$(CC)' ''; nativeBuildInputs = [ flex bison bc python3 python3.pkgs.pyelftools ]; - buildInputs = [ elfutils ]; + buildInputs = lib.optionals stdenv.isLinux [ elfutils ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ] - ++ lib.optional sevVariant "SEV=1"; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "SONAME_Darwin=-Wl,-install_name,${placeholder "out"}/lib/libkrunfw.dylib" + ] ++ lib.optional sevVariant "SEV=1"; enableParallelBuilding = true; @@ -44,6 +51,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/containers/libkrunfw"; license = with licenses; [ lgpl2Only lgpl21Only ]; maintainers = with maintainers; [ nickcao ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; }; } diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index b9e6eeba0f3f..6b8c2ebeaa94 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, glib, Carbon }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, Carbon, AppKit }: stdenv.mkDerivation rec { pname = "liblqr-1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ Carbon ]; + buildInputs = lib.optionals stdenv.isDarwin [ Carbon AppKit ]; propagatedBuildInputs = [ glib ]; meta = with lib; { diff --git a/pkgs/development/libraries/mlib/default.nix b/pkgs/development/libraries/mlib/default.nix new file mode 100644 index 000000000000..4f9c44e15c4f --- /dev/null +++ b/pkgs/development/libraries/mlib/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "mlib"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "P-p-H-d"; + repo = pname; + rev = "V${version}"; + hash = "sha256-LoDw9nQdEtXuTs0wncScrc2+Z7BW61ps5ee9OfQE4M0="; + }; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=$(out)" ]; + + doCheck = true; + + meta = with lib; { + description = "Library of generic and type safe containers in pure C language"; + longDescription = '' + M*LIB (M star lib) is a C library enabling to define and use generic and + type safe container, aka handling generic containers in in pure C + language. The objects within the containers can be trivial or very + complex: they can have their own constructor, destructor, operators or can + be basic C type like the C type 'int'. This makes it possible to construct + fully recursive objects (container-of[...]-container-of-type-T), without + erasing type information (typically using void pointers or resorting to C + macro to access the container). + ''; + homepage = "https://github.com/P-p-H-d/mlib"; + changelog = "https://github.com/P-p-H-d/mlib/releases/tag/${src.rev}"; + license = licenses.bsd2; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index b18d9a645eaf..35b6284fdee8 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, autoreconfHook, pkg-config, file +, cmake , libev, nghttp3, quictls , cunit, ncurses , withJemalloc ? false, jemalloc @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ autoreconfHook pkg-config file ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ libev nghttp3 quictls ] ++ lib.optional withJemalloc jemalloc; checkInputs = [ cunit ncurses ]; - preConfigure = '' - substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file - ''; + cmakeFlags = [ + "-DENABLE_STATIC_LIB=OFF" + ]; doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index cf9d597edc21..c3f04eae4ddf 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -2,6 +2,8 @@ , gn, ninja, python3, glib, pkg-config, icu , xcbuild, darwin , fetchpatch +, llvmPackages +, symlinkJoin }: # Use update.sh to update all checksums. @@ -106,6 +108,8 @@ stdenv.mkDerivation rec { touch build/config/gclient_args.gni ''; + llvmCcAndBintools = symlinkJoin { name = "llvmCcAndBintools"; paths = [ stdenv.cc llvmPackages.llvm ]; }; + gnFlags = [ "use_custom_libcxx=false" "is_clang=${lib.boolToString stdenv.cc.isClang}" @@ -123,7 +127,8 @@ stdenv.mkDerivation rec { # ''custom_toolchain="//build/toolchain/linux/unbundle:default"'' ''host_toolchain="//build/toolchain/linux/unbundle:default"'' ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'' - ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"''; + ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${llvmCcAndBintools}"'' + ++ lib.optional stdenv.isDarwin ''use_lld=false''; NIX_CFLAGS_COMPILE = "-O2"; FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12"; @@ -135,7 +140,7 @@ stdenv.mkDerivation rec { python3 ] ++ lib.optionals stdenv.isDarwin [ xcbuild - darwin.DarwinTools + llvmPackages.llvm python3.pkgs.setuptools ]; buildInputs = [ glib icu ]; @@ -166,7 +171,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ]; platforms = platforms.unix; license = licenses.bsd3; - # Fails to build on Darwin, see https://github.com/NixOS/nixpkgs/issues/158076 - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index cb81b97d0327..2065c3ebd2d5 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -153,7 +153,7 @@ buildLuarocksPackage { }) {}; busted = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, luasystem, lua-term, luassert, mediator_lua, say, dkjson, penlight, luafilesystem, lua, lua_cliargs +, fetchgit, penlight, luafilesystem, dkjson, lua_cliargs, lua, say, mediator_lua, luasystem, lua-term, luassert }: buildLuarocksPackage { pname = "busted"; @@ -176,7 +176,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ luasystem lua-term luassert mediator_lua say dkjson penlight luafilesystem lua lua_cliargs ]; + propagatedBuildInputs = [ penlight luafilesystem dkjson lua_cliargs lua say mediator_lua luasystem lua-term luassert ]; meta = { homepage = "https://lunarmodules.github.io/busted/"; @@ -186,7 +186,7 @@ buildLuarocksPackage { }) {}; cassowary = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, penlight +, fetchgit, penlight, lua }: buildLuarocksPackage { pname = "cassowary"; @@ -209,7 +209,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ lua penlight ]; + propagatedBuildInputs = [ penlight lua ]; meta = { homepage = "https://github.com/sile-typesetter/cassowary.lua"; @@ -220,7 +220,7 @@ buildLuarocksPackage { }) {}; cldr = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, penlight +, fetchgit, penlight, lua }: buildLuarocksPackage { pname = "cldr"; @@ -243,7 +243,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ lua penlight ]; + propagatedBuildInputs = [ penlight lua ]; meta = { homepage = "https://github.com/alerque/cldr-lua"; @@ -399,7 +399,7 @@ buildLuarocksPackage { }) {}; digestif = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, lpeg +, fetchgit, lpeg, lua }: buildLuarocksPackage { pname = "digestif"; @@ -419,7 +419,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.3"); - propagatedBuildInputs = [ lua lpeg ]; + propagatedBuildInputs = [ lpeg lua ]; meta = { homepage = "https://github.com/astoff/digestif/"; @@ -478,7 +478,7 @@ buildLuarocksPackage { }) {}; fluent = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, luaepnf, cldr, lua, penlight +, fetchgit, penlight, cldr, luaepnf, lua }: buildLuarocksPackage { pname = "fluent"; @@ -501,7 +501,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ luaepnf cldr lua penlight ]; + propagatedBuildInputs = [ penlight cldr luaepnf lua ]; meta = { homepage = "https://github.com/alerque/fluent-lua"; @@ -542,7 +542,7 @@ buildLuarocksPackage { }) {}; http = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchzip, luaossl, cqueues, compat53, lpeg, fifo, binaryheap, lpeg_patterns, basexx, bit32, lua +, fetchzip, basexx, lpeg_patterns, compat53, bit32, fifo, lua, binaryheap, cqueues, lpeg, luaossl }: buildLuarocksPackage { pname = "http"; @@ -557,7 +557,7 @@ buildLuarocksPackage { }; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ luaossl cqueues compat53 lpeg fifo binaryheap lpeg_patterns basexx bit32 lua ]; + propagatedBuildInputs = [ basexx lpeg_patterns compat53 bit32 fifo lua binaryheap cqueues lpeg luaossl ]; meta = { homepage = "https://github.com/daurnimator/lua-http"; @@ -626,7 +626,7 @@ buildLuarocksPackage { }) {}; ldoc = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, markdown, penlight +, fetchgit, penlight, markdown }: buildLuarocksPackage { pname = "ldoc"; @@ -645,7 +645,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - propagatedBuildInputs = [ markdown penlight ]; + propagatedBuildInputs = [ penlight markdown ]; meta = { homepage = "https://github.com/lunarmodules/LDoc"; @@ -847,7 +847,7 @@ buildLuarocksPackage { }) {}; lpeg_patterns = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchzip, lpeg, lua +, fetchzip, lua, lpeg }: buildLuarocksPackage { pname = "lpeg_patterns"; @@ -861,7 +861,7 @@ buildLuarocksPackage { sha256 = "1s3c179a64r45ffkawv9dnxw4mzwkzj00nr9z2gs5haajgpjivw6"; }; - propagatedBuildInputs = [ lpeg lua ]; + propagatedBuildInputs = [ lua lpeg ]; meta = { homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip"; @@ -1112,7 +1112,7 @@ buildLuarocksPackage { }) {}; lua-lsp = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, dkjson, inspect, lua, lpeglabel +, fetchgit, lua, inspect, lpeglabel, dkjson }: buildLuarocksPackage { pname = "lua-lsp"; @@ -1135,7 +1135,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ dkjson inspect lua lpeglabel ]; + propagatedBuildInputs = [ lua inspect lpeglabel dkjson ]; meta = { homepage = "https://github.com/Alloyed/lua-lsp"; @@ -1237,7 +1237,7 @@ buildLuarocksPackage { }) {}; lua-resty-jwt = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua-resty-openssl, lua +, fetchgit, lua, lua-resty-openssl }: buildLuarocksPackage { pname = "lua-resty-jwt"; @@ -1260,7 +1260,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ lua-resty-openssl lua ]; + propagatedBuildInputs = [ lua lua-resty-openssl ]; meta = { homepage = "https://github.com/cdbattags/lua-resty-jwt"; @@ -1270,7 +1270,7 @@ buildLuarocksPackage { }) {}; lua-resty-openidc = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua-resty-session, lua-resty-jwt, lua-resty-http, lua +, fetchgit, lua-resty-http, lua-resty-jwt, lua-resty-session, lua }: buildLuarocksPackage { pname = "lua-resty-openidc"; @@ -1293,7 +1293,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ lua-resty-session lua-resty-jwt lua-resty-http lua ]; + propagatedBuildInputs = [ lua-resty-http lua-resty-jwt lua-resty-session lua ]; meta = { homepage = "https://github.com/zmartzone/lua-resty-openidc"; @@ -1572,7 +1572,7 @@ buildLuarocksPackage { }) {}; luacheck = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, argparse, luafilesystem, lua +, fetchgit, lua, luafilesystem, argparse }: buildLuarocksPackage { pname = "luacheck"; @@ -1595,7 +1595,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ argparse luafilesystem lua ]; + propagatedBuildInputs = [ lua luafilesystem argparse ]; meta = { homepage = "https://github.com/lunarmodules/luacheck"; @@ -1671,7 +1671,7 @@ buildLuarocksPackage { }) {}; luadbi-mysql = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, luadbi, lua +, fetchgit, lua, luadbi }: buildLuarocksPackage { pname = "luadbi-mysql"; @@ -1694,7 +1694,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ luadbi lua ]; + propagatedBuildInputs = [ lua luadbi ]; meta = { homepage = "https://github.com/mwild1/luadbi"; @@ -1704,7 +1704,7 @@ buildLuarocksPackage { }) {}; luadbi-postgresql = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, luadbi +, fetchgit, luadbi, lua }: buildLuarocksPackage { pname = "luadbi-postgresql"; @@ -1727,7 +1727,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua luadbi ]; + propagatedBuildInputs = [ luadbi lua ]; meta = { homepage = "https://github.com/mwild1/luadbi"; @@ -1985,7 +1985,7 @@ buildLuarocksPackage { }) {}; luaposix = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchzip, bit32, lua +, fetchzip, lua, bit32 }: buildLuarocksPackage { pname = "luaposix"; @@ -2000,7 +2000,7 @@ buildLuarocksPackage { }; disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ bit32 lua ]; + propagatedBuildInputs = [ lua bit32 ]; meta = { homepage = "http://github.com/luaposix/luaposix/"; @@ -2036,7 +2036,7 @@ buildLuarocksPackage { }) {}; luasec = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, luasocket, lua +, fetchgit, lua, luasocket }: buildLuarocksPackage { pname = "luasec"; @@ -2059,7 +2059,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ luasocket lua ]; + propagatedBuildInputs = [ lua luasocket ]; meta = { homepage = "https://github.com/brunoos/luasec/wiki"; @@ -2304,6 +2304,38 @@ buildLuarocksPackage { }; }) {}; +lush-nvim = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +, moonscript}: +buildLuarocksPackage { + pname = "lush.nvim"; + version = "scm-1"; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/rktjmp/lush.nvim", + "rev": "6b9f399245de7bea8dac2c3bf91096ffdedfcbb7", + "date": "2022-08-10T01:43:55+10:00", + "path": "/nix/store/ljfhbz8s6pjnngbixk3m6ivpb7nx1gv0-lush.nvim", + "sha256": "0rb77rwmbm438bmbjfk5hwrrcn5sihsa1413bdpc27rw3rrn8v8z", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua ]; + checkInputs = [ moonscript ]; + + meta = { + homepage = "https://github.com/rktjmp/lush.nvim"; + description = "Define Neovim themes as a DSL in lua, with real-time feedback."; + maintainers = with lib.maintainers; [ teto ]; + license.fullName = "MIT/X11"; + }; +}) {}; + luuid = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchurl, lua }: @@ -2440,7 +2472,7 @@ buildLuarocksPackage { }) {}; moonscript = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, luafilesystem, argparse, lpeg +, fetchgit, lua, luafilesystem, lpeg, argparse }: buildLuarocksPackage { pname = "moonscript"; @@ -2460,7 +2492,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ lua luafilesystem argparse lpeg ]; + propagatedBuildInputs = [ lua luafilesystem lpeg argparse ]; meta = { homepage = "http://moonscript.org"; @@ -2493,7 +2525,7 @@ buildLuarocksPackage { }) {}; nvim-client = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchurl, luv, mpack, lua, coxpcall +, fetchurl, coxpcall, luv, mpack, lua }: buildLuarocksPackage { pname = "nvim-client"; @@ -2505,7 +2537,7 @@ buildLuarocksPackage { }; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ luv mpack lua coxpcall ]; + propagatedBuildInputs = [ coxpcall luv mpack lua ]; meta = { homepage = "https://github.com/neovim/lua-client"; @@ -2514,8 +2546,33 @@ buildLuarocksPackage { }; }) {}; +nvim-cmp = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchzip, lua +}: +buildLuarocksPackage { + pname = "nvim-cmp"; + version = "0.0.1-2"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/nvim-cmp-0.0.1-2.rockspec"; + sha256 = "0jx4i2rnc7zmy1bbqp6fqymlklc7xvqyv35prjl3ld05c4dpg7nq"; + }).outPath; + src = fetchzip { + url = "http://github.com/hrsh7th/nvim-cmp/archive/v0.0.1.zip"; + sha256 = "0649n476jd6dqd79fmywmigz19sb0s344ablwr25gr23fp46hzaz"; + }; + + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/hrsh7th/nvim-cmp"; + description = "A completion plugin for neovim"; + license.fullName = "MIT"; + }; +}) {}; + penlight = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, lua, luafilesystem +, fetchgit, luafilesystem, lua , busted}: buildLuarocksPackage { pname = "penlight"; @@ -2535,7 +2592,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1"); - propagatedBuildInputs = [ lua luafilesystem ]; + propagatedBuildInputs = [ luafilesystem lua ]; checkInputs = [ busted ]; meta = { @@ -2632,6 +2689,31 @@ buildLuarocksPackage { }; }) {}; +rest-nvim = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchzip, lua, plenary-nvim +}: +buildLuarocksPackage { + pname = "rest.nvim"; + version = "0.1-2"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/rest.nvim-0.1-2.rockspec"; + sha256 = "0l8k91483nz75ijgnyfb8r7mynsaps7ikvjkziimf62bv7aks3qh"; + }).outPath; + src = fetchzip { + url = "http://github.com/rest-nvim/rest.nvim/archive/0.1.zip"; + sha256 = "0yf1a1cjrrzw0wmjgg48g3qn9kfxn7hv38yx88l1sc1r1nsfijrq"; + }; + + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua plenary-nvim ]; + + meta = { + homepage = "https://github.com/rest-nvim/rest.nvim"; + description = "A fast Neovim http client written in Lua"; + license.fullName = "MIT"; + }; +}) {}; + say = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchgit, lua , busted}: @@ -2817,7 +2899,7 @@ buildLuarocksPackage { }) {}; tl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchgit, argparse, compat53, luafilesystem +, fetchgit, compat53, luafilesystem, argparse , dkjson}: buildLuarocksPackage { pname = "tl"; @@ -2839,7 +2921,7 @@ buildLuarocksPackage { } '') ["date" "path"]) ; - propagatedBuildInputs = [ argparse compat53 luafilesystem ]; + propagatedBuildInputs = [ compat53 luafilesystem argparse ]; checkInputs = [ dkjson ]; meta = { diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 60fcf2ca1ca5..1e46a23a21cc 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -94,6 +94,10 @@ with prev; ]; }); + lush-nvim = prev.lib.overrideLuarocks prev.lush-nvim (drv: rec { + doCheck = false; + }); + ljsyscall = prev.lib.overrideLuarocks prev.ljsyscall (drv: rec { version = "unstable-20180515"; # package hasn't seen any release for a long time diff --git a/pkgs/development/ocaml-modules/bindlib/default.nix b/pkgs/development/ocaml-modules/bindlib/default.nix new file mode 100644 index 000000000000..c0d8dd54a37b --- /dev/null +++ b/pkgs/development/ocaml-modules/bindlib/default.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromGitHub +, buildDunePackage +, earley +, timed +}: + +buildDunePackage rec { + pname = "bindlib"; + version = "6.0.0"; + + minimalOCamlVersion = "4.07"; + + src = fetchFromGitHub { + owner = "rlepigre"; + repo = "ocaml-${pname}"; + rev = version; + hash = "sha256-058yMbz9ExvgNG/kY9tPk70XSeVRSSKVg4n4F4fmPu4="; + }; + + checkInputs = [ earley timed ]; + doCheck = true; + + meta = with lib; { + homepage = "https://rlepigre.github.io/ocaml-bindlib"; + description = "Efficient binder representation in Ocaml"; + license = licenses.gpl3; + changelog = "https://github.com/rlepigre/ocaml-bindlib/raw/${version}/CHANGELOG.md"; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/ocaml-modules/dedukti/default.nix b/pkgs/development/ocaml-modules/dedukti/default.nix new file mode 100644 index 000000000000..fafeeb4690ce --- /dev/null +++ b/pkgs/development/ocaml-modules/dedukti/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, buildDunePackage +, cmdliner_1_1 +, menhir +}: + +buildDunePackage rec { + pname = "dedukti"; + version = "2.7"; + + minimalOCamlVersion = "4.08"; + + src = fetchFromGitHub { + owner = "Deducteam"; + repo = pname; + rev = "v${version}"; + hash = "sha256-SFxbgq2znO+OCEFzuekVquvtOEuCQanseKy+iZAeWbc="; + }; + + nativeBuildInputs = [ menhir ]; + buildInputs = [ cmdliner_1_1 ]; + + doCheck = false; # requires `tezt` + + meta = with lib; { + homepage = "https://deducteam.github.io"; + description = "Logical framework based on the λΠ-calculus modulo rewriting"; + license = licenses.cecill-b; + changelog = "https://github.com/Deducteam/Dedukti/raw/${version}/CHANGELOG.md"; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/ocaml-modules/lambdapi/default.nix b/pkgs/development/ocaml-modules/lambdapi/default.nix new file mode 100644 index 000000000000..5827c5d4b7a5 --- /dev/null +++ b/pkgs/development/ocaml-modules/lambdapi/default.nix @@ -0,0 +1,46 @@ +{ lib +, fetchFromGitHub +, buildDunePackage +, alcotest +, dedukti +, bindlib +, camlp-streams +, cmdliner_1_1 +, menhir +, pratter +, sedlex +, stdlib-shims +, timed +, why3 +, yojson +}: + +buildDunePackage rec { + pname = "lambdapi"; + version = "2.2.1"; + + minimalOCamlVersion = "4.08"; + + src = fetchFromGitHub { + owner = "Deducteam"; + repo = pname; + rev = version; + hash = "sha256-p2ZjSfiZwkf8X4fSNJx7bAVpTFl4UBHIEANIWF7NGCs="; + }; + + nativeBuildInputs = [ menhir ]; + propagatedBuildInputs = [ + bindlib camlp-streams cmdliner_1_1 pratter sedlex stdlib-shims timed why3 yojson + ]; + + checkInputs = [ alcotest dedukti ]; + doCheck = false; # "Error: Unbound module Cmd" + + meta = with lib; { + homepage = "https://github.com/Deducteam/lambdapi"; + description = "Proof assistant based on the λΠ-calculus modulo rewriting"; + license = licenses.cecill21; + changelog = "https://github.com/Deducteam/lambdapi/raw/${version}/CHANGES.md"; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/ocaml-modules/pratter/default.nix b/pkgs/development/ocaml-modules/pratter/default.nix new file mode 100644 index 000000000000..a44e815092ca --- /dev/null +++ b/pkgs/development/ocaml-modules/pratter/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchFromGitHub +, buildDunePackage +, camlp-streams +, alcotest +, qcheck +, qcheck-alcotest +}: + +buildDunePackage rec { + version = "2.0.0"; + pname = "pratter"; + + minimalOCamlVersion = "4.08"; + + src = fetchFromGitHub { + owner = "gabrielhdt"; + repo = "pratter"; + rev = version; + hash = "sha256-QEq8Zt2pfsRT04Zd+ugGKcHdzkqYcDDUg/iAFMMDdEE="; + }; + + propagatedBuildInputs = [ camlp-streams ]; + + checkInputs = [ alcotest qcheck qcheck-alcotest ]; + doCheck = true; + + meta = with lib; { + description = "An extended Pratt parser"; + homepage = "https://github.com/gabrielhdt/pratter"; + license = licenses.bsd3; + changelog = "https://github.com/gabrielhdt/pratter/raw/${version}/CHANGELOG.md"; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/ocaml-modules/timed/default.nix b/pkgs/development/ocaml-modules/timed/default.nix new file mode 100644 index 000000000000..988cb3f5487f --- /dev/null +++ b/pkgs/development/ocaml-modules/timed/default.nix @@ -0,0 +1,28 @@ +{ lib +, fetchFromGitHub +, ocaml +, buildDunePackage +}: + +buildDunePackage rec { + version = "1.1"; + pname = "timed"; + + minimalOCamlVersion = "4.08"; + + src = fetchFromGitHub { + owner = "rlepigre"; + repo = "ocaml-${pname}"; + rev = version; + sha256 = "sha256-wUoI9j/j0IGYW2NfJHmyR2XEYfYejyoYLWnKsuWdFas="; + }; + + doCheck = true; + + meta = with lib; { + description = "Timed references for imperative state"; + homepage = "https://github.com/rlepigre/ocaml-timed"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 4e9ccaf23701..ffef4a471d61 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchpatch, fetchPypi, makeWrapper, isPy3k +{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k , python, twisted, jinja2, msgpack, zope_interface, sqlalchemy, alembic , python-dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, pypugjs , boto3, moto, mock, lz4, setuptoolsTrial @@ -32,11 +32,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "3.5.0"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-woGHdCan5qTp00toNkWa821EgVQMrPK+OWXoqFcgIDQ="; + sha256 = "sha256-C8KXh+4bsf0zE8PCTwK3H/0pMP762I26quQiyHVkr2A="; }; propagatedBuildInputs = [ @@ -78,11 +78,6 @@ let # This patch disables the test that tries to read /etc/os-release which # is not accessible in sandboxed builds. ./skip_test_linux_distro.patch - (fetchpatch{ - url = "https://github.com/buildbot/buildbot/commit/54b8f62902122b0091319a96d0f9edd4195ab4c6.patch"; - stripLen = 1; - sha256 = "sha256-OqW3ZQK0bfqPG3YlrBbrSEEKsM/XqY2NO862ZD/DgHs="; - }) ]; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index a2cffd739d1a..146fc52166bb 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-CYbMixfZZ1xypV0J7TW54n/fja9RGMlWiF7StJYFnqM="; + sha256 = "sha256-+48r7VUl7r8u3aWE0+Uwk28DMhdwz02iqq76M7MgY+k="; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 62aa51e053dc..093703e2c160 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-boa/MWi/HAhNU3/n96i0fuoQ+jT5I+dWoe1Zd7f/Yvs="; + sha256 = "sha256-ivdjwZYHsovZu1HQ5tc+k7ScB4OdonOcTSuMXKKeU10="; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-NUDTwgkQuasOlJxNTlvfIm99LNVCrRIdBmgeJnwkSU8="; + sha256 = "sha256-SebskFsLZUHTi9lS9DbG8ZKQqjls+e25xvqqK7LZaMw="; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-EmiIDCG4iFIwFnwii8fjII7C7wsBifzeZeW7HyY04dE="; + sha256 = "sha256-HWhKEzjzAYJZsd31701NuHOvImwnxFM8dLvE7fqpIRM="; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-QcS8QJ17uzDvkynTczj05LojuIT6feGiQNCwCESbVLw="; + sha256 = "sha256-jGBdrVcxNpWdFT9aXO/KX/ZG/oXlWmlvpIFFSrVQ9pk="; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-U9ecRxpDowzjD4GsrW4FUHcbNaWeAFGKDlqMrbIoTrQ="; + sha256 = "sha256-8dvhVKbwTug78+14FGFyRj7AX3QpbveC4PHzc1yk03w="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 8c5319868ce5..61663cb9a740 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -28,7 +28,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-HZH3TdH5dhr3f6ev25O3SgPPNbiFGMmAp9DHwcb/2MA="; + sha256 = "sha256-WTvap1dx7OMim4UIZrfZVxrAWxPBwbRH6qdfO038bts="; }; postPatch = '' diff --git a/pkgs/development/python-modules/discogs-client/default.nix b/pkgs/development/python-modules/discogs-client/default.nix index f4d80c527bc8..a07500aba1b6 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.15"; + version = "2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "joalla"; repo = "discogs_client"; rev = "refs/tags/v${version}"; - sha256 = "sha256-teI0sbvluwVFmEOL/V1zLNGFVbeM7QzZ9rCOl3+A+aY="; + sha256 = "sha256-gGAtRhAg/W0dREhCOmif1XlQ4gldIGQ2hIC8gzifRu8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index f4450f2fea51..2bcba19d03ac 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "discord.py"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Rapptz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BhxXsNRgs/ihnlTxNwYTjRwPvneyDF8Q0wS3qr2BG9Q="; + sha256 = "sha256-DX9AmVhwP7XgzUApY8d+UB6LGqymErsaSzaisuKAOB0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index b7cc95f7c5fa..4253d69feaa1 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "django-extensions"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-jibske9cnOn4FPAGNs2EU1w1huF4dNxHAnOzuKSj3/E="; + sha256 = "sha256-i8A/FMba1Lc3IEBzefP3Uu23iGcDGYqo5bNv+u6hKQI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index ee92ab09db8b..ca47c67c81d8 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.6.0"; + version = "1.6.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-n9/M/blE+fvknUvlIlTWLqOhxo2Su3lj548enUf1DUg="; + sha256 = "sha256-2BtJQiDPMMIxbO0FdOQT/jzsaiPMTdmf8S21ezmQRLQ="; }; preBuild = '' diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 4a8fff9b7826..c8a6c42077fe 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.5.25"; + version = "1.5.26"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-wlwpw6ELRsORQDs/TC+J3vIR84Te8FE9qec3NLyhFY8="; + sha256 = "sha256-WA6EgdyZ6zQGCzeQsHUD304WMCarjhGEpqXXBhBsxNw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fireflyalgorithm/default.nix b/pkgs/development/python-modules/fireflyalgorithm/default.nix new file mode 100644 index 000000000000..b0343f2d870a --- /dev/null +++ b/pkgs/development/python-modules/fireflyalgorithm/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "FireflyAlgorithm"; + version = "0.3.2"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "firefly-cpp"; + repo = pname; + rev = version; + sha256 = "sha256-IlOIoP2aANE8y3+Qtb/H6w/+REnPWiUUQGRiAfxOpcM="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + numpy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "fireflyalgorithm" + ]; + + meta = with lib; { + description = "An implementation of the stochastic nature-inspired algorithm for optimization"; + homepage = "https://github.com/firefly-cpp/FireflyAlgorithm"; + license = licenses.mit; + maintainers = with maintainers; [ firefly-cpp ]; + }; +} diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index 3d4fd154c3f2..d2d526ea60df 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.19"; + version = "0.2.20"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-H3N0hAJsjBX3pQ2i03r4MRBQQLCXjLhftokZQx0bF80="; + sha256 = "sha256-RDd0KR7NjBTlgeQ/E4mnLnB2n4NCPoAt2a62NGdzCZE="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index 36b1e9f42d14..50516ae32e6a 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "5.0.0"; + version = "5.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-d8RG/PSWPHvQy7o9tPLPGrEp0r/Y3JWwWoT3cS4iR38="; + hash = "sha256-fJoV/mNImdcTpJC6c2zmYWZCXlBWLOP+5W5Hsmw2yOQ="; }; # Module has no tests diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 59cbd65b48f3..1643904c314f 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -17,7 +17,7 @@ let nbclient = buildPythonPackage rec { pname = "nbclient"; - version = "0.6.6"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ let nbclient = buildPythonPackage rec { owner = "jupyter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Rs4Jk4OtexB/NKM1Jo4cV87hBxXDlnX9X+4KO+pGb0E="; + hash = "sha256-+GQkEGWReo9y8bgcysslQdzJUcvQiZkQTQiwmWJ1mx8="; }; propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ]; diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix index 140d81c87c72..7fca1bd8951a 100644 --- a/pkgs/development/python-modules/nextcord/default.nix +++ b/pkgs/development/python-modules/nextcord/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nextcord"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "nextcord"; repo = "nextcord"; rev = "refs/tags/v${version}"; - hash = "sha256-/M7Wyb1GW6LPWm41jVnhWA6+dyTrdLyJ6pfsMozw5xI="; + hash = "sha256-2VlmcldbW+BfQRzOjCsh6r29qzwD+SG8H8arbTDg94k="; }; patches = [ diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index 352f42a555f7..5246bf803d18 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "5.10.0"; + version = "5.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-eybcT7pdc0QED3HrHN+jnxZLXoExEZZUEHSoFmhlsHQ="; + hash = "sha256-Xkf/7V1p98yy5UJnDZgnLMp/8BGLVYINWMommRrqdXk="; }; sourceRoot = "${src.name}/sdk/python"; diff --git a/pkgs/development/python-modules/pycep-parser/default.nix b/pkgs/development/python-modules/pycep-parser/default.nix index 91722ee89bca..aab9f05d93ff 100644 --- a/pkgs/development/python-modules/pycep-parser/default.nix +++ b/pkgs/development/python-modules/pycep-parser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pycep-parser"; - version = "0.3.8"; + version = "0.3.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "gruebel"; repo = "pycep"; rev = "refs/tags/${version}"; - hash = "sha256-y6npvFh6/QykOAKK8ihTHDcv5dFd4lLU64UXPIhBELA="; + hash = "sha256-CghTNdZZJJOakMySNPRCTYx+1aEY8ROUvS9loc9JcPo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyintesishome/default.nix b/pkgs/development/python-modules/pyintesishome/default.nix index c6b1a7319f3e..fb8fd6dac4d4 100644 --- a/pkgs/development/python-modules/pyintesishome/default.nix +++ b/pkgs/development/python-modules/pyintesishome/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyintesishome"; - version = "1.8.1"; + version = "1.8.3"; src = fetchFromGitHub { owner = "jnimmo"; repo = "pyIntesisHome"; - rev = version; - sha256 = "sha256-+bad3VIoP0sVw0blK9YIot2GfK5de4HTXv5/ipV2Nds="; + rev = "refs/tags/${version}"; + sha256 = "sha256-PMRTRQYckqD8GRatyj7IMAiFPbi91HvX19Jwe28rIPg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index b8f9564a4ffe..916a22a62ed0 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -2,8 +2,6 @@ , fetchFromGitLab , buildPythonPackage , pillow -, setuptools-scm -, setuptools-scm-git-archive , tesseract , cuneiform , isPy3k @@ -13,7 +11,7 @@ buildPythonPackage rec { pname = "pyocr"; - version = "0.7.2"; + version = "0.8.3"; disabled = !isPy3k; # Don't fetch from PYPI because it doesn't contain tests. @@ -23,7 +21,7 @@ buildPythonPackage rec { owner = "OpenPaperwork"; repo = "pyocr"; rev = version; - sha256 = "09ab86bmizpv94w3mdvdqkjyyvk1vafw3jqhkiw5xx7p180xn3il"; + sha256 = "sha256-gIn50H9liQcTb7SzoWnBwm5LTvkr+R+5OPvITls1B/w="; }; patches = [ @@ -33,9 +31,11 @@ buildPythonPackage rec { }) ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - - buildInputs = [ setuptools-scm setuptools-scm-git-archive ]; + # see the logic in setup.py + ENABLE_SETUPTOOLS_SCM = "0"; + preConfigure = '' + echo 'version = "${version}"' > src/pyocr/_version.py + ''; propagatedBuildInputs = [ pillow ]; @@ -45,6 +45,6 @@ buildPythonPackage rec { inherit (src.meta) homepage; description = "A Python wrapper for Tesseract and Cuneiform"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ symphorien ]; }; } diff --git a/pkgs/development/python-modules/pyocr/paths.patch b/pkgs/development/python-modules/pyocr/paths.patch index 55cbf7d48da4..d49060739737 100644 --- a/pkgs/development/python-modules/pyocr/paths.patch +++ b/pkgs/development/python-modules/pyocr/paths.patch @@ -1,3 +1,9 @@ +commit c4bac00441363fcaeb074682d8226ca523614ea2 +Author: Guillaume Girol +Date: Sat Aug 20 17:48:01 2022 +0200 + + Fix finding tesseract and cuneiform + diff --git a/src/pyocr/cuneiform.py b/src/pyocr/cuneiform.py index 2e5b717..35647e2 100644 --- a/src/pyocr/cuneiform.py @@ -19,7 +25,7 @@ index 2e5b717..35647e2 100644 LANGUAGES_LINE_PREFIX = "Supported languages: " LANGUAGES_SPLIT_RE = re.compile("[^a-z]") diff --git a/src/pyocr/libtesseract/tesseract_raw.py b/src/pyocr/libtesseract/tesseract_raw.py -index a068e73..9ebea5c 100644 +index 2002614..9ebea5c 100644 --- a/src/pyocr/libtesseract/tesseract_raw.py +++ b/src/pyocr/libtesseract/tesseract_raw.py @@ -2,7 +2,6 @@ import ctypes @@ -30,7 +36,7 @@ index a068e73..9ebea5c 100644 from ..error import TesseractError -@@ -10,48 +9,16 @@ from ..error import TesseractError +@@ -10,51 +9,16 @@ from ..error import TesseractError logger = logging.getLogger(__name__) TESSDATA_PREFIX = os.getenv('TESSDATA_PREFIX', None) @@ -57,7 +63,7 @@ index a068e73..9ebea5c 100644 - ) - ) - else: -- TESSDATA_PREFIX = tessdata +- TESSDATA_PREFIX = os.path.join(tessdata, "tessdata") - - -if sys.platform[:3] == "win": # pragma: no cover @@ -77,15 +83,18 @@ index a068e73..9ebea5c 100644 - ] -else: - libnames += [ +- "libtesseract.so.5", - "libtesseract.so.4", - "libtesseract.so.3", +- "libtesseract.5.dylib", +- "libtesseract.4.dylib", - ] - +libnames = [ "@tesseract@/lib/libtesseract.so" ] g_libtesseract = None -@@ -364,12 +331,12 @@ def init(lang=None): +@@ -367,12 +331,12 @@ def init(lang=None): try: if lang: lang = lang.encode("utf-8") @@ -103,7 +112,7 @@ index a068e73..9ebea5c 100644 ) g_libtesseract.TessBaseAPISetVariable( diff --git a/src/pyocr/tesseract.py b/src/pyocr/tesseract.py -index 7c30852..44e8446 100644 +index 0fe0d20..c1fdd27 100644 --- a/src/pyocr/tesseract.py +++ b/src/pyocr/tesseract.py @@ -28,8 +28,7 @@ from .builders import DigitBuilder # backward compatibility @@ -193,7 +202,7 @@ index 45b7f6a..95f55c6 100644 stderr=subprocess.STDOUT ) diff --git a/tests/tests_libtesseract.py b/tests/tests_libtesseract.py -index ad7fdc9..57e7a60 100644 +index a5d46d8..8b9e315 100644 --- a/tests/tests_libtesseract.py +++ b/tests/tests_libtesseract.py @@ -165,7 +165,8 @@ class TestLibTesseractRaw(BaseTest): @@ -217,7 +226,7 @@ index ad7fdc9..57e7a60 100644 self.assertEqual( diff --git a/tests/tests_tesseract.py b/tests/tests_tesseract.py -index 1a55567..a24d96f 100644 +index 18d01ef..593cf94 100644 --- a/tests/tests_tesseract.py +++ b/tests/tests_tesseract.py @@ -36,7 +36,7 @@ class TestTesseract(BaseTest): @@ -229,7 +238,7 @@ index 1a55567..a24d96f 100644 @patch("subprocess.Popen") def test_version_error(self, popen): -@@ -156,7 +156,7 @@ class TestTesseract(BaseTest): +@@ -162,7 +162,7 @@ class TestTesseract(BaseTest): for lang in ("eng", "fra", "jpn", "osd"): self.assertIn(lang, langs) popen.assert_called_once_with( @@ -238,7 +247,7 @@ index 1a55567..a24d96f 100644 startupinfo=None, creationflags=0, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) -@@ -171,7 +171,7 @@ class TestTesseract(BaseTest): +@@ -177,7 +177,7 @@ class TestTesseract(BaseTest): self.assertEqual(te.exception.status, 1) self.assertEqual("unable to get languages", te.exception.message) popen.assert_called_once_with( @@ -247,7 +256,7 @@ index 1a55567..a24d96f 100644 startupinfo=None, creationflags=0, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) -@@ -248,7 +248,7 @@ class TestTesseract(BaseTest): +@@ -254,7 +254,7 @@ class TestTesseract(BaseTest): self.assertEqual(status, 0) self.assertEqual(error, message) popen.assert_called_once_with( @@ -256,7 +265,7 @@ index 1a55567..a24d96f 100644 cwd=tmpdir, startupinfo=None, creationflags=0, -@@ -271,7 +271,7 @@ class TestTesseract(BaseTest): +@@ -277,7 +277,7 @@ class TestTesseract(BaseTest): self.assertEqual(status, 0) self.assertEqual(error, message) popen.assert_called_with( @@ -265,7 +274,7 @@ index 1a55567..a24d96f 100644 cwd=tmpdir, startupinfo=None, creationflags=0, -@@ -302,7 +302,7 @@ class TestTesseract(BaseTest): +@@ -308,7 +308,7 @@ class TestTesseract(BaseTest): self.assertEqual(result["angle"], 90) self.assertEqual(result["confidence"], 9.30) popen.assert_called_once_with( @@ -274,7 +283,7 @@ index 1a55567..a24d96f 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -338,7 +338,7 @@ class TestTesseract(BaseTest): +@@ -344,7 +344,7 @@ class TestTesseract(BaseTest): self.assertEqual(result["angle"], 90) self.assertEqual(result["confidence"], 9.30) popen.assert_called_once_with( @@ -283,7 +292,7 @@ index 1a55567..a24d96f 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -371,7 +371,7 @@ class TestTesseract(BaseTest): +@@ -377,7 +377,7 @@ class TestTesseract(BaseTest): self.assertEqual(result["angle"], 90) self.assertEqual(result["confidence"], 9.30) popen.assert_called_once_with( @@ -292,7 +301,7 @@ index 1a55567..a24d96f 100644 "--psm", "0", "-l", "osd"], stdin=subprocess.PIPE, shell=False, -@@ -399,7 +399,7 @@ class TestTesseract(BaseTest): +@@ -405,7 +405,7 @@ class TestTesseract(BaseTest): with self.assertRaises(tesseract.TesseractError) as te: tesseract.detect_orientation(self.image) popen.assert_called_once_with( @@ -301,7 +310,7 @@ index 1a55567..a24d96f 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -433,7 +433,7 @@ class TestTesseract(BaseTest): +@@ -439,7 +439,7 @@ class TestTesseract(BaseTest): with self.assertRaises(tesseract.TesseractError) as te: tesseract.detect_orientation(self.image) popen.assert_called_once_with( @@ -310,7 +319,7 @@ index 1a55567..a24d96f 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -467,7 +467,7 @@ class TestTesseract(BaseTest): +@@ -473,7 +473,7 @@ class TestTesseract(BaseTest): self.assertEqual(result["angle"], 90) self.assertEqual(result["confidence"], 9.30) popen.assert_called_once_with( @@ -319,7 +328,7 @@ index 1a55567..a24d96f 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -500,7 +500,7 @@ class TestTesseract(BaseTest): +@@ -506,7 +506,7 @@ class TestTesseract(BaseTest): self.assertEqual(result["angle"], 90) self.assertEqual(result["confidence"], 9.30) popen.assert_called_once_with( @@ -328,7 +337,7 @@ index 1a55567..a24d96f 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -527,7 +527,7 @@ class TestTesseract(BaseTest): +@@ -533,7 +533,7 @@ class TestTesseract(BaseTest): with self.assertRaises(tesseract.TesseractError) as te: tesseract.detect_orientation(self.image) popen.assert_called_once_with( @@ -337,7 +346,7 @@ index 1a55567..a24d96f 100644 stdin=subprocess.PIPE, shell=False, startupinfo=None, -@@ -561,7 +561,7 @@ class TestTesseract(BaseTest): +@@ -567,7 +567,7 @@ class TestTesseract(BaseTest): with self.assertRaises(tesseract.TesseractError) as te: tesseract.detect_orientation(self.image) popen.assert_called_once_with( diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 6eac9bf333be..855b5f618f81 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for testing asyncio code with pytest"; homepage = "https://github.com/pytest-dev/pytest-asyncio"; - changelog = "https://github.com/pytest-dev/pytest-asyncio/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/pytest-dev/pytest-asyncio/blob/v${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pytest-pylint/default.nix b/pkgs/development/python-modules/pytest-pylint/default.nix index e03e0fbe626c..11b91e191aff 100644 --- a/pkgs/development/python-modules/pytest-pylint/default.nix +++ b/pkgs/development/python-modules/pytest-pylint/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pytest-pylint"; - version = "0.18.0"; + version = "0.19.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "790c7a8019fab08e59bd3812db1657a01995a975af8b1c6ce95b9aa39d61da27"; + sha256 = "sha256-2I6DwQI8ZBVIqew1Z3B87udhZjKphq8TNCbUp00GaTI="; }; nativeBuildInputs = [ pytest-runner ]; diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index a17c4dee7340..5d6117d35e2f 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "1.3.5"; + version = "1.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ncgNO76j2Z3766ojYydUoYZzRoTb2XxhR6FkKFzjyhI="; + hash = "sha256-KcDVOKAuQ5iVKgK3o1Vnc+LUVsI1izTnkOmByiyCJ1E="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index 60ff8dec451c..6bc9c220ded4 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.15.20"; + version = "0.15.21"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hHZzMK7ge2Hs7tzHo4LV3rumEoEoL2OODRQRM60Vlz0="; + sha256 = "sha256-1wHV1+xrGFJWLoMIaG5jc01FfC7mV0+ArhPmWS5yG04="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix index ea4ae3bb3438..e4761dc33b02 100644 --- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix +++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -11,8 +11,6 @@ , qiskit-terra , scikit-learn , sparse - # Optional inputs -, withTorch ? true , torch # Check Inputs , pytestCheckHook @@ -38,10 +36,11 @@ buildPythonPackage rec { fastdtw numpy psutil + torch qiskit-terra scikit-learn sparse - ] ++ lib.optional withTorch torch; + ]; doCheck = false; # TODO: enable. Tests fail on unstable due to some multithreading issue? checkInputs = [ diff --git a/pkgs/development/python-modules/rising/default.nix b/pkgs/development/python-modules/rising/default.nix index 07fdad78aadf..553724807261 100644 --- a/pkgs/development/python-modules/rising/default.nix +++ b/pkgs/development/python-modules/rising/default.nix @@ -3,7 +3,6 @@ , isPy27 , fetchFromGitHub , pytestCheckHook -, pytest-cov , dill , numpy , torch @@ -25,7 +24,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy torch threadpoolctl tqdm ]; - checkInputs = [ dill pytest-cov pytestCheckHook ]; + checkInputs = [ dill pytestCheckHook ]; disabledTests = [ "test_affine" ]; # deprecated division operator '/' diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index fae42ac5914e..274c8818b204 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "tatsu"; - version = "5.8.2"; + version = "5.8.3"; # upstream only supports 3.10+ disabled = pythonOlder "3.10"; @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "neogeny"; repo = "TatSu"; rev = "refs/tags/v${version}"; - sha256 = "sha256-eJJ438zjXRZ7dk36RPkFvhcIA5RYo5MsjptZIpjCrVI="; + sha256 = "sha256-cKEMRbH/xNtYM0lmNVazv3i0Q1tmVrVPrB6F2s02Sro="; }; nativeBuildInputs = [ pytest-runner ]; diff --git a/pkgs/development/python-modules/torchgpipe/default.nix b/pkgs/development/python-modules/torchgpipe/default.nix index 68e113ce70fe..8bde4937eaec 100644 --- a/pkgs/development/python-modules/torchgpipe/default.nix +++ b/pkgs/development/python-modules/torchgpipe/default.nix @@ -1,8 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 -, pytest-runner +, pythonOlder , pytestCheckHook , torch }: @@ -11,7 +10,7 @@ buildPythonPackage rec { pname = "torchgpipe"; version = "0.0.7"; - disabled = isPy27; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kakaobrain"; @@ -20,9 +19,14 @@ buildPythonPackage rec { sha256 = "0ki0njhmz1i3pkpr3y6h6ac7p5qh1kih06mknc2s18mfw34f2l55"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'" "" + ''; + propagatedBuildInputs = [ torch ]; - checkInputs = [ pytest-runner pytestCheckHook ]; + checkInputs = [ pytestCheckHook ]; disabledTests = [ "test_inplace_on_requires_grad" "test_input_requiring_grad" diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index 933566fcb393..eee18b2cb7b3 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -15,7 +15,7 @@ let pname = "torchmetrics"; - version = "0.9.2"; + version = "0.9.3"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PyTorchLightning"; repo = "metrics"; rev = "refs/tags/v${version}"; - hash = "sha256-zkdmWxaTPTMyLe7P/zVfgKSYDCec3uh0eqCtahByMlY="; + hash = "sha256-L2p8UftRkuBuRJX4V5+OYkJeJ5pCK3MvfA1OvSfgglY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zope_dottedname/default.nix b/pkgs/development/python-modules/zope_dottedname/default.nix index cbd5cd6d6539..aca291669cdc 100644 --- a/pkgs/development/python-modules/zope_dottedname/default.nix +++ b/pkgs/development/python-modules/zope_dottedname/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "zope.dottedname"; - version = "4.3"; + version = "5.0"; src = fetchPypi { inherit pname version; - sha256 = "0cec09844d309550359ac1941abfcd9141e213f67f3c19bb8f90360c40787576"; + sha256 = "sha256-mfWDqAKFhqtMIXlGE+QR0BDNCZF/RdqXa9/udI87++w="; }; meta = with lib; { diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 5a6d885159a5..c266319fa345 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -361,6 +361,12 @@ in buildInputs = [ which v8 python2 ]; buildFlags = [ "--with-system-v8=true" ]; dontBuild = false; + # The gem includes broken symlinks which are ignored during unpacking, but + # then fail during build. Since the content is missing anyway, touching the + # files is enough to unblock the build. + preBuild = '' + touch vendor/depot_tools/cbuildbot vendor/depot_tools/chrome_set_ver vendor/depot_tools/cros_sdk + ''; postPatch = '' substituteInPlace ext/libv8/extconf.rb \ --replace "location = Libv8::Location::Vendor.new" \ @@ -633,7 +639,16 @@ in buildInputs = [ args.snappy ]; }; - sqlite3 = attrs: { + sqlite3 = attrs: if lib.versionAtLeast attrs.version "1.5.0" + then { + nativeBuildInputs = [ pkg-config sqlite.dev ]; + buildInputs = [ sqlite.out ]; + buildFlags = [ + "--enable-system-libraries" + "--with-pkg-config=${pkg-config}/bin/pkg-config" + ]; + } + else { buildFlags = [ "--with-sqlite3-include=${sqlite.dev}/include" "--with-sqlite3-lib=${sqlite.out}/lib" diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index 192c27682ab5..2a40c5970984 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -1,7 +1,9 @@ -{ lib, stdenv, fetchurl, bison, buildPackages }: +{ lib, stdenv, fetchurl, bison, buildPackages, pkgsBuildTarget }: let - mkJam = { meta ? { }, ... } @ args: stdenv.mkDerivation (args // { + mkJam = { pname, version, src, meta ? { } }: stdenv.mkDerivation { + inherit pname version src; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison ]; @@ -10,6 +12,23 @@ let export AR="$AR rc" ''; + # When cross-compiling, we need to set the preprocessor macros + # OSMAJOR/OSMINOR/OSPLAT to the values from the target platform, not the + # host platform. This looks a little ridiculous because the vast majority of + # build tools don't embed target-specific information into their binary, but + # in this case we behave more like a compiler than a make(1)-alike. + postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) '' + cat >>jam.h <"$1" -} cd "$(dirname "${BASH_SOURCE[0]}")" @@ -29,38 +18,5 @@ fi cd ../../../.. update-source-version omnisharp-roslyn "${new_version//v}" -store_src="$(nix-build . -A omnisharp-roslyn.src --no-out-link)" -src="$(mktemp -d /tmp/omnisharp-roslyn-src.XXX)" -cp -rT "$store_src" "$src" -chmod -R +w "$src" -trap 'rm -r "$src"' EXIT - -pushd "$src" - -export DOTNET_NOLOGO=1 -export DOTNET_CLI_TELEMETRY_OPTOUT=1 - -mkdir ./nuget_pkgs - -replaceInPlace global.json '7.0.100-preview.4.22252.9' "$SDK7_VERSION" - -# This is only needed for restore as we'll build for the runtime that is compiling the code in the nix build. -for project in src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj src/OmniSharp.LanguageServerProtocol/OmniSharp.LanguageServerProtocol.csproj; do - replaceInPlace $project \ - 'win7-x64;win7-x86;win10-arm64' \ - 'linux-x64;linux-arm64;osx-x64;osx-arm64' -done - -for project in src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj; do - dotnet restore "$project" \ - --packages ./nuget_pkgs \ - -property:PackageVersion="${new_version//v}" \ - -property:AssemblyVersion="${new_version//v}".0 \ - -property:FileVersion="${new_version//v}".0 \ - -property:InformationalVersion="${new_version//v}" \ - -property:RuntimeFrameworkVersion=6.0.0-preview.7.21317.1 \ - -property:RollForward=LatestMajor -done - -nuget-to-nix ./nuget_pkgs > "$deps_file" +$(nix-build -A omnisharp-roslyn.fetch-deps --no-out-link) "$deps_file" diff --git a/pkgs/development/tools/packcc/default.nix b/pkgs/development/tools/packcc/default.nix new file mode 100644 index 000000000000..77ad73158049 --- /dev/null +++ b/pkgs/development/tools/packcc/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchFromGitHub +, bats +, uncrustify +, testers +, packcc +}: + +stdenv.mkDerivation rec { + pname = "packcc"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "arithy"; + repo = "packcc"; + rev = "v${version}"; + hash = "sha256-T7PWM5IGly6jpGt04dh5meQjrZPUTs8VEFTQEPO5RSw="; + }; + + dontConfigure = true; + + preBuild = '' + cd build/${if stdenv.cc.isGNU then "gcc" + else if stdenv.cc.isClang then "clang" + else throw "Unsupported C compiler"} + ''; + + doCheck = true; + + checkInputs = [ bats uncrustify ]; + + preCheck = '' + patchShebangs ../../tests + + # Disable a failing test. + rm -rf ../../tests/style.d + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 release/bin/packcc $out/bin/packcc + + runHook postInstall + ''; + + passthru.tests.version = testers.testVersion { + package = packcc; + }; + + meta = with lib; { + description = "A parser generator for C"; + longDescription = '' + PackCC is a parser generator for C. Its main features are as follows: + - Generates your parser in C from a grammar described in a PEG, + - Gives your parser great efficiency by packrat parsing, + - Supports direct and indirect left-recursive grammar rules. + ''; + homepage = "https://github.com/arithy/packcc"; + changelog = "https://github.com/arithy/packcc/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/uniffi-bindgen/Cargo.lock b/pkgs/development/tools/uniffi-bindgen/Cargo.lock index 97a7addb26e1..9e0e94366983 100644 --- a/pkgs/development/tools/uniffi-bindgen/Cargo.lock +++ b/pkgs/development/tools/uniffi-bindgen/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "anyhow" -version = "1.0.58" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704" +checksum = "b9a8f622bcf6ff3df478e9deba3e03e4e04b300f8e6a139e192c05fa3490afc7" [[package]] name = "askama" @@ -45,7 +45,7 @@ dependencies = [ "askama_escape", "mime", "mime_guess", - "nom 7.1.1", + "nom", "proc-macro2", "quote", "serde", @@ -70,35 +70,32 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + [[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "bitvec" -version = "0.19.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - [[package]] name = "bytes" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b3de4a0c5e67e16066a0715723abd91edc2f9001d09c46e1dca929351e130e" +checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" [[package]] name = "camino" -version = "1.0.9" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "869119e97797867fd90f5e22af7d0bd274bd4635ebb9eb68c04f3f513ae6c412" +checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e" dependencies = [ "serde", ] @@ -133,16 +130,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "3.1.18" +version = "3.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" +checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd" dependencies = [ "atty", "bitflags", "clap_derive", "clap_lex", "indexmap", - "lazy_static", + "once_cell", "strsim", "termcolor", "textwrap", @@ -150,9 +147,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.1.18" +version = "3.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c" +checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ "heck", "proc-macro-error", @@ -172,48 +169,29 @@ dependencies = [ [[package]] name = "crate_one" -version = "0.19.3" -dependencies = [ - "anyhow", - "bytes", - "uniffi", - "uniffi_build", - "uniffi_macros", -] +version = "0.19.6" [[package]] name = "crate_two" -version = "0.19.3" +version = "0.19.6" dependencies = [ - "anyhow", - "bytes", "crate_one", - "uniffi", - "uniffi_build", - "uniffi_macros", ] [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "matches", "percent-encoding", ] [[package]] name = "fs-err" -version = "2.7.0" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bd79fa345a495d3ae89fb7165fec01c0e72f41821d642dda363a1e97975652e" - -[[package]] -name = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" +checksum = "64db3e262960f0662f43a6366788d5f10f7f244b8f7d7d987f560baf5ded5c50" [[package]] name = "glob" @@ -221,6 +199,17 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +[[package]] +name = "goblin" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143" +dependencies = [ + "log", + "plain", + "scroll", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -244,11 +233,10 @@ dependencies = [ [[package]] name = "idna" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] @@ -265,21 +253,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" [[package]] name = "libc" -version = "0.2.126" +version = "0.2.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" [[package]] name = "libloading" @@ -300,17 +282,11 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - [[package]] name = "memchr" -version = "2.3.4" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "mime" @@ -334,18 +310,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "nom" -version = "6.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c5c51b9083a3c620fa67a2a635d1ce7d95b897e957d6b28ff9a5da960a103a6" -dependencies = [ - "bitvec", - "funty", - "memchr", - "version_check", -] - [[package]] name = "nom" version = "7.1.1" @@ -358,27 +322,33 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.13.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" +checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" [[package]] name = "os_str_bytes" -version = "6.2.0" +version = "6.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" +checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" [[package]] name = "paste" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" +checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "plain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "proc-macro-error" @@ -406,57 +376,71 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" +checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" dependencies = [ "proc-macro2", ] [[package]] -name = "radium" -version = "0.5.3" +name = "ryu" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" [[package]] -name = "ryu" -version = "1.0.10" +name = "scroll" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" +checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" +dependencies = [ + "scroll_derive", +] + +[[package]] +name = "scroll_derive" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[package]] name = "semver" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1" +checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.139" +version = "1.0.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6" +checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.139" +version = "1.0.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1d3230c1de7932af58ad8ffbe1d784bd55efd5a9d84ac24f69c72d83543dfb" +checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" dependencies = [ "proc-macro2", "quote", @@ -465,9 +449,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.82" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" +checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" dependencies = [ "itoa", "ryu", @@ -488,21 +472,15 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.98" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "termcolor" version = "1.1.3" @@ -520,18 +498,18 @@ checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" [[package]] name = "thiserror" -version = "1.0.31" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +checksum = "8c1b05ca9d106ba7d2e31a9dab4a64e7be2cce415321966ea3132c49a656e252" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.31" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +checksum = "e8f2591983642de85c921015f3f070c665a197ed69e417af436115e3a1407487" dependencies = [ "proc-macro2", "quote", @@ -564,9 +542,9 @@ dependencies = [ [[package]] name = "trybuild" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "764b9e244b482a9b81bde596aa37aa6f1347bf8007adab25e59f901b32b4e0a0" +checksum = "e7f408301c7480f9e6294eb779cfc907f54bd901a9660ef24d7f233ed5376485" dependencies = [ "glob", "once_cell", @@ -594,9 +572,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" +checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" [[package]] name = "unicode-normalization" @@ -609,23 +587,24 @@ dependencies = [ [[package]] name = "uniffi" -version = "0.19.3" +version = "0.19.6" dependencies = [ "anyhow", "bytes", "camino", "cargo_metadata", - "lazy_static", "log", + "once_cell", "paste", "static_assertions", "trybuild", "uniffi_bindgen", + "uniffi_macros", ] [[package]] name = "uniffi-example-arithmetic" -version = "0.19.3" +version = "0.19.6" dependencies = [ "thiserror", "uniffi", @@ -635,7 +614,7 @@ dependencies = [ [[package]] name = "uniffi-example-callbacks" -version = "0.19.3" +version = "0.19.6" dependencies = [ "uniffi", "uniffi_build", @@ -644,7 +623,7 @@ dependencies = [ [[package]] name = "uniffi-example-custom-types" -version = "0.19.3" +version = "0.19.6" dependencies = [ "anyhow", "bytes", @@ -657,7 +636,7 @@ dependencies = [ [[package]] name = "uniffi-example-geometry" -version = "0.19.3" +version = "0.19.6" dependencies = [ "uniffi", "uniffi_build", @@ -666,7 +645,7 @@ dependencies = [ [[package]] name = "uniffi-example-rondpoint" -version = "0.19.3" +version = "0.19.6" dependencies = [ "uniffi", "uniffi_build", @@ -675,7 +654,7 @@ dependencies = [ [[package]] name = "uniffi-example-sprites" -version = "0.19.3" +version = "0.19.6" dependencies = [ "uniffi", "uniffi_build", @@ -684,9 +663,9 @@ dependencies = [ [[package]] name = "uniffi-example-todolist" -version = "0.19.3" +version = "0.19.6" dependencies = [ - "lazy_static", + "once_cell", "thiserror", "uniffi", "uniffi_build", @@ -695,10 +674,8 @@ dependencies = [ [[package]] name = "uniffi-fixture-callbacks" -version = "0.19.3" +version = "0.19.6" dependencies = [ - "lazy_static", - "thiserror", "uniffi", "uniffi_build", "uniffi_macros", @@ -706,9 +683,9 @@ dependencies = [ [[package]] name = "uniffi-fixture-coverall" -version = "0.19.3" +version = "0.19.6" dependencies = [ - "lazy_static", + "once_cell", "thiserror", "uniffi", "uniffi_build", @@ -717,7 +694,7 @@ dependencies = [ [[package]] name = "uniffi-fixture-ext-types" -version = "0.19.3" +version = "0.19.6" dependencies = [ "anyhow", "bytes", @@ -732,7 +709,7 @@ dependencies = [ [[package]] name = "uniffi-fixture-ext-types-guid" -version = "0.19.3" +version = "0.19.6" dependencies = [ "anyhow", "bytes", @@ -745,7 +722,7 @@ dependencies = [ [[package]] name = "uniffi-fixture-ext-types-lib-one" -version = "0.19.3" +version = "0.19.6" dependencies = [ "anyhow", "bytes", @@ -756,7 +733,7 @@ dependencies = [ [[package]] name = "uniffi-fixture-external-types" -version = "0.19.3" +version = "0.19.6" dependencies = [ "anyhow", "bytes", @@ -769,7 +746,7 @@ dependencies = [ [[package]] name = "uniffi-fixture-keywords-kotlin" -version = "0.19.3" +version = "0.19.6" dependencies = [ "thiserror", "uniffi", @@ -779,7 +756,7 @@ dependencies = [ [[package]] name = "uniffi-fixture-keywords-rust" -version = "0.19.3" +version = "0.19.6" dependencies = [ "thiserror", "uniffi", @@ -789,10 +766,9 @@ dependencies = [ [[package]] name = "uniffi-fixture-reexport-scaffolding-macro" -version = "0.19.3" +version = "0.19.6" dependencies = [ "cargo_metadata", - "lazy_static", "libloading", "uniffi", "uniffi-fixture-callbacks", @@ -800,13 +776,22 @@ dependencies = [ "uniffi_bindgen", ] +[[package]] +name = "uniffi-fixture-regression-callbacks-omit-labels" +version = "0.19.6" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + [[package]] name = "uniffi-fixture-regression-cdylib-dependency" -version = "0.19.3" +version = "0.19.6" [[package]] name = "uniffi-fixture-regression-cdylib-dependency-ffi-crate" -version = "0.19.3" +version = "0.19.6" dependencies = [ "uniffi", "uniffi-fixture-regression-cdylib-dependency", @@ -816,7 +801,7 @@ dependencies = [ [[package]] name = "uniffi-fixture-regression-i1015-fully-qualified-types" -version = "0.19.3" +version = "0.19.6" dependencies = [ "uniffi", "uniffi_build", @@ -825,7 +810,7 @@ dependencies = [ [[package]] name = "uniffi-fixture-regression-i356-enum-without-int-helpers" -version = "0.19.3" +version = "0.19.6" dependencies = [ "uniffi", "uniffi_build", @@ -834,7 +819,7 @@ dependencies = [ [[package]] name = "uniffi-fixture-regression-kotlin-experimental-unsigned-types" -version = "0.19.3" +version = "0.19.6" dependencies = [ "uniffi", "uniffi_build", @@ -843,7 +828,16 @@ dependencies = [ [[package]] name = "uniffi-fixture-regression-missing-newline" -version = "0.19.3" +version = "0.19.6" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-simple-fns" +version = "0.19.6" dependencies = [ "uniffi", "uniffi_build", @@ -852,7 +846,7 @@ dependencies = [ [[package]] name = "uniffi-fixture-swift-omit-argument-labels" -version = "0.19.3" +version = "0.19.6" dependencies = [ "uniffi", "uniffi_build", @@ -861,7 +855,7 @@ dependencies = [ [[package]] name = "uniffi-fixture-time" -version = "0.19.3" +version = "0.19.6" dependencies = [ "thiserror", "uniffi", @@ -871,25 +865,28 @@ dependencies = [ [[package]] name = "uniffi_bindgen" -version = "0.19.3" +version = "0.19.6" dependencies = [ "anyhow", "askama", + "bincode", "camino", - "cargo_metadata", "clap", "fs-err", + "goblin", "heck", - "lazy_static", + "once_cell", "paste", "serde", + "serde_json", "toml", + "uniffi_meta", "weedle2", ] [[package]] name = "uniffi_build" -version = "0.19.3" +version = "0.19.6" dependencies = [ "anyhow", "camino", @@ -898,48 +895,58 @@ dependencies = [ [[package]] name = "uniffi_macros" -version = "0.19.3" +version = "0.19.6" dependencies = [ + "bincode", "camino", - "glob", + "fs-err", + "once_cell", "proc-macro2", "quote", + "serde", "syn", + "toml", "uniffi_build", + "uniffi_meta", +] + +[[package]] +name = "uniffi_meta" +version = "0.19.6" +dependencies = [ + "serde", ] [[package]] name = "uniffi_testing" -version = "0.19.3" +version = "0.19.6" dependencies = [ "anyhow", "camino", "cargo_metadata", "fs-err", - "lazy_static", + "once_cell", "serde", "serde_json", ] [[package]] name = "uniffi_uitests" -version = "0.19.3" +version = "0.19.6" dependencies = [ "trybuild", "uniffi", - "uniffi_build", "uniffi_macros", ] [[package]] name = "url" -version = "2.2.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", "idna", - "matches", "percent-encoding", ] @@ -951,10 +958,10 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "weedle2" -version = "3.0.0" +version = "4.0.0" dependencies = [ "fs-err", - "nom 6.2.1", + "nom", ] [[package]] @@ -987,9 +994,3 @@ name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" diff --git a/pkgs/development/tools/uniffi-bindgen/default.nix b/pkgs/development/tools/uniffi-bindgen/default.nix index 28ecc281a14e..7b0dbb8d2450 100644 --- a/pkgs/development/tools/uniffi-bindgen/default.nix +++ b/pkgs/development/tools/uniffi-bindgen/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "uniffi-bindgen"; - version = "0.19.3"; + version = "0.19.6"; src = fetchFromGitHub { owner = "mozilla"; repo = "uniffi-rs"; rev = "v${version}"; - hash = "sha256-A6Zd1jfhoR4yW2lT5qYE3vJTpiJc94pK/XQmfE2QLFc="; + hash = "sha256-G/H0MJE0foYNY0m59+VzWBU3PGmeOb1IGmPIoD9Dpz0="; }; cargoLock.lockFile = ./Cargo.lock; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 5cdab24a76a8..a7487fb6c461 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -4,31 +4,31 @@ let aarch64-darwin = { arch = "aarch64"; shortName = "darwin"; - sha256 = "c82547d96125bf93ae76dafe203cae5f7cd50d041bfb1cf972f9f0232a0d1cc1"; + sha256 = "sha256-R17Ga4C6PSxfL1bz6IBjx0dYFmX93i0y8uqxG1eZKd4="; }; aarch64-linux = { arch = "aarch64"; shortName = "linux"; - sha256 = "3430f3ff456ee86ddb607a46ee937c9c1a02b8e4d2546de52b4493878f66afb8"; + sha256 = "sha256-KSC4gdsJZJoPjMEs+VigVuqlUDhg4sL054WRlAbB+eA="; }; x86_64-darwin = { arch = "x64"; shortName = "darwin"; - sha256 = "51fb5f29b5f00207ede11c892ccf5bb3ab437b77e7420e1c18b7fc91e02e2494"; + sha256 = "sha256-CVqFPvZScNTudE2wgUctwGDgTyaMeN8dUNmLatcKo5M="; }; x86_64-linux = { arch = "x64"; shortName = "linux"; - sha256 = "89fe00713a4e0e9f77d8842c5e07f771bd743271746fcb755c5d98cb5c00456e"; + sha256 = "sha256-N3hGPyp9wvb7jjpaFLJcdNIRyLvegjAe+MiV2aMS1nE="; }; }; dist = dists.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); in stdenvNoCC.mkDerivation rec { - version = "0.1.6"; + version = "0.1.11"; pname = "bun"; src = fetchurl { diff --git a/pkgs/games/osu-lazer/update.sh b/pkgs/games/osu-lazer/update.sh index ae130e187ccf..df1dbcc3c519 100755 --- a/pkgs/games/osu-lazer/update.sh +++ b/pkgs/games/osu-lazer/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../. -i bash -p curl jq common-updater-scripts nuget-to-nix dotnet-sdk +#!nix-shell -I nixpkgs=../../../. -i bash -p curl jq common-updater-scripts set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -18,22 +18,4 @@ if [[ "$1" != "--deps-only" ]]; then update-source-version osu-lazer "$new_version" fi -store_src="$(nix-build . -A osu-lazer.src --no-out-link)" -src="$(mktemp -d /tmp/osu-src.XXX)" -echo "Temp src dir: $src" -cp -rT "$store_src" "$src" -chmod -R +w "$src" - -pushd "$src" - -export DOTNET_NOLOGO=1 -export DOTNET_CLI_TELEMETRY_OPTOUT=1 - -mkdir ./nuget_tmp.packages -dotnet --info -dotnet restore osu.Desktop --packages ./nuget_tmp.packages --runtime linux-x64 - -nuget-to-nix ./nuget_tmp.packages > "$deps_file" - -popd -rm -r "$src" +$(nix-build . -A osu-lazer.fetch-deps --no-out-link) "$deps_file" diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index d130df696b45..b0654863faac 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, SDL, SDL2, fetchurl, gzip, libvorbis, libmad +{ lib, stdenv, SDL, SDL2, fetchurl, gzip, libvorbis, libmad, flac, libopus, opusfile, libogg, libxmp , Cocoa, CoreAudio, CoreFoundation, IOKit, OpenGL -, copyDesktopItems, makeDesktopItem +, copyDesktopItems, makeDesktopItem, pkg-config , useSDL2 ? stdenv.isDarwin # TODO: CoreAudio fails to initialize with SDL 1.x for some reason. }: @@ -20,9 +20,14 @@ stdenv.mkDerivation rec { ./quakespasm-darwin-makefile-improvements.patch ]; - nativeBuildInputs = [ copyDesktopItems ]; + nativeBuildInputs = [ + copyDesktopItems + pkg-config + ]; + buildInputs = [ - gzip libvorbis libmad (if useSDL2 then SDL2 else SDL) + gzip libvorbis libmad flac libopus opusfile libogg libxmp + (if useSDL2 then SDL2 else SDL) ] ++ lib.optionals stdenv.isDarwin [ Cocoa CoreAudio IOKit OpenGL ] ++ lib.optionals (stdenv.isDarwin && useSDL2) [ @@ -35,10 +40,11 @@ stdenv.mkDerivation rec { "USE_CODEC_WAVE=1" "USE_CODEC_MP3=1" "USE_CODEC_VORBIS=1" - "USE_CODEC_FLAC=0" - "USE_CODEC_OPUS=0" + "USE_CODEC_FLAC=1" + "USE_CODEC_OPUS=1" "USE_CODEC_MIKMOD=0" "USE_CODEC_UMX=0" + "USE_CODEC_XMP=1" "MP3LIB=mad" "VORBISLIB=vorbis" ] ++ lib.optionals useSDL2 [ diff --git a/pkgs/games/quakespasm/quakespasm-darwin-makefile-improvements.patch b/pkgs/games/quakespasm/quakespasm-darwin-makefile-improvements.patch index 0f8af7550ea4..c3098fa23d63 100644 --- a/pkgs/games/quakespasm/quakespasm-darwin-makefile-improvements.patch +++ b/pkgs/games/quakespasm/quakespasm-darwin-makefile-improvements.patch @@ -1,24 +1,26 @@ ---- a/Makefile.darwin 2021-09-12 14:42:51.000000000 +0300 -+++ b/Makefile.darwin 2021-09-12 15:09:16.000000000 +0300 -@@ -49,6 +49,7 @@ +diff --git a/Quake/Makefile.darwin b/Quake/Makefile.darwin +index 6a08e6d..4e320cd 100644 +--- a/Makefile.darwin ++++ b/Makefile.darwin +@@ -50,6 +50,7 @@ LINKER = $(CC) LIPO ?= lipo - STRIP ?= strip + STRIP ?= strip -S +PKG_CONFIG ?= pkg-config CPUFLAGS= LDFLAGS = -@@ -84,9 +85,6 @@ - USE_RPATH=1 +@@ -86,9 +87,6 @@ USE_RPATH=1 endif + CFLAGS += $(call check_gcc,-std=gnu11,) CFLAGS += $(CPUFLAGS) -ifeq ($(USE_RPATH),1) -LDFLAGS+=-Wl,-rpath,@executable_path/../Frameworks -endif - ifneq ($(DEBUG),0) DFLAGS += -DDEBUG -@@ -115,19 +113,14 @@ + CFLAGS += -g +@@ -117,19 +115,14 @@ CFLAGS += -DGL_SILENCE_DEPRECATION=1 # not relying on sdl-config command and assuming # /Library/Frameworks/SDL.framework is available SDL_CFLAGS =-D_GNU_SOURCE=1 -D_THREAD_SAFE @@ -34,42 +36,49 @@ -ifneq ($(SDL_FRAMEWORK_PATH),) -SDL_LIBS +=-F$(SDL_FRAMEWORK_PATH) -SDL_CFLAGS+=-F$(SDL_FRAMEWORK_PATH) -+SDL_CONFIG ?= sdl2-config ++SDL_CONFIG ?= sdl-config endif -SDL_LIBS +=-Wl,-framework,$(SDL_FRAMEWORK_NAME) -Wl,-framework,Cocoa +SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags) +SDL_LIBS := $(shell $(SDL_CONFIG) --libs) -+SDL_LIBS += -Wl,-framework,Cocoa ++SDL_LIBS += -Wl,-framework,Cocoa NET_LIBS := -@@ -164,38 +157,26 @@ +@@ -165,45 +158,31 @@ ifeq ($(USE_CODEC_WAVE),1) + CFLAGS+= -DUSE_CODEC_WAVE endif ifeq ($(USE_CODEC_FLAC),1) - CFLAGS+= -DUSE_CODEC_FLAC +-CFLAGS+= -DUSE_CODEC_FLAC -CODEC_INC = -I../MacOSX/codecs/include -CODEC_LINK= -L../MacOSX/codecs/lib - CODECLIBS+= -lFLAC +-CODECLIBS+= -lFLAC ++CFLAGS+= -DUSE_CODEC_FLAC $(shell $(PKG_CONFIG) --cflags flac) ++CODECLIBS+= $(shell $(PKG_CONFIG) --libs flac) endif ifeq ($(USE_CODEC_OPUS),1) -CFLAGS+= -DUSE_CODEC_OPUS -CODEC_INC = -I../MacOSX/codecs/include -CODEC_LINK= -L../MacOSX/codecs/lib -CODECLIBS+= -lopusfile -lopus -logg -+CFLAGS+= -DUSE_CODEC_OPUS $(shell $(PKG_CONFIG) --cflags opusfile) -+CODECLIBS+= $(shell $(PKG_CONFIG) --libs opusfile) ++CFLAGS+= -DUSE_CODEC_OPUS $(shell $(PKG_CONFIG) --cflags ogg opus opusfile) ++CODECLIBS+= $(shell $(PKG_CONFIG) --libs ogg opus opusfile) endif ifeq ($(USE_CODEC_VORBIS),1) - CFLAGS+= -DUSE_CODEC_VORBIS $(cpp_vorbisdec) +-CFLAGS+= -DUSE_CODEC_VORBIS $(cpp_vorbisdec) -CODEC_INC = -I../MacOSX/codecs/include -CODEC_LINK= -L../MacOSX/codecs/lib - CODECLIBS+= $(lib_vorbisdec) +-CODECLIBS+= $(lib_vorbisdec) ++CFLAGS+= -DUSE_CODEC_VORBIS $(shell $(PKG_CONFIG) --cflags ogg vorbis vorbisfile) ++CODECLIBS+= $(shell $(PKG_CONFIG) --libs ogg vorbis vorbisfile) endif ifeq ($(USE_CODEC_MP3),1) - CFLAGS+= -DUSE_CODEC_MP3 +-CFLAGS+= -DUSE_CODEC_MP3 -CODEC_INC = -I../MacOSX/codecs/include -CODEC_LINK= -L../MacOSX/codecs/lib - CODECLIBS+= $(lib_mp3dec) +-CODECLIBS+= $(lib_mp3dec) ++CFLAGS+= -DUSE_CODEC_MP3 $(shell $(PKG_CONFIG) --cflags $(MP3LIB)) ++CODECLIBS+= $(shell $(PKG_CONFIG) --libs $(MP3LIB)) endif ifeq ($(USE_CODEC_MIKMOD),1) CFLAGS+= -DUSE_CODEC_MIKMOD @@ -78,15 +87,25 @@ CODECLIBS+= -lmikmod endif ifeq ($(USE_CODEC_XMP),1) - CFLAGS+= -DUSE_CODEC_XMP +-CFLAGS+= -DUSE_CODEC_XMP -CODEC_INC = -I../MacOSX/codecs/include -CODEC_LINK= -L../MacOSX/codecs/lib - CODECLIBS+= -lxmp +-CODECLIBS+= -lxmp ++CFLAGS+= -DUSE_CODEC_XMP $(shell $(PKG_CONFIG) --cflags libxmp) ++CODECLIBS+= $(shell $(PKG_CONFIG) --libs libxmp) + endif + ifeq ($(USE_CODEC_MODPLUG),1) + CFLAGS+= -DUSE_CODEC_MODPLUG +-CODEC_INC = -I../MacOSX/codecs/include +-CODEC_LINK= -L../MacOSX/codecs/lib + CODECLIBS+= -lmodplug endif ifeq ($(USE_CODEC_UMX),1) -@@ -332,3 +313,5 @@ +@@ -333,4 +312,7 @@ debug: clean: - rm -f $(shell find . \( -name '*~' -o -name '#*#' -o -name '*.o' -o -name '*.res' -o -name $(DEFAULT_TARGET) \) -print) + $(RM) *.o *.d $(DEFAULT_TARGET) -+install: quakespasm ++install: quakespasm + install -D -m 755 quakespasm /usr/local/games/quake ++ + sinclude $(OBJS:.o=.d) diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index 1dd0fa6a2089..12938dbac89a 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "hdparm"; - version = "9.64"; + version = "9.65"; src = fetchurl { url = "mirror://sourceforge/hdparm/hdparm-${version}.tar.gz"; - sha256 = "sha256-MVuVaVHD/qAnKH3iBDgVNCF8C9Dze0k1h3/i2wyrhZo="; + sha256 = "sha256-0Ukp+RDQYJMucX6TgkJdR8LnFEI1pTcT1VqU995TWks="; }; preBuild = '' diff --git a/pkgs/os-specific/linux/kernel/genksyms-fix-segfault.patch b/pkgs/os-specific/linux/kernel/genksyms-fix-segfault.patch deleted file mode 100644 index 47ae77a5a54d..000000000000 --- a/pkgs/os-specific/linux/kernel/genksyms-fix-segfault.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c -index 88632df..ba6cfa9 100644 ---- a/scripts/genksyms/genksyms.c -+++ b/scripts/genksyms/genksyms.c -@@ -233,11 +233,11 @@ static struct symbol *__add_symbol(const char *name, enum symbol_type type, - free_list(last_enum_expr, NULL); - last_enum_expr = NULL; - enum_counter = 0; -- if (!name) -- /* Anonymous enum definition, nothing more to do */ -- return NULL; - } - -+ if (!name) -+ return NULL; -+ - h = crc32(name) % HASH_BUCKETS; - for (sym = symtab[h]; sym; sym = sym->hash_next) { - if (map_to_ns(sym->type) == map_to_ns(type) && diff --git a/pkgs/os-specific/linux/kernel/mac-nvme-t2.patch b/pkgs/os-specific/linux/kernel/mac-nvme-t2.patch deleted file mode 100644 index 2f1fa6a0daec..000000000000 --- a/pkgs/os-specific/linux/kernel/mac-nvme-t2.patch +++ /dev/null @@ -1,283 +0,0 @@ -diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c -index dd10cf78f2d3..8f006638452b 100644 ---- a/drivers/nvme/host/pci.c -+++ b/drivers/nvme/host/pci.c -@@ -28,8 +28,8 @@ - #include "trace.h" - #include "nvme.h" - --#define SQ_SIZE(depth) (depth * sizeof(struct nvme_command)) --#define CQ_SIZE(depth) (depth * sizeof(struct nvme_completion)) -+#define SQ_SIZE(q) ((q)->q_depth * sizeof(struct nvme_command)) -+#define CQ_SIZE(q) ((q)->q_depth * sizeof(struct nvme_completion)) - - #define SGES_PER_PAGE (PAGE_SIZE / sizeof(struct nvme_sgl_desc)) - -@@ -1344,16 +1344,16 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) - - static void nvme_free_queue(struct nvme_queue *nvmeq) - { -- dma_free_coherent(nvmeq->dev->dev, CQ_SIZE(nvmeq->q_depth), -+ dma_free_coherent(nvmeq->dev->dev, CQ_SIZE(nvmeq), - (void *)nvmeq->cqes, nvmeq->cq_dma_addr); - if (!nvmeq->sq_cmds) - return; - - if (test_and_clear_bit(NVMEQ_SQ_CMB, &nvmeq->flags)) { - pci_free_p2pmem(to_pci_dev(nvmeq->dev->dev), -- nvmeq->sq_cmds, SQ_SIZE(nvmeq->q_depth)); -+ nvmeq->sq_cmds, SQ_SIZE(nvmeq)); - } else { -- dma_free_coherent(nvmeq->dev->dev, SQ_SIZE(nvmeq->q_depth), -+ dma_free_coherent(nvmeq->dev->dev, SQ_SIZE(nvmeq), - nvmeq->sq_cmds, nvmeq->sq_dma_addr); - } - } -@@ -1433,12 +1433,12 @@ static int nvme_cmb_qdepth(struct nvme_dev *dev, int nr_io_queues, - } - - static int nvme_alloc_sq_cmds(struct nvme_dev *dev, struct nvme_queue *nvmeq, -- int qid, int depth) -+ int qid) - { - struct pci_dev *pdev = to_pci_dev(dev->dev); - - if (qid && dev->cmb_use_sqes && (dev->cmbsz & NVME_CMBSZ_SQS)) { -- nvmeq->sq_cmds = pci_alloc_p2pmem(pdev, SQ_SIZE(depth)); -+ nvmeq->sq_cmds = pci_alloc_p2pmem(pdev, SQ_SIZE(nvmeq)); - if (nvmeq->sq_cmds) { - nvmeq->sq_dma_addr = pci_p2pmem_virt_to_bus(pdev, - nvmeq->sq_cmds); -@@ -1447,11 +1447,11 @@ static int nvme_alloc_sq_cmds(struct nvme_dev *dev, struct nvme_queue *nvmeq, - return 0; - } - -- pci_free_p2pmem(pdev, nvmeq->sq_cmds, SQ_SIZE(depth)); -+ pci_free_p2pmem(pdev, nvmeq->sq_cmds, SQ_SIZE(nvmeq)); - } - } - -- nvmeq->sq_cmds = dma_alloc_coherent(dev->dev, SQ_SIZE(depth), -+ nvmeq->sq_cmds = dma_alloc_coherent(dev->dev, SQ_SIZE(nvmeq), - &nvmeq->sq_dma_addr, GFP_KERNEL); - if (!nvmeq->sq_cmds) - return -ENOMEM; -@@ -1465,12 +1465,13 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth) - if (dev->ctrl.queue_count > qid) - return 0; - -- nvmeq->cqes = dma_alloc_coherent(dev->dev, CQ_SIZE(depth), -+ nvmeq->q_depth = depth; -+ nvmeq->cqes = dma_alloc_coherent(dev->dev, CQ_SIZE(nvmeq), - &nvmeq->cq_dma_addr, GFP_KERNEL); - if (!nvmeq->cqes) - goto free_nvmeq; - -- if (nvme_alloc_sq_cmds(dev, nvmeq, qid, depth)) -+ if (nvme_alloc_sq_cmds(dev, nvmeq, qid)) - goto free_cqdma; - - nvmeq->dev = dev; -@@ -1479,15 +1480,14 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth) - nvmeq->cq_head = 0; - nvmeq->cq_phase = 1; - nvmeq->q_db = &dev->dbs[qid * 2 * dev->db_stride]; -- nvmeq->q_depth = depth; - nvmeq->qid = qid; - dev->ctrl.queue_count++; - - return 0; - - free_cqdma: -- dma_free_coherent(dev->dev, CQ_SIZE(depth), (void *)nvmeq->cqes, -- nvmeq->cq_dma_addr); -+ dma_free_coherent(dev->dev, CQ_SIZE(nvmeq), (void *)nvmeq->cqes, -+ nvmeq->cq_dma_addr); - free_nvmeq: - return -ENOMEM; - } -@@ -1515,7 +1515,7 @@ static void nvme_init_queue(struct nvme_queue *nvmeq, u16 qid) - nvmeq->cq_head = 0; - nvmeq->cq_phase = 1; - nvmeq->q_db = &dev->dbs[qid * 2 * dev->db_stride]; -- memset((void *)nvmeq->cqes, 0, CQ_SIZE(nvmeq->q_depth)); -+ memset((void *)nvmeq->cqes, 0, CQ_SIZE(nvmeq)); - nvme_dbbuf_init(dev, nvmeq, qid); - dev->online_queues++; - wmb(); /* ensure the first interrupt sees the initialization */ -diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index cc09b81fc7f4..716ebe87a2b8 100644 ---- a/drivers/nvme/host/core.c -+++ b/drivers/nvme/host/core.c -@@ -1986,6 +1986,7 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl, u64 cap) - ctrl->ctrl_config = NVME_CC_CSS_NVM; - ctrl->ctrl_config |= (page_shift - 12) << NVME_CC_MPS_SHIFT; - ctrl->ctrl_config |= NVME_CC_AMS_RR | NVME_CC_SHN_NONE; -+ /* Use default IOSQES. We'll update it later if needed */ - ctrl->ctrl_config |= NVME_CC_IOSQES | NVME_CC_IOCQES; - ctrl->ctrl_config |= NVME_CC_ENABLE; - -@@ -2698,6 +2699,30 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) - ctrl->hmmin = le32_to_cpu(id->hmmin); - ctrl->hmminds = le32_to_cpu(id->hmminds); - ctrl->hmmaxd = le16_to_cpu(id->hmmaxd); -+ -+ /* Grab required IO queue size */ -+ ctrl->iosqes = id->sqes & 0xf; -+ if (ctrl->iosqes < NVME_NVM_IOSQES) { -+ dev_err(ctrl->device, -+ "unsupported required IO queue size %d\n", ctrl->iosqes); -+ ret = -EINVAL; -+ goto out_free; -+ } -+ /* -+ * If our IO queue size isn't the default, update the setting -+ * in CC:IOSQES. -+ */ -+ if (ctrl->iosqes != NVME_NVM_IOSQES) { -+ ctrl->ctrl_config &= ~(0xfu << NVME_CC_IOSQES_SHIFT); -+ ctrl->ctrl_config |= ctrl->iosqes << NVME_CC_IOSQES_SHIFT; -+ ret = ctrl->ops->reg_write32(ctrl, NVME_REG_CC, -+ ctrl->ctrl_config); -+ if (ret) { -+ dev_err(ctrl->device, -+ "error updating CC register\n"); -+ goto out_free; -+ } -+ } - } - - ret = nvme_mpath_init(ctrl, id); -diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index 716a876119c8..34ef35fcd8a5 100644 ---- a/drivers/nvme/host/nvme.h -+++ b/drivers/nvme/host/nvme.h -@@ -244,6 +244,7 @@ struct nvme_ctrl { - u32 hmmin; - u32 hmminds; - u16 hmmaxd; -+ u8 iosqes; - - /* Fabrics only */ - u16 sqsize; -diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c -index 8f006638452b..54b35ea4af88 100644 ---- a/drivers/nvme/host/pci.c -+++ b/drivers/nvme/host/pci.c -@@ -28,7 +28,7 @@ - #include "trace.h" - #include "nvme.h" - --#define SQ_SIZE(q) ((q)->q_depth * sizeof(struct nvme_command)) -+#define SQ_SIZE(q) ((q)->q_depth << (q)->sqes) - #define CQ_SIZE(q) ((q)->q_depth * sizeof(struct nvme_completion)) - - #define SGES_PER_PAGE (PAGE_SIZE / sizeof(struct nvme_sgl_desc)) -@@ -162,7 +162,7 @@ static inline struct nvme_dev *to_nvme_dev(struct nvme_ctrl *ctrl) - struct nvme_queue { - struct nvme_dev *dev; - spinlock_t sq_lock; -- struct nvme_command *sq_cmds; -+ void *sq_cmds; - /* only used for poll queues: */ - spinlock_t cq_poll_lock ____cacheline_aligned_in_smp; - volatile struct nvme_completion *cqes; -@@ -178,6 +178,7 @@ struct nvme_queue { - u16 last_cq_head; - u16 qid; - u8 cq_phase; -+ u8 sqes; - unsigned long flags; - #define NVMEQ_ENABLED 0 - #define NVMEQ_SQ_CMB 1 -@@ -488,7 +489,8 @@ static void nvme_submit_cmd(struct nvme_queue *nvmeq, struct nvme_command *cmd, - bool write_sq) - { - spin_lock(&nvmeq->sq_lock); -- memcpy(&nvmeq->sq_cmds[nvmeq->sq_tail], cmd, sizeof(*cmd)); -+ memcpy(nvmeq->sq_cmds + (nvmeq->sq_tail << nvmeq->sqes), -+ cmd, sizeof(*cmd)); - if (++nvmeq->sq_tail == nvmeq->q_depth) - nvmeq->sq_tail = 0; - nvme_write_sq_db(nvmeq, write_sq); -@@ -1465,6 +1467,7 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth) - if (dev->ctrl.queue_count > qid) - return 0; - -+ nvmeq->sqes = qid ? dev->ctrl.iosqes : NVME_NVM_ADMSQES; - nvmeq->q_depth = depth; - nvmeq->cqes = dma_alloc_coherent(dev->dev, CQ_SIZE(nvmeq), - &nvmeq->cq_dma_addr, GFP_KERNEL); -diff --git a/include/linux/nvme.h b/include/linux/nvme.h -index 01aa6a6c241d..7af18965fb57 100644 ---- a/include/linux/nvme.h -+++ b/include/linux/nvme.h -@@ -141,6 +141,7 @@ enum { - * (In bytes and specified as a power of two (2^n)). - */ - #define NVME_NVM_IOSQES 6 -+#define NVME_NVM_ADMSQES 6 - #define NVME_NVM_IOCQES 4 - - enum { -diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 716ebe87a2b8..480ea24d8cf4 100644 ---- a/drivers/nvme/host/core.c -+++ b/drivers/nvme/host/core.c -@@ -2701,7 +2701,10 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) - ctrl->hmmaxd = le16_to_cpu(id->hmmaxd); - - /* Grab required IO queue size */ -- ctrl->iosqes = id->sqes & 0xf; -+ if (ctrl->quirks & NVME_QUIRK_128_BYTES_SQES) -+ ctrl->iosqes = 7; -+ else -+ ctrl->iosqes = id->sqes & 0xf; - if (ctrl->iosqes < NVME_NVM_IOSQES) { - dev_err(ctrl->device, - "unsupported required IO queue size %d\n", ctrl->iosqes); -diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index 34ef35fcd8a5..b2a78d08b984 100644 ---- a/drivers/nvme/host/nvme.h -+++ b/drivers/nvme/host/nvme.h -@@ -92,6 +92,16 @@ enum nvme_quirks { - * Broken Write Zeroes. - */ - NVME_QUIRK_DISABLE_WRITE_ZEROES = (1 << 9), -+ -+ /* -+ * Use only one interrupt vector for all queues -+ */ -+ NVME_QUIRK_SINGLE_VECTOR = (1 << 10), -+ -+ /* -+ * Use non-standard 128 bytes SQEs. -+ */ -+ NVME_QUIRK_128_BYTES_SQES = (1 << 11), - }; - - /* -diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c -index 54b35ea4af88..ab2358137419 100644 ---- a/drivers/nvme/host/pci.c -+++ b/drivers/nvme/host/pci.c -@@ -2080,6 +2080,9 @@ static int nvme_setup_irqs(struct nvme_dev *dev, unsigned int nr_io_queues) - dev->io_queues[HCTX_TYPE_DEFAULT] = 1; - dev->io_queues[HCTX_TYPE_READ] = 0; - -+ if (dev->ctrl.quirks & NVME_QUIRK_SINGLE_VECTOR) -+ irq_queues = 1; -+ - return pci_alloc_irq_vectors_affinity(pdev, 1, irq_queues, - PCI_IRQ_ALL_TYPES | PCI_IRQ_AFFINITY, &affd); - } -@@ -3037,6 +3040,9 @@ static const struct pci_device_id nvme_id_table[] = { - { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) }, - { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) }, - { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) }, -+ { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2005), -+ .driver_data = NVME_QUIRK_SINGLE_VECTOR | -+ NVME_QUIRK_128_BYTES_SQES }, - { 0, } - }; - MODULE_DEVICE_TABLE(pci, nvme_id_table); diff --git a/pkgs/os-specific/linux/kernel/p9-fixes.patch b/pkgs/os-specific/linux/kernel/p9-fixes.patch deleted file mode 100644 index f6061b60667a..000000000000 --- a/pkgs/os-specific/linux/kernel/p9-fixes.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c ---- a/fs/9p/vfs_inode.c -+++ b/fs/9p/vfs_inode.c -@@ -483,6 +483,9 @@ static int v9fs_test_inode(struct inode *inode, void *data) - - if (v9inode->qid.type != st->qid.type) - return 0; -+ -+ if (v9inode->qid.path != st->qid.path) -+ return 0; - return 1; - } - -diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c ---- a/fs/9p/vfs_inode_dotl.c -+++ b/fs/9p/vfs_inode_dotl.c -@@ -87,6 +87,9 @@ static int v9fs_test_inode_dotl(struct inode *inode, void *data) - - if (v9inode->qid.type != st->qid.type) - return 0; -+ -+ if (v9inode->qid.path != st->qid.path) -+ return 0; - return 1; - } - -diff --git a/net/9p/client.c b/net/9p/client.c -index 3ce672af1596..f1c8ad373f90 100644 ---- a/net/9p/client.c -+++ b/net/9p/client.c -@@ -749,8 +749,7 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...) - } - again: - /* Wait for the response */ -- err = wait_event_interruptible(*req->wq, -- req->status >= REQ_STATUS_RCVD); -+ err = wait_event_killable(*req->wq, req->status >= REQ_STATUS_RCVD); - - /* - * Make sure our req is coherent with regard to updates in other -diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c -index f24b25c25106..f3a4efcf1456 100644 ---- a/net/9p/trans_virtio.c -+++ b/net/9p/trans_virtio.c -@@ -286,8 +286,8 @@ p9_virtio_request(struct p9_client *client, struct p9_req_t *req) - if (err == -ENOSPC) { - chan->ring_bufs_avail = 0; - spin_unlock_irqrestore(&chan->lock, flags); -- err = wait_event_interruptible(*chan->vc_wq, -- chan->ring_bufs_avail); -+ err = wait_event_killable(*chan->vc_wq, -+ chan->ring_bufs_avail); - if (err == -ERESTARTSYS) - return err; - -@@ -327,7 +327,7 @@ static int p9_get_mapped_pages(struct virtio_chan *chan, - * Other zc request to finish here - */ - if (atomic_read(&vp_pinned) >= chan->p9_max_pages) { -- err = wait_event_interruptible(vp_wq, -+ err = wait_event_killable(vp_wq, - (atomic_read(&vp_pinned) < chan->p9_max_pages)); - if (err == -ERESTARTSYS) - return err; -@@ -471,8 +471,8 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req, - if (err == -ENOSPC) { - chan->ring_bufs_avail = 0; - spin_unlock_irqrestore(&chan->lock, flags); -- err = wait_event_interruptible(*chan->vc_wq, -- chan->ring_bufs_avail); -+ err = wait_event_killable(*chan->vc_wq, -+ chan->ring_bufs_avail); - if (err == -ERESTARTSYS) - goto err_out; - -@@ -489,8 +489,7 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req, - virtqueue_kick(chan->vq); - spin_unlock_irqrestore(&chan->lock, flags); - p9_debug(P9_DEBUG_TRANS, "virtio request kicked\n"); -- err = wait_event_interruptible(*req->wq, -- req->status >= REQ_STATUS_RCVD); -+ err = wait_event_killable(*req->wq, req->status >= REQ_STATUS_RCVD); - /* - * Non kernel buffers are pinned, unpin them - */ diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index f64a0a0ef158..f941ca9f007a 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -29,21 +29,11 @@ patch = ./request-key-helper-updated.patch; }; - p9_fixes = - { name = "p9-fixes"; - patch = ./p9-fixes.patch; - }; - modinst_arg_list_too_long = { name = "modinst-arglist-too-long"; patch = ./modinst-arg-list-too-long.patch; }; - genksyms_fix_segfault = - { name = "genksyms-fix-segfault"; - patch = ./genksyms-fix-segfault.patch; - }; - cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; hardened = let @@ -56,36 +46,6 @@ patches = lib.importJSON ./hardened/patches.json; in lib.mapAttrs mkPatch patches; - # https://bugzilla.kernel.org/show_bug.cgi?id=197591#c6 - iwlwifi_mvm_support_version_7_scan_req_umac_fw_command = rec { - name = "iwlwifi_mvm_support_version_7_scan_req_umac_fw_command"; - patch = fetchpatch { - name = name + ".patch"; - url = "https://bugzilla.kernel.org/attachment.cgi?id=260597"; - sha256 = "09096npxpgvlwdz3pb3m9brvxh7vy0xc9z9p8hh85xyczyzcsjhr"; - }; - }; - - # https://github.com/NixOS/nixpkgs/issues/42755 - xen-netfront_fix_mismatched_rtnl_unlock = rec { - name = "xen-netfront_fix_mismatched_rtnl_unlock"; - patch = fetchpatch { - name = name + ".patch"; - url = "https://github.com/torvalds/linux/commit/cb257783c2927b73614b20f915a91ff78aa6f3e8.patch"; - sha256 = "0xhblx2j8wi3kpnfpgjjwlcwdry97ji2aaq54r3zirk5g5p72zs8"; - }; - }; - - # https://github.com/NixOS/nixpkgs/issues/42755 - xen-netfront_update_features_after_registering_netdev = rec { - name = "xen-netfront_update_features_after_registering_netdev"; - patch = fetchpatch { - name = name + ".patch"; - url = "https://github.com/torvalds/linux/commit/45c8184c1bed1ca8a7f02918552063a00b909bf5.patch"; - sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv"; - }; - }; - # Adapted for Linux 5.4 from: # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=04896832c94aae4842100cafb8d3a73e1bed3a45 rtl8761b_support = @@ -97,10 +57,4 @@ name = "export-rt-sched-migrate"; patch = ./export-rt-sched-migrate.patch; }; - - # patches from https://lkml.org/lkml/2019/7/15/1748 - mac_nvme_t2 = rec { - name = "mac_nvme_t2"; - patch = ./mac-nvme-t2.patch; - }; } diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index b9342ccd4fac..ca2c38c0a1a7 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -1,5 +1,6 @@ { lib , bazel_5 +, bazel-gazelle , buildBazelPackage , fetchFromGitHub , stdenv @@ -48,6 +49,7 @@ buildBazelPackage rec { postPatch = '' sed -i 's,#!/usr/bin/env python3,#!${python3}/bin/python,' bazel/foreign_cc/luajit.patch sed -i '/javabase=/d' .bazelrc + sed -i '/"-Werror"/d' bazel/envoy_internal.bzl # Use system Python. sed -i -e '/python_interpreter_target =/d' -e '/@python3_10/d' bazel/python_dependencies.bzl @@ -81,8 +83,8 @@ buildBazelPackage rec { fetchAttrs = { sha256 = { - x86_64-linux = "0y3gpvx148bnn6kljdvkg99m681vw39l0avrhvncbf62hvpifqkw"; - aarch64-linux = "0lln5mdlskahz5hb4w268ys2ksy3051drrwlhracmk4i7rpm7fq3"; + x86_64-linux = "10f1lcn8pynqcj2hlz100zbpmawvn0f2hwpcw3m9v6v3fcs2l6pr"; + aarch64-linux = "1na7gna9563mm1y7sy34fh64f1kxz151xn26zigbi9amwcpjbav6"; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); dontUseCmakeConfigure = true; dontUseGnConfigure = true; @@ -91,20 +93,18 @@ buildBazelPackage rec { find $bazelOut/external -name requirements.bzl | while read requirements; do sed -i '/# Generated from /d' "$requirements" done - find $bazelOut/external -type f -executable | while read execbin; do - file "$execbin" | grep -q ': ELF .*, dynamically linked,' || continue - patchelf \ - --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ - "$execbin" - done # Remove references to paths in the Nix store. sed -i \ -e 's,${python3},__NIXPYTHON__,' \ -e 's,${stdenv.shellPackage},__NIXSHELL__,' \ $bazelOut/external/com_github_luajit_luajit/build.py \ - $bazelOut/external/local_config_sh/BUILD + $bazelOut/external/local_config_sh/BUILD \ + $bazelOut/external/base_pip3/BUILD.bazel + rm -r $bazelOut/external/go_sdk + rm -r $bazelOut/external/local_jdk + rm -r $bazelOut/external/bazel_gazelle_go_repository_tools/bin # Remove Unix timestamps from go cache. rm -rf $bazelOut/external/bazel_gazelle_go_repository_cache/{gocache,pkg/mod/cache,pkg/sumdb} @@ -115,6 +115,16 @@ buildBazelPackage rec { dontUseGnConfigure = true; dontUseNinjaInstall = true; preConfigure = '' + # Make executables work, for the most part. + find $bazelOut/external -type f -executable | while read execbin; do + file "$execbin" | grep -q ': ELF .*, dynamically linked,' || continue + patchelf \ + --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + "$execbin" + done + + ln -s ${bazel-gazelle}/bin $bazelOut/external/bazel_gazelle_go_repository_tools/bin + sed -i 's,#!/usr/bin/env bash,#!${stdenv.shell},' $bazelOut/external/rules_foreign_cc/foreign_cc/private/framework/toolchains/linux_commands.bzl # Add paths to Nix store back. @@ -122,7 +132,8 @@ buildBazelPackage rec { -e 's,__NIXPYTHON__,${python3},' \ -e 's,__NIXSHELL__,${stdenv.shellPackage},' \ $bazelOut/external/com_github_luajit_luajit/build.py \ - $bazelOut/external/local_config_sh/BUILD + $bazelOut/external/local_config_sh/BUILD \ + $bazelOut/external/base_pip3/BUILD.bazel ''; installPhase = '' install -Dm0755 bazel-bin/source/exe/envoy-static $out/bin/envoy @@ -137,10 +148,7 @@ buildBazelPackage rec { "-c opt" "--spawn_strategy=standalone" "--noexperimental_strict_action_env" - "--cxxopt=-Wno-maybe-uninitialized" - "--cxxopt=-Wno-uninitialized" - "--cxxopt=-Wno-error=type-limits" - "--cxxopt=-Wno-error=range-loop-construct" + "--cxxopt=-Wno-error" # Force use of system Java. "--extra_toolchains=@local_jdk//:all" @@ -148,7 +156,12 @@ buildBazelPackage rec { "--tool_java_runtime_version=local_jdk" "--define=wasm=${wasmRuntime}" - ]; + ] ++ (lib.optionals stdenv.isAarch64 [ + # external/com_github_google_tcmalloc/tcmalloc/internal/percpu_tcmalloc.h:611:9: error: expected ':' or '::' before '[' token + # 611 | : [end_ptr] "=&r"(end_ptr), [cpu_id] "=&r"(cpu_id), + # | ^ + "--define=tcmalloc=disabled" + ]); bazelFetchFlags = [ "--define=wasm=${wasmRuntime}" ]; diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix index 083d165d5ba0..6beb81b9a229 100644 --- a/pkgs/servers/http/trafficserver/default.nix +++ b/pkgs/servers/http/trafficserver/default.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { pname = "trafficserver"; - version = "9.1.2"; + version = "9.1.3"; src = fetchzip { url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2"; - sha256 = "sha256-eRpyTdwwO5EzrVpt9fF6VEYGZjHb905nQJd065wY5RU="; + sha256 = "sha256-Ihhsbn4PvIjWskmbWKajThIwtuiEyldBpmtuQ8RdyHA="; }; patches = [ @@ -64,8 +64,6 @@ stdenv.mkDerivation rec { url = "https://github.com/apache/trafficserver/commit/19d3af481cf74c91fbf713fc9d2f8b138ed5fbaf.diff"; sha256 = "0z1ikgpp00rzrrcqh97931586yn9wbksgai9xlkcjd5cg8gq0150"; }) - - ./fix-catch2-version-incompatibility.patch ]; # NOTE: The upstream README indicates that flex is needed for some features, diff --git a/pkgs/servers/http/trafficserver/fix-catch2-version-incompatibility.patch b/pkgs/servers/http/trafficserver/fix-catch2-version-incompatibility.patch deleted file mode 100644 index 248f9d4ef31a..000000000000 --- a/pkgs/servers/http/trafficserver/fix-catch2-version-incompatibility.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/src/tscore/unit_tests/test_History.cc b/src/tscore/unit_tests/test_History.cc -index 3e699139da0..7505f10aa4c 100644 ---- a/src/tscore/unit_tests/test_History.cc -+++ b/src/tscore/unit_tests/test_History.cc -@@ -59,10 +59,10 @@ TEST_CASE("History", "[libts][History]") - REQUIRE(history[2].reentrancy == static_cast(NO_REENTRANT)); - - history[0].location.str(buf, sizeof(buf)); -- REQUIRE(string_view{buf} == "test_History.cc:48 (____C_A_T_C_H____T_E_S_T____0)"); -+ REQUIRE(string_view{buf} == "test_History.cc:48 (C_A_T_C_H_T_E_S_T_0)"); - - history[1].location.str(buf, sizeof(buf)); -- REQUIRE(string_view{buf} == "test_History.cc:49 (____C_A_T_C_H____T_E_S_T____0)"); -+ REQUIRE(string_view{buf} == "test_History.cc:49 (C_A_T_C_H_T_E_S_T_0)"); - - ts::LocalBufferWriter<128> w; - SM *sm = new SM; -@@ -71,10 +71,10 @@ TEST_CASE("History", "[libts][History]") - SM_REMEMBER(sm, 3, NO_REENTRANT); - - w.print("{}", sm->history[0].location); -- REQUIRE(w.view() == "test_History.cc:69 (____C_A_T_C_H____T_E_S_T____0)"); -+ REQUIRE(w.view() == "test_History.cc:69 (C_A_T_C_H_T_E_S_T_0)"); - - w.reset().print("{}", sm->history[1].location); -- REQUIRE(w.view() == "test_History.cc:70 (____C_A_T_C_H____T_E_S_T____0)"); -+ REQUIRE(w.view() == "test_History.cc:70 (C_A_T_C_H_T_E_S_T_0)"); - - REQUIRE(sm->history[0].event == 1); - REQUIRE(sm->history[0].reentrancy == 1); -@@ -106,10 +106,10 @@ TEST_CASE("History", "[libts][History]") - REQUIRE(sm2->history.overflowed() == true); - - w.reset().print("{}", sm2->history[0].location); -- REQUIRE(w.view() == "test_History.cc:103 (____C_A_T_C_H____T_E_S_T____0)"); -+ REQUIRE(w.view() == "test_History.cc:103 (C_A_T_C_H_T_E_S_T_0)"); - - w.reset().print("{}", sm2->history[1].location); -- REQUIRE(w.view() == "test_History.cc:98 (____C_A_T_C_H____T_E_S_T____0)"); -+ REQUIRE(w.view() == "test_History.cc:98 (C_A_T_C_H_T_E_S_T_0)"); - - sm2->history.clear(); - REQUIRE(sm2->history.size() == 0); diff --git a/pkgs/servers/icingaweb2/ipl.nix b/pkgs/servers/icingaweb2/ipl.nix index 9d21951a299f..8159b97686e5 100644 --- a/pkgs/servers/icingaweb2/ipl.nix +++ b/pkgs/servers/icingaweb2/ipl.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2-ipl"; - version = "0.8.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "Icinga"; repo = "icinga-php-library"; rev = "v${version}"; - sha256 = "sha256:0ndd4gd26rglbz85izfvqc4ghcfa7wpq6ghrhggbzg819phndg5a"; + sha256 = "sha256-nwS7mK46KSBNHdjIfzUMR4xFcHJjpNXhLYBdM7TwgNQ="; }; installPhase = '' diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index c864a1f77697..469423021d34 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -36,13 +36,12 @@ buildDotnetModule rec { ln -s $out/bin/jackett $out/bin/Jackett || : ln -s $out/bin/Jackett $out/bin/jackett || : ''; + passthru.updateScript = ./updater.sh; meta = with lib; { description = "API Support for your favorite torrent trackers"; homepage = "https://github.com/Jackett/Jackett/"; license = licenses.gpl2Only; maintainers = with maintainers; [ edwtjo nyanloutre purcell ]; - platforms = platforms.all; }; - passthru.updateScript = ./updater.sh; } diff --git a/pkgs/servers/jackett/updater.sh b/pkgs/servers/jackett/updater.sh index 9de6ae3ef46a..d39452d2afc6 100755 --- a/pkgs/servers/jackett/updater.sh +++ b/pkgs/servers/jackett/updater.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts nuget-to-nix dotnet-sdk_6 +#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -15,23 +15,4 @@ fi cd ../../.. update-source-version jackett "${new_version//v}" -store_src="$(nix-build . -A jackett.src --no-out-link)" -src="$(mktemp -d /tmp/jackett-src.XXX)" -cp -rT "$store_src" "$src" -chmod -R +w "$src" - -pushd "$src" - -export DOTNET_NOLOGO=1 -export DOTNET_CLI_TELEMETRY_OPTOUT=1 - -mkdir ./nuget_pkgs - -for project in src/Jackett.Server/Jackett.Server.csproj src/Jackett.Test/Jackett.Test.csproj; do - dotnet restore "$project" --packages ./nuget_pkgs -done - -nuget-to-nix ./nuget_pkgs > "$deps_file" - -popd -rm -r "$src" +$(nix-build -A jackett.fetch-deps --no-out-link) "$deps_file" diff --git a/pkgs/servers/jellyfin/update.sh b/pkgs/servers/jellyfin/update.sh index f852bc878487..bbced42742c9 100755 --- a/pkgs/servers/jellyfin/update.sh +++ b/pkgs/servers/jellyfin/update.sh @@ -1,11 +1,8 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts dotnetCorePackages.sdk_6_0 nuget-to-nix gnused nix coreutils findutils +#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts gnused nix coreutils set -euo pipefail -export DOTNET_CLI_TELEMETRY_OPTOUT=1 -export DOTNET_NOLOGO=1 - latestVersion="$(curl -s "https://api.github.com/repos/jellyfin/jellyfin/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')" currentVersion=$(nix-instantiate --eval -E "with import ./. {}; jellyfin.version or (lib.getVersion jellyfin)" | tr -d '"') @@ -20,22 +17,4 @@ popd update-source-version jellyfin "$latestVersion" -store_src="$(nix-build . -A jellyfin.src --no-out-link)" -src="$(mktemp -d /tmp/jellyfin-src.XXX)" -echo "Temp src dir: $src" -cp -rT "$store_src" "$src" -chmod -R +w "$src" - -pushd "$src" - -mkdir ./nuget_tmp.packages - -dotnet restore Jellyfin.Server --packages ./nuget_tmp.packages --runtime linux-x86 -dotnet restore Jellyfin.Server --packages ./nuget_tmp.packages --runtime linux-x64 -dotnet restore Jellyfin.Server --packages ./nuget_tmp.packages --runtime linux-arm -dotnet restore Jellyfin.Server --packages ./nuget_tmp.packages --runtime linux-arm64 - -nuget-to-nix ./nuget_tmp.packages > "$nugetDepsFile" - -popd -rm -r "$src" +$(nix-build . -A jellyfin.fetch-deps --no-out-link) "$nugetDepsFile" diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index aa86b1159db7..26b6ca78e1c3 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.42.0"; + version = "2.43.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - hash = "sha256-BfHqVuTjgcObJm6bFwlXgHdcc1IalpY9opTamHqB0Zs="; + hash = "sha256-swJzMZDBxof8RLMxVZN79zxajMO7kuxZxD8gNpgSksI="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/nosql/mongodb/4.4.nix b/pkgs/servers/nosql/mongodb/4.4.nix index 7dd74e24fc48..9db11e21619b 100644 --- a/pkgs/servers/nosql/mongodb/4.4.nix +++ b/pkgs/servers/nosql/mongodb/4.4.nix @@ -10,5 +10,6 @@ buildMongoDB { sha256 = "sha256-ebg3R6P+tjRvizDzsl7mZzhTfqIaRJPfHBu0IfRvtS8="; patches = [ ./forget-build-dependencies-4-4.patch + ./fix-build-with-boost-1.79-4_4.patch ] ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-4.patch ]; } diff --git a/pkgs/servers/nosql/mongodb/5.0.nix b/pkgs/servers/nosql/mongodb/5.0.nix index 6bb2294cfffa..cd25525f4fe6 100644 --- a/pkgs/servers/nosql/mongodb/5.0.nix +++ b/pkgs/servers/nosql/mongodb/5.0.nix @@ -21,5 +21,7 @@ buildMongoDB { patches = [ ./forget-build-dependencies-4-4.patch ./asio-no-experimental-string-view-4-4.patch + ./fix-build-with-boost-1.79-5_0.patch + ./fix-gcc-Wno-exceptions-5.0.patch ]; } diff --git a/pkgs/servers/nosql/mongodb/fix-build-with-boost-1.79-4_4.patch b/pkgs/servers/nosql/mongodb/fix-build-with-boost-1.79-4_4.patch new file mode 100644 index 000000000000..fe1eb4aa3609 --- /dev/null +++ b/pkgs/servers/nosql/mongodb/fix-build-with-boost-1.79-4_4.patch @@ -0,0 +1,91 @@ +From 9a4c7b33e49cdf121ff9dee858539568d009fc27 Mon Sep 17 00:00:00 2001 +From: Et7f3 +Date: Tue, 19 Jul 2022 22:11:11 +0200 +Subject: [PATCH] build: Upgrade boost to 1.79.0 + +We can see in src/third_party/boost-1.70.0/boost/version.hpp that vendored +version of boost is BOOST_LIB_VERSION "1_70" + +We can also see the doc desbribe 2 headers to use filesystems lib: One is +src/third_party/boost/boost/filesystem/fstream.hpp that contains (175-177) + typedef basic_ifstream ifstream; + typedef basic_ofstream ofstream; + typedef basic_fstream fstream; + +So this mean they mostly forgot to include a header and include-what-you-use +would catch this error. + +In upstream they fixed in a simmilar way +https://github.com/mongodb/mongo/commit/13389dc222fc372442be8c147e09685bb9a26a3a +--- + src/mongo/db/storage/storage_repair_observer.cpp | 1 + + src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp | 1 + + src/mongo/shell/shell_utils_extended.cpp | 1 + + src/mongo/util/processinfo_linux.cpp | 2 +- + src/mongo/util/stacktrace_threads.cpp | 1 + + 5 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/mongo/db/storage/storage_repair_observer.cpp b/src/mongo/db/storage/storage_repair_observer.cpp +index 22b76a6a39c..453f48229cd 100644 +--- a/src/mongo/db/storage/storage_repair_observer.cpp ++++ b/src/mongo/db/storage/storage_repair_observer.cpp +@@ -42,6 +42,7 @@ + #endif + + #include ++#include + + #include "mongo/db/dbhelpers.h" + #include "mongo/db/operation_context.h" +diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp +index 85121941458..7464022fb28 100644 +--- a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp ++++ b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp +@@ -37,6 +37,7 @@ + + #include + #include ++#include + + #include "mongo/base/simple_string_data_comparator.h" + #include "mongo/bson/bsonobjbuilder.h" +diff --git a/src/mongo/shell/shell_utils_extended.cpp b/src/mongo/shell/shell_utils_extended.cpp +index 8cd7f035f1d..cd672eb513f 100644 +--- a/src/mongo/shell/shell_utils_extended.cpp ++++ b/src/mongo/shell/shell_utils_extended.cpp +@@ -37,6 +37,7 @@ + #endif + + #include ++#include + #include + + #include "mongo/bson/bson_validate.h" +diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp +index de4b84bca5a..7fa9d5d128e 100644 +--- a/src/mongo/util/processinfo_linux.cpp ++++ b/src/mongo/util/processinfo_linux.cpp +@@ -33,7 +33,7 @@ + + #include "processinfo.h" + +-#include ++#include + #include + #include + #include +diff --git a/src/mongo/util/stacktrace_threads.cpp b/src/mongo/util/stacktrace_threads.cpp +index 4667a261ab7..73a36015bd6 100644 +--- a/src/mongo/util/stacktrace_threads.cpp ++++ b/src/mongo/util/stacktrace_threads.cpp +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.32.1 (Apple Git-133) + diff --git a/pkgs/servers/nosql/mongodb/fix-build-with-boost-1.79-5_0.patch b/pkgs/servers/nosql/mongodb/fix-build-with-boost-1.79-5_0.patch new file mode 100644 index 000000000000..d00ed5e77d67 --- /dev/null +++ b/pkgs/servers/nosql/mongodb/fix-build-with-boost-1.79-5_0.patch @@ -0,0 +1,90 @@ +From fb846bdbd07cc3b8ada6179dccd974072c2b69da Mon Sep 17 00:00:00 2001 +From: Et7f3 +Date: Tue, 19 Jul 2022 22:01:56 +0200 +Subject: [PATCH] build: Upgrade boost to 1.79.0 + +We can see in src/third_party/boost/boost/version.hpp that vendored version of +boost is BOOST_LIB_VERSION "1_76" + +We can also see the doc desbribe 2 headers to use filesystems lib: One is +src/third_party/boost/boost/filesystem/fstream.hpp that contains (175-177) + typedef basic_ifstream ifstream; + typedef basic_ofstream ofstream; + typedef basic_fstream fstream; + +So this mean they mostly forgot to include a header and include-what-you-use +would catch this error. + +In upstream they fixed in a simmilar way +https://github.com/mongodb/mongo/commit/13389dc222fc372442be8c147e09685bb9a26a3a +--- + src/mongo/db/storage/storage_repair_observer.cpp | 1 + + src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp | 1 + + src/mongo/shell/shell_utils_extended.cpp | 1 + + src/mongo/util/processinfo_linux.cpp | 1 + + src/mongo/util/stacktrace_threads.cpp | 1 + + 5 files changed, 5 insertions(+) + +diff --git a/src/mongo/db/storage/storage_repair_observer.cpp b/src/mongo/db/storage/storage_repair_observer.cpp +index 22b76a6a39c..453f48229cd 100644 +--- a/src/mongo/db/storage/storage_repair_observer.cpp ++++ b/src/mongo/db/storage/storage_repair_observer.cpp +@@ -42,6 +42,7 @@ + #endif + + #include ++#include + + #include "mongo/db/dbhelpers.h" + #include "mongo/db/operation_context.h" +diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp +index 07fabadd634..2924a2c74af 100644 +--- a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp ++++ b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp +@@ -37,6 +37,7 @@ + + #include + #include ++#include + + #include "mongo/base/simple_string_data_comparator.h" + #include "mongo/bson/bsonobjbuilder.h" +diff --git a/src/mongo/shell/shell_utils_extended.cpp b/src/mongo/shell/shell_utils_extended.cpp +index fbdddc1318d..e37d4c93a11 100644 +--- a/src/mongo/shell/shell_utils_extended.cpp ++++ b/src/mongo/shell/shell_utils_extended.cpp +@@ -37,6 +37,7 @@ + #endif + + #include ++#include + #include + #include + +diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp +index eae0e9b7764..d5cd40f6039 100644 +--- a/src/mongo/util/processinfo_linux.cpp ++++ b/src/mongo/util/processinfo_linux.cpp +@@ -52,6 +52,7 @@ + #endif + + #include ++#include + #include + #include + #include +diff --git a/src/mongo/util/stacktrace_threads.cpp b/src/mongo/util/stacktrace_threads.cpp +index d2ee29d24b4..d485fa22367 100644 +--- a/src/mongo/util/stacktrace_threads.cpp ++++ b/src/mongo/util/stacktrace_threads.cpp +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.32.1 (Apple Git-133) + diff --git a/pkgs/servers/nosql/mongodb/fix-gcc-Wno-exceptions-5.0.patch b/pkgs/servers/nosql/mongodb/fix-gcc-Wno-exceptions-5.0.patch new file mode 100644 index 000000000000..b8803911968b --- /dev/null +++ b/pkgs/servers/nosql/mongodb/fix-gcc-Wno-exceptions-5.0.patch @@ -0,0 +1,44 @@ +From e78b2bf6eaa0c43bd76dbb841add167b443d2bb0 Mon Sep 17 00:00:00 2001 +From: Mark Benvenuto +Date: Mon, 21 Jun 2021 11:36:56 -0400 +Subject: [PATCH] SERVER-57688 Fix debug gcc 11 and clang 12 builds on Fedora + 34 + +--- + SConstruct | 4 ---- + src/mongo/db/query/plan_summary_stats.h | 4 +++- + src/mongo/util/shim_boost_assert.cpp | 1 + + 3 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 25fd4a248d0c..23cff6f9da53 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -3108,10 +3108,6 @@ def doConfigure(myenv): + # harmful to capture unused variables we are suppressing for now with a plan to fix later. + AddToCCFLAGSIfSupported(myenv, "-Wno-unused-lambda-capture") + +- # This warning was added in clang-5 and incorrectly flags our implementation of +- # exceptionToStatus(). See https://bugs.llvm.org/show_bug.cgi?id=34804 +- AddToCCFLAGSIfSupported(myenv, "-Wno-exceptions") +- + # Enable sized deallocation support. + AddToCXXFLAGSIfSupported(myenv, '-fsized-deallocation') + +diff --git a/src/mongo/db/query/plan_summary_stats.h b/src/mongo/db/query/plan_summary_stats.h +index 58677ab20d25..cfaa2053d16f 100644 +--- a/src/mongo/db/query/plan_summary_stats.h ++++ b/src/mongo/db/query/plan_summary_stats.h +@@ -29,9 +29,11 @@ + + #pragma once + +-#include "mongo/util/container_size_helper.h" ++#include + #include + ++#include "mongo/util/container_size_helper.h" ++ + namespace mongo { + + /** diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index 28795890069d..82837e87d1a6 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -70,8 +70,16 @@ in stdenv.mkDerivation rec { # fix environment variable reading substituteInPlace SConstruct \ --replace "env = Environment(" "env = Environment(ENV = os.environ," + '' + lib.optionalString (versionAtLeast version "4.4" && versionOlder version "4.6") '' + # Fix debug gcc 11 and clang 12 builds on Fedora + # https://github.com/mongodb/mongo/commit/e78b2bf6eaa0c43bd76dbb841add167b443d2bb0.patch + substituteInPlace src/mongo/db/query/plan_summary_stats.h --replace '#include ' '#include + #include ' + substituteInPlace src/mongo/db/exec/plan_stats.h --replace '#include ' '#include + #include ' '' + lib.optionalString stdenv.isDarwin '' substituteInPlace src/third_party/mozjs-${variants.mozjsVersion}/extract/js/src/jsmath.cpp --replace '${variants.mozjsReplace}' 0 + '' + lib.optionalString (stdenv.isDarwin && versionOlder version "3.6") '' substituteInPlace src/third_party/s2/s1angle.cc --replace drem remainder substituteInPlace src/third_party/s2/s1interval.cc --replace drem remainder substituteInPlace src/third_party/s2/s2cap.cc --replace drem remainder diff --git a/pkgs/servers/nosql/mongodb/v3_6.nix b/pkgs/servers/nosql/mongodb/v3_6.nix index 4fc9e3ea9062..9a6379fac440 100644 --- a/pkgs/servers/nosql/mongodb/v3_6.nix +++ b/pkgs/servers/nosql/mongodb/v3_6.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }: +{ stdenv, callPackage, fetchpatch, lib, sasl, boost, Security, CoreFoundation, cctools }: let buildMongoDB = callPackage ./mongodb.nix { @@ -12,5 +12,11 @@ in buildMongoDB { version = "3.6.23"; sha256 = "sha256-EJpIerW4zcGJvHfqJ65fG8yNsLRlUnRkvYfC+jkoFJ4="; patches = [ ./forget-build-dependencies.patch ] - ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ]; + ++ lib.optionals stdenv.isDarwin [ + (fetchpatch { + name = "fix double link of isNamedError."; + url = "https://github.com/mongodb/mongo/commit/9c6751b9765d269b667324bb2efe1ca76a916d20.patch"; + sha256 = "sha256-4mcafqhBh7039ocEI9d/gXWck51X68PqtWtz4dapwwI="; + }) + ]; } diff --git a/pkgs/servers/nosql/mongodb/v4_0.nix b/pkgs/servers/nosql/mongodb/v4_0.nix index 9d28a9185ba1..1235123c94a2 100644 --- a/pkgs/servers/nosql/mongodb/v4_0.nix +++ b/pkgs/servers/nosql/mongodb/v4_0.nix @@ -21,5 +21,11 @@ in buildMongoDB { sha256 = "sha256-RvfCP462RG+ZVjcb23DgCuxCdfPl2/UgH8N7FgCghGI="; }) ] - ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ]; + ++ lib.optionals stdenv.isDarwin [ + (fetchpatch { + name = "fix double link of isNamedError."; + url = "https://github.com/mongodb/mongo/commit/9c6751b9765d269b667324bb2efe1ca76a916d20.patch"; + sha256 = "sha256-4mcafqhBh7039ocEI9d/gXWck51X68PqtWtz4dapwwI="; + }) + ]; } diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index e849d6c86add..385f7147b807 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -16,14 +16,14 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-VUJgf0gxOJH6RKUN5pODxoT6MM4fX43CSApRCDvPjjU="; - arm64-linux_hash = "sha256-rZM9r9CCcB0Q468w4Q5CuTeQS6hmFPCSv/DJ/SPm4Tw="; - x64-osx_hash = "sha256-RjeuINFgtqKcKF6I8K+l9CbYTRKagepZGT3fOLXDtJE="; + x64-linux_hash = "sha256-t5KjzB+dJGNr80mbRRlGvzuC6NvicyScoVeCygzjKeA="; + arm64-linux_hash = "sha256-wj1B573MgLZee3pjzbDyYsEYQ6fIyWQkYQnAbV6IW2Q="; + x64-osx_hash = "sha256-sbaWK5FK9luSpra/8aujd02/8Z1LOKkAm5eAghT6LJk="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "prowlarr"; - version = "0.4.4.1947"; + version = "0.4.5.1960"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/sickbeard/patches/override-python-version-check.patch b/pkgs/servers/sickbeard/patches/override-python-version-check.patch new file mode 100644 index 000000000000..95c6970e0a07 --- /dev/null +++ b/pkgs/servers/sickbeard/patches/override-python-version-check.patch @@ -0,0 +1,28 @@ +From e97f418803c1db9a753fa755a9ee0cf04eabaed3 Mon Sep 17 00:00:00 2001 +From: rembo10 +Date: Sun, 11 Sep 2022 13:00:29 +0530 +Subject: [PATCH] Allow running on unsupported Python versions + +--- + sickgear.py | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/sickgear.py b/sickgear.py +index 9d0440bb..6d65e65d 100755 +--- a/sickgear.py ++++ b/sickgear.py +@@ -43,10 +43,7 @@ versions = [((2, 7, 9), (2, 7, 18)), ((3, 7, 1), (3, 8, 14)), + ((3, 9, 0), (3, 9, 2)), ((3, 9, 4), (3, 9, 14)), + ((3, 10, 0), (3, 10, 7))] # inclusive version ranges + if not any(list(map(lambda v: v[0] <= sys.version_info[:3] <= v[1], versions))) and not int(os.environ.get('PYT', 0)): +- print('Python %s.%s.%s detected.' % sys.version_info[:3]) +- print('Sorry, SickGear requires a Python version %s' % ', '.join(map( +- lambda r: '%s - %s' % tuple(map(lambda v: str(v).replace(',', '.')[1:-1], r)), versions))) +- sys.exit(1) ++ pass + + sys.path.insert(1, os.path.abspath(os.path.join(os.path.dirname(__file__), 'lib'))) + is_win = 'win' == sys.platform[0:3] +-- +2.37.2 + diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index c1c3c6dc05bf..5ad9f457c18b 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -1,23 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, python3, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, python3, makeWrapper, libarchive }: let - pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 ]); + pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.25.35"; + version = "0.25.40"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "0hc43wfa256nkjm7bvsr6b7xsyilm1ks4x16kvpprqmj1symlkz3"; + sha256 = "sha256-AHV/HSKuVWZFdZdkFp9p7okAcFO40d9OqV20MaHKXaU="; }; + patches = [ + ./patches/override-python-version-check.patch + ]; + dontBuild = true; doCheck = false; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ pythonEnv ]; + buildInputs = [ pythonEnv libarchive ]; postPatch = '' substituteInPlace sickgear.py --replace "/usr/bin/env python2" "/usr/bin/env python" diff --git a/pkgs/servers/web-apps/baget/default.nix b/pkgs/servers/web-apps/baget/default.nix index d19bb2906b35..18176c89bba7 100644 --- a/pkgs/servers/web-apps/baget/default.nix +++ b/pkgs/servers/web-apps/baget/default.nix @@ -23,7 +23,6 @@ buildDotnetModule rec { description = "A lightweight NuGet and symbol server"; license = licenses.mit; homepage = "https://loic-sharma.github.io/BaGet/"; - platforms = platforms.all; maintainers = [ maintainers.abbradar ]; }; } diff --git a/pkgs/servers/web-apps/baget/updater.sh b/pkgs/servers/web-apps/baget/updater.sh index 60f780e2a805..65b8ab093ea9 100755 --- a/pkgs/servers/web-apps/baget/updater.sh +++ b/pkgs/servers/web-apps/baget/updater.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p gnused jq common-updater-scripts nuget-to-nix dotnet-sdk_3 nix-prefetch-github +#!nix-shell -I nixpkgs=./. -i bash -p gnused jq common-updater-scripts nix-prefetch-github set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -21,20 +21,4 @@ rm repo_info pushd ../../../.. update-source-version baget "$new_version" "$new_hash" -store_src="$(nix-build -A baget.src --no-out-link)" -src="$(mktemp -d /tmp/baget-src.XXX)" -cp -rT "$store_src" "$src" - -trap 'rm -r "$src"' EXIT - -chmod -R +w "$src" - -pushd "$src" - -export DOTNET_NOLOGO=1 -export DOTNET_CLI_TELEMETRY_OPTOUT=1 - -mkdir ./nuget_pkgs -dotnet restore src/BaGet/BaGet.csproj --packages ./nuget_pkgs - -nuget-to-nix ./nuget_pkgs > "$deps_file" +$(nix-build -A baget.fetch-deps --no-out-link) "$deps_file" diff --git a/pkgs/test/coq/default.nix b/pkgs/test/coq/default.nix new file mode 100644 index 000000000000..cf59dd473b4c --- /dev/null +++ b/pkgs/test/coq/default.nix @@ -0,0 +1,6 @@ +{ lib, callPackage }: + +lib.recurseIntoAttrs { + overrideCoqDerivation = callPackage ./overrideCoqDerivation { }; +} + diff --git a/pkgs/test/coq/overrideCoqDerivation/default.nix b/pkgs/test/coq/overrideCoqDerivation/default.nix new file mode 100644 index 000000000000..c251c498e609 --- /dev/null +++ b/pkgs/test/coq/overrideCoqDerivation/default.nix @@ -0,0 +1,40 @@ +{ lib, coq, mkCoqPackages, runCommand }: + +let + + # This is just coq, but with dontFilter set to true. We need to set + # dontFilter to true here so that _all_ packages are visibile in coqPackages. + # There may be some versions of the top-level coq and coqPackages that don't + # build QuickChick, which is what we are using for this test below. + coqWithAllPackages = coq // { dontFilter = true; }; + + coqPackages = mkCoqPackages coqWithAllPackages; + + # This is the main test. This uses overrideCoqDerivation to + # override arguments to mkCoqDerivation. + # + # Here, we override the defaultVersion and release arguments to + # mkCoqDerivation. + overriddenQuickChick = + coqPackages.lib.overrideCoqDerivation + { + defaultVersion = "9999"; + release."9999".sha256 = lib.fakeSha256; + } + coqPackages.QuickChick; +in + +runCommand + "coq-overrideCoqDerivation-test-0.1" + { meta.maintainers = with lib.maintainers; [cdepillabout]; } + '' + # Confirm that the computed version number for the overridden QuickChick does + # actually become 9999, as set above. + if [ "${overriddenQuickChick.version}" -eq "9999" ]; then + echo "overriddenQuickChick version was successfully set to 9999" + touch $out + else + echo "ERROR: overriddenQuickChick version was supposed to be 9999, but was actually: ${overriddenQuickChick.version}" + exit 1 + fi + '' diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 82975efb5917..2638bbc37e6b 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -75,6 +75,8 @@ with pkgs; dhall = callPackage ./dhall { }; + coq = callPackage ./coq {}; + makeWrapper = callPackage ./make-wrapper { }; makeBinaryWrapper = callPackage ./make-binary-wrapper { makeBinaryWrapper = pkgs.makeBinaryWrapper.override { diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix index e43e4e1947d9..5f04e4b46ace 100644 --- a/pkgs/tools/X11/opentabletdriver/default.nix +++ b/pkgs/tools/X11/opentabletdriver/default.nix @@ -115,7 +115,7 @@ buildDotnetModule rec { homepage = "https://github.com/OpenTabletDriver/OpenTabletDriver"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ thiagokokada ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "otd"; }; } diff --git a/pkgs/tools/X11/opentabletdriver/update.sh b/pkgs/tools/X11/opentabletdriver/update.sh index 1524a9950166..322350415e7a 100755 --- a/pkgs/tools/X11/opentabletdriver/update.sh +++ b/pkgs/tools/X11/opentabletdriver/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused jq common-updater-scripts nuget-to-nix dotnet-sdk_6 dotnet-sdk_5 +#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq common-updater-scripts set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -23,20 +23,4 @@ sed -i ./default.nix -re "s|\"$oldDebSha256\"|\"$newDebSha256\"|" pushd ../../../.. update-source-version opentabletdriver "$new_version" -store_src="$(nix-build -A opentabletdriver.src --no-out-link)" -src="$(mktemp -d /tmp/opentabletdriver-src.XXX)" -cp -rT "$store_src" "$src" -chmod -R +w "$src" - -pushd "$src" -trap "rm -rf $src" EXIT - -export DOTNET_NOLOGO=1 -export DOTNET_CLI_TELEMETRY_OPTOUT=1 - -mkdir ./nuget_pkgs -for project in OpenTabletDriver.{Console,Daemon,UX.Gtk,Tests}; do - dotnet restore $project --packages ./nuget_pkgs -done - -nuget-to-nix ./nuget_pkgs > "$deps_file" +$(nix-build -A opentabletdriver.fetch-deps --no-out-link) "$deps_file" diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix index 02d75ac629c8..65c850fdca91 100644 --- a/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-credential-gcr"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; rev = "v${version}"; - sha256 = "sha256-NUFSnegLVGNUc6f/WSyIk1U6UQorxRykqojhgE/maw8="; + sha256 = "sha256-SdVAq/i5J21EoCHVrYL0y6zJxlElZRsGoKGJupZN94w="; }; patches = [ diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index 93f94ff04e0c..7b4f2b05b70f 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.10.21"; + version = "0.10.22"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - sha256 = "sha256-p9q0NVk+7jZ/DKxDjvvlfRKW9N1bk5jquxxQHmNE/3s="; + sha256 = "sha256-9Vl4FWmKaNWl5QcfFc5KDyLWMRmAEqkBwMqwqhXkjgo="; }; - vendorSha256 = "sha256-DRrf7VR1w35KRwokcDIBYr0pPmNREXiATRu4Cc+xegk="; + vendorSha256 = "sha256-10QeWL3tIcs2E4pK9UAY8C41YYjA3LHlvIbDhWVYATE="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index a63cdcda7cb8..136be31d8b81 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "1.6.4"; + version = "1.7.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-2kQ+KO69RxpIQkrkD6n7l9ti9ITwdpHYK7LuXYUo3ck="; + sha256 = "sha256-0o2tKg7BfhkNt/k8XdZ1agaSJxKO5OxB5aaRgV9IPeU="; }; checkInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ]; diff --git a/pkgs/tools/backup/discordchatexporter-cli/updater.sh b/pkgs/tools/backup/discordchatexporter-cli/updater.sh index c33b318d25b1..6628cceaa958 100755 --- a/pkgs/tools/backup/discordchatexporter-cli/updater.sh +++ b/pkgs/tools/backup/discordchatexporter-cli/updater.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts nuget-to-nix dotnet-sdk_6 +#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" @@ -14,17 +14,4 @@ fi cd ../../../.. update-source-version discordchatexporter-cli "$new_version" -store_src="$(nix-build . -A discordchatexporter-cli.src --no-out-link)" -src="$(mktemp -d /tmp/discordexporter-src.XXX)" -cp -rT "$store_src" "$src" -chmod -R +w "$src" - -pushd "$src" - -mkdir ./nuget_tmp.packages -dotnet restore DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj --packages ./nuget_tmp.packages - -nuget-to-nix ./nuget_tmp.packages > "$deps_file" - -popd -rm -r "$src" +$(nix-build -A discordchatexporter-cli.fetch-deps --no-out-link) "$deps_file" diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix index 30b7f79f04ac..f92a6a69fe28 100644 --- a/pkgs/tools/misc/fdupes/default.nix +++ b/pkgs/tools/misc/fdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fdupes"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "adrianlopezroche"; repo = "fdupes"; rev = "v${version}"; - hash = "sha256-w1vIZexuXoCpc509QKdKnUaD4Obs5rsjptYAE4T/T+g="; + hash = "sha256-8GYQfnUxS790pDXw2sjnDZNB55PMDaCcO6daIa/MPMw="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/misc/synth/default.nix b/pkgs/tools/misc/synth/default.nix index 80ccd7fc51cd..8be135c59d28 100644 --- a/pkgs/tools/misc/synth/default.nix +++ b/pkgs/tools/misc/synth/default.nix @@ -1,8 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, pkg-config -, openssl , stdenv , AppKit , Security @@ -10,24 +8,27 @@ rustPlatform.buildRustPackage rec { pname = "synth"; - version = "0.6.5-r1"; + version = "0.6.8"; src = fetchFromGitHub { - owner = "getsynth"; + owner = "shuttle-hq"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AcAZjS2Wo0PRngf0eYrduEd6rZX5YpYxsWEp0wf9jvg="; + sha256 = "sha256-siAm6Uq8Y+RexNrkL7nTw/f/v0LkUgqTUhAtJiy9QnE="; }; - cargoSha256 = "sha256-mMGlUCvbXaO0XfMwVtpq7HENoSaXrQU7GSh7/OhYdus="; + cargoSha256 = "sha256-COy8szsYKEzjtRBH8063ug5BkMv3qpc3i2RNb+n4I04="; - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ AppKit Security ]; + checkFlags = [ + # https://github.com/shuttle-hq/synth/issues/309 + "--skip=docs_blog_2021_08_31_seeding_databases_tutorial_dot_md" + ]; + # requires unstable rust features RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix new file mode 100644 index 000000000000..83e689a416f6 --- /dev/null +++ b/pkgs/tools/misc/tbls/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, testers +, tbls +}: + +buildGoModule rec { + pname = "tbls"; + version = "1.56.2"; + + src = fetchFromGitHub { + owner = "k1LoW"; + repo = "tbls"; + rev = "v${version}"; + sha256 = "sha256-fJbdZlgegC54OIAbygKO5GzNh6UAuT4OZp7KK+XJhvI="; + }; + + vendorSha256 = "sha256-pmnSeQHZEtsshldfq6D/r5pMYA5ivMWkzjOq2/WseYU="; + + CGO_CFLAGS = [ "-Wno-format-security" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/k1LoW/tbls.commit=unspecified" + "-X github.com/k1LoW/tbls.date=unspecified" + "-X github.com/k1LoW/tbls.version=${src.rev}" + "-X github.com/k1LoW/tbls/version.Version=${src.rev}" + ]; + + preCheck = '' + # Remove tests that require additional services. + rm -f \ + datasource/datasource_test.go \ + drivers/*/*_test.go + ''; + + passthru.tests.version = testers.testVersion { + package = tbls; + command = "tbls version"; + version = src.rev; + }; + + meta = with lib; { + description = "A tool to generate documentation based on a database"; + homepage = "https://github.com/k1LoW/tbls"; + changelog = "https://github.com/k1LoW/tbls/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/pkgs/tools/misc/tdfgo/default.nix b/pkgs/tools/misc/tdfgo/default.nix new file mode 100644 index 000000000000..b575085916f6 --- /dev/null +++ b/pkgs/tools/misc/tdfgo/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "tdfgo"; + version = "unstable-2022-08-25"; + + src = fetchFromGitHub { + owner = "digitallyserviced"; + repo = "tdfgo"; + rev = "9f0b3315eed32409639a05aca55d7a0252681193"; + sha256 = "sha256-Lr4+bXdVxYbCXKVzE+fjeLD559HuABK6lOLJ0sBBGNY="; + }; + + vendorSha256 = "sha256-T6PSs5NfXSXvzlq67rIDbzURyA+25df3nMMfufo0fow="; + + meta = with lib; { + description = "TheDraw font parser and console text renderer."; + longDescription = "Supports more fonts than `tdfiglet`, and packs more features."; + homepage = "https://github.com/digitallyserviced/tdfgo"; + license = licenses.cc0; + platforms = platforms.linux; + maintainers = with maintainers; [ crinklywrappr ]; + }; +} diff --git a/pkgs/tools/misc/trdl-client/default.nix b/pkgs/tools/misc/trdl-client/default.nix new file mode 100644 index 000000000000..5a683ef20204 --- /dev/null +++ b/pkgs/tools/misc/trdl-client/default.nix @@ -0,0 +1,70 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, testers +, trdl-client +}: + +buildGoModule rec { + pname = "trdl-client"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "werf"; + repo = "trdl"; + rev = "v${version}"; + hash = "sha256-6bJoM0s0lIZewERCNnm5+J5O+Tkzp+Pv2l4vvOSxIz8="; + }; + + sourceRoot = "source/client"; + + vendorHash = "sha256-j3WekQpnwbh+XiFgJlEr/Cw+2WloIw+iELsqk5Cy69g="; + + subPackages = [ "cmd/trdl" ]; + + CGO_ENABLED = 0; + + ldflags = [ + "-s" + "-w" + "-X github.com/werf/trdl/client/pkg/trdl.Version=${src.rev}" + ]; + + tags = [ + "dfrunmount" + "dfssh" + ]; + + # There are no tests for cmd/trdl. + doCheck = false; + + passthru.tests.version = testers.testVersion { + package = trdl-client; + command = "trdl version"; + version = "v${version}"; + }; + + meta = with lib; { + description = '' + The universal solution for delivering your software updates securely from + a trusted The Update Framework (TUF) repository + ''; + longDescription = '' + trdl is an Open Source solution providing a secure channel for delivering + updates from the Git repository to the end user. + + The project team releases new versions of the software and switches them + in the release channels. Git acts as the single source of truth while + Vault is used as a tool to verify operations as well as populate and + maintain the TUF repository. + + The user selects a release channel, continuously receives the latest + software version from the TUF repository, and uses it. + ''; + homepage = "https://trdl.dev"; + changelog = "https://github.com/werf/trdl/releases/tag/${src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ azahi ]; + mainProgram = "trdl"; + }; +} diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 3f42fa83c64f..8fce232cdb17 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "http-prompt"; - version = "1.0.0"; + version = "2.1.0"; src = fetchFromGitHub { rev = "v${version}"; repo = "http-prompt"; - owner = "eliangcs"; - sha256 = "0kngz2izcqjphbrdkg489p0xmf65xjc8ki1a2szcc8sgwc7z74xy"; + owner = "httpie"; + sha256 = "sha256-e4GyuxCeXYNsnBXyjIJz1HqSrqTGan0N3wxUFS+Hvkw="; }; propagatedBuildInputs = with python3Packages; [ @@ -18,6 +18,7 @@ python3Packages.buildPythonApplication rec { (python.pkgs.callPackage ../../../development/python-modules/prompt-toolkit/1.nix {}) pygments six + pyyaml ]; checkPhase = '' diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 2c49c3951cfd..099c629154ff 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , substituteAll -, intltool +, gettext , pkg-config , fetchpatch , dbus @@ -24,6 +24,7 @@ , libselinux , audit , gobject-introspection +, perl , modemmanager , openresolv , libndp @@ -57,11 +58,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.38.4"; + version = "1.40.0"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-hB9k1Bd2qt2SsVH0flD2K+igYRqQVv5r+BiBAk5qlsU="; + sha256 = "sha256-rufgV7wsyl2rhOQfFfHai3lespB0ewTL7ugiutnp/AM="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; @@ -153,10 +154,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - intltool + gettext pkg-config vala gobject-introspection + perl elfutils # used to find jansson soname # Docs gtk-doc diff --git a/pkgs/tools/networking/networkmanager/fix-install-paths.patch b/pkgs/tools/networking/networkmanager/fix-install-paths.patch index 642c386d07cf..3a2973060a1d 100644 --- a/pkgs/tools/networking/networkmanager/fix-install-paths.patch +++ b/pkgs/tools/networking/networkmanager/fix-install-paths.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 9675cd8d03..a4562b693c 100644 +index 300e71319c..2a9fba7116 100644 --- a/meson.build +++ b/meson.build -@@ -1005,9 +1005,9 @@ meson.add_install_script( +@@ -996,9 +996,9 @@ meson.add_install_script( join_paths('tools', 'meson-post-install.sh'), nm_datadir, nm_bindir, diff --git a/pkgs/tools/networking/networkmanager/fix-paths.patch b/pkgs/tools/networking/networkmanager/fix-paths.patch index 79b1fd373739..5b099e134849 100644 --- a/pkgs/tools/networking/networkmanager/fix-paths.patch +++ b/pkgs/tools/networking/networkmanager/fix-paths.patch @@ -24,10 +24,10 @@ index e23b3a5282..c7246a3b61 100644 ExecStart=@sbindir@/NetworkManager --no-daemon Restart=on-failure diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c -index 6b854517e5..7a642e76fe 100644 +index c51da9ac82..ad67a301ef 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c -@@ -13605,14 +13605,14 @@ nm_device_start_ip_check(NMDevice *self) +@@ -13879,14 +13879,14 @@ nm_device_start_ip_check(NMDevice *self) gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET); if (gw) { _nm_utils_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf); @@ -45,10 +45,10 @@ index 6b854517e5..7a642e76fe 100644 } } diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build -index 2026f98dc3..8ec6978b8e 100644 +index 46464a6328..d943d4351a 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build -@@ -170,7 +170,6 @@ if enable_introspection +@@ -171,7 +171,6 @@ if enable_introspection input: libnm_core_settings_sources, output: 'nm-propery-infos-' + info + '.xml', command: [ @@ -56,7 +56,7 @@ index 2026f98dc3..8ec6978b8e 100644 join_paths(meson.source_root(), 'tools', 'generate-docs-nm-property-infos.py'), info, '@OUTPUT@', -@@ -227,7 +226,6 @@ if enable_introspection +@@ -228,7 +227,6 @@ if enable_introspection 'env', 'GI_TYPELIB_PATH=' + gi_typelib_path, 'LD_LIBRARY_PATH=' + ld_library_path, @@ -78,7 +78,7 @@ index bebc53a851..93710455d5 100644 g_ptr_array_add(argv, (char *) arg1); diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c -index e2c0c394bd..1a507aa0d4 100644 +index 7ad5bee509..2641dbf637 100644 --- a/src/libnmc-base/nm-vpn-helpers.c +++ b/src/libnmc-base/nm-vpn-helpers.c @@ -198,25 +198,8 @@ nm_vpn_openconnect_authenticate_helper(const char *host, @@ -86,13 +86,13 @@ index e2c0c394bd..1a507aa0d4 100644 const char *const *iter; const char *path; - const char *const DEFAULT_PATHS[] = { -- "/sbin/", -- "/usr/sbin/", -- "/usr/local/sbin/", -- "/bin/", -- "/usr/bin/", -- "/usr/local/bin/", -- NULL, +- "/sbin/", +- "/usr/sbin/", +- "/usr/local/sbin/", +- "/bin/", +- "/usr/bin/", +- "/usr/local/bin/", +- NULL, - }; - path = nm_utils_file_search_in_paths("openconnect", @@ -109,10 +109,10 @@ index e2c0c394bd..1a507aa0d4 100644 if (!g_spawn_sync(NULL, (char **) NM_MAKE_STRV(path, "--authenticate", host), diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build -index 8f07ae634e..a1326b3403 100644 +index 49314cad2e..6d52624699 100644 --- a/src/libnmc-setting/meson.build +++ b/src/libnmc-setting/meson.build -@@ -6,7 +6,6 @@ if enable_docs +@@ -7,7 +7,6 @@ if enable_docs input: [nm_settings_docs_xml_gir, nm_property_infos_xml['nmcli']], output: 'settings-docs-input.xml', command: [ diff --git a/pkgs/tools/networking/ooniprobe-cli/default.nix b/pkgs/tools/networking/ooniprobe-cli/default.nix index ea7a14563257..6fd45acbd738 100644 --- a/pkgs/tools/networking/ooniprobe-cli/default.nix +++ b/pkgs/tools/networking/ooniprobe-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ooniprobe-cli"; - version = "3.15.3"; + version = "3.16.0"; src = fetchFromGitHub { owner = "ooni"; repo = "probe-cli"; rev = "v${version}"; - hash = "sha256-21D/1ImKOr9+GeSrIRCUGCcALU0WPohrnz1qqUXLy1A="; + hash = "sha256-UMnhisn/1PfNADNB9nN5+Yj2hmXetHiWULjgQPeHLc8="; }; - vendorSha256 = "sha256-tZHBcVTCll3dSfQnQDfo9z3ALAykRmFvH7vjLLtQHDc="; + vendorSha256 = "sha256-eH+PfclxqgffM/pzIkdl7x+6Ie6UPyUpWkJ7+G5eN/E="; subPackages = [ "cmd/ooniprobe" ]; diff --git a/pkgs/tools/package-management/microdnf/default.nix b/pkgs/tools/package-management/microdnf/default.nix index 597fc5cc11a9..ac3f2b6a0862 100644 --- a/pkgs/tools/package-management/microdnf/default.nix +++ b/pkgs/tools/package-management/microdnf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microdnf"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "sha256-PDvA25QSju16d83f0UVpUiDU8XDuC2dKRi3LaItFRmk="; + sha256 = "sha256-/6yMHjB9HNEEQuAc8zEvmjjl6wur0jByS1hLz39+rHI="; }; nativeBuildInputs = [ pkg-config cmake gettext help2man ]; diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/tools/package-management/micromamba/default.nix index 70443695e0ff..305e996e0d71 100644 --- a/pkgs/tools/package-management/micromamba/default.nix +++ b/pkgs/tools/package-management/micromamba/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "micromamba"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; rev = "micromamba-" + version; - sha256 = "sha256-CszDmt3SElHo1D2sNy2tPhZ43YD3pDjT8+fp2PVk+7Y="; + sha256 = "sha256-aTScTM1jX1WIrAVkAvp37fMa+05teLJnVdyIwtYq7mY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix index 03d51213b3e0..ee537733e7cb 100644 --- a/pkgs/tools/package-management/nix-prefetch/default.nix +++ b/pkgs/tools/package-management/nix-prefetch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, makeWrapper, asciidoc +{ lib, stdenv, fetchFromGitHub, fetchpatch, installShellFiles, makeWrapper, asciidoc , docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk , gnugrep, gnused, jq, nix }: @@ -17,6 +17,14 @@ stdenv.mkDerivation rec { ''; }; + patches = [ + (fetchpatch { + name = "fix-prefetching-hash-key.patch"; + url = "https://github.com/msteen/nix-prefetch/commit/508237f48f7e2d8496ce54f38abbe57f44d0cbca.patch"; + hash = "sha256-9SYPcRFZaVyNjMUVdXbef5eGvLp/kr379eU9lG5GgE0="; + }) + ]; + postPatch = '' lib=$out/lib/${pname} diff --git a/pkgs/tools/security/echidna/default.nix b/pkgs/tools/security/echidna/default.nix index f6f1426ad571..ae4a75902a97 100644 --- a/pkgs/tools/security/echidna/default.nix +++ b/pkgs/tools/security/echidna/default.nix @@ -11,13 +11,13 @@ }: mkDerivation rec { pname = "echidna"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "crytic"; repo = "echidna"; rev = "v${version}"; - sha256 = "sha256-WmlQWgn4qfRmx3PdzY7wzT9AyU7Re2T1CWJ7yGjcVac="; + sha256 = "sha256-ZLk3K00O6aERf+G5SagDVUk1/ba9U+9n9dqCImkczJs="; }; # NOTE: echidna is behind with aeson because of hevm, this patch updates diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 27f2589fecd3..b7c909bfcc88 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.14.5"; + version = "1.14.6"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MFnenWoInS2vWySa0IxKAFLYF9VHmPaL0eGM27b1wpI="; + sha256 = "sha256-TTifpIZdv2KVsWQGHR1seYL+A8MSmngnvm/zUqrz5CM="; }; - vendorSha256 = "sha256-clJAt/SZCLlLnYf2tmR9nmsbZ0SzMj7x+1Ft9dfEdJ4="; + vendorSha256 = "sha256-57fvb0UF90S+OhZcxi5ZFMOLXW72kKVjls5cia9pitA="; subPackages = [ "." ]; diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index 8c2c248fc97e..092163f68c77 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { sha256 = hash; }; - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; - ADDFLAGS = with darwin.apple_sdk.frameworks; lib.optional stdenv.isDarwin "-F${IOKit}/Library/Frameworks/"; diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index e7b7121270a2..d554405f8904 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gdu"; - version = "5.16.0"; + version = "5.17.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-e2fZJ1HRoi2uMyCWgjPIXs6Q6neg8XEqtC8YcUev+60="; + sha256 = "sha256-8YC0KUf+kSVnSt1436Ob1CdLJT/w5VYDOEHV0mDkO7E="; }; - vendorSha256 = "sha256-42hXOF/jeOc7WXqq6nBgYv5Qjypszxp9IboxchKQbN8="; + vendorSha256 = "sha256-rppVLeX1VDOW+eUHSM77DgY2KjOrUHdyqGWRAYRIbUE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 64061c84183a..cf6e0bdb3d42 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -282,7 +282,7 @@ in python3.pkgs.buildPythonApplication rec { fromSource ] ++ lib.optional _enableDitaaFilter binaryBytecode; homepage = "https://asciidoc-py.github.io/"; - changelog = "https://github.com/asciidoc-py/asciidoc-py/blob/${src.rev}/CHANGELOG.adoc"; + changelog = "https://github.com/asciidoc-py/asciidoc-py/blob/${version}/CHANGELOG.adoc"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor dotlambda ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 16b228a27bcc..5131cdb02b74 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1245,6 +1245,7 @@ mapAliases ({ rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # Added 2022-01-15 ring-daemon = jami-daemon; # Added 2021-10-26 rkt = throw "rkt was archived by upstream"; # Added 2020-05-16 + rls = throw "rls was discontinued upstream, use rust-analyzer instead"; # Added 2022-09-06 rng_tools = throw "'rng_tools' has been renamed to/replaced by 'rng-tools'"; # Converted to throw 2022-02-22 robomongo = throw "'robomongo' has been renamed to/replaced by 'robo3t'"; # Converted to throw 2022-02-22 rockbox_utility = rockbox-utility; # Added 2022-03-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b217cf07722..ce4a69104f56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -725,6 +725,8 @@ with pkgs; owl = callPackage ../tools/networking/owl { }; + packcc = callPackage ../development/tools/packcc { }; + packer = callPackage ../development/tools/packer { }; packr = callPackage ../development/libraries/packr { }; @@ -8021,7 +8023,9 @@ with pkgs; krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { }; - krunvm = callPackage ../applications/virtualization/krunvm { }; + krunvm = callPackage ../applications/virtualization/krunvm { + inherit (darwin) sigtool; + }; kronometer = libsForQt5.callPackage ../tools/misc/kronometer { }; @@ -11701,6 +11705,8 @@ with pkgs; trashy = callPackage ../tools/misc/trashy { }; + trdl-client = callPackage ../tools/misc/trdl-client { }; + trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom { inherit (xorg) libXxf86vm; }; @@ -12168,6 +12174,8 @@ with pkgs; td = callPackage ../tools/misc/td { }; + tdfgo = callPackage ../tools/misc/tdfgo { }; + tftp-hpa = callPackage ../tools/networking/tftp-hpa {}; tigervnc = callPackage ../tools/admin/tigervnc {}; @@ -14627,7 +14635,6 @@ with pkgs; ograc = callPackage ../development/tools/rust/ograc { }; rhack = callPackage ../development/tools/rust/rhack { }; - inherit (rustPackages) rls; roogle = callPackage ../development/tools/rust/roogle { }; rustfmt = rustPackages.rustfmt; rustracer = callPackage ../development/tools/rust/racer { @@ -14776,9 +14783,7 @@ with pkgs; wasi-libc = pkgsCross.wasi32.wasilibc; }; - tinyscheme = callPackage ../development/interpreters/tinyscheme { - stdenv = gccStdenv; - }; + tinyscheme = callPackage ../development/interpreters/tinyscheme { }; bupc = callPackage ../development/compilers/bupc { }; @@ -15356,8 +15361,6 @@ with pkgs; inherit (darwin) libobjc; }; defaultGemConfig = callPackage ../development/ruby-modules/gem-config { - # recent v8 doesn't build on nixpkgs Darwin yet. https://github.com/NixOS/nixpkgs/issues/158076 - v8 = if stdenv.isDarwin then v8_8_x else v8; inherit (darwin) DarwinTools cctools; inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -16661,6 +16664,8 @@ with pkgs; lenmus = callPackage ../applications/misc/lenmus { }; + lightningcss = callPackage ../development/tools/lightningcss { }; + libtool = libtool_2; libtool_1_5 = callPackage ../development/tools/misc/libtool { }; @@ -18953,6 +18958,8 @@ with pkgs; json2hcl = callPackage ../development/tools/json2hcl { }; + json2tsv = callPackage ../development/tools/json2tsv { }; + json2yaml = haskell.lib.compose.justStaticExecutables haskellPackages.json2yaml; json-glib = callPackage ../development/libraries/json-glib { }; @@ -19648,7 +19655,7 @@ with pkgs; libliftoff = callPackage ../development/libraries/libliftoff { }; liblqr1 = callPackage ../development/libraries/liblqr-1 { - inherit (darwin.apple_sdk.frameworks) Carbon; + inherit (darwin.apple_sdk.frameworks) Carbon AppKit; }; liblockfile = callPackage ../development/libraries/liblockfile { }; @@ -20567,6 +20574,8 @@ with pkgs; mlt = callPackage ../development/libraries/mlt { }; + mlib = callPackage ../development/libraries/mlib { }; + mlv-app = libsForQt5.callPackage ../applications/video/mlv-app { }; mono-addins = callPackage ../development/libraries/mono-addins { }; @@ -21941,7 +21950,7 @@ with pkgs; ucommon = callPackage ../development/libraries/ucommon { }; - v8 = callPackage ../development/libraries/v8 { }; + v8 = darwin.apple_sdk_11_0.callPackage ../development/libraries/v8 { }; v8_8_x = callPackage ../development/libraries/v8/8_x.nix { }; @@ -24233,7 +24242,9 @@ with pkgs; libcgroup = callPackage ../os-specific/linux/libcgroup { }; - libkrun = callPackage ../development/libraries/libkrun { }; + libkrun = callPackage ../development/libraries/libkrun { + inherit (darwin.apple_sdk.frameworks) Hypervisor; + }; libkrun-sev = callPackage ../development/libraries/libkrun { sevVariant = true; }; @@ -28923,6 +28934,8 @@ with pkgs; ktunnel = callPackage ../applications/networking/cluster/ktunnel { }; + pinniped = callPackage ../applications/networking/cluster/pinniped { }; + pgo-client = callPackage ../applications/networking/cluster/pgo-client { }; popeye = callPackage ../applications/networking/cluster/popeye { }; @@ -30328,6 +30341,8 @@ with pkgs; piston-cli = callPackage ../tools/misc/piston-cli { python3Packages = python39Packages; }; + pizarra = callPackage ../applications/graphics/pizarra { }; + plater = libsForQt5.callPackage ../applications/misc/plater { }; plexamp = callPackage ../applications/audio/plexamp { }; @@ -31392,6 +31407,8 @@ with pkgs; todoman = callPackage ../applications/office/todoman { }; + tofi = callPackage ../applications/misc/tofi { }; + topydo = callPackage ../applications/misc/topydo {}; torrential = callPackage ../applications/networking/p2p/torrential { }; @@ -33705,6 +33722,8 @@ with pkgs; tbe = libsForQt5.callPackage ../games/the-butterfly-effect { }; + tbls = callPackage ../tools/misc/tbls { }; + tecnoballz = callPackage ../games/tecnoballz { }; teetertorture = callPackage ../games/teetertorture { }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 89d2342f0c63..b61b69cad9ea 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,93 +1,101 @@ -{ beam, callPackage, wxGTK30, buildPackages, stdenv +{ beam +, callPackage +, wxGTK30 +, buildPackages +, stdenv , wxSupport ? true , systemdSupport ? stdenv.isLinux }: -with beam; { - lib = callPackage ../development/beam-modules/lib.nix { }; +let + self = beam; +in + +{ + beamLib = callPackage ../development/beam-modules/lib.nix { }; # R24 is the default version. # The main switch to change default Erlang version. defaultVersion = "erlangR24"; # Each - interpreters = with beam.interpreters; { + interpreters = { - erlang = beam.interpreters.${defaultVersion}; - erlang_odbc = beam.interpreters."${defaultVersion}_odbc"; - erlang_javac = beam.interpreters."${defaultVersion}_javac"; - erlang_odbc_javac = beam.interpreters."${defaultVersion}_odbc_javac"; + erlang = self.interpreters.${self.defaultVersion}; + erlang_odbc = self.interpreters."${self.defaultVersion}_odbc"; + erlang_javac = self.interpreters."${self.defaultVersion}_javac"; + erlang_odbc_javac = self.interpreters."${self.defaultVersion}_odbc_javac"; # Standard Erlang versions, using the generic builder. # R25 - erlangR25 = lib.callErlang ../development/interpreters/erlang/R25.nix { + erlangR25 = self.beamLib.callErlang ../development/interpreters/erlang/R25.nix { wxGTK = wxGTK30; parallelBuild = true; autoconf = buildPackages.autoconf269; inherit wxSupport systemdSupport; }; - erlangR25_odbc = erlangR25.override { odbcSupport = true; }; - erlangR25_javac = erlangR25.override { javacSupport = true; }; - erlangR25_odbc_javac = erlangR25.override { + erlangR25_odbc = self.interpreters.erlangR25.override { odbcSupport = true; }; + erlangR25_javac = self.interpreters.erlangR25.override { javacSupport = true; }; + erlangR25_odbc_javac = self.interpreters.erlangR25.override { javacSupport = true; odbcSupport = true; }; # R24 - erlangR24 = lib.callErlang ../development/interpreters/erlang/R24.nix { + erlangR24 = self.beamLib.callErlang ../development/interpreters/erlang/R24.nix { wxGTK = wxGTK30; # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; inherit wxSupport systemdSupport; }; - erlangR24_odbc = erlangR24.override { odbcSupport = true; }; - erlangR24_javac = erlangR24.override { javacSupport = true; }; - erlangR24_odbc_javac = erlangR24.override { + erlangR24_odbc = self.interpreters.erlangR24.override { odbcSupport = true; }; + erlangR24_javac = self.interpreters.erlangR24.override { javacSupport = true; }; + erlangR24_odbc_javac = self.interpreters.erlangR24.override { javacSupport = true; odbcSupport = true; }; # R23 - erlangR23 = lib.callErlang ../development/interpreters/erlang/R23.nix { + erlangR23 = self.beamLib.callErlang ../development/interpreters/erlang/R23.nix { wxGTK = wxGTK30; # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; inherit wxSupport systemdSupport; }; - erlangR23_odbc = erlangR23.override { odbcSupport = true; }; - erlangR23_javac = erlangR23.override { javacSupport = true; }; - erlangR23_odbc_javac = erlangR23.override { + erlangR23_odbc = self.interpreters.erlangR23.override { odbcSupport = true; }; + erlangR23_javac = self.interpreters.erlangR23.override { javacSupport = true; }; + erlangR23_odbc_javac = self.interpreters.erlangR23.override { javacSupport = true; odbcSupport = true; }; # R22 - erlangR22 = lib.callErlang ../development/interpreters/erlang/R22.nix { + erlangR22 = self.beamLib.callErlang ../development/interpreters/erlang/R22.nix { wxGTK = wxGTK30; # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; inherit wxSupport systemdSupport; }; - erlangR22_odbc = erlangR22.override { odbcSupport = true; }; - erlangR22_javac = erlangR22.override { javacSupport = true; }; - erlangR22_odbc_javac = erlangR22.override { + erlangR22_odbc = self.interpreters.erlangR22.override { odbcSupport = true; }; + erlangR22_javac = self.interpreters.erlangR22.override { javacSupport = true; }; + erlangR22_odbc_javac = self.interpreters.erlangR22.override { javacSupport = true; odbcSupport = true; }; # R21 - erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix { + erlangR21 = self.beamLib.callErlang ../development/interpreters/erlang/R21.nix { wxGTK = wxGTK30; autoconf = buildPackages.autoconf269; inherit wxSupport systemdSupport; }; - erlangR21_odbc = erlangR21.override { odbcSupport = true; }; - erlangR21_javac = erlangR21.override { javacSupport = true; }; - erlangR21_odbc_javac = erlangR21.override { + erlangR21_odbc = self.interpreters.erlangR21.override { odbcSupport = true; }; + erlangR21_javac = self.interpreters.erlangR21.override { javacSupport = true; }; + erlangR21_odbc_javac = self.interpreters.erlangR21.override { javacSupport = true; odbcSupport = true; }; @@ -95,10 +103,10 @@ with beam; { # Other Beam languages. These are built with `beam.interpreters.erlang`. To # access for example elixir built with different version of Erlang, use # `beam.packages.erlangR24.elixir`. - inherit (packages.erlang) + inherit (self.packages.erlang) elixir elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir_ls; - inherit (packages.erlang) lfe lfe_1_3; + inherit (self.packages.erlang) lfe lfe_1_3; }; # Helper function to generate package set with a specific Erlang version. @@ -109,12 +117,12 @@ with beam; { # appropriate Erlang/OTP version. packages = { # Packages built with default Erlang version. - erlang = packages.${defaultVersion}; + erlang = self.packages.${self.defaultVersion}; - erlangR25 = packagesWith interpreters.erlangR25; - erlangR24 = packagesWith interpreters.erlangR24; - erlangR23 = packagesWith interpreters.erlangR23; - erlangR22 = packagesWith interpreters.erlangR22; - erlangR21 = packagesWith interpreters.erlangR21; + erlangR25 = self.packagesWith self.interpreters.erlangR25; + erlangR24 = self.packagesWith self.interpreters.erlangR24; + erlangR23 = self.packagesWith self.interpreters.erlangR23; + erlangR22 = self.packagesWith self.interpreters.erlangR22; + erlangR21 = self.packagesWith self.interpreters.erlangR21; }; } diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index 0ab29d851636..4fedad00f24b 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -35,6 +35,7 @@ let warnUndeclaredOptions = mkOption { description = "Whether to warn when config contains an unrecognized attribute."; + type = types.bool; default = false; }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index dbfc7bb1eddc..51d883be39f1 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -11,7 +11,7 @@ let metaFetch = import ../build-support/coq/meta-fetch/default.nix {inherit lib stdenv fetchzip; }; - mkCoqDerivation = callPackage ../build-support/coq {}; + mkCoqDerivation = lib.makeOverridable (callPackage ../build-support/coq {}); contribs = recurseIntoAttrs (callPackage ../development/coq-modules/contribs {}); diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 547050b4f39b..a8b5742aaeb7 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -78,6 +78,8 @@ let bigstring = callPackage ../development/ocaml-modules/bigstring { }; + bindlib = callPackage ../development/ocaml-modules/bindlib { }; + biocaml = callPackage ../development/ocaml-modules/biocaml { }; bistro = callPackage ../development/ocaml-modules/bistro { }; @@ -286,6 +288,8 @@ let decompress = callPackage ../development/ocaml-modules/decompress { }; + dedukti = callPackage ../development/ocaml-modules/dedukti { }; + diet = callPackage ../development/ocaml-modules/diet { }; digestif = callPackage ../development/ocaml-modules/digestif { }; @@ -698,6 +702,8 @@ let ladspa = callPackage ../development/ocaml-modules/ladspa { }; + lambdapi = callPackage ../development/ocaml-modules/lambdapi { }; + lambdasoup = callPackage ../development/ocaml-modules/lambdasoup { }; lambda-term = callPackage ../development/ocaml-modules/lambda-term { }; @@ -1177,6 +1183,8 @@ let ppxlib = callPackage ../development/ocaml-modules/ppxlib { }; + pratter = callPackage ../development/ocaml-modules/pratter { }; + psmt2-frontend = callPackage ../development/ocaml-modules/psmt2-frontend { }; psq = callPackage ../development/ocaml-modules/psq { }; @@ -1227,6 +1235,8 @@ let tcpip = callPackage ../development/ocaml-modules/tcpip { }; + timed = callPackage ../development/ocaml-modules/timed { }; + tiny_httpd = callPackage ../development/ocaml-modules/tiny_httpd { }; tsort = callPackage ../development/ocaml-modules/tsort { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 48c5af94e954..a1e446976971 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3251,6 +3251,8 @@ in { fire = callPackage ../development/python-modules/fire { }; + fireflyalgorithm = callPackage ../development/python-modules/fireflyalgorithm { }; + firetv = callPackage ../development/python-modules/firetv { }; first = callPackage ../development/python-modules/first { };