diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-07-03 12:06:58 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-07-03 12:06:58 +0200 |
| commit | 37d54f4445556f3571ee269e04a4ab89fc13a506 (patch) | |
| tree | 3d9e263cc07beccf789d846df8789f9c00f99128 | |
| parent | Revert "stdenv bootstrap: upgrade x86_64-linux bootstrap tools & use temporar... (diff) | |
| parent | Merge pull request #126688 from Binary-Eater/polkit (diff) | |
| download | nixpkgs-origin/glibc-2.33.tar.gz | |
Merge branch 'staging' into glibc-2.33origin/glibc-2.33
377 files changed, 7501 insertions, 4602 deletions
diff --git a/.github/workflows/merge-staging.yml b/.github/workflows/merge-staging.yml deleted file mode 100644 index e499630a083b..000000000000 --- a/.github/workflows/merge-staging.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: "merge staging(-next)" - -on: - schedule: - # * is a special character in YAML so you have to quote this string - # Merge every 6 hours - - cron: '0 */6 * * *' - -jobs: - sync-branch: - if: github.repository_owner == 'NixOS' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Merge master into staging-next - id: staging_next - uses: devmasx/merge-branch@v1.3.1 - with: - type: now - from_branch: master - target_branch: staging-next - github_token: ${{ secrets.GITHUB_TOKEN }} - - - name: Merge staging-next into staging - id: staging - uses: devmasx/merge-branch@v1.3.1 - with: - type: now - from_branch: staging-next - target_branch: staging - github_token: ${{ secrets.GITHUB_TOKEN }} - - - name: Comment on failure - uses: peter-evans/create-or-update-comment@v1 - if: ${{ failure() }} - with: - issue-number: 105153 - body: | - An automatic merge${{ (steps.staging_next.outcome == 'failure' && ' from master to staging-next') || ((steps.staging.outcome == 'failure' && ' from staging-next to staging') || '') }} [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}). - diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml new file mode 100644 index 000000000000..adc8fa1e3ea4 --- /dev/null +++ b/.github/workflows/periodic-merge-24h.yml @@ -0,0 +1,49 @@ +# This action periodically merges base branches into staging branches. +# This is done to +# * prevent conflicts or rather resolve them early +# * make all potential breakage happen on the staging branch +# * and make sure that all major rebuilds happen before the staging +# branch get’s merged back into its base branch. + +name: "Periodic Merges (24h)" + + +on: + schedule: + # * is a special character in YAML so you have to quote this string + # Merge every 6 hours + - cron: '0 0 * * *' + +jobs: + periodic-merge: + if: github.repository_owner == 'NixOS' + runs-on: ubuntu-latest + strategy: + # don't fail fast, so that all pairs are tried + fail-fast: false + # certain branches need to be merged in order, like master->staging-next->staging + # and disabling parallelism ensures the order of the pairs below. + max-parallel: 1 + matrix: + pairs: + - from: master + into: haskell-updates + name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} + steps: + - uses: actions/checkout@v2 + + - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} + uses: devmasx/merge-branch@v1.3.1 + with: + type: now + from_branch: ${{ matrix.pairs.from }} + target_branch: ${{ matrix.pairs.into }} + github_token: ${{ secrets.GITHUB_TOKEN }} + + - name: Comment on failure + uses: peter-evans/create-or-update-comment@v1 + if: ${{ failure() }} + with: + issue-number: 105153 + body: | + Periodic merge from `${{ matrix.pairs.from }}` into `${{ matrix.pairs.into }}` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}). diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml new file mode 100644 index 000000000000..8ec4da1d8773 --- /dev/null +++ b/.github/workflows/periodic-merge-6h.yml @@ -0,0 +1,55 @@ +# This action periodically merges base branches into staging branches. +# This is done to +# * prevent conflicts or rather resolve them early +# * make all potential breakage happen on the staging branch +# * and make sure that all major rebuilds happen before the staging +# branch get’s merged back into its base branch. + +name: "Periodic Merges (6h)" + + +on: + schedule: + # * is a special character in YAML so you have to quote this string + # Merge every 6 hours + - cron: '0 */6 * * *' + +jobs: + periodic-merge: + if: github.repository_owner == 'NixOS' + runs-on: ubuntu-latest + strategy: + # don't fail fast, so that all pairs are tried + fail-fast: false + # certain branches need to be merged in order, like master->staging-next->staging + # and disabling parallelism ensures the order of the pairs below. + max-parallel: 1 + matrix: + pairs: + - from: master + into: staging-next + - from: staging-next + into: staging + - from: release-21.05 + into: staging-next-21.05 + - from: staging-next-21.05 + into: staging-21.05 + name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} + steps: + - uses: actions/checkout@v2 + + - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} + uses: devmasx/merge-branch@v1.3.1 + with: + type: now + from_branch: ${{ matrix.pairs.from }} + target_branch: ${{ matrix.pairs.into }} + github_token: ${{ secrets.GITHUB_TOKEN }} + + - name: Comment on failure + uses: peter-evans/create-or-update-comment@v1 + if: ${{ failure() }} + with: + issue-number: 105153 + body: | + Periodic merge from `${{ matrix.pairs.from }}` into `${{ matrix.pairs.into }}` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}). diff --git a/doc/builders/packages/steam.section.md b/doc/builders/packages/steam.section.md index d7bb6e69d7d9..0cfc1a2c2458 100644 --- a/doc/builders/packages/steam.section.md +++ b/doc/builders/packages/steam.section.md @@ -56,16 +56,7 @@ Use `programs.steam.enable = true;` if you want to add steam to systemPackages a ## steam-run {#sec-steam-run} -The FHS-compatible chroot used for steam can also be used to run other linux games that expect a FHS environment. To do it, add - -```nix -pkgs.steam.override ({ - nativeOnly = true; - newStdcpp = true; -}).run -``` - -to your configuration, rebuild, and run the game with +The FHS-compatible chroot used for Steam can also be used to run other Linux games that expect a FHS environment. To use it, install the `steam-run-native` package and run the game with ``` steam-run ./foo diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 348f66d42791..934e6cdca121 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -241,7 +241,7 @@ let git # replace with beam.packages.erlang.elixir_1_11 if you need beam.packages.erlang.elixir - nodejs-15_x + nodejs postgresql_13 # only used for frontend dependencies # you are free to use yarn2nix as well diff --git a/doc/languages-frameworks/hy.section.md b/doc/languages-frameworks/hy.section.md new file mode 100644 index 000000000000..a851ff24dfc2 --- /dev/null +++ b/doc/languages-frameworks/hy.section.md @@ -0,0 +1,31 @@ +# Hy {#sec-language-hy} + +## Installation {#ssec-hy-installation} + +### Installation without packages {#installation-without-packages} + +You can install `hy` via nix-env or by adding it to `configuration.nix` by reffering to it as a `hy` attribute. This kind of installation adds `hy` to your environment and it succesfully works with `python3`. + +::: {.caution} +Packages that are installed with your python derivation, are not accesible by `hy` this way. +::: + +### Installation with packages {#installation-with-packages} + +Creating `hy` derivation with custom `python` packages is really simple and similar to the way that python does it. Attribute `hy` provides function `withPackages` that creates custom `hy` derivation with specified packages. + +For example if you want to create shell with `matplotlib` and `numpy`, you can do it like so: + +```ShellSession +$ nix-shell -p "hy.withPackages (ps: with ps; [ numpy matplotlib ])" +``` + +Or if you want to extend your `configuration.nix`: +```nix +{ # ... + + environment.systemPackages = with pkgs; [ + (hy.withPackages (py-packages: with py-packages; [ numpy matplotlib ])) + ]; +} +``` diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 791afce6f5c6..516bddf67fd4 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -16,6 +16,7 @@ <xi:include href="gnome.section.xml" /> <xi:include href="go.section.xml" /> <xi:include href="haskell.section.xml" /> + <xi:include href="hy.section.xml" /> <xi:include href="idris.section.xml" /> <xi:include href="ios.section.xml" /> <xi:include href="java.section.xml" /> diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 99bddfb36e16..e436ce47eec3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4061,6 +4061,12 @@ github = "gytis-ivaskevicius"; githubId = 23264966; }; + hagl = { + email = "harald@glie.be"; + github = "hagl"; + githubId = 1162118; + name = "Harald Gliebe"; + }; hakuch = { email = "hakuch@gmail.com"; github = "hakuch"; @@ -10788,6 +10794,12 @@ githubId = 347983; name = "Udo Spallek"; }; + ulrikstrid = { + email = "ulrik.strid@outlook.com"; + github = "ulrikstrid"; + githubId = 1607770; + name = "Ulrik Strid"; + }; unode = { email = "alves.rjc@gmail.com"; github = "unode"; diff --git a/maintainers/scripts/haskell/mark-broken.sh b/maintainers/scripts/haskell/mark-broken.sh index 58433abe662b..71568ef6f200 100755 --- a/maintainers/scripts/haskell/mark-broken.sh +++ b/maintainers/scripts/haskell/mark-broken.sh @@ -17,9 +17,9 @@ trap "rm ${tmpfile}" 0 echo "Remember that you need to manually run 'maintainers/scripts/haskell/hydra-report.hs get-report' sometime before running this script." echo "Generating a list of broken builds and displaying for manual confirmation ..." -maintainers/scripts/haskell/hydra-report.hs mark-broken-list | sort -i > $tmpfile +maintainers/scripts/haskell/hydra-report.hs mark-broken-list | sort -i > "$tmpfile" -$EDITOR $tmpfile +$EDITOR "$tmpfile" tail -n +3 "$broken_config" >> "$tmpfile" @@ -28,10 +28,11 @@ broken-packages: # These packages don't compile. EOF +# clear environment here to avoid things like allowing broken builds in sort -iu "$tmpfile" >> "$broken_config" -maintainers/scripts/haskell/regenerate-hackage-packages.sh -maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh -maintainers/scripts/haskell/regenerate-hackage-packages.sh +env -i maintainers/scripts/haskell/regenerate-hackage-packages.sh +env -i maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh +env -i maintainers/scripts/haskell/regenerate-hackage-packages.sh if [[ "${1:-}" == "--do-commit" ]]; then git add $broken_config diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml index 2695082e3867..702fc03f6686 100644 --- a/nixos/doc/manual/development/nixos-tests.xml +++ b/nixos/doc/manual/development/nixos-tests.xml @@ -13,7 +13,7 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/test one or more virtual machines containing the NixOS system(s) required for the test. </para> - <xi:include href="writing-nixos-tests.xml" /> - <xi:include href="running-nixos-tests.xml" /> - <xi:include href="running-nixos-tests-interactively.xml" /> + <xi:include href="../from_md/development/writing-nixos-tests.section.xml" /> + <xi:include href="../from_md/development/running-nixos-tests.section.xml" /> + <xi:include href="../from_md/development/running-nixos-tests-interactively.section.xml" /> </chapter> diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.section.md b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md new file mode 100644 index 000000000000..3ba4e16e77f4 --- /dev/null +++ b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md @@ -0,0 +1,44 @@ +# Running Tests interactively {#sec-running-nixos-tests-interactively} + +The test itself can be run interactively. This is particularly useful +when developing or debugging a test: + +```ShellSession +$ nix-build nixos/tests/login.nix -A driverInteractive +$ ./result/bin/nixos-test-driver +starting VDE switch for network 1 +> +``` + +You can then take any Python statement, e.g. + +```py +> start_all() +> test_script() +> machine.succeed("touch /tmp/foo") +> print(machine.succeed("pwd")) # Show stdout of command +``` + +The function `test_script` executes the entire test script and drops you +back into the test driver command line upon its completion. This allows +you to inspect the state of the VMs after the test (e.g. to debug the +test script). + +To just start and experiment with the VMs, run: + +```ShellSession +$ nix-build nixos/tests/login.nix -A driverInteractive +$ ./result/bin/nixos-run-vms +``` + +The script `nixos-run-vms` starts the virtual machines defined by test. + +You can re-use the VM states coming from a previous run by setting the +`--keep-vm-state` flag. + +```ShellSession +$ ./result/bin/nixos-run-vms --keep-vm-state +``` + +The machine state is stored in the `$TMPDIR/vm-state-machinename` +directory. diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml deleted file mode 100644 index a6044d5f89e8..000000000000 --- a/nixos/doc/manual/development/running-nixos-tests-interactively.xml +++ /dev/null @@ -1,49 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-running-nixos-tests-interactively"> - <title>Running Tests interactively</title> - - <para> - The test itself can be run interactively. This is particularly useful when - developing or debugging a test: -<screen> -<prompt>$ </prompt>nix-build nixos/tests/login.nix -A driverInteractive -<prompt>$ </prompt>./result/bin/nixos-test-driver -starting VDE switch for network 1 -<prompt>></prompt> -</screen> - You can then take any Python statement, e.g. -<screen> -<prompt>></prompt> start_all() -<prompt>></prompt> test_script() -<prompt>></prompt> machine.succeed("touch /tmp/foo") -<prompt>></prompt> print(machine.succeed("pwd")) # Show stdout of command -</screen> - The function <command>test_script</command> executes the entire test script - and drops you back into the test driver command line upon its completion. - This allows you to inspect the state of the VMs after the test (e.g. to debug - the test script). - </para> - - <para> - To just start and experiment with the VMs, run: -<screen> -<prompt>$ </prompt>nix-build nixos/tests/login.nix -A driverInteractive -<prompt>$ </prompt>./result/bin/nixos-run-vms -</screen> - The script <command>nixos-run-vms</command> starts the virtual machines - defined by test. - </para> - - <para> - You can re-use the VM states coming from a previous run - by setting the <command>--keep-vm-state</command> flag. -<screen> -<prompt>$ </prompt>./result/bin/nixos-run-vms --keep-vm-state -</screen> - The machine state is stored in the - <filename>$TMPDIR/vm-state-</filename><varname>machinename</varname> directory. - </para> -</section> diff --git a/nixos/doc/manual/development/running-nixos-tests.section.md b/nixos/doc/manual/development/running-nixos-tests.section.md new file mode 100644 index 000000000000..d6a456f01883 --- /dev/null +++ b/nixos/doc/manual/development/running-nixos-tests.section.md @@ -0,0 +1,31 @@ +# Running Tests {#sec-running-nixos-tests} + +You can run tests using `nix-build`. For example, to run the test +[`login.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix), +you just do: + +```ShellSession +$ nix-build '<nixpkgs/nixos/tests/login.nix>' +``` + +or, if you don't want to rely on `NIX_PATH`: + +```ShellSession +$ cd /my/nixpkgs/nixos/tests +$ nix-build login.nix +… +running the VM test script +machine: QEMU running (pid 8841) +… +6 out of 6 tests succeeded +``` + +After building/downloading all required dependencies, this will perform +a build that starts a QEMU/KVM virtual machine containing a NixOS +system. The virtual machine mounts the Nix store of the host; this makes +VM creation very fast, as no disk image needs to be created. Afterwards, +you can view a pretty-printed log of the test: + +```ShellSession +$ firefox result/log.html +``` diff --git a/nixos/doc/manual/development/running-nixos-tests.xml b/nixos/doc/manual/development/running-nixos-tests.xml deleted file mode 100644 index e9257c907daf..000000000000 --- a/nixos/doc/manual/development/running-nixos-tests.xml +++ /dev/null @@ -1,36 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-running-nixos-tests"> - <title>Running Tests</title> - - <para> - You can run tests using <command>nix-build</command>. For example, to run the - test - <filename -xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename>, - you just do: -<screen> -<prompt>$ </prompt>nix-build '<nixpkgs/nixos/tests/login.nix>' -</screen> - or, if you don’t want to rely on <envar>NIX_PATH</envar>: -<screen> -<prompt>$ </prompt>cd /my/nixpkgs/nixos/tests -<prompt>$ </prompt>nix-build login.nix -… -running the VM test script -machine: QEMU running (pid 8841) -… -6 out of 6 tests succeeded -</screen> - After building/downloading all required dependencies, this will perform a - build that starts a QEMU/KVM virtual machine containing a NixOS system. The - virtual machine mounts the Nix store of the host; this makes VM creation very - fast, as no disk image needs to be created. Afterwards, you can view a - pretty-printed log of the test: -<screen> -<prompt>$ </prompt>firefox result/log.html -</screen> - </para> -</section> diff --git a/nixos/doc/manual/development/writing-nixos-tests.section.md b/nixos/doc/manual/development/writing-nixos-tests.section.md new file mode 100644 index 000000000000..8471e7608af9 --- /dev/null +++ b/nixos/doc/manual/development/writing-nixos-tests.section.md @@ -0,0 +1,301 @@ +# Writing Tests {#sec-writing-nixos-tests} + +A NixOS test is a Nix expression that has the following structure: + +```nix +import ./make-test-python.nix { + + # Either the configuration of a single machine: + machine = + { config, pkgs, ... }: + { configuration… + }; + + # Or a set of machines: + nodes = + { machine1 = + { config, pkgs, ... }: { … }; + machine2 = + { config, pkgs, ... }: { … }; + … + }; + + testScript = + '' + Python code… + ''; +} +``` + +The attribute `testScript` is a bit of Python code that executes the +test (described below). During the test, it will start one or more +virtual machines, the configuration of which is described by the +attribute `machine` (if you need only one machine in your test) or by +the attribute `nodes` (if you need multiple machines). For instance, +[`login.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix) +only needs a single machine to test whether users can log in +on the virtual console, whether device ownership is correctly maintained +when switching between consoles, and so on. On the other hand, +[`nfs/simple.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs/simple.nix), +which tests NFS client and server functionality in the +Linux kernel (including whether locks are maintained across server +crashes), requires three machines: a server and two clients. + +There are a few special NixOS configuration options for test VMs: + +`virtualisation.memorySize` + +: The memory of the VM in megabytes. + +`virtualisation.vlans` + +: The virtual networks to which the VM is connected. See + [`nat.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nat.nix) + for an example. + +`virtualisation.writableStore` + +: By default, the Nix store in the VM is not writable. If you enable + this option, a writable union file system is mounted on top of the + Nix store to make it appear writable. This is necessary for tests + that run Nix operations that modify the store. + +For more options, see the module +[`qemu-vm.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/qemu-vm.nix). + +The test script is a sequence of Python statements that perform various +actions, such as starting VMs, executing commands in the VMs, and so on. +Each virtual machine is represented as an object stored in the variable +`name` if this is also the identifier of the machine in the declarative +config. If you didn\'t specify multiple machines using the `nodes` +attribute, it is just `machine`. The following example starts the +machine, waits until it has finished booting, then executes a command +and checks that the output is more-or-less correct: + +```py +machine.start() +machine.wait_for_unit("default.target") +if not "Linux" in machine.succeed("uname"): + raise Exception("Wrong OS") +``` + +The first line is actually unnecessary; machines are implicitly started +when you first execute an action on them (such as `wait_for_unit` or +`succeed`). If you have multiple machines, you can speed up the test by +starting them in parallel: + +```py +start_all() +``` + +The following methods are available on machine objects: + +`start` + +: Start the virtual machine. This method is asynchronous --- it does + not wait for the machine to finish booting. + +`shutdown` + +: Shut down the machine, waiting for the VM to exit. + +`crash` + +: Simulate a sudden power failure, by telling the VM to exit + immediately. + +`block` + +: Simulate unplugging the Ethernet cable that connects the machine to + the other machines. + +`unblock` + +: Undo the effect of `block`. + +`screenshot` + +: Take a picture of the display of the virtual machine, in PNG format. + The screenshot is linked from the HTML log. + +`get_screen_text_variants` + +: Return a list of different interpretations of what is currently + visible on the machine\'s screen using optical character + recognition. The number and order of the interpretations is not + specified and is subject to change, but if no exception is raised at + least one will be returned. + + ::: {.note} + This requires passing `enableOCR` to the test attribute set. + ::: + +`get_screen_text` + +: Return a textual representation of what is currently visible on the + machine\'s screen using optical character recognition. + + ::: {.note} + This requires passing `enableOCR` to the test attribute set. + ::: + +`send_monitor_command` + +: Send a command to the QEMU monitor. This is rarely used, but allows + doing stuff such as attaching virtual USB disks to a running + machine. + +`send_key` + +: Simulate pressing keys on the virtual keyboard, e.g., + `send_key("ctrl-alt-delete")`. + +`send_chars` + +: Simulate typing a sequence of characters on the virtual keyboard, + e.g., `send_chars("foobar\n")` will type the string `foobar` + followed by the Enter key. + +`execute` + +: Execute a shell command, returning a list `(status, stdout)`. + +`succeed` + +: Execute a shell command, raising an exception if the exit status is + not zero, otherwise returning the standard output. Commands are run + with `set -euo pipefail` set: + + - If several commands are separated by `;` and one fails, the + command as a whole will fail. + + - For pipelines, the last non-zero exit status will be returned + (if there is one, zero will be returned otherwise). + + - Dereferencing unset variables fail the command. + +`fail` + +: Like `succeed`, but raising an exception if the command returns a zero + status. + +`wait_until_succeeds` + +: Repeat a shell command with 1-second intervals until it succeeds. + +`wait_until_fails` + +: Repeat a shell command with 1-second intervals until it fails. + +`wait_for_unit` + +: Wait until the specified systemd unit has reached the "active" + state. + +`wait_for_file` + +: Wait until the specified file exists. + +`wait_for_open_port` + +: Wait until a process is listening on the given TCP port (on + `localhost`, at least). + +`wait_for_closed_port` + +: Wait until nobody is listening on the given TCP port. + +`wait_for_x` + +: Wait until the X11 server is accepting connections. + +`wait_for_text` + +: Wait until the supplied regular expressions matches the textual + contents of the screen by using optical character recognition (see + `get_screen_text` and `get_screen_text_variants`). + + ::: {.note} + This requires passing `enableOCR` to the test attribute set. + ::: + +`wait_for_console_text` + +: Wait until the supplied regular expressions match a line of the + serial console output. This method is useful when OCR is not + possibile or accurate enough. + +`wait_for_window` + +: Wait until an X11 window has appeared whose name matches the given + regular expression, e.g., `wait_for_window("Terminal")`. + +`copy_from_host` + +: Copies a file from host to machine, e.g., + `copy_from_host("myfile", "/etc/my/important/file")`. + + The first argument is the file on the host. The file needs to be + accessible while building the nix derivation. The second argument is + the location of the file on the machine. + +`systemctl` + +: Runs `systemctl` commands with optional support for + `systemctl --user` + + ```py + machine.systemctl("list-jobs --no-pager") # runs `systemctl list-jobs --no-pager` + machine.systemctl("list-jobs --no-pager", "any-user") # spawns a shell for `any-user` and runs `systemctl --user list-jobs --no-pager` + ``` + +`shell_interact` + +: Allows you to directly interact with the guest shell. This should + only be used during test development, not in production tests. + Killing the interactive session with `Ctrl-d` or `Ctrl-c` also ends + the guest session. + +To test user units declared by `systemd.user.services` the optional +`user` argument can be used: + +```py +machine.start() +machine.wait_for_x() +machine.wait_for_unit("xautolock.service", "x-session-user") +``` + +This applies to `systemctl`, `get_unit_info`, `wait_for_unit`, +`start_job` and `stop_job`. + +For faster dev cycles it\'s also possible to disable the code-linters +(this shouldn\'t be commited though): + +```nix +import ./make-test-python.nix { + skipLint = true; + machine = + { config, pkgs, ... }: + { configuration… + }; + + testScript = + '' + Python code… + ''; +} +``` + +This will produce a Nix warning at evaluation time. To fully disable the +linter, wrap the test script in comment directives to disable the Black +linter directly (again, don\'t commit this within the Nixpkgs +repository): + +```nix + testScript = + '' + # fmt: off + Python code… + # fmt: on + ''; +``` diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml deleted file mode 100644 index e372c66410de..000000000000 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ /dev/null @@ -1,517 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-writing-nixos-tests"> - <title>Writing Tests</title> - - <para> - A NixOS test is a Nix expression that has the following structure: -<programlisting> -import ./make-test-python.nix { - - # Either the configuration of a single machine: - machine = - { config, pkgs, ... }: - { <replaceable>configuration…</replaceable> - }; - - # Or a set of machines: - nodes = - { <replaceable>machine1</replaceable> = - { config, pkgs, ... }: { <replaceable>…</replaceable> }; - <replaceable>machine2</replaceable> = - { config, pkgs, ... }: { <replaceable>…</replaceable> }; - … - }; - - testScript = - '' - <replaceable>Python code…</replaceable> - ''; -} -</programlisting> - The attribute <literal>testScript</literal> is a bit of Python code that - executes the test (described below). During the test, it will start one or - more virtual machines, the configuration of which is described by the - attribute <literal>machine</literal> (if you need only one machine in your - test) or by the attribute <literal>nodes</literal> (if you need multiple - machines). For instance, - <filename -xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename> - only needs a single machine to test whether users can log in on the virtual - console, whether device ownership is correctly maintained when switching - between consoles, and so on. On the other hand, - <filename -xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs/simple.nix">nfs/simple.nix</filename>, - which tests NFS client and server functionality in the Linux kernel - (including whether locks are maintained across server crashes), requires - three machines: a server and two clients. - </para> - - <para> - There are a few special NixOS configuration options for test VMs: -<!-- FIXME: would be nice to generate this automatically. --> - <variablelist> - <varlistentry> - <term> - <option>virtualisation.memorySize</option> - </term> - <listitem> - <para> - The memory of the VM in megabytes. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>virtualisation.vlans</option> - </term> - <listitem> - <para> - The virtual networks to which the VM is connected. See - <filename - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nat.nix">nat.nix</filename> - for an example. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <option>virtualisation.writableStore</option> - </term> - <listitem> - <para> - By default, the Nix store in the VM is not writable. If you enable this - option, a writable union file system is mounted on top of the Nix store - to make it appear writable. This is necessary for tests that run Nix - operations that modify the store. - </para> - </listitem> - </varlistentry> - </variablelist> - For more options, see the module - <filename -xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/qemu-vm.nix">qemu-vm.nix</filename>. - </para> - - <para> - The test script is a sequence of Python statements that perform various - actions, such as starting VMs, executing commands in the VMs, and so on. Each - virtual machine is represented as an object stored in the variable - <literal><replaceable>name</replaceable></literal> if this is also the - identifier of the machine in the declarative config. - If you didn't specify multiple machines using the <literal>nodes</literal> - attribute, it is just <literal>machine</literal>. - The following example starts the machine, waits until it has finished booting, - then executes a command and checks that the output is more-or-less correct: -<programlisting> -machine.start() -machine.wait_for_unit("default.target") -if not "Linux" in machine.succeed("uname"): - raise Exception("Wrong OS") -</programlisting> - The first line is actually unnecessary; machines are implicitly started when - you first execute an action on them (such as <literal>wait_for_unit</literal> - or <literal>succeed</literal>). If you have multiple machines, you can speed - up the test by starting them in parallel: -<programlisting> -start_all() -</programlisting> - </para> - - <para> - The following methods are available on machine objects: - <variablelist> - <varlistentry> - <term> - <methodname>start</methodname> - </term> - <listitem> - <para> - Start the virtual machine. This method is asynchronous — it does not - wait for the machine to finish booting. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>shutdown</methodname> - </term> - <listitem> - <para> - Shut down the machine, waiting for the VM to exit. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>crash</methodname> - </term> - <listitem> - <para> - Simulate a sudden power failure, by telling the VM to exit immediately. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>block</methodname> - </term> - <listitem> - <para> - Simulate unplugging the Ethernet cable that connects the machine to the - other machines. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>unblock</methodname> - </term> - <listitem> - <para> - Undo the effect of <methodname>block</methodname>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>screenshot</methodname> - </term> - <listitem> - <para> - Take a picture of the display of the virtual machine, in PNG format. The - screenshot is linked from the HTML log. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>get_screen_text_variants</methodname> - </term> - <listitem> - <para> - Return a list of different interpretations of what is currently visible - on the machine's screen using optical character recognition. The number - and order of the interpretations is not specified and is subject to - change, but if no exception is raised at least one will be returned. - </para> - <note> - <para> - This requires passing <option>enableOCR</option> to the test attribute - set. - </para> - </note> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>get_screen_text</methodname> - </term> - <listitem> - <para> - Return a textual representation of what is currently visible on the - machine's screen using optical character recognition. - </para> - <note> - <para> - This requires passing <option>enableOCR</option> to the test attribute - set. - </para> - </note> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>send_monitor_command</methodname> - </term> - <listitem> - <para> - Send a command to the QEMU monitor. This is rarely used, but allows doing - stuff such as attaching virtual USB disks to a running machine. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>send_key</methodname> - </term> - <listitem> - <para> - Simulate pressing keys on the virtual keyboard, e.g., - <literal>send_key("ctrl-alt-delete")</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>send_chars</methodname> - </term> - <listitem> - <para> - Simulate typing a sequence of characters on the virtual keyboard, e.g., - <literal>send_chars("foobar\n")</literal> will type the string - <literal>foobar</literal> followed by the Enter key. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>execute</methodname> - </term> - <listitem> - <para> - Execute a shell command, returning a list - <literal>(<replaceable>status</replaceable>, - <replaceable>stdout</replaceable>)</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>succeed</methodname> - </term> - <listitem> - <para> - Execute a shell command, raising an exception if the exit status - is not zero, otherwise returning the standard output. Commands - are run with <literal>set -euo pipefail</literal> set: - <itemizedlist> - <listitem> - <para> - If several commands are separated by <literal>;</literal> - and one fails, the command as a whole will fail. - </para> - </listitem> - <listitem> - <para> - For pipelines, the last non-zero exit status will be - returned (if there is one, zero will be returned - otherwise). - </para> - </listitem> - <listitem> - <para> - Dereferencing unset variables fail the command. - </para> - </listitem> - </itemizedlist> - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>fail</methodname> - </term> - <listitem> - <para> - Like <methodname>succeed</methodname>, but raising an exception if the - command returns a zero status. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>wait_until_succeeds</methodname> - </term> - <listitem> - <para> - Repeat a shell command with 1-second intervals until it succeeds. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>wait_until_fails</methodname> - </term> - <listitem> - <para> - Repeat a shell command with 1-second intervals until it fails. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>wait_for_unit</methodname> - </term> - <listitem> - <para> - Wait until the specified systemd unit has reached the “active” state. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>wait_for_file</methodname> - </term> - <listitem> - <para> - Wait until the specified file exists. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>wait_for_open_port</methodname> - </term> - <listitem> - <para> - Wait until a process is listening on the given TCP port (on - <literal>localhost</literal>, at least). - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>wait_for_closed_port</methodname> - </term> - <listitem> - <para> - Wait until nobody is listening on the given TCP port. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>wait_for_x</methodname> - </term> - <listitem> - <para> - Wait until the X11 server is accepting connections. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>wait_for_text</methodname> - </term> - <listitem> - <para> - Wait until the supplied regular expressions matches the textual contents - of the screen by using optical character recognition (see - <methodname>get_screen_text</methodname> and - <methodname>get_screen_text_variants</methodname>). - </para> - <note> - <para> - This requires passing <option>enableOCR</option> to the test attribute - set. - </para> - </note> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>wait_for_console_text</methodname> - </term> - <listitem> - <para> - Wait until the supplied regular expressions match a line of the serial - console output. This method is useful when OCR is not possibile or - accurate enough. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>wait_for_window</methodname> - </term> - <listitem> - <para> - Wait until an X11 window has appeared whose name matches the given - regular expression, e.g., <literal>wait_for_window("Terminal")</literal>. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>copy_from_host</methodname> - </term> - <listitem> - <para> - Copies a file from host to machine, e.g., - <literal>copy_from_host("myfile", "/etc/my/important/file")</literal>. - </para> - <para> - The first argument is the file on the host. The file needs to be - accessible while building the nix derivation. The second argument is the - location of the file on the machine. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>systemctl</methodname> - </term> - <listitem> - <para> - Runs <literal>systemctl</literal> commands with optional support for - <literal>systemctl --user</literal> - </para> - <para> -<programlisting> -machine.systemctl("list-jobs --no-pager") # runs `systemctl list-jobs --no-pager` -machine.systemctl("list-jobs --no-pager", "any-user") # spawns a shell for `any-user` and runs `systemctl --user list-jobs --no-pager` -</programlisting> - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> - <methodname>shell_interact</methodname> - </term> - <listitem> - <para> - Allows you to directly interact with the guest shell. - This should only be used during test development, not in production tests. - Killing the interactive session with <literal>Ctrl-d</literal> or <literal>Ctrl-c</literal> also ends the guest session. - </para> - </listitem> - </varlistentry> - </variablelist> - </para> - - <para> - To test user units declared by <literal>systemd.user.services</literal> the - optional <literal>user</literal> argument can be used: -<programlisting> -machine.start() -machine.wait_for_x() -machine.wait_for_unit("xautolock.service", "x-session-user") -</programlisting> - This applies to <literal>systemctl</literal>, <literal>get_unit_info</literal>, - <literal>wait_for_unit</literal>, <literal>start_job</literal> and - <literal>stop_job</literal>. - </para> - - <para> - For faster dev cycles it's also possible to disable the code-linters (this shouldn't - be commited though): -<programlisting> -import ./make-test-python.nix { - skipLint = true; - machine = - { config, pkgs, ... }: - { <replaceable>configuration…</replaceable> - }; - - testScript = - '' - <replaceable>Python code…</replaceable> - ''; -} -</programlisting> - This will produce a Nix warning at evaluation time. To fully disable the - linter, wrap the test script in comment directives to disable the Black linter - directly (again, don't commit this within the Nixpkgs repository): -<programlisting> - testScript = - '' - # fmt: off - <replaceable>Python code…</replaceable> - # fmt: on - ''; -</programlisting> - </para> -</section> diff --git a/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml b/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml new file mode 100644 index 000000000000..a2030e9c0739 --- /dev/null +++ b/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml @@ -0,0 +1,50 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-running-nixos-tests-interactively"> + <title>Running Tests interactively</title> + <para> + The test itself can be run interactively. This is particularly + useful when developing or debugging a test: + </para> + <programlisting> +$ nix-build nixos/tests/login.nix -A driverInteractive +$ ./result/bin/nixos-test-driver +starting VDE switch for network 1 +> +</programlisting> + <para> + You can then take any Python statement, e.g. + </para> + <programlisting language="python"> +> start_all() +> test_script() +> machine.succeed("touch /tmp/foo") +> print(machine.succeed("pwd")) # Show stdout of command +</programlisting> + <para> + The function <literal>test_script</literal> executes the entire test + script and drops you back into the test driver command line upon its + completion. This allows you to inspect the state of the VMs after + the test (e.g. to debug the test script). + </para> + <para> + To just start and experiment with the VMs, run: + </para> + <programlisting> +$ nix-build nixos/tests/login.nix -A driverInteractive +$ ./result/bin/nixos-run-vms +</programlisting> + <para> + The script <literal>nixos-run-vms</literal> starts the virtual + machines defined by test. + </para> + <para> + You can re-use the VM states coming from a previous run by setting + the <literal>--keep-vm-state</literal> flag. + </para> + <programlisting> +$ ./result/bin/nixos-run-vms --keep-vm-state +</programlisting> + <para> + The machine state is stored in the + <literal>$TMPDIR/vm-state-machinename</literal> directory. + </para> +</section> diff --git a/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml b/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml new file mode 100644 index 000000000000..7159b95b22b0 --- /dev/null +++ b/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml @@ -0,0 +1,34 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-running-nixos-tests"> + <title>Running Tests</title> + <para> + You can run tests using <literal>nix-build</literal>. For example, + to run the test + <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix"><literal>login.nix</literal></link>, + you just do: + </para> + <programlisting> +$ nix-build '<nixpkgs/nixos/tests/login.nix>' +</programlisting> + <para> + or, if you don’t want to rely on <literal>NIX_PATH</literal>: + </para> + <programlisting> +$ cd /my/nixpkgs/nixos/tests +$ nix-build login.nix +… +running the VM test script +machine: QEMU running (pid 8841) +… +6 out of 6 tests succeeded +</programlisting> + <para> + After building/downloading all required dependencies, this will + perform a build that starts a QEMU/KVM virtual machine containing a + NixOS system. The virtual machine mounts the Nix store of the host; + this makes VM creation very fast, as no disk image needs to be + created. Afterwards, you can view a pretty-printed log of the test: + </para> + <programlisting> +$ firefox result/log.html +</programlisting> +</section> diff --git a/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml b/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml new file mode 100644 index 000000000000..83a96d5bb224 --- /dev/null +++ b/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml @@ -0,0 +1,526 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-writing-nixos-tests"> + <title>Writing Tests</title> + <para> + A NixOS test is a Nix expression that has the following structure: + </para> + <programlisting language="bash"> +import ./make-test-python.nix { + + # Either the configuration of a single machine: + machine = + { config, pkgs, ... }: + { configuration… + }; + + # Or a set of machines: + nodes = + { machine1 = + { config, pkgs, ... }: { … }; + machine2 = + { config, pkgs, ... }: { … }; + … + }; + + testScript = + '' + Python code… + ''; +} +</programlisting> + <para> + The attribute <literal>testScript</literal> is a bit of Python code + that executes the test (described below). During the test, it will + start one or more virtual machines, the configuration of which is + described by the attribute <literal>machine</literal> (if you need + only one machine in your test) or by the attribute + <literal>nodes</literal> (if you need multiple machines). For + instance, + <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix"><literal>login.nix</literal></link> + only needs a single machine to test whether users can log in on the + virtual console, whether device ownership is correctly maintained + when switching between consoles, and so on. On the other hand, + <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs/simple.nix"><literal>nfs/simple.nix</literal></link>, + which tests NFS client and server functionality in the Linux kernel + (including whether locks are maintained across server crashes), + requires three machines: a server and two clients. + </para> + <para> + There are a few special NixOS configuration options for test VMs: + </para> + <variablelist> + <varlistentry> + <term> + <literal>virtualisation.memorySize</literal> + </term> + <listitem> + <para> + The memory of the VM in megabytes. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>virtualisation.vlans</literal> + </term> + <listitem> + <para> + The virtual networks to which the VM is connected. See + <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nat.nix"><literal>nat.nix</literal></link> + for an example. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>virtualisation.writableStore</literal> + </term> + <listitem> + <para> + By default, the Nix store in the VM is not writable. If you + enable this option, a writable union file system is mounted on + top of the Nix store to make it appear writable. This is + necessary for tests that run Nix operations that modify the + store. + </para> + </listitem> + </varlistentry> + </variablelist> + <para> + For more options, see the module + <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/qemu-vm.nix"><literal>qemu-vm.nix</literal></link>. + </para> + <para> + The test script is a sequence of Python statements that perform + various actions, such as starting VMs, executing commands in the + VMs, and so on. Each virtual machine is represented as an object + stored in the variable <literal>name</literal> if this is also the + identifier of the machine in the declarative config. If you didn't + specify multiple machines using the <literal>nodes</literal> + attribute, it is just <literal>machine</literal>. The following + example starts the machine, waits until it has finished booting, + then executes a command and checks that the output is more-or-less + correct: + </para> + <programlisting language="python"> +machine.start() +machine.wait_for_unit("default.target") +if not "Linux" in machine.succeed("uname"): + raise Exception("Wrong OS") +</programlisting> + <para> + The first line is actually unnecessary; machines are implicitly + started when you first execute an action on them (such as + <literal>wait_for_unit</literal> or <literal>succeed</literal>). If + you have multiple machines, you can speed up the test by starting + them in parallel: + </para> + <programlisting language="python"> +start_all() +</programlisting> + <para> + The following methods are available on machine objects: + </para> + <variablelist> + <varlistentry> + <term> + <literal>start</literal> + </term> + <listitem> + <para> + Start the virtual machine. This method is asynchronous — it + does not wait for the machine to finish booting. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>shutdown</literal> + </term> + <listitem> + <para> + Shut down the machine, waiting for the VM to exit. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>crash</literal> + </term> + <listitem> + <para> + Simulate a sudden power failure, by telling the VM to exit + immediately. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>block</literal> + </term> + <listitem> + <para> + Simulate unplugging the Ethernet cable that connects the + machine to the other machines. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>unblock</literal> + </term> + <listitem> + <para> + Undo the effect of <literal>block</literal>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>screenshot</literal> + </term> + <listitem> + <para> + Take a picture of the display of the virtual machine, in PNG + format. The screenshot is linked from the HTML log. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>get_screen_text_variants</literal> + </term> + <listitem> + <para> + Return a list of different interpretations of what is + currently visible on the machine's screen using optical + character recognition. The number and order of the + interpretations is not specified and is subject to change, but + if no exception is raised at least one will be returned. + </para> + <note> + <para> + This requires passing <literal>enableOCR</literal> to the + test attribute set. + </para> + </note> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>get_screen_text</literal> + </term> + <listitem> + <para> + Return a textual representation of what is currently visible + on the machine's screen using optical character recognition. + </para> + <note> + <para> + This requires passing <literal>enableOCR</literal> to the + test attribute set. + </para> + </note> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>send_monitor_command</literal> + </term> + <listitem> + <para> + Send a command to the QEMU monitor. This is rarely used, but + allows doing stuff such as attaching virtual USB disks to a + running machine. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>send_key</literal> + </term> + <listitem> + <para> + Simulate pressing keys on the virtual keyboard, e.g., + <literal>send_key("ctrl-alt-delete")</literal>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>send_chars</literal> + </term> + <listitem> + <para> + Simulate typing a sequence of characters on the virtual + keyboard, e.g., + <literal>send_chars("foobar\n")</literal> will type + the string <literal>foobar</literal> followed by the Enter + key. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>execute</literal> + </term> + <listitem> + <para> + Execute a shell command, returning a list + <literal>(status, stdout)</literal>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>succeed</literal> + </term> + <listitem> + <para> + Execute a shell command, raising an exception if the exit + status is not zero, otherwise returning the standard output. + Commands are run with <literal>set -euo pipefail</literal> + set: + </para> + <itemizedlist> + <listitem> + <para> + If several commands are separated by <literal>;</literal> + and one fails, the command as a whole will fail. + </para> + </listitem> + <listitem> + <para> + For pipelines, the last non-zero exit status will be + returned (if there is one, zero will be returned + otherwise). + </para> + </listitem> + <listitem> + <para> + Dereferencing unset variables fail the command. + </para> + </listitem> + </itemizedlist> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>fail</literal> + </term> + <listitem> + <para> + Like <literal>succeed</literal>, but raising an exception if + the command returns a zero status. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>wait_until_succeeds</literal> + </term> + <listitem> + <para> + Repeat a shell command with 1-second intervals until it + succeeds. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>wait_until_fails</literal> + </term> + <listitem> + <para> + Repeat a shell command with 1-second intervals until it fails. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>wait_for_unit</literal> + </term> + <listitem> + <para> + Wait until the specified systemd unit has reached the + <quote>active</quote> state. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>wait_for_file</literal> + </term> + <listitem> + <para> + Wait until the specified file exists. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>wait_for_open_port</literal> + </term> + <listitem> + <para> + Wait until a process is listening on the given TCP port (on + <literal>localhost</literal>, at least). + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>wait_for_closed_port</literal> + </term> + <listitem> + <para> + Wait until nobody is listening on the given TCP port. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>wait_for_x</literal> + </term> + <listitem> + <para> + Wait until the X11 server is accepting connections. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>wait_for_text</literal> + </term> + <listitem> + <para> + Wait until the supplied regular expressions matches the + textual contents of the screen by using optical character + recognition (see <literal>get_screen_text</literal> and + <literal>get_screen_text_variants</literal>). + </para> + <note> + <para> + This requires passing <literal>enableOCR</literal> to the + test attribute set. + </para> + </note> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>wait_for_console_text</literal> + </term> + <listitem> + <para> + Wait until the supplied regular expressions match a line of + the serial console output. This method is useful when OCR is + not possibile or accurate enough. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>wait_for_window</literal> + </term> + <listitem> + <para> + Wait until an X11 window has appeared whose name matches the + given regular expression, e.g., + <literal>wait_for_window("Terminal")</literal>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>copy_from_host</literal> + </term> + <listitem> + <para> + Copies a file from host to machine, e.g., + <literal>copy_from_host("myfile", "/etc/my/important/file")</literal>. + </para> + <para> + The first argument is the file on the host. The file needs to + be accessible while building the nix derivation. The second + argument is the location of the file on the machine. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>systemctl</literal> + </term> + <listitem> + <para> + Runs <literal>systemctl</literal> commands with optional + support for <literal>systemctl --user</literal> + </para> + <programlisting language="python"> +machine.systemctl("list-jobs --no-pager") # runs `systemctl list-jobs --no-pager` +machine.systemctl("list-jobs --no-pager", "any-user") # spawns a shell for `any-user` and runs `systemctl --user list-jobs --no-pager` +</programlisting> + </listitem> + </varlistentry> + <varlistentry> + <term> + <literal>shell_interact</literal> + </term> + <listitem> + <para> + Allows you to directly interact with the guest shell. This + should only be used during test development, not in production + tests. Killing the interactive session with + <literal>Ctrl-d</literal> or <literal>Ctrl-c</literal> also + ends the guest session. + </para> + </listitem> + </varlistentry> + </variablelist> + <para> + To test user units declared by + <literal>systemd.user.services</literal> the optional + <literal>user</literal> argument can be used: + </para> + <programlisting language="python"> +machine.start() +machine.wait_for_x() +machine.wait_for_unit("xautolock.service", "x-session-user") +</programlisting> + <para> + This applies to <literal>systemctl</literal>, + <literal>get_unit_info</literal>, <literal>wait_for_unit</literal>, + <literal>start_job</literal> and <literal>stop_job</literal>. + </para> + <para> + For faster dev cycles it's also possible to disable the code-linters + (this shouldn't be commited though): + </para> + <programlisting language="bash"> +import ./make-test-python.nix { + skipLint = true; + machine = + { config, pkgs, ... }: + { configuration… + }; + + testScript = + '' + Python code… + ''; +} +</programlisting> + <para> + This will produce a Nix warning at evaluation time. To fully disable + the linter, wrap the test script in comment directives to disable + the Black linter directly (again, don't commit this within the + Nixpkgs repository): + </para> + <programlisting language="bash"> + testScript = + '' + # fmt: off + Python code… + # fmt: on + ''; +</programlisting> +</section> diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index a0a20228a742..34e558d8603d 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -126,6 +126,14 @@ in type = types.bool; }; + environment.localBinInPath = mkOption { + description = '' + Add ~/.local/bin/ to $PATH + ''; + default = false; + type = types.bool; + }; + environment.binsh = mkOption { default = "${config.system.build.binsh}/bin/sh"; defaultText = "\${config.system.build.binsh}/bin/sh"; @@ -198,6 +206,10 @@ in # ~/bin if it exists overrides other bin directories. export PATH="$HOME/bin:$PATH" ''} + + ${optionalString cfg.localBinInPath '' + export PATH="$HOME/.local/bin:$PATH" + ''} ''; system.activationScripts.binsh = stringAfter [ "stdio" ] diff --git a/nixos/modules/security/systemd-confinement.nix b/nixos/modules/security/systemd-confinement.nix index afb81a2b56be..0a09a755e93c 100644 --- a/nixos/modules/security/systemd-confinement.nix +++ b/nixos/modules/security/systemd-confinement.nix @@ -105,7 +105,7 @@ in { wantsAPIVFS = lib.mkDefault (config.confinement.mode == "full-apivfs"); in lib.mkIf config.confinement.enable { serviceConfig = { - RootDirectory = pkgs.runCommand rootName {} "mkdir \"$out\""; + RootDirectory = "/var/empty"; TemporaryFileSystem = "/"; PrivateMounts = lib.mkDefault true; diff --git a/nixos/modules/services/audio/slimserver.nix b/nixos/modules/services/audio/slimserver.nix index 8f94a2b49404..21632919699c 100644 --- a/nixos/modules/services/audio/slimserver.nix +++ b/nixos/modules/services/audio/slimserver.nix @@ -63,6 +63,7 @@ in { description = "Slimserver daemon user"; home = cfg.dataDir; group = "slimserver"; + isSystemUser = true; }; groups.slimserver = {}; }; diff --git a/nixos/modules/services/backup/sanoid.nix b/nixos/modules/services/backup/sanoid.nix index 0472fb4ba1e7..be44a43b6d3f 100644 --- a/nixos/modules/services/backup/sanoid.nix +++ b/nixos/modules/services/backup/sanoid.nix @@ -10,74 +10,51 @@ let description = "dataset/template options"; }; - # Default values from https://github.com/jimsalterjrs/sanoid/blob/master/sanoid.defaults.conf - commonOptions = { hourly = mkOption { description = "Number of hourly snapshots."; - type = types.ints.unsigned; - default = 48; + type = with types; nullOr ints.unsigned; + default = null; }; daily = mkOption { description = "Number of daily snapshots."; - type = types.ints.unsigned; - default = 90; + type = with types; nullOr ints.unsigned; + default = null; }; monthly = mkOption { description = "Number of monthly snapshots."; - type = types.ints.unsigned; - default = 6; + type = with types; nullOr ints.unsigned; + default = null; }; yearly = mkOption { description = "Number of yearly snapshots."; - type = types.ints.unsigned; - default = 0; + type = with types; nullOr ints.unsigned; + default = null; }; autoprune = mkOption { description = "Whether to automatically prune old snapshots."; - type = types.bool; - default = true; + type = with types; nullOr bool; + default = null; }; autosnap = mkOption { description = "Whether to automatically take snapshots."; - type = types.bool; - default = true; - }; - - settings = mkOption { - description = '' - Free-form settings for this template/dataset. See - <link xlink:href="https://github.com/jimsalterjrs/sanoid/blob/master/sanoid.defaults.conf"/> - for allowed values. - ''; - type = datasetSettingsType; - }; - }; - - commonConfig = config: { - settings = { - hourly = mkDefault config.hourly; - daily = mkDefault config.daily; - monthly = mkDefault config.monthly; - yearly = mkDefault config.yearly; - autoprune = mkDefault config.autoprune; - autosnap = mkDefault config.autosnap; + type = with types; nullOr bool; + default = null; }; }; - datasetOptions = { - useTemplate = mkOption { + datasetOptions = rec { + use_template = mkOption { description = "Names of the templates to use for this dataset."; - type = (types.listOf (types.enum (attrNames cfg.templates))) // { - description = "list of template names"; - }; + type = types.listOf (types.enum (attrNames cfg.templates)); default = []; }; + useTemplate = use_template; recursive = mkOption { description = "Whether to recursively snapshot dataset children."; @@ -85,19 +62,12 @@ let default = false; }; - processChildrenOnly = mkOption { + process_children_only = mkOption { description = "Whether to only snapshot child datasets if recursing."; type = types.bool; default = false; }; - }; - - datasetConfig = config: { - settings = { - use_template = mkDefault config.useTemplate; - recursive = mkDefault config.recursive; - process_children_only = mkDefault config.processChildrenOnly; - }; + processChildrenOnly = process_children_only; }; # Extract pool names from configured datasets @@ -109,11 +79,11 @@ let else generators.mkValueStringDefault {} v; mkKeyValue = k: v: if v == null then "" + else if k == "processChildrenOnly" then "" + else if k == "useTemplate" then "" else generators.mkKeyValueDefault { inherit mkValueString; } "=" k v; in generators.toINI { inherit mkKeyValue; } cfg.settings; - configDir = pkgs.writeTextDir "sanoid.conf" configFile; - in { # Interface @@ -135,19 +105,21 @@ in { }; datasets = mkOption { - type = types.attrsOf (types.submodule ({ config, ... }: { + type = types.attrsOf (types.submodule ({config, options, ...}: { + freeformType = datasetSettingsType; options = commonOptions // datasetOptions; - config = mkMerge [ (commonConfig config) (datasetConfig config) ]; + config.use_template = mkAliasDefinitions (options.useTemplate or {}); + config.process_children_only = mkAliasDefinitions (options.processChildrenOnly or {}); })); default = {}; description = "Datasets to snapshot."; }; templates = mkOption { - type = types.attrsOf (types.submodule ({ config, ... }: { + type = types.attrsOf (types.submodule { + freeformType = datasetSettingsType; options = commonOptions; - config = commonConfig config; - })); + }); default = {}; description = "Templates for datasets."; }; @@ -177,8 +149,8 @@ in { config = mkIf cfg.enable { services.sanoid.settings = mkMerge [ - (mapAttrs' (d: v: nameValuePair ("template_" + d) v.settings) cfg.templates) - (mapAttrs (d: v: v.settings) cfg.datasets) + (mapAttrs' (d: v: nameValuePair ("template_" + d) v) cfg.templates) + (mapAttrs (d: v: v) cfg.datasets) ]; systemd.services.sanoid = { @@ -191,7 +163,7 @@ in { ExecStart = lib.escapeShellArgs ([ "${pkgs.sanoid}/bin/sanoid" "--cron" - "--configdir" configDir + "--configdir" (pkgs.writeTextDir "sanoid.conf" configFile) ] ++ cfg.extraArgs); ExecStopPost = map (pool: lib.escapeShellArgs [ "+/run/booted-system/sw/bin/zfs" "unallow" "sanoid" pool diff --git a/nixos/modules/services/misc/geoipupdate.nix b/nixos/modules/services/misc/geoipupdate.nix index 5d87be928d98..3211d4d88e4d 100644 --- a/nixos/modules/services/misc/geoipupdate.nix +++ b/nixos/modules/services/misc/geoipupdate.nix @@ -99,9 +99,22 @@ in LockFile = "/run/geoipupdate/.lock"; }; + systemd.services.geoipupdate-create-db-dir = { + serviceConfig.Type = "oneshot"; + script = '' + mkdir -p ${cfg.settings.DatabaseDirectory} + chmod 0755 ${cfg.settings.DatabaseDirectory} + ''; + }; + systemd.services.geoipupdate = { description = "GeoIP Updater"; - after = [ "network-online.target" "nss-lookup.target" ]; + requires = [ "geoipupdate-create-db-dir.service" ]; + after = [ + "geoipupdate-create-db-dir.service" + "network-online.target" + "nss-lookup.target" + ]; wants = [ "network-online.target" ]; startAt = cfg.interval; serviceConfig = { @@ -119,11 +132,9 @@ in }; }; - geoipupdateConf = pkgs.writeText "discourse.conf" (geoipupdateKeyValue cfg.settings); + geoipupdateConf = pkgs.writeText "geoipupdate.conf" (geoipupdateKeyValue cfg.settings); script = '' - mkdir -p "${cfg.settings.DatabaseDirectory}" - chmod 755 "${cfg.settings.DatabaseDirectory}" chown geoip "${cfg.settings.DatabaseDirectory}" cp ${geoipupdateConf} /run/geoipupdate/GeoIP.conf @@ -139,7 +150,38 @@ in ReadWritePaths = cfg.settings.DatabaseDirectory; RuntimeDirectory = "geoipupdate"; RuntimeDirectoryMode = 0700; + CapabilityBoundingSet = ""; + PrivateDevices = true; + PrivateMounts = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictRealtime = true; + RestrictNamespaces = true; + MemoryDenyWriteExecute = true; + LockPersonality = true; + SystemCallArchitectures = "native"; + }; + }; + + systemd.timers.geoipupdate-initial-run = { + wantedBy = [ "timers.target" ]; + unitConfig.ConditionPathExists = "!${cfg.settings.DatabaseDirectory}"; + timerConfig = { + Unit = "geoipupdate.service"; + OnActiveSec = 0; }; }; }; + + meta.maintainers = [ lib.maintainers.talyz ]; } diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 6d8dfcce933c..2748571be1f7 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -231,9 +231,9 @@ in { } fi '' + optionalString cfg.autoMount '' - ipfs --local config Mounts.FuseAllowOther --json true - ipfs --local config Mounts.IPFS ${cfg.ipfsMountDir} - ipfs --local config Mounts.IPNS ${cfg.ipnsMountDir} + ipfs --offline config Mounts.FuseAllowOther --json true + ipfs --offline config Mounts.IPFS ${cfg.ipfsMountDir} + ipfs --offline config Mounts.IPNS ${cfg.ipnsMountDir} '' + concatStringsSep "\n" (collect isString (mapAttrsRecursive @@ -243,7 +243,7 @@ in { read value <<EOF ${builtins.toJSON value} EOF - ipfs --local config --json "${concatStringsSep "." path}" "$value" + ipfs --offline config --json "${concatStringsSep "." path}" "$value" '') ({ Addresses.API = cfg.apiAddress; Addresses.Gateway = cfg.gatewayAddress; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 91caa2ccb422..2c96b94ca43c 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -453,6 +453,7 @@ in { ExecStart = (optionalString cfg.startWhenNeeded "-") + "${cfgc.package}/bin/sshd " + (optionalString cfg.startWhenNeeded "-i ") + + "-D " + # don't detach into a daemon process "-f /etc/ssh/sshd_config"; KillMode = "process"; } // (if cfg.startWhenNeeded then { diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index c33a38179ee4..3f88ff53dff0 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -34,7 +34,7 @@ in { systemd.packages = [ cfg.package ]; systemd.services.tailscaled = { wantedBy = [ "multi-user.target" ]; - path = [ pkgs.openresolv ]; + path = [ pkgs.openresolv pkgs.procps ]; serviceConfig.Environment = [ "PORT=${toString cfg.port}" ''"FLAGS=--tun ${lib.escapeShellArg cfg.interfaceName}"'' diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index 9c7166f381a3..d3ae072f86a8 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -30,6 +30,9 @@ in package = lib.mkOption { type = lib.types.package; default = pkgs.discourse; + apply = p: p.override { + plugins = lib.unique (p.enabledPlugins ++ cfg.plugins); + }; defaultText = "pkgs.discourse"; description = '' The discourse package to use. @@ -731,8 +734,6 @@ in cp -r ${cfg.package}/share/discourse/config.dist/* /run/discourse/config/ cp -r ${cfg.package}/share/discourse/public.dist/* /run/discourse/public/ - cp -r ${cfg.package}/share/discourse/plugins.dist/* /run/discourse/plugins/ - ${lib.concatMapStringsSep "\n" (p: "ln -sf ${p} /run/discourse/plugins/") cfg.plugins} ln -sf /var/lib/discourse/uploads /run/discourse/public/uploads ln -sf /var/lib/discourse/backups /run/discourse/public/backups diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix index 381a55faff16..d075449012f7 100644 --- a/nixos/modules/services/web-servers/minio.nix +++ b/nixos/modules/services/web-servers/minio.nix @@ -4,6 +4,11 @@ with lib; let cfg = config.services.minio; + + legacyCredentials = cfg: pkgs.writeText "minio-legacy-credentials" '' + MINIO_ROOT_USER=${cfg.accessKey} + MINIO_ROOT_PASSWORD=${cfg.secretKey} + ''; in { meta.maintainers = [ maintainers.bachp ]; @@ -49,6 +54,17 @@ in ''; }; + rootCredentialsFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + File containing the MINIO_ROOT_USER, default is "minioadmin", and + MINIO_ROOT_PASSWORD (length >= 8), default is "minioadmin"; in the format of + an EnvironmentFile=, as described by systemd.exec(5). + ''; + example = "/etc/nixos/minio-root-credentials"; + }; + region = mkOption { default = "us-east-1"; type = types.str; @@ -72,6 +88,8 @@ in }; config = mkIf cfg.enable { + warnings = optional ((cfg.accessKey != "") || (cfg.secretKey != "")) "services.minio.`accessKey` and services.minio.`secretKey` are deprecated, please use services.minio.`rootCredentialsFile` instead."; + systemd.tmpfiles.rules = [ "d '${cfg.configDir}' - minio minio - -" ] ++ (map (x: "d '" + x + "' - minio minio - - ") cfg.dataDir); @@ -86,14 +104,13 @@ in User = "minio"; Group = "minio"; LimitNOFILE = 65536; + EnvironmentFile = if (cfg.rootCredentialsFile != null) then cfg.rootCredentialsFile + else if ((cfg.accessKey != "") || (cfg.secretKey != "")) then (legacyCredentials cfg) + else null; }; environment = { MINIO_REGION = "${cfg.region}"; MINIO_BROWSER = "${if cfg.browser then "on" else "off"}"; - } // optionalAttrs (cfg.accessKey != "") { - MINIO_ACCESS_KEY = "${cfg.accessKey}"; - } // optionalAttrs (cfg.secretKey != "") { - MINIO_SECRET_KEY = "${cfg.secretKey}"; }; }; diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 63e01dd054a5..7134b4321630 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -61,7 +61,7 @@ def write_loader_conf(profile: Optional[str], generation: int) -> None: def profile_path(profile: Optional[str], generation: int, name: str) -> str: - return os.readlink("%s/%s" % (system_dir(profile, generation), name)) + return os.path.realpath("%s/%s" % (system_dir(profile, generation), name)) def copy_from_profile(profile: Optional[str], generation: int, name: str, dry_run: bool = False) -> str: diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 8c82b4bcf5db..f87d3b07a360 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -621,6 +621,8 @@ in Whether to allow TRIM requests to the underlying device. This option has security implications; please read the LUKS documentation before activating it. + This option is incompatible with authenticated encryption (dm-crypt + stacked over dm-integrity). ''; }; diff --git a/nixos/tests/sanoid.nix b/nixos/tests/sanoid.nix index c691bfc08ef7..1983945915fe 100644 --- a/nixos/tests/sanoid.nix +++ b/nixos/tests/sanoid.nix @@ -33,7 +33,7 @@ in { autosnap = true; }; - datasets."pool/sanoid".useTemplate = [ "test" ]; + datasets."pool/sanoid".use_template = [ "test" ]; extraArgs = [ "--verbose" ]; }; diff --git a/nixos/tests/vault.nix b/nixos/tests/vault.nix index 59bccbe25959..c3b28b62695a 100644 --- a/nixos/tests/vault.nix +++ b/nixos/tests/vault.nix @@ -19,6 +19,8 @@ import ./make-test-python.nix ({ pkgs, ... }: machine.wait_for_unit("vault.service") machine.wait_for_open_port(8200) machine.succeed("vault operator init") - machine.succeed("vault status | grep Sealed | grep true") + # vault now returns exit code 2 for sealed vaults + machine.fail("vault status") + machine.succeed("vault status || test $? -eq 2") ''; }) diff --git a/nixos/tests/zsh-history.nix b/nixos/tests/zsh-history.nix index 3109c3f65081..355687798406 100644 --- a/nixos/tests/zsh-history.nix +++ b/nixos/tests/zsh-history.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { # Login default.wait_until_tty_matches(1, "login: ") default.send_chars("root\n") - default.wait_until_tty_matches(1, "root@default>") + default.wait_until_tty_matches(1, r"\nroot@default\b") # Generate some history default.send_chars("echo foobar\n") diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 7af4b585adfa..6f0d34b870aa 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -1,49 +1,117 @@ -{ lib, mkDerivation, fetchurl, fetchFromGitHub, chromaprint -, fftw, flac, faad2, glibcLocales, mp4v2 -, libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis -, libGLU, libxcb, lilv, lv2, opusfile -, pkg-config, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg -, qtx11extras, rubberband, sconsPackages, sqlite, taglib, upower, vamp-plugin-sdk +{ lib +, mkDerivation +, fetchurl +, fetchFromGitHub +, chromaprint +, cmake +, faad2 +, ffmpeg +, fftw +, flac +, glibcLocales +, hidapi +, lame +, libebur128 +, libGLU +, libid3tag +, libkeyfinder +, libmad +, libmodplug +, libopus +, libsecret +, libshout +, libsndfile +, libusb1 +, libvorbis +, libxcb +, lilv +, lv2 +, mp4v2 +, opusfile +, pcre +, pkg-config +, portaudio +, portmidi +, protobuf +, qtbase +, qtkeychain +, qtscript +, qtsvg +, qtx11extras +, rubberband +, serd +, sord +, soundtouch +, sratom +, sqlite +, taglib +, upower +, vamp-plugin-sdk +, wavpack }: -let - # Because libshout 2.4.2 and newer seem to break streaming in mixxx, build it - # with 2.4.1 instead. - libshout241 = libshout.overrideAttrs (o: rec { - name = "libshout-2.4.1"; - src = fetchurl { - url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz"; - sha256 = "0kgjpf8jkgyclw11nilxi8vyjk4s8878x23qyxnvybbgqbgbib7k"; - }; - }); -in mkDerivation rec { pname = "mixxx"; - version = "2.2.4"; + version = "2.3.0"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; - rev = "release-${version}"; - sha256 = "1dj9li8av9b2kbm76jvvbdmihy1pyrw0s4xd7dd524wfhwr1llxr"; + rev = version; + sha256 = "18sx4l3zzbn5142xfv5bp0crdd615a5728fkprqacnx3zpa144x6"; }; - nativeBuildInputs = [ sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ - chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout241 libsndfile - libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkg-config portaudio portmidi protobuf qtbase qtscript qtsvg - qtx11extras rubberband sqlite taglib upower vamp-plugin-sdk + chromaprint + faad2 + ffmpeg + fftw + flac + glibcLocales + hidapi + lame + libebur128 + libGLU + libid3tag + libkeyfinder + libmad + libmodplug + libopus + libsecret + libshout + libsndfile + libusb1 + libvorbis + libxcb + lilv + lv2 + mp4v2 + opusfile + pcre + portaudio + portmidi + protobuf + qtbase + qtkeychain + qtscript + qtsvg + qtx11extras + rubberband + serd + sord + soundtouch + sratom + sqlite + taglib + upower + vamp-plugin-sdk + wavpack ]; enableParallelBuilding = true; - sconsFlags = [ - "build=release" - "qtdir=${qtbase}" - "faad=1" - "opus=1" - ]; - qtWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" ]; @@ -52,7 +120,7 @@ mkDerivation rec { homepage = "https://mixxx.org"; description = "Digital DJ mixing software"; license = licenses.gpl2Plus; - maintainers = [ maintainers.goibhniu maintainers.bfortz ]; + maintainers = with maintainers; [ goibhniu bfortz ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 298ae39716bb..0692f40e35f1 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.26.1"; + version = "2.29.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "0zbzqq3c0q45dz4vvgfbvqcgda7413mnwixi7yi78qb9mp8zxkhy"; + sha256 = "1y4xvnwh2mqbc39pmnpgjg8mlx208s2pipm7dazq4bgmay7k9zh0"; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index bd9e26ae73ab..4bb5f1f7a6b4 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -46,7 +46,7 @@ appimageTools.wrapType2 rec { install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png install -m 444 -D ${appimageContents}/resources/images/icons/512x512.png $out/share/icons/hicolor/512x512/apps/${pname}.png substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}' # symlink system binaries instead bundled ones mkdir -p $out/share/${pname}/resources/bin/{bridge,tor} diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 946cef998c1e..8a87889e7028 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -640,10 +640,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.8"; + version = "0.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-0.8.tar"; - sha256 = "0vkq8dsj6k3gsdhiyg6ccv49fqgjw6f0db4wjsvm5zbkadjvlm86"; + url = "https://elpa.gnu.org/packages/consult-0.9.tar"; + sha256 = "1n3bnvgj92fjd9dai9f95wvyfb20yhaw7b722lkqjg42i10jqzfn"; }; packageRequires = [ emacs ]; meta = { @@ -670,10 +670,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.8"; + version = "0.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.8.tar"; - sha256 = "1qrrky1g4k5vw56435dgkwnmnri7i51gkydd76as3l0ixm4pnp05"; + url = "https://elpa.gnu.org/packages/corfu-0.9.tar"; + sha256 = "0710bq07j6w6zm49ci1bbx580frdbc62b3hbxwzkwm5204nf78bf"; }; packageRequires = [ emacs ]; meta = { @@ -835,10 +835,10 @@ elpaBuild { pname = "devdocs"; ename = "devdocs"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/devdocs-0.1.tar"; - sha256 = "1ps2jpp1ckq9839l63p6npqrf85b8zb5akwvjvv7fkm8nvspdkil"; + url = "https://elpa.gnu.org/packages/devdocs-0.2.tar"; + sha256 = "1npc7yra7pvf86ahmz1h7hnjxrz15ar1vjcalg4ilizypycpgrwj"; }; packageRequires = [ emacs ]; meta = { @@ -1015,10 +1015,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.6.23"; + version = "0.6.24"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.6.23.tar"; - sha256 = "0j3jvy9s606qjqcmcjzgck3dp8bhpgly2g00wnswzcgk4makdzld"; + url = "https://elpa.gnu.org/packages/ebdb-0.6.24.tar"; + sha256 = "0156rh6fkv2yp509h6i8qzh4gsda2mcmfrxl4r6ywn1z5ahijc3r"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -1075,10 +1075,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20210607"; + version = "20210618"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20210607.tar"; - sha256 = "0avd58m8630s4d3ys9g84csscdmf2y1swwwkgzjkrrq8q0j5yd3l"; + url = "https://elpa.gnu.org/packages/eev-20210618.tar"; + sha256 = "13sb9shpj9fhns8sl3dxdgnn8z4wf14mgi4s87k5x4nrr012sscf"; }; packageRequires = [ emacs ]; meta = { @@ -1198,10 +1198,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "7.2"; + version = "7.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-7.2.tar"; - sha256 = "11vqqh9rnzibsfw7wx62rgzl8i8ldpf0hv1sj43nhl5c6dlc8d5z"; + url = "https://elpa.gnu.org/packages/emms-7.5.tar"; + sha256 = "0d7nsx2idzbp6d5im5rrsnwppbr2cimvxgx31bhwsm2aq3ya5v2j"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -1867,10 +1867,10 @@ elpaBuild { pname = "ivy-posframe"; ename = "ivy-posframe"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-posframe-0.6.0.tar"; - sha256 = "07dzglrcdl54lkznyphw97xwd9bcwzdcgzkav0vqfk7f5cwh1wkf"; + url = "https://elpa.gnu.org/packages/ivy-posframe-0.6.1.tar"; + sha256 = "1nay2sfbwm2fkp3f1y89innd9h6j3q70q9y4yddrwa69cxlj9m23"; }; packageRequires = [ emacs ivy posframe ]; meta = { @@ -2017,10 +2017,10 @@ elpaBuild { pname = "leaf"; ename = "leaf"; - version = "4.4.8"; + version = "4.5.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/leaf-4.4.8.tar"; - sha256 = "0h0ksmgrhn29ci6z8y54dbbzcqlvfs1ra0kmf226gz0dqzk45vb3"; + url = "https://elpa.gnu.org/packages/leaf-4.5.2.tar"; + sha256 = "0i90shhhkpdcwmfi8zv0008qgmg4g3cqd2yvpycfv9n2axvhag54"; }; packageRequires = [ emacs ]; meta = { @@ -2152,10 +2152,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "0.6"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-0.6.tar"; - sha256 = "05pwaz9643shxnv63l6r9m2c0qf1nc1hy6jiqw01bkvvgg8g4jag"; + url = "https://elpa.gnu.org/packages/marginalia-0.7.tar"; + sha256 = "1nz55nx6xp72nahs4g6asl5y5yrlnlnza58bjrlwwzmwsf7daz18"; }; packageRequires = [ emacs ]; meta = { @@ -2829,10 +2829,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-1.0.3.tar"; - sha256 = "0c3lnrydsysv8j25brgc0cckf1hz54yhkginncmw81y1ia43rqmx"; + url = "https://elpa.gnu.org/packages/posframe-1.0.4.tar"; + sha256 = "0i2pw90gw9zb22gj8yyvcp3b2k1bxxhbjj0idvr5iz1vd9023bc6"; }; packageRequires = [ emacs ]; meta = { @@ -2889,10 +2889,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "3.7.9"; + version = "3.8.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-3.7.9.tar"; - sha256 = "00ff1izdwcy53dcwpdn18wwndnw2jsw4bhg8gkqaa60xm468xzkl"; + url = "https://elpa.gnu.org/packages/pyim-3.8.2.tar"; + sha256 = "05sgciqb0hzy07j8pvbg7h2vpa9z5z60m6pknxd3b1kpi45vaihw"; }; packageRequires = [ async emacs xr ]; meta = { @@ -3355,10 +3355,10 @@ elpaBuild { pname = "setup"; ename = "setup"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/setup-0.2.0.tar"; - sha256 = "1xhjkyksilw1vbx12a4yz4bpj0dhl3m02yi8d9nyd19z098cfa9y"; + url = "https://elpa.gnu.org/packages/setup-0.2.1.tar"; + sha256 = "15paand086g33w2vb6jkyxd3i2pmpp84f31y3j5v8w9ia68pjzms"; }; packageRequires = [ emacs ]; meta = { @@ -3595,10 +3595,10 @@ elpaBuild { pname = "sql-indent"; ename = "sql-indent"; - version = "1.5"; + version = "1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sql-indent-1.5.tar"; - sha256 = "07k5rn9hbxppnka7nq0a3a6zyqqa1hp8j6qrb344js6zyak0cb63"; + url = "https://elpa.gnu.org/packages/sql-indent-1.6.tar"; + sha256 = "000pimlg0k4mrv2wpqq8w8l51wpr1lzlaq6ai8iaximm2a92ap5b"; }; packageRequires = [ cl-lib ]; meta = { @@ -3610,10 +3610,10 @@ elpaBuild { pname = "ssh-deploy"; ename = "ssh-deploy"; - version = "3.1.12"; + version = "3.1.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.12.tar"; - sha256 = "0fz49l63jfw9zy459f07bq2irdb8ispnx8m2c3wxwiim9yw5xnjg"; + url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.13.tar"; + sha256 = "006jr8yc5qvxdfk0pn40604a2b7a1ah6l6hi6rhxm3p5b08d9i5w"; }; packageRequires = [ emacs ]; meta = { @@ -3779,10 +3779,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.0.5"; + version = "2.5.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.0.5.tar"; - sha256 = "1dclxffynfacvwi2scpda35sxjb42603yyf2p0477qa9b0i4xha0"; + url = "https://elpa.gnu.org/packages/tramp-2.5.1.tar"; + sha256 = "1r7wifhzy2ipdlc4fqnx6549fnx45ggz57wh0cp7s6y25761si7q"; }; packageRequires = [ emacs ]; meta = { @@ -3824,10 +3824,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.3.4"; + version = "0.3.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-0.3.4.tar"; - sha256 = "1m71w52cr8f9wm6lybfa003w408lkrl6q9whs53hpp3pl5phhfvb"; + url = "https://elpa.gnu.org/packages/transient-0.3.5.tar"; + sha256 = "15dlj21gn0zxywic9wdcp5zc8skm1s170bq7smgkpd3p3lxslf68"; }; packageRequires = [ emacs ]; meta = { @@ -3949,6 +3949,21 @@ license = lib.licenses.free; }; }) {}; + vc-hgcmd = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "vc-hgcmd"; + ename = "vc-hgcmd"; + version = "1.14"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vc-hgcmd-1.14.tar"; + sha256 = "0pg6fg0znsmky3iwdpxn2sx5bbn72kw83s077000ilawi6zqwc2d"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vc-hgcmd.html"; + license = lib.licenses.free; + }; + }) {}; vcard = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "vcard"; @@ -4015,10 +4030,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-0.11.tar"; - sha256 = "0hzwddkac85i449173az8crlksj9ivrqf969r81kbr45ksgr1ij6"; + url = "https://elpa.gnu.org/packages/vertico-0.12.tar"; + sha256 = "14qlc438bysg23wfj04zpvpraqzzi4jlz3r11vc56vd0k2hfmvmn"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix index b70032982c01..e5f6f1aa7c9e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20210607"; + version = "20210628"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20210607.tar"; - sha256 = "178z9bnzcdaymnwxf0kkw1yzlzkj5dmdjjwdklc9qb9iv6rckfji"; + url = "https://orgmode.org/elpa/org-20210628.tar"; + sha256 = "1sn2yyynndk8qf43ss8bayll33r4ina8xfx4ywzcs3m1lm6xy1zl"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20210607"; + version = "20210628"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210607.tar"; - sha256 = "03liivgfcmp0lh6p57bh2gyn85n3sc4p91y374kq8kzc7fzrgzyr"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210628.tar"; + sha256 = "0r4kxp1hbhkwvi7939fglng8db4h4n7vigy8pd2gia3a02xcw8l5"; }; packageRequires = []; 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 1429040e4158..86d117b89561 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -25,26 +25,26 @@ }, { "ename": "0x0", - "commit": "a48b10b770038efc606fbbbedf79178d3b05186c", - "sha256": "1nkc5hfz77s37a1rp8m69f7zbk05jc1y1fcj0b46h9khyz6zbm01", + "commit": "982788433004ba644a372c50130613e3c56bba10", + "sha256": "0447s6jq57g0p5myb295930wyqk7q5qj00r8qi3l39670xsgbqdl", "fetcher": "git", - "url": "https://git.sr.ht/~zge/nullpointer-emacs", + "url": "https://git.sr.ht/~pkal/nullpointer-emacs", "unstable": { "version": [ - 20210512, - 1001 + 20210628, + 1207 ], - "commit": "655846fd3ce772950d30167b4b9be6ce64502ae7", - "sha256": "0y4v72pmjjly2kxrrwks2z35qbc76109pnqpj637fpjr190c468l" + "commit": "a613afa08271a75551a4d2165b4ab872b131edc0", + "sha256": "1ngaq8ldyv9h0g5c83y4g5z1a19z4k90dha5y4g7v3lpzmqx4jgn" }, "stable": { "version": [ 0, 4, - 2 + 3 ], - "commit": "655846fd3ce772950d30167b4b9be6ce64502ae7", - "sha256": "0y4v72pmjjly2kxrrwks2z35qbc76109pnqpj637fpjr190c468l" + "commit": "ab3e213607e6349aecc0063332972ac40506edd9", + "sha256": "1aywyarjl8fghy5py05rd64sidhkla0xzks1596p1gwpk5pm7n0n" } }, { @@ -741,10 +741,10 @@ }, { "ename": "ac-html", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "1vidmvylwwvraf8k63dvxv47ism49n6pp0f38l5rl4iaznhkdr84", + "commit": "28430d3db6e21cec8b138ef09320aeed711e58f9", + "sha256": "1fhrvww7sds90b4ka16sp79pjbjwrrl6ycp65pfc4b2cg1bq1w7m", "fetcher": "github", - "repo": "zhangkaiyulw/ac-html", + "repo": "victorteokw/ac-html", "unstable": { "version": [ 20151005, @@ -1029,8 +1029,8 @@ "auto-complete", "yasnippet" ], - "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", - "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" + "commit": "8a0dc9888de87ea3aace06628bff52ed32f3ca2b", + "sha256": "1xcsm72by6jiqr9y9fyk70nshsj5dj494faz9734m67fmxq45pfj" }, "stable": { "version": [ @@ -1055,8 +1055,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20210218, - 559 + 20210617, + 949 ], "deps": [ "dash", @@ -1066,8 +1066,8 @@ "s", "xcscope" ], - "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", - "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" + "commit": "8a0dc9888de87ea3aace06628bff52ed32f3ca2b", + "sha256": "1xcsm72by6jiqr9y9fyk70nshsj5dj494faz9734m67fmxq45pfj" }, "stable": { "version": [ @@ -1133,8 +1133,8 @@ "auto-complete", "rtags" ], - "commit": "63f18acb21e664fd92fbc19465f0b5df085b5e93", - "sha256": "0wzyn9qzyly71yfwhlk5m94ygjnbk459pgbpgkhp9fqgchx12p1r" + "commit": "65113e2a137baa9f85dc2157b893291470788dc4", + "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h" }, "stable": { "version": [ @@ -1507,14 +1507,14 @@ "repo": "mrkkrp/ace-popup-menu", "unstable": { "version": [ - 20210318, - 1748 + 20210608, + 839 ], "deps": [ "avy-menu" ], - "commit": "9a2056c53faba0bd7b7f44fb3faabf4d34b8497f", - "sha256": "0i7a708y9x4xdny3ccqwngn4la5vg0539c7qk87d163gl61mbk7k" + "commit": "594a305704be8ca0ef79a12b787bdb59bc6077c0", + "sha256": "1ykpb4l29iw5bxmip9cn6irgiak2hwb79kg1k5m32wc9p6b4kbjf" }, "stable": { "version": [ @@ -1929,30 +1929,28 @@ "repo": "agda/agda", "unstable": { "version": [ - 20210505, - 1142 + 20210619, + 545 ], "deps": [ "annotation", "eri" ], - "commit": "044843c5281a7bdb9479317793a75c8c0fcfadd9", - "sha256": "04lirb2p1h46c1l84ysdnr2jxvzsdw1zv6jhm7h8ybgzmaa65b6m" + "commit": "007a26fb5f7d9eb54db16484fb116d6e47c8cc5e", + "sha256": "1w9pra3qqmidsf5mvp0lmk9liw1ryaf8kjiawfgyyc6mzgw6nrvz" }, "stable": { "version": [ 2, 6, - 1, - 3, - 20210605 + 2 ], "deps": [ "annotation", "eri" ], - "commit": "ab805592a0ae7066fbd5fa5f47e933194fce878f", - "sha256": "19ld12x4is0nx52i05zv20js0zysx3bljbdn2nr65vy11dq2cyyp" + "commit": "246a229faea2ef2fa53caf491ff8a2d72dd7510c", + "sha256": "1ccmryw6vs8d87d5zmjl0kr2kvyd1zxl73344fa7yzqgg2kw1da6" } }, { @@ -2323,8 +2321,8 @@ "deps": [ "flycheck" ], - "commit": "df5664e71c1026af4aaf69e6b227d427a728e7c6", - "sha256": "1czy3sbwm6lfrgdbj0y12q4n70w6zg8g3y27iz1zr4y20hhcp2zk" + "commit": "bf859fdb80a46c6d0d9fd8f8540a8ae96d5c1016", + "sha256": "1bp3q84alqwkglifhwc5kcrb2dc22kjd3l0h9r0bh1klz70sjss4" }, "stable": { "version": [ @@ -2451,14 +2449,25 @@ "repo": "wyuenho/all-the-icons-dired", "unstable": { "version": [ - 20210422, - 921 + 20210614, + 1350 ], "deps": [ "all-the-icons" ], - "commit": "a294f45ec2c338e1255ae2dd98b19f3f143204e6", - "sha256": "1m3gqsgybx57qhdlswbn92cnsz9w10sqfzs2lnja63hzwzwxjg92" + "commit": "a758766878b6e8b9eaaf41d68599a2df99e37f48", + "sha256": "1shla7nyhml9m3g81p6yy8k4pdq289gb42900xzfp7zl4qvnm2vy" + }, + "stable": { + "version": [ + 2, + 0 + ], + "deps": [ + "all-the-icons" + ], + "commit": "a758766878b6e8b9eaaf41d68599a2df99e37f48", + "sha256": "1shla7nyhml9m3g81p6yy8k4pdq289gb42900xzfp7zl4qvnm2vy" } }, { @@ -2550,28 +2559,28 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20210605, - 1700 + 20210626, + 1956 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "e0eba9cb8f8c85c0b63434f6117f9fa232d8a890", - "sha256": "05a53s7v1vy688gwnn01p3flqlhznp2m0k1mg8ax4hjygyc05l8q" + "commit": "07b8c5271719afa6a4c598c2a19f4a096ca6efe8", + "sha256": "1blr46w08s9f3wrcarqds09is9akdsq8faghshby5fnk9s5srkq3" }, "stable": { "version": [ 1, - 5, - 1 + 6, + 2 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "0138c7e7f3b7a6c09665e45a6dd2168359efd47c", - "sha256": "0nbbkasbklxf62rx9mc5w37r014vdbbg3vm5dy03hxzvq3y1yrpn" + "commit": "07b8c5271719afa6a4c598c2a19f4a096ca6efe8", + "sha256": "1blr46w08s9f3wrcarqds09is9akdsq8faghshby5fnk9s5srkq3" } }, { @@ -3150,11 +3159,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20210519, - 1401 + 20210620, + 751 ], - "commit": "b22f594f3b813b12e442860344d2feb39d944b53", - "sha256": "1911j82vw8pp58byc41v2fhbjvr3l9rdjqa46gs757xssh0g8jal" + "commit": "9aba6305fef54f32b085a56ce2b843b3d8194ac2", + "sha256": "1n2pgvc4fw8r22ck2r3jmkrrh1vlwv1r35ljy5g3b95zjh11w7g4" }, "stable": { "version": [ @@ -3192,19 +3201,17 @@ 20200914, 644 ], - "commit": "044843c5281a7bdb9479317793a75c8c0fcfadd9", - "sha256": "04lirb2p1h46c1l84ysdnr2jxvzsdw1zv6jhm7h8ybgzmaa65b6m" + "commit": "007a26fb5f7d9eb54db16484fb116d6e47c8cc5e", + "sha256": "1w9pra3qqmidsf5mvp0lmk9liw1ryaf8kjiawfgyyc6mzgw6nrvz" }, "stable": { "version": [ 2, 6, - 1, - 3, - 20210605 + 2 ], - "commit": "ab805592a0ae7066fbd5fa5f47e933194fce878f", - "sha256": "19ld12x4is0nx52i05zv20js0zysx3bljbdn2nr65vy11dq2cyyp" + "commit": "246a229faea2ef2fa53caf491ff8a2d72dd7510c", + "sha256": "1ccmryw6vs8d87d5zmjl0kr2kvyd1zxl73344fa7yzqgg2kw1da6" } }, { @@ -4517,30 +4524,6 @@ } }, { - "ename": "auth-source-pass", - "commit": "6e63342b442794ead4d8bed803b0924d9cd26dc4", - "sha256": "10l3kbffy08fh0krwvh4gn75k37criv2ma5hgkadvq1s2p5ps8r6", - "fetcher": "github", - "repo": "DamienCassou/auth-source-pass", - "unstable": { - "version": [ - 20210210, - 1908 - ], - "commit": "fa8b964494c1ef42035fad340ff5f29fcdbed21c", - "sha256": "0fn30iy1jy0kh09652a0fn7zg93cf3xvs2bz28lml7knj2hbqi2r" - }, - "stable": { - "version": [ - 5, - 0, - 0 - ], - "commit": "df074612114c3cc2fa1c3023f26ff182f9b1190a", - "sha256": "0qnqqdpbfr06nqw4hq7c1s7yh7zyrv4gqjj06v70cavjml7pagp6" - } - }, - { "ename": "auth-source-xoauth2", "commit": "8ba0273c8aa2a50b9dc9b8312b860d94dfd808d5", "sha256": "0g06240ix4gzw3fb74jcadiq7nissi20i1vsbzhkx35j10mv7wn3", @@ -4605,14 +4588,14 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20210518, - 1020 + 20210615, + 1457 ], "deps": [ "packed" ], - "commit": "3af0b02393ca4f207f1e454161f7bd8a747f3051", - "sha256": "1h2iv14ppj5pqbnb7z7xvw1jm3cmis10jpqnd6miax1s6jlm8z0r" + "commit": "0f3afc6b057f9c9a3b60966f36e34cb46008cf61", + "sha256": "0grb9y7v7ibbcjv1yhssnavz43cij16ys5c68my8mv12wg5ld86z" }, "stable": { "version": [ @@ -4964,19 +4947,22 @@ "repo": "jcs-elpa/auto-highlight-symbol", "unstable": { "version": [ - 20210108, - 1841 + 20210629, + 1535 ], - "commit": "5ad84d0a12b175360b18504cd04e6bf7ab1cf5c8", - "sha256": "0dpsqzl6nn08kg9d42a6zpk7jq6621c0hzf28c1ary4vzcwm4j9v" + "deps": [ + "ht" + ], + "commit": "45c472cf72df1d477550dcc07e556047b2fc5852", + "sha256": "1xbkcpidmzlbv3qs8r9i880pbkf7w78xagh85nvcrv965ra66k6c" }, "stable": { "version": [ 1, - 59 + 60 ], - "commit": "0982390f19fee3c05856b9e4e40056dce4c4020d", - "sha256": "1vvk0vp61y63rjhfxk5ajs0m4p36pvbwb97sw66zdlrq5h33lmv9" + "commit": "d5125800b038d1275aabd14008ede75a3a858587", + "sha256": "1mi4mayfavkfm9fkg1j1wcv6kvb2cfgf5nr5kk15jhy7x1ajwphp" } }, { @@ -5111,11 +5097,11 @@ "repo": "jcs-elpa/auto-rename-tag", "unstable": { "version": [ - 20210418, - 1758 + 20210629, + 1537 ], - "commit": "8dbf13b344f6d5eba5c4876b18905d30b3118bb9", - "sha256": "1nlwg78d60w6xjpqhrc49nxxvjaxj07wb036rb5jsng9yb6r94m9" + "commit": "ac7b7183c5e84da110e2f4850c5d8bc5325d058a", + "sha256": "1hzh6ajccmkc2p5kcbl7vjh16rdh4nw3kmncw8ca32ij3l01rmb1" }, "stable": { "version": [ @@ -5313,10 +5299,10 @@ }, { "ename": "autocrypt", - "commit": "c5aac210984709f020f96f3ca166185900accddf", - "sha256": "1y5p5n2p2qk638i1as3wbfz82r08jv4q91470xz9r1gkdnn1xyx8", + "commit": "982788433004ba644a372c50130613e3c56bba10", + "sha256": "0ngdxqski3q4mqsrw8h07mkm58kwrvpxvclgyhq2jypvcvlb7abg", "fetcher": "git", - "url": "https://git.sr.ht/~zge/autocrypt", + "url": "https://git.sr.ht/~pkal/autocrypt", "unstable": { "version": [ 20210412, @@ -5325,8 +5311,8 @@ "deps": [ "cl-generic" ], - "commit": "5b55f8d37545e9c441788627c17e350d7edf4055", - "sha256": "0b06xnjkgwjpxl96mdi674pmvdaiwncifi1a30wxhl1dwr7kr084" + "commit": "1dc4e5983382093fc74c81d84a45cd2b53adfd90", + "sha256": "0r99h100v43i7wr2c1jqgyzixlc1y973swwfa9cfmnaxck3ibk93" } }, { @@ -5530,8 +5516,8 @@ "avy", "embark" ], - "commit": "ef609bf15368a68c4eb3c46fd8cc1bb623b6b83e", - "sha256": "0ddh7zqgaq07534l6m3wjvbcj23a01h3x7scd4pl5rj6wyxqwv76" + "commit": "acbe1cba548832d295449da348719f69b9685c6f", + "sha256": "0c1zqfrn2va2m9z6rw3i2h6dwm2vc0asbha4d9r0gss4b7519pf2" }, "stable": { "version": [ @@ -5771,19 +5757,19 @@ "repo": "juergenhoetzel/babel", "unstable": { "version": [ - 20210520, - 501 + 20210612, + 640 ], - "commit": "1f68c175e8a3223f37858167239051e9ab9e540c", - "sha256": "1b13pfxabfcl8p3j6bw6c5m2njzignab4p6fzxfmfpsvrq5yjzfz" + "commit": "946e69c61188bc41793402ac48466d8967ddb43d", + "sha256": "0drqcvkak677r2bc8jr0bp0qv3x2iw5cvlma6ir2blgm1d3q2bg3" }, "stable": { "version": [ 1, - 4 + 7 ], - "commit": "65b55ad89017c9b3a1c8c241ac4b4541eabdaf5f", - "sha256": "0px1xggk6qyrwkma1p3d7b4z2id2gbrsxkliw3nwc1q4zndg1zr7" + "commit": "a6028ec6780f22b5b15c4458d968f7b49be3974b", + "sha256": "1vbhmrgcbrqj079g40w43xya4yc38ddhfn6wrd75s77qzmhrczll" } }, { @@ -6115,11 +6101,11 @@ "repo": "szermatt/emacs-bash-completion", "unstable": { "version": [ - 20201011, - 916 + 20210615, + 1601 ], - "commit": "65e54c6f9c0ffebf94f7c505694bd249b9b53d32", - "sha256": "0aj110pmx6f11flmyk8ryj4mghjay2wbix945wisrlydlnl9jmmc" + "commit": "d9c97b741db389ceb127b0f0180b2087cb24d0ef", + "sha256": "15m7gbwq1lmca2rlfb2ik86ibmvjnj58yajbp5d23xn03qqd6x6c" }, "stable": { "version": [ @@ -6987,8 +6973,8 @@ "a", "pdf-tools" ], - "commit": "246120647e28a27506ca0894ba98e371086881fd", - "sha256": "15gqzj4h0w33w38i8ihl74iy7aqxlds97gm93r72z69pm2l1d7dm" + "commit": "8a3b529d5ece261a8847298ea03ed35615cc9bfa", + "sha256": "16zalqjd2llwkp7v0218crgf3k34py8zx6lj6z7i3kbmxm9nb27q" } }, { @@ -7036,14 +7022,14 @@ "repo": "bdarcus/bibtex-actions", "unstable": { "version": [ - 20210607, - 1230 + 20210625, + 1718 ], "deps": [ "bibtex-completion" ], - "commit": "07a3c64b12673b722a21c932eb85c595dea0c863", - "sha256": "0afnb0aa3msnvg2p4pjdcliccsfhaa7pp7bx76h3sfvv4648kki5" + "commit": "ee09acded11c160001e60c47de700e5fee6e9426", + "sha256": "0i4476gydsyandyb3r53hk8izx9jpmg03ny8f4glxcvlsm1ysvzf" }, "stable": { "version": [ @@ -7119,11 +7105,11 @@ "repo": "tarsius/bicycle", "unstable": { "version": [ - 20201028, - 1854 + 20210615, + 1459 ], - "commit": "e3fbc0737bb5f891e4d57d048bbc1fe17401f17f", - "sha256": "1jgrnd3yxaqgd3rxls41xxzfaq9hkmjk9wbdg06ak9h5xw4fi17j" + "commit": "2f0d6fbe0e363a0ed1f878316d1c0d7c1d6e1082", + "sha256": "1zlbz5kkqz4r3a2d5y563s1isbs1328kjjrfmn69gwd6w2zi5pii" }, "stable": { "version": [ @@ -7490,8 +7476,8 @@ 20200404, 1550 ], - "commit": "d99ab1aad84e4bd2bd4a499877764c213cce50ff", - "sha256": "0ay49ars61vr43n4bd3k4n1w89ilmw7d8s53ifixgw0vvjkz74z1" + "commit": "8f7cd388abccdf25baeca99c07ef2dfe264e8f2f", + "sha256": "16c4scmc7csb34c237m04fc2w252lvqiwjcz65bjmf077g1ipd7q" }, "stable": { "version": [ @@ -7963,15 +7949,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20210530, - 1158 + 20210618, + 2112 ], "deps": [ "epkg", "magit" ], - "commit": "e2263534e16ed8bbc935ee466f6ad2acbe9c603e", - "sha256": "169sdgi476hnxxv0s9qfi8cply9q7gb8i1hli4i74ynlrhc9wfq7" + "commit": "6ea061f30065493e206132ff3f7a2d8febb859d0", + "sha256": "0m7c512r789pbx2qgzx1zgbr2w4y6ma8l7zhvslji57hzhcvj10y" }, "stable": { "version": [ @@ -8570,16 +8556,16 @@ "repo": "countvajhula/buffer-ring", "unstable": { "version": [ - 20210529, - 2059 + 20210624, + 1642 ], "deps": [ "dynaring", "ht", "s" ], - "commit": "30572b4d8fff519c4996078a5ad743583fb22b0e", - "sha256": "1xg6kbjj4fccsr5awnh3ba9x33qznnala3kmnfwpmj94rd72whiy" + "commit": "4a226bc410ec7b5b0323879b03aad73be1b69728", + "sha256": "02l4wh4qykbk58cda8l3cyg4lpf5zjr0ss4927ac48nlxnawcrsa" }, "stable": { "version": [ @@ -8925,14 +8911,14 @@ "repo": "alphapapa/burly.el", "unstable": { "version": [ - 20201211, - 58 + 20210621, + 845 ], "deps": [ "map" ], - "commit": "291c2b34eee255f64c0fd889b67dc11a3b69ef12", - "sha256": "0a9k47xn9fhhw6rl73gri2ykzag5c68drfc7c4r0f1nqp61smkkv" + "commit": "c6d6aaeded0ef892af307652503de21db2a2a5b3", + "sha256": "1ic6qgmcj4l7a4775wwz45qwadj4ha4z3v2qlr4s54hzzldwc9w7" }, "stable": { "version": [ @@ -9202,11 +9188,11 @@ "repo": "lassik/emacs-c-eval", "unstable": { "version": [ - 20210603, - 1716 + 20210611, + 705 ], - "commit": "f79be8354a3c01fddbf38b731aa8934421cef22f", - "sha256": "1qpi5j2h9q4khp3kbk4ybsg4mp2cp5kws5fz7bjpxz4iz0s8mbx7" + "commit": "fd129bfcb75475ac6820cc33862bd8efb8097fae", + "sha256": "1xfgjc0j8ck03278n014mvf768m68knyawrc3lmybr2gj04b4cz9" } }, { @@ -9426,20 +9412,20 @@ "repo": "unhammer/calendar-norway.el", "unstable": { "version": [ - 20180906, - 1502 + 20210608, + 1136 ], - "commit": "8d1fda8268caa74ba5e712c7675ed3c34e46e2d4", - "sha256": "011c8pz1g805a7c3djai39yasd2idfp4c2dcrvf7kbls27ayrl6d" + "commit": "4dd8c38ef30ad45931c8ae7bcdfd720c3fcffffc", + "sha256": "02xf57dincpn7km1f3c9dnq2qv6lk07m9z5hilm3nnns0wwzqdyw" }, "stable": { "version": [ 0, 9, - 4 + 5 ], - "commit": "8d1fda8268caa74ba5e712c7675ed3c34e46e2d4", - "sha256": "011c8pz1g805a7c3djai39yasd2idfp4c2dcrvf7kbls27ayrl6d" + "commit": "4dd8c38ef30ad45931c8ae7bcdfd720c3fcffffc", + "sha256": "02xf57dincpn7km1f3c9dnq2qv6lk07m9z5hilm3nnns0wwzqdyw" } }, { @@ -9785,14 +9771,14 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20210422, - 657 + 20210615, + 1543 ], "deps": [ "markdown-mode" ], - "commit": "0174599fd1c1b429042c7ca67c3d45f07441a43d", - "sha256": "0qm6cgzsr86s1rcvqpv8x5b3r1v7nq7z8il8ci4vlw9hk0wg65a2" + "commit": "1dd9771853b4327ed161232b65520c13ffe3c0c6", + "sha256": "12pwlww471s6n4vy367m3z8gscxpapi7q6sz5siyis9vjwz3ql2y" }, "stable": { "version": [ @@ -9894,8 +9880,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20210528, - 1605 + 20210621, + 1830 ], "deps": [ "ansi", @@ -9906,8 +9892,8 @@ "s", "shut-up" ], - "commit": "daee4bec9c7d96a165366f7edeaa4616837bf432", - "sha256": "062hsgb4315wvydygvygjywi4wp8xri3h0gj4n5dmy884578hhjl" + "commit": "9fbc15dfe8b0739082e7bbff65f226dfe74ac9dd", + "sha256": "16pc37b6qaaar8gb4b6rzx7bwdj1lamg34a0nlqw6bkp0wzv1d4v" }, "stable": { "version": [ @@ -10165,11 +10151,11 @@ "repo": "cdominik/cdlatex", "unstable": { "version": [ - 20201016, - 1659 + 20210621, + 654 ], - "commit": "adf96bab0bbf28f65c882c0874f1c14fdb216bd8", - "sha256": "010sljis51q31l2irhmr4k3i80f6vnzxf8k09p6k7b91jcby3nf5" + "commit": "720f9145d88b3e54b5388742c8a1a2b963d74581", + "sha256": "1mgjw93b5mag1ivvxsm416nkvappi4rkddpjlpjcvqw7lwzgps3d" }, "stable": { "version": [ @@ -10423,17 +10409,17 @@ 20171115, 2108 ], - "commit": "35b67c8380bb284c9c59914d967ee157a62311b8", - "sha256": "1579n0m13l7ghw5g4b0iffrcvgsh5pk3abk29rrskq736i0h007s" + "commit": "3a5929f70b2b258e4786f86383edee6db76bd5a7", + "sha256": "05a004z6lxafi9x16br3hhflv7dr1ndlgqrfsb88rjm17w6afpc3" }, "stable": { "version": [ 3, - 17, + 18, 0 ], - "commit": "68302fb6a977b11238c91ad9a2b5cb52e6294561", - "sha256": "0y8knkrxhj8w2pvz3wjf36q4lpcbv89h2ha8ha1248mfgqmh3wjr" + "commit": "b2e902351f51f30b46836494ae9cc1b38b3c6cf5", + "sha256": "1lm791bv829p4yjy95lw673g1l9cihg0akan6qxyjg7x219l7dgy" } }, { @@ -10542,16 +10528,16 @@ "repo": "Alexander-Miller/cfrs", "unstable": { "version": [ - 20210529, - 1123 + 20210609, + 1805 ], "deps": [ "dash", "posframe", "s" ], - "commit": "e16a01012545d378150432fa10684a2a7d1cc2d1", - "sha256": "1pj0l0jqgx3bixklllppgm6pwyfd0dc1ik5cs9x1azb1qdgf8kjs" + "commit": "2cb7f1cbf9292b0efe167ef372cfb5a7600564eb", + "sha256": "1y75mijqchkzhq185961clyl2idj22kz0a1gp69y29qhhfvs43yk" }, "stable": { "version": [ @@ -11055,16 +11041,16 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20210603, - 1656 + 20210622, + 44 ], "deps": [ "dash", "seq", "ts" ], - "commit": "5c5b7fc5e72e2322af2cac14745c7adaab1d56cf", - "sha256": "104n79hj8649h90g8kh3i4rfyk1alq0skpjv8jjpbz0cybhp7n53" + "commit": "e7561cf0bb6cbe129edec7f3e15265c985e6e117", + "sha256": "1x8jb65pmzw3218skqmgn95bvl5wx02yghp5wmn1gd4xdhran2qc" }, "stable": { "version": [ @@ -11121,14 +11107,14 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20210603, - 1656 + 20210617, + 1707 ], "deps": [ "chronometrist" ], - "commit": "5c5b7fc5e72e2322af2cac14745c7adaab1d56cf", - "sha256": "104n79hj8649h90g8kh3i4rfyk1alq0skpjv8jjpbz0cybhp7n53" + "commit": "e7561cf0bb6cbe129edec7f3e15265c985e6e117", + "sha256": "1x8jb65pmzw3218skqmgn95bvl5wx02yghp5wmn1gd4xdhran2qc" }, "stable": { "version": [ @@ -11199,8 +11185,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20210524, - 832 + 20210625, + 1100 ], "deps": [ "clojure-mode", @@ -11211,8 +11197,8 @@ "sesman", "spinner" ], - "commit": "8f51546c0efb36226c4bae7d65465b0e0aa8c06f", - "sha256": "0bn1k34a0dr85c0jj3cb3w8afbhb5iy7whdddkfpa5fkrhc77acf" + "commit": "af140ced2286ff646471b067b94c2b18d42616df", + "sha256": "0nwh1pi31jrhxjxy7q92hpis5lf1k6f6l6k5vdb0y2lfsd7acqii" }, "stable": { "version": [ @@ -11403,14 +11389,14 @@ "repo": "jorgenschaefer/circe", "unstable": { "version": [ - 20210601, - 801 + 20210614, + 912 ], "deps": [ "cl-lib" ], - "commit": "c0b2f997b3b73640d635ee84627bb8cf36c9adfe", - "sha256": "1kjfch0fhq67iivad56s071c8qlsssdsdg83h5v9iz2x4jipm0wa" + "commit": "d6f1fa18646f6ed2a1c0f06a4888130bd694ff19", + "sha256": "1l6v02aa072jvhq4b9dpkprqs14py0d4jm3xvihm05lvrbf9v6c6" }, "stable": { "version": [ @@ -11552,6 +11538,21 @@ } }, { + "ename": "citre", + "commit": "a11fd12ba99427246c17c178ef9277fc2d2e2eed", + "sha256": "0nbyb0n0f1f11lnyv9wxy2d1vmz5vg5w18dln2vlwcjh2a6n3jz9", + "fetcher": "github", + "repo": "universal-ctags/citre", + "unstable": { + "version": [ + 20210701, + 1448 + ], + "commit": "01ed8539e8068f1e1ff658ab4b1931d9b7907809", + "sha256": "1ihxy871wqdpy3ri77kl1wwd21bnl484x343z9xvggl9z6dz8pw4" + } + }, + { "ename": "cl-format", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "09jwy0fgaz2f04dvcdns6w859s6izvrkp8ib4lws3x8kx8z918fy", @@ -11629,26 +11630,26 @@ }, { "ename": "clang-capf", - "commit": "c47e1fd9d5a4b85f08676742a9b36b74a2ac8fb6", - "sha256": "11qfh8c2kjcy715yyp0sywla74z92qn5j1z9wp4fv5p45w6b6112", + "commit": "982788433004ba644a372c50130613e3c56bba10", + "sha256": "0xng53wrvmmcl3pq1ap9ddnqrfwmhqwcwli7xnf7a5dqlx6dxj7h", "fetcher": "git", - "url": "https://git.sr.ht/~zge/clang-capf", + "url": "https://git.sr.ht/~pkal/clang-capf", "unstable": { "version": [ - 20201205, - 1229 + 20210625, + 1107 ], - "commit": "6d0fcae75044d930e989903673b6ab22d0401418", - "sha256": "12kcb26vk0x20nkwsqw7fk2mlzd64dbh02wz7bpdr3r74iygsapf" + "commit": "e422f339395aac6d023954880d19bc76a0d1072d", + "sha256": "1gdd674m1vbl8acwsgx6qfmx1gr7h8a6yadzp1jjaandpmc9jlrf" }, "stable": { "version": [ 1, 2, - 0 + 1 ], - "commit": "630ab057ed614d142ac08bb3a44a869a81cb591a", - "sha256": "0xrxk4b903ayymrngf2swk8d7ic8np1dy8zp9hg3wjlibsmagak0" + "commit": "e422f339395aac6d023954880d19bc76a0d1072d", + "sha256": "1gdd674m1vbl8acwsgx6qfmx1gr7h8a6yadzp1jjaandpmc9jlrf" } }, { @@ -11925,8 +11926,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20210518, - 1305 + 20210628, + 1154 ], "deps": [ "cider", @@ -11939,8 +11940,8 @@ "seq", "yasnippet" ], - "commit": "ae2f6344eaf66c872ebc4a87a389f34434ad7a3d", - "sha256": "064pnj9wyhfx02cczmp9ah00ng5v9ps7mhn6mbs6vldv9cfrsvr7" + "commit": "466822ff6f9da584f7cf72c868017b8840574dbd", + "sha256": "1jvmqb4sj3www6fq8srq13yjixp4ixx5i6b0xhiv2bi6r41m3ina" }, "stable": { "version": [ @@ -12337,26 +12338,26 @@ "repo": "emacscollective/closql", "unstable": { "version": [ - 20210530, - 1136 + 20210616, + 1951 ], "deps": [ "emacsql-sqlite" ], - "commit": "1b0e5bfef95de49bf669c54a15571386f10f4705", - "sha256": "01l4w3wc7rm7mca8pbkyz0yrks4z8i00ppy5c4bmrnn6akf7h9ih" + "commit": "e2687e7ff958a19e6e5d6552c4e0b7b33c424bab", + "sha256": "1ghqxnn39i032ibm5sbnv67r2dd2hgfnfpqbmb8wzg9wc6smnacq" }, "stable": { "version": [ 1, 0, - 5 + 6 ], "deps": [ "emacsql-sqlite" ], - "commit": "1b0e5bfef95de49bf669c54a15571386f10f4705", - "sha256": "01l4w3wc7rm7mca8pbkyz0yrks4z8i00ppy5c4bmrnn6akf7h9ih" + "commit": "e2687e7ff958a19e6e5d6552c4e0b7b33c424bab", + "sha256": "1ghqxnn39i032ibm5sbnv67r2dd2hgfnfpqbmb8wzg9wc6smnacq" } }, { @@ -12483,8 +12484,8 @@ "repo": "atilaneves/cmake-ide", "unstable": { "version": [ - 20210603, - 1522 + 20210610, + 1525 ], "deps": [ "cl-lib", @@ -12492,8 +12493,8 @@ "s", "seq" ], - "commit": "9b1100bd8d65b961b7478f9c011f0f6eb8cfcdd9", - "sha256": "1lr9cz856hqb3qz5fq6qqc2a55mfgdrh451np5m2bf2ljw0d67nh" + "commit": "28dc4ab5bd01d99553901b4efeb7234280928b18", + "sha256": "01xpknvj5mm2d3z6xzaw6cyb26hrzhvs44763ajvgw9l43mviwy3" }, "stable": { "version": [ @@ -12520,17 +12521,19 @@ 20210104, 1831 ], - "commit": "05d8a586fa4eb6256b8b80a0f7f084e8c5d3c8e6", - "sha256": "11vxpkf8y9n0kxyfgkbyrq76b0g4xjl2rriyj2d59s3xlx27gqjp" + "commit": "bf6c9567920965f7b3aba37079cc1b51f31d969d", + "sha256": "1hk1qmvw9hmq8xarcnc3pspgsa2fkr8cra8g43i12b8011dz6hpb" }, "stable": { "version": [ 3, - 20, - 3 + 21, + 0, + -1, + 2 ], - "commit": "13d112ea03f2b068da1f7ac3239a42a6cff94eda", - "sha256": "1rn9gzjcg1km9pbyipkfgzq8jvsmwwa2zkmra5yksfwq2094apnh" + "commit": "e610e99ad34a545ac67f1977e78ea59a52fdcf79", + "sha256": "1jss6aavq89kmhdbjml6qamv9jm92xf74g1wz4dsr36wh0mypgfk" } }, { @@ -12682,11 +12685,11 @@ "repo": "astoff/code-cells.el", "unstable": { "version": [ - 20210529, - 1452 + 20210612, + 755 ], - "commit": "2e40770d7963dcbb52ac45dcd83c0537fda5e188", - "sha256": "1m6csmg7y99ihw6nhknnr6wqamf5y5j931gfbsrhbar2hh8wjx5m" + "commit": "1bd650391a6fe84eb267f2534a0750ea1b5549f4", + "sha256": "0r0gp0i0mkfw035qrhpbjw3vdlyiffc5b9zmsmq93wcqvn459154" } }, { @@ -13489,11 +13492,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20210606, - 135 + 20210618, + 2105 ], - "commit": "e0f8c9ad754bdc2c02318f4baf433886c7aa83e3", - "sha256": "1wqwcggjzmqihdgs3bm23fbv2cxpbh9cjvnzgdj01vbgh4ccqkfh" + "commit": "1fd1b363eee68e4cdcf0e610005c0bdbf9940604", + "sha256": "00502ffyfx9zc6bs2pzn3zj3rj2zz8sdm1g046ijkgbya8wszkcm" }, "stable": { "version": [ @@ -13772,26 +13775,26 @@ "repo": "redguardtoo/company-ctags", "unstable": { "version": [ - 20210528, - 1311 + 20210629, + 1038 ], "deps": [ "company" ], - "commit": "26f0a906a646b4885984e068a2046c3a1d0578eb", - "sha256": "0ix5zjwfjj4cbx61qy9d0rfbsmk5kgvm9r2v2r76qa39wx3dys82" + "commit": "cf7bfdbfedc8ca4ee134c8d66e70eb6035185174", + "sha256": "0ysf3gd3fk74j203y2zg3rq41jx42wgk1y1fn2g5giawazi7ym2x" }, "stable": { "version": [ 0, 0, - 5 + 6 ], "deps": [ "company" ], - "commit": "26f0a906a646b4885984e068a2046c3a1d0578eb", - "sha256": "0ix5zjwfjj4cbx61qy9d0rfbsmk5kgvm9r2v2r76qa39wx3dys82" + "commit": "cf7bfdbfedc8ca4ee134c8d66e70eb6035185174", + "sha256": "0ysf3gd3fk74j203y2zg3rq41jx42wgk1y1fn2g5giawazi7ym2x" } }, { @@ -14010,16 +14013,16 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20210329, - 1543 + 20210608, + 1454 ], "deps": [ "company", "ht", "s" ], - "commit": "a90e45ee69bac18205418aea68d981c12835eb81", - "sha256": "0rm2nw5h74qhc5sqrwgw7l94x32kp35fw3xdpfpglr6bmqyqjbmz" + "commit": "b35c6fd89ad111c662916751cf8b3facc8acb1c0", + "sha256": "0h9ly6jpbkbcraxs8l0245vqld61jap1vw3cfrbp885jyyzpfb0v" }, "stable": { "version": [ @@ -14531,15 +14534,15 @@ "repo": "xenodium/company-org-block", "unstable": { "version": [ - 20210607, - 1202 + 20210623, + 731 ], "deps": [ "company", "org" ], - "commit": "e2742dea77b356ee11a1200263d48eed79f5fe43", - "sha256": "194kjkpaca7k60hxs96mah416fdn5mfbsa4wgrpc3cprlrbyp8jr" + "commit": "4fd9a9c673225196e211bb3ced411d0ef9ff2f88", + "sha256": "1nsgkamrq54vm88imdyhl4326fxl9hvkfp0prckgjcg2r37pkxar" } }, { @@ -14558,8 +14561,8 @@ "cl-lib", "company" ], - "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", - "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" + "commit": "8a0dc9888de87ea3aace06628bff52ed32f3ca2b", + "sha256": "1xcsm72by6jiqr9y9fyk70nshsj5dj494faz9734m67fmxq45pfj" }, "stable": { "version": [ @@ -14591,8 +14594,8 @@ "company", "phpactor" ], - "commit": "debf66848c6099415c731b179dcd47e96db3b50b", - "sha256": "0i5g4gh5i5y8wsrqw89lwi2s2sn67pvvj2y6p7lnyv0i201v5bs8" + "commit": "272217fbb6b7e7f70615fc518d77c6d75f33a44f", + "sha256": "0hm96i9vdbkcq6mypjpl94dn3gzyk23iql5zzy2d221vmjhqvn7d" }, "stable": { "version": [ @@ -14920,8 +14923,8 @@ "company", "rtags" ], - "commit": "63f18acb21e664fd92fbc19465f0b5df085b5e93", - "sha256": "0wzyn9qzyly71yfwhlk5m94ygjnbk459pgbpgkhp9fqgchx12p1r" + "commit": "65113e2a137baa9f85dc2157b893291470788dc4", + "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h" }, "stable": { "version": [ @@ -14986,8 +14989,8 @@ "company", "solidity-mode" ], - "commit": "383ac144727c716c65989c079ae76127e25144c3", - "sha256": "1q4b8623mygzp3qwy5bmb3hipzjfri9007x0ilq3i7k5bs34jz9r" + "commit": "5f6ef3156fadae5af6f381d674d20535529a20e4", + "sha256": "02rmc7naspjfl757k7zdfg9xd6nvfpsiqfcxkj6ywc7mnndpq2c0" }, "stable": { "version": [ @@ -15703,19 +15706,19 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210606, - 1237 + 20210629, + 1951 ], - "commit": "ae905501bcdb8fdda0d10a0846d575fd2a38e6d7", - "sha256": "1jz4j27irxknfbcxsn8phhhaiwyc2z9gnyrj03ah1v57i0i9g79c" + "commit": "6ce9aa58e74da92e391cfe938bc3da4f47ab591e", + "sha256": "1ji5ilakwahipp23avzjpi5vfp5f17pm6m1prygk065zqdianrv9" }, "stable": { "version": [ 0, - 8 + 9 ], - "commit": "e538f168d9d16c926d92c19d6131298962b778a9", - "sha256": "1460818fb6y086vgn1mzmrwhpa5jswlwi4v71zr86cg6y7yg4248" + "commit": "ee58941308d83a717728f056ea753e80f68cfbc0", + "sha256": "0iy6lrqbpi4lv7141rdawpn278rxinfxspwb81n04azyxrk28vlw" } }, { @@ -15789,29 +15792,29 @@ "repo": "gagbo/consult-lsp", "unstable": { "version": [ - 20210428, - 1515 + 20210630, + 1151 ], "deps": [ "consult", "f", "lsp-mode" ], - "commit": "12989949cc21a1173206f688d56a1e798073a4c3", - "sha256": "0g3bpi53x6gr9631kzidbv4596bvdbxlr8y84ln40iwx5j8w6s7p" + "commit": "e8a50f2c94f40c86934ca2eaff007f9c00586272", + "sha256": "1xkkybfdzr1xqhvc2bamp253icm75dz7bkdz6bv8xj8688p8vrm9" }, "stable": { "version": [ 0, - 2 + 4 ], "deps": [ "consult", "f", "lsp-mode" ], - "commit": "c4c0426b58946578ac1806a60258d2b275d5b524", - "sha256": "11lrnv5ssiwwdvdib05nz070yc3w9lfcqikgnl3bq8gbcrm9zjf4" + "commit": "e4a0b9403477fe90741ac84d0d2ac3729122b363", + "sha256": "00rrc17axn7pmvzy1q95nf0w036cx7fhxwhimamh9cmijkdsf5w5" } }, { @@ -15822,15 +15825,15 @@ "url": "https://codeberg.org/jao/consult-notmuch.git", "unstable": { "version": [ - 20210519, - 57 + 20210701, + 422 ], "deps": [ "consult", "notmuch" ], - "commit": "71aa3b8ee6cd3cd07313b74353ac29fdfde0e7b0", - "sha256": "1wfghhyv89fcnjznvjwriwdpksr3yijr5lg0xihc7vssz05c7qpr" + "commit": "9e65c421cf54ca12234acad727818fa0fe60fa3e", + "sha256": "19flyh3v1xm2zswzjkvjbijvpbq5r8isafza4fd0yicvqbjyklhx" }, "stable": { "version": [ @@ -15853,14 +15856,14 @@ "url": "https://codeberg.org/jao/consult-recoll.git", "unstable": { "version": [ - 20210411, - 1300 + 20210620, + 1955 ], "deps": [ "consult" ], - "commit": "9038cfa4222f428e28bdafa0aeb57362104a873d", - "sha256": "0sqwczfvplmlwkjmpd3l8i6gjsfw180kafyvkzdkdig4cwa39yks" + "commit": "7b54edb8ac011015ccb43c9d6193e455b4405425", + "sha256": "1qz0r36nv5d52g9i4g9lcrp9gh1kf16q8lgjwgxxqi0qrq2h99z0" } }, { @@ -15871,15 +15874,15 @@ "url": "https://codeberg.org/jao/espotify", "unstable": { "version": [ - 20210605, - 1502 + 20210620, + 1953 ], "deps": [ "consult", "espotify" ], - "commit": "3d62a3319ab03a810030058d3fb368b28dfd82d5", - "sha256": "0hj3nczmqmgiwsvh664rs34j63wl325x6nar21p1a84h5ximpkxq" + "commit": "5bf63dacc5df8a74860e80dabd16afce68a24a36", + "sha256": "1vxg86wv6f96bva0d1xxhisk525chwhdl4nq77xhriflq65mcmi3" } }, { @@ -16397,14 +16400,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20210410, - 1256 + 20210608, + 206 ], "deps": [ "counsel" ], - "commit": "5d7ee6776ed5c314472e2af2797ebfdc725e6a70", - "sha256": "116yylad46sjfvadpl3lj3sb17ariswyp6k1ihh8ba5jn9f9hl5h" + "commit": "2c1f2161d36f70e0034e29abecfcb8878b30b6ac", + "sha256": "1hcsz773i67i82crzczm4csjkl9qj430m73lpvqkh7if543bs030" }, "stable": { "version": [ @@ -16735,15 +16738,15 @@ "repo": "mnewt/counsel-web", "unstable": { "version": [ - 20200313, - 5 + 20210609, + 2156 ], "deps": [ "counsel", "request" ], - "commit": "35c648b4cdd9f266ab54512a0fec2a3ca55d5bc6", - "sha256": "128vl9a5w8v2xzfi5xn9cqshxmcfq2pcmnkkqcxfmi401m2lm0bx" + "commit": "1359b3b204fcdac7a3d6664c7d540a88b5acecfd", + "sha256": "1y5dnhsx5q8jvrr5hjr8cp53nvdq25c9q9im61ym75nccl9lwp4v" } }, { @@ -17067,8 +17070,8 @@ 20210601, 1327 ], - "commit": "771a405e262c98b802e2c5302306aed802d8233e", - "sha256": "0kcv3jjygjvz75irjdddgakw8b0ckm5gqasrb2341zgqms7l9rfr" + "commit": "b2c24f42f2fae63433787150f77b397d69ce0e5b", + "sha256": "1c0smqhc87fzg7db20k92k938p8dkqiig59krwylkqgagsi7hbg4" }, "stable": { "version": [ @@ -17238,11 +17241,11 @@ "repo": "Boruch-Baum/emacs-crossword", "unstable": { "version": [ - 20210216, - 1703 + 20210614, + 633 ], - "commit": "cb2e2a435ea9f4fa8c7517b4909af8b62bca8a3e", - "sha256": "18dk9623ff2kxfhbdnh4l68n5dfxqgrm6ilmv85dfj685kahd0d3" + "commit": "a8594b6e13f5e276aa9bc810ac74a8032bb1f678", + "sha256": "1in8y4fg79v0lx5k0bfhazppkhmb8x9xb0wrjpv3p877vy3687i9" }, "stable": { "version": [ @@ -17372,16 +17375,16 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20210328, - 2004 + 20210624, + 1320 ], "deps": [ "tree-sitter", "tree-sitter-indent", "tree-sitter-langs" ], - "commit": "33e3042535e70a284389f8da1c495958fed8a826", - "sha256": "009qizx0cc97if0bdxrmw3l1slddwwhb21fq6npchg7dwswpnai4" + "commit": "093f0f21a9d04d79a380de145cbc42693ef8c76f", + "sha256": "1150s8zz9z6pmr9m8jny7g8qrhxdnpbk4nzrlyddhaf9hkw9nfi9" }, "stable": { "version": [ @@ -18050,8 +18053,8 @@ 20190111, 2150 ], - "commit": "7b018126aefb100a4f00aeba121688e8a168ee22", - "sha256": "0wxjnxic06kkdjlsd0r0afpms26rhdyskv2f4nj7gabiz1m341gm" + "commit": "e7e5d1dc652755bd0ac0a45e4f970b1a2b137308", + "sha256": "0900w9ddx0i942spji7jg6ssv9d898isggzy9yjhirwn8fs0a2jb" }, "stable": { "version": [ @@ -18525,11 +18528,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20210602, - 1928 + 20210609, + 1330 ], - "commit": "aab346ed9d8f0f7ea033029c9688810353052e7e", - "sha256": "0vq8sgbil17llimaar4j5ar07g17q8ir3a7hfpmv9572ah1zqpw9" + "commit": "88d799595e8f1b4154637ce8a3f81b97b0520c1a", + "sha256": "0b68kivrvwwp51q7cizgdd5i69n7p322gzd305zb377aksl98rbj" }, "stable": { "version": [ @@ -18604,8 +18607,8 @@ "deps": [ "dash" ], - "commit": "aab346ed9d8f0f7ea033029c9688810353052e7e", - "sha256": "0vq8sgbil17llimaar4j5ar07g17q8ir3a7hfpmv9572ah1zqpw9" + "commit": "88d799595e8f1b4154637ce8a3f81b97b0520c1a", + "sha256": "0b68kivrvwwp51q7cizgdd5i69n7p322gzd305zb377aksl98rbj" }, "stable": { "version": [ @@ -19635,11 +19638,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20210606, - 933 + 20210625, + 1617 ], - "commit": "07fc164a680d02de2a7af983adb5e726cbfd7fc0", - "sha256": "1ldd4h9r7wiqgynxwlqf6hg5m2whzaczlhxmbch7i60rd72wwvrj" + "commit": "f7c57d1878d78f076e2a2ef1c97129dc8aa4da15", + "sha256": "0fgyv5g23by8gddaai6q7dwv0f87fam91avpd0fx8klckyz3i5ww" } }, { @@ -19650,11 +19653,11 @@ "repo": "blahgeek/emacs-devdocs-browser", "unstable": { "version": [ - 20210601, - 1447 + 20210629, + 1601 ], - "commit": "d3702670eb361715e41440eb699523b3f4c60bee", - "sha256": "1mv0d67y6m1wi779lc0mnpylqiw3cnaj0rkj199fxh91nkc6vk27" + "commit": "23e62096b98b9b509efc453d7fee0810acea4bf8", + "sha256": "0f6ld4m1x419677snbpd3qyx782zpj61rahphgc5nfj6aanvll0w" } }, { @@ -19759,10 +19762,10 @@ }, { "ename": "dictcc", - "commit": "5e867df96915a0c4f22fdccd4e2096878895bda6", - "sha256": "0x1y742hb3dm7xmh5810dlqki38kybw68rmg9adcchm2rn86jqlm", + "commit": "cdc15fbd060183e2b06f0c776075beddf7433f39", + "sha256": "023r50vwc3bbbyfmn05lyfpq78cmjr076i2rjd064izbrybififp", "fetcher": "github", - "repo": "cqql/dictcc.el", + "repo": "martenlienen/dictcc.el", "unstable": { "version": [ 20200421, @@ -19867,14 +19870,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20210523, - 11 + 20210615, + 1539 ], "deps": [ "cl-lib" ], - "commit": "d4340608c2d6d8b81aad8e690d0265799aba16f3", - "sha256": "1haqmaaj6ajqqfdni6gn3nmqaif8jqrpdnr84m3zjddsdw5zlcsk" + "commit": "1077c734b3b6de02c80456035a4939b028cb4179", + "sha256": "18vk7rhysavm8j02kd4lw6j6zr2l13gyvrjxq7psy1flhvmkxknc" }, "stable": { "version": [ @@ -19931,14 +19934,14 @@ "repo": "ShuguangSun/diffpdf.el", "unstable": { "version": [ - 20210307, - 932 + 20210626, + 1447 ], "deps": [ "transient" ], - "commit": "96861493f95fe88118942bbe64954142250d6c24", - "sha256": "13dda1883pkji4nf44mx9xiys6rgirw12si9fnazsviiqycjaf1b" + "commit": "a5b203b549e373cb9b0ef3f00c0010bd34dd644a", + "sha256": "0bd09ljvlzffb02fgcvjjvysrj762a1wfvad0ywph4722dvnjfn0" }, "stable": { "version": [ @@ -19963,8 +19966,8 @@ 20141014, 2357 ], - "commit": "e0aacd8b3d9f886f27222c1397f0655e849e0af7", - "sha256": "14ccak3cmv36pd085188lypal9gd3flyikcrxn0wi6hn60w2dgvr" + "commit": "53f2d001bd3a5cb80c6ada16b4e570afd1989a09", + "sha256": "0ivy5ydww69gnxws6y37hgvyyvs9gssvdljzs1h13pcycm05hdxb" } }, { @@ -20100,11 +20103,11 @@ "repo": "tarsius/dim-autoload", "unstable": { "version": [ - 20200103, - 1239 + 20210615, + 1502 ], - "commit": "c8dc02259d6c1aa25fb58742ae8b181f83b39a13", - "sha256": "0k9m57zrdpabb6b34j9xy3cmcpzni89wq71pzzwgdi47p1n4r4vd" + "commit": "77b6a5814ffb49e33679fd67b53b9f05042b6ebc", + "sha256": "1a1xhmsm1c4k3mkbbhzd7fmb8q60fhs0lrf39m261180kz0wnhrq" }, "stable": { "version": [ @@ -20130,8 +20133,8 @@ "deps": [ "dylan" ], - "commit": "040c8ebc884305fd4ff980d21c68946fa74b095a", - "sha256": "1f99wn0lgknvnplp7nk2lylf17yak2hw53n9a0vkxng01xhf50d2" + "commit": "d85409dc3cba57a390ca85da95822f8078ecbfa2", + "sha256": "1cm4l2ycaw47mfgc6ms021zxkas1jajgwpnykqlkcwcbakbczxjl" } }, { @@ -20866,14 +20869,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20210411, - 2315 + 20210608, + 2340 ], "deps": [ "dired-subtree" ], - "commit": "79d8187da373b573a2d5385ca868553bb73e0005", - "sha256": "0b1f6ddhn8z4q790d370zhyqrn4mlqk7i6901sld52m14zigd72j" + "commit": "6be2dad2782e28dae2f50c0cbfd82042b2b6ba8d", + "sha256": "1lqnd64ga7g8dzzgfn2bw00y65hlvlgxnj3bk7j6qr5wzkz6qp52" }, "stable": { "version": [ @@ -21017,14 +21020,14 @@ "repo": "Boruch-Baum/emacs-diredc", "unstable": { "version": [ - 20210603, - 2349 + 20210613, + 1423 ], "deps": [ "key-assist" ], - "commit": "43159042ca788be74c387cc59ba3fffc57079993", - "sha256": "01r6sk2zlj3mf39vczaybhpzzmv379vvi85mc4gygif24m102sg3" + "commit": "5e13b7c088e2554b2aa406581520d53902c74016", + "sha256": "06vy5wgrv0sjdnsx31jg1c12wwzxpkgb2xz1djzi5pbhakidspv3" }, "stable": { "version": [ @@ -21069,8 +21072,8 @@ 20160529, 2017 ], - "commit": "c08e163d9d6c62f7b07e94d54c96c2e364e67e0e", - "sha256": "1h2hnm8r3anfbk5x7d2dnv38bdllsbwaam6ivpbgzn12r23wrsr2" + "commit": "ad328a15c5deffc1021af9b3f19a745dcd8f4415", + "sha256": "1s6gwn3ksvk2wyslv7kwn0da3xgw1ayx6yaddhbxz0kg6ps2ran2" }, "stable": { "version": [ @@ -21864,8 +21867,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20210516, - 1958 + 20210624, + 1359 ], "deps": [ "dash", @@ -21875,8 +21878,8 @@ "tablist", "transient" ], - "commit": "bc2dc09edea167d4fdf022aa263bad71932bb0c4", - "sha256": "009qxd0q77pzq2xvm060zswy0amga9cdcc1h3zf2mhn2cw64ydic" + "commit": "9bcefbe54dbed4d364286fe65a87872e763ff7dc", + "sha256": "184dsvaa60b4j6w8s6146x81l5d2a6hkxjqp69gwiixpyjyvcj6n" }, "stable": { "version": [ @@ -22076,8 +22079,8 @@ "deps": [ "s" ], - "commit": "f6dcb378bb69c23d58978d5bc1e37c4ae160d278", - "sha256": "055b24cskxp0wy74synnnsmfnzbavmazyackq0qfnfbkqryrzfml" + "commit": "32196031f60627e88a67b676d643ab51c251711f", + "sha256": "19bm4fr38hkh6mrbf0vgafwq2hfldkcn2b5flllvizq2qh86hq81" }, "stable": { "version": [ @@ -22219,30 +22222,30 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20210606, - 1532 + 20210627, + 1731 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "1660910b758251608c17e1a0e27ff862e345daab", - "sha256": "1apbh9kp1qk3klx65imbhmxxnf8ax0hzzcdwj4n6qpm7s6bk1gc3" + "commit": "07d03c4626eaaf2cc9c346308add3700ad4a3a06", + "sha256": "0c9g5i9cyqcc934rz778zia24bls99i9hfl0s61354ncgw4qndfy" }, "stable": { "version": [ 3, - 1, - 1 + 2, + 0 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "5cb0ff7a3878b218486fe7ef9b3c83cb226dd03e", - "sha256": "1dkgh87sv25mdlzdfihp6gp0asvwplx9yrn7nfsqzsfc3kpajkck" + "commit": "d514f43679513819b37333a64a44523f239150b6", + "sha256": "1gfkaxga919a1a19dhpbby95l8dixb1278g5d7iadjf2i3j0p3l0" } }, { @@ -22272,14 +22275,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20210604, - 1922 + 20210701, + 707 ], "deps": [ "cl-lib" ], - "commit": "b2c0ea0f0778a6ea85b87e1b87916572e98e1fe7", - "sha256": "1rjhmjsszms4rlqq368f717ds4kmdjblkgd2ww830d7sy5h5rb6n" + "commit": "bd5b9065dea54472519da67ccfcc3185bf5e35c3", + "sha256": "0g12rlkfg9ijgd2csrcmcqf6yrs33x9gfkw3g7azp74pvx3cvcmi" }, "stable": { "version": [ @@ -22523,11 +22526,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20210518, - 657 + 20210627, + 1011 ], - "commit": "aa72f3d5c4d49cc0fb581d2f4eac528cf0278a11", - "sha256": "1ay4i606rjcr55ky54sxyvh6ac4s4ilr1i3pykvavdgmrzy3ij89" + "commit": "99ef8ef438e8e11a4486a20c353508b5e20d010e", + "sha256": "0hrqbggmfizl7wcwjcnpgs7ykns6iqwai51mqv61k7m2m37slf6k" }, "stable": { "version": [ @@ -22883,16 +22886,16 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20210303, - 1714 + 20210622, + 1720 ], "deps": [ "dash", "popup", "s" ], - "commit": "8f70acbe164553b225476fed55019ecddcf0bbd6", - "sha256": "08g417yf4byhhldvcbkmhrlm7iaylkv0cbcg1c701dyfngxn01y2" + "commit": "542e72d3feba986a12119f6def515ef1347cb4ca", + "sha256": "1x0g1n9x7qsiwqq8432li6yiww2kvdbk2wkqs3glw97grzrz89gc" }, "stable": { "version": [ @@ -22936,17 +22939,17 @@ 20210213, 757 ], - "commit": "ac3a66e0f7d3577b27cc5d5f2399163bfbe11828", - "sha256": "1grll7h2hv906bik224qn9fldmq4lhnlfcif1lg4grr3f4nhl1wc" + "commit": "846b38c1efab4757240d131d2c45102930fc305c", + "sha256": "1vw500g9jfa4za1f0r90bzzb6ra9jyn52z1g4nwvqcnha1sixj7m" }, "stable": { "version": [ 2, - 8, - 5 + 9, + 0 ], - "commit": "e84ba5230f6afacb12f022937138a752f1c301b6", - "sha256": "0a1jj6njzsfjgklsirs6a79079wg4jhy6n888vg3dgp44awwq5jn" + "commit": "641a95d2254ca7c51c97f07f2eed85b7a95db954", + "sha256": "01np4jy0f3czkpzkl38k9b4lsh41qk52ldaqxl98mgigyzhx4w0b" } }, { @@ -23058,11 +23061,11 @@ "repo": "dylan-lang/dylan-emacs-support", "unstable": { "version": [ - 20210329, - 604 + 20210613, + 1431 ], - "commit": "040c8ebc884305fd4ff980d21c68946fa74b095a", - "sha256": "1f99wn0lgknvnplp7nk2lylf17yak2hw53n9a0vkxng01xhf50d2" + "commit": "d85409dc3cba57a390ca85da95822f8078ecbfa2", + "sha256": "1cm4l2ycaw47mfgc6ms021zxkas1jajgwpnykqlkcwcbakbczxjl" } }, { @@ -23185,14 +23188,14 @@ "repo": "ahyatt/emacs-dyncloze", "unstable": { "version": [ - 20210405, - 212 + 20210613, + 1956 ], "deps": [ "dash" ], - "commit": "38aac1a38017a707b4c539a7932cc8f6cd8f1a77", - "sha256": "05i0a1680a79xvawa93iip10ln6bkrnvzqh3a2lica4hfx0hsi0x" + "commit": "fe5baf6d324800779f80f5c6298a56e2dcb87598", + "sha256": "0c7bh3swwmfc1z834f79jakg1n6li5prd33r5k92id8kl18hb8fj" } }, { @@ -23449,8 +23452,8 @@ 20201112, 820 ], - "commit": "5f3cfac22a7e2508be47079860ab573f397c3cfa", - "sha256": "1p7x7wvzc1sragxpb7b6qnb9fv193mm3ydwf1kwi6rgnz29zql58" + "commit": "527df13dcfb11f7a059ca9e8e4d31ab79423d896", + "sha256": "0ylmd42z0lczliafwhw0ga80y7j1njdypzmfkmnblhlxyiwjxwxk" }, "stable": { "version": [ @@ -24329,8 +24332,8 @@ "repo": "sebastiw/edts", "unstable": { "version": [ - 20201110, - 1827 + 20210630, + 1626 ], "deps": [ "auto-complete", @@ -24341,8 +24344,8 @@ "popup", "s" ], - "commit": "648e8ac632bee8eaa92fc4e09a674ae453bae0a9", - "sha256": "1z7abw4s3k8ynx9i25blp0i51is0wdpsipx79l4wkpazhpsx8gb6" + "commit": "5564f5292eba339afa7760af9467c896ccd708da", + "sha256": "0dkpijsfprlckaggnzmarrbny2qn02927s0fh94dql2gqkvfxhd0" }, "stable": { "version": [ @@ -24505,8 +24508,8 @@ 20200107, 2333 ], - "commit": "df4e47f7c8adfe90d9bf408459772a6cb4e71b70", - "sha256": "1n0dcrhwpl24whxzwhxf7qjlqlllzl5aahdq8h2zdgb6xz912k64" + "commit": "54fc2af0efdbb9e000667749bcfc9fda659304cf", + "sha256": "032iacivlg86fi3kwgsh0dsggx7kp8l9yvngb4ih7ilfd33mzrza" }, "stable": { "version": [ @@ -24526,8 +24529,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210526, - 1751 + 20210611, + 2249 ], "deps": [ "eldoc", @@ -24536,8 +24539,8 @@ "project", "xref" ], - "commit": "e498cb171bb07ec36880a2494aafc8acb1cc34ca", - "sha256": "1q2rg6kk16h0wv70p2x1rg5cjmn0w0gc3phriwdd7iwn842dsrb7" + "commit": "5cc8df63d86a6c43134dd6e4e3ae26cfae14e66a", + "sha256": "0whplm1858d3mv4af6qk0jr5dk9ym1yzp4zsslrrfpyi54vy96yx" }, "stable": { "version": [ @@ -24863,11 +24866,11 @@ "repo": "dimitri/el-get", "unstable": { "version": [ - 20210606, - 911 + 20210613, + 1418 ], - "commit": "52df810e538243d07f2a317ad36e351b440a75e0", - "sha256": "0s9107bss982v4njwkfyi4gismg402xcrqkq9c2hrwhyr6pny4w0" + "commit": "ec135b5353867ce3564a675e99024944b834395d", + "sha256": "1mpc4gnrpvqvhfvjvp4hqb4x6nzn1kfzgsqi4sdjgbfjqll2jzv0" }, "stable": { "version": [ @@ -25170,8 +25173,8 @@ 20210524, 1611 ], - "commit": "afe8f31e2b9f78d13b22a695b7cf9c373656b85e", - "sha256": "09yk4xvsdd5mvrzx4kdfyi2bkbdykjg80hcxvjamh967s6vinzjb" + "commit": "64545671174f9ae307c0bd0aa9f1304d04236421", + "sha256": "10hjqva6xpilnsfsi8z7w3mjmii4hzf53cmccv1w3076ccvcpq62" } }, { @@ -25219,8 +25222,8 @@ 20210530, 1641 ], - "commit": "e9af76aa8fd9ce5b7010b7322a73341828cfe690", - "sha256": "1wryp568bl5p0s78va2pgh9aiskhphmva20zmk1jg0qjxim58grv" + "commit": "d51ce6152519b5cf32d0dcc40cad6787eb605997", + "sha256": "1nkc9fwg7fn8gvj4zg515320p7m2h3b1nyd6zzbp2v60qj7277jq" }, "stable": { "version": [ @@ -25240,11 +25243,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20210402, - 2039 + 20210608, + 2202 ], - "commit": "f66f8d0641a0025d65da1ec21141ea594d6883da", - "sha256": "1y9ns6kmhgzi176z251cymplqc9bdk0axhhcvh4mn21vi5igz4pz" + "commit": "13d207d40863a041b84c34f075668c7931db5a78", + "sha256": "1cvwp01w0adgxwlsispmir4wgs73cl62n5rh7ri6rw6g4fribq1m" }, "stable": { "version": [ @@ -25302,15 +25305,15 @@ "repo": "stardiviner/eldoc-overlay", "unstable": { "version": [ - 20200715, - 1214 + 20210630, + 1345 ], "deps": [ "inline-docs", "quick-peek" ], - "commit": "563ca285a510d1cbd5129cc3a8f8a3cdded065de", - "sha256": "1llh93rlvzsl9m2f7gprb5rbbf2ghysyn1balb8clb64hq98gjyb" + "commit": "3edbfb23836bdef253f4a5fd125952e55877d2b2", + "sha256": "1r2fjdra4bav16c108jzzjd2qhng7493i7l7znbasialf40j3cbs" } }, { @@ -25412,11 +25415,11 @@ "repo": "xwl/electric-spacing", "unstable": { "version": [ - 20210430, - 1714 + 20210625, + 1722 ], - "commit": "800e09af7b0cd5d78d22f857dbce10fb080637df", - "sha256": "0ykndvbbx8rvaxppmkngyrzp1x6fghj9xv55i847kpzx1c6gs4fc" + "commit": "1be87078a689d967cb2d6654659fb49427926d62", + "sha256": "06iws70cc58xs79wlv9wgqk6vk9grvv1jhcngjjwg0pdn080rksz" } }, { @@ -25531,6 +25534,44 @@ } }, { + "ename": "elfeed-autotag", + "commit": "11425f3533d452f1f7f412b1dbe617be9dcbf225", + "sha256": "0p6avgi7pclcf1ml0k3lzwd92plgz28d8q82675gyjs8gfwkn5m7", + "fetcher": "github", + "repo": "paulelms/elfeed-autotag", + "unstable": { + "version": [ + 20210607, + 637 + ], + "deps": [ + "dash", + "elfeed", + "elfeed-protocol", + "org", + "s" + ], + "commit": "bc62c37fb79b720ff8b6d67f04f2268841306dcd", + "sha256": "0vmvl3c465i2gkm9079hj7l3qxna37q3rrs498r8dby11c0dgcax" + }, + "stable": { + "version": [ + 0, + 1, + 2 + ], + "deps": [ + "dash", + "elfeed", + "elfeed-protocol", + "org", + "s" + ], + "commit": "bc62c37fb79b720ff8b6d67f04f2268841306dcd", + "sha256": "0vmvl3c465i2gkm9079hj7l3qxna37q3rrs498r8dby11c0dgcax" + } + }, + { "ename": "elfeed-dashboard", "commit": "339127464845e86419c6a88004fc16b60d675f57", "sha256": "1ykg8gcsl7gf1w2xvd1wm088fw1l1mbsamx7drrvkdnpwxx6xiga", @@ -25907,15 +25948,15 @@ "repo": "Wilfred/elisp-refs", "unstable": { "version": [ - 20200815, - 2357 + 20210615, + 1624 ], "deps": [ "dash", "s" ], - "commit": "b3634a4567c655a1cda51b217629849cba0ac6a7", - "sha256": "1zy629gavyrwx5gmpz7l1a86hbrxjrfqik398v3ja8vg8bj9d6nq" + "commit": "fdde21e34b1272783d566d8230b5ed2dc4749048", + "sha256": "15g3xp3w8lrshjf812c8v50y396zx7107fcyc59kljhsc257j62y" }, "stable": { "version": [ @@ -26361,11 +26402,11 @@ "repo": "redguardtoo/elpa-mirror", "unstable": { "version": [ - 20210509, - 439 + 20210614, + 302 ], - "commit": "193dd942cd74f71d94067f48249427676ba7dec8", - "sha256": "0hwsy780x1kw1c9k1xrbrbip6l62fa41czal0nnqr9li0brig7d7" + "commit": "18209f7f4602e48204992e38c5d265eb1a68320a", + "sha256": "0507bydbplh515jm1y8w9fpv3mljxkj797ssackadx484n3v0yvv" }, "stable": { "version": [ @@ -26424,8 +26465,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20210328, - 1852 + 20210630, + 2317 ], "deps": [ "company", @@ -26434,8 +26475,8 @@ "s", "yasnippet" ], - "commit": "2203597e1254eba345d6873daa40c7b9d144931c", - "sha256": "0rzqmcbrq7xdk748cwy5ikzbg7f13g57jf7rhxyfy6j5pwn8q7k7" + "commit": "4248dccef31e260813d93cafd083bfcd71efc92a", + "sha256": "16pkbg1fwsn0haz2x0ky9pmpgxj9syszsm5g58jra5r0dhyv99vz" }, "stable": { "version": [ @@ -26737,11 +26778,11 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20210504, - 1306 + 20210615, + 1503 ], - "commit": "53d257db92fb72ade8ea1b91dc6839c21563119e", - "sha256": "1qccz8z0410xhygrfy62h1j3553avdcb7m61ps6b6y74nz615l1r" + "commit": "ef6dfa8e598b2761d0a481526e98e254123a20f6", + "sha256": "0p7c2mnwz85klliy1af96knkdja6q9k9j11r0hfka7g4fak0qi6d" }, "stable": { "version": [ @@ -26818,11 +26859,11 @@ "repo": "skeeto/emacsql", "unstable": { "version": [ - 20200714, - 28 + 20210615, + 1539 ], - "commit": "6d8cd9366284b5a27268ff4b783e2c34573d5b60", - "sha256": "04l1rzsmy9131h42y1v6vsfbby7v1gldwd5g600mqfjbbwcnbgsk" + "commit": "9dca5996168c4963eb67e61c7f17fdcb8228e314", + "sha256": "1gjwll970avjv0ah4m8w56ybi4l4bc4n8p29wq77za56m0g6jzrg" }, "stable": { "version": [ @@ -26848,8 +26889,8 @@ "deps": [ "emacsql" ], - "commit": "6d8cd9366284b5a27268ff4b783e2c34573d5b60", - "sha256": "04l1rzsmy9131h42y1v6vsfbby7v1gldwd5g600mqfjbbwcnbgsk" + "commit": "9dca5996168c4963eb67e61c7f17fdcb8228e314", + "sha256": "1gjwll970avjv0ah4m8w56ybi4l4bc4n8p29wq77za56m0g6jzrg" }, "stable": { "version": [ @@ -26878,8 +26919,8 @@ "deps": [ "emacsql" ], - "commit": "6d8cd9366284b5a27268ff4b783e2c34573d5b60", - "sha256": "04l1rzsmy9131h42y1v6vsfbby7v1gldwd5g600mqfjbbwcnbgsk" + "commit": "9dca5996168c4963eb67e61c7f17fdcb8228e314", + "sha256": "1gjwll970avjv0ah4m8w56ybi4l4bc4n8p29wq77za56m0g6jzrg" }, "stable": { "version": [ @@ -26908,8 +26949,8 @@ "deps": [ "emacsql" ], - "commit": "6d8cd9366284b5a27268ff4b783e2c34573d5b60", - "sha256": "04l1rzsmy9131h42y1v6vsfbby7v1gldwd5g600mqfjbbwcnbgsk" + "commit": "9dca5996168c4963eb67e61c7f17fdcb8228e314", + "sha256": "1gjwll970avjv0ah4m8w56ybi4l4bc4n8p29wq77za56m0g6jzrg" }, "stable": { "version": [ @@ -27058,11 +27099,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210607, - 1506 + 20210615, + 1833 ], - "commit": "ef609bf15368a68c4eb3c46fd8cc1bb623b6b83e", - "sha256": "0ddh7zqgaq07534l6m3wjvbcj23a01h3x7scd4pl5rj6wyxqwv76" + "commit": "acbe1cba548832d295449da348719f69b9685c6f", + "sha256": "0c1zqfrn2va2m9z6rw3i2h6dwm2vc0asbha4d9r0gss4b7519pf2" }, "stable": { "version": [ @@ -27088,8 +27129,8 @@ "consult", "embark" ], - "commit": "ef609bf15368a68c4eb3c46fd8cc1bb623b6b83e", - "sha256": "0ddh7zqgaq07534l6m3wjvbcj23a01h3x7scd4pl5rj6wyxqwv76" + "commit": "acbe1cba548832d295449da348719f69b9685c6f", + "sha256": "0c1zqfrn2va2m9z6rw3i2h6dwm2vc0asbha4d9r0gss4b7519pf2" }, "stable": { "version": [ @@ -27256,29 +27297,29 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20210607, - 1450 + 20210619, + 1246 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "c360a8934c1e07ddab4e12d28800d362d254ccbd", - "sha256": "02aikwki7932dldhnsq8ndca59spbc4g2kjfal3sw16lklfw0sfa" + "commit": "6e0aaaf4c5598826b24c3079b80bf8af000a77c6", + "sha256": "016y0w1gy8z1gdri54njas20l3kw99jg5bjyrmcbmgzjmb1jq0y8" }, "stable": { "version": [ 7, - 2 + 5 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "b0173b6b4c5b66a4706cb82c9b50a179bf159a0f", - "sha256": "1scppj8wkiml4dgsg4540hdd8mv9ghcp2r17b647az0ccxwp73qm" + "commit": "144c49ac2931b6e57e265cc6139b7c9718f1297e", + "sha256": "0j9qh781zr348qx49zvr59rdpmh4204fqx9sm3mfh3kg6kbc7v8x" } }, { @@ -28006,26 +28047,26 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20210530, - 1147 + 20210616, + 2229 ], "deps": [ "closql" ], - "commit": "8ee60b65bff02ef606d489b83e2def9922e9623d", - "sha256": "03zsysj78w43q902wi9dhck64q9va247avr6fhdw8ynf2lvb78d3" + "commit": "44b7b2519f84056ee94a6c4ce21fce146532174c", + "sha256": "0z9sz9ydfjzhawh4qip41h3vid1lslaf0h14hkjz9kx8fkrzib8a" }, "stable": { "version": [ 3, 3, - 0 + 1 ], "deps": [ "closql" ], - "commit": "8ee60b65bff02ef606d489b83e2def9922e9623d", - "sha256": "03zsysj78w43q902wi9dhck64q9va247avr6fhdw8ynf2lvb78d3" + "commit": "44b7b2519f84056ee94a6c4ce21fce146532174c", + "sha256": "0z9sz9ydfjzhawh4qip41h3vid1lslaf0h14hkjz9kx8fkrzib8a" } }, { @@ -28158,10 +28199,10 @@ }, { "ename": "eradio", - "commit": "533c3f130d94335bf18907fefe2b5f1e047cdfbe", - "sha256": "0dxlsikgz1fbsypxxzczp6m4bbqh4kqv0f7w058z2sgzplybq3m4", + "commit": "99f67df1d87ecd1bb54b85fa1711dfba90dd00dc", + "sha256": "1w6igfsb8l4i2nq1h528wys61gwh784xzm99bw25rrjj17jdyxsn", "fetcher": "github", - "repo": "fossegrim/eradio", + "repo": "olavfosse/eradio", "unstable": { "version": [ 20210327, @@ -28277,11 +28318,11 @@ "repo": "alexmurray/erc-matterircd", "unstable": { "version": [ - 20201029, - 2321 + 20210701, + 32 ], - "commit": "d46f55909f1c229fd84f409ef992a7a463719893", - "sha256": "19vwpl40nw3jgfmiwl1y4yna0ygjyzlqf5gs85g63f61d89gjlrs" + "commit": "6e9698310f5df5193bccb334839bca29e4bbfe30", + "sha256": "0cwq1ljgb0ga1b8f8gks9c4y8rqjfawpr4l0fi0p3y674a76z33f" } }, { @@ -28643,19 +28684,17 @@ 20200914, 644 ], - "commit": "044843c5281a7bdb9479317793a75c8c0fcfadd9", - "sha256": "04lirb2p1h46c1l84ysdnr2jxvzsdw1zv6jhm7h8ybgzmaa65b6m" + "commit": "007a26fb5f7d9eb54db16484fb116d6e47c8cc5e", + "sha256": "1w9pra3qqmidsf5mvp0lmk9liw1ryaf8kjiawfgyyc6mzgw6nrvz" }, "stable": { "version": [ 2, 6, - 1, - 3, - 20210605 + 2 ], - "commit": "ab805592a0ae7066fbd5fa5f47e933194fce878f", - "sha256": "19ld12x4is0nx52i05zv20js0zysx3bljbdn2nr65vy11dq2cyyp" + "commit": "246a229faea2ef2fa53caf491ff8a2d72dd7510c", + "sha256": "1ccmryw6vs8d87d5zmjl0kr2kvyd1zxl73344fa7yzqgg2kw1da6" } }, { @@ -28669,17 +28708,17 @@ 20210315, 1640 ], - "commit": "a8969ec16a91c0e1ac56a438d81069d288662518", - "sha256": "0wp6sf8rw73waws47av68d4sdd28qix74n53c4fpdc4c2xq3j3h6" + "commit": "3517ac9f6b48641b949e19971a1a2d022b7494a0", + "sha256": "1r9adb0x370c3cj93lgaag2ifkgi954gh5hnshkr3wz8bpqirvk1" }, "stable": { "version": [ 24, 0, - 2 + 3 ], - "commit": "82f97b9d3d639ed87175aeed75747eb6594170ab", - "sha256": "065kc9p30jam23grpm7dwxjf76n6g1hzdrq9q1irr3qmw1rr0240" + "commit": "0a887ba078f6faadea128b51a98e928dcb0e79a4", + "sha256": "0hirfg5y53gj5smf2rqxiadj02ad761hgq3yqcz4j1ldnm50hlr9" } }, { @@ -29418,8 +29457,8 @@ 20210405, 1808 ], - "commit": "3d62a3319ab03a810030058d3fb368b28dfd82d5", - "sha256": "0hj3nczmqmgiwsvh664rs34j63wl325x6nar21p1a84h5ximpkxq" + "commit": "5bf63dacc5df8a74860e80dabd16afce68a24a36", + "sha256": "1vxg86wv6f96bva0d1xxhisk525chwhdl4nq77xhriflq65mcmi3" } }, { @@ -29531,11 +29570,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20210520, - 2146 + 20210616, + 1806 ], - "commit": "f62f460e3c55e5e7ad5941225e7884b0e1656131", - "sha256": "0i5i59pbga10s4yml5vi4fbbxmaqgf8fx4caj3mfgd8dkrkxblgp" + "commit": "a5df6aa81351385e9813b722afcacdba1648226d", + "sha256": "0di7s1k9lizvbr4n59qhn6ipc67klcyimlkdqw4if7nkfjif5bsn" }, "stable": { "version": [ @@ -30126,15 +30165,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20210527, - 2107 + 20210628, + 1913 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "ad47644eea5e351269f5bead18e713768d96f207", - "sha256": "1bcdrvrrjq9r75cfrxziq84slrjm8gbbhbm72hqjfzka6zcnr39g" + "commit": "f20d442ff006aa5a6dc48ac654906b48b95107fd", + "sha256": "0bl854036zpjg5p5asamvlnl9lf46rgcpa645yhrvxqmwznm6din" }, "stable": { "version": [ @@ -30328,15 +30367,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20210607, - 1954 + 20210701, + 1024 ], "deps": [ "annalist", "evil" ], - "commit": "86b02f84a8df0ddd6216cb85d49bedd6ee2ab747", - "sha256": "0vh0wdzz9idfinbfd3mynlp88lgq5j9wk8c3pc5a1is6g3jpj938" + "commit": "a24168ffe3711890b5dcd41041a51146bbd67497", + "sha256": "1pz046fw06lgc7gjrfr0a895j867mm96k8h5dw3k0p64rh1xh1sa" }, "stable": { "version": [ @@ -30894,26 +30933,26 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20210325, - 123 + 20210609, + 1311 ], "deps": [ "evil" ], - "commit": "8c8c94bea899718f393ad041202a355e6f24ea19", - "sha256": "0vygxkvri6363wi3byjd2r23bjyvjkfy58n2kshslaq18z5vylzl" + "commit": "d7ad7f712b98aa64b7cc4fb16354b32666739c77", + "sha256": "1x7wpq0lgkp016yik6sc7b2abhixgcwk0mxx29dyycsjjkdlhp3a" }, "stable": { "version": [ 2, 3, - 11 + 12 ], "deps": [ "evil" ], - "commit": "a0c5bd1fe89119b94ffb0a266d2969434e7ec4c1", - "sha256": "1990g1b6v0i7jaiv35bdssdn601rjifzg4fy9s3sxk0drqm1xiss" + "commit": "9cd0ddaacb3476221d37344715c759ed3cb538d7", + "sha256": "0l4ash907d91vccqdxjz1v5spd8f4va0vrdri6h9y1qc67mjlsph" } }, { @@ -31029,11 +31068,11 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20210528, - 1009 + 20210624, + 1122 ], - "commit": "c0f49e4e87300720b8e8a8296d92b8386956c7a2", - "sha256": "0ci3hjzgwayz9nvmwg5vbmvn80cz0lsppghi511cbr3cdf8xkkv4" + "commit": "118bebd02a489ddf5eee3ab6fb55b3ef37ebe6d4", + "sha256": "15phgj1x2k7i6wnhq3lbrjldrc7xr18z4sgsmklwwgr4blx9ql1s" }, "stable": { "version": [ @@ -31463,15 +31502,15 @@ "repo": "hlissner/evil-snipe", "unstable": { "version": [ - 20210607, - 420 + 20210609, + 509 ], "deps": [ "cl-lib", "evil" ], - "commit": "9bd7345476174dfc6eeaa700a505e45b155ddb83", - "sha256": "1p7v9pnbyc4mhpkvmyl9vr825grqnfyl0h203sbnb1vnw15bbnbp" + "commit": "a9b9b39a7915e66b7d5da9cecfaf002c72d08196", + "sha256": "01ikzxvm878k0xwj10h3ww02459g3jiz4fjsm481jw1jjvnxg5b2" }, "stable": { "version": [ @@ -31557,14 +31596,14 @@ "repo": "emacs-evil/evil-surround", "unstable": { "version": [ - 20200603, - 2216 + 20210615, + 2119 ], "deps": [ "evil" ], - "commit": "4706987bc01a552343848da49b4951bd54374643", - "sha256": "0v2v58pchr5icdpvg4k6vblxhgjk09wi7f54hs1dj0f6rgvpxmx5" + "commit": "3bd73794ee5a760118042584ef74e2b6fb2a1e06", + "sha256": "125yxpd2cmhwvcb0p9z5dc6ydk4w2a9vblkn9hayh6myj9jwjy9f" }, "stable": { "version": [ @@ -31654,8 +31693,8 @@ "deps": [ "evil" ], - "commit": "ad47644eea5e351269f5bead18e713768d96f207", - "sha256": "1bcdrvrrjq9r75cfrxziq84slrjm8gbbhbm72hqjfzka6zcnr39g" + "commit": "f20d442ff006aa5a6dc48ac654906b48b95107fd", + "sha256": "0bl854036zpjg5p5asamvlnl9lf46rgcpa645yhrvxqmwznm6din" }, "stable": { "version": [ @@ -32308,8 +32347,8 @@ 20190520, 1106 ], - "commit": "e043df1bcef40cd5934a74c210e1e35d5eb0e5a6", - "sha256": "0am4g25mlmm1iqcm2kxzskrzhrm1f09cdwcqmvk4lidid5xcb6xc" + "commit": "fc6713e753380f3034d8df55b7af3a737ea52ab4", + "sha256": "17p8gcbm81qq1rgn3xdblmvyx3qn4sjpylna7pfpq32nkxjaajvc" }, "stable": { "version": [ @@ -32338,10 +32377,10 @@ }, { "ename": "expand-line", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "0bzz7zrpfdxhjxs7nzlmzjb9jfajhxkivzr5sm87mg3zx8b6gjyi", + "commit": "06f13c6ff35e0e710407b2138fcefaebf01b007a", + "sha256": "19vk9kp1pp5m9l6qwgnxalamqlcds66f3vc0psyymna1g7pinr1w", "fetcher": "github", - "repo": "zhangkaiyulw/expand-line", + "repo": "victorteokw/expand-line", "unstable": { "version": [ 20151006, @@ -32359,11 +32398,11 @@ "repo": "magnars/expand-region.el", "unstable": { "version": [ - 20200304, - 1839 + 20210624, + 1015 ], - "commit": "4b8322774d9c1d8b64a0049d1dbbc1e7ce80c1a0", - "sha256": "1x6sbychbz91q7mnfn882ir9blfw98mjcrzby38z1xlx3c9phwyi" + "commit": "519e92eabc470fe1792d8d4a37c98e76cf195840", + "sha256": "0rh5li9i6nz81mbji87dnv5ly58rl5lphlvjx4m0hb7dlqpw0db2" }, "stable": { "version": [ @@ -32775,15 +32814,15 @@ "repo": "rejeep/f.el", "unstable": { "version": [ - 20191110, - 1357 + 20210624, + 1103 ], "deps": [ "dash", "s" ], - "commit": "c4dbf8c8e83df834f5d6f72cd5649b9d8a8812ec", - "sha256": "132zj5yvx4llzsh6rs0jwj0b5cfl140v0m6rk0kckw3vfgfh0cln" + "commit": "50af874cd19042f17c8686813d52569b1025c76a", + "sha256": "0k6qp5vqyiql9f6i6z95iskjpv9wn6sd66wnf2x0jxbws4r2bjxy" }, "stable": { "version": [ @@ -32871,10 +32910,10 @@ }, { "ename": "face-shift", - "commit": "e55d2d30525602726c3c63025f5fce671efac416", - "sha256": "1y0m6yv64q76x6i2r5npn97c2axsy2k7b3m58zxh8p7c5lpwjdpa", + "commit": "982788433004ba644a372c50130613e3c56bba10", + "sha256": "06962zrxnm7q9w8ddm6xwa2q1vbb8wi1z8sqmw0yksz6wra49d5w", "fetcher": "git", - "url": "https://git.sr.ht/~zge/face-shift", + "url": "https://git.sr.ht/~pkal/face-shift", "unstable": { "version": [ 20190818, @@ -32883,8 +32922,8 @@ "deps": [ "cl-lib" ], - "commit": "8dd6fb5f6277d3a594654aeb3e6a7b7b5581656a", - "sha256": "003k8i18s782zf1g0c9wi8p9lyk0viz76dah8hd3y622hmx8sdlb" + "commit": "8c62d7a27a0e3092942742362ed73e17e254e904", + "sha256": "028b3j7rp4z78285r8w4db8dx9j6zlqp8aw4y0pvd4ifqbs5wh05" }, "stable": { "version": [ @@ -32952,8 +32991,8 @@ 20210602, 1952 ], - "commit": "45f2faef92ee23738b86f4f8d0a433ad729a5ca8", - "sha256": "0slvrgw508388il24wlx9g0bf32anpk6rbhmb2r99anq2vhn4b4g" + "commit": "cb8803355e20812d84195b1b7c9b0578c3262e68", + "sha256": "0wx2k9262p712aasn3ha8si250yzhcqz513apna8lp5gri2rxsg8" }, "stable": { "version": [ @@ -33424,20 +33463,20 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20210410, - 1942 + 20210624, + 1431 ], - "commit": "59ab02344f569069b9899a3a5ffdca4a30093df4", - "sha256": "1vh6n2sg89g43sidymk22wjzjh71wgbajshhh7y3f6zf8xs94mmz" + "commit": "f37a3de72c6cbf37f82d4b2f37d9009af5058099", + "sha256": "1qnmcysrl2zxiid4v1h1hq1nax3a7sxs2dmag54sfifm149lf7f3" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "ae4634bef12f66a1d4721ab74c5bf8dd29d710d2", - "sha256": "15b5zb66dzszpdiqkwgxqv434kqgpk1l065ic4lbj3y3krm2snbg" + "commit": "ea8564a2cc4f7e10b3fc13faf26a4f098b159f00", + "sha256": "1qnmcysrl2zxiid4v1h1hq1nax3a7sxs2dmag54sfifm149lf7f3" } }, { @@ -33574,15 +33613,15 @@ "repo": "knpatel401/filetree", "unstable": { "version": [ - 20210514, - 1614 + 20210629, + 356 ], "deps": [ "dash", "helm" ], - "commit": "08c0ea22f304f9777cd96e9b86f7c6e5331e82d8", - "sha256": "1phqiisabqsfkmslajl012lc0bf5y0vkgrcjavbwzf52hj7kn982" + "commit": "f7dd8a310f5364f1e1549082ef231c3c27285e89", + "sha256": "1w1f924as6l0s9dkpjjk6bnkp29x52mf5pzzqxqsigp2r1z6k2lk" } }, { @@ -33768,8 +33807,8 @@ 20210427, 1205 ], - "commit": "3bf010d2be073d499de5ffdaa98f48bf8a3dd21e", - "sha256": "0zpckqcx4fbjni1f0c6wzi1356ab06j33himfgkhvyl1bn4w5jna" + "commit": "680ec93808176442a2c78b91b18bb4256d81d340", + "sha256": "1af30i3nsms1s2gwq3wx0xbmjxd95hipai63icw3jpwc3pmw3g2n" }, "stable": { "version": [ @@ -33918,11 +33957,11 @@ "repo": "jming422/fira-code-mode", "unstable": { "version": [ - 20201005, - 1607 + 20210621, + 1933 ], - "commit": "a3a7a75d2b8b15404c37de186162a5f89ba447bf", - "sha256": "0az773s1g8c1sahyrci4zclzhyznr3kizmvxs65rpn0pcmcfq1m8" + "commit": "85e0eba018bca70040faea19996b43ce8e543cad", + "sha256": "1mv0gphbp976ncfif2jbfrmkayh0lp5cjqmiimhw1inw7ps18k5r" } }, { @@ -34855,14 +34894,14 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20210605, - 1713 + 20210618, + 920 ], "deps": [ "flycheck" ], - "commit": "8c45988a12e7c149b17d7edb84e6dfc33bb7b288", - "sha256": "1lsfz3yi3i1mqmq6p9x6fx26wrlqihsaz3yk5g50yv6jqvfr1g79" + "commit": "3abe1a6184fefea3e427141131fba40afae3d356", + "sha256": "1g600caz7v7qm6fj67x0s064f4n5fr57bnd0m3sc43gn24rpjjdv" } }, { @@ -35723,31 +35762,31 @@ }, { "ename": "flycheck-grammalecte", - "commit": "2e7aee5074faedef4f2b989ffe05995b2f73bfbb", - "sha256": "031x2yh3wdklsm169h34sg0bzpl36nfms129zj4j0z99gw1kda3z", + "commit": "5f03c71c5482b4f3f6424e71dc19e7daec400db6", + "sha256": "0w55xmxxa28k776fl0kc08frsk1msq0ia40afa4gj8g6mi254qm3", "fetcher": "git", "url": "https://git.umaneti.net/flycheck-grammalecte/", "unstable": { "version": [ - 20210504, - 1852 + 20210627, + 1018 ], "deps": [ "flycheck" ], - "commit": "f488739aea2ef5c8d39bd28083dd72fdfee46e02", - "sha256": "18yiv09hzbclf9rjp61lxlia2m1qbvmwkiqxxs9jjpac28x7ypjf" + "commit": "8f13de89134e9708b2a24a040a0335a7302632f9", + "sha256": "1acwvndq604gl5n3985mj5v70vcl3d12vh6bzs5nz5xyr8c848z7" }, "stable": { "version": [ - 1, - 4 + 2, + 0 ], "deps": [ "flycheck" ], - "commit": "f488739aea2ef5c8d39bd28083dd72fdfee46e02", - "sha256": "18yiv09hzbclf9rjp61lxlia2m1qbvmwkiqxxs9jjpac28x7ypjf" + "commit": "fab1b5071b7fe7a34869ffb8672abad38948c047", + "sha256": "040mb9djj4cxpjsjch9i30pi36a2z7grkhnsnfdi5qyh341p4pq0" } }, { @@ -36178,6 +36217,37 @@ } }, { + "ename": "flycheck-languagetool", + "commit": "06859c648c33d422a798ef98a564cb79783a9a3d", + "sha256": "0qnvvl9bfx7i0agfm3v7qrcjm86vfshpx97aa0ms8byw77hii5i7", + "fetcher": "github", + "repo": "emacs-languagetool/flycheck-languagetool", + "unstable": { + "version": [ + 20210629, + 536 + ], + "deps": [ + "flycheck" + ], + "commit": "6ade9d7f294cee7e41d0bce9dddb139c49985501", + "sha256": "1yq2n7bknw7by1cn53xn7kz8a3qj1w7szsjysaj93mhxb154g9qz" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "flycheck", + "s" + ], + "commit": "5608a330e09222d05bf0354f1847f537168e22dd", + "sha256": "0v6gqhgwn2x6qd34380y5n1ql08anv02bs6qk7glq6a0ha8xkzfa" + } + }, + { "ename": "flycheck-ledger", "commit": "dc715e6849aa5d6017e2478514c4a0d84c7ddbe5", "sha256": "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl", @@ -36513,15 +36583,15 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20201126, - 603 + 20210617, + 2237 ], "deps": [ "flycheck", "phpstan" ], - "commit": "6863a5278fc656cddb604b0c6e165f05d0171d0a", - "sha256": "05q1y6xshh5csr672jwplp2xmp87gvj9rc65ybpa687dkdmq8cdh" + "commit": "56617fa87c9bec037d4e4a0a143b7d70a989c082", + "sha256": "02k4pmmxq3h8mi0dsjh0s0002gjkpg6g9pxsnxgalwb6rakfirbh" }, "stable": { "version": [ @@ -36900,8 +36970,8 @@ "flycheck", "rtags" ], - "commit": "63f18acb21e664fd92fbc19465f0b5df085b5e93", - "sha256": "0wzyn9qzyly71yfwhlk5m94ygjnbk459pgbpgkhp9fqgchx12p1r" + "commit": "65113e2a137baa9f85dc2157b893291470788dc4", + "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h" }, "stable": { "version": [ @@ -37355,8 +37425,8 @@ 20210411, 2342 ], - "commit": "8c45988a12e7c149b17d7edb84e6dfc33bb7b288", - "sha256": "1lsfz3yi3i1mqmq6p9x6fx26wrlqihsaz3yk5g50yv6jqvfr1g79" + "commit": "3abe1a6184fefea3e427141131fba40afae3d356", + "sha256": "1g600caz7v7qm6fj67x0s064f4n5fr57bnd0m3sc43gn24rpjjdv" } }, { @@ -37898,6 +37968,36 @@ } }, { + "ename": "flymake-languagetool", + "commit": "3ead983cef03a4a25f78bac45d4a7cca5058880a", + "sha256": "07m3mps9vs2zk63ssgcwwmdbfln7qzqhnny4i90x6kd2g10vkmvc", + "fetcher": "github", + "repo": "emacs-languagetool/flymake-languagetool", + "unstable": { + "version": [ + 20210627, + 434 + ], + "deps": [ + "s" + ], + "commit": "5e44d7ba7153d20a01428bff98c1949a7a0eb753", + "sha256": "19149wr4plng3n1bpfd49ja1phd3sbyrxa6vk47qh8xc7x1ra309" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "s" + ], + "commit": "f0f105ab11fd1de1379baef91fcd46e6c2464dca", + "sha256": "1sylnd4hybxnygcgxqw8p7mlp0r000n6f44y5fq3sv9518l5mflz" + } + }, + { "ename": "flymake-less", "commit": "6d4eae8b7b7d81ebf4d85f38fc3a17b4bc918318", "sha256": "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0", @@ -38086,14 +38186,14 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20201122, - 950 + 20210617, + 2223 ], "deps": [ "phpstan" ], - "commit": "6863a5278fc656cddb604b0c6e165f05d0171d0a", - "sha256": "05q1y6xshh5csr672jwplp2xmp87gvj9rc65ybpa687dkdmq8cdh" + "commit": "56617fa87c9bec037d4e4a0a143b7d70a989c082", + "sha256": "02k4pmmxq3h8mi0dsjh0s0002gjkpg6g9pxsnxgalwb6rakfirbh" }, "stable": { "version": [ @@ -38116,14 +38216,11 @@ "repo": "manuel-uberti/flymake-proselint", "unstable": { "version": [ - 20200927, - 640 - ], - "deps": [ - "flymake-quickdef" + 20210621, + 929 ], - "commit": "b94950301139846002d2020bc630440ff834bf24", - "sha256": "1zlbw4mj0l9p72gw03jrqmaakh7550ha02r3rmxrlqs6gjzqsd1f" + "commit": "adf1ce7daf1380cb50f365a36548165fe4a32423", + "sha256": "1mmwq4b4idhbsygwjmn3fj67idixx4gaap9zfa0v4didahjsjsjh" } }, { @@ -38242,24 +38339,6 @@ } }, { - "ename": "flymake-rust", - "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", - "sha256": "0fgpkz1d4y2ywizwwrhqdqncdmhdnbgf3mcv3hjpa82x44yb7j32", - "fetcher": "github", - "repo": "jxs/flymake-rust", - "unstable": { - "version": [ - 20170729, - 2139 - ], - "deps": [ - "flymake-easy" - ], - "commit": "2f42d1f2dad73ec9de460eda6176e3ab25c446f0", - "sha256": "02fgkv9hxwrv8n5h6izb5jyjcpazlf86pjjj4zkv1ycpa6gyzzwn" - } - }, - { "ename": "flymake-sass", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", "sha256": "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d", @@ -38964,8 +39043,8 @@ 20191004, 1850 ], - "commit": "246120647e28a27506ca0894ba98e371086881fd", - "sha256": "15gqzj4h0w33w38i8ihl74iy7aqxlds97gm93r72z69pm2l1d7dm" + "commit": "8a3b529d5ece261a8847298ea03ed35615cc9bfa", + "sha256": "16zalqjd2llwkp7v0218crgf3k34py8zx6lj6z7i3kbmxm9nb27q" } }, { @@ -39042,8 +39121,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20210525, - 1345 + 20210628, + 736 ], "deps": [ "closql", @@ -39053,16 +39132,17 @@ "let-alist", "magit", "markdown-mode", - "transient" + "transient", + "yaml" ], - "commit": "551e51511e25505d14e05699a1707fd57e394a9a", - "sha256": "139pndj9l9aifnvv2ak5zwf5gzwhp3m6dfpw1avf4vkh1zywzwa0" + "commit": "84ef3a7bad5879a2dd179a94655ac0da28be3898", + "sha256": "0mp1jwc0ms6d15l3vw0zg35l68q58bk5bj8w5znjvwjh3akybfpm" }, "stable": { "version": [ 0, 2, - 0 + 1 ], "deps": [ "closql", @@ -39074,8 +39154,8 @@ "markdown-mode", "transient" ], - "commit": "551e51511e25505d14e05699a1707fd57e394a9a", - "sha256": "139pndj9l9aifnvv2ak5zwf5gzwhp3m6dfpw1avf4vkh1zywzwa0" + "commit": "e7d0d759440492549db331f3c39c3cc62880118f", + "sha256": "0j28vc0q1h36pk0y2nidnlsc2y7n0vpfrd8civiv1zp8z0jwfyc9" } }, { @@ -39110,15 +39190,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20210604, - 1107 + 20210619, + 533 ], "deps": [ "inheritenv", "language-id" ], - "commit": "82f68e5d1f0641d7a050db02ab2c0a7d3888f358", - "sha256": "0761qmkza4sbl1k0vj4q18zm9p148h7131dq46wwajyxbmrxlxja" + "commit": "6a3463a723e08a37bae85a7585700ab314ae86ea", + "sha256": "10aa5jh4ba4bhghwb8mi6my1dazbvxlylk3gcxji47qj0z78fajh" }, "stable": { "version": [ @@ -39255,26 +39335,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20210523, - 1327 + 20210611, + 1228 ], "deps": [ "seq" ], - "commit": "77f3ce6b646868210f91b6a80fcaaa77297ed341", - "sha256": "1f0mzrn237kv2p5bz58km4b7a46shzm1v7n4a6ksyfd3n7cqas85" + "commit": "91f4ad083fa620e6e6202460decc3280bd8e4e71", + "sha256": "0xlg5b0sa4qbv68sza23fr5khv36860jbhzfbcqcw1d420xllryx" }, "stable": { "version": [ 3, - 4, - 1 + 5, + 0 ], "deps": [ "seq" ], - "commit": "707b8fdc9a0e1de1a911ca312c23c0c1672f3ec3", - "sha256": "14zhbcfqyp093kd1bxl7f2hf5l5995qmgpmnxfgw9qcc781crj73" + "commit": "91f4ad083fa620e6e6202460decc3280bd8e4e71", + "sha256": "0xlg5b0sa4qbv68sza23fr5khv36860jbhzfbcqcw1d420xllryx" } }, { @@ -40214,11 +40294,11 @@ "repo": "bling/fzf.el", "unstable": { "version": [ - 20210508, - 1516 + 20210619, + 1421 ], - "commit": "23c09c9c0417c7de67a8965d9b506d0cc7aea7a2", - "sha256": "0c4cz1kyanqswz5ww8aql96hqxg8p8lwwwygw061rq2ycmkl54nk" + "commit": "c975001725e4b7f58dd9379a64c170f07734af59", + "sha256": "01d303vbn7vvhl1g1wpmpy90h5vaj3yimzgmhnmswc2qc2s3cnhq" }, "stable": { "version": [ @@ -40271,11 +40351,11 @@ "repo": "ShiroTakeda/gams-mode", "unstable": { "version": [ - 20210227, - 251 + 20210701, + 36 ], - "commit": "52e984d64c48f518222e0f6bd326236f78d7bf7a", - "sha256": "0fjdm2mlwibi6cz0r7cm4ylxzg7i8fljkwfhflb84xqcaknwr2sk" + "commit": "64e3544726b77f10becb58a51d61993fbba433af", + "sha256": "1sn893lnqfr13p1m2g36i6f0ikpibhp7q7ak5271fhpzjzh0fi1r" }, "stable": { "version": [ @@ -40760,14 +40840,14 @@ "repo": "emacs-geiser/stklos", "unstable": { "version": [ - 20210503, - 944 + 20210626, + 1440 ], "deps": [ "geiser" ], - "commit": "0e3a0570354c03c0cfa25da82fb34ad2e81c1981", - "sha256": "1g31cibl88g1vjfvw4z80ywxpnxy5lijhs754qdcnx36maragh07" + "commit": "be482a03225720d7adb003c28e4515f6252e7ce2", + "sha256": "1dyzpr9i5pxi2p2hg3ndryh7x4y0r9bra88pd1l904vdfsxdxv5z" }, "stable": { "version": [ @@ -40789,11 +40869,11 @@ "url": "https://git.carcosa.net/jmcbray/gemini.el.git", "unstable": { "version": [ - 20210226, - 1419 + 20210611, + 1833 ], - "commit": "0a227125a4112266c06ed7247de039090314b525", - "sha256": "0fiix0ssaannim5kxpckhd5z6fssij3igv1dg9y7143dzxf274zz" + "commit": "97e096ab2400bbe3c0f6d19fb49bd952f2f14e03", + "sha256": "1l092mhpv8dg00ln4yv040kmha7556klm5bqfdvc9ysjnfiwprkd" }, "stable": { "version": [ @@ -40938,8 +41018,8 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20210530, - 402 + 20210620, + 334 ], "deps": [ "dash", @@ -40947,8 +41027,8 @@ "magit", "s" ], - "commit": "f1bdc47ab2bb29c2a0a385aaa9a5f0f6d543ffb5", - "sha256": "1qcw5kzcw9g41hqg0gnq3k6i4ygfgrlghadmfzdnf7dbk93ngl4g" + "commit": "ac555ccec74c48297bac0944a207e5b8aceac49e", + "sha256": "053gn6ja80810y4a2dayz3xy1bmzb7w06lvf87difa0nhm3mr54g" } }, { @@ -41206,15 +41286,15 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20210531, - 2006 + 20210619, + 1405 ], "deps": [ "let-alist", "treepy" ], - "commit": "e9a819c9c997b8e752eeb4a3fcd1a7b55ab8da47", - "sha256": "1c92q4hrax9gfrw35qi3slr7man006v5vqzp6hi2an5haw2cz4x2" + "commit": "865424d4faf66048bfb3752856ac0cf68e1c6efe", + "sha256": "0kqjxwkm3n6r9zg6pi015g9ix4pyz7b2rngcmmrindcjb5h292a4" }, "stable": { "version": [ @@ -41272,8 +41352,8 @@ 20210401, 656 ], - "commit": "fa81e915c256271fa10b807a2935d5eaa4700dff", - "sha256": "1yf6yipvhhna29mzaan5vb3d5qvbrkp2awr5diyf381mvxgk8akh" + "commit": "8ab9c88a2b8cccd3c092e155f84b1b19930d0719", + "sha256": "1jiglrlhrph57p5kkm1qlqihwl6z7h9qh16qmmd5783ynksnbxp3" }, "stable": { "version": [ @@ -41572,16 +41652,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210525, - 844 + 20210701, + 1554 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "4a8646a30df99bbafc95d4f21a0b2bf0a6f6566f", - "sha256": "0y3wzvyaxn5zybjak77r1cngaqqm462s3d4f1cwmzvrnpv99f3r9" + "commit": "2ae376e4923e02355828350b81cdc1b0f8fa72ff", + "sha256": "1h07rg0fvr7av69bcks1n63digafq145mlsaddyv6xixxqjp0vbg" }, "stable": { "version": [ @@ -43004,11 +43084,11 @@ "repo": "emacsorphanage/gnuplot", "unstable": { "version": [ - 20210526, - 1848 + 20210609, + 834 ], - "commit": "07a80272b86c081b40602ec0b080571f3269749d", - "sha256": "1d50b5vwnzca16g7hs2i0357lx9x5rvivdb5hdi0ngf6sb8d1afk" + "commit": "7138b139d2dca9683f1a81325c643b2744aa1ea3", + "sha256": "1v30avyx5klccpxqi85l5467dbc2v7s1jk5xv7rzvhg27azr4jm2" }, "stable": { "version": [ @@ -43574,14 +43654,14 @@ "repo": "emacsorphanage/go-impl", "unstable": { "version": [ - 20170125, - 1552 + 20210621, + 743 ], "deps": [ "go-mode" ], - "commit": "69f0d0ef05771487e15abec500cd06befd171abf", - "sha256": "1rmik6g3l9q1bqavmqx1fhcadz4pwswgfnkbaxl6c5b6g2sl26iq" + "commit": "1eebba6ccd02d11a5a82ad4540a8d562797bc3b3", + "sha256": "1i48vawn2a76bdbvv02mw7c5ny7g8dxk6b6xw2y9z0iijmbr0dzl" }, "stable": { "version": [ @@ -44081,20 +44161,20 @@ "repo": "io12/good-scroll.el", "unstable": { "version": [ - 20210607, - 339 + 20210613, + 206 ], - "commit": "b4233500bbbdb64758283ba8a4b7cef5a85181a2", - "sha256": "05k03bycwpgs9wf9rh4rxfp38lhzr46c8zpvkd5qr6zwb1nnvr00" + "commit": "26a1b958bbf2c45d86f033e58b74edd196302f23", + "sha256": "0g4fzji614aqy3kw9iivlmw5v8igql0lkrzvgffrd01jn57dzlwp" }, "stable": { "version": [ 1, 1, - 1 + 4 ], - "commit": "61aa3b57d572e6a46a1415b66dbc4b80c33bfb73", - "sha256": "0zprygv94rp1hdq7qxcmp3ns04j6l28y9w5hp087mhfbr1v5y54m" + "commit": "4ca86e18c8f64fd7a2d088a591ac11773d6b06a7", + "sha256": "0bq229nnwp8cy33gizp75wi3x11wn46p73v1581srm2f1zmkapsj" } }, { @@ -44483,8 +44563,8 @@ "magit-popup", "s" ], - "commit": "da0ae769e70e1af16865c3fadb25e9132d089dc6", - "sha256": "09kdlz6h31yasi1rv7759m40zb12vj6llv70pqh9swrpii2nmdzp" + "commit": "93851bd6e14df055d86661de494119e6bacb2192", + "sha256": "0bb5zbyr0xsf4p3440n5x2f3h10ya76vwr3jq10j0ff0x4fxs6iy" }, "stable": { "version": [ @@ -45098,11 +45178,11 @@ "repo": "ZungBang/emacs-grep-a-lot", "unstable": { "version": [ - 20131006, - 1347 + 20210618, + 1420 ], - "commit": "9f9f645b9e308a0d887b66864ff97d0fca1ba4ad", - "sha256": "1f8262mrlinzgnn4m49hbj1hm3c1mvzza24py4b37sasn49546lw" + "commit": "223819dbea049bdeb5f97f9849fce139a5f16a75", + "sha256": "06rrbwb5ms2m3mhsg1l4hqnn7x379019kkdfm8gys5kxv4mfp22l" } }, { @@ -45128,20 +45208,20 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20210515, - 1548 + 20210609, + 1305 ], - "commit": "02b7a8109fa1ae248e61c91da3bd8676f8d2e175", - "sha256": "0rd8nasnlc01wb4lkzpk3xrwj9lx2n4gsq7h4nc0irnbfy8phy1s" + "commit": "0ef2a3566f76e1c03ec64ac64cbb916530e40e32", + "sha256": "1p15b41bdzg8819hnq6js62486mwdqcwxns5mnqb21bn6m7pizpm" }, "stable": { "version": [ 2, - 2, - 1 + 3, + 0 ], - "commit": "9615c4774727a719d38313a679d70f2a2c6aca68", - "sha256": "01imyi1l33ng78m6c5g4pma5gy4j7jy7dwmqwsqgwbws08qdbwgr" + "commit": "0ef2a3566f76e1c03ec64ac64cbb916530e40e32", + "sha256": "1p15b41bdzg8819hnq6js62486mwdqcwxns5mnqb21bn6m7pizpm" } }, { @@ -45264,11 +45344,11 @@ "repo": "ROCKTAKEY/grugru", "unstable": { "version": [ - 20210127, - 432 + 20210617, + 1028 ], - "commit": "4ac2bf3877e3af7d23ace3165b9c8ed536ff4832", - "sha256": "05nw45hgbygfvbymghsp425474d4nrgl8pjii8jwd1ym155bf13k" + "commit": "b1d873cb6186e08c6f7ec782df989b01e955fb4d", + "sha256": "1rsixglxvc5a25v1pbyz23bngql84nvjn8673lmkhdcqcvd3s1hg" }, "stable": { "version": [ @@ -45494,14 +45574,14 @@ "repo": "tmalsburg/guess-language.el", "unstable": { "version": [ - 20210308, - 1514 + 20210623, + 1505 ], "deps": [ "cl-lib" ], - "commit": "7e511d23ee4315a79081c53596398c471572fb0f", - "sha256": "03bm6j8d1v5z1gz1chlpp7s3jzi0lnq6nqdw8r7z1ik5si59dvj5" + "commit": "e6b78ed2a36bf5debd3d07ffd99a5a8ca60609d6", + "sha256": "0g0vdz42s6hns249lfxcha7l7ihqpyay3n5iijziwrbrrhqi6rx6" } }, { @@ -45576,8 +45656,8 @@ "repo": "alezost/guix.el", "unstable": { "version": [ - 20210224, - 1601 + 20210608, + 1653 ], "deps": [ "bui", @@ -45586,8 +45666,8 @@ "geiser", "magit-popup" ], - "commit": "8ce6d219e87c5097abff9ce6f1f5a4293cdfcb31", - "sha256": "0awbd8x154c4dk4av7inpgd63n07xzng84vvc8qckmgljknc0j7k" + "commit": "c9aef52121b458297e70bb50f49f7276b4a8d759", + "sha256": "00xdxadbi9fxpfp60zah9190rcz3w08vl1blbhmaiy7c1hd2gi39" }, "stable": { "version": [ @@ -46201,11 +46281,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20210507, - 2243 + 20210622, + 2049 ], - "commit": "b35e8547b67f3d2c4d38ec7e7e516e3c0925352f", - "sha256": "1z6x28gv47vdi2a06p1w390a40ll1b1g2dhxhzpn998r6b1d8zxm" + "commit": "98ba3922360199d5260d47f417f096730ad057c5", + "sha256": "1k7zs7vlbpyhizv4ff1mhagz1mvazmm4bvq215z9f871hhf6l7ff" }, "stable": { "version": [ @@ -46535,30 +46615,30 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210607, - 1026 + 20210701, + 637 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "a92156303021e0ec91a904e16a994d8e1ccd78f7", - "sha256": "1lxmp0a7wk7wqb6qcy1zn9sr47vakgxzn0j8yyvdv1vps4hz9wk0" + "commit": "e74f450eaa4f197f1fa63a819193bc1c65984042", + "sha256": "1xl9wn520gnpyyryf7iij8y1x5ak61zcira6g480sqvv2ympmhkd" }, "stable": { "version": [ 3, - 7, - 1 + 8, + 0 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "8b0b9953a71ba07c24fdfc4d26fab21fb66e4d1f", - "sha256": "0b8sfpvy02ijk9xi9b44762b718jqfq063wcg75dk3q452d27s1h" + "commit": "0714e27fe703a42fa52caf6daa0921d544a55402", + "sha256": "1xrpv0sqmlwn94bc31k2iav284i1hl95937541ihlkhqg6v2vwrv" } }, { @@ -47443,26 +47523,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210606, - 1857 + 20210701, + 608 ], "deps": [ "async" ], - "commit": "a92156303021e0ec91a904e16a994d8e1ccd78f7", - "sha256": "1lxmp0a7wk7wqb6qcy1zn9sr47vakgxzn0j8yyvdv1vps4hz9wk0" + "commit": "e74f450eaa4f197f1fa63a819193bc1c65984042", + "sha256": "1xl9wn520gnpyyryf7iij8y1x5ak61zcira6g480sqvv2ympmhkd" }, "stable": { "version": [ 3, - 7, - 1 + 8, + 0 ], "deps": [ "async" ], - "commit": "8b0b9953a71ba07c24fdfc4d26fab21fb66e4d1f", - "sha256": "0b8sfpvy02ijk9xi9b44762b718jqfq063wcg75dk3q452d27s1h" + "commit": "0714e27fe703a42fa52caf6daa0921d544a55402", + "sha256": "1xrpv0sqmlwn94bc31k2iav284i1hl95937541ihlkhqg6v2vwrv" } }, { @@ -49523,8 +49603,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20201123, - 1102 + 20210608, + 1556 ], "deps": [ "dash", @@ -49532,16 +49612,17 @@ "org-ql", "s" ], - "commit": "208e103ecc146db71d878df3bd09c6eb60c2797d", - "sha256": "09vdndp3935iy4flynbjpkvfax7vs1ppswl19wx4nn2rp7hdz8kp" + "commit": "8342656b2d9af4bb6af9daa0a8b037d3693bd940", + "sha256": "0alrs2dsd5k4xjrs2zs7hcr5fbfrr3rdq705s04943ic4kzvhrc9" }, "stable": { "version": [ 0, - 5 + 5, + 2 ], - "commit": "3924b023e0f1e8fa93cfa79bdd71f9f0c0fb4679", - "sha256": "14nsy2dbln3m5bpqzyfqycn18sb3qh407hjbkk1l0x2nqs3lrkqn" + "commit": "d3b0ef2f5194452d88bf23ec31ebfef822c47c24", + "sha256": "0b3xxnbhnrz0263fnrrdbs3gif4pjkfws4mxkfqqpg0fc8azp2rx" } }, { @@ -50284,8 +50365,8 @@ "helm", "rtags" ], - "commit": "63f18acb21e664fd92fbc19465f0b5df085b5e93", - "sha256": "0wzyn9qzyly71yfwhlk5m94ygjnbk459pgbpgkhp9fqgchx12p1r" + "commit": "65113e2a137baa9f85dc2157b893291470788dc4", + "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h" }, "stable": { "version": [ @@ -50795,15 +50876,15 @@ "repo": "emacs-helm/helm-system-packages", "unstable": { "version": [ - 20201114, - 1019 + 20210628, + 1727 ], "deps": [ "helm", "seq" ], - "commit": "c331c69de0a37d2bc4d6f882cc021a905e7e56f9", - "sha256": "13a8jpj4wwm0yjv8hnsizgjf8wi3r2ap87lyvw7g4c7snp2dydwa" + "commit": "a16bb1c3708416984106a98353700d456414b6a1", + "sha256": "09acgs1mjkqmm7n88x4hck2bp3jv5fifdkd406r8fh874vyfib38" }, "stable": { "version": [ @@ -51560,11 +51641,11 @@ "repo": "emacsmirror/highlight", "unstable": { "version": [ - 20190710, - 1527 + 20210318, + 2248 ], - "commit": "9258a2b8362d737115cbd87618f947eadb140411", - "sha256": "0pbqzgbfkm8smi23j94hirxh2r1yc0ipyjbbv1y906br6bx5c1a8" + "commit": "28557cb8d99b96eb509aaec1334c7cdda162517f", + "sha256": "1klrc2w0wg9ajm973b7blkjcwscqni6nxaqkcmimava398lxss2l" } }, { @@ -51800,10 +51881,10 @@ "version": [ 2, 0, - 2 + 3 ], - "commit": "fdabfda5f6300f8dd4d2a62c49359605798cc001", - "sha256": "0x833ahd5m4rlqrgr7n5xj477vbs7mmp267in22hw0cxi9aan08q" + "commit": "891538de31524956136e1419e1206af0c8befe02", + "sha256": "08l5gb73ibs1mmfifnks5gxrcg8x8azw9g10jj2f8vn8viwwa7m0" } }, { @@ -52153,11 +52234,11 @@ "repo": "ideasman42/emacs-hl-block-mode", "unstable": { "version": [ - 20210320, - 1051 + 20210617, + 1324 ], - "commit": "717b4f743c633362a8b28c883c454c5ef3711722", - "sha256": "16b1hnxzfygn3pgck5d8m612iwn42bxsx0zhdqrzmjl9sjvvps4h" + "commit": "0ea43d320219ba4e6b7b1be36a5c1533ac3edb42", + "sha256": "1hg18rm7lqs45gvv1rb5d3vqh6g9nmyf2wd2sichl06a2cn48n16" } }, { @@ -52204,11 +52285,11 @@ "repo": "ideasman42/emacs-hl-prog-extra", "unstable": { "version": [ - 20210422, - 56 + 20210629, + 602 ], - "commit": "42dee82058e49a7eae5490af2b6b4147600e87ed", - "sha256": "1csvhvjzhq1w9384i9n78qv8x0c2y8mdqig6fa2k5qi84cgsh8zp" + "commit": "c251d0cd354565b859ddf7c61bdae32649c6a0f4", + "sha256": "0a8dkay7d31h2k4vsapwigf62wl77yk4r0wa86ly4p6vghbczj3w" } }, { @@ -52241,11 +52322,11 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20210504, - 1406 + 20210615, + 1505 ], - "commit": "57378bd4511887a815725a7850e1ff2c6e9fda16", - "sha256": "0bdwdp8d0g7n0kv6l4h7alya3z6fsfi618dzw5x8f2az3r87yg8y" + "commit": "5ac0076cfeaea57f7c7a59d9d41a34c1bdc4b22e", + "sha256": "1h3h62rglgwir3jfy6wq9hkwlx6z28cs9dz8jv8xgpk1jsj89whw" }, "stable": { "version": [ @@ -53137,11 +53218,11 @@ "repo": "Riyyi/emacs-hybrid-reverse", "unstable": { "version": [ - 20210527, - 2324 + 20210630, + 1155 ], - "commit": "4cad8a17f6c9d98a628d78fe358d589b03172b57", - "sha256": "0xwl0fycygzwsrv4vrph6q6hy0550j3z1ir9ahfc7fjl091k192x" + "commit": "e59c8392938235ca8d95306aa1c3f1591a43fb45", + "sha256": "0vrdd4w9v07g6092sva8br0n3dlf1n9gj8y56k13a1wn9hwi2wp3" } }, { @@ -53614,27 +53695,27 @@ "repo": "plandes/icsql", "unstable": { "version": [ - 20210605, - 1658 + 20210612, + 1340 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "bc7c5f27f9d804613759a1d1357166f9ccecbe0e", - "sha256": "1g3wy9jjlag4ma610kdqnb0f2sy1032m5q419ankh5fv0gfxlwbl" + "commit": "4521e9d2debef7687bfd26a664479f0c46688a36", + "sha256": "0s65kilx1jrjhm80sc4fj3x0mr3x4m3vjllm6qxj8ml8sh3pkai3" }, "stable": { "version": [ 0, - 7 + 8 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "bc7c5f27f9d804613759a1d1357166f9ccecbe0e", - "sha256": "1g3wy9jjlag4ma610kdqnb0f2sy1032m5q419ankh5fv0gfxlwbl" + "commit": "4521e9d2debef7687bfd26a664479f0c46688a36", + "sha256": "0s65kilx1jrjhm80sc4fj3x0mr3x4m3vjllm6qxj8ml8sh3pkai3" } }, { @@ -54150,15 +54231,15 @@ "repo": "idris-hackers/idris-mode", "unstable": { "version": [ - 20210223, - 850 + 20210614, + 1212 ], "deps": [ "cl-lib", "prop-menu" ], - "commit": "80aabd2566082aa67d17eccdd80e9f1fb10c9ec8", - "sha256": "1cmmasfmgnzhixhczigz1c2jzhr9yj4v6mwvgxs99vbg2k3p9rcq" + "commit": "f52ad0b4770403561b40f1d0499ecaca70da886c", + "sha256": "1ai5ha67650ryj7mdxx6b86hlm2v13h7kipisgvxj5dss3j9j7lv" }, "stable": { "version": [ @@ -54196,11 +54277,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20210606, - 1026 + 20210612, + 546 ], - "commit": "94650d77719a554cdcebfc6e26a731de87e14483", - "sha256": "029z9j3anb948mbmh6ai8asxgfim8193ymm41c7crqzga9p4ivc7" + "commit": "3247f3029a4e309c71a5b066fa4299d4cbb79fbc", + "sha256": "1w6apgfs4zgcqpcn3qgf0ncx46m6sz7vr4ln00s626ll0c4lhnys" }, "stable": { "version": [ @@ -54403,11 +54484,11 @@ "repo": "tarsius/imake", "unstable": { "version": [ - 20200103, - 1238 + 20210615, + 1506 ], - "commit": "100d62c7095743fadddfad5b9e0740ee386ba4cf", - "sha256": "0wpfl74v7xnvsk3ribxkfyy4p5p9j2wskrcf0naavqpgm6fc6jvr" + "commit": "b61b1582abe8f7a389883f48b7e5243abb010a69", + "sha256": "19nbas7kpbxksd0vqbvf8awzpnrmy97yxd616kcxcp86qk34mlwr" }, "stable": { "version": [ @@ -54910,16 +54991,16 @@ "repo": "emacs-stuff/indent-tools", "unstable": { "version": [ - 20190606, - 1642 + 20210622, + 1207 ], "deps": [ "hydra", "s", "yafolding" ], - "commit": "c419874e6fb296ecdba94b2f4b73c9eecdd5329d", - "sha256": "1dwhn9ssirr7i08rfd97mih629cxc9jwnvncb74dxdbgn1bi2b9k" + "commit": "c731f05fa3950e2e8580ec61b88abbc705639830", + "sha256": "0jri2vxd5a4sx93xq6kjcc5zx9yrhv789x3lyq6r2p2422diw2jr" } }, { @@ -55077,11 +55158,11 @@ "repo": "J3RN/inf-elixir", "unstable": { "version": [ - 20210315, - 1723 + 20210629, + 40 ], - "commit": "b526ce852886d1863163e054fcbbcbb83c55b32a", - "sha256": "1kmv2j1g299wb8dqq43zk61jigkfl9rnqxbfnclzsqfdlnhvw6ii" + "commit": "ec87ecaab5a10e79034f77d553e7fefbf60b9f97", + "sha256": "1p6r0iwqcaf9bp123ccwafmzlf8hgwvap0cqwgy33cks6bhcbzb9" }, "stable": { "version": [ @@ -55578,17 +55659,17 @@ }, { "ename": "insert-kaomoji", - "commit": "216fcef758036cf466fa5b52599394709eed48b3", - "sha256": "1ip61cigz6b6hsj8ahgb6fxf7yab24r0rjjl11i10ykq7sb49k00", + "commit": "982788433004ba644a372c50130613e3c56bba10", + "sha256": "0yaz5fsnxdrnv16sns8hgvf07fmfz8p8969619ywv844kv3p16q7", "fetcher": "git", - "url": "https://git.sr.ht/~zge/kaomoji", + "url": "https://git.sr.ht/~pkal/insert-kaomoji", "unstable": { "version": [ - 20200325, - 2248 + 20210618, + 2249 ], - "commit": "d18423f78cc02ba866b1a1dfb0617476cd941c54", - "sha256": "0n6fjndwcp2qg8164420dlc3xsdzm6m0zwbvvwn5w03khbk788hr" + "commit": "25b74d527cef00f6a49985161a8caaf62faa887c", + "sha256": "1qqxw67fbpix290jjrfai6z33fsyzb3zy1nwzk6mjss151586f5n" }, "stable": { "version": [ @@ -56862,15 +56943,15 @@ "repo": "tumashu/ivy-posframe", "unstable": { "version": [ - 20210426, - 2144 + 20210609, + 1053 ], "deps": [ "ivy", "posframe" ], - "commit": "084cc59ea2cd62afaa51445ada3d00404749a541", - "sha256": "170z5akdwxzrn0b4cbk6v8a3dqz229b7pj9n0534y1a7ydvcyv9h" + "commit": "9c8382823392d5e64fb4879055e43ab4a029e62a", + "sha256": "1dqbgi12rd79jkrbyd59lrx9b5wi5a0k2xmf927c4mcqjfbvih2w" }, "stable": { "version": [ @@ -56993,8 +57074,8 @@ "ivy", "rtags" ], - "commit": "63f18acb21e664fd92fbc19465f0b5df085b5e93", - "sha256": "0wzyn9qzyly71yfwhlk5m94ygjnbk459pgbpgkhp9fqgchx12p1r" + "commit": "65113e2a137baa9f85dc2157b893291470788dc4", + "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h" }, "stable": { "version": [ @@ -57060,8 +57141,8 @@ "espotify", "ivy" ], - "commit": "3d62a3319ab03a810030058d3fb368b28dfd82d5", - "sha256": "0hj3nczmqmgiwsvh664rs34j63wl325x6nar21p1a84h5ximpkxq" + "commit": "5bf63dacc5df8a74860e80dabd16afce68a24a36", + "sha256": "1vxg86wv6f96bva0d1xxhisk525chwhdl4nq77xhriflq65mcmi3" } }, { @@ -57858,11 +57939,11 @@ "repo": "rymndhng/jest-test-mode", "unstable": { "version": [ - 20210228, - 132 + 20210615, + 41 ], - "commit": "fb2bacab9475410c79e6e4ca344f093f7698466d", - "sha256": "0m3p75659krzcyc54ri0x8bwr1zxhkrfmyz8z7z5mjpydb8qb1v8" + "commit": "d7660096e7d49f9b2ebc8924c0f5b39c5ffa8c86", + "sha256": "1sw1cgykq9i6wdjjlqlw6jrdxnic615k96lbqyir84fizn55qcja" } }, { @@ -58412,14 +58493,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20210414, - 2241 + 20210622, + 102 ], "deps": [ "cl-lib" ], - "commit": "b891edecedf30be6321e2f109fdfeb25b0edad27", - "sha256": "179vkwr57nibc148b961g1aim052v65qsva44imxibkm9h0n32w9" + "commit": "4eaf98e3cc3789381a37a05cd70a248db9ac8c1b", + "sha256": "0mlp1pbph3790lvg5j6cdaffhb9ly8jdl00lmffs14840b8prkf3" }, "stable": { "version": [ @@ -58484,8 +58565,8 @@ "deps": [ "js2-mode" ], - "commit": "d970dd53dec76f9f72ade5b1f8717dea3d45bb3c", - "sha256": "0i46frhgmkw6qga1mki9bsrm6zncyca9fr81n1sadmgwfl1rxl28" + "commit": "ab01c290860ab0d8f43afcf1f7466fdced24e123", + "sha256": "12g1yah3k0k0p6nlrq8j9iq5l59zalknix60s1zj24bssac5y0zj" }, "stable": { "version": [ @@ -58777,14 +58858,14 @@ "repo": "tminor/jsonnet-mode", "unstable": { "version": [ - 20210527, - 1557 + 20210627, + 1451 ], "deps": [ "dash" ], - "commit": "54a89b0aaba7a68782008c5e1ab00d5ec757316a", - "sha256": "14nxfa91yg2243v4d5kvynp2645x3811ispmhmpgil3x9qbl9jg9" + "commit": "404ebe3ca964fde99b7a6d89d2840ce53376d80a", + "sha256": "1ddkljjmvbm35gdw6wnys2na19826wxxgydlikn52nvchvr5z5z9" }, "stable": { "version": [ @@ -58820,10 +58901,10 @@ }, { "ename": "jst", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "1kxf8ckhsh0sgc4xqkkyh7ghk17farqqz35ibvmyrkl9s19ydj1q", + "commit": "93d46615545045ea2a9456b8a28016ec933e43d4", + "sha256": "0zl20xy33cz1k0lcm2ymk0bi0w7ayndq0xqrw42fvd7gm1plbsd4", "fetcher": "github", - "repo": "zhangkaiyulw/jst-mode", + "repo": "victorteokw/jst-mode", "unstable": { "version": [ 20150604, @@ -58933,8 +59014,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20210330, - 1901 + 20210624, + 547 ], "deps": [ "dash", @@ -58943,8 +59024,8 @@ "spinner", "vterm" ], - "commit": "03b4296ba7151963eb3c850f3314b02644101f51", - "sha256": "1jgs0pz8bzqg8116kyw3z7jwbf6karrl89ks028q091ylc00nm8b" + "commit": "47f1b125f8364a0aa8c072fdc7b4007aad5c0724", + "sha256": "12lqc5yysjzf0vypjcs2mnsv6frhwyfm950rcsbwkwz3lvfnrajn" }, "stable": { "version": [ @@ -59216,26 +59297,26 @@ "repo": "TxGVNN/emacs-k8s-mode", "unstable": { "version": [ - 20210414, - 1543 + 20210618, + 1540 ], "deps": [ "yaml-mode" ], - "commit": "14f08627d5bc320fee5bd9926e9aabe6956f514e", - "sha256": "1rfglmslhv3i71fgsqs8gjcnkff06lnp0b9s182rsnfz29dnzd1a" + "commit": "430e9d698f1411efe3f8f2bb4c8f8857e0321a8d", + "sha256": "0rpgsfxvbic7ni82cpqi7wya73ajbd2jfbjskklzlmhwn1j26a9v" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "yaml-mode" ], - "commit": "9364cdbbae00055c4efa1eeb80503e0b0a215743", - "sha256": "1ap8nwlv9ha5a03gc10sva12sc6qzq1vig8hibg1igbsc1qmfkad" + "commit": "430e9d698f1411efe3f8f2bb4c8f8857e0321a8d", + "sha256": "0rpgsfxvbic7ni82cpqi7wya73ajbd2jfbjskklzlmhwn1j26a9v" } }, { @@ -59849,11 +59930,11 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20210521, - 828 + 20210616, + 826 ], - "commit": "a12ef1fb480b56c34c92f48fc7f7aa8a1d7c4c4b", - "sha256": "0093v1c5nl2bh1lvccqq6fzpgjald3yypp87dsim982aywl2vlv1" + "commit": "04ba7519f34421c235bac458f0192c130f732f12", + "sha256": "09xr0h2ag3pzlz455gv5h915vn1dz56gqx61jx3n7fc4a794pqxw" }, "stable": { "version": [ @@ -59920,14 +60001,14 @@ "repo": "dacap/keyfreq", "unstable": { "version": [ - 20160516, - 1416 + 20210630, + 1318 ], "deps": [ "cl-lib" ], - "commit": "e5fe9d585ce882f1ba9afa5d894eaa82c79be4f4", - "sha256": "12m1jy8m8i39b809qbxx9g3r066jxhqwfyf5mqbd1lzlaw63b1i7" + "commit": "7bb36e910ae04ff1dce387e3ce73b669d299680b", + "sha256": "188055yg9fqw92p1wip7mx7nz5gz5jbwb6lgcjncxzs4i9v7w8kr" }, "stable": { "version": [ @@ -60316,8 +60397,8 @@ 20210318, 2106 ], - "commit": "3894a454ee03ede25e920759e6ac2df040ff3431", - "sha256": "1crqrmzxhm21psv5mkbzn3h2syrgszx50i4kd4n92f56dq7s8i4b" + "commit": "143ba31a0a5c23d8c1a8d6fb1972d94cc1d7f31c", + "sha256": "1daisqp687p0bpjk8mj7c3sxq9clwi25byzbk7yx8l15rcr1bhr5" }, "stable": { "version": [ @@ -60527,10 +60608,10 @@ }, { "ename": "kroman", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "0rcy3343pmlqzqzhmz2c3r0b44pn8fsyp39mvn9nmdnaxsn6q3k8", + "commit": "ff990cb7ff2c10c3d6c97b820c9eaad7c4e86b11", + "sha256": "0vg7wrm7h36gnhhyjpk6k2sq5x1rilzaqhjrhyk508f5jfzylzqz", "fetcher": "github", - "repo": "zhangkaiyulw/kroman-el", + "repo": "victorteokw/kroman-el", "unstable": { "version": [ 20150827, @@ -60601,8 +60682,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20210326, - 2053 + 20210623, + 1316 ], "deps": [ "dash", @@ -60610,8 +60691,8 @@ "transient", "yaml-mode" ], - "commit": "91d1c8e97e4168fc49548c3449b4a60568c96790", - "sha256": "16s6iy3igb40r29x4bpb2x9763pf1fg5cygfdgabjq8xq36slmg8" + "commit": "801d4cc78cb59b3c39e9ea53d7f16ec3c9a6bb6b", + "sha256": "120pyq6njxvhjwjrsbrclxj9g4qsi9awm9pmvvy74z3qzxjkj7bl" }, "stable": { "version": [ @@ -60643,8 +60724,8 @@ "evil", "kubel" ], - "commit": "91d1c8e97e4168fc49548c3449b4a60568c96790", - "sha256": "16s6iy3igb40r29x4bpb2x9763pf1fg5cygfdgabjq8xq36slmg8" + "commit": "801d4cc78cb59b3c39e9ea53d7f16ec3c9a6bb6b", + "sha256": "120pyq6njxvhjwjrsbrclxj9g4qsi9awm9pmvvy74z3qzxjkj7bl" }, "stable": { "version": [ @@ -60661,27 +60742,27 @@ }, { "ename": "kubernetes", - "commit": "16850227ea48f6f38102b9cdf80e0758766a24d2", - "sha256": "06357a8y3rpvid03r9vhmjgq97hmiah5g8gff32dij9424vidil9", + "commit": "870901c45fb35384953568a972aa36ad445e1ad9", + "sha256": "07x770fcnjg0545bml3jqmd9d9l1bw8i8i4imznqhwx3acm8grzy", "fetcher": "github", - "repo": "chrisbarrett/kubernetes-el", + "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20210604, - 909 + 20210630, + 612 ], "deps": [ "dash", "magit", "magit-popup" ], - "commit": "93d7b4d1b079b3cf1fbe3949154b6a1bc06904ef", - "sha256": "0xz35j38ph1l870zrdd0r2xycxq65pbq1a1hi270q4mikpai85gb" + "commit": "d8034e6ddd668d2f7d34b6aa7bd19e2a575b609f", + "sha256": "1hp760wqwzflpnqrha1qnrbilr3qynd1dma00jyrhq76hdb83xwv" }, "stable": { "version": [ 0, - 13, + 15, 0 ], "deps": [ @@ -60689,40 +60770,40 @@ "magit", "magit-popup" ], - "commit": "8ae9dc2340620c7d8efb2347723b25bde5a6fba0", - "sha256": "0di3vcq8c8j8avjlic7bhvbq4p27cvzyklm26wiq4rga88vjhyb0" + "commit": "ea81874f0490cea310b09c57718aa0e5c83d578b", + "sha256": "13kra8y8laqk949phxwlw5q0lmv4yc9knql12srdys1hyvhczwx3" } }, { "ename": "kubernetes-evil", - "commit": "16850227ea48f6f38102b9cdf80e0758766a24d2", - "sha256": "12ygfs6g9aivf2ws3lxwjm5xnd2kidhli889icpygd5v7gnk9pg8", + "commit": "870901c45fb35384953568a972aa36ad445e1ad9", + "sha256": "163idbancjbm8jj8bprhrg7lqypz3g3qkfz7mas0b40iw6ip220h", "fetcher": "github", - "repo": "chrisbarrett/kubernetes-el", + "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20191108, - 615 + 20210628, + 2003 ], "deps": [ "evil", "kubernetes" ], - "commit": "93d7b4d1b079b3cf1fbe3949154b6a1bc06904ef", - "sha256": "0xz35j38ph1l870zrdd0r2xycxq65pbq1a1hi270q4mikpai85gb" + "commit": "d8034e6ddd668d2f7d34b6aa7bd19e2a575b609f", + "sha256": "1hp760wqwzflpnqrha1qnrbilr3qynd1dma00jyrhq76hdb83xwv" }, "stable": { "version": [ 0, - 13, + 15, 0 ], "deps": [ "evil", "kubernetes" ], - "commit": "8ae9dc2340620c7d8efb2347723b25bde5a6fba0", - "sha256": "0di3vcq8c8j8avjlic7bhvbq4p27cvzyklm26wiq4rga88vjhyb0" + "commit": "ea81874f0490cea310b09c57718aa0e5c83d578b", + "sha256": "13kra8y8laqk949phxwlw5q0lmv4yc9knql12srdys1hyvhczwx3" } }, { @@ -60969,8 +61050,8 @@ "highlight", "math-symbol-lists" ], - "commit": "63796ccadcc9147c5badd9a87f626611f63e3c4c", - "sha256": "1iwgi7jm20qwxlfa7klkz5zmdfxa14psly6xsl29i37j9p6146sb" + "commit": "56f808edfd0983c0df2ed1c957c50c02af5faad3", + "sha256": "05fyx88wmyc4c6lcy5qphg6zhbfmlnpy7y23l00qfi5k9hmv99hm" } }, { @@ -61095,25 +61176,25 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20210411, - 1332 + 20210618, + 1532 ], "deps": [ "cl-lib" ], - "commit": "30a5bc267af7de167d0a835ead828016e6e7e14c", - "sha256": "1wkppwh72zs8b4jqdxqpf3gikh11la03nkj8nna9bg7k8n0a4vaq" + "commit": "7db7ba27d2abf8891d40dc952c22d3a3654d9bbc", + "sha256": "11wzyv6jdprppjqygszl30hkxydjlhk7fdvda6h37k6dlk1fh1wp" }, "stable": { "version": [ 0, - 12 + 13 ], "deps": [ "cl-lib" ], - "commit": "2c99ce29b86fc635649f4e89723912dc1cc4f36c", - "sha256": "12fzzdc4jns440gb71iydsicni646gciaxv50p0wrfk9mbppidck" + "commit": "7db7ba27d2abf8891d40dc952c22d3a3654d9bbc", + "sha256": "11wzyv6jdprppjqygszl30hkxydjlhk7fdvda6h37k6dlk1fh1wp" } }, { @@ -61124,26 +61205,26 @@ "repo": "PillFall/Emacs-LanguageTool.el", "unstable": { "version": [ - 20201111, - 515 + 20210621, + 453 ], "deps": [ "request" ], - "commit": "531ab81bf66c778616a326b93d4eedd509dd795e", - "sha256": "03mrlwic3ws54573abc8wpq4apffnmq4ncqlwsvs4nhg14yl2s59" + "commit": "feea3f9271ce920490a0d9dcd11e669e3eaad1d0", + "sha256": "0vxq945x1yn86kpw7qbb686vb3pzyk7wma8g0dbval2m4hsbrn26" }, "stable": { "version": [ 0, - 3, - 0 + 4, + 2 ], "deps": [ "request" ], - "commit": "531ab81bf66c778616a326b93d4eedd509dd795e", - "sha256": "03mrlwic3ws54573abc8wpq4apffnmq4ncqlwsvs4nhg14yl2s59" + "commit": "feea3f9271ce920490a0d9dcd11e669e3eaad1d0", + "sha256": "0vxq945x1yn86kpw7qbb686vb3pzyk7wma8g0dbval2m4hsbrn26" } }, { @@ -61364,11 +61445,11 @@ "repo": "pekingduck/launchctl-el", "unstable": { "version": [ - 20210309, - 1113 + 20210611, + 2243 ], - "commit": "86cbb8980de4641b552a792389cc2cb9b2718ee4", - "sha256": "08prmsx6ski5j1pnzr7v3hxvbdrb5by8x2dihwhz0wjgfsqj13mr" + "commit": "c9b7e93f5ec6fa504dfb03d60571cf3e5dc38e12", + "sha256": "0hbhbyl4qbc9b7hmkjpwclyfh4xnl5j51j18793wrh28xqpbkf0s" } }, { @@ -61476,11 +61557,11 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20210603, - 1518 + 20210611, + 1550 ], - "commit": "af0d4d8daaa323c34502d3cbea85ec8f70b06c00", - "sha256": "0p4smpfld1ky07cy5qn8kqpbqw5ymrn8valkpx4c519lj6pb9rn6" + "commit": "a4fd520f5c31f54e0797155866e0b35df277664e", + "sha256": "0xy1zjr32xpj4kkl3rxshcz5x2qvkn1ciq4v61p6a7vfr3qmkiz2" }, "stable": { "version": [ @@ -61775,8 +61856,8 @@ "repo": "kaiwk/leetcode.el", "unstable": { "version": [ - 20210121, - 1600 + 20210620, + 706 ], "deps": [ "aio", @@ -61785,14 +61866,14 @@ "log4e", "spinner" ], - "commit": "9c44791407c3f4f76d903ee43367547803ae9c32", - "sha256": "14nlmgbkb8vyb0r25sdg03lg2h38gj83vspp9v9vsqyiiirhnvnh" + "commit": "aeba19919e6d8f1c0529330572240143a2af38e0", + "sha256": "0yfghps19832w4sdjaglnbb9xn40fc5a6072lxbsw8gan9c2bjh7" }, "stable": { "version": [ 0, 1, - 18 + 22 ], "deps": [ "aio", @@ -61801,8 +61882,8 @@ "log4e", "spinner" ], - "commit": "ef59344158ae4b7842ca2531ec77c439ed6e6997", - "sha256": "0sxrzr34x43dcxw9l3ib982rz4327fpwnjmj3hi17bc5gk6zzfq2" + "commit": "aeba19919e6d8f1c0529330572240143a2af38e0", + "sha256": "0yfghps19832w4sdjaglnbb9xn40fc5a6072lxbsw8gan9c2bjh7" } }, { @@ -62049,16 +62130,17 @@ 20210603, 1241 ], - "commit": "1feb8af64c977946b6184b7d63b436c49dbeb52d", - "sha256": "0vxpkvp8fsi52zb2sqqd9xfdndyxb59hqg8qkpdfsdwszxngfij5" + "commit": "8b73426766029eb541b69f49cc49b9dfa1c616be", + "sha256": "101mpzj38w6cng09aq5rq4ly4a0p9zgr8jmbvlkf12i8k03lsfsv" }, "stable": { "version": [ 2, - 0 + 0, + 1 ], - "commit": "76eaf432f768b45393e404c1bd1861a08c19de3b", - "sha256": "0vxpkvp8fsi52zb2sqqd9xfdndyxb59hqg8qkpdfsdwszxngfij5" + "commit": "c09b9aebaa659f5c2d0c152d8401fd6924144ce9", + "sha256": "0a5cfnk3021idvv4bv2lvnksjy9d0yyd13bnj793ks86j5f3hdv5" } }, { @@ -62153,11 +62235,11 @@ "repo": "magit/libegit2", "unstable": { "version": [ - 20200515, - 1759 + 20210620, + 2017 ], - "commit": "0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a", - "sha256": "0pnjr3bg6y6354dfjjxfj0g51swzgl1fncpprah75x4k94rd369f" + "commit": "77bd28aeaa2a49962e8f714741f5a69b656a2183", + "sha256": "19sxrikxl0kbfnbl2rdjvj96l9abmqhi68jj5hglgpa8qp3flc24" } }, { @@ -62183,20 +62265,20 @@ "repo": "mpdel/libmpdel", "unstable": { "version": [ - 20210107, - 950 + 20210627, + 755 ], - "commit": "9162a4b350c978f94dde6f75d60bc6a17e1dc18e", - "sha256": "0w45g4pkjsggv5yqw0zsnwqvzljapfvhxzf0vhnrqc446ys9jzp3" + "commit": "e4ae63dd002fe07835c3c8a35b20b6e8347f8e84", + "sha256": "0pryjihv1766x86lqy2anpxwr159dndlzmqxxiiwhhz4skp5498w" }, "stable": { "version": [ 1, - 2, + 3, 0 ], - "commit": "a9d67cea595bfeff73cf6281fa735df98dee9a45", - "sha256": "1nzs6g2mg3jhfhhfcxjhd9sbvwzhmr6j6mc80ln2nr4gzjqgaa4k" + "commit": "b49ab2fe497d61d7d00ed1ad0c3b5a1d6a65e5c4", + "sha256": "0krxhcay5s9s7i41q7ga5skj31vaz2qx3djcrlwajf203bl8j4m9" } }, { @@ -62296,36 +62378,36 @@ 20210303, 1751 ], - "commit": "be7ff92e4dfb06ed51baaa10157d9a1ee1cd666a", - "sha256": "067i605hk3qy01106l90bbl91ivr3zqv2yqr41jf5pfysafykx4x" + "commit": "95538837d93c9d05e35ea85d6c25527fac715df7", + "sha256": "0p3v41vrsfjv866gjys2izmiyxl7vaiy7m93ra9kx45mrslyjcyg" }, "stable": { "version": [ 0, - 17, + 19, 0 ], - "commit": "ec97fdf14ce7a65398ecc2755654db46a3ef3b14", - "sha256": "067i605hk3qy01106l90bbl91ivr3zqv2yqr41jf5pfysafykx4x" + "commit": "0169d3ef40403c1bb41b5ce81c7ae2ec01a6ba1d", + "sha256": "0p3v41vrsfjv866gjys2izmiyxl7vaiy7m93ra9kx45mrslyjcyg" } }, { "ename": "line-reminder", - "commit": "6c2287c7b4c543e92ccfab120388b2c05174d2db", - "sha256": "1s3ibn7c1j6m7wdkb0z37apgfc0g8vhhrqcnmldf19zi3k13bm0x", + "commit": "eb151125750b06c2cf6fcc5d762c980fdc89b0dc", + "sha256": "1l7bf0lvncn645v7c3rr5gxd9jkz5jfyaps864mzwvmasbx6d3p4", "fetcher": "github", - "repo": "jcs-elpa/line-reminder", + "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20210531, - 743 + 20210627, + 2121 ], "deps": [ "fringe-helper", "indicators" ], - "commit": "1856034d0ed8ce41a29a1ea051184ee7c2f3e276", - "sha256": "0ni73ybrg21l63hs51pixkxf77bl288hzji03bm8v1hzsm72vxxs" + "commit": "355cdcb6888fe6668e85a96dfe694d4bd050372e", + "sha256": "0hs5js38djfid0aqz0ygswqj26j3dpqjbaidghlfhdhcvifixsvw" }, "stable": { "version": [ @@ -62352,8 +62434,8 @@ 20180219, 1024 ], - "commit": "68e59d0fff1eb76c7b1a72c438f344c251115e81", - "sha256": "1ipqf3qfgzcrrp6xwgxb6wkk8a6ii5jx5im5gfhghdhy45z2m3ii" + "commit": "a52bd2bce9d6fb73dc7fe1e867e3ea804b5abd07", + "sha256": "18fl0f3j6bfv85pjcf0fggd0k6l6gxwvi19jrp3slzf0mhrlxd8k" }, "stable": { "version": [ @@ -62944,8 +63026,8 @@ "deps": [ "s" ], - "commit": "29bb40a7150b6cfe1a96948ae1f36e9c107eb759", - "sha256": "1dznafcfwmd52jakkzzk3dhji55aal7hsfkglr3051fz8pkz7xfx" + "commit": "18d523d5b6a8cecc3e93c550d2ceab2d1035de02", + "sha256": "1d8dlb2xsqk88lac7f9n0y8ridkn6gfl5pb6sr2n66v9mq75j6rq" } }, { @@ -62985,11 +63067,11 @@ "repo": "jingtaozf/literate-elisp", "unstable": { "version": [ - 20210605, - 1238 + 20210612, + 1056 ], - "commit": "41f0946037b50323901ce708c1af82e59a334433", - "sha256": "1hjb1f835xq5jgq4s0dpr85vs5cap001lxv9n02l198gb2qppq6k" + "commit": "1a6465d4190491ddf927698554b13352a7babb3a", + "sha256": "1nbzrxfrz209dgnlhkqq9bpf2h678laac2wsrrmf9flw65dpafv9" }, "stable": { "version": [ @@ -63082,11 +63164,11 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20210413, - 205 + 20210701, + 1735 ], - "commit": "c191b149f93ed473f3900e506cfc762d53145237", - "sha256": "0likjz2q0pbs3cbqczdfhh6k0c1j8y6j32cxkcpjm9wakp1vzxq2" + "commit": "96ca0e9058d8c1e533ce9aa1396e49f086362b06", + "sha256": "0bcilb7mcf9al3qs8i63idw97025b193sslrwkd7w8pphk2g9cqi" }, "stable": { "version": [ @@ -63658,11 +63740,14 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20210601, - 133 + 20210701, + 216 ], - "commit": "50494b545b9a909fc6570216230beda1ebeedf36", - "sha256": "0wag0hhpak0i1k2bmzz896jkpadrmacj1m0bbb3y7rrl9sw1dcqg" + "deps": [ + "map" + ], + "commit": "27df47157a0a1753065172a346a2ffeb1778a99c", + "sha256": "0cwqyggc9hf5kwpypw0230p5fl3j8a6b2k3cgsrfk4i4lwkfnr5c" } }, { @@ -63673,15 +63758,15 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20210601, - 129 + 20210701, + 216 ], "deps": [ "dash", "loopy" ], - "commit": "50494b545b9a909fc6570216230beda1ebeedf36", - "sha256": "0wag0hhpak0i1k2bmzz896jkpadrmacj1m0bbb3y7rrl9sw1dcqg" + "commit": "27df47157a0a1753065172a346a2ffeb1778a99c", + "sha256": "0cwqyggc9hf5kwpypw0230p5fl3j8a6b2k3cgsrfk4i4lwkfnr5c" } }, { @@ -63748,8 +63833,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210601, - 420 + 20210608, + 2101 ], "deps": [ "dap-mode", @@ -63760,14 +63845,14 @@ "lsp-treemacs", "pkg-info" ], - "commit": "7ef909a1c9e0e1c924b43637899e0d53b0d1b00f", - "sha256": "1vsfs0jpk7fdfb3zmpxs3f7fy0s7d9b8jha5p7y6g0afhxz4iqn1" + "commit": "01d89d43f17a15c7ccad5a458250d5d6b0f70b09", + "sha256": "0vnzzfap7ndr26016n1c1q21ga2lgw9vb555mn4dql6ny191ri0r" }, "stable": { "version": [ 1, - 18, - 5 + 19, + 0 ], "deps": [ "dap-mode", @@ -63778,8 +63863,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "90a06dfc23750c3861628256a4af4e3b00b2e23d", - "sha256": "1cabxsz7gbjywhsqjqp32vdgycg2mq21mdxvwbfcs6k0cf319dwh" + "commit": "49bb4d597e30c95d66a96739ea10c1c4f74ac649", + "sha256": "0kwzi6f3ig6lq95h2y9nddwkisml1fig290vn1sm7wkl3r9ci8bd" } }, { @@ -63797,8 +63882,8 @@ "dash", "lsp-mode" ], - "commit": "fa304ea402ac492e97bee14496a41afa8508cc5e", - "sha256": "0y0z4ind08jj93qsxgvi5zqa5f8lnamg8fv2dvkgipx1qvq25r4c" + "commit": "49a6bab0b1ad88d220305dbe3a0a14d368f62354", + "sha256": "1i3gywik5m9j797c69ng70bs28qdww9662sjl6y232rw19rya93b" } }, { @@ -63841,8 +63926,8 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20210523, - 403 + 20210616, + 1021 ], "deps": [ "grammarly", @@ -63851,8 +63936,8 @@ "request", "s" ], - "commit": "f34f0d50a91a82ab9c49e2cf5ddcb42a98cc2ede", - "sha256": "1hqilkbxa63gkl6sc8km6j0m4lxindf184c1zl91h4sfh4kg67zb" + "commit": "57a698e69c0dacbcad30398c262cdc5711efba71", + "sha256": "17jhfzy7bk645402yi65dsw19rvyjqm5wfd8y73hcfniihdrnqzp" }, "stable": { "version": [ @@ -63879,15 +63964,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20210209, - 2150 + 20210621, + 1334 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "7efbef3d206989faa8b691a4230a3ed872542187", - "sha256": "15xp3gjj9zdvxbhcgw21108s9y99rfmih5sqlk7f0m9hw5mqw4zm" + "commit": "eb37ac4a6a43277263bbb17aed6a862a0992ae8e", + "sha256": "04pcwcw5bq6hs0zr553sf9isbslp4pbahbch0yb0l472ihlbcxwh" } }, { @@ -63949,8 +64034,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20210520, - 1747 + 20210701, + 725 ], "deps": [ "dap-mode", @@ -63962,8 +64047,8 @@ "request", "treemacs" ], - "commit": "b6f14d8ae3cddcbacacf245aeef46e5407e5b401", - "sha256": "1xb051wgllmfm87bw4kiznfbsv54jqr9q02h2zy9np74n51q6jp7" + "commit": "28c56ec59a8c1b197727f4d56cec724445661fd9", + "sha256": "0g544mxv362ypwg79kyvjmnr63ss5psp89dmmzbx0bfpk8z4ib0j" }, "stable": { "version": [ @@ -64074,14 +64159,14 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20210607, - 1206 + 20210608, + 1330 ], "deps": [ "lsp-mode" ], - "commit": "a5de6b7166935af4a1e05d254fc1a44600518066", - "sha256": "0i5mbz7mwnax7jwv9c1bkwp5jwqrvwvh51fgwkmnz0kpjxhzfpsm" + "commit": "0e4c96a625bd83930cac338eb7a998c024a15f38", + "sha256": "11gvqbp9j585g86ir610lb3fq87nbwr44j3xzifh4rga6cwdb6yj" }, "stable": { "version": [ @@ -64104,14 +64189,14 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20210405, - 1702 + 20210616, + 1021 ], "deps": [ "lsp-mode" ], - "commit": "0fd8baec7e5f92d74b8b80d02c926d32332d86bd", - "sha256": "04jx5bknns1fyany1x8wzs6yx9qxzwrwj8m1iardxy8la3jp6ncd" + "commit": "cd6fa0b32118792e9f7bcbf4a26032bfff05d603", + "sha256": "16hn5wbfa4f958pyl47l4nvqx092ws16l99dcwijzk9xs4wrkipn" }, "stable": { "version": [ @@ -64134,8 +64219,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20210529, - 752 + 20210615, + 1413 ], "deps": [ "dap-mode", @@ -64147,8 +64232,8 @@ "scala-mode", "treemacs" ], - "commit": "4c11fe47ef3c71a2fc7cd67a055ea0bc5883a0c6", - "sha256": "16laslmvsamvcn58gsi6hfs53p12q0nz7zx993ipa2xhy6n04hcg" + "commit": "9f82ebee48d32cd7bbc3e64b84d1ef5b0926195b", + "sha256": "1l4sxkmlif6dlh6j11fgy6z7hs4739jdcazm0y35cbhq9bspxsnx" }, "stable": { "version": [ @@ -64178,8 +64263,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210605, - 1854 + 20210630, + 2003 ], "deps": [ "dash", @@ -64189,8 +64274,8 @@ "markdown-mode", "spinner" ], - "commit": "7b75d6bf01bed9ccb108cf1406d0e2af29d7e39b", - "sha256": "1lbb3bpizibpnw77bgdf8j2303gwh2133n8s518frmz6gcb7kz8s" + "commit": "7b183d397f8bc17eceb4d156e24575a47a1d807f", + "sha256": "15br2gf55436jm5a3iygr8cp3vriiar85kmgmap88ws8z83qg17x" }, "stable": { "version": [ @@ -64477,8 +64562,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20210502, - 1804 + 20210618, + 1722 ], "deps": [ "dash", @@ -64487,8 +64572,8 @@ "lsp-mode", "treemacs" ], - "commit": "f360d54fa68a00baec228d9582bc67c1a327d757", - "sha256": "0wbni6njz98c23pns4wxg4mq26zrvpyxh0qcz0a4l46zdn1962vm" + "commit": "905cc74726438cf06d8ad7cabb2efae75aeb2359", + "sha256": "0kh8yn80x1fgpcvrgj9bqmlhpnkxqsy57w8m06gws8lhlnrh4yk9" }, "stable": { "version": [ @@ -64515,16 +64600,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20210604, - 1158 + 20210619, + 905 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "c4ffa7abf6706d591300c608c51d2b72178848ad", - "sha256": "1qr7is4k5w6dcfkcvg7crna6r26lqmb02v08i3yggq09qd01c08g" + "commit": "240a7de26400cf8b13312c3f9acf7ce653bdaa8a", + "sha256": "1zscdjlnkx43i4kw2qmlvji23xfpw7n5y4v99ld33205dg905fsy" }, "stable": { "version": [ @@ -64550,11 +64635,11 @@ "repo": "immerrr/lua-mode", "unstable": { "version": [ - 20201110, - 1250 + 20210619, + 652 ], - "commit": "2d9a468b94acd8480299d47449b53136060b7b23", - "sha256": "1586k3friamcyfg1xszhkh1vaddrfxji1mn7rd7s8id8f7sp8mnv" + "commit": "2bd9077dd0405efc9276f612e24a345698c539c4", + "sha256": "0ldk6v7c3xamyhq6zwp2l79iyxfan0qmlycsvj39z3fljaz953z0" }, "stable": { "version": [ @@ -64632,8 +64717,8 @@ 20210607, 1130 ], - "commit": "b5391e8dc088d95d8f131f49982d5c7cbaa23677", - "sha256": "08bfjg51ydznfk8w7hwznzyybl42mqa5l0pvb4xapqcq2na3d3yf" + "commit": "d158bb78029705a6ee848f8e00c09ba1f3575564", + "sha256": "1dkx6xas7dg07pgk4h3f7cdr6hmccw00qv3fi8l2vj462nd7cr5w" } }, { @@ -65002,8 +65087,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210531, - 1524 + 20210701, + 1554 ], "deps": [ "dash", @@ -65012,8 +65097,8 @@ "transient", "with-editor" ], - "commit": "4a8646a30df99bbafc95d4f21a0b2bf0a6f6566f", - "sha256": "0y3wzvyaxn5zybjak77r1cngaqqm462s3d4f1cwmzvrnpv99f3r9" + "commit": "2ae376e4923e02355828350b81cdc1b0f8fa72ff", + "sha256": "1h07rg0fvr7av69bcks1n63digafq145mlsaddyv6xixxqjp0vbg" }, "stable": { "version": [ @@ -65352,15 +65437,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210525, - 814 + 20210701, + 1551 ], "deps": [ "libgit", "magit" ], - "commit": "4a8646a30df99bbafc95d4f21a0b2bf0a6f6566f", - "sha256": "0y3wzvyaxn5zybjak77r1cngaqqm462s3d4f1cwmzvrnpv99f3r9" + "commit": "2ae376e4923e02355828350b81cdc1b0f8fa72ff", + "sha256": "1h07rg0fvr7av69bcks1n63digafq145mlsaddyv6xixxqjp0vbg" }, "stable": { "version": [ @@ -65435,14 +65520,14 @@ "repo": "dickmao/magit-patch-changelog", "unstable": { "version": [ - 20210607, - 1635 + 20210616, + 1302 ], "deps": [ "magit" ], - "commit": "5cd99a6336ad4b60e9e8ce766b8a9c0395289775", - "sha256": "17s5268kcqhgd141fvjqnn2wrny7v03yz940k2whr383l1253k6v" + "commit": "623d1a6a3bfa0f01bcaaffa13ad5ce5ae29cdb0a", + "sha256": "1dds83a6fcpakmhny5n3s4ibcvjba4p07pg8bpy37k32c704lw27" } }, { @@ -65521,14 +65606,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210525, - 844 + 20210701, + 1554 ], "deps": [ "dash" ], - "commit": "4a8646a30df99bbafc95d4f21a0b2bf0a6f6566f", - "sha256": "0y3wzvyaxn5zybjak77r1cngaqqm462s3d4f1cwmzvrnpv99f3r9" + "commit": "2ae376e4923e02355828350b81cdc1b0f8fa72ff", + "sha256": "1h07rg0fvr7av69bcks1n63digafq145mlsaddyv6xixxqjp0vbg" }, "stable": { "version": [ @@ -66322,19 +66407,19 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20210605, - 1213 + 20210620, + 1943 ], - "commit": "4c6272ffc4836de052c8b06f681b0e700cb01602", - "sha256": "0l4sl4w4yq3hkpvvw7w1mh046f95bkg1c3av07kwk9cm038rwhvg" + "commit": "9796fada769f44cb8e05914bd6be3fcc15d791e2", + "sha256": "0yn6dybvsdhr37hnadmbfqi7pf7scxr9z6a6ghsqbrghycddd0mc" }, "stable": { "version": [ 0, - 6 + 7 ], - "commit": "ca9a5e35913569d66d34193a87d8511b2bb9d2b2", - "sha256": "1lisns2vghmqlg8wiv6jy15cfgnc8j83khz0vfnmrjwgcmjw3bbz" + "commit": "9796fada769f44cb8e05914bd6be3fcc15d791e2", + "sha256": "0yn6dybvsdhr37hnadmbfqi7pf7scxr9z6a6ghsqbrghycddd0mc" } }, { @@ -66442,11 +66527,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20210530, - 1825 + 20210616, + 122 ], - "commit": "58f2d22526ac1e4abd4ee1afff8624d2dd3123d3", - "sha256": "1k17zpx05yafxfsw89dlkymqc5xajzv28qby12kdhwwlsbarqvd0" + "commit": "1c7d29d52986b2cb153b5f643167ea49417de469", + "sha256": "0jgfxvhx5z3hjzpdxikx75ikgc0w7ap442svqpyigf78rb32wsjl" }, "stable": { "version": [ @@ -66516,16 +66601,16 @@ "repo": "ardumont/markdown-toc", "unstable": { "version": [ - 20210515, - 902 + 20210629, + 931 ], "deps": [ "dash", "markdown-mode", "s" ], - "commit": "86a4a2b092b0f23b9edb3ee0ab7da483b7f10a5b", - "sha256": "0n1fzla3dkscz70fy81fsbiyi2hj7swjy7zvxprhn36jjkb6b5hf" + "commit": "f78cba9b5761c91058fed3a781bd3fed7f996e1f", + "sha256": "12dddxa14ppa7gaayify67w4sc6ncbc68wdg4madfqj7s71lnm45" }, "stable": { "version": [ @@ -67363,16 +67448,16 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20210606, - 1056 + 20210622, + 931 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "1cf2508f8e95311aa9ca405f899c3596cf8c2bc7", - "sha256": "12xzq9sxczjppqpx75bny2dp647m3f9ww6zf9a22rgmmspzkk5cx" + "commit": "174cb2fb5f1ae674a405667ed432cd6601f53656", + "sha256": "0ix0ph82j12v1x5bi9w643q0a9cik4yd02bmk5c919wnyfz1syy7" } }, { @@ -67383,11 +67468,11 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20210408, - 1014 + 20210623, + 1512 ], - "commit": "7d929be2e9c1ae1a32e680591c5a224a96198e47", - "sha256": "0gpis7r2c7sppk4fx6alq9g2asva71xj05fjjq60zg87paimfdx4" + "commit": "a69ef83f2894c7e019c9b487b9646f7a63456471", + "sha256": "1v0pc3yglbgdpmviz45h1zcnc2kkz35jbvdzkrks122736nz1dli" }, "stable": { "version": [ @@ -67408,15 +67493,15 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20210409, - 1323 + 20210615, + 1208 ], "deps": [ "auto-complete", "merlin" ], - "commit": "7d929be2e9c1ae1a32e680591c5a224a96198e47", - "sha256": "0gpis7r2c7sppk4fx6alq9g2asva71xj05fjjq60zg87paimfdx4" + "commit": "a69ef83f2894c7e019c9b487b9646f7a63456471", + "sha256": "1v0pc3yglbgdpmviz45h1zcnc2kkz35jbvdzkrks122736nz1dli" }, "stable": { "version": [ @@ -67441,15 +67526,15 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20210409, - 1323 + 20210615, + 1208 ], "deps": [ "company", "merlin" ], - "commit": "7d929be2e9c1ae1a32e680591c5a224a96198e47", - "sha256": "0gpis7r2c7sppk4fx6alq9g2asva71xj05fjjq60zg87paimfdx4" + "commit": "a69ef83f2894c7e019c9b487b9646f7a63456471", + "sha256": "1v0pc3yglbgdpmviz45h1zcnc2kkz35jbvdzkrks122736nz1dli" }, "stable": { "version": [ @@ -67503,15 +67588,15 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20210409, - 1323 + 20210615, + 1208 ], "deps": [ "iedit", "merlin" ], - "commit": "7d929be2e9c1ae1a32e680591c5a224a96198e47", - "sha256": "0gpis7r2c7sppk4fx6alq9g2asva71xj05fjjq60zg87paimfdx4" + "commit": "a69ef83f2894c7e019c9b487b9646f7a63456471", + "sha256": "1v0pc3yglbgdpmviz45h1zcnc2kkz35jbvdzkrks122736nz1dli" }, "stable": { "version": [ @@ -67777,11 +67862,11 @@ "repo": "kazu-yamamoto/Mew", "unstable": { "version": [ - 20210416, - 33 + 20210625, + 240 ], - "commit": "380d6059fa9f102e736969d086749980820a9e0e", - "sha256": "03fxicfl7yvxj6ac636544km1khhmrjqi97r0smwqfxvlm2gs037" + "commit": "fc4bca6d95d8b8d5e169ecf1433d968c2eec299d", + "sha256": "0lcy73df204ww4kmbkfz5cbpmdwbsn7z47j5by89izn14dczllvq" }, "stable": { "version": [ @@ -68237,11 +68322,11 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20210603, - 2150 + 20210615, + 1510 ], - "commit": "aed285155dc8f073d766e752520ec599e77ce8b7", - "sha256": "1qxszcx9n1yfc9j9ihvrdwb57n19w03600z3v4z2ybxap1y0nq3v" + "commit": "1be68e8571336672d6cbec86246d1bf7844976be", + "sha256": "0lg704kwc851spp69745np8hsk0h6rl2hvfpid0j412278ds1qi8" }, "stable": { "version": [ @@ -68438,8 +68523,8 @@ 20210601, 2158 ], - "commit": "db502020ffe6bc65576b93527a20c0bf3df562da", - "sha256": "0gw6xw38x8h72gbvhmddgzijs4xvkrgs6c7v552db56hrlsj9lhp" + "commit": "d912fec98698c4f72a5f408d5a3f80e95327817d", + "sha256": "0gby38fd5vvfbm3pl2cvp6jsfjqi17xgh1m8vv9z9s6zang4knsy" }, "stable": { "version": [ @@ -68877,11 +68962,20 @@ "repo": "SidharthArya/modular-config.el", "unstable": { "version": [ - 20200824, - 442 + 20210629, + 2319 ], - "commit": "c0a6d3dac1aa176deb8417c77dfeac06e9f18e1f", - "sha256": "1pky409m3mip42k6qw4sf28ja50lsw17318kwgcrkl0nrvnbs31j" + "commit": "222ed4aab718ebcc2944c6cca87ebc3370d5ac3c", + "sha256": "0bdh5akywlj3grwclkl4vk82iij2jlvinmcp3xbi973n7y9i4s49" + }, + "stable": { + "version": [ + 0, + 0, + 3 + ], + "commit": "222ed4aab718ebcc2944c6cca87ebc3370d5ac3c", + "sha256": "0bdh5akywlj3grwclkl4vk82iij2jlvinmcp3xbi973n7y9i4s49" } }, { @@ -68892,11 +68986,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210607, - 917 + 20210630, + 1252 ], - "commit": "a2c8796fcbcbdd332165e02476c6de5799996d31", - "sha256": "0p9yzj70kx3s740dl7k3vwwkr1g9zxsirwl83n1nvswc4csgv20j" + "commit": "9b1d1594efa5d7389300b93c78f1b1dd389f9c27", + "sha256": "1m4wmcjhd7hck3rdg9anynlxzr9lnswkdzwypgwfwmabnvsyqvrm" }, "stable": { "version": [ @@ -69239,11 +69333,11 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20210522, - 1100 + 20210615, + 1511 ], - "commit": "392c77174ace6c57921f237f41eaa4c3a83ac303", - "sha256": "0b4kg4dxy4ywwin96vz6x3rpvgr718y5rgrdarmwym9wv1qz0a0c" + "commit": "9d8b2f758098d19781c7c5cdaeda5785e41be039", + "sha256": "1z9pspjrpclxznc9d16lix1zc0yx520jx1nqjbxj3kcwfxzkbbl4" }, "stable": { "version": [ @@ -69305,8 +69399,8 @@ "repo": "ageldama/moonshot", "unstable": { "version": [ - 20200210, - 2356 + 20210627, + 2244 ], "deps": [ "cl-lib", @@ -69318,8 +69412,8 @@ "s", "seq" ], - "commit": "c9f363b1b5f2b92006e03116580540dadb7364ea", - "sha256": "0r6sn8f5la1sxw7af2h349p8p5ybmgpc7aisc96wjilp1zrmdh8v" + "commit": "ec37a12825888047a90d9ee8131aa4bea348edf7", + "sha256": "0vd9m2zs3rch361ykmf0l3fjsrk1rwlb7w1dc7zz3gwpb6nas845" } }, { @@ -69598,8 +69692,8 @@ 20210306, 1053 ], - "commit": "d031469630c70188c20598c0f3a3c3c46c6c7a14", - "sha256": "13mbkpzfdy136y5w6ns73qy1fsxwqzsvnnfcid2x7rrrqbxrcm5r" + "commit": "171aebaf3a1fb76d1a460d12c7199bc6fbcec473", + "sha256": "06dw5blx8r6wzkwwwbi7p3fxs4flgsf2vlkz8vv9gar4cg9w7wy7" }, "stable": { "version": [ @@ -70256,14 +70350,14 @@ "repo": "ReanGD/emacs-multi-compile", "unstable": { "version": [ - 20210604, - 140 + 20210620, + 48 ], "deps": [ "dash" ], - "commit": "948ee25878c509d0f9ba8715b209eae79143b76e", - "sha256": "0lgp64pgblidm4jyr3wlv5xq2x81znzi0xvqm8h0f8af9jzl2b38" + "commit": "65699ac6a2f787a07908466e1cbfe3333ace7532", + "sha256": "05h4rh5g8kqz8sl31r8800rkrcv9ir6jh6qr38qwj1zrcd77zk02" } }, { @@ -70828,14 +70922,14 @@ "repo": "mallt/mysql-to-org-mode", "unstable": { "version": [ - 20200602, - 2019 + 20210622, + 447 ], "deps": [ "s" ], - "commit": "f3afc506f8b0d037238e49290de4b028c6ad9dd1", - "sha256": "19g21zvvamlhy1yrqhqbd1x3km6q2m650xsvl613rpcdqsk8l2ic" + "commit": "c5eefc71200f2e1d0d67a13ed897b3cdfa835117", + "sha256": "1ll7n8gxmzk7grlwh5igbxh7lvf7c08hi1xir2n0fj9wyzd432ny" }, "stable": { "version": [ @@ -71921,8 +72015,8 @@ 20181024, 1439 ], - "commit": "8fa4d05fea5140f80ff5f4629d19c6ce0d6f5cca", - "sha256": "0dn53fjq4dl8szpjqxn91md0xvr4sa458j1p0w8vgskc0iibzn4c" + "commit": "c8f8f2a9e3016ab7a9ecb2e8b084cf441f3ae88e", + "sha256": "1nj7w0dgvhmqy5hkdn0idf468x7s2h2y5372j13w3x1fkdcnyln8" }, "stable": { "version": [ @@ -72020,11 +72114,11 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20210523, - 326 + 20210629, + 2024 ], - "commit": "e4844f7a711c8d7dceb82b6b841a1e8485e12586", - "sha256": "0g05qa926xkayd79n2zi9ypd4m5245jjxwv2vp4hqn2cl76pnpak" + "commit": "d27820b0408b3e9067c264e25c009bd5cd9dfcd1", + "sha256": "0hrhzm703k86a4wlx0hwnivklniziy2xbrs1q0mvijmsvks60f57" }, "stable": { "version": [ @@ -72312,14 +72406,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20210605, - 1753 + 20210619, + 2158 ], "deps": [ "cl-lib" ], - "commit": "a6c8e0575766eb573a7add103836d578bd205962", - "sha256": "1r8rarcp0q0rl19kc6q7lll0djkvf3iw17rrsjswsq3z9fyq8iyr" + "commit": "b12a85a5afff7b5d60f889c1c2e8f5deab7fdbae", + "sha256": "193kyvj2f3zgb39shhcf2qk33rzbp8qp9mkc9p0cvnrc517h6y5r" }, "stable": { "version": [ @@ -72617,20 +72711,20 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20210605, - 1839 + 20210627, + 1741 ], - "commit": "6f0f83660e222cfdd05b05ad134763a7ab26f097", - "sha256": "0rs37inh95c1r91mjjwf1kssmxq8mliblzvdjypijps13fxk7m60" + "commit": "1768b0c416ce1034a5726ff0037e5a605cb45ab6", + "sha256": "0cynllvnhiibxa9a06xg9qzybvsl802l7lcc2jwzhja05l2wrdps" }, "stable": { "version": [ 0, 32, - 1 + 2 ], - "commit": "b580009e2bc69efb019983bf2f7dc5052c19545a", - "sha256": "06r0hdz8mxnzag74md62a9m6c2zm0fxn45n4n1c26j5cmrys7j16" + "commit": "af56f3bcdc8a644564a1182f58bd311907193a4a", + "sha256": "1f0xccc51z2fijj4cyx4pcxmam9pygq0z1rb4zrybz1vpsr7zrvk" } }, { @@ -72700,14 +72794,14 @@ "url": "https://git.sr.ht/~tarsius/notmuch-maildir", "unstable": { "version": [ - 20210416, - 1043 + 20210615, + 1513 ], "deps": [ "notmuch" ], - "commit": "e34c470521e83c3100f0d6eb9e7402ae35e19321", - "sha256": "0pmikf1djkr07067nkgmdcxyn7l7ibswx6qlnai8v1v51f9h1g9q" + "commit": "fd0e2199da746906eca080d4ca5bca17068cdce5", + "sha256": "1fqnx6hhg0cqj82yjpl7llg6vvppc3y8q9k6g67mqr7z3712bw0x" }, "stable": { "version": [ @@ -73121,15 +73215,15 @@ "repo": "douglasdavis/numpydoc.el", "unstable": { "version": [ - 20210523, - 1746 + 20210616, + 1532 ], "deps": [ "dash", "s" ], - "commit": "dcbc06429084e209f081a8c6318b46c1c9ff7309", - "sha256": "0bggm5ssxpj49km8q8z9hj351garl1xydz1dya7r0yvz12y6wn5g" + "commit": "9209d52ddf43eddc983763b77f6932be61982475", + "sha256": "1sx7jj9w20gxxsqx5wa9m6da0971qp8mgp76hpdc1crqrx1mj55b" }, "stable": { "version": [ @@ -74199,6 +74293,25 @@ } }, { + "ename": "ob-swiftui", + "commit": "ed83f297fcccfc44be9d1a20f3b96071dd7b8a58", + "sha256": "0hxdacxqxqkjl6gi2j909vymjnnlpv8zsmlxw3r7g5i8f468d4qr", + "fetcher": "github", + "repo": "xenodium/ob-swiftui", + "unstable": { + "version": [ + 20210618, + 856 + ], + "deps": [ + "org", + "swift-mode" + ], + "commit": "31cfe991eb171bb0d2f53cf621be1b9d91573ac3", + "sha256": "1l2n4ijf3sfgj05xzvnb1cd9k24ynh2cg36yj386bq7kadamympc" + } + }, + { "ename": "ob-tmux", "commit": "a3f47fbfe745972e690e8028f893bb38ba30978d", "sha256": "12c0m2xxd75lbc98h7cwprmdn823mh2ii59pxr6fgnq7araqkz20", @@ -74416,11 +74529,11 @@ "repo": "ocaml-ppx/ocamlformat", "unstable": { "version": [ - 20210601, - 901 + 20210617, + 1726 ], - "commit": "be14af363e9338e86173c2d96732f59b3c76e73e", - "sha256": "10q2xd4mqdi9h6dbjfx5081l8sc025rgkxsz9hwm93yrb5xw1rwd" + "commit": "a54914c8f4bc5e2d57aac5ed15f1192c2f53abbc", + "sha256": "0625kwk1k8c4j92w4v5160zxcqxa2bf7kdmkii26m25fzw1az1d1" }, "stable": { "version": [ @@ -74613,26 +74726,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20210521, - 1311 + 20210623, + 653 ], "deps": [ "org-re-reveal" ], - "commit": "fe1feb913bf69b1e854053e3f07026c14c6c91dc", - "sha256": "0w4x18srwhznd4xicr2sk7m3lhzgw6pyza7skar5i4n7y30q38xp" + "commit": "e828f86ee607de487cb60393b41c6919d0b66356", + "sha256": "0m3s68n31whryzwjz8iyd9mdzvdm2r9rh9cwlw8br5qh40jbl67b" }, "stable": { "version": [ 3, 20, - 1 + 2 ], "deps": [ "org-re-reveal" ], - "commit": "fe1feb913bf69b1e854053e3f07026c14c6c91dc", - "sha256": "0w4x18srwhznd4xicr2sk7m3lhzgw6pyza7skar5i4n7y30q38xp" + "commit": "26d6d8946ddd5f71954564f26e63f6b5f1e9c0aa", + "sha256": "0m3s68n31whryzwjz8iyd9mdzvdm2r9rh9cwlw8br5qh40jbl67b" } }, { @@ -74676,6 +74789,38 @@ } }, { + "ename": "ol-notmuch", + "commit": "b6d136b1033d9afdea965ab07ba7c05e9ecf56e5", + "sha256": "1hsc5xj9mj3p1fz4svwqam5gxhcnfrpx5s97c4rzf8fq0cnf5pd1", + "fetcher": "git", + "url": "https://git.sr.ht/~tarsius/ol-notmuch", + "unstable": { + "version": [ + 20210530, + 2054 + ], + "deps": [ + "notmuch", + "org" + ], + "commit": "126fb446d8fa9e54cf21103afaf506fd81273c02", + "sha256": "1pkb333m1rryhxf26p8661y7w9fnsaarn0qkzys1pyfj09q9rsmj" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "deps": [ + "notmuch", + "org" + ], + "commit": "126fb446d8fa9e54cf21103afaf506fd81273c02", + "sha256": "1pkb333m1rryhxf26p8661y7w9fnsaarn0qkzys1pyfj09q9rsmj" + } + }, + { "ename": "olc", "commit": "1e21abd021d72c491ed1503146c51761e18c56c4", "sha256": "0kcqwnhhy5wa0r61yqg9gly9jd6b1846q2w43fmhzk3l4nzky32r", @@ -75328,11 +75473,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20210603, - 1335 + 20210613, + 1723 ], - "commit": "e85084e733d6eb50893974fc5fd569b944a5010c", - "sha256": "1lmjmp0iwp8n9nrqvygav7y2fxxwqpv4kk2wy2gg4bi056arbx5a" + "commit": "2646dad28c0819fbe9ee521d39efb9ae40e03982", + "sha256": "0vxfinsx69fqpcgbsv6g26klim3yasds3ha9v3xkk32y9sb783lr" }, "stable": { "version": [ @@ -75491,26 +75636,26 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20210603, - 1352 + 20210628, + 2141 ], "deps": [ "request" ], - "commit": "03c1ca90a7f2583074f020619c7cb92a783fb375", - "sha256": "1pwgs9xm6i0cqhrwpl60y3xbd0k64nr48kfa83x3yk9x38i6ddp0" + "commit": "8cc47ecef5d90d4f0f2bba669bbd89f88fda4be1", + "sha256": "11a44kfbpa2w54kqqc9mg3bzz0p0jrdjsz8l9sn11irl8xlgrm67" }, "stable": { "version": [ 0, 0, - 2 + 3 ], "deps": [ "request" ], - "commit": "03c1ca90a7f2583074f020619c7cb92a783fb375", - "sha256": "1pwgs9xm6i0cqhrwpl60y3xbd0k64nr48kfa83x3yk9x38i6ddp0" + "commit": "8cc47ecef5d90d4f0f2bba669bbd89f88fda4be1", + "sha256": "11a44kfbpa2w54kqqc9mg3bzz0p0jrdjsz8l9sn11irl8xlgrm67" } }, { @@ -75521,14 +75666,14 @@ "repo": "awth13/org-appear", "unstable": { "version": [ - 20210605, - 904 + 20210627, + 612 ], "deps": [ "org" ], - "commit": "cf87546d6458d36492a89661a1e097e5596aa26a", - "sha256": "18p8s0syqhqpk21ylbk8np3srknhi4ckxfxn7i4jkscsy8282lcb" + "commit": "12056f697fce51958e7baf837d250341bd86194e", + "sha256": "0p3h2inqqf9ighr9sig1spbni9mq0k4iy8w10w5bpjd3xm37qx80" } }, { @@ -76654,8 +76799,8 @@ "stable": { "version": [ 1, - 6, - 1 + 7, + 0 ], "deps": [ "dash", @@ -76697,16 +76842,16 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20210602, - 358 + 20210630, + 1503 ], "deps": [ "dash", "org", "s" ], - "commit": "40716a4cfd36304b4a16977020b1e82870faec15", - "sha256": "1wncx69rqlvx9pnr5mlwn9i00nrfhi1icxv0zpc7z2kzf03wn930" + "commit": "ddb1b95ac139676e4aa8a0b787e57feba34cc7cb", + "sha256": "0l563j9m8zcmsn8vqv3qchk4yqrfbigk5k4iqcw8p7cbix57sjah" }, "stable": { "version": [ @@ -76780,16 +76925,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20210527, - 1629 + 20210622, + 130 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "a01f0453667f9baccf0b8a514e9c9f0a9fb9fb6e", - "sha256": "1gn2sflvcc4gvgci3m12d16mjrwxywrd8vvrs7s87k0cf7yl74vf" + "commit": "f4599dd5dfd7f97a22ca98502f809a8d14551c09", + "sha256": "0i8rqila62qamv3mxh66g678kbang3sxjbf3x70nmrx7fyy2m2jv" }, "stable": { "version": [ @@ -76933,14 +77078,14 @@ "repo": "stardiviner/org-link-beautify", "unstable": { "version": [ - 20210222, - 227 + 20210628, + 1124 ], "deps": [ "all-the-icons" ], - "commit": "4662b3a7b9244aa35aae2f469f87be4a44a6b1bb", - "sha256": "1wb00rm6zdlb8hrhph783wi8zjra8m09gi6m2nnfr37al3986g0s" + "commit": "f78924c06c9f3902bab8e390d91402516d2bb502", + "sha256": "1v847kpc3fh4sxi1rw8pp6xlb89r6z224831xkd82gys74ya0724" } }, { @@ -77111,30 +77256,30 @@ "repo": "ndwarshuis/org-ml", "unstable": { "version": [ - 20210328, - 1655 + 20210627, + 1623 ], "deps": [ "dash", "org", "s" ], - "commit": "9d8c26d12c972a60b94bcc3b364d857db997cfa3", - "sha256": "102lrlf25i30xbpszr1mh6mkxd6wwgbwg32dafccxm4dmj3v9hqq" + "commit": "e14205312c54a1c97491c7f847d296b09f5f57b0", + "sha256": "030fsgdp8cg2h8mlxq6769l158pqcwnv4r3bl36lpjs950lv9pas" }, "stable": { "version": [ 5, - 6, - 2 + 7, + 0 ], "deps": [ "dash", "org", "s" ], - "commit": "5aeed6d0f7f878b20483975200df43b6fc7f32f9", - "sha256": "102lrlf25i30xbpszr1mh6mkxd6wwgbwg32dafccxm4dmj3v9hqq" + "commit": "e14205312c54a1c97491c7f847d296b09f5f57b0", + "sha256": "030fsgdp8cg2h8mlxq6769l158pqcwnv4r3bl36lpjs950lv9pas" } }, { @@ -77541,17 +77686,16 @@ "repo": "org-pivotal/org-pivotal", "unstable": { "version": [ - 20200607, - 1505 + 20210701, + 342 ], "deps": [ "a", "dash", - "dash-functional", "request" ], - "commit": "125e70f9a682751e4ed7c3a350b2794af9600f47", - "sha256": "1w91wb6l3vsri015awig1kfs986zf49466x4ni0m24hcg00n2m7n" + "commit": "f55b9773b2f4a502e636688bc1caa21ee0396abe", + "sha256": "1ipxr8s384pljlz9rzpdhmrsa7q7jzk27dblrrapgbgi52h3n5np" } }, { @@ -77594,14 +77738,14 @@ "repo": "rlister/org-present", "unstable": { "version": [ - 20200204, - 1647 + 20210619, + 1614 ], "deps": [ "org" ], - "commit": "9709ca2d04a59959354222ac4d3f8b750785739a", - "sha256": "08f8gh2zg4gr4d5ajlcnlj2lsp8nywni4mhw4w4nfa4dwyq7mxgv" + "commit": "5010b90fd09f484268f731b855d394deb8b5fc3d", + "sha256": "0k8l7qmxbxbzc4g0xh4ipssls78fky0cq2lg3864qdli820wzy5b" } }, { @@ -77655,14 +77799,14 @@ "repo": "lujun9972/org-preview-html", "unstable": { "version": [ - 20180625, - 619 + 20210623, + 1523 ], "deps": [ "org" ], - "commit": "8ba7ecd7ac624f33b3e2395f477bbff4f1ec4efe", - "sha256": "1h46v0ckhfzv3fixcfxk7pkmh56c5lana8kpwiknm447q1wmlbx4" + "commit": "3fe7dd85b8a7dc4ead7495095a3abaad28e2f809", + "sha256": "1vih94z3k8qz2vkzvcqbxpipijsxyfn2kvimylfwjrfbkrmvigsp" } }, { @@ -77767,12 +77911,11 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20201213, - 1358 + 20210624, + 1314 ], "deps": [ "dash", - "dash-functional", "f", "map", "org", @@ -77783,13 +77926,14 @@ "transient", "ts" ], - "commit": "208e103ecc146db71d878df3bd09c6eb60c2797d", - "sha256": "09vdndp3935iy4flynbjpkvfax7vs1ppswl19wx4nn2rp7hdz8kp" + "commit": "8342656b2d9af4bb6af9daa0a8b037d3693bd940", + "sha256": "0alrs2dsd5k4xjrs2zs7hcr5fbfrr3rdq705s04943ic4kzvhrc9" }, "stable": { "version": [ 0, - 5 + 5, + 2 ], "deps": [ "dash", @@ -77804,8 +77948,8 @@ "transient", "ts" ], - "commit": "3924b023e0f1e8fa93cfa79bdd71f9f0c0fb4679", - "sha256": "14nsy2dbln3m5bpqzyfqycn18sb3qh407hjbkk1l0x2nqs3lrkqn" + "commit": "d3b0ef2f5194452d88bf23ec31ebfef822c47c24", + "sha256": "0b3xxnbhnrz0263fnrrdbs3gif4pjkfws4mxkfqqpg0fc8azp2rx" } }, { @@ -77891,8 +78035,8 @@ "htmlize", "org" ], - "commit": "4538c06fab9a7259aa1fb40e93a43dcfacef27c1", - "sha256": "1w6zvgfcyjqlxy4s13h7w66vv0fcid57s6vigzgnzi666w86fdyh" + "commit": "cf000894f6e5d0627151e2bec5b1a54a311ad53e", + "sha256": "1lfvhc4gly06rq5i2fgjydg4rsy7vgksa8hpydsvklr0ypvc1hcc" }, "stable": { "version": [ @@ -78159,8 +78303,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20210513, - 804 + 20210609, + 1221 ], "deps": [ "dash", @@ -78170,8 +78314,8 @@ "org", "s" ], - "commit": "8ad141403065bebd5a72f0ef53cf5ef8f2034419", - "sha256": "126s444r0baylrmxw1z0lkbx7f40srk3wwk55li7is225qz2jlmb" + "commit": "756f6215b672e267f986a3d6e494f5309825b91a", + "sha256": "16rjqzj872y1240w15gawxcwj5gg1cds162wq1hswzplmx8wp9d1" }, "stable": { "version": [ @@ -78207,8 +78351,8 @@ "org-ref", "org-roam" ], - "commit": "f7b5be2ce0b43dd4d842484fc0ec37fdc8526907", - "sha256": "1cqx2izzchwd6yi0gmskdb0kiqjwk2m7rgk074bzzq0dzbpl180j" + "commit": "c9865196efe7cfdfcced0d47ea3e5b39bdddd162", + "sha256": "0c9y76r1bagz39m74kb2jcxqsc2q461407bbsib3f512sdf93lyg" }, "stable": { "version": [ @@ -78371,11 +78515,11 @@ "repo": "lordnik22/org-shoplist", "unstable": { "version": [ - 20210514, - 1041 + 20210629, + 2157 ], - "commit": "1c534662719222e315d970e2fa871d222f80ea87", - "sha256": "1m6a37bw60xjkqaffzk1kjpcy76i5dd17925hzz2fbbhlxkac67x" + "commit": "71ea7643e66c97d21df49fb8b600578ca0464f83", + "sha256": "0pjcpry9hzma87f8isyi0q5si0i67g0gd8shj2y3qyizi9ns64a2" } }, { @@ -78582,11 +78726,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20210606, - 1806 + 20210616, + 809 ], - "commit": "0bd38b604405ba8e6ba00dd32ce4773eb02eb901", - "sha256": "1d9kdcdiz600swcy318hd56l751w2qyafdibnkzfkhjzw63c2hwh" + "commit": "4738a7bdb24cb4e1d1d5effc23f953e4c76e7713", + "sha256": "0kpa1rnpxfar8xkah29f9h6q26fgdxcb8gimsfqvrj145vama7pr" }, "stable": { "version": [ @@ -79188,8 +79332,8 @@ 20210414, 1844 ], - "commit": "246120647e28a27506ca0894ba98e371086881fd", - "sha256": "15gqzj4h0w33w38i8ihl74iy7aqxlds97gm93r72z69pm2l1d7dm" + "commit": "8a3b529d5ece261a8847298ea03ed35615cc9bfa", + "sha256": "16zalqjd2llwkp7v0218crgf3k34py8zx6lj6z7i3kbmxm9nb27q" } }, { @@ -79617,15 +79761,15 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20210525, - 1956 + 20210620, + 1943 ], "deps": [ "magit", "org" ], - "commit": "26242895ef1642bf30c63683fb224fdba25e0853", - "sha256": "1xd58yqqsb79lgxkhxs4s50jq8f3639k6fhlza9hsy53apfczkal" + "commit": "f956d802f19ea495efa95af6c673588afeb3adc5", + "sha256": "0mbcr98xq3zim01dk1fbyc1vajnjwx90k62mygv343rhrd05v44m" }, "stable": { "version": [ @@ -79649,8 +79793,8 @@ "repo": "magit/orgit-forge", "unstable": { "version": [ - 20210525, - 1957 + 20210615, + 1516 ], "deps": [ "forge", @@ -79658,8 +79802,8 @@ "org", "orgit" ], - "commit": "ea2a1cf9d337901b413e9df258b8e07af55c00f6", - "sha256": "07ia3b6bfilnpify93kq5g10xhh794v5pmc9cmmb312c3qyqi7b4" + "commit": "365b75609a9454dccf5681eb6075ca53bd32af85", + "sha256": "1y7rywlqhsvkism9dmzlb3sijd8isp6qqhgba79aqgk9wz593rkv" }, "stable": { "version": [ @@ -79759,8 +79903,8 @@ 20201129, 604 ], - "commit": "5aec071702c21dcc777e75b575d3875141688e46", - "sha256": "13405irnpwb1fgwv5d9mwywpbvb6d7smmi7nsd140l0i0m7anx1c" + "commit": "649fd0cdcb831dcd840c66ee324005165ce970ca", + "sha256": "1iarfqdxryj5p43hsch2jgqslrpyfkza9x9fpshmbpwjkbf1548x" }, "stable": { "version": [ @@ -80713,8 +80857,8 @@ "deps": [ "org" ], - "commit": "074c3abf0a6aa5d671da1a39a20137140ba41d24", - "sha256": "1a134x8pmgas5k1m769clk3yhrzdh4n0cwmh23bf22avk6n3bz8z" + "commit": "290b5d6b659addf99cb96a316fb24caa90ad0e77", + "sha256": "04isqw4wfn5hq772sf0szq2rc3b8finhgjc5cna2sw7bhfgycywb" }, "stable": { "version": [ @@ -81136,36 +81280,6 @@ } }, { - "ename": "ox-slimhtml", - "commit": "6fae8e3c4abd37a651d4cbdb337a74f1a7c7366a", - "sha256": "16jrw8n26iy69ibr29bp3pqp4lm66alihks37qipd2g5grqqfdnd", - "fetcher": "github", - "repo": "balddotcat/ox-slimhtml", - "unstable": { - "version": [ - 20210330, - 1941 - ], - "deps": [ - "cl-lib" - ], - "commit": "72cffc4292c82d5f3a24717ed386a953862485d8", - "sha256": "0p22dmyrcny82k0r1w84kcwi513xy03h848knzhm9zj7360dlkiw" - }, - "stable": { - "version": [ - 0, - 4, - 5 - ], - "deps": [ - "cl-lib" - ], - "commit": "a764ef64235845e4f5cfd73244d6cf1e7fee903b", - "sha256": "14h0kks7i2k53fwbsqb4giafacm58inppqpr5mbj904cy146g29f" - } - }, - { "ename": "ox-spectacle", "commit": "f441e1b3ee30065f8a68c9b0b45d9db0cac8a289", "sha256": "1nf4765dihlcjbifhb9dinqin27ivqj2s8wzh1hj4vc3n8mdx5pr", @@ -81504,14 +81618,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20210421, - 1333 + 20210616, + 2110 ], "deps": [ "cl-lib" ], - "commit": "b4eec13201093070a12f37396afce83eb6771df5", - "sha256": "1kr9iwsrpxbalhjz91pqplwkb44msdl2qv4rwsbapz8z8hs4xzji" + "commit": "95e021756ee5c5255a63cce8351178e298c68363", + "sha256": "05qm6a0dy2iszrlwkiw5x2v0h5whk7d4qn7qjlf5qpns5fl0fwg2" }, "stable": { "version": [ @@ -81608,11 +81722,11 @@ "repo": "tttuuu888/package-loading-notifier", "unstable": { "version": [ - 20210603, - 1138 + 20210608, + 1406 ], - "commit": "8fd10303e19a2a1e8b5544ce8c34c8466af5d08a", - "sha256": "11d9mc9ca9bn9x3by8fqcan2c8wn85d8xnmkfvzxcmw7dz87kis2" + "commit": "1e30d097de8939c4aa380915d3ba3060a87ce3c6", + "sha256": "0wmf3pfjvxrv86mpvbkn5n4drc20yc12fwm4k6a613br0bs75gan" } }, { @@ -82030,8 +82144,8 @@ 20200510, 5 ], - "commit": "246120647e28a27506ca0894ba98e371086881fd", - "sha256": "15gqzj4h0w33w38i8ihl74iy7aqxlds97gm93r72z69pm2l1d7dm" + "commit": "8a3b529d5ece261a8847298ea03ed35615cc9bfa", + "sha256": "16zalqjd2llwkp7v0218crgf3k34py8zx6lj6z7i3kbmxm9nb27q" } }, { @@ -82584,22 +82698,22 @@ "s", "with-editor" ], - "commit": "4e73cdc4c376ad61d2e4858bc87cf01eab0dd403", - "sha256": "0pvn8djsm8bvx2msrfvm12b778w9yl7sw517l2x0bdm48apz3ifx" + "commit": "3dd14690c7c81ac80e32e942cf5976732faf0fb3", + "sha256": "10015qvf98j4m26rprrvhbfj4dg4j5sg2c0ps7x94cjjxrph7kf6" }, "stable": { "version": [ 1, 7, - 3 + 4 ], "deps": [ - "f", + "auth-source-pass", "s", "with-editor" ], - "commit": "74fdfb5022f317ad48d449e29543710bdad1afda", - "sha256": "0nixbsyckkp1qjszgac74m00vj10vc3vyw2wic1zgc2rx795k228" + "commit": "1078f2514d579178d5df7042c6a790e9c9b731ad", + "sha256": "17zp9pnb3i9sd2zn9qanngmsywrb7y495ngcqs6313pv3gb83v53" } }, { @@ -82932,11 +83046,11 @@ "repo": "JonWaltman/pcmpl-args.el", "unstable": { "version": [ - 20190223, - 1613 + 20210625, + 2116 ], - "commit": "0b8a05fc6e370fa9c466250659619f8d6b53d446", - "sha256": "1zhjpgnd8n95fv2z5d9360cx2vhw88yqz7gyc0qc563p6l3xmffg" + "commit": "e6957896b065e2fda80a8258dfebb86b49742c15", + "sha256": "0fx7v5b3v7y9qxr8n8pm6449rdf4ljc0fb6kp0vpdzfzc4yzgdni" } }, { @@ -83492,21 +83606,21 @@ "repo": "bbatsov/persp-projectile", "unstable": { "version": [ - 20180616, - 1944 + 20210618, + 708 ], "deps": [ "cl-lib", "perspective", "projectile" ], - "commit": "533808b3e4f8f95a1e3ed9c55d9aa720277ebd5f", - "sha256": "17i1srw1k771i3a5wlydbyasyd9z39ryf48mxfs0dsbx1zjbj0pg" + "commit": "4e374d7650c7e041df5af5ac280a44d4a4ec705a", + "sha256": "0cpf1739cd6ylyaz7pspsmh1dsmvymdqfpypahca0nn169vdrzk9" }, "stable": { "version": [ + 1, 0, - 2, 0 ], "deps": [ @@ -83514,8 +83628,8 @@ "perspective", "projectile" ], - "commit": "7686633acf44402fa90429759cca6a155e4df2b9", - "sha256": "0rqyzsmg32sdr4k9i2lf3jfyr9bskkl7gfb5ndl16iip9py7403z" + "commit": "6e4c2e017d59d10d627cf95b2bb9f9fa2b22a3a3", + "sha256": "0566zm9gbac9b1niszl0jhwizxw2a0f8b4b2idvihpsi93iwa8vi" } }, { @@ -83526,14 +83640,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20210523, - 2254 + 20210610, + 548 ], "deps": [ "cl-lib" ], - "commit": "b37c6756700a167742c8ab06fa5a850d9d94f4bd", - "sha256": "1ciab9xz4lbnnnx9407bagyf10dv6h9nalzm2wj6w6x7kckb4105" + "commit": "68b13cef8435cae581850415cdda17e245dd0eae", + "sha256": "1iwqg1y47lp54qn9cjr3w9pca294mn92qlil3a4lr8xi57jbi3iz" }, "stable": { "version": [ @@ -83988,8 +84102,8 @@ 20210519, 1728 ], - "commit": "9561a6c0a92a3d7c00e7e57972f42cb5be775898", - "sha256": "189imf8dvmsfhcy0p9f8a7l0z8dfdsnialk58f4p1l06p67s21df" + "commit": "cbf27232649c39e3749eefd23f962750bd249a49", + "sha256": "0r20y2hrgy1gmnx6izzvmvjh4axwb4x4pgcxn4bjmpzypand5xfp" }, "stable": { "version": [ @@ -84101,8 +84215,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20210517, - 1838 + 20210619, + 1706 ], "deps": [ "async", @@ -84110,8 +84224,8 @@ "f", "php-runtime" ], - "commit": "debf66848c6099415c731b179dcd47e96db3b50b", - "sha256": "0i5g4gh5i5y8wsrqw89lwi2s2sn67pvvj2y6p7lnyv0i201v5bs8" + "commit": "272217fbb6b7e7f70615fc518d77c6d75f33a44f", + "sha256": "0hm96i9vdbkcq6mypjpl94dn3gzyk23iql5zzy2d221vmjhqvn7d" }, "stable": { "version": [ @@ -84135,14 +84249,14 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20201122, - 950 + 20210617, + 2234 ], "deps": [ "php-mode" ], - "commit": "6863a5278fc656cddb604b0c6e165f05d0171d0a", - "sha256": "05q1y6xshh5csr672jwplp2xmp87gvj9rc65ybpa687dkdmq8cdh" + "commit": "56617fa87c9bec037d4e4a0a143b7d70a989c082", + "sha256": "02k4pmmxq3h8mi0dsjh0s0002gjkpg6g9pxsnxgalwb6rakfirbh" }, "stable": { "version": [ @@ -84445,11 +84559,11 @@ "repo": "EricCrosson/pine-script-mode", "unstable": { "version": [ - 20210605, - 1527 + 20210629, + 1257 ], - "commit": "e465c0264958cbed0fb29dad2b30b9f18fbf1064", - "sha256": "0crc2q5mzflyz13zx0ghsf2kdmj67lcqb2vnnsw0z2sk7wafrz2i" + "commit": "c04309be9fb73012b4c5c839741b1abcfe0b8aa9", + "sha256": "1hahd9w5pww3nx1xvbci4pscpbzb0k5xv3yff896jg66di36fvwg" }, "stable": { "version": [ @@ -84595,21 +84709,21 @@ }, { "ename": "pippel", - "commit": "6d1796688ed0d6957557d960ca28e450f9bcb6cf", - "sha256": "1li4h0dff1n7njy2lk3d50ndrlw84fphmdg16j0srkbgy7xz90yn", + "commit": "45459106a88b5bb8ce5afdef9a7cb95a0fb447bf", + "sha256": "1gn944k09r78lfn1nqg69fnwx91y9lvw1k2i9czk7yhx4zmyinpl", "fetcher": "github", - "repo": "brotzeit/pippel", + "repo": "arifer612/pippel", "unstable": { "version": [ - 20180710, - 856 + 20210614, + 1655 ], "deps": [ "dash", "s" ], - "commit": "21a5200e8e5ccaa1911abb4ebf090b76ca839756", - "sha256": "1amqjm6kn1xda058kdwq3xgk7raz6y9iw0mzrac78sgf57qaczyb" + "commit": "2480fd376b8f69691b45b0141fca0d900a5ac64a", + "sha256": "190cd66bhvlmyxki7hl43s0h4rvflw9r36xm4ky3c1mhbkrfsz1p" } }, { @@ -85579,15 +85693,15 @@ "repo": "polymode/poly-markdown", "unstable": { "version": [ - 20200316, - 1315 + 20210625, + 803 ], "deps": [ "markdown-mode", "polymode" ], - "commit": "1536cf0c32f71d5cd05c90f7905905e38006e95d", - "sha256": "1q4qq0ql08hxkdrd2aal03560k612my7bvnfpfij3g432hn0p7v6" + "commit": "e79d811d78da668556a694bb840bea3515b4c6f8", + "sha256": "02jpak60jl6nrz5zkkc0cw5i95vl4h6g31qvgb3qsidimav305n6" }, "stable": { "version": [ @@ -85985,11 +86099,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20210602, - 847 + 20210610, + 1945 ], - "commit": "2be084a77cc2bc79ea7dc23edada161f4ff6dfdb", - "sha256": "118sbcm6qavckxva81vamrs98dj38yv0qccqqj4p3a4q7brfi8cw" + "commit": "4c51182f5f5dd7a1ffa69fb994ef5ef6f9592686", + "sha256": "028wfdi240r8xdz7j77fv29brk5ck6yhhh1vj9p58m4f4ff8r9ik" } }, { @@ -86000,11 +86114,11 @@ "repo": "auto-complete/popup-el", "unstable": { "version": [ - 20210317, - 138 + 20210625, + 400 ], - "commit": "866a091b83369873b4d1c5d62a590fbb0a150bd0", - "sha256": "059x15zlc6c17yg5ahdca3bryr10nh9xbb61dv0gdc2wg2c0pzzi" + "commit": "cf899f8012f4189e76a009bebb589ff71631b1e9", + "sha256": "09nf95bin4dq50vapax8xndm0bay2cbsws4zvpb4hp3kk0gdzrl6" }, "stable": { "version": [ @@ -86245,11 +86359,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20210604, - 647 + 20210617, + 42 ], - "commit": "3257a52e3599bc1d5c9a4b646d36d7a49b0dd025", - "sha256": "13p7122100ywg6dc32wq0hvcn52x8djxq6vgcmdpdsdy7k4fkxwc" + "commit": "f97c4aff2c2c376ca62276d5597aa108546633a9", + "sha256": "18w06fdz63w2arwgbgbl9wghb9fin4cqpxnyajppyqk5lpnsn7iq" }, "stable": { "version": [ @@ -86771,10 +86885,10 @@ }, { "ename": "private", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "1mvma2xgjy9vkh468x80xlri6qfr7d494la1j6r1clkjsn5kg7hr", + "commit": "e036ca25bced52cdacc4e56dcdea4282360aa5da", + "sha256": "1rq4vyfjr8b2fnwjnw28if9y9svvaxw1pwisys5p8rx0mff48cn3", "fetcher": "github", - "repo": "zhangkaiyulw/private", + "repo": "victorteokw/private", "unstable": { "version": [ 20150122, @@ -87059,6 +87173,21 @@ } }, { + "ename": "project-mode-line-tag", + "commit": "9a739b3a77aaf0033161c6687e1e9c5592bb18bd", + "sha256": "0syr5lpn0xmvf54k65lif181y6kcvs96j8wykzzlmsf9zdkkdg20", + "fetcher": "github", + "repo": "fritzgrabo/project-mode-line-tag", + "unstable": { + "version": [ + 20210615, + 1825 + ], + "commit": "ed6adf9287d2aa526d85451623f1aa281cfa7e0a", + "sha256": "0xryvjsb2r4rj22wgjpixa31kg4sp7xww63hldnf7c1cvcc9g305" + } + }, + { "ename": "project-persist", "commit": "bd81d1f8a30ed951ed94b9a4db13a2f7735ea878", "sha256": "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24", @@ -87143,14 +87272,14 @@ "repo": "hying-caritas/project-shells", "unstable": { "version": [ - 20201026, - 748 + 20210625, + 647 ], "deps": [ "seq" ], - "commit": "382b3d48a797ea56383732ebf9cd219aeec676df", - "sha256": "04zsk6mwxkp71fbjq64k78nwx3gvgbp2fmm5f8ah2ap2g65j5kq3" + "commit": "900369828f1a213c60a2207a71d46bc43fd5405c", + "sha256": "1igs3dr3j9lw8lyww1wp69v5i9k2ifvblmsh862vx7l6rvy98f5h" } }, { @@ -87161,14 +87290,14 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20210607, - 1513 + 20210701, + 441 ], "deps": [ "pkg-info" ], - "commit": "155fdb44176347c9599357c7935993033260a930", - "sha256": "040g4frdjabpa8ddhag81dx3kphh5kp3iv34x4zsbkhb6gryd5zf" + "commit": "da08a9103b5ba3b38ef031a9627a19436eb318b5", + "sha256": "08y36qvr20888jc2b5172qgah0xpp9bc3iwp38w8clfrjfd28g2s" }, "stable": { "version": [ @@ -87241,34 +87370,36 @@ "repo": "asok/projectile-rails", "unstable": { "version": [ - 20210325, - 2120 + 20210625, + 708 ], "deps": [ + "dash", "f", "inf-ruby", "inflections", "projectile", "rake" ], - "commit": "f1fe6e8eff485dc560e6ffe7f0b9c46a61509a58", - "sha256": "1b9wsn6mm1ajh81f6bmp3ajxch3j05bzslzxjakw93gjg69w74y1" + "commit": "6a18ada3566ab2cb795129e3dfca2a32cc413fb8", + "sha256": "1xr6ha5jkczpbdqpxf8s4qggvx4arwky6mfwaji2kjnkk0ajjyda" }, "stable": { "version": [ 0, - 21, + 22, 0 ], "deps": [ + "dash", "f", "inf-ruby", "inflections", "projectile", "rake" ], - "commit": "8d6b3734958f5dc7a620dc1b44754986d3726f3d", - "sha256": "03cj0cpmqyxcvqscnjcgcfz5k1ga6knr5jcb5prnv9hfjfqgk3pb" + "commit": "6a18ada3566ab2cb795129e3dfca2a32cc413fb8", + "sha256": "1xr6ha5jkczpbdqpxf8s4qggvx4arwky6mfwaji2kjnkk0ajjyda" } }, { @@ -87679,17 +87810,17 @@ 20200619, 1742 ], - "commit": "4644980d818ec9d987f74c74b1a1d45de9ab01fd", - "sha256": "1mzblak9s46wsfh3l1798k9pjwbddnz030y0cfx831lfpr20227b" + "commit": "4b77b733699f9c39b517a124da737c018b1164e2", + "sha256": "1mfvmpwxayrzp07vl72djv162vlf0xg29mxh030lqf7jc9h11gxq" }, "stable": { "version": [ 3, 17, - 2 + 3 ], - "commit": "70db61a91bae270dca5db2f9837deea11118b148", - "sha256": "08a7rnflhklbabqm5yyz2nwyzzfbh24miiy3wsxphaanjz4xr6yi" + "commit": "909a0f36a10075c4b4bc70fdee2c7e32dd612a72", + "sha256": "08644kaxhpjs38q5q4fp01yr0wakg1ijha4g3lzp2ifg7y3c465d" } }, { @@ -88533,15 +88664,15 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20210607, - 427 + 20210623, + 415 ], "deps": [ "async", "xr" ], - "commit": "eaf331f67ad3d6ea5b63c92bcd0cfc0134466b53", - "sha256": "0prrkn2yaj6wm2hn17jgfxb1vz58mdm3ivmqsncrfhl1vdll73jm" + "commit": "70d488f9233a578f0c7f8906aa83a1a690ec10fa", + "sha256": "14zczmikgsxqf3klx17n1imgpqhj3gjmz4hs95lkxs3a50qbqh7z" }, "stable": { "version": [ @@ -88588,14 +88719,14 @@ "repo": "p1uxtar/pyim-cangjiedict", "unstable": { "version": [ - 20210507, - 928 + 20210617, + 934 ], "deps": [ "pyim" ], - "commit": "455e20e90044a1fcd6c4b45252745fa233e0107d", - "sha256": "0dv5l8cpccvc7jsc4qdijnz76dp2rznmcnkkn3w75xw46ai8chnk" + "commit": "d17e3d32a6480939b350a91a915ebe8e6efad819", + "sha256": "1bszpqsm15az0wvbgsk012manxnvigbk38qr5iqzkgd4d13yv5fs" } }, { @@ -88703,17 +88834,17 @@ 20210411, 1931 ], - "commit": "6c7bc2b576a705fcc7bc52494163e9a1a240ea80", - "sha256": "1m4swr0v998c6iq589mzx6glq7g2gc109469wcsjyi9j4cv7qgkr" + "commit": "6f066733e23a61d83580cd1898e6b8afab8fafea", + "sha256": "1m7365k7a624mp33v5x23knkcahpa9gvb3sbr8idqlk8n8k3f6mk" }, "stable": { "version": [ 2, - 8, + 9, 3 ], - "commit": "735c958d3b36fb5d343b7bcb81b1055a430cb042", - "sha256": "1m8f8qv88bvqbviszwf0n4ch5dpyqa33067ampy706cpg7mwjvn0" + "commit": "aa688de05e469e33a20478144013946ccb752736", + "sha256": "0r2xp90bwwqnya3gq0q0gh2qdn7i9fcsq8ab890bnd0b44ivx0nk" } }, { @@ -88984,11 +89115,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20210601, - 1845 + 20210620, + 1854 ], - "commit": "198ba8e15e848825b2215e9fc363f06d8c173a28", - "sha256": "1z6vnbnqvn20gs131d0rjncr4nk11amahvmfaffkhiwmpsl1b3gv" + "commit": "3f0be5ace492d2ddd8405f4b5186ef89caee762e", + "sha256": "17clkgs94dgq5nsjlwkr52m5s446ibfss3qc8a8m0zaz6j4f8l1m" }, "stable": { "version": [ @@ -89162,11 +89293,11 @@ "repo": "psaris/q-mode", "unstable": { "version": [ - 20210307, - 2102 + 20210620, + 1712 ], - "commit": "a30a84afae9bb72bc601b213ae68821479b0bb03", - "sha256": "1q85vxvv76vmb9zhc91p2aqh333h1p48737spriv5sw9wvis0gdm" + "commit": "86d937854c45f6b2a102b42c1a991ba713532f9e", + "sha256": "1hbb0m5kjczyri6hbgkk1par53zfnsp7m133xqzfhg2sibrvbz2x" } }, { @@ -89628,15 +89759,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20210604, - 1431 + 20210629, + 2000 ], "deps": [ "faceup", "pos-tip" ], - "commit": "4b46a818c08820e04d25df7fe830e80ea82e1126", - "sha256": "0kr1sd819rvyfw34g6sqcnygkllcx07ccc5zc773kn0ngiqd0zvn" + "commit": "4f8eafe2a016e2e78872e4006939ee82397e57a0", + "sha256": "0fa9kipg1ihfr16ljsfgxd6z8a5fj31npfxhqv7q9ysi4nq479c0" } }, { @@ -90293,11 +90424,11 @@ "repo": "pfchen/read-only-cfg", "unstable": { "version": [ - 20210517, - 749 + 20210608, + 1259 ], - "commit": "c128c9412f768adf89ff5c4ad433cf0beab6656a", - "sha256": "11zj4ysmacvz82j1siqlcp30i05my20lscls8wkdjl75g9d2b12l" + "commit": "a02395b37a68b2e20e365c2e3752f966c71d4c02", + "sha256": "0jihqc16knvws5w2y5djdir4h52mpwk86nbjlap47lh2r18qk6q6" } }, { @@ -92023,11 +92154,11 @@ "repo": "galdor/rfc-mode", "unstable": { "version": [ - 20210510, - 1104 + 20210615, + 1721 ], - "commit": "b885d6bd2b3be69a2413c4dc5cc34344d821cba2", - "sha256": "0qqvab5n5y70mv9dq06xnqmpxy9pr994k3b83kw70pq43gb03nxd" + "commit": "3ef663203b157e7c5b2cd3c425ec8fbe7977a24c", + "sha256": "0lrmgvrj69rs49vjfwkm3w9z4y5mkndra1kdqmr9s7z9f1558is1" }, "stable": { "version": [ @@ -92050,28 +92181,28 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20210305, - 1621 + 20210625, + 939 ], "deps": [ "transient", "wgrep" ], - "commit": "10e64887c224002572e1f1e19c74453cba606c3f", - "sha256": "1519lh5j5zki2dfzd1a1hl1d24nap99hv80647rvpr3mzbcsg29s" + "commit": "0fa6d33d2f3123aecd0b0dbc5fa3d884edf10a92", + "sha256": "17f11znjyfnxs5y0zafcx9aa055wkw3igzk9gy0cipnyp42yb4v7" }, "stable": { "version": [ 2, - 0, - 3 + 1, + 0 ], "deps": [ "transient", "wgrep" ], - "commit": "bb89400d4d5e4eb22917f7048256745ea566a844", - "sha256": "0d8habjr4nv0xbgsk7nj5zid5zywf00vbl5zcx7anda5w1cy2zvr" + "commit": "0fa6d33d2f3123aecd0b0dbc5fa3d884edf10a92", + "sha256": "17f11znjyfnxs5y0zafcx9aa055wkw3igzk9gy0cipnyp42yb4v7" } }, { @@ -92230,8 +92361,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20210207, - 1432 + 20210628, + 1648 ], "deps": [ "cl-lib", @@ -92239,14 +92370,14 @@ "popup", "posframe" ], - "commit": "519e6eb3b5e8e668c2835d27f54fcf5776242576", - "sha256": "1q0kzdy3nxswsriq4fxr00wmw43x737dd7pnkf9g6v8hd7gsqkzc" + "commit": "b93e761209211f8a6de1bb4b8f1d36651564a8d9", + "sha256": "0z0iwsqr92g8ykxb51gkawwxwzx0faw0027zgdi7c38ngjqld237" }, "stable": { "version": [ 1, 0, - 4 + 5 ], "deps": [ "cl-lib", @@ -92254,8 +92385,8 @@ "popup", "posframe" ], - "commit": "ee7f951f0bc3b55034634019dd385706bc413dbb", - "sha256": "1a50cziwg7lpgh26yvwxs46jfyfq1m0l6igbg5g5m288mz4d3an9" + "commit": "b93e761209211f8a6de1bb4b8f1d36651564a8d9", + "sha256": "0z0iwsqr92g8ykxb51gkawwxwzx0faw0027zgdi7c38ngjqld237" } }, { @@ -92430,11 +92561,11 @@ "repo": "jgkamat/rmsbolt", "unstable": { "version": [ - 20191218, - 257 + 20210624, + 417 ], - "commit": "2bc1afe528b70b8aad4243a3b2b72bcf09a599e1", - "sha256": "0pg2q275qd83i8c1g0f1xlwvbqd40xm3gw2ahl80blyllsvz04j9" + "commit": "ff496660cc52a6dd33d358ef0acc6d4bb70cc340", + "sha256": "05i0101238yy1da6z543nr9x5gpvgdxrrdn3sw5dibcn6z62ml3p" } }, { @@ -92445,14 +92576,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20210608, - 17 + 20210626, + 137 ], "deps": [ "inf-ruby" ], - "commit": "bcddba77ba11b46f94730708fff2215f4b620428", - "sha256": "04az3rk7h606pv2l16wf2bmad9nqb7nx6r7cwap90dvnfjn56a3y" + "commit": "e1304d123d729aa063671d0ca526b01e72f0f5ed", + "sha256": "1ghwjymcmmr99z060l1shm9sqbjxxdgq6b7ayn8s9mldcqm5pa3q" }, "stable": { "version": [ @@ -92695,8 +92826,8 @@ 20210313, 1541 ], - "commit": "63f18acb21e664fd92fbc19465f0b5df085b5e93", - "sha256": "0wzyn9qzyly71yfwhlk5m94ygjnbk459pgbpgkhp9fqgchx12p1r" + "commit": "65113e2a137baa9f85dc2157b893291470788dc4", + "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h" }, "stable": { "version": [ @@ -92721,8 +92852,8 @@ "deps": [ "rtags" ], - "commit": "63f18acb21e664fd92fbc19465f0b5df085b5e93", - "sha256": "0wzyn9qzyly71yfwhlk5m94ygjnbk459pgbpgkhp9fqgchx12p1r" + "commit": "65113e2a137baa9f85dc2157b893291470788dc4", + "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h" }, "stable": { "version": [ @@ -93255,8 +93386,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20210502, - 1646 + 20210609, + 1900 ], "deps": [ "dash", @@ -93269,8 +93400,8 @@ "spinner", "xterm-color" ], - "commit": "ed68fd3bb410869e1a4ce3943b5913ea88d9b509", - "sha256": "0896m5ajlq90pp7ds6iw7plqkffm6k01v3rfqfhb3qwd92nxgcf0" + "commit": "bbf129cd128105de51b6c242b2551094b8d8987d", + "sha256": "09dnlvi8kf683n6q3yp4gy9d4idiyg4x6rcij8d90cvygh8i30wd" } }, { @@ -93305,11 +93436,11 @@ "repo": "Kungsgeten/ryo-modal", "unstable": { "version": [ - 20210523, - 757 + 20210625, + 2046 ], - "commit": "ab6417d8e546f1836618ee72d074ec65431ebc80", - "sha256": "1yy0jr7n55qbraxif2zhgmyr31jd5sd62jyhd3cg327vl5ga1ajg" + "commit": "fc9e227127fa327183d39d28c3afdb2f395a51a2", + "sha256": "1j05dyg77fpdh7gl29bq48fdba7kwbhsq3ryn6b8vzhncapsqj99" } }, { @@ -93320,11 +93451,11 @@ "repo": "magnars/s.el", "unstable": { "version": [ - 20210603, - 736 + 20210616, + 619 ], - "commit": "e1710af8d058faca32529d1129deb5d57871385a", - "sha256": "1zm9zqa1479kn74a1hbs7jc8rli7vzz5hk8k2rqpi34yf569yjhj" + "commit": "08661efb075d1c6b4fa812184c1e5e90c08795a9", + "sha256": "02hcjnf8n0nzqysqi9g7kqykxmn8nwhsx1scrq6wj1iibc16nh0p" }, "stable": { "version": [ @@ -93740,8 +93871,8 @@ 20200830, 301 ], - "commit": "393a5f2be890c1e90b3d5f331ce1bf34dad09742", - "sha256": "16y5njqb9v58fmsp9nn38wvzx71jgy0di2m8933a8dkirddi324v" + "commit": "32c5c18e1cac173b79fc37b85dca51f4e8d57e45", + "sha256": "1vzg370393yfw1msgdyq2bwv3rc765z30vsrxssm0zifjqimkab6" } }, { @@ -94084,10 +94215,10 @@ }, { "ename": "scratches", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "116bjy1m35h83r2c354i2xk1br87nmvd99kbzax0wgkkkcjff8c4", + "commit": "991ef46a458c9301283dd440d79448fb25374c98", + "sha256": "0gq5ar2v50sxddf0lccm75kl2fq3g4zacq8wd2hf9kp3cq7mylh9", "fetcher": "github", - "repo": "zhangkaiyulw/scratches", + "repo": "victorteokw/scratches", "unstable": { "version": [ 20151006, @@ -94647,15 +94778,15 @@ "repo": "wanderlust/semi", "unstable": { "version": [ - 20210529, - 1313 + 20210613, + 948 ], "deps": [ "apel", "flim" ], - "commit": "95259568446f32c1af56dfc27e3614815322a1bf", - "sha256": "09xld1vpxdz1kvw039g7hk89p2d8pi95j9hgls6iviwzs6ni41yl" + "commit": "509f6f0bc2f5d020c63e47d9ad89410dc20bcb6f", + "sha256": "0lnr5kyc59rs2p3lnhyr6cc126rh17szp68xpsx4brym3blb37yc" } }, { @@ -94767,15 +94898,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20210521, - 1050 + 20210630, + 1805 ], "deps": [ "dash", "edit-indirect" ], - "commit": "900fdc33b647e92d0f464872da1b12d724de7d43", - "sha256": "1ji8qjg3qsxprsqjp4hks999f0rfqnl3nyj08hr4vra5nqk6x4cg" + "commit": "4fbbd85c0f809593f6d26edf1388ff059f77e82f", + "sha256": "0jyz0cz1c6bimkd48iv09lgmzgbb63v5dybcgrjcmcg630c8yh87" }, "stable": { "version": [ @@ -94837,6 +94968,25 @@ } }, { + "ename": "seriestracker", + "commit": "9370b3c06f065ee50ed7e4ffcfd9d503b6e9563f", + "sha256": "03vg4y262yy0y3xh0imx4mh59z2lhzif5jxnad2w385khnyj1n21", + "fetcher": "github", + "repo": "MaximeWack/seriestracker", + "unstable": { + "version": [ + 20210629, + 2303 + ], + "deps": [ + "dash", + "transient" + ], + "commit": "a5ce1bfd06ed90bba9947a9045659d13f3362a96", + "sha256": "0gjwp0h9ip58da1p8q9s9pjfh0g6pav4gam9s51xnx8mv0vbgb68" + } + }, + { "ename": "servant", "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", "sha256": "0h8xsg37cvc5r8vkclf7d3gbf6gh4k5pmbiyhwpkbrxwjyl1sl21", @@ -95279,11 +95429,11 @@ "repo": "ieure/shell-here", "unstable": { "version": [ - 20191011, - 1959 + 20210616, + 2338 ], - "commit": "88b80deb1337a97b403b20fc467fa2d579b3bfd5", - "sha256": "1x9zcxsc6cnh0h051377asbqhcx3mzcarrnj9zmyg6fcszgas5v1" + "commit": "a3679c52d31d1dc6ed29bcab087cb5455a992eda", + "sha256": "0w0mlggb5gnvm109qn50ric3lb9znxvfkzvc7xla2qnmaz037ppz" } }, { @@ -95402,6 +95552,30 @@ } }, { + "ename": "shellcop", + "commit": "51f723347f56e150852bf82d163c04aa846a3d9c", + "sha256": "19281hh73m898187ksb0wl409iwgr49z6mqx3dr5ggajbs7jp4yn", + "fetcher": "github", + "repo": "redguardtoo/shellcop", + "unstable": { + "version": [ + 20210622, + 721 + ], + "commit": "7c025b10173ef380ea539dbbdcd7d60977119e24", + "sha256": "1rjiyz3sx387b8559k01j6149jw729zlk5s3ah2jaxj6p9cag418" + }, + "stable": { + "version": [ + 0, + 0, + 6 + ], + "commit": "7c025b10173ef380ea539dbbdcd7d60977119e24", + "sha256": "1rjiyz3sx387b8559k01j6149jw729zlk5s3ah2jaxj6p9cag418" + } + }, + { "ename": "shelldoc", "commit": "551623175e55629be6cfe44a595f25f09bd889e8", "sha256": "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx", @@ -95558,11 +95732,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210606, - 124 + 20210621, + 534 ], - "commit": "0e18a7e96c8e425ac7c2e69aa26fa6a1e8e6e51a", - "sha256": "1jxp447d8xnk4ixpni7rsph7fd3p58ydmi39yrx201hbqh15jxiz" + "commit": "70b985b1d00c8703acb1ebf16875616903470f45", + "sha256": "0djvaxbxjic4m8nqmj1gs0h77gf0fik00ia7ayfha3fc7fabiif9" } }, { @@ -95950,6 +96124,36 @@ } }, { + "ename": "side-hustle", + "commit": "f75ebbbec4736474a745487cecebdd70a3edde21", + "sha256": "01avgnswjq4jflgxfkrcgc56il6v6qgxblv1zn70n2p31x7n8y63", + "fetcher": "github", + "repo": "rnkn/side-hustle", + "unstable": { + "version": [ + 20210627, + 701 + ], + "deps": [ + "seq" + ], + "commit": "1f4cd5e7cfbabb00c6d87e913770f21e3d16c957", + "sha256": "0qcaqfsnw90prch3x1flccanys4bh72x2pdmf27nh5b3i9jbrbv2" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "seq" + ], + "commit": "786932352ce2f10214b801e872690e05b6102851", + "sha256": "09i5ds9ayid570x97glcy6cb8qdr5jc8riqfs7wl3hi4dif0z61a" + } + }, + { "ename": "side-notes", "commit": "67d23bdaefb563d88b206a9ed822316f3d5be9a2", "sha256": "07hrrplgvp3fvl10fsmxifnim8wz34w7fhzzzkxpdj1zlwls6h83", @@ -96090,14 +96294,14 @@ "repo": "vapniks/simple-call-tree", "unstable": { "version": [ - 20210608, - 33 + 20210625, + 2001 ], "deps": [ "anaphora" ], - "commit": "d776c801d773e535d1647524e2c4f63b200d8ef1", - "sha256": "1jh1h09l4vkzj40l8nskkilbggfl889l3rhi8b70jm4yvmk9np62" + "commit": "26de24bcde0eae911a0185bb5a6b74b9864fcfc3", + "sha256": "0589ns2v6jxyd7adjkj34zlcnnxbfs6c7hm56yskbs2s4qkkf369" } }, { @@ -96605,15 +96809,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20210512, - 1220 + 20210614, + 1523 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "bdda756a5667a537497a35f5a0fc5b7c28bf3bd3", - "sha256": "0xm3fdwla8axag1zpc7361mgyjpf1qg907l86w4v8ald8z4qcvl9" + "commit": "98a656d96b177edce57b552a2fa9d139cdce8c9a", + "sha256": "133p6yj5vdw6i4j2v8ac2g9ayrwxlvvimh2qs5fmxi8vklvn7h3a" }, "stable": { "version": [ @@ -96845,11 +97049,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20210604, - 937 + 20210629, + 2009 ], - "commit": "c783ba6576b554f3fc15a70bf30d225f277d1863", - "sha256": "1lwghrqw81dr7mhx8i92nn4xhamnpqwdvmzx1lg1fzy7g5qx7fl6" + "commit": "954e5dad72fb5712dfa968222e2b46dfdf9a476c", + "sha256": "06m2vwxga1rys98z97abajqq89k2dlfrrab21hhgqwc0zmdmb9fv" }, "stable": { "version": [ @@ -97124,10 +97328,10 @@ }, { "ename": "smart-mark", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "0kx34983qqxkx2afql1daj155294dkbinw861lhx537614fq7wmn", + "commit": "debbf9d7069436641a4ea922c3e44dd8176cb072", + "sha256": "01crd7bv6r1iz414s8044qp3560n52f4pmbq0qniin2dya7si681", "fetcher": "github", - "repo": "zhangkaiyulw/smart-mark", + "repo": "victorteokw/smart-mark", "unstable": { "version": [ 20150912, @@ -98118,8 +98322,8 @@ "flycheck", "solidity-mode" ], - "commit": "383ac144727c716c65989c079ae76127e25144c3", - "sha256": "1q4b8623mygzp3qwy5bmb3hipzjfri9007x0ilq3i7k5bs34jz9r" + "commit": "5f6ef3156fadae5af6f381d674d20535529a20e4", + "sha256": "02rmc7naspjfl757k7zdfg9xd6nvfpsiqfcxkj6ywc7mnndpq2c0" }, "stable": { "version": [ @@ -98143,11 +98347,11 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20210505, - 1704 + 20210622, + 931 ], - "commit": "383ac144727c716c65989c079ae76127e25144c3", - "sha256": "1q4b8623mygzp3qwy5bmb3hipzjfri9007x0ilq3i7k5bs34jz9r" + "commit": "5f6ef3156fadae5af6f381d674d20535529a20e4", + "sha256": "02rmc7naspjfl757k7zdfg9xd6nvfpsiqfcxkj6ywc7mnndpq2c0" }, "stable": { "version": [ @@ -98643,11 +98847,11 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20210206, - 1428 + 20210618, + 2001 ], - "commit": "c8c468580048e2464f012d171b2101bfb208e33d", - "sha256": "1rbv04smfyhm5qm3ghn9vsl0sm4lv20gkpw2zdzrf0l3nkb7dx45" + "commit": "f98150e8e254e6bf94dee2de3e8baaf02e2aae80", + "sha256": "02jm3v3bnbc45rd4fl9kkln0pn49ix2igm254yz33cg0ykgkj2nf" } }, { @@ -98718,14 +98922,14 @@ "repo": "ljos/sparql-mode", "unstable": { "version": [ - 20200429, - 1719 + 20210701, + 1202 ], "deps": [ "cl-lib" ], - "commit": "e8c9345e2e2427282b3dc9cd1e297e3c76d34f7f", - "sha256": "1i799cq0dydq7jdhc1b2ridlsmmkk85286g9r6nj6kif3177l171" + "commit": "ceb370b3879841f8809cc3f9b1b87e898f10562f", + "sha256": "05vbsfyck0nxa0bsg7jjshjzh7719gx6z6i9i4ayxcfygh3wh6xz" }, "stable": { "version": [ @@ -98763,11 +98967,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20210415, - 1821 + 20210629, + 1739 ], - "commit": "86c223a2db529768fd815dc0635ed432c1a215e8", - "sha256": "1bz6186w83xmajnw489dc1la7b6gly9vrp40mh58gknk5fjdx86w" + "commit": "b915b063f9de2eff4b9a37c04559a3f2fbfdba84", + "sha256": "1skwcsv8cvjfsgncgd4hybkhjdf6clb65pnpqfh9jxc866aw9n39" } }, { @@ -98805,11 +99009,11 @@ "repo": "brailcom/speechd-el", "unstable": { "version": [ - 20210607, - 2032 + 20210619, + 1753 ], - "commit": "2ffae385139936a03e1d1a96993d3bf5f9509bbf", - "sha256": "1kwg74qy66kwhsl2pqn4cvkrqrfdvyyaz13h4h1bqpxckb1dc05z" + "commit": "bd21335668ac7ea4d8c992490b4a710053434e74", + "sha256": "1jlb1mfigcqxvm1aibf803xypmbj3x1145nmf2q0v2aaipd6s912" } }, { @@ -98894,11 +99098,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20210415, - 1326 + 20210617, + 426 ], - "commit": "fae15427a1027e5eafdff7e5627cd399f73dbc37", - "sha256": "05xarav1dw4315rh4qchvf6p9vsdyg09nm9rc6k657n4r8ip725c" + "commit": "1abcb5594e1bfe35716d29e64523e4cebdce737c", + "sha256": "0hk3cly374sgiwdf3crjj45afr8nv4jq4bda1vkdb9yqjla0xw8s" } }, { @@ -99482,11 +99686,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20210528, - 2053 + 20210701, + 23 ], - "commit": "c4ff94490dd8124e633f907f94955b30b7a4d8d4", - "sha256": "065n3x1mzhjgkyvy5j3fgqa75npxqp1dq05xgac9pqgcr2j09mi6" + "commit": "a92d2a4f748f124910d406a9386979688f7f28a5", + "sha256": "1gfqskdng23dpacvmypyc2jsrw15hrrwq84qmlnwyibf0g0pjj1f" }, "stable": { "version": [ @@ -99614,11 +99818,11 @@ "repo": "cjohansson/emacs-ssh-deploy", "unstable": { "version": [ - 20201016, - 1439 + 20210626, + 2228 ], - "commit": "fce4ea35f09ed5899c1a2dfa3527bc2dd5ca3ba5", - "sha256": "10banrq8p0v10237yy2f04i0vvpjdz0by9cp92ambw94c3l3ii8f" + "commit": "7c5fe8af2d62d8f6d32ebe2d3bfc53051a9432d1", + "sha256": "1ca1ai742g2901pni08clk37h1ls4n65pzxpsfzsxnr7i46yh989" }, "stable": { "version": [ @@ -99910,8 +100114,8 @@ 20200606, 1308 ], - "commit": "311caea3f11330a42a37efe078305b4ce42e53ae", - "sha256": "1hfr36xb24y829pcd4maw206lyhrb3qwxxzj6gwh3a0nw8s1sr1m" + "commit": "097c527a40797e1b3f3a954cfc5e04987fbb61a9", + "sha256": "0yidmzdkrw66hga7nna337jk8rkml6plhr1mzfsyfazpb9da0zsj" }, "stable": { "version": [ @@ -99960,11 +100164,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20210430, - 839 + 20210610, + 1256 ], - "commit": "eac0f54da5ff116622a6448b68057b45c337f2de", - "sha256": "0b7glyq3z98vi7f79zg0phqm6ibc30lq2m4mwy22gg0941rr2zja" + "commit": "e69b7532ceb27126fb9516c9a8aff652b032088a", + "sha256": "1jcqcf34d55r1z786gpkj7jwap646izk498pn2dia7skiwwljx5b" } }, { @@ -100268,11 +100472,11 @@ "repo": "PythonNut/su.el", "unstable": { "version": [ - 20210226, - 42 + 20210626, + 2025 ], - "commit": "787f78989253f4568942a4cece5f135f005e135f", - "sha256": "1sr6lwjd2py0pncbx4qxa8wfxa3fnmfhxr944aid672hba2pdx7s" + "commit": "36db018de8423a6e380a49d4e602d376a0740f6d", + "sha256": "08vma290dxzjxyn4df2i1kjzm24myxvsll9cxky277asbb8ja74z" } }, { @@ -100933,26 +101137,26 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20210518, - 728 + 20210613, + 543 ], "deps": [ "seq" ], - "commit": "4a5f57722e06dad3bbbb1a496ef7d1b732ac7c46", - "sha256": "05x6xy29dym9pn8kssiwhn34c1vwxgsb9jnfq6n0ii5inlw0vx2g" + "commit": "1b47a09f1c0e15c543e0551e7f1e643f437e7711", + "sha256": "1f12rmsxzjz0ixrzvi37gj6kqkjp08mym0qvnxdmqiackagxp2rq" }, "stable": { "version": [ 8, - 2, + 3, 0 ], "deps": [ "seq" ], - "commit": "fd3c824c3622aef4ad29983667f34ebad91e9f69", - "sha256": "1s60j7778n8vl53capi1bs5mbb1g2vwaaa4y7wdv6ajrlxh95a5x" + "commit": "1b47a09f1c0e15c543e0551e7f1e643f437e7711", + "sha256": "1f12rmsxzjz0ixrzvi37gj6kqkjp08mym0qvnxdmqiackagxp2rq" } }, { @@ -101354,8 +101558,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20210528, - 406 + 20210630, + 1816 ], "deps": [ "evil", @@ -101367,8 +101571,8 @@ "seq", "undo-tree" ], - "commit": "1b6466e75295bbf7847253dfb6bf580b1c68eb9f", - "sha256": "1rbb7zl45x9xkf05601j05vq3f3hj0nh3rbv16a3n8d0ab5qnvhr" + "commit": "740d80599c0a1ff0882e231e46c61ba16c83cd84", + "sha256": "1zfjdrm88c16czmi4i6rm87nafpyrjpjkj79cg44l9cizyv5198q" }, "stable": { "version": [ @@ -101761,14 +101965,14 @@ "repo": "fritzgrabo/tab-bar-groups", "unstable": { "version": [ - 20210526, - 2044 + 20210615, + 1915 ], "deps": [ "s" ], - "commit": "63af8dced377a346b4559145b2e6e1767263f916", - "sha256": "16628wjk14h99z9i822xjv8fkxra6n65nafm3cr3ci86qd00j7a2" + "commit": "a2e456097322d0b1cfdb7aa37c32a628bcca3bf0", + "sha256": "19ni9bl34hzmqsb9wiznbghw67m7g9zz3z5m3wgndn9zsj37ccka" } }, { @@ -101803,10 +102007,10 @@ }, { "ename": "tab-jump-out", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "1p2hkj0d9hbiwbf746l3rad8a5x6hk97b0ajl6q6cwbmy2qm3cca", + "commit": "f84b8d995a13b8d30d15b3bf9f671dd06fb8522b", + "sha256": "0yyncbgdbw8lgjaycmky7wxhhxaqydks25qf565n2xj87snc5l7n", "fetcher": "github", - "repo": "zhangkaiyulw/tab-jump-out", + "repo": "victorteokw/tab-jump-out", "unstable": { "version": [ 20151006, @@ -101985,11 +102189,11 @@ "repo": "tmalsburg/tango-plus-theme", "unstable": { "version": [ - 20210505, - 1051 + 20210615, + 1229 ], - "commit": "f31d282a70b0eb24470935438af59de96ddace2e", - "sha256": "1f3kxc9l0f4r7fxhrz77lghn4847f3b7dk8j84sn6d5zr436by8n" + "commit": "6ad64d82c8bd8c559b9023cd70b1c2d0c18e9060", + "sha256": "0ig8ng5ycdf256phigh3fzalvd0ncvs54f7kfpq0gp43ky9sgvz0" } }, { @@ -102230,28 +102434,28 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20210607, - 1622 + 20210701, + 1035 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "0fcca201db99fbe93e8b0fd404dc00fd55cd658a", - "sha256": "0nqx5sddfa9442dgsssp022rfarznnq69gclj4h5kk726rkf9cid" + "commit": "a4054e9517d68109212f9d69342a49d4d65dd56f", + "sha256": "010b2rkpr8cib1c6s1ysg5wllrsg4rxc7h7cxqrjq1978bi499cw" }, "stable": { "version": [ 0, 7, - 24 + 25 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "9187e6e3d903474645f3e64806bc62ef687ec205", - "sha256": "1ra04cp49zzx8vy8aswd00l46ixyc44sxh1s3nw880b4ywzxmc6j" + "commit": "f979ac79070c39a4c483c08df96080763287ce4e", + "sha256": "1fdvghwpmja94d65p02j7wa09lwjs3ah1kfb1v17b6l9qd5g80nc" } }, { @@ -102839,10 +103043,10 @@ "version": [ 1, 1, - 0 + 1 ], - "commit": "77181c75cbde5954542688659cd4f2352ed29fbe", - "sha256": "1bcwja7hm11hxd1nmf1z93hkzcvkkpxavvbivg6j336ygzr1r82g" + "commit": "5d35efbf2c1619d9385ef00ed74e9de1ea7cf32d", + "sha256": "11df5606hiqgglxi6xrrljwh70h2wgkib447ggvs2r3f2jayilr4" } }, { @@ -102853,15 +103057,15 @@ "repo": "emacsorphanage/terraform-mode", "unstable": { "version": [ - 20201208, - 1827 + 20210621, + 1953 ], "deps": [ "dash", "hcl-mode" ], - "commit": "a9fa5bdaf58e9cae32ee44b7d0883f5600441b05", - "sha256": "12v8mldxpa32v63zg4y3c7dihbw4v5agy3kd9rpiyymf6z0pcad5" + "commit": "e560caaa9d9a11b0868adf6d9dcae5ebb5055730", + "sha256": "0r4zw6jwn5v1xzzbc1195jblhcg3ikbmz3wiwy462qzib56bj8d3" }, "stable": { "version": [ @@ -103321,18 +103525,18 @@ 20200212, 1903 ], - "commit": "a67ce1533462256ff418027a3aa56516a1139d02", - "sha256": "0f20x4bklq32lcwa2ihnlnb6ri884xx7dyhg62yqz9y4w8filhhv" + "commit": "6c2a7567772f3954006c77a8bdc041df83802a00", + "sha256": "0g1j346s8jhw830byzjvgsjg6a03kza19xsghza1bzncwqjbv1n5" }, "stable": { "version": [ 2021, 6, - 7, + 28, 0 ], - "commit": "ec71afa89573c92de4a2a2ab87a51bd9021f5819", - "sha256": "0h3b89nb8sshhc52fxsgpdiqr85mfg1rpzp69qmiiwx1yz0b66wi" + "commit": "32036a5505970a5a8c905543ebc6de1b20a662d8", + "sha256": "0nc9d88ydm5x4nynyxq4rqbp63ypjd1mwf18vancwigv7jxc62an" } }, { @@ -103388,20 +103592,20 @@ "deps": [ "haskell-mode" ], - "commit": "cfc231660a642b2451f874824365931419ab45a0", - "sha256": "06wqsljigm7hvycvg4p5rilivr8g7im300jlnm1r463dc1d12kjh" + "commit": "60a1c271b39dac22783a4f892446f08d3faeb025", + "sha256": "18spz3lvb3df0rr2cqxkqa6rfzrpwwryh4gkzp68znbbfl655l8d" }, "stable": { "version": [ 1, 7, - 4 + 7 ], "deps": [ "haskell-mode" ], - "commit": "652d7a4e374d3c171278e6bdfccfa41c7621d4d3", - "sha256": "11590ifnh9ynwcfv31f5m59wr6ckrm3xi2g40wvk4ddxslj4yxnh" + "commit": "b7399a878622173bf9fdc076ec72a8353e1b924c", + "sha256": "1qbywv182gzbdk27bzah273mb8brmqrpxcgv1pmdy10fc7fv2z0f" } }, { @@ -103637,11 +103841,11 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20210607, - 1412 + 20210621, + 1857 ], - "commit": "34a4499fac484c369774e356373b1f4994d65176", - "sha256": "11cjyiwi87rv9lj09810aazxgphdhpxpfhbhzr64176vqgmb8khr" + "commit": "80d29c0f29925775fb00e90669a153d94eae01db", + "sha256": "1hdxis28ngrl0d1gafckah7srad4rnpmn4dh5dxd0a5vph63cxhw" } }, { @@ -104282,8 +104486,8 @@ 20210528, 754 ], - "commit": "c0b2f997b3b73640d635ee84627bb8cf36c9adfe", - "sha256": "1kjfch0fhq67iivad56s071c8qlsssdsdg83h5v9iz2x4jipm0wa" + "commit": "d6f1fa18646f6ed2a1c0f06a4888130bd694ff19", + "sha256": "1l6v02aa072jvhq4b9dpkprqs14py0d4jm3xvihm05lvrbf9v6c6" }, "stable": { "version": [ @@ -104386,20 +104590,20 @@ "repo": "magit/transient", "unstable": { "version": [ - 20210530, - 2252 + 20210701, + 1116 ], - "commit": "a96818c93a10d9ef9bb14e5c0b9fdc1a808b13b9", - "sha256": "1mvccsfalnr4ybsgqazxcw62vfhigxg61y6v98k2fqncnmsbripa" + "commit": "51e833e5152e9fdcdc1dbbf34ad2d4905bde1f69", + "sha256": "10k9dzs8y6i0rfckclxm5n3maylmh95993n5dvrs8rbmlcpmihvy" }, "stable": { "version": [ 0, 3, - 4 + 5 ], - "commit": "b47e9d7d769437e279628d801a95c173c4ff26b4", - "sha256": "16z0j69sk7k51sd1vri3y2v0xjj0w7wpf5mmwnsxp8y6d3m0yjbv" + "commit": "b711543401dafc159943d8a703cf30fabdc78e1f", + "sha256": "0wzfnzv2304a737zwp163aajjhm8i3ix9v7palgg1r3jskvbghmw" } }, { @@ -104773,8 +104977,8 @@ "pfuture", "s" ], - "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", - "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" + "commit": "2655a8976d56719add893cec45a18e018626842d", + "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" }, "stable": { "version": [ @@ -104810,8 +105014,8 @@ "all-the-icons", "treemacs" ], - "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", - "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" + "commit": "2655a8976d56719add893cec45a18e018626842d", + "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" } }, { @@ -104829,8 +105033,8 @@ "evil", "treemacs" ], - "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", - "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" + "commit": "2655a8976d56719add893cec45a18e018626842d", + "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" }, "stable": { "version": [ @@ -104853,14 +105057,14 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210605, - 1118 + 20210630, + 1953 ], "deps": [ "treemacs" ], - "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", - "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" + "commit": "2655a8976d56719add893cec45a18e018626842d", + "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" }, "stable": { "version": [ @@ -104891,8 +105095,8 @@ "pfuture", "treemacs" ], - "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", - "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" + "commit": "2655a8976d56719add893cec45a18e018626842d", + "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" }, "stable": { "version": [ @@ -104924,8 +105128,8 @@ "persp-mode", "treemacs" ], - "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", - "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" + "commit": "2655a8976d56719add893cec45a18e018626842d", + "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" }, "stable": { "version": [ @@ -104957,8 +105161,8 @@ "perspective", "treemacs" ], - "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", - "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" + "commit": "2655a8976d56719add893cec45a18e018626842d", + "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" } }, { @@ -104976,8 +105180,8 @@ "projectile", "treemacs" ], - "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", - "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" + "commit": "2655a8976d56719add893cec45a18e018626842d", + "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" }, "stable": { "version": [ @@ -105314,14 +105518,14 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20210605, - 1629 + 20210628, + 1257 ], "deps": [ "caml" ], - "commit": "24c1a1adbe51d93f681e72442fa73f885eb33776", - "sha256": "1cp6g117kfmwfqb7sq4y4jx8ggp29f4hz2kz5g3355s8zhjlld2y" + "commit": "2e8482e23f45f0e6246a8d075a3b8696c5f49070", + "sha256": "04wblkb0jqzq67p1d96i284wfqv3ddffrwz3i3wf537wyi8bmn4k" }, "stable": { "version": [ @@ -105738,6 +105942,30 @@ } }, { + "ename": "uci-mode", + "commit": "0779d9728de07e3115b48997f2623d1fc5c313c7", + "sha256": "0idk3flaq316ynf02226j4hww8rlb60ssikqkjh69n0r31ygg0q3", + "fetcher": "github", + "repo": "dwcoates/uci-mode", + "unstable": { + "version": [ + 20210626, + 1956 + ], + "commit": "2cdf4de5af96d56108a0a5716416ef3c8ac7bb7c", + "sha256": "133vrnbann0ibsm14h7ghdx8f9i92niazbw8r49srx2xx0jv3lk6" + }, + "stable": { + "version": [ + 0, + 5, + 5 + ], + "commit": "2cdf4de5af96d56108a0a5716416ef3c8ac7bb7c", + "sha256": "133vrnbann0ibsm14h7ghdx8f9i92niazbw8r49srx2xx0jv3lk6" + } + }, + { "ename": "ucs-utils", "commit": "c9db386ab3910940addae6e925b2ac17e64e0f87", "sha256": "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2", @@ -105990,11 +106218,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20210418, - 920 + 20210617, + 1327 ], - "commit": "243d93b4c7c1224e7067cd323f64d23dfdfe7c0e", - "sha256": "1gdx6kir0a0v7q2ai59miibch9hccqlnx2y88qswfpqr9pf7z6vm" + "commit": "579936966b41d2d6782f587509fef21477141374", + "sha256": "1sqjp84hi81q62pyx7py7zvmkwdywh106i6jqqnmgkv0ai9cb2ml" } }, { @@ -106224,11 +106452,11 @@ "repo": "astoff/unicode-math-input.el", "unstable": { "version": [ - 20210110, - 1431 + 20210612, + 847 ], - "commit": "b46fc1d4cc5ab5c2bca3de1e5e43c8f53f1d343b", - "sha256": "1g84ynppdv46lhsrl0bgvdvlkijhzns4knkldgmbdhsjafvnz8cw" + "commit": "2788d7824d23749a6e5b33f653c47471455da187", + "sha256": "1kqaqzlgf9gqxf3fzy41m606h7ridp5iik1w5a0dpq86ni23r77c" } }, { @@ -106880,17 +107108,20 @@ "deps": [ "tuareg" ], - "commit": "bac3946079a98df00f31656dc10c6c9f1a8bc422", - "sha256": "1wbmr0n384501i97x0akcfwcigklwqgwvhdwgxw6zxxn5wdg60b2" + "commit": "c87b8b2817eefd0cd53564618911386b89b587c5", + "sha256": "1zf4hg33sblzh2f65vk0292jg4jlwa8702kfwpsg1kcg4w6nsfdp" }, "stable": { "version": [ 2, - 7, + 8, 0 ], - "commit": "a5ff52bbf608e1112b5c0d41a36e3267f39f4084", - "sha256": "125cv7kwvr1xj52yfb5qlra2li2hikbqnqvqdasn0rq3pkj7f02b" + "deps": [ + "tuareg" + ], + "commit": "c87b8b2817eefd0cd53564618911386b89b587c5", + "sha256": "1zf4hg33sblzh2f65vk0292jg4jlwa8702kfwpsg1kcg4w6nsfdp" } }, { @@ -106939,15 +107170,15 @@ "repo": "damon-kwok/v-mode", "unstable": { "version": [ - 20210425, - 411 + 20210608, + 629 ], "deps": [ "dash", "hydra" ], - "commit": "96ca8dad3a3a402a44bf9066591fe27fa2e4fd9a", - "sha256": "08n577b8xr1pv2mdzqzdbkd5j0pih7zd4z4p5y5w4hq72mcid43q" + "commit": "3afbd72180417ada6aeeec861081495aca962124", + "sha256": "0is9hdh8w87l9x84ihhcd040z8m7cy2321q2rmbfmpffaaja90cl" } }, { @@ -107205,19 +107436,19 @@ "repo": "muffinmad/emacs-vc-hgcmd", "unstable": { "version": [ - 20201211, - 1339 + 20210608, + 1030 ], - "commit": "d23de9d10ff68b4c2302ab956f3ba3bb5d3858ee", - "sha256": "14c2brvw6vnf1h3lbpap4jh5d7mjnzxrbny4jk77832v09mj2ria" + "commit": "c00d792b34219a387832f8f9b4a689d7972f592a", + "sha256": "05gjyq4cpc79ipiyl3j263cw6mdbfxmh7wvsxsxavp21q588fb0y" }, "stable": { "version": [ 1, - 13 + 14 ], - "commit": "d23de9d10ff68b4c2302ab956f3ba3bb5d3858ee", - "sha256": "14c2brvw6vnf1h3lbpap4jh5d7mjnzxrbny4jk77832v09mj2ria" + "commit": "12e102f8359095953e06ed17c7223cd6638e5cea", + "sha256": "1mm8lnwii53j32v54aahl8sf3ciwymrvc1rgy4nw2m7hcrnjsb78" } }, { @@ -107374,16 +107605,16 @@ "repo": "justbur/emacs-vdiff-magit", "unstable": { "version": [ - 20190304, - 1707 + 20210614, + 1630 ], "deps": [ "magit", "transient", "vdiff" ], - "commit": "b100d126c69e5c26a61ae05aa1778bcc4302b597", - "sha256": "16cjmrzflf2i1w01973sl944xrfanakba8sb4dpwi79d92xp03xy" + "commit": "fa62a260411387702dd4cc4791075c737519001f", + "sha256": "04n47g3ffnh3bjq5575b6l046cpy7dixksfjy8pzsgh9ah1h37lz" }, "stable": { "version": [ @@ -108264,17 +108495,17 @@ }, { "ename": "vs-dark-theme", - "commit": "60b9b00d18334f2d7b737e3cc6b3c733e1b163e4", - "sha256": "0didkb2zd9ac7h1ccwi9y1q5mcqpwxyws7nsk5g8rhrkygdf9lds", + "commit": "094a9cbc18882daa4f2efd3d72bb0a34e6bd9f63", + "sha256": "1rz2flacnh6h40k559l0r1vwcnx89w4j9ipp1ysnh8rzji3wl07k", "fetcher": "github", - "repo": "jcs-elpa/vs-dark-theme", + "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20210427, - 727 + 20210627, + 2121 ], - "commit": "5a826e6ea3e9edd9241e3253ce97333955c8ae1a", - "sha256": "0q94crd6m6m000gjxwv92jz9rphmnr5wg7jzf6yig1hlhfqjgw9v" + "commit": "bda27d3a7f11fee0550055b0552c2633c167dd96", + "sha256": "1y8ycsm4d72v86prg87dffis5q853k2w0fvx5vz732jryzp18lda" }, "stable": { "version": [ @@ -108287,17 +108518,17 @@ }, { "ename": "vs-light-theme", - "commit": "c997456be95ece85fdef87905e9e14fe308fd827", - "sha256": "02w5zyxf34r1lvk56s3xbkzpvinbwsyv1h685hg9vhn0yy0a23ns", + "commit": "a1258f6afe69d0a13c19246a8b8bd2e5b1a67b48", + "sha256": "14wbqim0bghxwp45qwjh7nc3gi91jaapakaq3x0ypyw8l6xxrbnm", "fetcher": "github", - "repo": "jcs-elpa/vs-light-theme", + "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20210427, - 727 + 20210627, + 2121 ], - "commit": "e324120248c1d513a6516edff250d161f876aad9", - "sha256": "1jw9cbbvm76ijvcrkkn27r3n6qw14jxbirdc0bryv4k12yiwla9m" + "commit": "a8bff6913f603a30bd98bef882ace01476c440bf", + "sha256": "1rshwvfggjb7amgxcl31xhll28kfbgh14aw33khlp32gq6p3vqyh" }, "stable": { "version": [ @@ -108334,8 +108565,8 @@ 20210530, 629 ], - "commit": "961c8c1fdd7eb874d4e2ce386d5e6d1f318b5b72", - "sha256": "1dga7yhb5pnqj5d86pvzbabrq05xj1ppx6g0hinhm8z6m8h6y540" + "commit": "bcae11818d74aa0de8e592b8349d90e512444758", + "sha256": "1rmdin9z68xkxqjhvhyklbby5mxs3qf4wx9c07945p4ps80w8z5g" }, "stable": { "version": [ @@ -108370,11 +108601,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20210409, - 1558 + 20210618, + 1922 ], - "commit": "2b1392cb2b14ec5bd0b7355197d5f353aa5d3983", - "sha256": "0cz0zfq5lannqq2ivmp6zv9r3fybkykx2vl4vn614rij23lylbwc" + "commit": "d9dfa624679afdd5db6ad25429ef86d3dd91401e", + "sha256": "07nk6bw70mi9r3kgs5b11pfwfvfa73xwdl3xgclv8l7k87yysd69" } }, { @@ -108385,14 +108616,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20210531, - 1453 + 20210629, + 927 ], "deps": [ "vterm" ], - "commit": "afe60b814d9d045b968f4a464bbedb241b35392b", - "sha256": "007spqyc474k8fxi6l3s0jh8dg18d9b07wvz3lvbyrgdqwdw2a0p" + "commit": "2258eb19e8bde75f79505c4306f3476bcedce56c", + "sha256": "0k5hmn2wnag6hirnk2ch3xviymbxha5pcb3p1j1lj2likbhwizw8" } }, { @@ -108606,11 +108837,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210606, - 2300 + 20210615, + 103 ], - "commit": "0e18a7e96c8e425ac7c2e69aa26fa6a1e8e6e51a", - "sha256": "1jxp447d8xnk4ixpni7rsph7fd3p58ydmi39yrx201hbqh15jxiz" + "commit": "70b985b1d00c8703acb1ebf16875616903470f45", + "sha256": "0djvaxbxjic4m8nqmj1gs0h77gf0fik00ia7ayfha3fc7fabiif9" } }, { @@ -108831,16 +109062,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20210312, - 843 + 20210629, + 1252 ], "deps": [ "apel", "flim", "semi" ], - "commit": "6e189fc944a9bbde76c5a6d9b6a38d57e85e6390", - "sha256": "0yphp7bqgmhd89hgqy8rg6kmkkzmhz3sjkzm9b1paic7fx9s0maj" + "commit": "769699d60aa033049804083b459ee562b82db77e", + "sha256": "0mgl28xsvc0421pysy6hh0hymr0li8iayaa330r41cbqsk3gz4nw" } }, { @@ -109614,20 +109845,20 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20210601, - 252 + 20210630, + 1217 ], - "commit": "fc29864395fdaf688e2ef5111831663bad89a020", - "sha256": "1adv32z8dmpygbrk14l1pj2535c10ncv8znfzgi1s908ds20kad1" + "commit": "27d9fec33abb989b030f7677ccf5f799287d6472", + "sha256": "1vdvp3iavh57mwhmgxwalrha7h7hgxsfnkxbrspl9x9cx7fx98f3" }, "stable": { "version": [ 3, 5, - 2 + 3 ], - "commit": "5fb30301cb3b4fca5a0e1ce8ec1ef59290b79199", - "sha256": "1wgygby4zwlbx6ry6asraaixl169qdz092zgk1brvg63w7f8vkkb" + "commit": "1f9c37d50f08995c8671822591c8babb893ccc6f", + "sha256": "144i3hkgm36wnfmqk5vq390snziy3zhwifbh6q6dzs99ic77d5g6" } }, { @@ -109638,15 +109869,15 @@ "repo": "yanghaoxie/which-key-posframe", "unstable": { "version": [ - 20190427, - 1103 + 20210615, + 944 ], "deps": [ "posframe", "which-key" ], - "commit": "e7f28608c7fc9507e407c6b840dff09062df533a", - "sha256": "0954llm57gfy3lvq8s32mqdswbv20na0v28gi61kw7023f1wg7ri" + "commit": "90e85d74899fc23d95798048cc0bbdb4bab9c1b7", + "sha256": "173a04s00rydqpkrwdd9khwijbslkwmzqa557x6r1vpp0pdgaz0l" }, "stable": { "version": [ @@ -109932,11 +110163,11 @@ "repo": "progfolio/wikinfo", "unstable": { "version": [ - 20210121, - 1642 + 20210630, + 1730 ], - "commit": "afa32f2b3c23e6d1565698faf9697fa445059bb9", - "sha256": "1wxdb34xsvqydr54w44b84hbins8ay1md49vphp6jqbj99q992dg" + "commit": "bd60451f661609b1b7bfb25662b8b68c0a842c8a", + "sha256": "07jplxs05bwac7i6ksxwl7pm30qk8mc3dvdx0pvim59l67vb61wh" } }, { @@ -109947,15 +110178,15 @@ "repo": "progfolio/wikinforg", "unstable": { "version": [ - 20210602, - 1459 + 20210615, + 2334 ], "deps": [ "org", "wikinfo" ], - "commit": "3aecd23e68b9117a03c65fafa85a0805b58609d1", - "sha256": "0m1fj06x9r941k2842v2091xbff89wp704ifrcdgb6zbksx5d8i2" + "commit": "7df42a260fb93cb743a08e67ea92d77f62dec72b", + "sha256": "05qqs4b0gmnwjl6d29xns93p2lyh1x2xzl0qpydbnxjirwp2bamx" } }, { @@ -110125,27 +110356,28 @@ "repo": "bmag/emacs-purpose", "unstable": { "version": [ - 20210423, - 454 + 20210628, + 715 ], "deps": [ "imenu-list", "let-alist" ], - "commit": "1a556294131a78b557f88bd28d42b43d5c6bd79a", - "sha256": "15v3225irmgg6zsv4h3zyqrbcgx9kbr6rzx5v5hgf9h16fgibi8j" + "commit": "bb462f12f836414425edac32ebd069b4fd5b98d4", + "sha256": "1cw513mh3gyl21qpmgwqjgpi8kwddmd4n69l4ax5a5pv3vvwrcx9" }, "stable": { "version": [ 1, - 8 + 8, + 1 ], "deps": [ "imenu-list", "let-alist" ], - "commit": "8f84defbb4d80ecaada37a2bbde2c1d8699f98af", - "sha256": "1bq0s56wj6ibyh625zfnisy8yniz72dpg4mcgq55azsbnd4fblqq" + "commit": "bb462f12f836414425edac32ebd069b4fd5b98d4", + "sha256": "1cw513mh3gyl21qpmgwqjgpi8kwddmd4n69l4ax5a5pv3vvwrcx9" } }, { @@ -110979,8 +111211,8 @@ 20210316, 156 ], - "commit": "2e57f792edc371e7105ee388f878d52d5801f5de", - "sha256": "0qyx41yawaamfs8k3dr7b48kf09snlklja0pa1n8nw80q355w94p" + "commit": "986c9d96ff898d346b453422e8e312f7976e6089", + "sha256": "17wls9mn097kwpcg9f4dxa6is0yshxgmjh2z1pk1nwfd8mdpczvg" }, "stable": { "version": [ @@ -111000,11 +111232,11 @@ "repo": "ag91/writer-word-goals", "unstable": { "version": [ - 20210503, - 656 + 20210614, + 1527 ], - "commit": "ef94f78b2c4e4fcf1a59d492637cbc84396cb032", - "sha256": "0xf2nvwvag21ds566r90rlf98hf80mz3zj2svhwmqrj6nm70p6z3" + "commit": "46c8a7c71275ced2c662c1222d4b85319f80dd83", + "sha256": "15qxs91inbpr9qk2xlaijargkvj9c6rmw0m4b05qrqni0cgb75dk" } }, { @@ -111115,11 +111347,11 @@ "repo": "xahlee/xah-css-mode", "unstable": { "version": [ - 20201229, - 837 + 20210627, + 505 ], - "commit": "5d9db23bbb982c28cbcf351957ef96ecd80e4c0b", - "sha256": "0f1dwl1nljxw94g6jkqv7rsyxnr9na0xxj447jhmsjyd3iry3g7n" + "commit": "62b7162198ca6659e025feb058e5662c55333ad4", + "sha256": "0xk5wa209pgc2sfz0j4dac57apy45si87628bqc21fnf877ga8qv" } }, { @@ -111130,11 +111362,11 @@ "repo": "xahlee/xah-elisp-mode", "unstable": { "version": [ - 20210208, - 2056 + 20210627, + 508 ], - "commit": "3ae341944297d59bf33f5580364af2858198781e", - "sha256": "09w44nmxdvc7pxyz959qj59dfqxplj22qqdal7206bb12r1l88zr" + "commit": "86ddb3ce73bb2a844a126e42386571ca8e884260", + "sha256": "1ks43xdfv287n3sy8n25widkwwx388pm3b8p4r2ld6qz200wqjdq" } }, { @@ -111145,11 +111377,11 @@ "repo": "xahlee/xah-find", "unstable": { "version": [ - 20210111, - 334 + 20210624, + 327 ], - "commit": "8948fa8f18023868731a1666f9893abc08f370e1", - "sha256": "1qk1scf085fc650km5hx2fp2chxj1a2hwp4bffxmp59mg78qpb71" + "commit": "16b8d62ddb1d5548fcd78a0371481434390ebd54", + "sha256": "10scxxxg84b38rjlmk0r486r7b1nvla57yq6v1h1ymlbp0addvby" } }, { @@ -111160,11 +111392,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20210520, - 540 + 20210701, + 145 ], - "commit": "3022cbf1e0b16c4fe632d03bd49832afac12510c", - "sha256": "0bv9r4kak8gjwcvws1vygdr9ppfyi9m34y5a5alm606y8qmzjxs6" + "commit": "6465e77d57a30a0a82ca4f4756593207b2ada510", + "sha256": "1bzlpwxkjmzgypagdp9qj4jf6crm3yhjnr98ipr1f49dl8178j6s" } }, { @@ -111356,8 +111588,8 @@ "repo": "dandavison/xenops", "unstable": { "version": [ - 20210504, - 1106 + 20210630, + 740 ], "deps": [ "aio", @@ -111367,8 +111599,8 @@ "f", "s" ], - "commit": "4994ae4a660ee94d341ce1905c12b4cf39fee574", - "sha256": "0cqvz8bkpjc4fmdn10zq70q3bvixx25yn13ihxygsdi1mjmn30fh" + "commit": "95b0b37cf5bb6474f054056b0dad9402c700c5b7", + "sha256": "09xiabicada3ziyinlc9fczcdy2nr01fn3fqlq1vpjzb5882k63l" } }, { @@ -111670,10 +111902,10 @@ }, { "ename": "xresources-theme", - "commit": "35763febad20f29320d459394f810668db6c3353", - "sha256": "1vsbvg9w5g6y2qlb8ssn12ax31r7fbslfi9vcgvmjydcr8r1z0zs", + "commit": "8ff729d95709a9e0f458e54dbdab4724ca3c09f3", + "sha256": "0n359mjv4j6n002v5bimas77y1507x1797qj6l1kcdwym8pk0rvg", "fetcher": "github", - "repo": "cqql/xresources-theme", + "repo": "martenlienen/xresources-theme", "unstable": { "version": [ 20190108, @@ -111960,20 +112192,20 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20210604, - 1500 + 20210625, + 528 ], - "commit": "5b352258f50ec9d2e7ff8bd16323a24fb484b52b", - "sha256": "1zaj7w0jfzz7iwsnd8ql3pxgiw108dx0ggk2q5rqxdz5902hksqs" + "commit": "69c699a15af342199d0dbbbe7676a85487781ae7", + "sha256": "1j1yqpnpn5k17jnrax56and4yss1bimxck3zigbgy5fpng89l8sb" }, "stable": { "version": [ 0, 3, - 2 + 3 ], - "commit": "5b352258f50ec9d2e7ff8bd16323a24fb484b52b", - "sha256": "1zaj7w0jfzz7iwsnd8ql3pxgiw108dx0ggk2q5rqxdz5902hksqs" + "commit": "9382bf5a3b1cad1c404bfd13fab8cf6688fe8442", + "sha256": "0xm6c4lk62ifwpc03wmn6602r1izfbk9kpyv3wg3p8ksxllvd0ns" } }, { @@ -112095,11 +112327,11 @@ "repo": "Kungsgeten/yankpad", "unstable": { "version": [ - 20210205, - 1318 + 20210625, + 1951 ], - "commit": "fb9cb7753af971701dcd96a51efb4d70e2b2a18f", - "sha256": "1xaal77cqics6fdm51j7pm12k61v0qxg68krgb7yi1fd90fm2iy3" + "commit": "6f5c7e5171030663ebda4f1f872c30d0e165b6b7", + "sha256": "08f5qn1dsikv9dkdvdrb8mmjb3himlnh9bcany2w4pj0apgcwn4d" }, "stable": { "version": [ @@ -112218,11 +112450,11 @@ "repo": "emacsorphanage/yascroll", "unstable": { "version": [ - 20210427, - 645 + 20210625, + 803 ], - "commit": "bd20a61ab7cd610625137c051c7f15e7404b7829", - "sha256": "0mxl8qxj9vdr8cg9xkh2v901n8m1drk0wzf4di34vkgkmrlkigyg" + "commit": "0ddf70ec214e2b1fade0594ec44c55adb48c06da", + "sha256": "1mkk07j3bayzprimiq95blbyj7idl01p6jv43hh226r427c89bcs" }, "stable": { "version": [ @@ -112348,11 +112580,11 @@ "url": "https://www.yatex.org/hgrepos/yatex", "unstable": { "version": [ - 20200208, - 931 + 20210630, + 2200 ], - "commit": "f4c2dca86202c2da5b4f0f6ec97c49dd1cb01e6c", - "sha256": "1dh4i2dj2cfg693bvwdi4frmi2892h4q25xdacdm63c7fmn3ap6l" + "commit": "d4831b3672f87affbb0f7f69135e7824d0bd325b", + "sha256": "0fga8zicxgmfw4px2zwfvwycl9hcqcwnf65izrbrj6rrljdbb3yv" } }, { @@ -112581,11 +112813,11 @@ "repo": "ryuslash/yoshi-theme", "unstable": { "version": [ - 20210509, - 520 + 20210623, + 544 ], - "commit": "9a26f361083ed1d0dd56e659fae913ffea51c739", - "sha256": "1da39wyb8zhpyvqxld19cna0jdjhpdiwsmac6ari7nw8i8dvbbhw" + "commit": "4aa2a0d0c3e3b7c408d680df8cc5ede53c18e923", + "sha256": "0psb3ff0f0wia7vmxqhframl8vnyzk6xx3dmv1g1j7b0njk259ij" }, "stable": { "version": [ @@ -113121,14 +113353,14 @@ "repo": "nnicandro/emacs-zmq", "unstable": { "version": [ - 20210424, - 1943 + 20210613, + 343 ], "deps": [ "cl-lib" ], - "commit": "790033363cf0e78c616cfe117a2f681381e96f29", - "sha256": "0vssi5d02s7f9rhsgqnbh4ql2nvjcc4hsrmihwrk1ij50pn927yj" + "commit": "38dc6c4119aee57666caf8f97c8a3d7f678823e0", + "sha256": "0j7szww8fi2pyvln1bppyq8nly0vkbncz63kzqhi1zx7dfz127ry" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/applications/editors/greenfoot/default.nix index 34f489bfba3e..962710be2f50 100644 --- a/pkgs/applications/editors/greenfoot/default.nix +++ b/pkgs/applications/editors/greenfoot/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "greenfoot"; - version = "3.6.1"; + version = "3.7.0"; src = fetchurl { # We use the deb here. First instinct might be to go for the "generic" JAR # download, but that is actually a graphical installer that is much harder # to unpack than the deb. url = "https://www.greenfoot.org/download/files/Greenfoot-linux-${builtins.replaceStrings ["."] [""] version}.deb"; - sha256 = "112h6plpclj8kbv093m4pcczljhpd8d47d7a2am1yfgbyckx6hf0"; + sha256 = "sha256-K9faU3ZarcR4g8riHpoZYVH0sXtueqfm3Fo+sZAHJA8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 38ea3054a60d..b962ab6e22be 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -255,12 +255,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1znb4m7sv7xqi1mq3yw0m51m06wfwmhhxmvck0xkv8s0cfg18qim"; /* updated by script */ + sha256 = "0lhi3vwhwb359va4sa17y071i03l4mfwqpsp7haqxjf900dcld7d"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -268,12 +268,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "Up and Coming Go IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0g20r7yn4r2h08wv3i8bnnma8x4jljixsbmfml8kixk0pzfhv4px"; /* updated by script */ + sha256 = "0xy9k90v3kcm9sj48l809qn0vws4ygsxxyqwsg6y9a3r1raqgqxd"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -281,12 +281,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "03i5f6p0abr9yfs9fg90fg7hb1a7zar9q4d4iiag30cmndwpslg2"; /* updated by script */ + sha256 = "1phpfa9i3k7g92ankmibp53c1469ifnb12g6s8gklln7v7xxakmi"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -294,12 +294,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "0mw4acaik1bkr7gqbwgs3i8f8px8zw95hm1zxgd5gd5kh88n17x5"; /* updated by script */ + sha256 = "13c7a96zbw05w1gy4ds4wzac853hdlnbflww2xaz60jnr1k24gnp"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -320,12 +320,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2021.1.3"; /* updated by script */ + version = "2021.1.4"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "05hjv1nz1b82bkakadjvsy23v0qv8fyni6h31lcg9198h1890f7v"; /* updated by script */ + sha256 = "0p9a8l2bpjm25x4af1hlqhmw5xsirsfajznd6y723yqmjy8hs46l"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -333,12 +333,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "PyCharm Community Edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0sp7w1xrl0y36dai08kqfd0jk06yr7jdbaf1a9f3fgxp5pmspxp1"; /* updated by script */ + sha256 = "0c03grsrjydb6jcnbq1qi4158c14vni3znr7vysnbvldi8al6w8m"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -346,12 +346,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "PyCharm Professional Edition"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0ny7rbl8g5azpqnlcq8l6bwh6hrp8rgp06lf4a8gdr9rpvw9xsqb"; /* updated by script */ + sha256 = "01nwc9nprlyrwyij98px915w66g6vxbznsmmmg56rv3rvjvjp7yl"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl index cd3d2193a283..abb4e5f72236 100755 --- a/pkgs/applications/editors/jetbrains/update.pl +++ b/pkgs/applications/editors/jetbrains/update.pl @@ -14,7 +14,7 @@ sub semantic_less { } sub get_latest_versions { - my @channels = get("http://www.jetbrains.com/updates/updates.xml") =~ /(<channel .+?<\/channel>)/gs; + my @channels = get("https://www.jetbrains.com/updates/updates.xml") =~ /(<channel .+?<\/channel>)/gs; my %h = {}; for my $ch (@channels) { my ($id) = $ch =~ /^<channel id="[^"]+" name="([^"]+)"/; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 1b4835064f96..bfa7e8e2009d 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -2,6 +2,7 @@ , libuv, lua, ncurses, pkg-config , unibilium, xsel, gperf , libvterm-neovim +, tree-sitter , glibcLocales ? null, procps ? null # now defaults to false because some tests can be flaky (clipboard etc) @@ -31,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.4.4"; + version = "0.5.0"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m"; + sha256 = "0lgbf90sbachdag1zm9pmnlbn35964l3khs27qy4462qzpqyi9fi"; }; patches = [ @@ -58,6 +59,7 @@ in msgpack ncurses neovimLuaEnv + tree-sitter unibilium ] ++ optional stdenv.isDarwin libiconv ++ optionals doCheck [ glibcLocales procps ] @@ -96,6 +98,7 @@ in "-DGPERF_PRG=${gperf}/bin/gperf" "-DLUA_PRG=${neovimLuaEnv.interpreter}" "-DLIBLUV_LIBRARY=${luvpath}" + "-DUSE_BUNDLED=OFF" ] ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted" ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON" diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 56a81f21febb..d9a4ed2a8948 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -10,6 +10,9 @@ # Attributes inherit from specific versions , version, src, meta, sourceRoot , executableName, longName, shortName, pname, updateScript +# sourceExecutableName is the name of the binary in the source archive, over +# which we have no control +, sourceExecutableName ? executableName }: let @@ -77,12 +80,12 @@ let '' + (if system == "x86_64-darwin" then '' mkdir -p "$out/Applications/${longName}.app" $out/bin cp -r ./* "$out/Applications/${longName}.app" - ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${executableName}" $out/bin/${executableName} + ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${sourceExecutableName}" $out/bin/${executableName} '' else '' mkdir -p $out/lib/vscode $out/bin cp -r ./* $out/lib/vscode - ln -s $out/lib/vscode/bin/${executableName} $out/bin + ln -s $out/lib/vscode/bin/${sourceExecutableName} $out/bin/${executableName} mkdir -p $out/share/applications ln -s $desktopItem/share/applications/${executableName}.desktop $out/share/applications/${executableName}.desktop diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 1a4b3e6c0616..85804f3bf2fc 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -25,6 +25,7 @@ in version = "1.57.1"; pname = "vscode"; + sourceExecutableName = "code"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; shortName = "Code" + lib.optionalString isInsiders " - Insiders"; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 585f62178611..ef307ce3460b 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "0.99.37"; + version = "0.99.38"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "1a2scwjrjijxwyfpqih23zzay3yqhyzpxnp66388fcir1cmp8zih"; + sha256 = "sha256-04MRw6pMtJGxTMKwOzPNGg1T85SfVY5bMkF3gt2V0e0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/flavours/default.nix b/pkgs/applications/misc/flavours/default.nix index fcedf65af713..94fc91dfdb9c 100644 --- a/pkgs/applications/misc/flavours/default.nix +++ b/pkgs/applications/misc/flavours/default.nix @@ -1,20 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "flavours"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Misterio77"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rDy859jg+F8XC4sJogIgdn1FoT8cf7S+KORt+7kboAc="; + sha256 = "1bgi6p7l0bh9k4vkwvngk7q19ynia0z1ninb1cq8qnwwpll6kbya"; }; - buildInputs = [ ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - cargoSha256 = "sha256-I8ZH35L2CVLy6ypmdOPd8VEG/sQeGaHyT1HWNdwyZVo="; + cargoSha256 = "07hwxhfcbqbwb3hz18w92h1lhdiwwy7abhwpimzx7syyavp4rmn4"; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd flavours \ + --zsh <($out/bin/flavours --completions zsh) \ + --fish <($out/bin/flavours --completions fish) \ + --bash <($out/bin/flavours --completions bash) + ''; meta = with lib; { description = "An easy to use base16 scheme manager/builder that integrates with any workflow"; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index bb925ceb2fbf..c2e55be11349 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.84.2"; + version = "0.84.3"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NE4vXtczzcL5f0/aDYeGnleBwsDBTzojSaek/LzowFo="; + sha256 = "sha256-3SbF4JsanNup0JmtEoZlyu3SvMn01r+nhnPgIi/W8pA="; }; vendorSha256 = "sha256-ImXTOtN6kQL7Q8IBlmK7+i47cWtyZT0xcnQdCw3NvWM="; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 0c0dae0da42e..750043d4a9e3 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -44,6 +44,7 @@ let inherit version; sha256 = "63509b41d158ae5b7f67eb4ad20fecbb4eee99434e73e140354dc3ff8e09716f"; }; + propagatedBuildInputs = [ self.six ]; } ); } diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix index 47412c78f4e6..23fddf3b7ed6 100644 --- a/pkgs/applications/misc/reddsaver/default.nix +++ b/pkgs/applications/misc/reddsaver/default.nix @@ -8,22 +8,22 @@ rustPlatform.buildRustPackage rec { pname = "reddsaver"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "manojkarthick"; repo = "reddsaver"; rev = "v${version}"; - sha256 = "0ffci3as50f55n1v36hji4n0b3lkch5ylc75awjz65jz2gd2y2j4"; + sha256 = "1czsy1bb0ja650sndwzq9rcbbhcci7s7ablw0agaynhi403shavv"; }; - cargoSha256 = "1xf26ldgfinzpakcp65w52fdl3arsm053vfnq7gk2fwnq55cjwl0"; + cargoSha256 = "0wr6y7mfffaqdh6i5nqhx692dih159121sm6k0i37wcdvxhvd51z"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - # package does not contain tests as of v0.3.2 + # package does not contain tests as of v0.3.3 docCheck = false; meta = with lib; { diff --git a/pkgs/applications/misc/seatd/default.nix b/pkgs/applications/misc/seatd/default.nix index e07356d0c334..98f278e0c3a7 100644 --- a/pkgs/applications/misc/seatd/default.nix +++ b/pkgs/applications/misc/seatd/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "man" ]; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ systemd ]; diff --git a/pkgs/applications/misc/slides/default.nix b/pkgs/applications/misc/slides/default.nix index 4eb0981d81f1..1d1aed3c9260 100644 --- a/pkgs/applications/misc/slides/default.nix +++ b/pkgs/applications/misc/slides/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "slides"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "maaslalani"; repo = "slides"; rev = "v${version}"; - sha256 = "00sml6b9q3df9dgl7fpsn6a3qkq6xklnbfvvblf91xdf4ssn7wrx"; + sha256 = "15f4sn1zsqqhzxnmwb1igh8xhka6li31ygdqgbjvxzm93lkarxvs"; }; checkInputs = [ diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 3994541f48b1..4901eda54aa6 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tut"; - version = "0.0.17"; + version = "0.0.20"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "0g4kbprsdjk2lbx81azdvz8kkhyk370id3622xxssr894v0i7iwj"; + sha256 = "03jiv5m807z96796fbpi6ny22am3sq4jfni37fxbld05sxdzwcnd"; }; - vendorSha256 = "1kf7ynmxrzvhl028b4nbz9h9v9x5srarsbynpgpp4vicmxqlvrmh"; + vendorSha256 = "1in5b7ixnm5iizkzziqclvgaq87ccdh507amkgfhfy5sxsgbfb1g"; meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index e8664690df29..18565f31a2fb 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -175,18 +175,6 @@ let sha256 = "1bxdhxmiy6h4acq26lq43x2mxx6rawmfmlgsh5j7w8kyhkw5af0c"; revert = true; }) - # To fix build errors with the older system FFmpeg: - (githubPatch { - # unbundle: add libavcodec/packet.h to shim headers - commit = "e4d228ec30607b06bf3fed77497abef89c29966a"; - sha256 = "02jg2bdmgjcpmk6alb72jc93wy3nf2fpa72hb4aarq337i2mwn4v"; - }) - (githubPatch { - # Roll src/third_party/ffmpeg/ 7e1d53a09..cf7ee6598 (1000 commits) - commit = "3ec3b2992238d4b4764f99f04605e154688c7990"; - sha256 = "1fwb154s5qcis490rvcvm14zrmaj59g5lg9zg8ada36vw9hycbrf"; - revert = true; - }) ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index bca947df473b..863510ded66c 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "92.0.4515.70", - "sha256": "06yhpxr5bg0gx7hmrhc6zg4gr1d9s34y2rb98rpl4dilmc548i6q", - "sha256bin64": "1fkakh1r87pg5nr101m6v86y8iyyfba8vnzrg0229kcar7v8wzf7", + "version": "92.0.4515.80", + "sha256": "142v8y275mysgksvfprc83a7r1dlcnb5rqi8a451fmfnj6wrsq8i", + "sha256bin64": "0sz2fvg6l7q7syc5pysa246p03sganmgjdfvind42i8cqxw8gycp", "deps": { "gn": { "version": "2021-05-07", @@ -31,15 +31,15 @@ } }, "dev": { - "version": "93.0.4549.3", - "sha256": "0bkr67n1d75ayd1d9sa57c99j85r83gadzfs8iw7kwiha9g0mjgp", - "sha256bin64": "1hac6m668nrdzvfqx3vyc74pnx8lf973m1jxnm3cfy83g7wynphz", + "version": "93.0.4557.4", + "sha256": "06397k5mkrrdrmd7icyvd1ifnmhincgw5nskgc3m436qzzifsab9", + "sha256bin64": "1q2c2dhx1yya6vhr82asf7h2zrv6kjzjv1a0zlfxkp3i6lnivgrd", "deps": { "gn": { - "version": "2021-06-18", + "version": "2021-06-25", "url": "https://gn.googlesource.com/gn", - "rev": "170c2dba1e0c0299fe8c6a441caf2f2352a42ae0", - "sha256": "1ylx8a5fxq7aciqs0mx7fld763sqkqn39lb9k951w6gksm15lrn3" + "rev": "4d207c94eab41f09c9a8505eb47f3d2919e47943", + "sha256": "1jfgksa7rifh3ynnmd7m8xxggwxckz0jnwjaq9m5xapksb89hbn1" } } }, diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 272228878735..a49879e53528 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.0.8"; + version = "3.1.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-TOPJvOQKEMEsQ/wAJNF+08g4z75GGkNom6gRCrNOO2I="; + sha256 = "sha256-WErNPofVnV6L7DkYU/dh4mWm+u7UJNFUmRN6IZzMb2g="; }; - vendorSha256 = "sha256-YjVAoMyGKMHLGEPeOOkCKCzeWFiUsXfJIKcw5GYoljg="; + vendorSha256 = "sha256-99N//woGPx9QEtkFsktaiAbu7TS+3DHArBA52OUJFU4="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index 4d7e170c2018..ec3f21c69d15 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "helm-secrets"; - version = "3.7.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "jkroepke"; repo = pname; rev = "v${version}"; - hash = "sha256-AM+TLeSrXjn10DiQzXSqSwTqsc7CjTdnf6TWetden7g="; + hash = "sha256-UZu3jChEK59UrtUR2ze68Kkc6MkHRtTsfTOS/B96sLM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index cb2ca48b9077..b2788f8b0701 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.24.11"; + version = "0.24.12"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-UWY4r7pasFsmlRRKFANyxPIoNNuMPNg1gMXrAXEcqdw="; + sha256 = "sha256-GuN+OAzuNus1B32ZSsnrJPrE7MQ0ZqNKDmoNe7Sa7Zs="; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - vendorSha256 = "sha256-EEN3nKQBtAGG7MAa9h11KFPZ9g7xtNxhFB1i/2QS66g="; + vendorSha256 = "sha256-JBWQxRaMvIbUiOD7sJiZH1SHNCdysgh5FeSmYf+FdG4="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 962647993447..09851e67ab56 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -4,16 +4,18 @@ let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in buildGoModule rec { pname = "stern"; - version = "1.14.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-8l/Tr+IxR3yPmt9hI70XuUQ4YEYzRTMLbo8BsngoU60="; + sha256 = "sha256-jgmURvc1did3YgtqWlAzFbWxc3jHHylOfCVOLeAC7V8="; }; - vendorSha256 = "sha256-pvFT4A7bDBvBf1odyv3z4inw1/IsvOA+++OPbfNjzxM="; + vendorSha256 = "sha256-p8WoFDwABXcO54WKP5bszoht2JdjHlRJjbG8cMyNo6A="; + + subPackages = [ "." ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index d4332c0265c5..7f0127c28fd8 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -4,7 +4,6 @@ , xorg, libXdmcp, libxkbcommon , libnotify, libsoup, libgee , librsvg, libsignal-protocol-c -, fetchpatch , libgcrypt , epoxy , at-spi2-core diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 2189d1b0ba21..a9de901cd870 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -28,7 +28,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.6.2"; # Please backport all updates to the stable channel. + version = "5.7.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0cdzww741l4s95n5gq5zx5l3zvxinxbqa9y6wf8wjq7rzn6bwqx3"; + sha256 = "1hjykjqf3n20aab9g3bwk5w8x8v61320xv6z4iqrwwdzfkb3ly20"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/irc/kirc/default.nix b/pkgs/applications/networking/irc/kirc/default.nix new file mode 100644 index 000000000000..c4f63613fc57 --- /dev/null +++ b/pkgs/applications/networking/irc/kirc/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "kirc"; + version = "0.2.7"; + + src = fetchFromGitHub { + owner = "mcpcpc"; + repo = pname; + rev = version; + hash = "sha256-iaqj4xB15DB3w/RaiCOMdAu8eONhTw1Dz0j5kykAHV4="; + }; + + dontConfigure = true; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with lib; { + homepage = "http://kirc.io/"; + description = "Tiny IRC client written in C99"; + longDescription = '' + kirc is a tiny open-source Internet Relay Chat (IRC) client designed with + usability and cross-platform compatibility in mind. + + It features: + - No dependencies other than a C99 compiler. + - Simple Authentication and Security Layer (SASL) procotol support. + - Client-to-client (CTCP) protocol support. + - Transport Layer Security (TLS) protocol support (via external + utilities). + - Simple chat history logging. + - Asynchronous message handling. + - Multi-channel joining at server connection. + - Full support for all RFC 2812 commands. + - Easy customized color scheme definition. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix index 1042c2d1dee3..1a975d2229db 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -20,4 +20,6 @@ weechat-autosort = callPackage ./weechat-autosort { }; weechat-otr = callPackage ./weechat-otr { }; + + weechat-go = callPackage ./weechat-go { }; } diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-go/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-go/default.nix new file mode 100644 index 000000000000..623b2570b475 --- /dev/null +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-go/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl, weechat }: + +stdenv.mkDerivation { + pname = "weechat-go"; + version = "2.7"; + + src = fetchurl { + url = "https://github.com/weechat/scripts/raw/414cff3ee605ba204b607742430a21443c035b08/python/go.py"; + sha256 = "0bnbfpj1qg4yzwbikh1aw5ajc8l44lkb0y0m6mz8grpf5bxk5cwm"; + }; + + dontUnpack = true; + + passthru.scripts = [ "go.py" ]; + + installPhase = '' + install -D $src $out/share/go.py + ''; + + meta = with lib; { + inherit (weechat.meta) platforms; + description = "go.py is a weechat script to quickly jump to different buffers"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ govanify ]; + }; +} diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index e0c5b50be0f3..d93fea1f702a 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -63,7 +63,7 @@ let description = "Low-latency, high quality voice chat software"; homepage = "https://mumble.info"; license = licenses.bsd3; - maintainers = with maintainers; [ petabyteboy infinisil ]; + maintainers = with maintainers; [ petabyteboy infinisil felixsinger ]; platforms = platforms.linux; }; }); diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 6b73f03531d0..f17d1fa3ae7e 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,27 +1,18 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake, qtbase, qttools +{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, qtbase, qttools , seafile-shared, jansson, libsearpc , withShibboleth ? true, qtwebengine }: mkDerivation rec { pname = "seafile-client"; - version = "8.0.1"; + version = "8.0.3"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; - rev = "b4b944921c7efef13a93d693c45c997943899dec"; - sha256 = "2vV+6ZXjVg81JVLfWeD0UK+RdmpBxBU2Ozx790WFSyw="; + rev = "v${version}"; + sha256 = "lhdKbR19ScNeezICf7vwZaeJikPjwbqrz42bo4lhxJs="; }; - patches = [ - # Fix compilation failure with "error: template with C linkage", fixes #122505 - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_build_with_glib2.diff?h=seafile-client&id=7be253aaa2bdb6771721f45aa08bc875c8001c5a"; - name = "fix_build_with_glib2.diff"; - sha256 = "0hl7rcqfr8k62c1pr133bp3j63b905izaaggmgvr1af4jibal05v"; - }) - ]; - nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ qtbase qttools seafile-shared jansson libsearpc ] ++ lib.optional withShibboleth qtwebengine; diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 522cef2b8a79..36518db09917 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.50"; + version = "2.56"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-ai8/XryFw/7GYuWAmLkqHzK97QgTBPyE6m3dflck94w="; + sha256 = "1y9abk2i0qk5c00dnw8wvasy7dmmy6az8d1cf9bq0dwh8g8kylbn"; }; - vendorSha256 = "sha256-gJQDcACMWZWS4CgS2NDALoBzxu7Hh4ZW3f0gUFUALCM="; + vendorSha256 = "015qvd0h786z1iwv81i107z92mqhzldp1hkcsp75wzf4j7nmzxvf"; subPackages = [ "weed" ]; diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 7ecb8936a690..aa5175fca9ed 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "0fgkjv7p2p0k58ifs77qfy0ni2yhrmk8rqyysjxq0im6j3f3az11"; + sha256 = "02ka7acynkwkml2pavlv4j5vkm6x5aq5sfxgydv26qzs39f1wdgc"; }; modRoot = "./agent"; - vendorSha256 = "1avl5xvav9y2vni5w3ksvrcz67x2kkadqw9p1cfq5rkjny1c2jrg"; + vendorSha256 = "18z3vwcwkyj6hcvl35qmj034237h9l18dvcbx1hxry7qdwv807c9"; buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ]; diff --git a/pkgs/applications/office/timedoctor/default.nix b/pkgs/applications/office/timedoctor/default.nix index f4ce436e963b..e6d3186578a4 100644 --- a/pkgs/applications/office/timedoctor/default.nix +++ b/pkgs/applications/office/timedoctor/default.nix @@ -15,7 +15,7 @@ appimageTools.wrapType2 { url = "https://repo2.timedoctor.com/td-desktop-hybrid/prod/v${version}/timedoctor-desktop_${version}_linux-x86_64.AppImage"; }; multiPkgs = _: with _; [ - alsaLib + alsa-lib atk at-spi2-atk at-spi2-core diff --git a/pkgs/applications/radio/soapyairspy/default.nix b/pkgs/applications/radio/soapyairspy/default.nix index 0541c3abf914..7e8a09d67b98 100644 --- a/pkgs/applications/radio/soapyairspy/default.nix +++ b/pkgs/applications/radio/soapyairspy/default.nix @@ -2,18 +2,15 @@ , airspy, soapysdr } : -let - version = "0.1.2"; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "soapyairspy"; - inherit version; + version = "0.2.0"; src = fetchFromGitHub { owner = "pothosware"; repo = "SoapyAirspy"; rev = "soapy-airspy-${version}"; - sha256 = "061r77vs6ywxbxfif12y6v5xkz6gcvbz9k060q12vmdh6sisdwk2"; + sha256 = "0g23yybnmq0pg2m8m7dbhif8lw0hdsmnnjym93fdyxfk5iln7fsc"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index ea8c8fad1068..ccd4b8799cef 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -8,7 +8,7 @@ let - version = "0.7.2"; + version = "0.8.0"; modulesVersion = with lib; versions.major version + "." + versions.minor version; modulesPath = "lib/SoapySDR/modules" + modulesVersion; extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages; @@ -21,7 +21,7 @@ in stdenv.mkDerivation { owner = "pothosware"; repo = "SoapySDR"; rev = "soapy-sdr-${version}"; - sha256 = "102wnpjxrwba20pzdh1vvx0yg1h8vqd8z914idxflg9p14r6v5am"; + sha256 = "1dy25zxk7wmg7ik82dx7h3bbbynvalbz1dxsl7kgm3374yxhnixv"; }; nativeBuildInputs = [ cmake makeWrapper pkg-config ]; diff --git a/pkgs/applications/science/astronomy/phd2/default.nix b/pkgs/applications/science/astronomy/phd2/default.nix index 0e0ad06bbe9f..543e6820a763 100644 --- a/pkgs/applications/science/astronomy/phd2/default.nix +++ b/pkgs/applications/science/astronomy/phd2/default.nix @@ -1,19 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, wxGTK30-gtk3, - curl, gettext, glib, indi-full, libnova, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, wxGTK30-gtk3 +, curl, gettext, glib, indi-full, libnova, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "phd2"; - version = "2.6.9dev1"; + version = "2.6.10"; src = fetchFromGitHub { owner = "OpenPHDGuiding"; repo = "phd2"; rev = "v${version}"; - sha256 = "1ih7m9lilh12xbhmwm9kkicaqy72mi3firl6df7m5x38n2zj3zm4"; + sha256 = "sha256-2ZiPjhlguWXFcC53xG1aqAode7twtoHWszFUMQkK5xU="; }; - nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; - buildInputs = [ gtk3 wxGTK30-gtk3 curl gettext glib indi-full libnova ]; + nativeBuildInputs = [ + cmake + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + wxGTK30-gtk3 + curl + gettext + glib + indi-full + libnova + ]; cmakeFlags = [ "-DOPENSOURCE_ONLY=1" @@ -27,8 +40,9 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://openphdguiding.org/"; description = "Telescope auto-guidance application"; + changelog = "https://github.com/OpenPHDGuiding/phd2/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ hjones2199 ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index c645693e19a1..92606f3f909c 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.41"; + version = "14.31.42"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-dI1WkQgFikxaIjjqVKZcsGvc3QIu/NMIcRW3N8PGbkY="; + sha256 = "sha256-q81dUSxrKT3nzX0bFclolsyguQxXKlsiX9GCwEvOpAw="; }; patchPhase = '' diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index af5441f07e21..b539df7592a5 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.109"; + version = "3.3.110"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "sha256-NUYezNm4tEcMqnirmo8U7Ky8ye/2MDPY3OWAk+eG3rc="; + sha256 = "sha256-Ku25IVa8ot3SWxODeMrOaxBY5X022TnvD3l2kAa3Wao="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 69753fcef2d0..b5c66289c9d3 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -130,7 +130,7 @@ self = stdenv.mkDerivation { (if versionAtLeast "8.10" then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme wrapGAppsHook ] else [ ocamlPackages.lablgtk ]) - ++ optional (versionAtLeast "8.14") [ ocamlPackages.dune_2 ] + ++ optional (versionAtLeast "8.14") ocamlPackages.dune_2 ; postPatch = '' diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index 569c455e6532..8427249c4ce9 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation { ''; homepage = "http://hol.sourceforge.net/"; license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ mudri ]; }; } diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 214f4e218fd3..ea2cd356e315 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.30.0"; + version = "3.31.0"; src = fetchFromGitHub { owner = "leanprover-community"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # from. this is then used to check whether an olean file should be # rebuilt. don't use a tag as rev because this will get replaced into # src/githash.h.in in preConfigure. - rev = "a5822ea47ebc52eec6323d8f1b60f6ec025daf99"; - sha256 = "sha256-gJhbkl19iilNyfCt2TfPmghYA3yCjg6kS+yk/x/k14Y="; + rev = "333783350cd3fe38f25fed1da7d6a433d8f85b77"; + sha256 = "sha256-N8Ju7pSGssvt84/0e1o6G/p7fWM1c0Mzw+ftL1/++J4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index defe218b119e..ef2d97ef6bfc 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -1,5 +1,5 @@ { lib, fetchzip, makeWrapper, makeDesktopItem, stdenv -, gtk3, libXtst, glib, zlib +, gtk3, libXtst, glib, zlib, wrapGAppsHook }: let @@ -25,7 +25,11 @@ in stdenv.mkDerivation rec { sha256 = "02a2y2mkfab5cczw8g604m61h4xr0apir49zbd1aq6mmgcgngw80"; }; - nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ gtk3 ]; + + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + + dontWrapGApps = true; phases = [ "installPhase" ]; @@ -36,6 +40,9 @@ in stdenv.mkDerivation rec { cp -r "$src" "$out/toolbox" chmod -R +w "$out/toolbox" + fixupPhase + gappsWrapperArgsHook + patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/toolbox/toolbox" @@ -52,7 +59,8 @@ in stdenv.mkDerivation rec { makeWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \ --run "set -x; cd $out/toolbox" \ --add-flags "-data ~/.tla-toolbox" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3 libXtst glib zlib ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3 libXtst glib zlib ]}" \ + "''${gappsWrapperArgs[@]}" echo -e "\nCreating TLA Toolbox icons..." pushd "$src" diff --git a/pkgs/applications/science/math/sage/patches/sphinx-3.5-code-output.patch b/pkgs/applications/science/math/sage/patches/sphinx-3.5-code-output.patch deleted file mode 100644 index f17897d4c89f..000000000000 --- a/pkgs/applications/science/math/sage/patches/sphinx-3.5-code-output.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py -index 6bad826a88..f4d7b8651c 100644 ---- a/src/sage/misc/sagedoc.py -+++ b/src/sage/misc/sagedoc.py -@@ -24,7 +24,7 @@ see :trac:`12849`:: - ....: for line in fobj: - ....: if "#sage.symbolic.expression.Expression.numerical_approx" in line: - ....: print(line) -- <code class="sig-name descname">numerical_approx</code><span class="sig-paren">(</span><em class="sig-param"><span class="n">prec</span><span class="o">=</span><span class="default_value">None</span></em>, <em class="sig-param"><span class="n">digits</span><span class="o">=</span><span class="default_value">None</span></em>, <em class="sig-param"><span class="n">algorithm</span><span class="o">=</span><span class="default_value">None</span></em><span class="sig-paren">)</span>... -+ <code class="sig-name descname"><span class="pre">numerical_approx</span></code><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">prec</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">digits</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">algorithm</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em><span class="sig-paren">)</span>... - - Check that sphinx is not imported at Sage start-up:: - diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 57234c660a5a..1ed174ebd460 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -16,7 +16,12 @@ let fetchSageDiff = { base, name, rev, sha256, ...}@args: ( fetchpatch ({ inherit name sha256; - url = "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}"; + + # We used to use + # "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}" + # but the former way does not squash multiple patches together. + url = "https://github.com/sagemath/sage/compare/${base}...${rev}.diff"; + # We don't care about sage's own build system (which builds all its dependencies). # Exclude build system changes to avoid conflicts. excludes = [ "build/*" ]; @@ -79,13 +84,6 @@ stdenv.mkDerivation rec { # ignore a deprecation warning for usage of `cmp` in the attrs library in the doctests ./patches/ignore-cmp-deprecation.patch - # sphinx 3.5 pretty-prints code slightly differently than sphinx - # 3.1--3.3. a similar patch is available at the sphinx 4 ticket - # (https://trac.sagemath.org/ticket/31696), but sphinx 3.5 uses - # <code> tags while sphinx 4 uses <span> tags so we cannot just - # import the patch from trac. - ./patches/sphinx-3.5-code-output.patch - # remove use of matplotlib function deprecated in 3.4 # https://trac.sagemath.org/ticket/31827 (fetchSageDiff { @@ -95,16 +93,38 @@ stdenv.mkDerivation rec { sha256 = "sha256-SXcUGBMOoE9HpuBzgKC3P6cUmM5MiktXbe/7dVdrfWo="; }) - # https://trac.sagemath.org/ticket/30801. this patch has - # positive_review but has not been merged upstream yet, so we - # don't use fetchSageDiff because it returns a file that contains - # each commit as a separate patch instead of a single diff, and - # some commits from the pari update branch are already in 9.3.rc5 - # (auto-resolvable merge conflicts). - (fetchpatch { + # pari 2.13 update + # https://trac.sagemath.org/ticket/30801 + # + # the last commit in that ticket is + # c78b1470fccd915e2fa93f95f2fefba6220fb1f7, but commits after + # 10a4531721d2700fd717e2b3a1364508ffd971c3 only deal with 32-bit + # and post-26635 breakage, none of which is relevant to us. since + # there are post-9.4.beta0 rebases after that, we just skip later + # commits. + (fetchSageDiff { + base = "9.3"; name = "pari-2.13.1.patch"; - url = "https://github.com/sagemath/sagetrac-mirror/compare/d6c5cd9be78cc448ee4c54bac93385b1244a234c...10a4531721d2700fd717e2b3a1364508ffd971c3.diff"; - sha256 = "sha256-zMjRMEReoiTvmt+vvV0Ij1jtyLSLwSXBEVXqgvmq1D4="; + rev = "10a4531721d2700fd717e2b3a1364508ffd971c3"; + sha256 = "sha256-gffWKK9CMREaNOb5zb63iZUgON4FvsPrMQNqe+5ZU9E="; + }) + + # sympy 1.8 update + # https://trac.sagemath.org/ticket/31647 + (fetchSageDiff { + base = "9.4.beta0"; + name = "sympy-1.8.patch"; + rev = "fa864b36e15696450c36d54215b1e68183b29d25"; + sha256 = "sha256-fj/9QEZlVF0fw9NpWflkTuBSKpGjCE6b96ECBgdn77o="; + }) + + # sphinx 4 update + # https://trac.sagemath.org/ticket/31696 + (fetchSageDiff { + base = "9.4.beta3"; + name = "sphinx-4.patch"; + rev = "bc84af8c795b7da433d2000afc3626ee65ba28b8"; + sha256 = "sha256-5Kvs9jarC8xRIU1rdmvIWxQLC25ehiTLJpg5skh8WNM="; }) ]; diff --git a/pkgs/applications/science/robotics/emuflight-configurator/default.nix b/pkgs/applications/science/robotics/emuflight-configurator/default.nix index 2b89a00eb4bd..ab94df9ef18f 100644 --- a/pkgs/applications/science/robotics/emuflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/emuflight-configurator/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "emuflight-configurator"; - version = "0.3.5"; + version = "0.3.6"; src = fetchurl { url = "https://github.com/emuflight/EmuConfigurator/releases/download/${version}/emuflight-configurator_${version}_linux64.zip"; - sha256 = "d55bdc52cf93d58c728ccb296ef912a5fc0f42c57ed95f3ded5f85d1c10838c4"; + sha256 = "sha256-egSUd/+RNo0vr2EJibgk9nNnql5sHC11gctUMK+DzW0="; }; nativeBuildInputs = [ wrapGAppsHook unzip copyDesktopItems ]; diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index f69625e16cd0..4f8d6832eddd 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -26,7 +26,7 @@ }: let - version = "1.8.0"; + version = "1.8.1"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz"; - sha256 = "07irlhkvziv51cp5zn1yz8ljfnrnfjcykv5pgfwmpslw3nl5szxv"; + sha256 = "0yrz7n0wls8g8w7ja934icwxmng3sxh70x87qmzc9c9cb1wyd989"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 82b4fbd8a60b..16f87df678ca 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-b0pbcRcdfkHrqlALHcUzmVujkeKNFHdWd3ENPXZ5WYk="; + sha256 = "sha256-P9fbkJSXRYZdVD1EKWWs0FKs8aQdPqHWESUqjsGgyPU="; }; vendorSha256 = "sha256-ndsjmY/UCFyegm8yP7BopYMh5eZ8/fftWfxW4r5los0="; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index c84375cfece5..3623dbba6b8d 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.15.4"; + version = "2.16"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "1ayw2pz9falcsi528q63z3w7npzkk7y8z258danqh41j6q9871js"; + sha256 = "sha256-F36MuqgVkKM2RCIGEGJmL3/KpZy3eDRZ7WWUE15mTfU="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/video/obs-studio/0001-Use-FindLibobs.cmake.patch b/pkgs/applications/video/obs-studio/plugins/obs-move-transition-use-FindLibobs.cmake.patch index db7d5b4b31f4..bc082de0bd5e 100644 --- a/pkgs/applications/video/obs-studio/0001-Use-FindLibobs.cmake.patch +++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition-use-FindLibobs.cmake.patch @@ -18,6 +18,7 @@ index f6d8fa3..5f0657d 100644 + "${LIBOBS_INCLUDE_DIR}/../UI/obs-frontend-api") + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/version.h) + set(move-transition_HEADERS @@ -38,4 +49,10 @@ target_link_libraries(move-transition libobs) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index 90a0a56971a2..b1f3e680ef2a 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { cp ${obs-studio.src}/cmake/external/FindLibobs.cmake FindLibobs.cmake ''; - patches = [ ./0001-Use-FindLibobs.cmake.patch ]; + patches = [ ./obs-move-transition-use-FindLibobs.cmake.patch ]; postPatch = '' substituteInPlace move-source-filter.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>' diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index cc3d518ff884..b1c8f436884c 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -3,13 +3,9 @@ libsigcxx, libxmlxx, xdg-utils, isocodes, wrapGAppsHook }: -let - version = "0.54.0"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "subtitleeditor"; - inherit version; + version = "0.54.0"; src = fetchFromGitHub { owner = "kitone"; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index ed5976151301..6098aeba0514 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -24,11 +24,11 @@ with lib; stdenv.mkDerivation rec { pname = "${optionalString onlyLibVLC "lib"}vlc"; - version = "3.0.12"; + version = "3.0.16"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz"; - sha256 = "0ygqihw2c5vvzv8950dlf7rdwz1cpz1668jgyja604ljibrmix7g"; + sha256 = "sha256-/641/GT2JcF1Vx0jRrxfYge+mXYlF/FUI+dPGDmUEPY="; }; # VLC uses a *ton* of libraries for various pieces of functionality, many of diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index f6d7ce3d6196..cbd7d8e5512d 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "0.23"; + version = "0.24"; pname = "charliecloud"; src = fetchFromGitHub { owner = "hpc"; repo = "charliecloud"; rev = "v${version}"; - sha256 = "sha256-JQNidKqJROFVm+O1exTDon1fwU91zONqgKJIpe9gspY="; + sha256 = "sha256-kdaVlwE3vdCxsmJTOUwx8J+9UcBuXbKDwS2MHX2ZPPM="; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index 6fbcf1b28703..317c08c5d894 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -12,19 +12,20 @@ , pixman , udev , libevdev +, libinput , libX11 , libGL }: stdenv.mkDerivation rec { pname = "river"; - version = "unstable-2021-06-06"; + version = "unstable-2021-06-27"; src = fetchFromGitHub { owner = "ifreund"; repo = pname; - rev = "0e9dc089d14e2b5c923d483c62d342af29493cf0"; - sha256 = "sha256-2rIZYr9Y+IBrox5MVrPpHeI8OVSXHsMZmcCagsX56lU="; + rev = "39578db1344ca298f2bb2fe2278a35108d5f2b66"; + sha256 = "sha256-DQroN+FV7sq0PyczERZgnW73YKAVvj2JJQjfzidlBI8="; fetchSubmodules = true; }; @@ -38,6 +39,7 @@ stdenv.mkDerivation rec { pixman udev libevdev + libinput libX11 libGL ]; diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index 3622e1c3b3c7..9d0daf7182d5 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "5.000"; + version = "6.000"; in fetchzip rec { name = "gentium-${version}"; @@ -10,12 +10,20 @@ in fetchzip rec { postFetch = '' mkdir -p $out/share/{doc,fonts} unzip -l $downloadedFile - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*/FONTLOG.txt \*/GENTIUM-FAQ.txt \*/README.txt -d $out/share/doc/${name} - unzip -j $downloadedFile \*/documentation/\* -d $out/share/doc/${name}/documentation + unzip -j $downloadedFile \*.ttf \ + -d $out/share/fonts/truetype + unzip -j $downloadedFile \ + \*/FONTLOG.txt \ + \*/README.txt \ + -d $out/share/doc/${name} + unzip -j $downloadedFile \ + \*/documentation/\*.html \ + \*/documentation/\*.txt \ + -x \*/documentation/source/\* \ + -d $out/share/doc/${name}/documentation ''; - sha256 = "1qr2wjdmm93167b0w9cidlf3wwsyjx4838ja9jmm4jkyian5whhp"; + sha256 = "zhSpAYK3Lfzsx6Z1IA6aRFNNXdDGq/jWxsQ20c2HcxI="; meta = with lib; { homepage = "https://software.sil.org/gentium/"; diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 8a8cfa74d702..b44bcc923785 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "8005ce7c7ba90fa92db65f86c544623353a96cf8", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/8005ce7c7ba90fa92db65f86c544623353a96cf8.tar.gz", - "sha256": "1kzhh7h0csb0vh9avbjsm6hziaa3lbpmzp4pkij4s3bbl4l664aa", - "msg": "Update from Hackage at 2021-06-22T07:13:30Z" + "commit": "1567e96c400fcd62dfc0d9412881591d6e1e9f22", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/1567e96c400fcd62dfc0d9412881591d6e1e9f22.tar.gz", + "sha256": "04z26ypfp3nip2x6gwrv5k1lmckmmi03ry3z97syc72qqj59n9hq", + "msg": "Update from Hackage at 2021-06-26T12:56:56Z" } diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index 7797586f5abd..511cb6a1c092 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "bulky"; - version = "1.4"; + version = "1.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "bulky"; rev = version; - sha256 = "sha256-i6OmkZGgZpfp8G2T6CDFQmIG/0V36YFbWBR7MvDi6Ew="; + sha256 = "sha256-+3OoeuGuyiHWlUrxm5A7CmNR+ijxdlmecmvqk+i+h08="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix b/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix new file mode 100644 index 000000000000..3c7f99f7d3ac --- /dev/null +++ b/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix @@ -0,0 +1,29 @@ +{ mkXfceDerivation, lib, python3, intltool, gettext, + gtk3, libxfce4ui, libxfce4util, pango, harfbuzz, gdk-pixbuf, atk }: + +let + pythonEnv = python3.withPackages(ps: [ ps.pygobject3 ]); + makeTypelibPath = lib.makeSearchPathOutput "lib/girepository-1.0" "lib/girepository-1.0"; +in mkXfceDerivation { + category = "apps"; + pname = "xfce4-panel-profiles"; + version = "1.0.13"; + + sha256 = "sha256-B3Q5d3KBN5m8wY82CIbIugJC8nNS+OcgKchn+TGrDhc="; + + nativeBuildInputs = [ intltool gettext ]; + propagatedBuildInputs = [ pythonEnv ]; + + configurePhase = '' + ./configure --prefix=$out + ''; + + postFixup = '' + wrapProgram $out/bin/xfce4-panel-profiles \ + --set GI_TYPELIB_PATH ${makeTypelibPath [ gtk3 libxfce4ui libxfce4util pango harfbuzz gdk-pixbuf atk ]} + ''; + + meta = { + description = "Simple application to manage Xfce panel layouts"; + }; +} diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index c72d20b9d8f7..ccbeff5c37cb 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -93,6 +93,8 @@ lib.makeScope pkgs.newScope (self: with self; { xfburn = callPackage ./applications/xfburn { }; + xfce4-panel-profiles = callPackage ./applications/xfce4-panel-profiles { }; + #### ART xfce4-icon-theme = callPackage ./art/xfce4-icon-theme { }; diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index eb2ec5cbe33b..136140359f0a 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { for f in $out/bin/* do wrapProgram $f \ - --prefix PATH : ${stdenv.cc}/bin + --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} done ''; diff --git a/pkgs/development/coq-modules/itauto/default.nix b/pkgs/development/coq-modules/itauto/default.nix new file mode 100644 index 000000000000..66791b130614 --- /dev/null +++ b/pkgs/development/coq-modules/itauto/default.nix @@ -0,0 +1,24 @@ +{ lib, mkCoqDerivation, coq, version ? null }: +with lib; + +mkCoqDerivation rec { + pname = "itauto"; + owner = "fbesson"; + domain = "gitlab.inria.fr"; + + release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A="; + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.13"; out = "8.13+no"; } + ] null; + + mlPlugin = true; + extraBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]); + enableParallelBuilding = false; + + meta = { + description = "A reflexive SAT solver parameterised by a leaf tactic and Nelson-Oppen support"; + maintainers = with maintainers; [ siraben ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1c3cbbbbe31f..b6e5274be003 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -706,10 +706,6 @@ self: super: { uuid-types = doJailbreak super.uuid-types; uuid = doJailbreak super.uuid; - # Bypass version check for random < 1.2 (1.2 works fine). - # https://github.com/yeyan/xmonad-wallpaper/issues/2 - xmonad-wallpaper = doJailbreak super.xmonad-wallpaper; - # The tests spuriously fail libmpd = dontCheck super.libmpd; @@ -1936,4 +1932,12 @@ EOT # https://github.com/dagit/zenc/issues/5 zenc = doJailbreak super.zenc; + # Indeterministic tests + # Fixed on upstream: https://github.com/softwarefactory-project/matrix-client-haskell/commit/4ca4963cfd06379d9bdce49742af854aed6a0d37 + matrix-client = dontCheck super.matrix-client; + + # Flakey tests + # upstream https://github.com/circuithub/rel8/issues/86 + rel8 = dontCheck super.rel8; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 0c4b46360ba7..492af32edb14 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -173,6 +173,7 @@ self: super: { hls-brittany-plugin = dontCheck super.hls-brittany-plugin; hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin; hls-module-name-plugin = dontCheck super.hls-module-name-plugin; + hls-splice-plugin = dontCheck super.hls-splice-plugin; # We are lacking pure pgrep at the moment for tests to work tmp-postgres = dontCheck super.tmp-postgres; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index d960d4ed8f07..f21266e5004d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -617,6 +617,7 @@ broken-packages: - chunky - church - church-maybe + - churros - cielo - cil - cinvoke @@ -1640,7 +1641,6 @@ broken-packages: - gitter - git-vogue - gi-vips - - gi-wnck - glade - glapp - Gleam @@ -2289,6 +2289,7 @@ broken-packages: - hs-rs-notify - hs-scrape - hsseccomp + - hssh - hs-snowtify - hs-speedscope - hsSqlite3 @@ -2453,6 +2454,7 @@ broken-packages: - initialize - inject-function - inline-asm + - inline-r - inserts - instana-haskell-trace-sdk - instance-map @@ -2963,6 +2965,7 @@ broken-packages: - mi - miconix-test - microbase + - microformats2-parser - microgroove - microlens-each - micrologger @@ -3597,6 +3600,7 @@ broken-packages: - plat - platinum-parsing - PlayingCards + - plex - plist - plist-buddy - plot-gtk @@ -3979,6 +3983,7 @@ broken-packages: - reversi - ReviewBoard - rewrite-inspector + - rfc - rfc-prelude - rhbzquery - ribbit @@ -4869,6 +4874,7 @@ broken-packages: - turing-music - turtle-options - tweak + - twee - twentefp-websockets - twfy-api-client - twhs diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index fa4e798d1d3b..45d0bdcd0cbb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -218,6 +218,7 @@ package-maintainers: - hlint - hmatrix - iCalendar + - matrix-client - neuron - optics - reflex-dom @@ -356,6 +357,7 @@ unsupported-platforms: gi-ibus: [ x86_64-darwin ] gi-ostree: [ x86_64-darwin ] gi-vte: [ x86_64-darwin ] + gi-wnck: [ x86_64-darwin ] gnome-keyring: [ x86_64-darwin ] gtk-mac-integration: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ] gtk-sni-tray: [ x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 5c38f0b040f8..fdad31819ac5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -5,35 +5,395 @@ dont-distribute-packages: - 4Blocks - - a50 - - abcBridge + - AC-Vector-Fancy + - ADPfusionForest + - ADPfusionSet + - AERN-Net + - AERN-Real + - AERN-Real-Double + - AERN-Real-Interval + - AERN-RnToRm + - AERN-RnToRm-Plot + - ASN1 - AbortT-monadstf - AbortT-mtl + - Advgame + - Advise-me + - AlgoRhythm + - AlignmentAlgorithms + - AndroidViewHierarchyImporter + - Annotations + - ApplePush + - AttoJson + - AutoForms + - AvlTree + - BASIC + - Barracuda + - BerlekampAlgorithm + - BioHMM + - Biobase + - BiobaseBlast + - BiobaseDotP + - BiobaseENA + - BiobaseEnsembl + - BiobaseFR3D + - BiobaseFasta + - BiobaseHTTP + - BiobaseHTTPTools + - BiobaseInfernal + - BiobaseMAF + - BiobaseTrainingData + - BiobaseTurner + - BiobaseTypes + - BiobaseVienna + - BiobaseXNA + - BirdPP + - Bitly + - BlastHTTP + - Blobs + - BlogLiterately + - BlogLiterately-diagrams + - Bookshelf + - CBOR + - CC-delcont-alt + - CMCompare + - CPBrainfuck + - CPL + - CSPM-Interpreter + - CSPM-ToProlog + - CSPM-cspm + - CarneadesIntoDung + - Chart-fltkhs + - ClustalParser + - Coadjute + - Combinatorrent + - ComonadSheet + - Condor + - Configger + - Control-Monad-MultiPass + - CoreFoundation + - DMuCheck + - DOM + - DP + - DSH + - DSTM + - Dangerous + - DarcsHelpers + - DefendTheKing + - DifferenceLogic + - DisTract + - DnaProteinAlignment + - DocTest + - DrHylo + - Dust + - Dust-tools + - Dust-tools-pcap + - DysFRP-Cairo + - DysFRP-Craftwerk + - EditTimeReport + - EntrezHTTP + - EsounD + - EtaMOO + - Etage-Graph + - Eternal10Seconds + - Etherbunny + - EventSocket + - FComp + - FM-SBLEX + - FTPLine + - Facts + - FailureT + - FermatsLastMargin + - FieldTrip + - FilePather + - Finance-Treasury + - FiniteMap + - FirstOrderTheory + - Flippi + - Forestry + - FormalGrammars + - Foster + - Frames-beam + - Frames-dsv + - Frank + - GLFW-OGL + - GLFW-task + - GPX + - GPipe-Collada + - GPipe-Examples + - GPipe-GLFW + - GPipe-GLFW4 + - GPipe-TextureLoad + - Gamgine + - GeBoP + - GenI + - GenSmsPdu + - Genbank + - Gene-CluEDO + - GenussFold + - GlomeView + - GoogleDirections + - GoogleSB + - GoogleTranslate + - GrammarProducts + - GraphHammer + - GraphHammer-examples + - GrowlNotify + - Gtk2hsGenerics + - GtkGLTV + - GuiHaskell + - GuiTV + - H + - HAppS-Data + - HAppS-IxSet + - HAppS-Server + - HAppS-State + - HGamer3D-API + - HGamer3D-CAudio-Binding + - HGamer3D-OIS-Binding + - HJScript + - HLearn-algebra + - HLearn-approximation + - HLearn-classification + - HLearn-datastructures + - HLearn-distributions + - HNM + - HPlot + - HPong + - HROOT + - HROOT-core + - HROOT-graf + - HROOT-hist + - HROOT-io + - HROOT-math + - HROOT-tree + - HRay + - HSGEP + - HSHHelpers + - HSoundFile + - HStringTemplateHelpers + - HTab + - HXMPP + - HaMinitel + - HaRe + - HaTeX-meta + - HaTeX-qq + - HaVSA + - Hach + - HarmTrace + - HasGP + - Hashell + - HaskRel + - Hate + - Hawk + - Hayoo + - Hedi + - Hieroglyph + - HiggsSet + - Hipmunk-Utils + - HipmunkPlayground + - Hoed + - Holumbus-Distribution + - Holumbus-MapReduce + - Holumbus-Searchengine + - Holumbus-Storage + - HongoDB + - Hs2lib + - HsParrot + - HsWebots + - Hsed + - Hydrogen + - INblobs + - IORefCAS + - IndexedList + - InfixApplicative + - JSON-Combinator + - JSON-Combinator-Examples + - JSONb + - Javasf + - JsContracts + - JsonGrammar + - JuPyTer-notebook + - JunkDB-driver-gdbm + - JunkDB-driver-hashtables + - KiCS + - KiCS-debugger + - KiCS-prophecy + - LDAPv3 + - LambdaDesigner + - LambdaINet + - LambdaPrettyQuote + - LambdaShell + - LinearSplit + - LinkChecker + - LogicGrowsOnTrees + - LogicGrowsOnTrees-MPI + - LogicGrowsOnTrees-network + - LogicGrowsOnTrees-processes + - LslPlus + - Lucu + - Lykah + - MC-Fold-DP + - MFlow + - MIP-glpk + - MSQueue + - MaybeT-transformers + - MetaObject + - Metrics + - Mhailist + - Michelangelo + - MicrosoftTranslator + - MissingPy + - MonadCatchIO-mtl + - MonadCatchIO-mtl-foreign + - MonadCatchIO-transformers-foreign + - MonadLab + - Monaris + - Monatron-IO + - Monocle + - MuCheck-HUnit + - MuCheck-Hspec + - MuCheck-QuickCheck + - MuCheck-SmallCheck + - MutationOrder + - NXT + - NaperianNetCDF + - NearContextAlgebra + - Ninjas + - NoSlow + - Nomyx + - Nomyx-Core + - Nomyx-Language + - Nomyx-Rules + - Nomyx-Web + - NonEmptyList + - Nussinov78 + - OSM + - OnRmt + - OpenAFP-Utils + - OpenGLCheck + - OpenSCAD + - OpenVG + - PCLT-DB + - PageIO + - Paraiso + - Parallel-Arrows-Eden + - PermuteEffects + - Plot-ho-matic + - PlslTools + - Printf-TH + - ProbabilityMonads + - Pugs + - Pup-Events + - Pup-Events-Demo + - Quelea + - RESTng + - RMP + - RNAFold + - RNAFoldProgs + - RNAdesign + - RNAdraw + - RNAlien + - RNAwolf + - Ranka + - Rlang-QQ + - RollingDirectory + - S3 + - SBench + - SCRIPTWriter + - SCalendar + - SFML-control + - SFont + - SGdemo + - STLinkUSB + - STM32-Zombie + - SVG2Q + - SciFlow + - SciFlow-drmaa + - Scurry + - SelectSequencesFromMSA + - Shellac-compatline + - Shellac-editline + - Shellac-haskeline + - Shellac-readline + - ShortestPathProblems + - Shpadoinkle-backend-pardiff + - Shpadoinkle-backend-static + - Shpadoinkle-developer-tools + - Shpadoinkle-disembodied + - Shpadoinkle-examples + - Shpadoinkle-html + - Shpadoinkle-router + - Shpadoinkle-template + - Shpadoinkle-widgets + - SimpleGL + - SimpleLog + - SimpleServer + - Smooth + - Snusmumrik + - SoccerFun + - SoccerFunGL + - SourceGraph + - SpinCounter + - Spock-auth + - Spock-lucid + - Spock-worker + - StockholmAlignment + - Strafunski-Sdf2Haskell + - SyntaxMacros + - Taxonomy + - TaxonomyTools + - TeX-my-math + - TeaHS + - TreeCounter + - Treiber + - TrieMap + - TypeClass + - TypeIlluminator + - UMM + - URLT + - UrlDisp + - ViennaRNA-extras + - WAVE + - WEditorBrick + - WEditorHyphen + - WL500gPControl + - WURFL + - WXDiffCtrl + - WashNGo + - WaveFront + - WebBits-Html + - WebBits-multiplate + - WebCont + - WordAlignment + - WxGeneric + - XML + - XMPP + - XSaiga + - YACPong + - Yablog + - Yogurt + - Yogurt-Standalone + - Z-Botan + - Z-IO + - Z-MessagePack + - Z-YAML + - a50 + - abcBridge + - ac-machine-conduit - accelerate-arithmetic - accelerate-fourier - accelerate-typelits - access-token-provider - - ac-machine-conduit - acme-php - acme-safe - acousticbrainz-client - activehs - actor - - AC-Vector-Fancy - adhoc-network - adict - - ADPfusionForest - - ADPfusionSet - adp-multi-monadiccp - - Advgame - - Advise-me - aern2-real - - AERN-Net - - AERN-Real - - AERN-Real-Double - - AERN-Real-Interval - - AERN-RnToRm - - AERN-RnToRm-Plot - aeson-native - afv - agda-server @@ -46,8 +406,6 @@ dont-distribute-packages: - algebra-driven-design - algebra-sql - algolia - - AlgoRhythm - - AlignmentAlgorithms - alms - alpha - alsa-gui @@ -58,18 +416,18 @@ dont-distribute-packages: - amqp-streamly - analyze-client - anatomy - - AndroidViewHierarchyImporter - animate-example - animate-frames - animate-preview - animate-sdl2 - annah - - Annotations - anonymous-sums-tests - antagonist - anticiv - antlrc - apelsin + - api-rpc-pegnet + - api-yoti - apiary - apiary-authenticate - apiary-clientsession @@ -85,11 +443,8 @@ dont-distribute-packages: - apiary-redis - apiary-session - apiary-websockets - - api-rpc-pegnet - apis - - api-yoti - apotiki - - ApplePush - approx-rand-test - arbor-monad-metric-datadog - arch-hs @@ -104,7 +459,6 @@ dont-distribute-packages: - arraylist - ascii-table - asic - - ASN1 - assert4hs-hspec - assert4hs-tasty - assimp @@ -114,7 +468,6 @@ dont-distribute-packages: - atmos-dimensional-tf - atomic-primops-foreign - atp - - AttoJson - attoparsec-enumerator - attoparsec-iteratee - attoparsec-text-enumerator @@ -122,13 +475,11 @@ dont-distribute-packages: - audiovisual - aura - authoring - - AutoForms - autonix-deps-kf5 - avers - avers-api - avers-api-docs - avers-server - - AvlTree - avro-piper - awesomium - awesomium-glut @@ -150,6 +501,7 @@ dont-distribute-packages: - azure-functions-worker - azure-service-api - azure-servicebus + - b-tree - babylon - backblaze-b2-hs - backdropper @@ -162,12 +514,10 @@ dont-distribute-packages: - bamboo-theme-mini-html5 - bamse - bamstats - - Barracuda - base16-lens - base32-bytestring - base64-bytes - baserock-schema - - BASIC - batchd - battlenet-yesod - battleships @@ -184,9 +534,9 @@ dont-distribute-packages: - beam-th - beautifHOL - bech32-th + - bech32-th_1_1_1 - bein - belka - - BerlekampAlgorithm - berp - bff - bglib @@ -197,32 +547,15 @@ dont-distribute-packages: - binary-file - binary-protocol-zmq - binary-streams + - binding-wx - bindings-apr-util - bindings-linux-videodev2 - bindings-ppdev - - binding-wx - binembed-example - bioace - bioalign - - Biobase - - BiobaseBlast - - BiobaseDotP - - BiobaseENA - - BiobaseEnsembl - - BiobaseFasta - - BiobaseFR3D - - BiobaseHTTP - - BiobaseHTTPTools - - BiobaseInfernal - - BiobaseMAF - - BiobaseTrainingData - - BiobaseTurner - - BiobaseTypes - - BiobaseVienna - - BiobaseXNA - biofasta - biofastq - - BioHMM - bioinformatics-toolkit - biophd - biopsl @@ -231,27 +564,24 @@ dont-distribute-packages: - bip32 - birch-beer - bird - - BirdPP - bit-array - bitcoin-address - bitcoin-api - bitcoin-api-extra - bitcoin-block - bitcoin-compact-filters - - bitcoind-regtest - - bitcoind-rpc - bitcoin-keys - bitcoin-rpc - bitcoin-scripting - bitcoin-tx - bitcoin-types - - Bitly + - bitcoind-regtest + - bitcoind-rpc - bitly-cli - bitmaps - bittorrent - bla - blakesum-demo - - BlastHTTP - blastxml - blatex - blaze-builder-enumerator @@ -259,10 +589,7 @@ dont-distribute-packages: - ble - blink1 - blip - - Blobs - blogination - - BlogLiterately - - BlogLiterately-diagrams - bloodhound-amazonka-auth - bloxorz - blubber @@ -273,7 +600,6 @@ dont-distribute-packages: - bond-haskell - bond-haskell-compiler - bookkeeper-permissions - - Bookshelf - boomslang - boopadoop - boots-cloud @@ -292,7 +618,6 @@ dont-distribute-packages: - bronyradiogermany-streaming - brotli-conduit - brotli-streams - - b-tree - btree - buchhaltung - buildbox-tools @@ -309,14 +634,14 @@ dont-distribute-packages: - bytelog - bytestring-read - c0check - - cabal2arch - cabal-bounds - cabal-cache - cabal-cargs - - cabalmdvrpm - cabal-query - - cabalrpmdeps - cabal-test + - cabal2arch + - cabalmdvrpm + - cabalrpmdeps - cake - cakyrespa - cal3d-examples @@ -332,9 +657,8 @@ dont-distribute-packages: - canteven-http - cao - cap - - carboncopy - - CarneadesIntoDung - car-pool + - carboncopy - cartel - casadi-bindings - casadi-bindings-control @@ -348,8 +672,6 @@ dont-distribute-packages: - casui - categorical-algebra - category-extras - - CBOR - - CC-delcont-alt - cctools-workqueue - cef3-simple - ceilometer-common @@ -363,11 +685,9 @@ dont-distribute-packages: - cfopu - cgrep - chainweb-mining-client - - chakra - chalkboard-viewer - charade - chart-cli - - Chart-fltkhs - chart-svg - chart-svg-various - chart-unit @@ -423,38 +743,33 @@ dont-distribute-packages: - cloud-seeder - cloudyfs - clua - - ClustalParser - clustertools - clutterhs - cmathml3 - - CMCompare - cmptype - cmv - cnc-spec-compiler - - Coadjute - - codec + - co-feldspar + - co-log-polysemy-formatting - code-conjure + - codec - codec-rpm - codemonitor - - co-feldspar - cognimeta-utils - coinbase-exchange - colada - collapse-duplication - collection-json - collections-base-instances - - co-log-polysemy-formatting - color-counter - colorless-http-client - colorless-scotty - colour-space - columbia - comark - - Combinatorrent - comic - commsec-keyexchange - comonad-random - - ComonadSheet - compact-mutable - complexity - computational-algebra @@ -464,7 +779,6 @@ dont-distribute-packages: - concrete-haskell - concrete-haskell-autogen - condor - - Condor - conductive-hsc3 - conductive-song - conduit-vfs-zip @@ -474,9 +788,8 @@ dont-distribute-packages: - conferer-source-dhall - conferer-source-yaml - conffmt - - Configger - - configifier - config-select + - configifier - configurator-ng - constraint-manip - constructible @@ -488,7 +801,6 @@ dont-distribute-packages: - control - control-monad-attempt - control-monad-exception-monadsfd - - Control-Monad-MultiPass - conversions - convert - convertible-ascii @@ -500,13 +812,10 @@ dont-distribute-packages: - copilot-language - copilot-libraries - copilot-theorem - - CoreFoundation - coroutine-enumerator - coroutine-iteratee - - couchdb-enumerator - couch-simple - - CPBrainfuck - - CPL + - couchdb-enumerator - cprng-aes-effect - cql-io-tinylog - cqrs-example @@ -526,17 +835,14 @@ dont-distribute-packages: - criu-rpc - crockford - cron-compat - - cryptocipher - crypto-conduit + - cryptocipher - cryptoids - cryptoids-class - cryptol - crystalfontz - csg - cspmchecker - - CSPM-cspm - - CSPM-Interpreter - - CSPM-ToProlog - csv-enumerator - ctpl - cube @@ -544,13 +850,11 @@ dont-distribute-packages: - cursor-fuzzy-time-gen - cv-combinators - cypher - - Dangerous - dapi - darcs-benchmark - darcs-beta - - darcsden - darcs-fastconvert - - DarcsHelpers + - darcsden - darcswatch - darkplaces-demo - darkplaces-rcon-util @@ -558,9 +862,7 @@ dont-distribute-packages: - data-accessor-monads-fd - data-basic - data-cycle - - datadog-tracing - data-elf - - dataflow - data-layer - data-lens-fd - data-lens-ixset @@ -570,6 +872,8 @@ dont-distribute-packages: - data-result - data-rtuple - data-structure-inferrer + - datadog-tracing + - dataflow - date-conversions - dbjava - dbus-client @@ -584,11 +888,11 @@ dont-distribute-packages: - ddc-core-simpl - ddc-core-tetra - ddc-driver - - ddci-core - ddc-interface - ddc-source-tetra - ddc-tools - ddc-war + - ddci-core - debug - debug-trace-var - decidable @@ -597,7 +901,6 @@ dont-distribute-packages: - deeplearning-hs - deepzoom - defargs - - DefendTheKing - definitive-graphics - deka-tests - delaunay @@ -606,9 +909,9 @@ dont-distribute-packages: - delimiter-separated - delta - delta-h + - dep-t-advice - dependent-state - dephd - - dep-t-advice - deptrack-devops - deptrack-dot - dequeue @@ -618,6 +921,7 @@ dont-distribute-packages: - dewdrop - dfinity-radix-tree - dhall-docs + - di-polysemy - dia-functions - diagrams-haddock - diagrams-html5 @@ -625,7 +929,6 @@ dont-distribute-packages: - diagrams-pgf - diagrams-reflex - diagrams-wx - - DifferenceLogic - difference-monoid - digestive-functors-hsp - dingo-core @@ -633,14 +936,12 @@ dont-distribute-packages: - dingo-widgets - diplomacy - diplomacy-server - - di-polysemy - dirfiles - discogs-haskell - discord-gateway - discord-hs - discord-register - discord-rest - - DisTract - distributed-process-async - distributed-process-azure - distributed-process-client-server @@ -665,18 +966,13 @@ dont-distribute-packages: - dmenu-pkill - dmenu-pmount - dmenu-search - - DMuCheck - - DnaProteinAlignment - doc-review - - DocTest - doi - - DOM - domain - domain-core - domain-optics - dow - download-media-content - - DP - dph-examples - dph-lifted-base - dph-lifted-copy @@ -684,25 +980,17 @@ dont-distribute-packages: - dph-prim-interface - dph-prim-par - dph-prim-seq - - DrHylo - dropbox-sdk - dropsolve - - DSH - dsh-sql - dsmc-tools - - DSTM - dtd - dumb-cas - - Dust - - Dust-tools - - Dust-tools-pcap - dvda - dynamic-cabal - dynamic-pipeline - dynamic-plot - dynobud - - DysFRP-Cairo - - DysFRP-Craftwerk - eccrypto-ed25519-bindings - ecdsa - edenskel @@ -710,7 +998,6 @@ dont-distribute-packages: - edge - edges - editable - - EditTimeReport - effective-aspects-mzv - egison - egison-pattern-src-haskell-mode @@ -729,7 +1016,6 @@ dont-distribute-packages: - embroidery - engine-io-growler - entangle - - EntrezHTTP - enumerate - enumerate-function - enumerator-fd @@ -742,25 +1028,19 @@ dont-distribute-packages: - errors-ext - ersatz-toysat - esotericbot - - EsounD - estreps - - Etage-Graph - - EtaMOO - - Eternal10Seconds - eternity - eternity-timestamped - ether - - Etherbunny - ethereum-analyzer - ethereum-analyzer-cli - ethereum-analyzer-webui - ethereum-client-haskell - ethereum-merkle-patricia-db - evdev-streamly + - event-monad - eventful-postgresql - eventful-sqlite - - event-monad - - EventSocket - eventsource-geteventstore-store - every-bit-counts - exception-monads-fd @@ -777,25 +1057,22 @@ dont-distribute-packages: - extensible-data - extract-dependencies - extrapolate - - Facts - factual-api - - FailureT - fakedata-quickcheck - - fallingblocks - falling-turnip + - fallingblocks - family-tree - fast-digits - fastirc - fault-tree - fbrnch - fcd - - FComp - feature-flipper-postgres - fedora-img-dl - - feed2lj - - feed2twitter - feed-gipeda - feed-translator + - feed2lj + - feed2twitter - fei-base - fei-cocoapi - fei-dataiter @@ -805,33 +1082,26 @@ dont-distribute-packages: - fei-nn - feldspar-compiler - feldspar-language - - FermatsLastMargin - festung - ffmpeg-tutorials - ficketed - fields - - FieldTrip - filepath-crypto - - filepather - - FilePather - filepath-io-access + - filepather - filesystem-enumerator - - Finance-Treasury - find-clumpiness - findhttp - - FiniteMap - firstify - - FirstOrderTheory + - fix-parser-simple - fixed-point-vector - fixed-point-vector-space - fixhs - - fix-parser-simple - flac-picture - flashblast - flatbuffers - flexiwrap - flexiwrap-smallcheck - - Flippi - flite - flowdock-api - flower @@ -843,13 +1113,10 @@ dont-distribute-packages: - fltkhs-themes - fluent-logger - fluent-logger-conduit - - FM-SBLEX - foldl-transduce-attoparsec - follower - foo - - Forestry - formal - - FormalGrammars - format - format-status - forml @@ -859,28 +1126,23 @@ dont-distribute-packages: - fortran-src-extras - foscam-directory - foscam-sort - - Foster - fp-ieee - fplll - fpnla-examples - frame-markdown - - Frames-beam - - Frames-dsv - - Frank - - freekick2 - - freelude - - freer-converse - free-theorems-counterexamples - free-theorems-seq - free-theorems-seq-webui - free-theorems-webui + - freekick2 + - freelude + - freer-converse - frpnow-gloss - frpnow-gtk - frpnow-gtk3 - frpnow-vty - ftdi - ftp-client-conduit - - FTPLine - ftree - ftshell - funbot @@ -888,8 +1150,8 @@ dont-distribute-packages: - funcons-lambda-cbv-mp - funcons-simple - funcons-tools - - functional-arrow - function-combine + - functional-arrow - functor-combo - funflow-nix - funion @@ -903,12 +1165,10 @@ dont-distribute-packages: - g2q - gact - galois-fft - - Gamgine - gargoyle-postgresql-connect - gbu - gdax - gdiff-ig - - GeBoP - gedcom - geek - geek-server @@ -917,18 +1177,13 @@ dont-distribute-packages: - gelatin-gl - gelatin-sdl2 - gelatin-shaders - - Genbank - - Gene-CluEDO - generics-mrsop-gdiff - genesis - genesis-test - - GenI - - geniconvert - geni-gui - - geniserver - geni-util - - GenSmsPdu - - GenussFold + - geniconvert + - geniserver - geodetic - geolite-csv - getemx @@ -938,11 +1193,11 @@ dont-distribute-packages: - ghc-debug-stub - ghc-imported-from - ghc-instances - - ghci-pretty - - ghcjs-hplay - ghc-mod - ghc-tags-plugin - ghc-vis + - ghci-pretty + - ghcjs-hplay - ght - gi-cairo-again - gi-gsk @@ -950,11 +1205,11 @@ dont-distribute-packages: - gi-gtk_4_0_4 - git-fmt - git-gpush + - git-object + - git-remote-ipfs - github-webhook-handler-snap - gitlib-cross - gitlib-s3 - - git-object - - git-remote-ipfs - givegif - gladexml-accessor - glazier @@ -962,12 +1217,9 @@ dont-distribute-packages: - glazier-react - glazier-react-examples - glazier-react-widget - - GLFW-OGL - - GLFW-task - global - global-config - glome-hs - - GlomeView - gloss-accelerate - gloss-devil - gloss-examples @@ -983,14 +1235,11 @@ dont-distribute-packages: - goal-probability - goal-simulation - goat - - GoogleDirections - google-drive - google-mail-filters - google-maps-geocoding - - googleplus - - GoogleSB - google-static-maps - - GoogleTranslate + - googleplus - gore-and-ash-actor - gore-and-ash-async - gore-and-ash-demo @@ -1000,27 +1249,15 @@ dont-distribute-packages: - gore-and-ash-network - gore-and-ash-sdl - gore-and-ash-sync - - GPipe-Collada - - GPipe-Examples - - GPipe-GLFW - - GPipe-GLFW4 - - GPipe-TextureLoad - gps - gps2htmlReport - - GPX - grab-form - graflog - grammar-combinators - - GrammarProducts - grapefruit-examples - grapefruit-records - grapefruit-ui - grapefruit-ui-gtk - - GraphHammer - - GraphHammer-examples - - graphicsFormats - - graphicstools - - graphql-client - graph-rewriting-cl - graph-rewriting-gl - graph-rewriting-lambdascope @@ -1029,13 +1266,15 @@ dont-distribute-packages: - graph-rewriting-strategies - graph-rewriting-trs - graph-rewriting-ww - - graphtype - graph-visit + - graphicsFormats + - graphicstools + - graphql-client + - graphtype - greencard-lib + - grid-proto - gridbounds - gridland - - grid-proto - - GrowlNotify - grpc-etcd-client - grpc-haskell - grpc-haskell-core @@ -1046,28 +1285,22 @@ dont-distribute-packages: - gsmenu - gstorable - gtfs + - gtk-serialized-event - gtk2hs-cast-glade - gtk2hs-cast-gnomevfs - gtk2hs-cast-gtkglext - gtk2hs-cast-gtksourceview2 - - Gtk2hsGenerics - - GtkGLTV - gtkimageview - gtkrsync - - gtk-serialized-event - guarded-rewriting - guess-combinator - - GuiHaskell - - GuiTV + - hArduino + - hOff-display + - hPDB + - hPDB-examples - habit - hablo - hablog - - Hach - - hack2-handler-happstack-server - - hack2-handler-mongrel2-http - - hack2-handler-snap-server - - hackage2twitter - - hackage-server - hack-contrib - hack-contrib-press - hack-handler-epoll @@ -1075,10 +1308,15 @@ dont-distribute-packages: - hack-handler-fastcgi - hack-handler-hyena - hack-handler-simpleserver - - hackmanager - hack-middleware-cleanpath - hack-middleware-clientsession - hack-middleware-jsonp + - hack2-handler-happstack-server + - hack2-handler-mongrel2-http + - hack2-handler-snap-server + - hackage-server + - hackage2twitter + - hackmanager - haddock - haddock_2_23_1 - haddocset @@ -1093,16 +1331,12 @@ dont-distribute-packages: - halma-gui - halma-telegram-bot - ham - - HaMinitel - hamusic - hans-pcap - happlets-lib-gtk - - HAppS-Data - happs-hsp - happs-hsp-template - - HAppS-IxSet - - HAppS-Server - - HAppS-State + - happs-tutorial - happstack-auth - happstack-authenticate - happstack-contrib @@ -1117,48 +1351,26 @@ dont-distribute-packages: - happstack-state - happstack-static-routing - happstack-yui - - happs-tutorial - happybara-webkit - haquil - - hArduino - hardware-edsl - - HaRe - harg - hark - harmony - - HarmTrace - haroonga-httpd + - has-th - hascat - hascat-lib - hascat-setup - hascat-system - - HasGP - - Hashell - hashflare + - hask-home - haskarrow - haskdeep - haskeem - haskell-abci - haskell-aliyun - haskell-bitmex-client - - haskelldb-connect-hdbc - - haskelldb-connect-hdbc-catchio-mtl - - haskelldb-connect-hdbc-catchio-tf - - haskelldb-connect-hdbc-catchio-transformers - - haskelldb-connect-hdbc-lifted - - haskelldb-dynamic - - haskelldb-flat - - haskelldb-hdbc - - haskelldb-hdbc-mysql - - haskelldb-hdbc-odbc - - haskelldb-hdbc-postgresql - - haskelldb-hdbc-sqlite3 - - haskelldb-hsql - - haskelldb-hsql-mysql - - haskelldb-hsql-odbc - - haskelldb-hsql-postgresql - - haskelldb-hsql-sqlite3 - - haskelldb-th - haskell-docs - haskell-eigen-util - haskell-ftp @@ -1182,10 +1394,27 @@ dont-distribute-packages: - haskell-tools-refactor - haskell-tools-rewrite - haskell-tor + - haskelldb-connect-hdbc + - haskelldb-connect-hdbc-catchio-mtl + - haskelldb-connect-hdbc-catchio-tf + - haskelldb-connect-hdbc-catchio-transformers + - haskelldb-connect-hdbc-lifted + - haskelldb-dynamic + - haskelldb-flat + - haskelldb-hdbc + - haskelldb-hdbc-mysql + - haskelldb-hdbc-odbc + - haskelldb-hdbc-postgresql + - haskelldb-hdbc-sqlite3 + - haskelldb-hsql + - haskelldb-hsql-mysql + - haskelldb-hsql-odbc + - haskelldb-hsql-postgresql + - haskelldb-hsql-sqlite3 + - haskelldb-th - haskelm - haskey-mtl - haskgame - - hask-home - haskoin-bitcoind - haskoin-core - haskoin-crypto @@ -1201,7 +1430,6 @@ dont-distribute-packages: - haskore-realtime - haskore-supercollider - haskore-synthesizer - - HaskRel - hasktorch - hasktorch-ffi-thc - hasktorch-indef @@ -1222,16 +1450,9 @@ dont-distribute-packages: - haste-lib - haste-markup - haste-perch - - has-th - - Hate - - HaTeX-meta - hatexmpp3 - - HaTeX-qq - - HaVSA - hawitter - - Hawk - haxy - - Hayoo - hback - hbayes - hbb @@ -1252,15 +1473,14 @@ dont-distribute-packages: - hdph - heart-app - heatitup + - heavy-log-shortcuts - heavy-logger - heavy-logger-amazon - heavy-logger-instances - - heavy-log-shortcuts - hecc - hedgehog-checkers-lens - hedgehog-fakedata - hedgehog-gen-json - - Hedi - hedis-pile - heist-aeson - helics @@ -1287,16 +1507,11 @@ dont-distribute-packages: - hfd - hfiar - hgalib - - HGamer3D-API - - HGamer3D-CAudio-Binding - - HGamer3D-OIS-Binding - hgen - hgeometry-svg - hgithub - hiccup - hierarchical-spectral-clustering - - Hieroglyph - - HiggsSet - highjson-swagger - highjson-th - himpy @@ -1307,8 +1522,6 @@ dont-distribute-packages: - hinvaders - hinze-streams - hipbot - - HipmunkPlayground - - Hipmunk-Utils - hipsql-client - hipsql-server - hirt @@ -1319,15 +1532,9 @@ dont-distribute-packages: - hist-pl-lmf - hit - hit-graph - - HJScript - hjsonschema - hjugement-cli - hlcm - - HLearn-algebra - - HLearn-approximation - - HLearn-classification - - HLearn-datastructures - - HLearn-distributions - hledger-api - hlrdb - hls @@ -1339,20 +1546,12 @@ dont-distribute-packages: - hmm-lapack - hmt - hmt-diagrams - - HNM - hnormalise - hob - - Hoed - - hOff-display - hogre - hogre-examples - - Holumbus-Distribution - - Holumbus-MapReduce - - Holumbus-Searchengine - - Holumbus-Storage - holy-project - hommage - - HongoDB - hood - hoodie - hoodle @@ -1371,11 +1570,7 @@ dont-distribute-packages: - hpage - hpaste - hpc-tracer - - hPDB - - hPDB-examples - hplayground - - HPlot - - HPong - hpqtypes-extras - hprotoc-fork - hps @@ -1383,26 +1578,21 @@ dont-distribute-packages: - hpython - hquantlib - hranker - - HRay - hreader - hreader-lens - hreq-client - hreq-conduit - - HROOT - - HROOT-core - - HROOT-graf - - HROOT-hist - - HROOT-io - - HROOT-math - - HROOT-tree + - hs-blake2 + - hs-brotli + - hs-ffmpeg + - hs-gen-iface + - hs-pkpass + - hs-swisstable-hashtables-class - hs2dot - - Hs2lib - hsautogui - hsbackup - hsbencher-codespeed - hsbencher-fusion - - hs-blake2 - - hs-brotli - hsc3-auditor - hsc3-cairo - hsc3-data @@ -1422,24 +1612,16 @@ dont-distribute-packages: - hscassandra - hscope - hsdev - - Hsed - hset - hsfacter - - hs-ffmpeg - - hs-gen-iface - - HSGEP - - HSHHelpers - hslogstash - hsnock - - HSoundFile - - HsParrot - hspec-expectations-pretty - hspec-pg-transact - hspec-setup - hspec-shouldbe - hspec-test-sandbox - hspecVariant - - hs-pkpass - hsprocess - hsql-mysql - hsql-odbc @@ -1450,24 +1632,20 @@ dont-distribute-packages: - hsqml-morris - hsreadability - hssqlppp-th - - hs-swisstable-hashtables-class - hstar - hstox - hstradeking - - HStringTemplateHelpers - hstzaar - hsubconvert - - HsWebots - hswip - hsx-jmacro - hsx-xhtml - - HTab - hts - - http2-client-exe - - http2-client-grpc - http-client-auth - http-enumerator - http-io-streams + - http2-client-exe + - http2-client-grpc - https-everywhere-rules - https-everywhere-rules-raw - httpspec @@ -1488,14 +1666,13 @@ dont-distribute-packages: - hw-json-simple-cursor - hw-json-standard-cursor - hw-kafka-avro + - hw-simd-cli + - hw-uri - hworker-ses - hwormhole - hws - - hw-simd-cli - hwsl2-bytevector - hwsl2-reducers - - hw-uri - - HXMPP - hxmppc - hxournal - hxt-binary @@ -1503,7 +1680,6 @@ dont-distribute-packages: - hxthelper - hxweb - hybrid - - Hydrogen - hydrogen-cli - hydrogen-cli-args - hydrogen-data @@ -1517,13 +1693,14 @@ dont-distribute-packages: - hyloutils - hyperpublic - ice40-prim - - ideas-math - - ideas-math-types - - ideas-statistics - ide-backend - ide-backend-common - ide-backend-server + - ideas-math + - ideas-math-types + - ideas-statistics - ige-mac-integration + - ihaskell-inline-r - ihaskell-rlangqq - ihttp - imap @@ -1539,7 +1716,6 @@ dont-distribute-packages: - importify - imprevu-happstack - improve - - INblobs - inch - incremental-computing - incremental-maps @@ -1548,10 +1724,8 @@ dont-distribute-packages: - indentation-parsec - indentation-trifecta - indexation - - IndexedList - indieweb-algorithms - infernu - - InfixApplicative - inline-java - inspector-wrecker - instant-aeson @@ -1566,7 +1740,6 @@ dont-distribute-packages: - intset - invertible-hlist - ion - - IORefCAS - ipatch - ipc - ipld-cid @@ -1581,12 +1754,12 @@ dont-distribute-packages: - ismtp - isobmff-builder - isohunt + - iter-stats - iteratee-compress - iteratee-mtl - iteratee-parsec - iteratee-stm - iterio-server - - iter-stats - ivor - ivory-avr-atmega328p-registers - ivory-backend-c @@ -1604,10 +1777,9 @@ dont-distribute-packages: - jail - java-bridge-extras - java-character - - javaclass - java-reflect + - javaclass - javasf - - Javasf - jmacro - jmacro-rpc - jmacro-rpc-happstack @@ -1616,26 +1788,18 @@ dont-distribute-packages: - jobs-ui - join - jot - - JsContracts - jsmw - - json2-hdbc - json-ast-json-encoder - json-autotype - json-b - - JSONb - - JSON-Combinator - - JSON-Combinator-Examples - json-enumerator - - JsonGrammar - json-incremental-decoder - json-query - - jsons-to-schema - json-togo - json-tokens + - json2-hdbc + - jsons-to-schema - jspath - - JunkDB-driver-gdbm - - JunkDB-driver-hashtables - - JuPyTer-notebook - jvm - jvm-batching - jvm-streaming @@ -1662,20 +1826,17 @@ dont-distribute-packages: - keera-hails-reactive-fs - keera-hails-reactive-gtk - keera-hails-reactive-htmldom - - keera-hails-reactivelenses - keera-hails-reactive-network - keera-hails-reactive-polling - keera-hails-reactive-wx - keera-hails-reactive-yampa + - keera-hails-reactivelenses - keera-posture - kevin - keysafe - keyvaluehash - keyword-args - kicad-data - - KiCS - - KiCS-debugger - - KiCS-prophecy - kif-parser - kit - kleene @@ -1694,8 +1855,12 @@ dont-distribute-packages: - labyrinth - labyrinth-server - laika - - lambdabot-zulip - lambda-calculator + - lambda-devs + - lambda-options + - lambdaFeed + - lambdaLit + - lambdabot-zulip - lambdacms-media - lambdacube - lambdacube-bullet @@ -1706,21 +1871,13 @@ dont-distribute-packages: - lambdacube-examples - lambdacube-gl - lambdacube-samples - - LambdaDesigner - - lambda-devs - - lambdaFeed - - LambdaINet - - lambdaLit - - lambda-options - - LambdaPrettyQuote - - LambdaShell - lambdaya-bus - lambdiff - lang + - language-Modula2 - language-boogie - language-eiffel - language-kort - - language-Modula2 - language-ninja - language-oberon - language-python-colour @@ -1740,7 +1897,6 @@ dont-distribute-packages: - lazy-hash - lazy-hash-cache - ldapply - - LDAPv3 - leaky - lean - legion @@ -1776,8 +1932,6 @@ dont-distribute-packages: - linear-circuit - linearmap-category - linearscan-hoopl - - LinearSplit - - LinkChecker - linkchk - linkcore - linux-ptrace @@ -1787,15 +1941,15 @@ dont-distribute-packages: - liquid-bytestring - liquid-containers - liquid-ghc-prim - - liquidhaskell-cabal-demo - liquid-parallel - liquid-platform - liquid-prelude - liquid-vector - - listenbrainz-client + - liquidhaskell-cabal-demo - list-t-attoparsec - list-t-html-parser - list-witnesses + - listenbrainz-client - live-sequencer - llvm - llvm-analysis @@ -1811,57 +1965,51 @@ dont-distribute-packages: - llvm-tf - llvm-tools - lmonad-yesod - - localize - local-search + - localize - locked-poll - log - - logging-effect-extra - - logic-classes - - LogicGrowsOnTrees - - LogicGrowsOnTrees-MPI - - LogicGrowsOnTrees-network - - LogicGrowsOnTrees-processes - log-postgres - log-utils + - logging-effect-extra + - logic-classes - lojban - lojysamban - lol-apps - lol-benches - lol-cpp - - loli - lol-repa - lol-tests - lol-typing + - loli - longshot - loop-effin - lorentz - lostcities - loup - - LslPlus - ls-usb - lsystem - lti13 - luachunk - lucid-colonnade - lucienne - - Lucu - luhn - lui - luminance-samples - lvish - - Lykah - lz4-conduit - lzma-enumerator + - mDNSResponder-client - macbeth-lib - machines-amazonka - macosx-make-standalone + - magic-wormhole - magicbane - magico - - magic-wormhole - mahoro - maid - - mailgun - mail-pool + - mailgun - majordomo - majority - manatee @@ -1881,27 +2029,24 @@ dont-distribute-packages: - manifold-random - manifolds - marionetta - - markdown2svg - markdown-pap + - markdown2svg - markov-processes - marmalade-upload - marquise - marvin - masakazu-bot - matchers - - mathblog - - mathlink - math-programming-glpk - math-programming-tests + - mathblog + - mathlink - matsuri - maxent - maxent-learner-hw-gui - maxsharing - - MaybeT-transformers - - MC-Fold-DP - mcmc - mcmc-samplers - - mDNSResponder-client - mealy - mediabus-fdk-aac - mediabus-rtp @@ -1911,20 +2056,13 @@ dont-distribute-packages: - mergeful-persistent - mergeless-persistent - merkle-patricia-db - - MetaObject - meta-par-accelerate - metaplug - metar - metar-http - - Metrics - metronome - - MFlow - - Mhailist - - Michelangelo - - microformats2-parser - - microformats2-types - micro-gateway - - MicrosoftTranslator + - microformats2-types - midimory - mighttpd - minecraft-data @@ -1934,11 +2072,9 @@ dont-distribute-packages: - minilight-lua - minimung - minioperational - - MIP-glpk - miss - - MissingPy - - missing-py2 - miss-porcelain + - missing-py2 - mixed-strategies - mkbndl - mkcabal @@ -1949,25 +2085,18 @@ dont-distribute-packages: - moan - modify-fasta - modsplit - - modularity - modular-prelude-classy + - modularity - modulo - mole - - MonadCatchIO-mtl - - MonadCatchIO-mtl-foreign - - MonadCatchIO-transformers-foreign - monad-exception - - monadiccp-gecode - - MonadLab - monad-state - monad-stlike-stm + - monadiccp-gecode - monarch - - Monaris - - Monatron-IO - monetdb-mapi - mongrel2-handler - monky - - Monocle - monte-carlo - moo - moo-nad @@ -1987,16 +2116,12 @@ dont-distribute-packages: - msgpack-idl - msgpack-rpc - msgpack-rpc-conduit - - MSQueue - mtgoxapi - - MuCheck-Hspec - - MuCheck-HUnit - - MuCheck-QuickCheck - - MuCheck-SmallCheck - mu-grpc-client - mu-grpc-server - - multibase + - mu-tracing - multi-cabal + - multibase - multifocal - multihash-serialise - multilinear-io @@ -2006,7 +2131,6 @@ dont-distribute-packages: - multisetrewrite - murder - murmurhash3 - - musicbrainz-email - music-graphics - music-parts - music-pitch @@ -2014,39 +2138,36 @@ dont-distribute-packages: - music-score - music-sibelius - music-suite + - musicbrainz-email - musicxml2 - mutable-iter - - MutationOrder - mute-unmute - - mu-tracing - - mvclient - mvc-updates + - mvclient - mxnet-dataiter - mxnet-examples - mxnet-nn + - myTestlll - mysnapsession-example - mysql-haskell-openssl - mysql-simple-typed - - myTestlll - mywatch - n2o-web - nakadi-client - nanovg-simple - - NaperianNetCDF - nats-queue - natural-number - - NearContextAlgebra - nemesis-titan - nerf - nero-wai - nero-warp - nested-routes - - netcore - - netlines - net-spider-cli - net-spider-pangraph - net-spider-rpl - net-spider-rpl-cli + - netcore + - netlines - netstring-enumerator - nettle-frp - nettle-netkit @@ -2071,31 +2192,21 @@ dont-distribute-packages: - ngrams-loader - ngx-export-tools-extra - nikepub - - Ninjas - nirum - nlp-scores-scripts - - Nomyx - nomyx-api - nomyx-core - - Nomyx-Core - nomyx-language - - Nomyx-Language - nomyx-library - - Nomyx-Rules - nomyx-server - - Nomyx-Web - - NonEmptyList - - NoSlow - notmuch-haskell - notmuch-web - - numerical - numeric-ode + - numerical - numhask-hedgehog - numhask-histogram - numhask-range - numhask-test - - Nussinov78 - - NXT - nymphaea - obd - obdd @@ -2115,17 +2226,12 @@ dont-distribute-packages: - one-liner_2_0 - online - online-csv - - OnRmt - open-adt-tutorial - - OpenAFP-Utils - - OpenGLCheck + - open-union - openpgp-crypto-api - - OpenSCAD - openssh-github-keys - opentracing-jaeger - opentracing-zipkin-v1 - - open-union - - OpenVG - optima-for-hasql - optimal-blocks - optimusprime @@ -2133,11 +2239,9 @@ dont-distribute-packages: - orchid-demo - order-maintenance - org-mode-lucid - - OSM - osm-download - otp-authenticator - padKONTROL - - PageIO - pairing - panda - pandoc-japanese-filters @@ -2148,11 +2252,9 @@ dont-distribute-packages: - papa-implement - papa-semigroupoids - paprika - - Paraiso - - Parallel-Arrows-Eden - parco-attoparsec - - parconc-examples - parco-parsec + - parconc-examples - parquet-hs - parse-help - parsestar @@ -2165,7 +2267,6 @@ dont-distribute-packages: - pcapng - pcf - pcf-font-embed - - PCLT-DB - pdf-slave - peakachu - pec @@ -2182,7 +2283,6 @@ dont-distribute-packages: - periodic-client-exe - periodic-server - perm - - PermuteEffects - persistent-audit - persistent-hssqlppp - persistent-map @@ -2217,17 +2317,16 @@ dont-distribute-packages: - planet-mitchell - plocketed - ploterific - - Plot-ho-matic - - PlslTools - png-file - pngload - pocket-dns + - point-octree - pointless-lenses - pointless-rewrite - - point-octree - poke - polh-lexicon - polydata + - polysemy-RandomFu - polysemy-chronos - polysemy-conc - polysemy-extra @@ -2244,7 +2343,7 @@ dont-distribute-packages: - polysemy-optics - polysemy-path - polysemy-plugin - - polysemy-RandomFu + - polysemy-readline - polysemy-resume - polysemy-test - polysemy-time @@ -2277,15 +2376,13 @@ dont-distribute-packages: - powerqueue-sqs - pqueue-mtl - practice-room - - prednote-test - pred-set - pred-trie + - prednote-test - presto-hdbc - preview - primula-board - primula-bot - - Printf-TH - - ProbabilityMonads - proc - process-iterio - process-progress @@ -2303,19 +2400,16 @@ dont-distribute-packages: - proplang - prosidyc - proteome + - proto-lens-descriptors - proto3-suite - protobuf-native - protocol-buffers-descriptor-fork - - proto-lens-descriptors - proton - psc-ide - puffytools - - Pugs - pugs-compat - pugs-hsregex - punkt - - Pup-Events - - Pup-Events-Demo - puppetresources - pure-cdb - pure-priority-queue-tests @@ -2332,7 +2426,6 @@ dont-distribute-packages: - qhs - qr-repa - quantum-random - - Quelea - queryparser - queryparser-demo - queryparser-hive @@ -2376,7 +2469,6 @@ dont-distribute-packages: - random-effin - random-hypergeometric - range-space - - Ranka - rasa - rasa-example-config - rasa-ext-bufs @@ -2409,10 +2501,10 @@ dont-distribute-packages: - record-aeson - record-gl - record-preprocessor - - records-th - record-syntax - - reddit + - records-th - redHandlers + - reddit - reduce-equations - refh - reflex-animation @@ -2428,8 +2520,8 @@ dont-distribute-packages: - regex-genex - regex-pcre-text - regex-pderiv - - regexp-tries - regex-xmlschema + - regexp-tries - regional-pointers - regions-monadsfd - regions-monadstf @@ -2462,20 +2554,18 @@ dont-distribute-packages: - rest-client - rest-core - rest-example - - restful-snap - rest-gen - rest-happstack - - RESTng - - restricted-workers - rest-snap - rest-stringmap - rest-types - rest-wai + - restful-snap + - restricted-workers - rethinkdb-model - rewrite - rewriting - rezoom - - rfc - rfc-env - rfc-http-client - rfc-psql @@ -2491,16 +2581,8 @@ dont-distribute-packages: - ripple - risc-v - rivet - - Rlang-QQ - rlwe-challenges - rmonad - - RMP - - RNAdesign - - RNAdraw - - RNAFold - - RNAFoldProgs - - RNAlien - - RNAwolf - rncryptor - rob - robot @@ -2512,7 +2594,6 @@ dont-distribute-packages: - rollbar-cli - rollbar-wai - rollbar-yesod - - RollingDirectory - ron-schema - ron-storage - rose-trie @@ -2531,7 +2612,7 @@ dont-distribute-packages: - ruler - ruler-core - runtime-arbitrary - - S3 + - s-expression - safer-file-handles - safer-file-handles-bytestring - safer-file-handles-text @@ -2549,29 +2630,25 @@ dont-distribute-packages: - samtools-iteratee - sarsi - sasl + - sat-micro-hs - satchmo-backends - satchmo-examples - satchmo-funsat - satchmo-minisat - satchmo-toysat - - sat-micro-hs - - SBench - - sc2hs - sc2-lowlevel - sc2-support + - sc2hs - sc3-rdu - scalable-server - - SCalendar - - scalpel-search - scalp-webhooks + - scalpel-search - scan-vector-machine - schema - schematic - scholdoc - scholdoc-citeproc - scholdoc-texmath - - SciFlow - - SciFlow-drmaa - scion - scion-browser - scope @@ -2580,15 +2657,12 @@ dont-distribute-packages: - scp-streams - scrabble-bot - scrapbook - - SCRIPTWriter - - Scurry - sde-solver - seakale-postgresql - seakale-tests - secrm - sednaDBXML - seitz-symbol - - SelectSequencesFromMSA - selenium-server - self-extract - semi-iso @@ -2603,6 +2677,7 @@ dont-distribute-packages: - sequor - serpentine - serv + - serv-wai - servant-auth-token - servant-auth-token-acid - servant-auth-token-leveldb @@ -2631,12 +2706,7 @@ dont-distribute-packages: - servant-zeppelin-client - servant-zeppelin-server - servant-zeppelin-swagger - - serv-wai - sessiontypes-distributed - - s-expression - - SFML-control - - SFont - - SGdemo - sgf - sgrep - sha1 @@ -2645,27 +2715,13 @@ dont-distribute-packages: - shapefile - shapely-data - shelduck - - Shellac-compatline - - Shellac-editline - - Shellac-haskeline - - Shellac-readline - shellmate-extras - shine-varying - - ShortestPathProblems - showdown - - Shpadoinkle-backend-pardiff - - Shpadoinkle-backend-static - - Shpadoinkle-developer-tools - - Shpadoinkle-disembodied - - Shpadoinkle-examples - - Shpadoinkle-html - - Shpadoinkle-router - - Shpadoinkle-template - - Shpadoinkle-widgets - shpider - shuffle - - sibe - si-clock + - sibe - sigma-ij - signable - signals @@ -2675,12 +2731,9 @@ dont-distribute-packages: - simgi - simple-c-value - simple-firewire - - SimpleGL - - simpleirc-lens - - SimpleLog - simple-nix - simple-pascal - - SimpleServer + - simpleirc-lens - simseq - singleton-nats_0_4_6 - singletons-base @@ -2697,7 +2750,6 @@ dont-distribute-packages: - smcdel - smith-cli - smith-client - - Smooth - smtlib2-debug - smtlib2-pipe - smtlib2-quickcheck @@ -2706,6 +2758,7 @@ dont-distribute-packages: - snap-auth-cli - snap-elm - snap-extras + - snap-utils - snaplet-actionlog - snaplet-auth-acid - snaplet-coffee @@ -2728,17 +2781,13 @@ dont-distribute-packages: - snaplet-tasks - snaplet-wordpress - snappy-iteratee - - snap-utils - sndfile-enumerators - sneathlane-haste - snm - snmp + - snow-white - snowflake-core - snowflake-server - - snow-white - - Snusmumrik - - SoccerFun - - SoccerFunGL - sock2stream - sockets - solga-swagger @@ -2747,7 +2796,6 @@ dont-distribute-packages: - sounddelay - soundgen - source-code-server - - SourceGraph - sparkle - sparrow - sparsebit @@ -2762,49 +2810,41 @@ dont-distribute-packages: - sphero - sphinx-cli - spice - - SpinCounter - spline3 - splines - - Spock-auth - - Spock-lucid - - Spock-worker - sprinkles - sproxy - - sproxy2 - sproxy-web - - sqlite-simple-typed + - sproxy2 - sql-simple-mysql - sql-simple-pool - sql-simple-postgresql - sql-simple-sqlite + - sqlite-simple-typed - sr-extra - sscgi - sshd-lint - sssp - sstable - stable-tree + - stack-hpc-coveralls + - stack-network + - stack-run-auto - stackage - - stackage2nix - stackage-build-plan - stackage-cabal - stackage-query - stackage-sandbox - stackage-setup - stackage-upload - - stack-hpc-coveralls - - stack-network - - stack-run-auto + - stackage2nix - starrover2 - stateful-mtl - static-closure - statsd-client - statsdi - - STLinkUSB - - STM32-Zombie - stmcontrol - - StockholmAlignment - storablevector-streamfusion - - Strafunski-Sdf2Haskell - stratux - stratux-demo - stratux-http @@ -2837,38 +2877,36 @@ dont-distribute-packages: - superconstraints - sv - sv-cassava + - sv-svfactor - svg2q - - SVG2Q - svgone - - sv-svfactor - swapper - swearjure - sweet-egison - switch - sylvia + - sym-plot - symantic-atom - symantic-lib - symbiote - symmetry-operations-symbols - - sym-plot - syncthing-hs - syntax - syntax-attoparsec - syntax-example - syntax-example-json - - SyntaxMacros - - syntaxnet-haskell - syntax-pretty - syntax-printer + - syntaxnet-haskell - synthesizer-llvm - systemstats - t3-client - ta + - tag-stream - tagged-list - tagged-th - tagsoup-navigate - tagstew - - tag-stream - tal - tamarin-prover - tamarin-prover-term @@ -2883,15 +2921,12 @@ dont-distribute-packages: - tasty-laws - tasty-lens - tateti-tateti - - Taxonomy - - TaxonomyTools - tbox - tccli - tdd-util - tdlib - tdlib-gen - tdlib-types - - TeaHS - techlab - telegram-bot - telegram-raw-api @@ -2901,35 +2936,34 @@ dont-distribute-packages: - tensorflow-ops - terminal-text - terrahs - - testbench - test-framework-sandbox - test-sandbox-compose - test-sandbox-hunit - test-sandbox-quickcheck - test-simple - - TeX-my-math - - textmatetags + - testbench - text-plus - text-trie - text-xml-generic + - textmatetags - th-alpha - th-context + - th-instances + - th-typegraph - theatre - theoremquest-client - thimk - - th-instances - - th-typegraph - thumbnail-polish - - tickle - tic-tac-toe + - tickle - tidal-serial - tighttp - timberc - time-exts - time-http - time-io-access - - timeprint - time-warp + - timeprint - timezone-unix - tinyMesh - tip-haskell-frontend @@ -2937,13 +2971,13 @@ dont-distribute-packages: - titan - tls-extra - tn + - to-string-instances - toboggan - todos - toktok - too-many-cells - top - topkata - - to-string-instances - total-map - toxcore - toxcore-c @@ -2963,14 +2997,11 @@ dont-distribute-packages: - trasa-reflex - trasa-server - trasa-th - - TreeCounter - treemap-html-tools - treersec - - Treiber - trek-app - trek-db - triangulation - - TrieMap - tries - trimpolya - truelevel @@ -2997,22 +3028,20 @@ dont-distribute-packages: - type-assertions - type-cache - type-cereal - - TypeClass - type-combinators-quote - type-combinators-singletons - - typed-encoding-encoding - type-digits - - typed-spreadsheet - - typed-streams - - TypeIlluminator - - typelevel - - typelevel-rewrite-rules - type-ord - type-ord-spine-cereal - - typescript-docs - type-sets - type-structure - type-sub-th + - typed-encoding-encoding + - typed-spreadsheet + - typed-streams + - typelevel + - typelevel-rewrite-rules + - typescript-docs - typson-beam - typson-esqueleto - typson-selda @@ -3021,20 +3050,19 @@ dont-distribute-packages: - ucam-webauth - uhc-light - uhc-util - - UMM - unagi-bloomfilter - unbound - unfoldable-restricted - - unicode-normalization - uni-events - - uniformBase - - uniform-io - uni-graphs - uni-htk - uni-posixutil - - uniqueness-periods-vector-examples - uni-reactor - uni-uDrawGraph + - unicode-normalization + - uniform-io + - uniformBase + - uniqueness-periods-vector-examples - universe-th - unix-fcntl - unix-simple @@ -3050,8 +3078,6 @@ dont-distribute-packages: - urembed - uri-enumerator - uri-enumerator-file - - UrlDisp - - URLT - usb - usb-enumerator - usb-hid @@ -3087,7 +3113,6 @@ dont-distribute-packages: - vformat-aeson - vformat-time - vfr-waypoints - - ViennaRNA-extras - vigilance - vimeta - vinyl-operational @@ -3101,7 +3126,6 @@ dont-distribute-packages: - vty-ui-extras - waargonaut - wahsp - - wai-cli - wai-devel - wai-dispatch - wai-handler-snap @@ -3116,26 +3140,18 @@ dont-distribute-packages: - wai-thrift - waldo - warped - - WashNGo - - WAVE - - WaveFront - wavesurfer - wavy - - web3 - - webapi - - WebBits-Html - - WebBits-multiplate - - WebCont - - webcrank-wai - - webdriver-w3c - web-mongrel2 - web-page - web-rep - web-routes-regular - web-routing + - web3 + - webapi + - webcrank-wai + - webdriver-w3c - webserver - - WEditorBrick - - WEditorHyphen - weighted - werewolf-slack - what4 @@ -3146,13 +3162,11 @@ dont-distribute-packages: - wikipedia4epub - windowslive - winio - - WL500gPControl - - wlc-hs - wl-pprint-ansiterm - wl-pprint-terminfo + - wlc-hs - wobsurv - wolf - - WordAlignment - workflow-extra - workflow-pure - workflow-types @@ -3163,28 +3177,23 @@ dont-distribute-packages: - writer-cps-full - wss-client - wtk-gtk + - wu-wei - wumpus-basic - wumpus-drawing - wumpus-microprint - wumpus-tree - - WURFL - - wu-wei - wx - wxAsteroids + - wxFruit + - wxSimpleCanvas - wxc - wxcore - - WXDiffCtrl - - wxFruit - - WxGeneric - wxhnotepad - - wxSimpleCanvas - wxturtle - wyvern - xdcc - xhb-atom-cache - xhb-ewmh - - XML - - xml2x - xml-catalog - xml-enumerator - xml-enumerator-combinators @@ -3193,34 +3202,31 @@ dont-distribute-packages: - xml-push - xml-query-xml-conduit - xml-query-xml-types - - xmltv - xml-tydom-conduit + - xml2x + - xmltv - xmms2-client - xmms2-client-glib - xmonad-contrib-bluetilebranch - xmpipe - - XMPP - xournal-builder - xournal-convert - xournal-parser - xournal-render - - XSaiga - xtc - - Yablog - - YACPong - yajl-enumerator - yam - yam-datasource - yam-job - yam-logger - - yaml-rpc-scotty - - yaml-rpc-snap - - yaml-unscrambler - yam-redis - yam-transaction - yam-transaction-odbc - yam-transaction-postgresql - yam-web + - yaml-rpc-scotty + - yaml-rpc-snap + - yaml-unscrambler - yarr-image-io - yavie - ycextra @@ -3243,15 +3249,12 @@ dont-distribute-packages: - yesod-session-redis - yjftp - yjftp-libs - - Yogurt - - Yogurt-Standalone - yoko - york-lava - yql - yu-launch - yuuko - zasni-gerna - - Z-Botan - zephyr - zerobin - zeromq3-conduit @@ -3263,16 +3266,13 @@ dont-distribute-packages: - zifter-hindent - zifter-hlint - zifter-stack - - Z-IO - zipper - zippo - ziptastic-client - zlib-enum - zmcat - - Z-MessagePack - zoom-cache - zoom-cache-pcm - zoom-cache-sndfile - zoovisitor - zuramaru - - Z-YAML diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 2b2f23e20eaf..5bf9f460acf8 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -44,6 +44,7 @@ in , libraryFrameworkDepends ? [], executableFrameworkDepends ? [] , homepage ? "https://hackage.haskell.org/package/${pname}" , platforms ? with lib.platforms; all # GHC can cross-compile +, badPlatforms ? lib.platforms.none , hydraPlatforms ? null , hyperlinkSource ? true , isExecutable ? false, isLibrary ? !isExecutable @@ -289,7 +290,7 @@ in lib.fix (drv: assert allPkgconfigDepends != [] -> pkg-config != null; stdenv.mkDerivation ({ - name = "${pname}-${version}"; + inherit pname version; outputs = [ "out" ] ++ (optional enableSeparateDataOutput "data") @@ -663,6 +664,7 @@ stdenv.mkDerivation ({ // optionalAttrs (args ? description) { inherit description; } // optionalAttrs (args ? maintainers) { inherit maintainers; } // optionalAttrs (args ? hydraPlatforms) { inherit hydraPlatforms; } + // optionalAttrs (args ? badPlatforms) { inherit badPlatforms; } // optionalAttrs (args ? changelog) { inherit changelog; } ; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 87864a11e56a..4e8e61c05b08 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -7753,6 +7753,7 @@ self: { ]; description = "The Haskell/R mixed programming environment"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "HABQT" = callPackage @@ -8818,17 +8819,17 @@ self: { ({ mkDerivation, base, constraints, containers, data-default , deepseq, directory, doctest-exitcode-stdio, doctest-lib , exceptions, extra, hspec, monad-control, mono-traversable, mtl - , QuickCheck, regex-tdfa, syb, template-haskell, transformers-base - , unliftio + , QuickCheck, regex-tdfa, stm, syb, template-haskell + , transformers-base, unliftio }: mkDerivation { pname = "HMock"; - version = "0.1.0.1"; - sha256 = "1viv8aggapxvk1akm1z3976h4b12wa8zwkr5qinfpvmsgvlkhhlz"; + version = "0.2.0.0"; + sha256 = "1i5b9fxb5fii3ib97dncr5pfsylj5bsppi45qx7wq1idmz0fq3rj"; libraryHaskellDepends = [ base constraints containers data-default exceptions extra - monad-control mono-traversable mtl regex-tdfa syb template-haskell - transformers-base unliftio + monad-control mono-traversable mtl regex-tdfa stm syb + template-haskell transformers-base unliftio ]; testHaskellDepends = [ base containers data-default deepseq directory @@ -35089,8 +35090,8 @@ self: { }: mkDerivation { pname = "attoparsec-data"; - version = "1.0.5.1"; - sha256 = "1fn28rg79w5kkv3lrmqjcff8fhn1kc2b84vnblr0xqbfdjdbzgp6"; + version = "1.0.5.2"; + sha256 = "05x7xij5jyfzcl0hyjjw4lxlzgkmi55q48s5vbgvba48a2crv0qj"; libraryHaskellDepends = [ attoparsec attoparsec-time base bytestring scientific text time uuid @@ -35234,16 +35235,12 @@ self: { }) {}; "attoparsec-time" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, scientific, text - , time - }: + ({ mkDerivation, attoparsec, base, bytestring, text, time }: mkDerivation { pname = "attoparsec-time"; - version = "1.0.1.1"; - sha256 = "1g3wfc499zdz79i06hgg4286ky9yv4mi3jgq1zf92ik1wcw23q6l"; - libraryHaskellDepends = [ - attoparsec base bytestring scientific text time - ]; + version = "1.0.1.2"; + sha256 = "1pc4dy4d6q11cfmgrg41h2nm34vgnnarah85gnwbd6x48cissrpp"; + libraryHaskellDepends = [ attoparsec base bytestring text time ]; description = "Attoparsec parsers of time"; license = lib.licenses.mit; }) {}; @@ -38232,6 +38229,8 @@ self: { pname = "base32"; version = "0.2.1.0"; sha256 = "1c1qzbri6m8b2m1cr68vrjbny6wlvfyrbfyzd61s83a3y3w39plp"; + revision = "1"; + editedCabalFile = "0apyphnlsnr16s5xb9b9g7d5aw3ny4qx8nz8y71zpglk63sy0cq0"; libraryHaskellDepends = [ base bytestring deepseq ghc-byteorder text text-short ]; @@ -39495,6 +39494,35 @@ self: { broken = true; }) {}; + "bech32_1_1_1" = callPackage + ({ mkDerivation, array, base, base58-bytestring, bytestring + , containers, deepseq, extra, hspec, hspec-discover, memory + , optparse-applicative, process, QuickCheck, text, vector + }: + mkDerivation { + pname = "bech32"; + version = "1.1.1"; + sha256 = "0ibdibki3f51wpxby3cl6p0xzd32ddczlg2dcqxy7lgx7j3h9xgn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring containers extra text + ]; + executableHaskellDepends = [ + base base58-bytestring bytestring extra memory optparse-applicative + text + ]; + testHaskellDepends = [ + base base58-bytestring bytestring containers deepseq extra hspec + memory process QuickCheck text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "bech32-th" = callPackage ({ mkDerivation, base, bech32, hspec, hspec-discover , template-haskell, text @@ -39513,6 +39541,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "bech32-th_1_1_1" = callPackage + ({ mkDerivation, base, bech32, hspec, hspec-discover + , template-haskell, text + }: + mkDerivation { + pname = "bech32-th"; + version = "1.1.1"; + sha256 = "0548an9v6y14qalb1agl5bskcmpb9865lxyap162xzgskd9s4iik"; + libraryHaskellDepends = [ base bech32 template-haskell text ]; + testHaskellDepends = [ base bech32 hspec template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Template Haskell extensions to the Bech32 library"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "bed-and-breakfast" = callPackage ({ mkDerivation, array, base, binary, cpphs, deepseq, QuickCheck , template-haskell @@ -44256,8 +44300,8 @@ self: { }: mkDerivation { pname = "blucontrol"; - version = "0.5.1.1"; - sha256 = "0v3ifwxjbxm86ybn5daqqfdm4nmbfzlbkyc19d4nawnzjyf8v2p9"; + version = "0.6.0.0"; + sha256 = "1rywy6r5wachz3y9vw1iy5b46fvlxcv5s33lrriffimqprkglbcj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47353,8 +47397,8 @@ self: { }: mkDerivation { pname = "bytebuild"; - version = "0.3.7.0"; - sha256 = "1vckm98sarxzqh6ib89y5kzhbf1yxc9wgrbpwbsrh0dv5gi3pclj"; + version = "0.3.8.0"; + sha256 = "19gg4qjlj595j8zd0n6cz2kgz70g8z6w666c6wlf5lj32j8p6yh5"; libraryHaskellDepends = [ base byteslice bytestring integer-logarithms natural-arithmetic primitive primitive-offset primitive-unlifted run-st text-short @@ -50184,8 +50228,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.30.2"; - sha256 = "0i0v8cb0a3mbkrb3liw60gb7zflnps5w04a6nx5aynini7mpwanj"; + version = "0.1.30.3"; + sha256 = "0r6vrcdqqf6a8rihjgppmp625ws5vmsmq98i177xfg14hsal49pp"; libraryHaskellDepends = [ aeson async base bytestring calamity-commands colour concurrent-extra connection containers data-default-class @@ -53125,7 +53169,6 @@ self: { ]; description = "A REST Web Api server template for building (micro)services"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "chalk" = callPackage @@ -54638,6 +54681,8 @@ self: { ]; description = "Channel/Arrow based streaming computation library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cielo" = callPackage @@ -58667,6 +58712,24 @@ self: { license = lib.licenses.mit; }) {}; + "colour_2_3_6" = callPackage + ({ mkDerivation, base, QuickCheck, random, test-framework + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "colour"; + version = "2.3.6"; + sha256 = "0wgqj64mh2y2zk77kv59k3xb3dk4wmgfp988y74sp9a4d76mvlrc"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base QuickCheck random test-framework test-framework-quickcheck2 + ]; + description = "A model for human colour/color perception"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "colour-accelerate" = callPackage ({ mkDerivation, accelerate, base }: mkDerivation { @@ -67215,8 +67278,8 @@ self: { }: mkDerivation { pname = "cuckoo"; - version = "0.2.1"; - sha256 = "1bv39vfg0yzancyya1cdbrcdc0gasp0djcc9ryiwrc3kf9y0nbzn"; + version = "0.2.2"; + sha256 = "1wm81a5fsq0wdvx3ayxfrljya7rm9c0vfmy5dhxa6h9zxnqrkvav"; libraryHaskellDepends = [ base memory primitive random vector ]; testHaskellDepends = [ base bytestring cryptonite doctest hashable memory primitive @@ -69699,6 +69762,18 @@ self: { license = lib.licenses.mit; }) {}; + "data-lens-light_0_1_2_3" = callPackage + ({ mkDerivation, base, mtl, template-haskell }: + mkDerivation { + pname = "data-lens-light"; + version = "0.1.2.3"; + sha256 = "1xczbmgin315qh9wpl6v2vvnp6hv1irfbfqs7pk034qcpx61fwdl"; + libraryHaskellDepends = [ base mtl template-haskell ]; + description = "Simple lenses, minimum dependencies"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "data-lens-template" = callPackage ({ mkDerivation, base, data-lens, template-haskell }: mkDerivation { @@ -73854,6 +73929,8 @@ self: { pname = "dhall-docs"; version = "1.0.6"; sha256 = "004n8kh8riw67aqwp6z9199jwv2c9r1dbkg92s71vd9zc04wxljv"; + revision = "1"; + editedCabalFile = "1m8ms4y4pxiays620k4zjf7hnfk103y990pnhnb6hr0h70n7i157"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -74537,6 +74614,8 @@ self: { pname = "diagrams-graphviz"; version = "1.4.1.1"; sha256 = "0lscrxd682jvyrl5bj4dxp7593qwyis01sl0p4jm2jfn335wdq40"; + revision = "1"; + editedCabalFile = "1qx69541pxf71whfz2a913yzbhfcks2pyzfprkgrcmiiyv0a3i7b"; libraryHaskellDepends = [ base containers diagrams-lib fgl graphviz split ]; @@ -75620,8 +75699,8 @@ self: { }: mkDerivation { pname = "digraph"; - version = "0.2"; - sha256 = "0k6kr1vr25i2jvv2q1xby06b7xkpg2dr4sq2ffnv0lmznshjy8y5"; + version = "0.2.1"; + sha256 = "04x8y6snlfm8w22l0mn58sqbgdsc3av9l6qz2wqfdjmcp7h7s79r"; libraryHaskellDepends = [ base containers deepseq hashable massiv mwc-random streaming transformers unordered-containers @@ -78678,8 +78757,8 @@ self: { }: mkDerivation { pname = "domain"; - version = "0.1.1.1"; - sha256 = "1vy789dv1lpha2bxvr0x1vk2vvgb9z43abkqi1rbj2vvirqsbr1n"; + version = "0.1.1.2"; + sha256 = "0s4x7jhhcx94fzi8cg5bqfqn2vajdlv1yjrakfnfdqk187zbdc6r"; libraryHaskellDepends = [ attoparsec base bytestring domain-core foldl hashable parser-combinators template-haskell template-haskell-compat-v0208 @@ -78687,7 +78766,8 @@ self: { ]; testHaskellDepends = [ base domain-core QuickCheck quickcheck-instances rerebase tasty - tasty-hunit tasty-quickcheck template-haskell text th-orphans + tasty-hunit tasty-quickcheck template-haskell + template-haskell-compat-v0208 text th-orphans ]; description = "Codegen helping you define domain models"; license = lib.licenses.mit; @@ -85429,7 +85509,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "esqueleto_3_5_1_0" = callPackage + "esqueleto_3_5_2_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, hspec-core, monad-logger , mtl, mysql, mysql-simple, persistent, persistent-mysql @@ -85439,8 +85519,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.5.1.0"; - sha256 = "1r77lym11gh53059b3hg5wyzb4ymaynk5awrmzgnwfkmx041sqp8"; + version = "3.5.2.0"; + sha256 = "06z5n0nbyrdvzlfqmx3jvh76kkss3bis19k5ppqkifsfgwi07rzw"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -88678,8 +88758,8 @@ self: { }: mkDerivation { pname = "fakedata-quickcheck"; - version = "0.1.0"; - sha256 = "0al5brin9bs0553rrw073za4jzw2whrf05yj6h34lmx4kxzciv6s"; + version = "0.2.0"; + sha256 = "0m70r66vbkgi1d016cpgahaas17hysabp44nigz4cda9l3x6qmh6"; libraryHaskellDepends = [ base fakedata QuickCheck random ]; testHaskellDepends = [ base fakedata hspec hspec-core QuickCheck random regex-tdfa text @@ -96670,8 +96750,8 @@ self: { }: mkDerivation { pname = "funcons-tools"; - version = "0.2.0.11"; - sha256 = "1gi7db5mjq25xwl27ihsrg0ya1jgw5zhki5c1431rizj72yx5ji9"; + version = "0.2.0.13"; + sha256 = "0favv5lfhhhsjasn0gfx2m9q18j8qjk3w92ih78nqaam8gfg59vm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96693,10 +96773,10 @@ self: { ({ mkDerivation, base, bv, containers, multiset, text, vector }: mkDerivation { pname = "funcons-values"; - version = "0.1.0.7"; - sha256 = "0jdgwv44gs4zr8z5pg6lzikrgn3dzna8z0vriq71anlifjyci8yq"; + version = "0.1.0.9"; + sha256 = "1817jhp9vpipkvxdqvn4yj88z7z3pyrxs22h4d51c3056ighq6wn"; revision = "1"; - editedCabalFile = "1aam84wminmcy530vkv8g2qkag6gz45yyx5xks7gq1y7jifm1kkb"; + editedCabalFile = "1g807b4lpz0whz0v4xl7y0qj0682y9lvmng06rxxyabn2lcvx5sc"; libraryHaskellDepends = [ base bv containers multiset text vector ]; @@ -97353,6 +97433,8 @@ self: { pname = "futhark-data"; version = "1.0.0.1"; sha256 = "126b7igrk0aldj4kjwkyvvsy3v64g9iv6w9ladbbfnd4qw7svswm"; + revision = "1"; + editedCabalFile = "08p820dmdlg5x6ikgi69sddkywj71cnnjwz2fppnv901bbn55fav"; libraryHaskellDepends = [ base binary bytestring bytestring-to-vector containers megaparsec mtl text vector vector-binary-instances @@ -104049,8 +104131,9 @@ self: { libraryPkgconfigDepends = [ libwnck ]; description = "Wnck bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) libwnck;}; "gi-xlib" = callPackage @@ -104890,6 +104973,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "githash_0_1_6_1" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , process, template-haskell, temporary, th-compat, unliftio + }: + mkDerivation { + pname = "githash"; + version = "0.1.6.1"; + sha256 = "0g922g2l3xv795gvhri5ccrh751dnyckjs7mzv1d8pg2lffpj0bi"; + libraryHaskellDepends = [ + base bytestring directory filepath process template-haskell + th-compat + ]; + testHaskellDepends = [ + base bytestring directory filepath hspec process template-haskell + temporary th-compat unliftio + ]; + description = "Compile git revision info into Haskell projects"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "github" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , binary, binary-instances, bytestring, containers, cryptohash-sha1 @@ -105266,6 +105370,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "gitlab-haskell_0_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, connection, http-conduit + , http-types, tasty, tasty-hunit, temporary, text, time + , transformers, unix, unliftio, unliftio-core + }: + mkDerivation { + pname = "gitlab-haskell"; + version = "0.3.0"; + sha256 = "0krcan8i9lkickl77r9dyf93k96yxj5zp0asmzq86ds13m8f3s9i"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring connection http-conduit http-types temporary + text time transformers unix unliftio unliftio-core + ]; + testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; + description = "A Haskell library for the GitLab web API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "gitlib" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, conduit , conduit-combinators, containers, directory, exceptions, filepath @@ -129646,8 +129770,8 @@ self: { }: mkDerivation { pname = "hledger-flow"; - version = "0.14.3.0"; - sha256 = "113lr6b47fs3900wrn8fg1kxcbvfh91gla7585h13miz3wyjbdyf"; + version = "0.14.4"; + sha256 = "1qvh5vgnk6vrhhr1kjqsycz13acxa7ynpqnd1bmchfl4q3aga9gw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138853,6 +138977,8 @@ self: { ]; description = "SSH protocol implementation"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hsshellscript" = callPackage @@ -139686,8 +139812,8 @@ self: { pname = "html-parse"; version = "0.2.0.2"; sha256 = "0dm771lrrqc87ygbr3dzyl1vsyi30jgr7l0isvsbqyah7s4zyg38"; - revision = "1"; - editedCabalFile = "1hr9bskwwx3svxqaxcyaz8v0brli1bb03xcvg7zpgbisf8x6r316"; + revision = "2"; + editedCabalFile = "1arck1sfcnqfczpi6zq4rja3svd3vcxxdi69dv9983v3sl01hk2g"; libraryHaskellDepends = [ attoparsec base containers deepseq text ]; @@ -144402,8 +144528,8 @@ self: { }: mkDerivation { pname = "hypertypes"; - version = "0.1.0.1"; - sha256 = "0b3cnjw07pryqslnx0k6lxdpwnihnk6pnhp6l9d09mqyxymd9nyx"; + version = "0.1.0.2"; + sha256 = "1zh10884a2fvj06ndh4hz2vk97x4nibr57b30kgq731x4q50zgfs"; libraryHaskellDepends = [ array base base-compat binary constraints containers deepseq generic-constraints generic-data lattices lens monad-st mtl pretty @@ -145703,6 +145829,7 @@ self: { ]; description = "Embed R quasiquotes and plots in IHaskell notebooks"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ihaskell-juicypixels" = callPackage @@ -147694,6 +147821,8 @@ self: { ]; description = "Seamlessly call R from Haskell and vice versa. No FFI required."; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) R;}; "inliterate" = callPackage @@ -149399,8 +149528,8 @@ self: { ({ mkDerivation, base, binary, bytestring, iproute }: mkDerivation { pname = "ip2location"; - version = "8.2.1"; - sha256 = "1ccr15yn2ska5wgwlcnfpi9w1xxkly0pwqibmdl9a1ggmwfsskv0"; + version = "8.3.1"; + sha256 = "01sdx0j0rm7rgylac51mk4ph5krdnzdd8532di5g5ik3p112dzg8"; libraryHaskellDepends = [ base binary bytestring iproute ]; description = "IP2Location Haskell package for IP geolocation"; license = lib.licenses.mit; @@ -153778,8 +153907,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.5.3"; - sha256 = "00774gby970jxa69zw8baki40r6nw7vrprc670n8skmlp03p38j2"; + version = "0.5.4"; + sha256 = "10lmx9xwikk4sbc3ffpzqff9qxpphgp2q8w2rdm2iskaa7qi3skn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156121,8 +156250,8 @@ self: { }: mkDerivation { pname = "knit"; - version = "0.2.0.0"; - sha256 = "0a1swv5w9fxissxqr2x61qijqyhdxs71fv21fjz4r0kcqywnvy6x"; + version = "0.3.0.0"; + sha256 = "0wp16yrlibfl32b4akcwali074wxar96mvaykgh0xsf4pq1czx3q"; libraryHaskellDepends = [ base bytestring containers deepseq hashtables vector ]; @@ -164941,6 +165070,31 @@ self: { license = lib.licenses.mit; }) {}; + "literatex_0_2_0_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, conduit + , filepath, optparse-applicative, tasty, tasty-hunit, text, ttc + , unliftio + }: + mkDerivation { + pname = "literatex"; + version = "0.2.0.0"; + sha256 = "1j5x1hfh71jpywgwpbyir74h58b6lzaj7gpk2f07xlcwqmm68syz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring conduit text ttc unliftio + ]; + executableHaskellDepends = [ + ansi-wl-pprint base optparse-applicative ttc + ]; + testHaskellDepends = [ + base bytestring filepath tasty tasty-hunit text ttc unliftio + ]; + description = "transform literate source code to Markdown"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "little-earley" = callPackage ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }: mkDerivation { @@ -166064,8 +166218,8 @@ self: { }: mkDerivation { pname = "log-elasticsearch"; - version = "0.12.0.0"; - sha256 = "05cvk93s61k42bmsmj4997hdij4xk74a6jrd1qvdbkq13w20260m"; + version = "0.12.1.0"; + sha256 = "07z0p5jcd5gjhk4dyf9ny74l68ja58ffa80mbfsyaz66ff6k4y6s"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq http-client http-client-tls http-types log-base network-uri @@ -171134,6 +171288,29 @@ self: { broken = true; }) {}; + "matrix-client" = callPackage + ({ mkDerivation, aeson, base, base64, bytestring, doctest + , exceptions, hashable, hspec, http-client, http-client-tls, retry + , SHA, text, time, unordered-containers + }: + mkDerivation { + pname = "matrix-client"; + version = "0.1.0.0"; + sha256 = "10w1q846b4jnyg9yb87d69ixfyhl205ryrib6a53pbk0bx6zn59w"; + libraryHaskellDepends = [ + aeson base base64 bytestring exceptions hashable http-client + http-client-tls retry SHA text time unordered-containers + ]; + testHaskellDepends = [ + aeson base base64 bytestring doctest exceptions hashable hspec + http-client http-client-tls retry SHA text time + unordered-containers + ]; + description = "A matrix client library"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ maralorn ]; + }) {}; + "matrix-lens" = callPackage ({ mkDerivation, base, hedgehog, lens, matrix, tasty , tasty-discover, tasty-hedgehog, tasty-hspec, vector @@ -172903,16 +173080,14 @@ self: { }) {}; "merkle-log" = callPackage - ({ mkDerivation, base, bytestring, cereal, criterion, cryptonite - , deepseq, exceptions, hash-tree, memory, merkle-tree, mwc-random - , QuickCheck, random, random-bytestring, text + ({ mkDerivation, base, bytestring, criterion, cryptonite, deepseq + , exceptions, hash-tree, memory, mwc-random, QuickCheck, random + , random-bytestring, text }: mkDerivation { pname = "merkle-log"; - version = "0.1.0.0"; - sha256 = "07q0ifgwq8agwm62k1k83sdrln4zbj6ln90nw9p9g3pgxnp3inia"; - revision = "1"; - editedCabalFile = "1vrzsflvmx0mrsdb7i7pbz4d74k6yjccrb7979yw0r91qhmzlcir"; + version = "0.1.1"; + sha256 = "17a6s9xbv460289avbwdnf8c4vhw9qzj5xddxvfmnjjwp58qxvj1"; libraryHaskellDepends = [ base bytestring cryptonite deepseq exceptions memory text ]; @@ -172920,8 +173095,8 @@ self: { base bytestring cryptonite deepseq exceptions memory QuickCheck ]; benchmarkHaskellDepends = [ - base bytestring cereal criterion cryptonite deepseq hash-tree - memory merkle-tree mwc-random QuickCheck random random-bytestring + base bytestring criterion cryptonite deepseq hash-tree memory + mwc-random QuickCheck random random-bytestring ]; description = "Merkle Tree Logs"; license = lib.licenses.bsd3; @@ -173594,31 +173769,33 @@ self: { }) {}; "microformats2-parser" = callPackage - ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base - , base-compat, blaze-html, blaze-markup, bytestring, containers - , data-default, either, errors, hspec - , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl - , network, network-uri, options, pcre-heavy, raw-strings-qq, safe - , scotty, tagsoup, template-haskell, text, time, transformers - , unordered-containers, vector, wai-cli, wai-extra, xml-lens - , xss-sanitize + ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec + , aws-lambda-haskell-runtime, aws-lambda-haskell-runtime-wai, base + , base-compat, blaze-html, blaze-markup, bytestring + , case-insensitive, containers, data-default, either, errors + , githash, hspec, hspec-expectations-pretty-diff, html-conduit + , lens, lens-aeson, mtl, network, network-uri, options, pcre-heavy + , raw-strings-qq, safe, scotty, tagsoup, template-haskell, text + , time, transformers, unordered-containers, vector, wai, wai-cli + , wai-extra, xml-lens, xss-sanitize }: mkDerivation { pname = "microformats2-parser"; - version = "1.0.1.9"; - sha256 = "1lxbw825yg16nmflf93l1sy6mxa3dnd7a5mdalc034brsnf1vish"; + version = "1.0.2.0"; + sha256 = "1vrw60az8jb3m9kk2vsn1v5l68jmwxsfw3p7lfwl9a8d4gk5m1gp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-qq attoparsec base base-compat blaze-markup bytestring - containers data-default either errors html-conduit lens-aeson - network-uri pcre-heavy safe tagsoup text time transformers - unordered-containers vector xml-lens xss-sanitize + case-insensitive containers data-default either errors html-conduit + lens lens-aeson network-uri pcre-heavy safe tagsoup text time + transformers unordered-containers vector xml-lens xss-sanitize ]; executableHaskellDepends = [ - aeson aeson-pretty base base-compat blaze-html blaze-markup - data-default network network-uri options scotty text wai-cli - wai-extra + aeson aeson-pretty aws-lambda-haskell-runtime + aws-lambda-haskell-runtime-wai base base-compat blaze-html + blaze-markup data-default githash network network-uri options + scotty text wai wai-cli wai-extra ]; testHaskellDepends = [ aeson-qq base base-compat bytestring data-default hspec @@ -173628,6 +173805,7 @@ self: { description = "A Microformats 2 parser"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "microformats2-types" = callPackage @@ -189008,8 +189186,8 @@ self: { pname = "nvim-hs"; version = "2.1.0.4"; sha256 = "0bg94adja6xvzlv1x849nrfpb0i5mjbp19f9cwhaa4iw1qs532rf"; - revision = "1"; - editedCabalFile = "0yzdq8nxf2n7n4ns6frgl5nhgb3vj3nkh7336mz994iydam17wcl"; + revision = "2"; + editedCabalFile = "0bd90ndkk4lll4rvr87b9vil2h8jlchkh1fag1nrhj90lnczgpnl"; libraryHaskellDepends = [ base bytestring cereal cereal-conduit conduit containers data-default deepseq foreign-store hslogger megaparsec messagepack @@ -189033,6 +189211,44 @@ self: { license = lib.licenses.asl20; }) {}; + "nvim-hs_2_1_0_5" = callPackage + ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit + , containers, data-default, deepseq, foreign-store, hslogger, hspec + , hspec-discover, HUnit, megaparsec, messagepack, mtl, network + , optparse-applicative, path, path-io, prettyprinter + , prettyprinter-ansi-terminal, QuickCheck, resourcet, stm + , streaming-commons, template-haskell, text, time + , time-locale-compat, transformers, transformers-base + , typed-process, unliftio, unliftio-core, utf8-string, vector, void + }: + mkDerivation { + pname = "nvim-hs"; + version = "2.1.0.5"; + sha256 = "11ld5bgrica3ma54f7x37hcbcl0ms3x6gi0326by3jsnskxplz0z"; + libraryHaskellDepends = [ + base bytestring cereal cereal-conduit conduit containers + data-default deepseq foreign-store hslogger megaparsec messagepack + mtl network optparse-applicative path path-io prettyprinter + prettyprinter-ansi-terminal resourcet stm streaming-commons + template-haskell text time time-locale-compat transformers + transformers-base typed-process unliftio unliftio-core utf8-string + vector void + ]; + testHaskellDepends = [ + base bytestring cereal cereal-conduit conduit containers + data-default foreign-store hslogger hspec hspec-discover HUnit + megaparsec messagepack mtl network optparse-applicative path + path-io prettyprinter prettyprinter-ansi-terminal QuickCheck + resourcet stm streaming-commons template-haskell text time + time-locale-compat transformers transformers-base typed-process + unliftio unliftio-core utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell plugin backend for neovim"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "nvim-hs-contrib" = callPackage ({ mkDerivation, base, bytestring, data-default, directory , filepath, hspec, hspec-discover, messagepack, mtl, nvim-hs @@ -192465,12 +192681,12 @@ self: { }) {}; "optparse-declarative" = callPackage - ({ mkDerivation, base, mtl }: + ({ mkDerivation, base, exceptions, mtl }: mkDerivation { pname = "optparse-declarative"; - version = "0.4.1"; - sha256 = "0paa7r64y0nb9yv3x387pdid68lnc1gn2m28kcli55dvh1x4wwxr"; - libraryHaskellDepends = [ base mtl ]; + version = "0.4.2"; + sha256 = "0a8b4aa5zvj36nj81kfylxcqfp9ahi5lnak61wvwv9bw68r2a2jn"; + libraryHaskellDepends = [ base exceptions mtl ]; description = "Declarative command line option parser"; license = lib.licenses.mit; }) {}; @@ -192541,6 +192757,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "optparse-simple_0_1_1_4" = callPackage + ({ mkDerivation, base, bytestring, directory, githash + , optparse-applicative, template-haskell, th-compat, transformers + }: + mkDerivation { + pname = "optparse-simple"; + version = "0.1.1.4"; + sha256 = "0y3qgab8csiwyv60cnpzpv65n3c0ikvdx5b5mfkfahkv8xfdh08x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base githash optparse-applicative template-haskell th-compat + transformers + ]; + testHaskellDepends = [ base bytestring directory ]; + description = "Simple interface to optparse-applicative"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "optparse-text" = callPackage ({ mkDerivation, base, hspec, optparse-applicative, text }: mkDerivation { @@ -194186,6 +194422,65 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "pandoc_2_14_0_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base + , base64-bytestring, binary, blaze-html, blaze-markup, bytestring + , case-insensitive, citeproc, commonmark, commonmark-extensions + , commonmark-pandoc, connection, containers, data-default, deepseq + , Diff, directory, doclayout, doctemplates, emojis, exceptions + , file-embed, filepath, Glob, haddock-library, hslua + , hslua-module-path, hslua-module-system, hslua-module-text, HsYAML + , HTTP, http-client, http-client-tls, http-types, ipynb + , jira-wiki-markup, JuicyPixels, mtl, network, network-uri + , pandoc-types, parsec, process, QuickCheck, random, safe + , scientific, SHA, skylighting, skylighting-core, split, syb + , tagsoup, tasty, tasty-bench, tasty-golden, tasty-hunit, tasty-lua + , tasty-quickcheck, temporary, texmath, text, text-conversions + , time, unicode-collation, unicode-transforms, unix + , unordered-containers, xml, xml-conduit, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "2.14.0.3"; + sha256 = "1pgd6125mrvzj2faxbsfmackb7kchzcr6bjkrwqbyn9hzxdzbqw2"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty array attoparsec base base64-bytestring binary + blaze-html blaze-markup bytestring case-insensitive citeproc + commonmark commonmark-extensions commonmark-pandoc connection + containers data-default deepseq directory doclayout doctemplates + emojis exceptions file-embed filepath Glob haddock-library hslua + hslua-module-path hslua-module-system hslua-module-text HsYAML HTTP + http-client http-client-tls http-types ipynb jira-wiki-markup + JuicyPixels mtl network network-uri pandoc-types parsec process + random safe scientific SHA skylighting skylighting-core split syb + tagsoup temporary texmath text text-conversions time + unicode-collation unicode-transforms unix unordered-containers xml + xml-conduit zip-archive zlib + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring containers Diff directory doctemplates exceptions + filepath Glob hslua mtl pandoc-types process QuickCheck tasty + tasty-golden tasty-hunit tasty-lua tasty-quickcheck text time xml + zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring containers deepseq mtl tasty-bench text time + ]; + postInstall = '' + mkdir -p $out/share/man/man1 + mv "man/"*.1 $out/share/man/man1/ + ''; + description = "Conversion between markup formats"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -196066,8 +196361,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "parsec1"; - version = "1.0.0.7"; - sha256 = "1v9kq4g378v8pkj8ldpqwh9dwlng5idbxqqb8ywmzdjnglih34rf"; + version = "1.0.0.8"; + sha256 = "02zagbrn4w6gjl9awh4si5b6ia14p4rx22cssd03zx4ddb8kcwf7"; libraryHaskellDepends = [ base ]; description = "Portable monadic parser combinators"; license = lib.licenses.bsd3; @@ -199002,7 +199297,7 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {}; - "persistent_2_13_0_3" = callPackage + "persistent_2_13_0_4" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, criterion, deepseq , fast-logger, file-embed, hspec, http-api-data, lift-type @@ -199013,8 +199308,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.13.0.3"; - sha256 = "0jlrkyy10cz6rq47r75q9l5ycyrdjwxs810x7v5ijrimdd9cv24d"; + version = "2.13.0.4"; + sha256 = "04q4x50p2jpsp7fzrb61rs225hnrl8n1khmdvf0z6inkwq462w6a"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data lift-type monad-logger @@ -203390,6 +203685,8 @@ self: { ]; description = "run a subprocess, combining stdout and stderr"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "plist" = callPackage @@ -203588,8 +203885,8 @@ self: { }: mkDerivation { pname = "ploterific"; - version = "0.2.1.2"; - sha256 = "1ywg09amxngan23c5724c5s2s79yhynqha6c5xivg1ls58nc7yk5"; + version = "0.2.1.3"; + sha256 = "0ggi653hjg9s3v9zqsapm3ryb37hfdbw21pznhsvzhyy3n0fv7jv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -204883,6 +205180,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "polysemy-readline" = callPackage + ({ mkDerivation, base, exceptions, haskeline, polysemy + , polysemy-plugin + }: + mkDerivation { + pname = "polysemy-readline"; + version = "0.1.0.0"; + sha256 = "19nic0n5k3r5qbmhnrzwrkncj61ba43qmg86mx0y190mvx540yz1"; + libraryHaskellDepends = [ + base exceptions haskeline polysemy polysemy-plugin + ]; + testHaskellDepends = [ + base exceptions haskeline polysemy polysemy-plugin + ]; + description = "Readline effect for polysemy"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "polysemy-resume" = callPackage ({ mkDerivation, base, hedgehog, polysemy, polysemy-plugin , polysemy-test, relude, tasty, tasty-hedgehog, text, transformers @@ -216627,24 +216943,24 @@ self: { , filepath, hashable, html-entities, http-conduit, HUnit , lifted-base, mmorph, mtl, network-uri, parsec, parsers , QuickCheck, safe, selective, tasty, tasty-hunit, tasty-quickcheck - , text, unordered-containers, xeno + , template-haskell, temporary, text, unordered-containers, xeno }: mkDerivation { pname = "rdf4h"; - version = "4.0.2"; - sha256 = "1gkz1i1v2509aa5c9jp2lgmsnnsr7d1314gq3xmcs21dfgf7xibw"; + version = "5.0.1"; + sha256 = "0i6sza600fzrk92pp9qc4ji361js5adg7ijf30hb9fdl854hjgk9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ algebraic-graphs attoparsec base binary bytestring containers deepseq exceptions filepath hashable html-entities http-conduit - lifted-base mmorph mtl network-uri parsec parsers selective text - unordered-containers xeno + lifted-base mmorph mtl network-uri parsec parsers selective + template-haskell text unordered-containers xeno ]; executableHaskellDepends = [ base containers text ]; testHaskellDepends = [ - base containers directory filepath HUnit QuickCheck safe tasty - tasty-hunit tasty-quickcheck text + base bytestring containers directory filepath HUnit QuickCheck safe + tasty tasty-hunit tasty-quickcheck temporary text ]; benchmarkHaskellDepends = [ base criterion deepseq text ]; description = "A library for RDF processing in Haskell"; @@ -222901,6 +223217,7 @@ self: { description = "Robert Fischer's Common library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rfc-env" = callPackage @@ -223672,8 +223989,8 @@ self: { }: mkDerivation { pname = "rio-process-pool"; - version = "1.0.0"; - sha256 = "09v95wyrsa6yg5q5zaf9gqmn2xhh1i1q2mmxq52xhpc8pqwj93b9"; + version = "1.0.1"; + sha256 = "1r3w7p9yf2k2czdwm739y191x25ravbsn948wwgqxsqamsqs7l18"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -231554,14 +231871,41 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant_0_18_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors + , bytestring, case-insensitive, deepseq, hspec, hspec-discover + , http-api-data, http-media, http-types, mmorph, mtl, network-uri + , QuickCheck, quickcheck-instances, singleton-bool, sop-core + , string-conversions, tagged, text, transformers, vault + }: + mkDerivation { + pname = "servant"; + version = "0.18.3"; + sha256 = "033ykm8l7a9bjcwb3v9d0ljglq1sxpjm1iss7nqakpyxljcg2sxp"; + libraryHaskellDepends = [ + aeson attoparsec base base-compat bifunctors bytestring + case-insensitive deepseq http-api-data http-media http-types mmorph + mtl network-uri QuickCheck singleton-bool sop-core + string-conversions tagged text transformers vault + ]; + testHaskellDepends = [ + aeson base base-compat bytestring hspec http-media mtl QuickCheck + quickcheck-instances string-conversions text transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "A family of combinators for defining webservices APIs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-JuicyPixels" = callPackage ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant , servant-server, wai, warp }: mkDerivation { pname = "servant-JuicyPixels"; - version = "0.3.0.6"; - sha256 = "16bdlgrz71h03lr2xcd2isclfzgr9h2xdl5lbnbs0v1czaxx7m6h"; + version = "0.3.1.0"; + sha256 = "1mi9b84myy3sg35xxrna5pwjwkn51v0xsd300ssvy8xaj4k96wjk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -231611,8 +231955,8 @@ self: { pname = "servant-auth"; version = "0.4.0.0"; sha256 = "0v2g80kakjwpws92bk3anzy4k8vgxq99y7g3ib4amc5x6kxcmjh1"; - revision = "2"; - editedCabalFile = "0mbx44l1jnvfvppv6diiixqx5rdkb68djxl36m5sd12qz6rqmcx0"; + revision = "3"; + editedCabalFile = "1hq0mz4fm2f6v57jzyahk5wfip285v3yh20dawvmwdh7wq6104zr"; libraryHaskellDepends = [ aeson base jose lens servant text unordered-containers ]; @@ -231631,8 +231975,8 @@ self: { pname = "servant-auth-client"; version = "0.4.1.0"; sha256 = "16rmwdrx0qyqa821ipayczzl3gv8gvqgx8k9q8qaw19w87hwkh83"; - revision = "1"; - editedCabalFile = "0q7bazq4ilijclpz23fshpjcspnrfalh7jhqi5gg03m00wwibn4n"; + revision = "2"; + editedCabalFile = "0mq9nhrlh44jxkngj06pasrrjzv5193lj6d2szprnncgrk36zi31"; libraryHaskellDepends = [ base bytestring containers servant servant-auth servant-client-core ]; @@ -231687,8 +232031,8 @@ self: { pname = "servant-auth-docs"; version = "0.2.10.0"; sha256 = "0j1ynnrb6plrhpb2vzs2p7a9jb41llp0j1jwgap7hjhkwhyc7wxd"; - revision = "7"; - editedCabalFile = "10178ahxq36l9mik7dcn1c1f97fpp8b4r7xiqwiv21llp95s7cqp"; + revision = "8"; + editedCabalFile = "01mb003lajxs1x82k20dbnxzdvxdla51vi4dh4f0a1xycvyhfpyi"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text @@ -231753,8 +232097,8 @@ self: { pname = "servant-auth-server"; version = "0.4.6.0"; sha256 = "0isl9pzzhfbs8pgh3qr2vbgfp0bh741dfa59sq7n3cmbkc6ndpkk"; - revision = "2"; - editedCabalFile = "1vf0mnbq0wmwha3aa2fn593dwibaw00l4agspgvchx7574jyr5wp"; + revision = "3"; + editedCabalFile = "0iasfns12wab45hf4qkwm5bx1z63ass9n5sh926wnn82g1v6qdyw"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring case-insensitive cookie data-default-class entropy http-types jose @@ -231779,8 +232123,8 @@ self: { pname = "servant-auth-swagger"; version = "0.2.10.1"; sha256 = "029nvb4wxwl98ah26bgcq1b7izrnvssxwn1682liimvsh4a8bady"; - revision = "2"; - editedCabalFile = "0b8fawx2wv9zshn9i4abnwy4lgf3fkhbhm8bhfpgm9d867dx21y4"; + revision = "3"; + editedCabalFile = "1hkszdp7c7c34b2yp2gb7khzlzq8iw5ma066r30kq2nw5jj895k0"; libraryHaskellDepends = [ base lens servant servant-auth servant-swagger swagger2 text ]; @@ -232112,6 +232456,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-client_0_18_3" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring, containers + , deepseq, entropy, exceptions, hspec, hspec-discover + , http-api-data, http-client, http-media, http-types, HUnit + , kan-extensions, markdown-unlit, monad-control, mtl, network + , QuickCheck, semigroupoids, servant, servant-client-core + , servant-server, sop-core, stm, tdigest, text, time, transformers + , transformers-base, transformers-compat, wai, warp + }: + mkDerivation { + pname = "servant-client"; + version = "0.18.3"; + sha256 = "0ddn7x9z2znkkyn6l2x6a85vq673q4vppr0q9n56ibvl3k3saxj0"; + libraryHaskellDepends = [ + base base-compat bytestring containers deepseq exceptions + http-client http-media http-types kan-extensions monad-control mtl + semigroupoids servant servant-client-core stm text time + transformers transformers-base transformers-compat + ]; + testHaskellDepends = [ + aeson base base-compat bytestring entropy hspec http-api-data + http-client http-types HUnit kan-extensions markdown-unlit mtl + network QuickCheck servant servant-client-core servant-server + sop-core stm tdigest text transformers transformers-compat wai warp + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Automatic derivation of querying functions for servant"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-client-core" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, containers, deepseq, exceptions, free, hspec @@ -232135,6 +232510,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-client-core_0_18_3" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, containers, deepseq, exceptions, free, hspec + , hspec-discover, http-media, http-types, network-uri, QuickCheck + , safe, servant, sop-core, template-haskell, text, transformers + }: + mkDerivation { + pname = "servant-client-core"; + version = "0.18.3"; + sha256 = "1iln4axymmmk3ib0wxmpzjgq16lip8nz7xich3ysgzx6g2n15xsd"; + libraryHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring containers + deepseq exceptions free http-media http-types network-uri safe + servant sop-core template-haskell text transformers + ]; + testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Core functionality and class for client function generation for servant APIs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-client-js" = callPackage ({ mkDerivation, base, binary, bytestring, case-insensitive , containers, exceptions, http-media, http-types, jsaddle @@ -232187,6 +232584,8 @@ self: { pname = "servant-conduit"; version = "0.15.1"; sha256 = "1vy3ihypb0zm2yd16rq120qw3898i3c0mahh2jysssv65g0avdwp"; + revision = "1"; + editedCabalFile = "0j7jrwyj6vnfr8wyyzjjm6gakx401aylrq8shc2y9ciy0mhf8lrv"; libraryHaskellDepends = [ base bytestring conduit mtl resourcet servant unliftio-core ]; @@ -232310,6 +232709,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-docs_0_11_9" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring + , case-insensitive, hashable, http-media, http-types, lens, servant + , string-conversions, tasty, tasty-golden, tasty-hunit, text + , transformers, universe-base, unordered-containers + }: + mkDerivation { + pname = "servant-docs"; + version = "0.11.9"; + sha256 = "0ynjyyxlzb2j5d92rryqqa97rp16582mbmvnv7syczha5ziq24nk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat bytestring case-insensitive + hashable http-media http-types lens servant string-conversions text + universe-base unordered-containers + ]; + executableHaskellDepends = [ + aeson base lens servant string-conversions text + ]; + testHaskellDepends = [ + aeson base base-compat lens servant string-conversions tasty + tasty-golden tasty-hunit transformers + ]; + description = "generate API docs for your servant webservice"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-docs-simple" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hspec , hspec-core, ordered-containers, prettyprinter, raw-strings-qq @@ -232552,6 +232980,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-foreign_0_15_4" = callPackage + ({ mkDerivation, base, base-compat, hspec, hspec-discover + , http-types, lens, servant, text + }: + mkDerivation { + pname = "servant-foreign"; + version = "0.15.4"; + sha256 = "0bznb73rbgfgkg7n4pxghkqsfca0yw9vak73c6w8sqvc2mjnc7mz"; + libraryHaskellDepends = [ + base base-compat http-types lens servant text + ]; + testHaskellDepends = [ base hspec servant ]; + testToolDepends = [ hspec-discover ]; + description = "Helpers for generating clients for servant APIs in any programming language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-gdp" = callPackage ({ mkDerivation, aeson, base, gdp, servant-server, text }: mkDerivation { @@ -232737,6 +233183,41 @@ self: { broken = true; }) {}; + "servant-http-streams_0_18_3" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring + , case-insensitive, containers, deepseq, entropy, exceptions, hspec + , hspec-discover, http-api-data, http-common, http-media + , http-streams, http-types, HUnit, io-streams, kan-extensions + , markdown-unlit, monad-control, mtl, network, QuickCheck + , semigroupoids, servant, servant-client-core, servant-server, stm + , tdigest, text, time, transformers, transformers-base + , transformers-compat, wai, warp + }: + mkDerivation { + pname = "servant-http-streams"; + version = "0.18.3"; + sha256 = "0cc4qmbzq4n1yp5yfg76w1skkksh13qlbza9i2pgsxa9sc39s5fa"; + libraryHaskellDepends = [ + base base-compat bytestring case-insensitive containers deepseq + exceptions http-common http-media http-streams http-types + io-streams kan-extensions monad-control mtl semigroupoids servant + servant-client-core text time transformers transformers-base + transformers-compat + ]; + testHaskellDepends = [ + aeson base base-compat bytestring deepseq entropy hspec + http-api-data http-streams http-types HUnit kan-extensions + markdown-unlit mtl network QuickCheck servant servant-client-core + servant-server stm tdigest text transformers transformers-compat + wai warp + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Automatic derivation of querying functions for servant"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "servant-http2-client" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring , case-insensitive, containers, data-default-class, exceptions @@ -232916,6 +233397,8 @@ self: { pname = "servant-machines"; version = "0.15.1"; sha256 = "0k8abcc72s5bzcf2vmjkxxjnhk45rww6hr3l93msm2510hi6gda4"; + revision = "1"; + editedCabalFile = "0zplgs1kqfmnnx8yv8ay594misiamgmvy41b8w1h3mr7n4vrgk8j"; libraryHaskellDepends = [ base bytestring machines mtl servant ]; testHaskellDepends = [ base base-compat bytestring http-client http-media machines servant @@ -233213,6 +233696,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-pipes_0_15_3" = callPackage + ({ mkDerivation, base, base-compat, bytestring, http-client + , http-media, monad-control, mtl, pipes, pipes-bytestring + , pipes-safe, servant, servant-client, servant-server, wai, warp + }: + mkDerivation { + pname = "servant-pipes"; + version = "0.15.3"; + sha256 = "1sd01f95rkraa0zdqqg2vwx91zsih0i0hqqkz55nnw9bsbsqhq1n"; + libraryHaskellDepends = [ + base bytestring monad-control mtl pipes pipes-safe servant + ]; + testHaskellDepends = [ + base base-compat bytestring http-client http-media pipes + pipes-bytestring pipes-safe servant servant-client servant-server + wai warp + ]; + description = "Servant Stream support for pipes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-polysemy" = callPackage ({ mkDerivation, base, deepseq, http-client, http-client-tls, lens , mtl, polysemy, polysemy-plugin, polysemy-zoo, servant @@ -233641,6 +234146,42 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-server_0_18_3" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, containers, directory, exceptions, filepath, hspec + , hspec-discover, hspec-wai, http-api-data, http-media, http-types + , monad-control, mtl, network, network-uri, QuickCheck, resourcet + , safe, servant, should-not-typecheck, sop-core, string-conversions + , tagged, temporary, text, transformers, transformers-base + , transformers-compat, wai, wai-app-static, wai-extra, warp, word8 + }: + mkDerivation { + pname = "servant-server"; + version = "0.18.3"; + sha256 = "1gng0in85as45aprwy19xaqlgmwfx0pkly150d2v96knhbcwsshk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat base64-bytestring bytestring containers exceptions + filepath http-api-data http-media http-types monad-control mtl + network network-uri resourcet servant sop-core string-conversions + tagged text transformers transformers-base wai wai-app-static word8 + ]; + executableHaskellDepends = [ + aeson base base-compat servant text wai warp + ]; + testHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring directory hspec + hspec-wai http-types mtl QuickCheck resourcet safe servant + should-not-typecheck sop-core string-conversions temporary text + transformers transformers-compat wai wai-extra + ]; + testToolDepends = [ hspec-discover ]; + description = "A family of combinators for defining webservices APIs and serving them"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-server-namedargs" = callPackage ({ mkDerivation, base, bytestring, http-api-data, http-types, named , servant, servant-namedargs, servant-server, string-conversions @@ -248528,6 +249069,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "streaming-bytestring_0_2_1" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim + , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit + , tasty-smallcheck, transformers, transformers-base + }: + mkDerivation { + pname = "streaming-bytestring"; + version = "0.2.1"; + sha256 = "1yri2g0wx2fila25ang04nsv4i12b4yhwqwcfkkpx1sz8fhzibxy"; + libraryHaskellDepends = [ + base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet + streaming transformers transformers-base + ]; + testHaskellDepends = [ + base bytestring resourcet smallcheck streaming tasty tasty-hunit + tasty-smallcheck transformers + ]; + description = "Fast, effectful byte streams"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "streaming-cassava" = callPackage ({ mkDerivation, base, bytestring, cassava, hspec, mtl, QuickCheck , quickcheck-instances, streaming, streaming-bytestring, text @@ -250074,8 +250637,8 @@ self: { }: mkDerivation { pname = "stripeapi"; - version = "0.1.0.2"; - sha256 = "1zls2k2bzrkwcqav8s416gjsc4rp6glb4rv0ljkjab55ym3fkbqq"; + version = "1.0.0.0"; + sha256 = "0wg3b08gvkcqinc5r9jcrcfrgw0c3mh57ca5hzcrknddwd23flbj"; libraryHaskellDepends = [ aeson base bytestring ghc-prim http-client http-conduit http-types mtl scientific text time transformers unordered-containers vector @@ -251957,13 +252520,13 @@ self: { }: mkDerivation { pname = "swiss-ephemeris"; - version = "1.2.1.1"; - sha256 = "1k584gv36xgj87qbrvcl5w9v8z2k7y4csmz737d5r2a8mvf8sf33"; + version = "1.3.0.1"; + sha256 = "1y30qx18ps412r28grlxpfxw3ikirbf3kkxmqwd75ydxp9apn52k"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Haskell bindings for the Swiss Ephemeris C library"; - license = lib.licenses.gpl2Only; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255452,6 +256015,18 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-bench_0_3" = callPackage + ({ mkDerivation, base, containers, deepseq, tasty }: + mkDerivation { + pname = "tasty-bench"; + version = "0.3"; + sha256 = "06c7n1dslxr1m15m8kf35zfn544jm36vk8s3yfrf6h047gd1bs2k"; + libraryHaskellDepends = [ base containers deepseq tasty ]; + description = "Featherlight benchmark framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-checklist" = callPackage ({ mkDerivation, base, exceptions, parameterized-utils, tasty , tasty-expected-failure, tasty-hunit, text @@ -255821,6 +256396,8 @@ self: { pname = "tasty-json"; version = "0.1.0.0"; sha256 = "0k6zzi2w675pghxfv5y6m67n2cv8bb22dq9zgb5yfwycfj3va4bp"; + revision = "1"; + editedCabalFile = "0jk27ld4l435nnzc80wg6b46ibmc0cmbb0k3hpp58yxbyldr6xdr"; libraryHaskellDepends = [ base bytestring containers stm tagged tasty text ]; @@ -256206,8 +256783,8 @@ self: { pname = "tasty-wai"; version = "0.1.1.1"; sha256 = "1bnq2mbgv1ksn9sq33dq1q91pzndy7gn61mlnkybk89k0bsw5i7y"; - revision = "1"; - editedCabalFile = "033s0aap50r7y3sbxc1jf60lpv66nljwyypc8smyccgiv5l8khzr"; + revision = "2"; + editedCabalFile = "13f0rmdyfd8wx9w9d6vj40akskq763gjj89p7dzy6zyaiyllgk64"; libraryHaskellDepends = [ base bytestring http-types HUnit tasty wai wai-extra ]; @@ -257031,6 +257608,18 @@ self: { license = lib.licenses.mit; }) {}; + "template-haskell-compat-v0208_0_1_6" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "template-haskell-compat-v0208"; + version = "0.1.6"; + sha256 = "1s2ba86y2r9n4r1dwfg734y3nfqxak560s8srd04kbn623hnrkw8"; + libraryHaskellDepends = [ base template-haskell ]; + description = "A backwards compatibility layer for Template Haskell newer than 2.8"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "template-haskell-optics" = callPackage ({ mkDerivation, base, containers, optics-core, template-haskell }: mkDerivation { @@ -258769,8 +259358,8 @@ self: { pname = "texrunner"; version = "0.0.1.2"; sha256 = "1fxyxwgvn0rxhkl1fs2msr88jqwx5wwfnjsjlcankrwcn7gyk7jy"; - revision = "2"; - editedCabalFile = "0zv8xp8z2gx9zjqn1f81hri4hn0bws7cq39g5i2g2axrkm9nwj5q"; + revision = "3"; + editedCabalFile = "1l3cpi7yx8jm3653rf3v7midf19i7khc6in75m7zz66124c6i350"; libraryHaskellDepends = [ attoparsec base bytestring directory filepath io-streams mtl process semigroups temporary @@ -266567,6 +267156,23 @@ self: { license = lib.licenses.mit; }) {}; + "ttc_1_1_0_1" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-hunit + , template-haskell, text + }: + mkDerivation { + pname = "ttc"; + version = "1.1.0.1"; + sha256 = "0vngp6md5viz4r57q0qn3pf09ph6kpkzvdigsxmgqcic2ha1a4n1"; + libraryHaskellDepends = [ base bytestring template-haskell text ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit template-haskell text + ]; + description = "Textual Type Classes"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ttl-hashtables" = callPackage ({ mkDerivation, base, clock, containers, data-default, failable , hashable, hashtables, hspec, mtl, transformers @@ -267088,6 +267694,8 @@ self: { ]; description = "An equational theorem prover"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "twee-lib" = callPackage @@ -276926,23 +277534,19 @@ self: { "wai-cli" = callPackage ({ mkDerivation, ansi-terminal, base, http-types, iproute - , monads-tf, network, options, socket-activation, stm - , streaming-commons, unix, wai, wai-extra, warp, warp-tls + , monads-tf, network, options, stm, streaming-commons, transformers + , unix, wai, wai-extra, warp, warp-tls }: mkDerivation { pname = "wai-cli"; - version = "0.2.1"; - sha256 = "1r4lxbjzb5qzn7y0kanlgm8s9a3j1j93cvs74s2bmcc82ysc3x9f"; - revision = "1"; - editedCabalFile = "1h0ip8r0zdm0xzaprfiyfdm40286apyvn6psqnx7pif8acfhpq8m"; + version = "0.2.3"; + sha256 = "0fflvxfc9ibkrrgqdsr89gl77b0b706a8g7ylydaqqz6z089qbi3"; libraryHaskellDepends = [ - ansi-terminal base http-types iproute monads-tf network options - socket-activation stm streaming-commons unix wai wai-extra warp - warp-tls + ansi-terminal base http-types iproute monads-tf network options stm + streaming-commons transformers unix wai wai-extra warp warp-tls ]; description = "Command line runner for Wai apps (using Warp) with TLS, CGI, socket activation & graceful shutdown"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "wai-conduit" = callPackage @@ -286307,8 +286911,8 @@ self: { }: mkDerivation { pname = "yaml-unscrambler"; - version = "0.1.0.2"; - sha256 = "03wvb5skx41kdmdc6zhydr7zddzyshy2cgk8zmwy26q70z3g01zf"; + version = "0.1.0.3"; + sha256 = "1n8q5dsvs6sh2gzs24m49cz5pg1pavn9sma4fk5jizrjrabik4sj"; libraryHaskellDepends = [ acc attoparsec attoparsec-data attoparsec-time base base64 bytestring conduit containers foldl hashable libyaml mtl scientific @@ -291303,8 +291907,8 @@ self: { ({ mkDerivation, base, hspec, Z-Data, Z-IO, zookeeper_mt }: mkDerivation { pname = "zoovisitor"; - version = "0.1.1.1"; - sha256 = "1mg3wz3drddxdrbr1b0yw5wayzqi99zfdlgiwvgcc5pxb98i6wk3"; + version = "0.1.2.0"; + sha256 = "0s0svxa7y7a35jg4f0qq6zdg187c2g1s0f3payd26vpwa6rp8f8k"; libraryHaskellDepends = [ base Z-Data Z-IO ]; librarySystemDepends = [ zookeeper_mt ]; testHaskellDepends = [ base hspec ]; diff --git a/pkgs/development/interpreters/alda/default.nix b/pkgs/development/interpreters/alda/default.nix index 85c48ee2014d..96d4207dbe8f 100644 --- a/pkgs/development/interpreters/alda/default.nix +++ b/pkgs/development/interpreters/alda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alda"; - version = "1.4.4"; + version = "1.5.0"; src = fetchurl { url = "https://github.com/alda-lang/alda/releases/download/${version}/alda"; - sha256 = "sha256-zIq8coSh4B9VGrixkQfhySK7qhlFG2p7O0suvbiScKY="; + sha256 = "sha256-OHbOsgYN87ThU7EgjCgxADnOv32qIi+7XwDwcW0dmV0="; }; dontUnpack = true; diff --git a/pkgs/development/interpreters/hy/builder.nix b/pkgs/development/interpreters/hy/builder.nix new file mode 100644 index 000000000000..6757f859ac14 --- /dev/null +++ b/pkgs/development/interpreters/hy/builder.nix @@ -0,0 +1,40 @@ +{ lib +, python3Packages +, hyDefinedPythonPackages /* Packages like with python.withPackages */ +, ... +}: +python3Packages.buildPythonApplication rec { + pname = "hy"; + version = "1.0a1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-lCrbvbkeutSNmvvn/eHpTnJwPb5aEH7hWTXYSE+AJmU="; + }; + + checkInputs = with python3Packages; [ flake8 pytest ]; + + propagatedBuildInputs = with python3Packages; [ + appdirs + astor + clint + colorama + fastentrypoints + funcparserlib + rply + pygments + ] ++ (hyDefinedPythonPackages python3Packages); + + # Hy does not include tests in the source distribution from PyPI, so only test executable. + checkPhase = '' + $out/bin/hy --help > /dev/null + ''; + + meta = with lib; { + description = "A LISP dialect embedded in Python"; + homepage = "https://hylang.org/"; + license = licenses.mit; + maintainers = with maintainers; [ nixy mazurel ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix index e39bf915cfcf..f5d80c11d711 100644 --- a/pkgs/development/interpreters/hy/default.nix +++ b/pkgs/development/interpreters/hy/default.nix @@ -1,37 +1,15 @@ -{ lib, python3Packages }: - -python3Packages.buildPythonApplication rec { - pname = "hy"; - version = "0.19.0"; - - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "05k05qmiiysiwdc05sxmanwhv1crfwbb3l8swxfisbzbvmv1snis"; - }; - - checkInputs = with python3Packages; [ flake8 pytest ]; - - propagatedBuildInputs = with python3Packages; [ - appdirs - astor - clint - colorama - fastentrypoints - funcparserlib - rply - pygments - ]; - - # Hy does not include tests in the source distribution from PyPI, so only test executable. - checkPhase = '' - $out/bin/hy --help > /dev/null - ''; - - meta = with lib; { - description = "A LISP dialect embedded in Python"; - homepage = "http://hylang.org/"; - license = licenses.mit; - maintainers = with maintainers; [ nixy ]; - platforms = platforms.all; - }; +{ lib +, callPackage +, hyDefinedPythonPackages ? python-packages: [] /* Packages like with python.withPackages */ +}: +let + withPackages = ( + python-packages: callPackage ./builder.nix { + hyDefinedPythonPackages = python-packages; + } + ); +in +(withPackages hyDefinedPythonPackages) // { + # Export withPackages function for hy customization + inherit withPackages; } diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index 7640e6bc6463..1e72f7b48b4a 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "7.4.20"; - sha256 = "0d5ncz97y0271dsmz269wl4721vhq2fn6pmm9rxglc756p36pnha"; + version = "7.4.21"; + sha256 = "0al2697d5hwq0f39rgncl1pwfxzzpc0afmr0fjvw5qjpww163v1n"; }); in diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 294f100dedd3..82d78d95314e 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.7"; - sha256 = "0yazcc9x66xg1gmi3rpgk891g6s3mm7aywcadqfqnx1mdz4z5ckj"; + version = "8.0.8"; + sha256 = "0vyi9hhy7yl4l589dniwb3gq29sp3giq7ni4nca3x54q3bbpgg8l"; }); in diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 5344be9c5c7e..dbe01acb6dfd 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -133,7 +133,7 @@ let unwrapped = php; # Select the right php tests for the php version tests = nixosTests."php${lib.strings.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor php.version)}"; - inherit (php-packages) extensions buildPecl; + inherit (php-packages) extensions buildPecl mkExtension; packages = php-packages.tools; meta = php.meta // { outputsToInstall = [ "out" ]; @@ -195,8 +195,6 @@ let # PCRE ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ] - ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" ] - ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre2.dev}" ] ++ [ "PCRE_LIBDIR=${pcre2}" ] diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix index d46c7a6bcd85..4c67c927e57f 100644 --- a/pkgs/development/libraries/AntTweakBar/default.nix +++ b/pkgs/development/libraries/AntTweakBar/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchurl, unzip, xorg, libGLU, libGL }: -stdenv.mkDerivation { - name = "AntTweakBar-1.16"; +stdenv.mkDerivation rec { + pname = "AntTweakBar"; + version = "1.16"; nativeBuildInputs = [ unzip ]; buildInputs = [ xorg.libX11 libGLU libGL ]; src = fetchurl { - url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_116.zip"; + url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_${lib.replaceStrings ["."] [""] version}.zip"; sha256 = "0z3frxpzf54cjs07m6kg09p7nljhr7140f4pznwi7srwq4cvgkpv"; }; diff --git a/pkgs/development/libraries/PlistCpp/default.nix b/pkgs/development/libraries/PlistCpp/default.nix index f7c47805748e..c2d5e6dceac7 100644 --- a/pkgs/development/libraries/PlistCpp/default.nix +++ b/pkgs/development/libraries/PlistCpp/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }: stdenv.mkDerivation { - name = "PlistCpp-11615d"; + pname = "PlistCpp"; + version = "unstable-11615d"; src = fetchFromGitHub { owner = "matthewbauer"; diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index bf76bc1e8570..059ba65b25c4 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -5,7 +5,7 @@ , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid , libXext, libICE, libXrandr , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid, libpulseaudio -, OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa +, OpenGL, GLUT, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa }: # NOTE: When editing this expression see if the same change applies to @@ -16,7 +16,8 @@ with lib; let extraPropagatedBuildInputs = [ ] ++ optionals x11Support [ libXext libICE libXrandr ] - ++ optionals openglSupport [ libGL libGLU ] + ++ optionals (openglSupport && stdenv.isLinux) [ libGL libGLU ] + ++ optionals (openglSupport && stdenv.isDarwin) [ OpenGL GLUT ] ++ optional alsaSupport alsa-lib ++ optional pulseaudioSupport libpulseaudio ++ optional stdenv.isDarwin Cocoa; @@ -73,18 +74,18 @@ stdenv.mkDerivation rec { }) # Fix drops of keyboard events for SDL_EnableUNICODE (fetchpatch { - url = "http://hg.libsdl.org/SDL/raw-rev/0aade9c0203f"; - sha256 = "1y9izncjlqvk1mkz1pkl9lrk9s452cmg2izjjlqqrhbn8279xy50"; + url = "https://github.com/libsdl-org/SDL-1.2/commit/0332e2bb18dc68d6892c3b653b2547afe323854b.patch"; + sha256 = "0g458iv6pp9sikdch6ms8svz60lf5ks2q5wgid8s9rydhk98lpp5"; }) # Ignore insane joystick axis events (fetchpatch { - url = "http://hg.libsdl.org/SDL/raw-rev/95abff7adcc2"; - sha256 = "0i8x0kx0pw12ld5bfxhyzs466y3c0n9dscw1ijhq1b96r72xyhqq"; + url = "https://github.com/libsdl-org/SDL-1.2/commit/ab99cc82b0a898ad528d46fa128b649a220a94f4.patch"; + sha256 = "1b3473sawfdbkkxaqf1hg0vn37yk8hf655jhnjwdk296z4gclazh"; }) # https://bugzilla.libsdl.org/show_bug.cgi?id=1769 (fetchpatch { - url = "http://hg.libsdl.org/SDL/raw-rev/91ad7b43317a"; - sha256 = "15g537vbl2my4mfrjxfkcx9ri6bk2gjvaqj650rjdxwk2nkdkn4b"; + url = "https://github.com/libsdl-org/SDL-1.2/commit/5d79977ec7a6b58afa6e4817035aaaba186f7e9f.patch"; + sha256 = "1k7y57b1zy5afib1g7w3in36n8cswbcrzdbrjpn5cb105rnb9vmp"; }) # Workaround X11 bug to allow changing gamma # Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222 @@ -96,12 +97,12 @@ stdenv.mkDerivation rec { # Fix a build failure on OS X Mavericks # Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085 (fetchpatch { - url = "http://hg.libsdl.org/SDL/raw-rev/e9466ead70e5"; - sha256 = "0mpwdi09h89df2wxqw87m1rdz7pr46k0w6alk691k8kwv970z6pl"; + url = "https://github.com/libsdl-org/SDL-1.2/commit/19039324be71738d8990e91b9ba341b2ea068445.patch"; + sha256 = "0ckwling2ad27c9vxgp97ndjd098d6zbrydza8b9l77k8airj98c"; }) (fetchpatch { - url = "http://hg.libsdl.org/SDL/raw-rev/bbfb41c13a87"; - sha256 = "1336g7waaf1c8yhkz11xbs500h8bmvabh4h437ax8l1xdwcppfxv"; + url = "https://github.com/libsdl-org/SDL-1.2/commit/7933032ad4d57c24f2230db29f67eb7d21bb5654.patch"; + sha256 = "1by16firaxyr0hjvn35whsgcmq6bl0nwhnpjf75grjzsw9qvwyia"; }) ]; diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index fe97f0167439..d6424575a764 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "CVE-2017-2887"; - url = "https://hg.libsdl.org/SDL_image/raw-diff/318484db0705/IMG_xcf.c"; - sha256 = "140dyszz9hkpgwjdiwp1b7jdd8f8l5d862xdaf3ml4cimga1h5kv"; + url = "https://github.com/libsdl-org/SDL_image/commit/e7723676825cd2b2ffef3316ec1879d7726618f2.patch"; + includes = [ "IMG_xcf.c" ]; + sha256 = "174ka2r95i29nlshzgp6x5vc68v7pi8lhzf33and2b1ms49g4jb7"; }) ]; diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index 89585d908da4..39e27c909b50 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -2,9 +2,10 @@ , freetype, SDL, libX11 }: stdenv.mkDerivation rec { - name = "agg-2.5"; + pname = "agg"; + version = "2.5"; src = fetchurl { - url = "http://www.antigrain.com/${name}.tar.gz"; + url = "https://www.antigrain.com/${pname}-${version}.tar.gz"; sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/development/libraries/amrnb/default.nix index 2316961e3994..4e325932b5e8 100644 --- a/pkgs/development/libraries/amrnb/default.nix +++ b/pkgs/development/libraries/amrnb/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "amrnb-11.0.0.0"; + pname = "amrnb"; + version = "11.0.0.0"; srcAmr = fetchurl { - url = "http://www.3gpp.org/ftp/Specs/latest/Rel-11/26_series/26104-b00.zip"; + url = "https://www.3gpp.org/ftp/Specs/latest/Rel-11/26_series/26104-b00.zip"; sha256 = "1wf8ih0hk7w20vdlnw7jb7w73v15hbxgbvmq4wq7h2ghn0j8ppr3"; }; diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 64c0b031e47d..558ea51eb049 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -23,7 +23,8 @@ , pngquant }: stdenv.mkDerivation rec { - name = "appstream-glib-0.7.18"; + pname = "appstream-glib"; + version = "0.7.18"; outputs = [ "out" "dev" "man" "installedTests" ]; outputBin = "dev"; @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "hughsie"; repo = "appstream-glib"; - rev = lib.replaceStrings [ "." "-" ] [ "_" "_" ] name; + rev = "${lib.replaceStrings ["-"] ["_"] pname}-${lib.replaceStrings ["."] ["_"] version}"; sha256 = "12s7d3nqjs1fldnppbg2mkjg4280f3h8yzj3q1hiz3chh1w0vjbx"; }; diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix index 33b253718a7f..a1e1babbe5e8 100644 --- a/pkgs/development/libraries/argp-standalone/default.nix +++ b/pkgs/development/libraries/argp-standalone/default.nix @@ -19,11 +19,12 @@ let sha256 = "1xx2zdc187a1m2x6c1qs62vcrycbycw7n0q3ks2zkxpaqzx2dgkw"; }; in -stdenv.mkDerivation { - name = "argp-standalone-1.3"; +stdenv.mkDerivation rec { + pname = "argp-standalone"; + version = "1.3"; src = fetchurl { - url = "https://www.lysator.liu.se/~nisse/misc/argp-standalone-1.3.tar.gz"; + url = "https://www.lysator.liu.se/~nisse/misc/argp-standalone-${version}.tar.gz"; sha256 = "dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be"; }; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 4e85c7a92a64..515c60c985a7 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.40.1"; + version = "2.40.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0miqn8531czy9ffpxnsxsnk12w3d6sqjda3qyix8kns2xsjf6rlz"; + sha256 = "RNwXr5Q7D9GWxhweA7bBZpYDhcrpbMtelb3v/7aEn5g="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index b7c9287b68bc..3ff021222faa 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -6,10 +6,11 @@ # files. stdenv.mkDerivation rec { - name = "attr-2.4.48"; + pname = "attr"; + version = "2.4.48"; src = fetchurl { - url = "mirror://savannah/attr/${name}.tar.gz"; + url = "mirror://savannah/attr/${pname}-${version}.tar.gz"; sha256 = "1rr4adzwax4bzr2c00f06zcsljv5y6p9wymz1g89ww7cb2rp5bay"; }; diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix index 79232107cdd2..9b1840256ade 100644 --- a/pkgs/development/libraries/boolstuff/default.nix +++ b/pkgs/development/libraries/boolstuff/default.nix @@ -1,12 +1,10 @@ { lib, stdenv, fetchurl, pkg-config }: - -let baseurl = "https://perso.b2b2c.ca/~sarrazip/dev"; in - stdenv.mkDerivation rec { - name = "boolstuff-0.1.16"; + pname = "boolstuff"; + version = "0.1.16"; src = fetchurl { - url = "${baseurl}/${name}.tar.gz"; + url = "https://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz"; sha256 = "10qynbyw723gz2vrvn4xk2var172kvhlz3l3l80qbdsfb3d12wn0"; }; @@ -14,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for operations on boolean expression binary trees"; - homepage = "${baseurl}/boolstuff.html"; + homepage = "https://perso.b2b2c.ca/~sarrazip/dev/boolstuff.html"; license = "GPL"; maintainers = [ lib.maintainers.marcweber ]; platforms = lib.platforms.all; diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index a333a69ffa1b..d6ab4fe0dfe5 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, bison }: stdenv.mkDerivation rec { - name = "buddy-2.4"; + pname = "buddy"; + version = "2.4"; src = fetchurl { - url = "mirror://sourceforge/buddy/${name}.tar.gz"; + url = "mirror://sourceforge/buddy/${pname}-${version}.tar.gz"; sha256 = "0dl86l9xkl33wnkz684xa9axhcxx2zzi4q5lii0axnb9lsk81pyk"; }; diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix index 6e21984eb1da..bc609d7bbf17 100644 --- a/pkgs/development/libraries/chmlib/default.nix +++ b/pkgs/development/libraries/chmlib/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "chmlib-0.40a"; + pname = "chmlib"; + version = "0.40a"; src = fetchFromGitHub { owner = "jedwing"; diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix index b2bd2adde43a..65d6a392ffdb 100644 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ b/pkgs/development/libraries/cloog-ppl/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, ppl, autoreconfHook }: stdenv.mkDerivation rec { - name = "cloog-ppl-0.15.11"; + pname = "cloog-ppl"; + version = "0.15.11"; src = fetchurl { - url = "mirror://gcc/infrastructure/${name}.tar.gz"; + url = "mirror://gcc/infrastructure/${pname}-${version}.tar.gz"; sha256 = "0psdm0bn5gx60glfh955x5b3b23zqrd92idmjr0b00dlnb839mkw"; }; diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index 913393804249..f906b3f3a89f 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, unzip, cmake, python }: -stdenv.mkDerivation { - name = "flann-1.9.1"; +stdenv.mkDerivation rec { + pname = "flann"; + version = "1.9.1"; src = fetchFromGitHub { owner = "mariusmuja"; repo = "flann"; - rev = "1.9.1"; + rev = version; sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc"; }; diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 660276530aa8..53c9b5a30dc9 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -5,10 +5,11 @@ with lib; stdenv.mkDerivation rec { - name = "glew-2.2.0"; + pname = "glew"; + version = "2.2.0"; src = fetchurl { - url = "mirror://sourceforge/glew/${name}.tgz"; + url = "mirror://sourceforge/glew/${pname}-${version}.tgz"; sha256 = "1qak8f7g1iswgswrgkzc7idk7jmqgwrs58fhg2ai007v7j4q5z6l"; }; diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index a127c5b81c89..3a5da0afc744 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -153,10 +153,15 @@ stdenv.mkDerivation ({ "--enable-add-ons" "--sysconfdir=/etc" "--enable-stackguard-randomization" - "--enable-static-pie" "--enable-bind-now" (lib.withFeatureAs withLinuxHeaders "headers" "${linuxHeaders}/include") (lib.enableFeature profilingLibraries "profile") + ] ++ lib.optionals (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isAarch64) [ + # This feature is currently supported on + # i386, x86_64 and x32 with binutils 2.29 or later, + # and on aarch64 with binutils 2.30 or later. + # https://sourceware.org/glibc/wiki/PortStatus + "--enable-static-pie" ] ++ lib.optionals withLinuxHeaders [ "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26 ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix index 8f35407f9ddd..debf3eb59264 100644 --- a/pkgs/development/libraries/gnet/default.nix +++ b/pkgs/development/libraries/gnet/default.nix @@ -1,11 +1,12 @@ {lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, glib, libtool }: -stdenv.mkDerivation { - name = "gnet-2.0.8"; +stdenv.mkDerivation rec { + pname = "gnet"; + version = "2.0.8"; src = fetchFromGitHub { owner = "GNOME"; repo = "gnet"; - rev = "GNET_2_0_8"; + rev = "GNET_${lib.replaceStrings ["."] ["_"] version}"; sha256 = "1cy78kglzi235md964ikvm0rg801bx0yk9ya8zavndjnaarzqq87"; }; diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index fc2edc187129..5dcc24cc8bc2 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, libidn, libkrb5 }: stdenv.mkDerivation rec { - name = "gsasl-1.10.0"; + pname = "gsasl"; + version = "1.10.0"; src = fetchurl { - url = "mirror://gnu/gsasl/${name}.tar.gz"; + url = "mirror://gnu/gsasl/${pname}-${version}.tar.gz"; sha256 = "sha256-hby9juYJWt54cCY6KOvLiDL1Qepzk5dUlJJgFcB1aNM="; }; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index faf38a1a05fb..5723323defd6 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -292,6 +292,8 @@ stdenv.mkDerivation rec { # `applemedia/videotexturecache.h` requires `gst/gl/gl.h`, # but its meson build system does not declare the dependency. "-Dapplemedia=disabled" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dintrospection=disabled" ]; # Argument list too long diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 699f70a0788a..3e00050ada2f 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -105,6 +105,8 @@ stdenv.mkDerivation rec { "-Dgl-graphene=disabled" # not packaged in nixpkgs as of writing # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices "-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dintrospection=disabled" ] ++ lib.optional (!enableX11) "-Dx11=disabled" # TODO How to disable Wayland? diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 2d43a02725f9..9cc1675de3ae 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -76,6 +76,8 @@ stdenv.mkDerivation rec { "-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dintrospection=disabled" ] ++ lib.optionals stdenv.isDarwin [ # darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it. "-Dlibunwind=disabled" diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index 517fe9b302d3..12cb6dac6f31 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -51,6 +51,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dintrospection=disabled" ]; meta = with lib; { diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 6ada053ea012..840b0f252857 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -59,6 +59,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dintrospection=disabled" ]; postPatch = '' diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 56596960019b..d66376b64996 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -54,6 +54,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dintrospection=disabled" ]; postPatch = '' diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix index 438f7feab6ce..1e910e3bcf40 100644 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ b/pkgs/development/libraries/gtkimageview/default.nix @@ -1,11 +1,12 @@ { fetchurl, lib, stdenv, pkg-config, gtk2 }: stdenv.mkDerivation rec { - name = "gtkimageview-1.6.4"; + pname = "gtkimageview"; + version = "1.6.4"; src = fetchurl { - url = "http://trac.bjourne.webfactional.com/chrome/common/releases/${name}.tar.gz"; - sha256 = "1if3yh5z6nkv5wnkk0qyy9pkk03vn5rqbfk23q87kj39pqscgr37"; + url = "https://sources.archlinux.org/other/packages/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1wj63af9j9p5i067lpwi9lxvwalamakrmklvl983kvi7s4w1ss2c"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix index aacdf0ee933e..6d60d62fcce7 100644 --- a/pkgs/development/libraries/hawknl/default.nix +++ b/pkgs/development/libraries/hawknl/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, unzip}: -stdenv.mkDerivation { - name = "hawknl-1.68"; +stdenv.mkDerivation rec { + pname = "hawknl"; + version = "1.68"; src = fetchurl { - url = "http://urchlay.naptime.net/~urchlay/src/HawkNL168src.zip"; + url = "http://urchlay.naptime.net/~urchlay/src/HawkNL${lib.replaceStrings ["."] [""] version}src.zip"; sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028"; }; diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index 1d6fed2281e7..4bc06a97a7b2 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -2,10 +2,11 @@ , libX11, libXext, xorgproto, libjpeg, giflib, libtiff, libpng }: -stdenv.mkDerivation { - name = "imlib-1.9.15"; +stdenv.mkDerivation rec { + pname = "imlib"; + version = "1.9.15"; src = fetchurl { - url = "http://tarballs.nixos.org/imlib-1.9.15.tar.gz"; + url = "https://tarballs.nixos.org/imlib-${version}.tar.gz"; sha256 = "0ggjxyvgp4pxc0b88v40xj9daz90518ydnycw7qax011gxpr12d3"; }; diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 37375f52c32e..7aefaa9d4936 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "21.2.2"; + version = "21.2.3"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "0cz2zr5qmhlsb1ydffakpkw9adyvn5n2y269fp0k2sskqwlykn48"; + sha256 = "0nldd1yfyvwnpkh0v3ni09z2zwmj84px0pcd1w50brvny36r814c"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index ab55e76f29a3..40a46041caa2 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "jbigkit-2.1"; + pname = "jbigkit"; + version = "2.1"; src = fetchurl { - url = "https://www.cl.cam.ac.uk/~mgk25/jbigkit/download/${name}.tar.gz"; + url = "https://www.cl.cam.ac.uk/~mgk25/jbigkit/download/${pname}-${version}.tar.gz"; sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy"; }; diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index 037225b86e5b..077c4fe90fdb 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "judy-1.0.5"; +stdenv.mkDerivation rec { + pname = "judy"; + version = "1.0.5"; src = fetchurl { - url = "mirror://sourceforge/judy/Judy-1.0.5.tar.gz"; + url = "mirror://sourceforge/judy/Judy-${version}.tar.gz"; sha256 = "1sv3990vsx8hrza1mvq3bhvv9m6ff08y4yz7swn6znszz24l0w6j"; }; diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 66bdcc03b966..b600a2ca4c3d 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libtiff, libjpeg, zlib }: stdenv.mkDerivation rec { - name = "lcms2-2.12"; + pname = "lcms2"; + version = "2.12"; src = fetchurl { - url = "mirror://sourceforge/lcms/${name}.tar.gz"; + url = "mirror://sourceforge/lcms/${pname}-${version}.tar.gz"; sha256 = "sha256-GGY5hehkEARVrD5QdiXEOMNxA1TYXly7fNQEPhH+EPU="; }; diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix index d0ba47186559..dc0c8c0ed741 100644 --- a/pkgs/development/libraries/lesstif/default.nix +++ b/pkgs/development/libraries/lesstif/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, xlibsWrapper, libXp, libXau}: stdenv.mkDerivation rec { - name = "lesstif-0.95.2"; + pname = "lesstif"; + version = "0.95.2"; src = fetchurl { - url = "mirror://sourceforge/lesstif/${name}.tar.bz2"; + url = "mirror://sourceforge/lesstif/${pname}-${version}.tar.bz2"; sha256 = "1qzpxjjf7ri1jzv71mvq5m9g8hfaj5yzwp30rwxlm6n2b24a6jpb"; }; buildInputs = [xlibsWrapper]; diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix index ed945d9e5a08..f1ba199fc8e0 100644 --- a/pkgs/development/libraries/levmar/default.nix +++ b/pkgs/development/libraries/levmar/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "levmar-2.6"; + pname = "levmar"; + version = "2.6"; src = fetchurl { - url = "https://www.ics.forth.gr/~lourakis/levmar/${name}.tgz"; + url = "https://www.ics.forth.gr/~lourakis/levmar/${pname}-${version}.tgz"; sha256 = "1mxsjip9x782z6qa6k5781wjwpvj5aczrn782m9yspa7lhgfzx1v"; }; diff --git a/pkgs/development/libraries/libaec/default.nix b/pkgs/development/libraries/libaec/default.nix index 4c539860be72..aa146ca24133 100644 --- a/pkgs/development/libraries/libaec/default.nix +++ b/pkgs/development/libraries/libaec/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "libaec"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitLab { domain = "gitlab.dkrz.de"; owner = "k202009"; repo = "libaec"; rev = "v${version}"; - sha256 = "1rpma89i35ahbalaqz82y201syxni7jkf9892jlyyrhhrvlnm4l2"; + sha256 = "sha256-Vi0fCd9V/EH+PcD+e6RZK2/isR1xGX25POhm1Xen5ak="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/development/libraries/libasyncns/default.nix index 0dc26b686117..c94e1c04e0ba 100644 --- a/pkgs/development/libraries/libasyncns/default.nix +++ b/pkgs/development/libraries/libasyncns/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libasyncns-0.8"; + pname = "libasyncns"; + version = "0.8"; src = fetchurl { - url = "http://0pointer.de/lennart/projects/libasyncns/${name}.tar.gz"; + url = "http://0pointer.de/lennart/projects/libasyncns/${pname}-${version}.tar.gz"; sha256 = "0x5b6lcic4cd7q0bx00x93kvpyzl7n2abbgvqbrlzrfb8vknc6jg"; }; diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix index f90815f4ee9f..9c790172039b 100644 --- a/pkgs/development/libraries/libaudclient/default.nix +++ b/pkgs/development/libraries/libaudclient/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib, dbus-glib }: stdenv.mkDerivation rec { - name = "libaudclient-3.5-rc2"; + pname = "libaudclient"; version = "3.5-rc2"; src = fetchurl { - url = "https://distfiles.audacious-media-player.org/${name}.tar.bz2"; + url = "https://distfiles.audacious-media-player.org/${pname}-${version}.tar.bz2"; sha256 = "0nhpgz0kg8r00z54q5i96pjk7s57krq3fvdypq496c7fmlv9kdap"; }; diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix index d9c10415b67a..2ac90a11f086 100644 --- a/pkgs/development/libraries/libavc1394/default.nix +++ b/pkgs/development/libraries/libavc1394/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libraw1394 }: stdenv.mkDerivation rec { - name = "libavc1394-0.5.4"; + pname = "libavc1394"; + version = "0.5.4"; src = fetchurl { - url = "mirror://sourceforge/libavc1394/${name}.tar.gz"; + url = "mirror://sourceforge/libavc1394/${pname}-${version}.tar.gz"; sha256 = "0lsv46jdqvdx5hx92v0z2cz3yh6212pz9gk0k3513sbaa04zzcbw"; }; diff --git a/pkgs/development/libraries/libblocksruntime/default.nix b/pkgs/development/libraries/libblocksruntime/default.nix index 6ba832fb3cda..0ab380064429 100644 --- a/pkgs/development/libraries/libblocksruntime/default.nix +++ b/pkgs/development/libraries/libblocksruntime/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, clang }: stdenv.mkDerivation { - name = "blocksruntime-20140624"; + pname = "blocksruntime"; + version = "unstable-2014-06-24"; src = fetchFromGitHub { owner = "mackyle"; diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index 7387e9edc5b5..10d688d89b6c 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libconfig"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { url = "https://hyperrealm.github.io/${pname}/dist/${pname}-${version}.tar.gz"; - sha256 = "1ngs2qx3cx5cbwinc5mvadly0b5n7s86zsc68c404czzfff7lg3w"; + sha256 = "sha256-VFFm1srAN3RDgdHpzFpUBQlOe/rRakEWmbz/QLuzHuc="; }; doCheck = true; diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/development/libraries/libdbi/default.nix index 48812f091bea..ffbc3f671007 100644 --- a/pkgs/development/libraries/libdbi/default.nix +++ b/pkgs/development/libraries/libdbi/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libdbi-0.9.0"; + pname = "libdbi"; + version = "0.9.0"; src = fetchurl { - url = "mirror://sourceforge/libdbi/${name}.tar.gz"; + url = "mirror://sourceforge/libdbi/${pname}-${version}.tar.gz"; sha256 = "00s5ra7hdlq25iv23nwf4h1v3kmbiyzx0v9bhggjiii4lpf6ryys"; }; diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/development/libraries/libdivsufsort/default.nix index 0f332f8ac74c..91b320826606 100644 --- a/pkgs/development/libraries/libdivsufsort/default.nix +++ b/pkgs/development/libraries/libdivsufsort/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "libdivsufsort-2.0.1"; +stdenv.mkDerivation rec { + pname = "libdivsufsort"; + version = "2.0.1"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libdivsufsort/libdivsufsort-2.0.1.tar.bz2"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libdivsufsort/libdivsufsort-${version}.tar.bz2"; sha256 = "1g0q40vb2k689bpasa914yi8sjsmih04017mw20zaqqpxa32rh2m"; }; diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix index 8699e83d0fd0..5630047eed7f 100644 --- a/pkgs/development/libraries/libestr/default.nix +++ b/pkgs/development/libraries/libestr/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libestr-0.1.11"; + pname = "libestr"; + version = "0.1.11"; src = fetchurl { - url = "http://libestr.adiscon.com/files/download/${name}.tar.gz"; + url = "http://libestr.adiscon.com/files/download/${pname}-${version}.tar.gz"; sha256 = "0910ifzcs8kpd3srrr4fvbacgh2zrc6yn7i4rwfj6jpzhlkjnqs6"; }; diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index ce1c35c7ec60..5a5d8b93057a 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -1,7 +1,8 @@ {lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - name = "libf2c-20160102"; + pname = "libf2c"; + version = "20160102"; src = fetchurl { url = "http://www.netlib.org/f2c/libf2c.zip"; diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index 2576d426af55..589c08399a70 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "libfpx-1.3.1-7"; + pname = "libfpx"; + version = "1.3.1-7"; src = fetchurl { - url = "mirror://imagemagick/delegates/${name}.tar.xz"; + url = "mirror://imagemagick/delegates/${pname}-${version}.tar.xz"; sha256 = "1s28mwb06w6dj0zl6ashpj8m1qiyadawzl7cvbw7dmj1w39ipghh"; }; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index 0326b9c4f64f..68801883df9d 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, libusb-compat-0_1}: stdenv.mkDerivation rec { - name = "libftdi-0.20"; + pname = "libftdi"; + version = "0.20"; src = fetchurl { - url = "https://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz"; + url = "https://www.intra2net.com/en/developer/libftdi/download/${pname}-${version}.tar.gz"; sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii"; }; diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/development/libraries/libgssglue/default.nix index d4bf3ff1c2bb..0d01b05e223b 100644 --- a/pkgs/development/libraries/libgssglue/default.nix +++ b/pkgs/development/libraries/libgssglue/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libkrb5 }: stdenv.mkDerivation rec { - name = "libgssglue-0.4"; + pname = "libgssglue"; + version = "0.4"; src = fetchurl { - url = "http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/${name}.tar.gz"; + url = "http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/${pname}-${version}.tar.gz"; sha256 = "0fh475kxzlabwz30wz3bf7i8kfqiqzhfahayx3jj79rba1sily9z"; }; diff --git a/pkgs/development/libraries/libhangul/default.nix b/pkgs/development/libraries/libhangul/default.nix index eea513a137cf..295ed9bf3054 100644 --- a/pkgs/development/libraries/libhangul/default.nix +++ b/pkgs/development/libraries/libhangul/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "libhangul-0.1.0"; +stdenv.mkDerivation rec { + pname = "libhangul"; + version = "0.1.0"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libhangul/libhangul-0.1.0.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libhangul/libhangul-${version}.tar.gz"; sha256 = "0ni9b0v70wkm0116na7ghv03pgxsfpfszhgyj3hld3bxamfal1ar"; }; diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix index b6df338f122e..9088d9022069 100644 --- a/pkgs/development/libraries/libibmad/default.nix +++ b/pkgs/development/libraries/libibmad/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libibumad }: stdenv.mkDerivation rec { - name = "libibmad-1.3.13"; + pname = "libibmad"; + version = "1.3.13"; src = fetchurl { - url = "https://www.openfabrics.org/downloads/management/${name}.tar.gz"; + url = "https://www.openfabrics.org/downloads/management/${pname}-${version}.tar.gz"; sha256 = "02sj8k2jpcbiq8s0l2lqk4vwji2dbb2lc730cv1yzv0zr0hxgk8p"; }; diff --git a/pkgs/development/libraries/libibumad/default.nix b/pkgs/development/libraries/libibumad/default.nix index 6de97ad77cd7..b9ebef7d4ccb 100644 --- a/pkgs/development/libraries/libibumad/default.nix +++ b/pkgs/development/libraries/libibumad/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libibumad-1.3.10.2"; + pname = "libibumad"; + version = "1.3.10.2"; src = fetchurl { - url = "https://www.openfabrics.org/downloads/management/${name}.tar.gz"; + url = "https://www.openfabrics.org/downloads/management/${pname}-${version}.tar.gz"; sha256 = "0bkygb3lbpaj6s4vsyixybrrkcnilbijv4ga5p1xdwyr3gip83sh"; }; diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index 29d4c3432ebd..a15b00a66ef7 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -2,10 +2,11 @@ , useGTK ? config.libiodbc.gtk or false }: stdenv.mkDerivation rec { - name = "libiodbc-3.52.12"; + pname = "libiodbc"; + version = "3.52.12"; src = fetchurl { - url = "mirror://sourceforge/iodbc/${name}.tar.gz"; + url = "mirror://sourceforge/iodbc/${pname}-${version}.tar.gz"; sha256 = "0qpvklgr1lcn5g8xbz7fbc9rldqf9r8s6xybhqj20m4sglxgziai"; }; diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/pkgs/development/libraries/libiptcdata/default.nix index 140faab43b1a..540d6d01a411 100644 --- a/pkgs/development/libraries/libiptcdata/default.nix +++ b/pkgs/development/libraries/libiptcdata/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "libiptcdata-1.0.4"; + pname = "libiptcdata"; + version = "1.0.4"; src = fetchurl { - url = "mirror://sourceforge/libiptcdata/${name}.tar.gz"; + url = "mirror://sourceforge/libiptcdata/${pname}-${version}.tar.gz"; sha256 = "03pfvkmmx762iydq0q207x2028d275pbdysfsgpmrr0ywy63pxkr"; }; diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix index fe3038c3249a..74d32a6cc748 100644 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ b/pkgs/development/libraries/liblastfmSF/default.nix @@ -1,14 +1,15 @@ { lib, stdenv, fetchurl, pkg-config, curl, openssl }: -stdenv.mkDerivation { - name = "liblastfm-SF-0.5"; +stdenv.mkDerivation rec { + pname = "liblastfm-SF"; + version = "0.5"; nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ curl openssl ]; src = fetchurl { - url = "mirror://sourceforge/liblastfm/libclastfm-0.5.tar.gz"; + url = "mirror://sourceforge/liblastfm/libclastfm-${version}.tar.gz"; sha256 = "0hpfflvfx6r4vvsbvdc564gkby8kr07p8ma7hgpxiy2pnlbpian9"; }; diff --git a/pkgs/development/libraries/libliftoff/default.nix b/pkgs/development/libraries/libliftoff/default.nix new file mode 100644 index 000000000000..759549dbb289 --- /dev/null +++ b/pkgs/development/libraries/libliftoff/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub +, meson, pkg-config, ninja +, libdrm +}: + +stdenv.mkDerivation rec { + pname = "libliftoff"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "emersion"; + repo = pname; + rev = "v${version}"; + sha256 = "1s53jsll3c7272bhmh4jr6k5m1nvn8i1ld704qmzsm852ilmgrla"; + }; + + nativeBuildInputs = [ meson pkg-config ninja ]; + + buildInputs = [ libdrm ]; + + meta = with lib; { + description = "A lightweight KMS plane library"; + longDescription = '' + libliftoff eases the use of KMS planes from userspace without standing in + your way. Users create "virtual planes" called layers, set KMS properties + on them, and libliftoff will pick planes for these layers if possible. + ''; + inherit (src.meta) homepage; + changelog = "https://github.com/emersion/libliftoff/releases/tag/v${version}"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index b871dbdb19d2..aa6cd0fd57d8 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -1,11 +1,14 @@ -{ lib, stdenv, fetchurl, pkg-config, glib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib }: stdenv.mkDerivation rec { - name = "liblqr-1-0.4.2"; + pname = "liblqr-1"; + version = "0.4.2"; - src = fetchurl { - url = "${meta.homepage}/local--files/en:download-page/${name}.tar.bz2"; - sha256 = "0dzikxzjz5zmy3vnydh90aqk23q0qm8ykx6plz6p4z90zlp84fhp"; + src = fetchFromGitHub { + owner = "carlobaldassi"; + repo = "liblqr"; + rev = "v${version}"; + sha256 = "10mrl5k3l2hxjhz4w93n50xwywp6y890rw2vsjcgai8627x5f1df"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/libltc/default.nix b/pkgs/development/libraries/libltc/default.nix index 2391d281d46a..a7d52fe17cf9 100644 --- a/pkgs/development/libraries/libltc/default.nix +++ b/pkgs/development/libraries/libltc/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "libltc-1.3.1"; +stdenv.mkDerivation rec { + pname = "libltc"; + version = "1.3.1"; src = fetchurl { - url = "https://github.com/x42/libltc/releases/download/v1.3.1/libltc-1.3.1.tar.gz"; + url = "https://github.com/x42/libltc/releases/download/v${version}/libltc-${version}.tar.gz"; sha256 = "173h9dgmain3nyrwk6q2d7yl4fnh4vacag4s2p01n5b7nyrkxrjh"; }; diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix index 44c55cb4682b..50bbf8383e61 100644 --- a/pkgs/development/libraries/libmcrypt/default.nix +++ b/pkgs/development/libraries/libmcrypt/default.nix @@ -2,11 +2,12 @@ with lib; -stdenv.mkDerivation { - name = "libmcrypt-2.5.8"; +stdenv.mkDerivation rec { + pname = "libmcrypt"; + version = "2.5.8"; src = fetchurl { - url = "mirror://sourceforge/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.gz"; + url = "mirror://sourceforge/mcrypt/Libmcrypt/${version}/libmcrypt-${version}.tar.gz"; sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4"; }; diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index 0ee0701d9290..099dab139c4f 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }: -stdenv.mkDerivation { - name = "libmemcached-1.0.18"; +stdenv.mkDerivation rec { + pname = "libmemcached"; + version = "1.0.18"; src = fetchurl { - url = "https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz"; + url = "https://launchpad.net/libmemcached/${lib.versions.majorMinor version}/${version}/+download/libmemcached-${version}.tar.gz"; sha256 = "10jzi14j32lpq0if0p9vygcl2c1352hwbywzvr9qzq7x6aq0nb72"; }; diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index f1704a527b44..15a68bdce589 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, zlib, libpng, libjpeg, lcms2 }: stdenv.mkDerivation rec { - name = "libmng-2.0.3"; + pname = "libmng"; + version = "2.0.3"; src = fetchurl { - url = "mirror://sourceforge/libmng/${name}.tar.xz"; + url = "mirror://sourceforge/libmng/${pname}-${version}.tar.xz"; sha256 = "1lvxnpds0vcf0lil6ia2036ghqlbl740c4d2sz0q5g6l93fjyija"; }; diff --git a/pkgs/development/libraries/libmongo-client/default.nix b/pkgs/development/libraries/libmongo-client/default.nix index f81f63133384..a6a20141cc62 100644 --- a/pkgs/development/libraries/libmongo-client/default.nix +++ b/pkgs/development/libraries/libmongo-client/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib }: stdenv.mkDerivation rec { - name = "libmongo-client-0.1.8"; + pname = "libmongo-client"; + version = "0.1.8"; src = fetchFromGitHub { owner = "algernon"; repo = "libmongo-client"; - rev = name; + rev = "${pname}-${version}"; sha256 = "1cjx06i3gd9zkyvwm2ysjrf0hkhr7bjg3c27s7n0y31j10igfjp0"; }; diff --git a/pkgs/development/libraries/libmpcdec/default.nix b/pkgs/development/libraries/libmpcdec/default.nix index b42d9a3d1e43..753687221245 100644 --- a/pkgs/development/libraries/libmpcdec/default.nix +++ b/pkgs/development/libraries/libmpcdec/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "libmpcdec-1.2.6"; +stdenv.mkDerivation rec { + pname = "libmpcdec"; + version = "1.2.6"; src = fetchurl { - url = "https://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2"; + url = "https://files.musepack.net/source/libmpcdec-${version}.tar.bz2"; sha256 = "1a0jdyga1zfi4wgkg3905y6inghy3s4xfs5m4x7pal08m0llkmab"; }; diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix index ab67d544a1df..e1ad8305188e 100644 --- a/pkgs/development/libraries/libmusicbrainz/default.nix +++ b/pkgs/development/libraries/libmusicbrainz/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchurl, cmake, neon, libdiscid }: stdenv.mkDerivation rec { - name = "libmusicbrainz-3.0.3"; + pname = "libmusicbrainz"; + version = "3.0.3"; nativeBuildInputs = [ cmake ]; buildInputs = [ neon libdiscid ]; src = fetchurl { - url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${name}.tar.gz"; + url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${pname}-${version}.tar.gz"; sha256 = "1i9qly13bwwmgj68vma766hgvsd1m75236haqsp9zgh5znlmkm3z"; }; diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index 5fe5ba86bea3..7ca9ec5acb6d 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -2,10 +2,11 @@ stdenv.mkDerivation rec { - name = "liboauth-1.0.3"; + pname = "liboauth"; + version = "1.0.3"; src = fetchurl { - url = "mirror://sourceforge/liboauth/${name}.tar.gz"; + url = "mirror://sourceforge/liboauth/${pname}-${version}.tar.gz"; sha256 = "07w1aq8y8wld43wmbk2q8134p3bfkp2vma78mmsfgw2jn1bh3xhd"; }; diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix index 15856c0262c7..ecf013363ad7 100644 --- a/pkgs/development/libraries/liboggz/default.nix +++ b/pkgs/development/libraries/liboggz/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libogg, pkg-config }: stdenv.mkDerivation rec { - name = "liboggz-1.1.1"; + pname = "liboggz"; + version = "1.1.1"; src = fetchurl { - url = "http://downloads.xiph.org/releases/liboggz/${name}.tar.gz"; + url = "https://downloads.xiph.org/releases/liboggz/${pname}-${version}.tar.gz"; sha256 = "0nj17lhnsw4qbbk8jy4j6a78w6v2llhqdwq46g44mbm9w2qsvbvb"; }; diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix index 7bf99e739f31..184cb2e7de4a 100644 --- a/pkgs/development/libraries/libraw1394/default.nix +++ b/pkgs/development/libraries/libraw1394/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libraw1394-2.1.2"; + pname = "libraw1394"; + version = "2.1.2"; src = fetchurl { - url = "mirror://kernel/linux/libs/ieee1394/${name}.tar.gz"; + url = "mirror://kernel/linux/libs/ieee1394/${pname}-${version}.tar.gz"; sha256 = "0z5md84941ky5l7afayx2z6j0sk0mildxbjajq6niznd44ky7i6x"; }; diff --git a/pkgs/development/libraries/libresample/default.nix b/pkgs/development/libraries/libresample/default.nix index 0756874b3e75..f466229cfe8e 100644 --- a/pkgs/development/libraries/libresample/default.nix +++ b/pkgs/development/libraries/libresample/default.nix @@ -6,10 +6,11 @@ let sha256 = "063w8rqxw87fc89gas47vk0ll7xl8cy7d8g70gm1l62bqkkajklx"; }; in -stdenv.mkDerivation { - name = "libresample-0.1.3"; +stdenv.mkDerivation rec { + pname = "libresample"; + version = "0.1.3"; src = fetchurl { - url = "mirror://debian/pool/main/libr/libresample/libresample_0.1.3.orig.tar.gz"; + url = "mirror://debian/pool/main/libr/libresample/libresample_${version}.orig.tar.gz"; sha256 = "05a8mmh1bw5afqx0kfdqzmph4x2npcs4idx0p0v6q95lwf22l8i0"; }; patches = [ patch ]; diff --git a/pkgs/development/libraries/librevisa/default.nix b/pkgs/development/libraries/librevisa/default.nix index 892bbbbbfc04..12d1da460fb9 100644 --- a/pkgs/development/libraries/librevisa/default.nix +++ b/pkgs/development/libraries/librevisa/default.nix @@ -3,10 +3,11 @@ # TODO: add VXI development files, for VXI-11 (TCPIP) support stdenv.mkDerivation rec { - name = "librevisa-0.0.20130412"; + pname = "librevisa"; + version = "0.0.20130412"; src = fetchurl { - url = "http://www.librevisa.org/download/${name}.tar.gz"; + url = "http://www.librevisa.org/download/${pname}-${version}.tar.gz"; sha256 = "0bjzq23s3xzw0l9qx4l8achrx5id8xdd6r52lvdl4a28dxzbcfhq"; }; diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix index 5a2b8636774f..d30fc55fc77f 100644 --- a/pkgs/development/libraries/libs3/default.nix +++ b/pkgs/development/libraries/libs3/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, curl, libxml2 }: stdenv.mkDerivation { - name = "libs3-2018-12-03"; + pname = "libs3"; + version = "unstable-2018-12-03"; src = fetchFromGitHub { owner = "bji"; diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 1e5cdb389483..5b284e4408c6 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -4,10 +4,11 @@ # need pkg-config so that libshout installs ${out}/lib/pkgconfig/shout.pc stdenv.mkDerivation rec { - name = "libshout-2.4.5"; + pname = "libshout"; + version = "2.4.5"; src = fetchurl { - url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz"; + url = "https://downloads.xiph.org/releases/libshout/${pname}-${version}.tar.gz"; sha256 = "sha256-2eVoZopnOZTr4/HrXyvuBuMjal25K40MSH4cD4hqaJA="; }; diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index fe2717cfeb36..5daf93b943ba 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -5,10 +5,11 @@ }: stdenv.mkDerivation rec { - name = "libstatgrab-0.92"; + pname = "libstatgrab"; + version = "0.92"; src = fetchurl { - url = "https://ftp.i-scream.org/pub/i-scream/libstatgrab/${name}.tar.gz"; + url = "https://ftp.i-scream.org/pub/i-scream/libstatgrab/${pname}-${version}.tar.gz"; sha256 = "15m1sl990l85ijf8pnc6hdfha6fqyiq74mijrzm3xz4zzxm91wav"; }; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 5e1c0c671d90..6c2cb095a818 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -15,12 +15,13 @@ }: stdenv.mkDerivation rec { - name = "libvirt-glib-4.0.0"; + pname = "libvirt-glib"; + version = "4.0.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "https://libvirt.org/sources/glib/${name}.tar.xz"; + url = "https://libvirt.org/sources/glib/${pname}-${version}.tar.xz"; sha256 = "hCP3Bp2qR2MHMh0cEeLswoU0DNMsqfwFIHdihD7erL0="; }; diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix index 90914d4186ea..066dcb4f34f4 100644 --- a/pkgs/development/libraries/libvterm/default.nix +++ b/pkgs/development/libraries/libvterm/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, glib, ncurses }: stdenv.mkDerivation rec { - name = "libvterm-0.99.7"; + pname = "libvterm"; + version = "0.99.7"; src = fetchurl { - url = "mirror://sourceforge/libvterm/${name}.tar.gz"; + url = "mirror://sourceforge/libvterm/${pname}-${version}.tar.gz"; sha256 = "10gaqygmmwp0cwk3j8qflri5caf8vl3f7pwfl2svw5whv8wkn0k2"; }; diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index cf85d57a7f20..bf0df220935c 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libwpd, zlib, librevenge }: stdenv.mkDerivation rec { - name = "libwpg-0.3.3"; + pname = "libwpg"; + version = "0.3.3"; src = fetchurl { - url = "mirror://sourceforge/libwpg/${name}.tar.xz"; + url = "mirror://sourceforge/libwpg/${pname}-${version}.tar.xz"; sha256 = "074x159immf139szkswv2zapnq75p7xk10dbha2p9193hgwggcwr"; }; diff --git a/pkgs/development/libraries/libx86/src-for-default.nix b/pkgs/development/libraries/libx86/src-for-default.nix index a681d9e58902..b7e432d8109c 100644 --- a/pkgs/development/libraries/libx86/src-for-default.nix +++ b/pkgs/development/libraries/libx86/src-for-default.nix @@ -1,9 +1,7 @@ rec { + pname="libx86"; version="1.1"; - name="libx86-1.1"; hash="0j6h6bc02c6qi0q7c1ncraz4d1hkm5936r35rfsp4x1jrc233wav"; url="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-${version}.tar.gz"; - advertisedUrl="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-1.1.tar.gz"; - - + advertisedUrl="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-${version}.tar.gz"; } diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix index d78bb1a7d946..47dfcab5a499 100644 --- a/pkgs/development/libraries/libxmp/default.nix +++ b/pkgs/development/libraries/libxmp/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libxmp-4.5.0"; + pname = "libxmp"; + version = "4.5.0"; meta = with lib; { description = "Extended module player library"; @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://sourceforge/xmp/libxmp/${name}.tar.gz"; + url = "mirror://sourceforge/xmp/libxmp/${pname}-${version}.tar.gz"; sha256 = "sha256-eEfSYhEtFOhEL0TlrG7Z3bylTCUShHILVjyFKzHybnU="; }; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index bdecfe0d57ad..aaa78de47f75 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.1.3"; + version = "21.1.4"; branch = versions.major version; self = stdenv.mkDerivation { @@ -45,7 +45,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0s8yi7y63xsyqw19ihil18fykkjxr6ibcir2fvymz1vh4ql23qnb"; + sha256 = "02z9g6zpkg1p1sm8f84xdi7v2n7x534x9pn565bvcr411527y5qz"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index 52d294525a0c..7997fc18d111 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, openssl }: -stdenv.mkDerivation { - name = "mysocketw-031026"; +stdenv.mkDerivation rec { + pname = "mysocketw"; + version = "031026"; src = fetchurl { - url = "http://www.digitalfanatics.org/cal/socketw/files/SocketW031026.tar.gz"; + url = "https://www.digitalfanatics.org/cal/socketw/files/SocketW${version}.tar.gz"; sha256 = "0crinikhdl7xihzmc3k3k41pgxy16d5ci8m9sza1lbibns7pdwj4"; }; diff --git a/pkgs/development/libraries/nvidia-video-sdk/default.nix b/pkgs/development/libraries/nvidia-video-sdk/default.nix index 22161e3dc1d6..ab674833ebfc 100644 --- a/pkgs/development/libraries/nvidia-video-sdk/default.nix +++ b/pkgs/development/libraries/nvidia-video-sdk/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, unzip }: -stdenv.mkDerivation { - name = "nvidia-video-sdk-6.0.1"; +stdenv.mkDerivation rec { + pname = "nvidia-video-sdk"; + version = "6.0.1"; src = fetchurl { url = "https://developer.nvidia.com/video-sdk-601"; - name = "nvidia_video_sdk_6.0.1.zip"; + name = "nvidia_video_sdk_${version}.zip"; sha256 = "08h1vnqsv22js9v3pyim5yb80z87baxb7s2g5gsvvjax07j7w8h5"; }; diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index 7a1c39715797..da95f9ef698c 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -2,11 +2,12 @@ , libXi, libSM, libXmu, libXext, libX11 }: stdenv.mkDerivation rec { - name = "plib-1.8.5"; + pname = "plib"; + version = "1.8.5"; src = fetchurl { # XXX: The author doesn't use the orthodox SF way to store tarballs. - url = "http://plib.sourceforge.net/dist/${name}.tar.gz"; + url = "http://plib.sourceforge.net/dist/${pname}-${version}.tar.gz"; sha256 = "0cha71mflpa10vh2l7ipyqk67dq2y0k5xbafwdks03fwdyzj4ns8"; }; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index bc7f7e80d9c2..a8b012a20998 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -20,28 +20,14 @@ in stdenv.mkDerivation rec { pname = "polkit"; - version = "0.118"; + version = "0.119"; src = fetchurl { url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.gz"; - sha256 = "0swmg37jsxsxfsd2b3qm0l3zxr9ldvhpjw8lsgq3j8q7wy2fjm3d"; + sha256 = "0p0zzmr0kh3mpmqya4q27y4h9b920zp5ya0i8909ahp9hvdrymy8"; }; - patches = [ - # Don't use etc/dbus-1/system.d - # Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/11 - (fetchpatch { - url = "https://gitlab.freedesktop.org/polkit/polkit/commit/5dd4e22efd05d55833c4634b56e473812b5acbf2.patch"; - sha256 = "17lv7xj5ksa27iv4zpm4zwd4iy8zbwjj4ximslfq3sasiz9kxhlp"; - }) - (fetchpatch { - # https://www.openwall.com/lists/oss-security/2021/06/03/1 - # https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/79 - name = "CVE-2021-3560.patch"; - url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81.patch"; - sha256 = "157ddsizgr290jsb8fpafrc37gc1qw5pdvl351vnn3pzhqs7n6f4"; - }) - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + patches = lib.optionals stdenv.hostPlatform.isMusl [ # Make netgroup support optional (musl does not have it) # Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/10 # We use the version of the patch that Alpine uses successfully. @@ -110,18 +96,22 @@ stdenv.mkDerivation rec { inherit doCheck; checkInputs = [ dbus ]; checkPhase = '' + runHook preCheck + # unfortunately this test needs python-dbusmock, but python-dbusmock needs polkit, # leading to a circular dependency substituteInPlace test/Makefile --replace polkitbackend "" # tests need access to the system bus dbus-run-session --config-file=${./system_bus.conf} -- sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS make check' + + runHook postCheck ''; meta = with lib; { homepage = "http://www.freedesktop.org/wiki/Software/polkit"; description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; - license = licenses.gpl2; + license = licenses.lgpl2Plus; platforms = platforms.unix; maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); }; diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index efa68146e8d8..bf0f8a7388de 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, alsa-lib, pkg-config, libjack2 , AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }: -stdenv.mkDerivation { - name = "portaudio-190600-20161030"; +stdenv.mkDerivation rec { + pname = "portaudio"; + version = "190600-20161030"; src = fetchurl { - url = "http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz"; + url = "http://www.portaudio.com/archives/pa_stable_v${lib.replaceStrings ["-"] ["_"] version}.tgz"; sha256 = "04qmin6nj144b8qb9kkd9a52xfvm0qdgm8bg8jbl7s3frmyiv8pm"; }; diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix index 82ee5c3ae44d..c1a86b1f3979 100644 --- a/pkgs/development/libraries/psqlodbc/default.nix +++ b/pkgs/development/libraries/psqlodbc/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libiodbc, postgresql, openssl }: stdenv.mkDerivation rec { - name = "psqlodbc-09.01.0200"; + pname = "psqlodbc"; + version = "09.01.0200"; src = fetchurl { - url = "https://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz"; + url = "https://ftp.postgresql.org/pub/odbc/versions/src/${pname}-${version}.tar.gz"; sha256 = "0b4w1ahfpp34jpscfk2kv9050lh3xl9pvcysqvaigkcd0vsk1hl9"; }; diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index 2b0be6f0b3dd..2c62ea27d19b 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -1,12 +1,15 @@ -{ lib, stdenv, fetchurl, qtbase, qmake, qca-qt5 }: +{ lib, stdenv, fetchFromGitHub, qtbase, qmake, qca-qt5 }: -stdenv.mkDerivation { - name = "qoauth-2.0.0"; +stdenv.mkDerivation rec { + pname = "qoauth"; + version = "2.0.0"; - src = fetchurl { - url = "https://github.com/ayoy/qoauth/archive/v2.0.0.tar.gz"; - name = "qoauth-2.0.0.tar.gz"; - sha256 = "a28005986410d333e03d077679cdf6c504ec5a33342867dc0f9fb0b74285e333"; + src = fetchFromGitHub { + owner = "ayoy"; + repo = "qoauth"; + rev = "v${version}"; + name = "qoauth-${version}.tar.gz"; + sha256 = "1b2jdqs526ac635yb2whm049spcsk7almnnr6r5b4yqhq922anw3"; }; postPatch = '' diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix index 0ff6db175611..edab4037a154 100644 --- a/pkgs/development/libraries/sbc/default.nix +++ b/pkgs/development/libraries/sbc/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libsndfile }: stdenv.mkDerivation rec { - name = "sbc-1.4"; + pname = "sbc"; + version = "1.4"; src = fetchurl { - url = "http://www.kernel.org/pub/linux/bluetooth/${name}.tar.xz"; + url = "https://www.kernel.org/pub/linux/bluetooth/${pname}-${version}.tar.xz"; sha256 = "1jal98pnrjkzxlkiqy0ykh4qmgnydz9bmsp1jn581p5kddpg92si"; }; diff --git a/pkgs/development/libraries/science/biology/EBTKS/default.nix b/pkgs/development/libraries/science/biology/EBTKS/default.nix index b75ac06627fb..2a832fc7c37a 100644 --- a/pkgs/development/libraries/science/biology/EBTKS/default.nix +++ b/pkgs/development/libraries/science/biology/EBTKS/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "EBTKS"; - name = "${pname}-2017-09-23"; + version = "unstable-2017-09-23"; src = fetchFromGitHub { owner = "BIC-MNI"; diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/pkgs/development/libraries/science/math/liblbfgs/default.nix index 20c5a2070a05..3c194648c2a3 100644 --- a/pkgs/development/libraries/science/math/liblbfgs/default.nix +++ b/pkgs/development/libraries/science/math/liblbfgs/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "liblbfgs-1.10"; +stdenv.mkDerivation rec { + pname = "liblbfgs"; + version = "1.10"; configureFlags = [ "--enable-sse2" ]; src = fetchurl { - url = "https://github.com/downloads/chokkan/liblbfgs/liblbfgs-1.10.tar.gz"; + url = "https://github.com/downloads/chokkan/liblbfgs/liblbfgs-${version}.tar.gz"; sha256 = "1kv8d289rbz38wrpswx5dkhr2yh4fg4h6sszkp3fawxm09sann21"; }; diff --git a/pkgs/development/libraries/science/math/metis/default.nix b/pkgs/development/libraries/science/math/metis/default.nix index b06b432372a7..da79f6d62499 100644 --- a/pkgs/development/libraries/science/math/metis/default.nix +++ b/pkgs/development/libraries/science/math/metis/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, unzip, cmake }: -stdenv.mkDerivation { - name = "metis-5.1.0"; +stdenv.mkDerivation rec { + name = "metis"; + version = "5.1.0"; src = fetchurl { - url = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz"; + url = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-${version}.tar.gz"; sha256 = "1cjxgh41r8k6j029yxs8msp3z6lcnpm16g5pvckk35kc7zhfpykn"; }; diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/pkgs/development/libraries/science/math/openspecfun/default.nix index a341264d9894..cb72fbd2ca48 100644 --- a/pkgs/development/libraries/science/math/openspecfun/default.nix +++ b/pkgs/development/libraries/science/math/openspecfun/default.nix @@ -1,10 +1,13 @@ -{ lib, stdenv, fetchurl, gfortran }: +{ lib, stdenv, fetchFromGitHub, gfortran }: -stdenv.mkDerivation { - name = "openspecfun-0.5.3"; - src = fetchurl { - url = "https://github.com/JuliaLang/openspecfun/archive/v0.5.3.tar.gz"; - sha256 = "1rs1bv8jq751fv9vq79890wqf9xlbjc7lvz3ighzyfczbyjcf18m"; +stdenv.mkDerivation rec { + pname = "openspecfun"; + version = "0.5.3"; + src = fetchFromGitHub { + owner = "JuliaLang"; + repo = "openspecfun"; + rev = "v${version}"; + sha256 = "0pfw6l3ch7isz403llx7inxlvavqh01jh1hb9dpidi86sjjx9kfh"; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix index 0fcb4884de5c..f6b9194a608c 100644 --- a/pkgs/development/libraries/scmccid/default.nix +++ b/pkgs/development/libraries/scmccid/default.nix @@ -2,15 +2,16 @@ assert stdenv ? cc && stdenv.cc.libc != null; -stdenv.mkDerivation { - name = "scmccid-5.0.11"; +stdenv.mkDerivation rec { + pname = "scmccid"; + version = "5.0.11"; src = if stdenv.hostPlatform.system == "i686-linux" then (fetchurl { - url = "http://www.scmmicro.com/support/download/scmccid_5.0.11_linux.tar.gz"; + url = "http://www.scmmicro.com/support/download/scmccid_${version}_linux.tar.gz"; sha256 = "1r5wkarhzl09ncgj55baizf573czw0nplh1pgddzx9xck66kh5bm"; }) else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl { - url = "http://www.scmmicro.com/support/download/scmccid_5.0.11_linux_x64.tar.gz"; + url = "http://www.scmmicro.com/support/download/scmccid_${version}_linux_x64.tar.gz"; sha256 = "0k9lzlk01sl4ycfqgrqqy3bildz0mcr1r0kkicgjz96l4s0jgz0i"; }) else throw "Architecture not supported"; diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix index 9973e04a670b..56c4eccf434c 100644 --- a/pkgs/development/libraries/slib/default.nix +++ b/pkgs/development/libraries/slib/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv, unzip, scheme, texinfo }: stdenv.mkDerivation rec { - name = "slib-3b5"; + pname = "slib"; + version = "3b5"; src = fetchurl { - url = "https://groups.csail.mit.edu/mac/ftpdir/scm/${name}.zip"; + url = "https://groups.csail.mit.edu/mac/ftpdir/scm/${pname}-${version}.zip"; sha256 = "0q0p2d53p8qw2592yknzgy2y1p5a9k7ppjx0cfrbvk6242c4mdpq"; }; diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix index c9debd36110e..46520714c510 100644 --- a/pkgs/development/libraries/soprano/default.nix +++ b/pkgs/development/libraries/soprano/default.nix @@ -2,10 +2,11 @@ , pkg-config }: stdenv.mkDerivation rec { - name = "soprano-2.9.4"; + pname = "soprano"; + version = "2.9.4"; src = fetchurl { - url = "mirror://sourceforge/soprano/${name}.tar.bz2"; + url = "mirror://sourceforge/soprano/${pname}-${version}.tar.bz2"; sha256 = "1rg0x7yg0a1cbnxz7kqk52580wla8jbnj4d4r3j7l7g7ajyny1k4"; }; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index f334bb2f35a4..9f330f3f32f8 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation { sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; }; + configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.targetPlatform) [ + "lf_cv_sane_realloc=yes" + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxcb xcbutil ]; diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix index e515dd1673fa..9ac026ee94b8 100644 --- a/pkgs/development/libraries/tre/default.nix +++ b/pkgs/development/libraries/tre/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, fetchpatch}: stdenv.mkDerivation rec { - name = "tre-0.8.0"; + pname = "tre"; + version = "0.8.0"; src = fetchurl { - url = "https://laurikari.net/tre/${name}.tar.gz"; + url = "https://laurikari.net/tre/${pname}-${version}.tar.gz"; sha256 = "1pd7qsa7vc3ybdc6h2gr4pm9inypjysf92kab945gg4qa6jp11my"; }; diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 7cfd9f1edf5c..7306243bca9d 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -10,10 +10,11 @@ assert xor (openssl != null) (gnutls != null); assert !(xor (openssl != null) (zlib != null)); stdenv.mkDerivation rec { - name = "ucommon-7.0.0"; + pname = "ucommon"; + version = "7.0.0"; src = fetchurl { - url = "mirror://gnu/commoncpp/${name}.tar.gz"; + url = "mirror://gnu/commoncpp/${pname}-${version}.tar.gz"; sha256 = "6ac9f76c2af010f97e916e4bae1cece341dc64ca28e3881ff4ddc3bc334060d7"; }; diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix index 0235912ce539..5c3140a177c3 100644 --- a/pkgs/development/libraries/vcdimager/default.nix +++ b/pkgs/development/libraries/vcdimager/default.nix @@ -2,10 +2,11 @@ , libiconv, darwin }: stdenv.mkDerivation rec { - name = "vcdimager-2.0.1"; + pname = "vcdimager"; + version = "2.0.1"; src = fetchurl { - url = "mirror://gnu/vcdimager/${name}.tar.gz"; + url = "mirror://gnu/vcdimager/${pname}-${version}.tar.gz"; sha256 = "0ypnb1vp49nmzp5571ynlz6n1gh90f23w3z4x95hb7c2p7pmylb7"; }; diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 38688d90246e..4c4af6b2c1f8 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "virglrenderer"; - version = "0.8.2"; + version = "0.9.1"; src = fetchurl { url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${version}/virglrenderer-virglrenderer-${version}.tar.bz2"; - sha256 = "07vfzg99wq92yg2phza9jc0zvps34yy9gc8v4hibqchdl77fmspx"; + sha256 = "1h76a1ylhh4niq33sa5knx033sr4k2816vibh4m58j54y7qc6346"; }; buildInputs = [ libGLU epoxy libX11 libdrm mesa ]; diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 6858cd93ab36..d87adabf56c6 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }: stdenv.mkDerivation { - name = "vxl-1.17.0-nix1"; + pname = "vxl"; + version = "1.17.0-nix1"; src = fetchFromGitHub { owner = "vxl"; diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix index db36c2a34c15..dd5cd21d405f 100644 --- a/pkgs/development/libraries/xbase/default.nix +++ b/pkgs/development/libraries/xbase/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "xbase-3.1.2"; +stdenv.mkDerivation rec { + pname = "xbase"; + version = "3.1.2"; src = fetchurl { - url = "mirror://sourceforge/xdb/xbase64-3.1.2.tar.gz"; + url = "mirror://sourceforge/xdb/xbase64-${version}.tar.gz"; sha256 = "17287kz1nmmm64y7zp9nhhl7slzlba09h6cc83w4mvsqwd9w882r"; }; diff --git a/pkgs/development/ocaml-modules/alcotest/mirage.nix b/pkgs/development/ocaml-modules/alcotest/mirage.nix new file mode 100644 index 000000000000..b4ba4246b2cd --- /dev/null +++ b/pkgs/development/ocaml-modules/alcotest/mirage.nix @@ -0,0 +1,16 @@ +{ lib, buildDunePackage, alcotest, lwt, logs, mirage-clock, duration }: + +buildDunePackage { + pname = "alcotest-mirage"; + + inherit (alcotest) version src useDune2; + + propagatedBuildInputs = [ alcotest lwt logs mirage-clock duration ]; + + doCheck = true; + + meta = alcotest.meta // { + description = "Mirage implementation for Alcotest"; + maintainers = with lib.maintainers; [ ulrikstrid anmonteiro ]; + }; +} diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index 18683d5f1709..f496ce91c826 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -5,27 +5,17 @@ then throw "camlpdf is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "2.3.1"; + version = "2.4"; name = "ocaml${ocaml.version}-camlpdf-${version}"; src = fetchFromGitHub { owner = "johnwhitington"; repo = "camlpdf"; rev = "v${version}"; - sha256 = "1q69hhk63z836jbkv4wsng27w35w0qpz01c7ax0mqm8d8kmnr0v4"; + sha256 = "09kzrgmlxb567315p3fy59ba0kv7xhp548n9i3l4wf9n06p0ww9m"; }; buildInputs = [ which ocaml findlib ]; - # Version number in META file is wrong - patchPhase = '' - patch -p 0 META <<EOF - 3c3 - < version="1.7.1" - --- - > version="${version}" - EOF - ''; - preInstall = '' mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs ''; diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index cc2aad52d3d6..2a0fae4a1dbb 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -1,6 +1,10 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib, camlpdf, ncurses }: -let version = "2.3.1"; in +if !lib.versionAtLeast ocaml.version "4.10" +then throw "cpdf is not available for OCaml ${ocaml.version}" +else + +let version = "2.4"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-cpdf-${version}"; @@ -9,19 +13,14 @@ stdenv.mkDerivation { owner = "johnwhitington"; repo = "cpdf-source"; rev = "v${version}"; - sha256 = "1gwz0iy28f67kbqap2q10nf98dalwbi03vv5j893z2an7pb4w68z"; + sha256 = "1a8lmfc76dr8x6pxgm4aypbys02pfma9yh4z3l1qxp2q1909na5l"; }; - prePatch = '' - substituteInPlace META --replace 'version="1.7"' 'version="${version}"' - ''; - buildInputs = [ ocaml findlib ncurses ]; propagatedBuildInputs = [ camlpdf ]; - createFindlibDestdir = true; - - postInstall = '' + preInstall = '' + mkdir -p $OCAMLFIND_DESTDIR mkdir -p $out/bin cp cpdf $out/bin mkdir -p $out/share/ diff --git a/pkgs/development/ocaml-modules/routes/default.nix b/pkgs/development/ocaml-modules/routes/default.nix new file mode 100644 index 000000000000..a83d0db5d84d --- /dev/null +++ b/pkgs/development/ocaml-modules/routes/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchurl, buildDunePackage }: + +buildDunePackage rec { + pname = "routes"; + version = "0.9.1"; + + useDune2 = true; + minimalOCamlVersion = "4.05"; + + src = fetchurl { + url = "https://github.com/anuragsoni/routes/releases/download/${version}/routes-${version}.tbz"; + sha256 = "0h2c1p5w6237c1lmsl5c8q2dj5dq20gf2cmb12nbmlfn12sfmcrl"; + }; + + meta = with lib; { + description = "Typed routing for OCaml applications"; + license = licenses.bsd3; + homepage = "https://anuragsoni.github.io/routes"; + maintainers = with maintainers; [ ulrikstrid anmonteiro ]; + }; +} diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix index dd74a21bf9b8..e169b886f88e 100644 --- a/pkgs/development/python-modules/aiocoap/default.nix +++ b/pkgs/development/python-modules/aiocoap/default.nix @@ -1,24 +1,42 @@ { lib , buildPythonPackage , fetchFromGitHub -, python +, pytestCheckHook +, pygments +, pythonOlder }: buildPythonPackage rec { pname = "aiocoap"; - version = "0.4b3"; + version = "0.4.1"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "chrysn"; repo = pname; rev = version; - sha256 = "1zjg475xgvi19rqg7jmfgy5nfabq50aph0231p9jba211ps7cmxw"; + sha256 = "0k7ii2l3n139f8712ja6w3z73xiwlfsjgdc4k5c514ni2w6w2yjc"; }; - checkPhase = '' - ${python.interpreter} -m aiocoap.cli.defaults - ${python.interpreter} -m unittest discover -v - ''; + propagatedBuildInputs = [ + pygments + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # Don't test the plugins + "tests/test_tls.py" + "tests/test_reverseproxy.py" + "tests/test_oscore_plugtest.py" + ]; + + disabledTests = [ + # Communication is not properly mocked + "test_uri_parser" + ]; pythonImportsCheck = [ "aiocoap" ]; diff --git a/pkgs/development/python-modules/aiomusiccast/default.nix b/pkgs/development/python-modules/aiomusiccast/default.nix new file mode 100644 index 000000000000..e77642f510a7 --- /dev/null +++ b/pkgs/development/python-modules/aiomusiccast/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, aiohttp +}: + +buildPythonPackage rec { + pname = "aiomusiccast"; + version = "0.8.1"; + + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "vigonotion"; + repo = "aiomusiccast"; + rev = version; + sha256 = "sha256-1k0ELXA8TgAyRYdzSFXp/BsPesC1WCiC4PqHfcPk0u8="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "aiomusiccast" ]; + + meta = with lib; { + description = "Companion library for musiccast devices intended for the Home Assistant integration"; + homepage = "https://github.com/vigonotion/aiomusiccast"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/aiopg/default.nix b/pkgs/development/python-modules/aiopg/default.nix index cb9cd327e8ce..36ea00234830 100644 --- a/pkgs/development/python-modules/aiopg/default.nix +++ b/pkgs/development/python-modules/aiopg/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiopg"; - version = "1.2.1"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "0c6s2p1fjbdk1ygpl6a1s1rbnsk8gw9kj99pf98nxhb9j3iahas4"; + sha256 = "sha256-/J53WqBag4ArSF7wETvmoBUtgNqp4eYGH0ytipiSKBI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/async-dns/default.nix b/pkgs/development/python-modules/async-dns/default.nix index fdf240f5ba96..3067269aac9f 100644 --- a/pkgs/development/python-modules/async-dns/default.nix +++ b/pkgs/development/python-modules/async-dns/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , poetry-core , python , pythonOlder @@ -9,7 +8,7 @@ buildPythonPackage rec { pname = "async-dns"; - version = "1.1.9"; + version = "1.1.10"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -17,23 +16,13 @@ buildPythonPackage rec { owner = "gera2ld"; repo = "async_dns"; rev = "v${version}"; - sha256 = "1z8j0s3dwcyavarhx41q75k1cmfzmwiqdh4svv3v15np26cywyag"; + sha256 = "1yxmdlf2n66kp2mprsd4bvfsf63l4c4cfkjm2rm063pmlifz2fvj"; }; nativeBuildInputs = [ poetry-core ]; - patches = [ - # Switch to poetry-core, https://github.com/gera2ld/async_dns/pull/22 - # Can be remove for async-dns>1.1.9 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/gera2ld/async_dns/commit/25fee497aae3bde0ddf9f8804d249a27edbe607e.patch"; - sha256 = "0w4zlppnp1a2q1wasc95ymqx3djswl32y5nw6fvz3nn8jg4gc743"; - }) - ]; - checkPhase = '' export HOME=$TMPDIR # Test needs network access diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index fc48f9150124..f6d7fcac62a5 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { pname = "daphne"; - version = "3.0.1"; + version = "3.0.2"; disabled = !isPy3k; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "django"; repo = pname; rev = version; - sha256 = "1bkxhzvaqwz760c11nhaiwvsq1d1csmk5dz2a1j1ynypjprhvhsk"; + sha256 = "sha256-KWkMV4L7bA2Eo/u4GGif6lmDNrZAzvYyDiyzyWt9LeI="; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/debian-inspector/default.nix b/pkgs/development/python-modules/debian-inspector/default.nix index 8064a35ffee0..e19694bcf9c8 100644 --- a/pkgs/development/python-modules/debian-inspector/default.nix +++ b/pkgs/development/python-modules/debian-inspector/default.nix @@ -2,30 +2,25 @@ , buildPythonPackage , fetchPypi , pythonAtLeast -, fetchpatch , chardet , attrs , commoncode , pytestCheckHook +, setuptools-scm }: + buildPythonPackage rec { pname = "debian-inspector"; - version = "0.9.10"; + version = "21.5.25"; src = fetchPypi { pname = "debian_inspector"; inherit version; - sha256 = "fd29a02b925a4de0d7bb00c29bb05f19715a304bc10ef7b9ad06a93893dc3a8c"; + sha256 = "1d3xaqw00kav85nk29qm2yqb73bkyqf185fs1q0vgd7bnap9wqaw"; }; - patches = lib.optionals (pythonAtLeast "3.9") [ - # https://github.com/nexB/debian-inspector/pull/15 - # fixes tests on Python 3.9 - (fetchpatch { - name = "drop-encoding-argument.patch"; - url = "https://github.com/nexB/debian-inspector/commit/ff991cdb788671ca9b81f1602b70a439248fd1aa.patch"; - sha256 = "bm3k7vb9+Rm6+YicQEeDOOUVut8xpDaNavG+t2oLZkI="; - }) + nativeBuildInputs = [ + setuptools-scm ]; dontConfigure = true; diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index ae6187e207e9..7ee41a962c73 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "Django"; - version = "3.2.4"; + version = "3.2.5"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "15pjwyvrx4n8gi8n51b14wp54bg4jqapr25p52597zn6ikdxijb6"; + sha256 = "1kam3301jl53vm0mhflwwsqy5d7kb5dksmjanlaj7v7xakm5z81x"; }; patches = lib.optional withGdal diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix index 613d2444d73c..1bc5d380b08e 100644 --- a/pkgs/development/python-modules/drms/default.nix +++ b/pkgs/development/python-modules/drms/default.nix @@ -7,16 +7,18 @@ , astropy , pytestCheckHook , pytest-doctestplus +, pythonOlder }: buildPythonPackage rec { pname = "drms"; - version = "0.6.0"; + version = "0.6.2"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "74efb903f42647ea536de0c5aea4f9a81efe027c95055ec4e72ef62479a04c89"; + sha256 = "sha256-Id8rPK8qq71gHn5DKnEi7Lp081GFbcFtGU+v89Vlt9o="; }; propagatedBuildInputs = [ @@ -31,10 +33,12 @@ buildPythonPackage rec { pytest-doctestplus ]; + pythonImportsCheck = [ "drms" ]; + meta = with lib; { description = "Access HMI, AIA and MDI data with Python"; homepage = "https://github.com/sunpy/drms"; - license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + license = licenses.bsd2; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index 4329db98c2bd..6449a3da767c 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -6,29 +6,33 @@ buildPythonPackage rec { pname = "editorconfig"; - version = "0.12.2"; + version = "0.12.3"; # fetchgit used to ensure test submodule is available src = fetchgit { url = "https://github.com/editorconfig/editorconfig-core-py"; - rev = "596da5e06ebee05bdbdc6224203c79c4d3c6486a"; # Not tagged - sha256 = "05cbp971b0zix7kfxkk7ndxb4ax1l21frwc00d4g78mk4sdz6dig"; + rev = "1a8fb62b9941fded9e4fb83a3d0599427f5484cb"; # Not tagged + sha256 = "0vx8rl7kii72965jsi01mdsz9rfi1q9bwy13x47iaqm6rmcwc1rb"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; dontUseCmakeConfigure = true; checkPhase = '' cmake . - # utf_8_char fails with python3 + # utf_8_char fails with Python 3 ctest -E "utf_8_char" . ''; + pythonImportsCheck = [ "editorconfig" ]; + meta = with lib; { - homepage = "https://editorconfig.org"; description = "EditorConfig File Locator and Interpreter for Python"; + homepage = "https://editorconfig.org"; license = licenses.psfl; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/extractcode/7z.nix b/pkgs/development/python-modules/extractcode/7z.nix index e3318b426ecc..be6fcde55c29 100644 --- a/pkgs/development/python-modules/extractcode/7z.nix +++ b/pkgs/development/python-modules/extractcode/7z.nix @@ -4,15 +4,16 @@ , plugincode , p7zip }: + buildPythonPackage rec { pname = "extractcode-7z"; - version = "21.4.4"; + version = "21.5.31"; src = fetchFromGitHub { owner = "nexB"; repo = "scancode-plugins"; rev = "v${version}"; - sha256 = "xnUGDMS34iMVMGo/nZwRarGzzbj3X4Rt+YHvvKpmy6A="; + sha256 = "02qinla281fc6pmg5xzsrmqnf9js76f2qcbf98zq7m2dkn70as4w"; }; sourceRoot = "source/builtins/extractcode_7z-linux"; diff --git a/pkgs/development/python-modules/extractcode/libarchive.nix b/pkgs/development/python-modules/extractcode/libarchive.nix index 8e89c3d6a8e3..2cff60f3d811 100644 --- a/pkgs/development/python-modules/extractcode/libarchive.nix +++ b/pkgs/development/python-modules/extractcode/libarchive.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "extractcode-libarchive"; - version = "21.4.4"; + version = "21.5.31"; src = fetchFromGitHub { owner = "nexB"; repo = "scancode-plugins"; rev = "v${version}"; - sha256 = "xnUGDMS34iMVMGo/nZwRarGzzbj3X4Rt+YHvvKpmy6A="; + sha256 = "02qinla281fc6pmg5xzsrmqnf9js76f2qcbf98zq7m2dkn70as4w"; }; sourceRoot = "source/builtins/extractcode_libarchive-linux"; diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index 5d8359885bd1..fff330946d16 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -11,6 +11,10 @@ buildPythonPackage rec { sha256 = "28352387efbbe772cfb307570019f81957a13ff718d994a9125fa705efb73680"; }; + postPatch = '' + sed -i -e 's/use_scm_version=.*/version="${version}",/' setup.py + ''; + propagatedBuildInputs = [ flask brotli ]; meta = with lib; { diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 8762d62e59b9..4d829f3d6473 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -3,6 +3,7 @@ , fetchPypi , six , isPyPy +, python }: @@ -16,11 +17,18 @@ buildPythonPackage rec { sha256 = "c87df8ae3f01ffb4483c796fe1b15232ce2b219f0b18126948616224d3f658ee"; }; - propagatedBuildInputs = [ six ]; + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover -v greenlet.tests + runHook postCheck + ''; - meta = { - homepage = "https://pypi.python.org/pypi/greenlet"; + meta = with lib; { + homepage = "https://github.com/python-greenlet/greenlet"; description = "Module for lightweight in-process concurrent programming"; - license = lib.licenses.lgpl2; + license = with licenses; [ + psfl # src/greenlet/slp_platformselect.h & files in src/greenlet/platform/ directory + mit + ]; }; } diff --git a/pkgs/development/python-modules/guppy3/default.nix b/pkgs/development/python-modules/guppy3/default.nix index 578f979914cb..b9db312d8716 100644 --- a/pkgs/development/python-modules/guppy3/default.nix +++ b/pkgs/development/python-modules/guppy3/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "guppy3"; - version = "3.1.0"; + version = "3.1.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "zhuyifei1999"; repo = pname; rev = "v${version}"; - sha256 = "0yjsn8najbic4f50nj6jzhzrhj1bw6918w0gihdkzhqynwgqi64m"; + sha256 = "14iwah1i4dcn74zjj9sq3av1yh9q5nvgqwccnn71blp7gxcnxnvh"; }; propagatedBuildInputs = [ tkinter ]; diff --git a/pkgs/development/python-modules/malduck/default.nix b/pkgs/development/python-modules/malduck/default.nix index a9a8419a04dc..1b757a144ccf 100644 --- a/pkgs/development/python-modules/malduck/default.nix +++ b/pkgs/development/python-modules/malduck/default.nix @@ -35,8 +35,14 @@ buildPythonPackage rec { yara-python ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "pefile==2019.4.18" "pefile" + ''; + # Project has no tests. They will come with the next release doCheck = false; + pythonImportsCheck = [ "malduck" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix index 159310035b8f..780cafa599db 100644 --- a/pkgs/development/python-modules/mdformat/default.nix +++ b/pkgs/development/python-modules/mdformat/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mdformat"; - version = "0.7.6"; + version = "0.7.7"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = version; - sha256 = "0mnbi3vp7zgllpcpf6vrjw9y6jas95shphn99ayr8b8wgxsaqkif"; + sha256 = "sha256-1qwluHxZnSuyNJENzeJzkuhIQN5njTOch2Wz45J0qRI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/netmap/default.nix b/pkgs/development/python-modules/netmap/default.nix new file mode 100644 index 000000000000..012599216074 --- /dev/null +++ b/pkgs/development/python-modules/netmap/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, substituteAll +, nmap +, python +}: + +buildPythonPackage rec { + pname = "netmap"; + version = "0.7.0.2"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "python-nmap"; + rev = version; + sha256 = "1a44zz9zsxy48ahlpjjrddpyfi7cnfknicfcp35hi588qm430mag"; + }; + + patches = [ + (substituteAll { + src = ./nmap-path.patch; + nmap = "${lib.getBin nmap}/bin/nmap"; + }) + ]; + + # upstream tests require sudo + # make sure nmap is found instead + checkPhase = '' + runHook preCheck + ${python.interpreter} -c 'import nmap; nmap.PortScanner()' + runHook postCheck + ''; + + pythonImportsCheck = [ "nmap" ]; + + meta = with lib; { + description = "Python class to use nmap and access scan results from python3"; + homepage = "https://github.com/home-assistant-libs/python-nmap"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/netmap/nmap-path.patch b/pkgs/development/python-modules/netmap/nmap-path.patch new file mode 100644 index 000000000000..99f9cb43a940 --- /dev/null +++ b/pkgs/development/python-modules/netmap/nmap-path.patch @@ -0,0 +1,17 @@ +diff --git a/nmap/nmap.py b/nmap/nmap.py +index 91c460d..8c5ff0a 100755 +--- a/nmap/nmap.py ++++ b/nmap/nmap.py +@@ -77,11 +77,7 @@ class PortScanner(object): + def __init__( + self, + nmap_search_path=( +- "nmap", +- "/usr/bin/nmap", +- "/usr/local/bin/nmap", +- "/sw/bin/nmap", +- "/opt/local/bin/nmap", ++ "@nmap@", + ), + ): + """ diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index a55d26d83c28..4cc0ce80d4d1 100755 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -1,18 +1,19 @@ -{ lib, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy -, pandas, requests, Rtree, shapely, folium, scikit-learn, scipy}: +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, geopandas, matplotlib, networkx, numpy +, pandas, requests, Rtree, shapely, folium, scikit-learn, scipy, gdal, rasterio}: buildPythonPackage rec { pname = "osmnx"; - version = "0.9"; + version = "1.1.1"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "gboeing"; repo = pname; rev = "v${version}"; - sha256 = "1k3y5kl4k93vxaxyanc040x44s2fyyc3m1ndy2j3kg0037z8ad4z"; + sha256 = "0dkv3fnlq23d7d30lhdf4a313lxy3a5qfldidvszs1z9n16ycnwb"; }; - propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikit-learn scipy ]; + propagatedBuildInputs = [ geopandas matplotlib networkx numpy pandas requests Rtree shapely folium scikit-learn scipy gdal rasterio ]; # requires network doCheck = false; diff --git a/pkgs/development/python-modules/pefile/default.nix b/pkgs/development/python-modules/pefile/default.nix index 92a0d064f49c..5cd514c871fc 100644 --- a/pkgs/development/python-modules/pefile/default.nix +++ b/pkgs/development/python-modules/pefile/default.nix @@ -1,24 +1,34 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , future -, fetchPypi -, lib +, fetchFromGitHub +, setuptools-scm +, pythonOlder }: buildPythonPackage rec { pname = "pefile"; - version = "2019.4.18"; + version = "2021.5.24"; + disabled = pythonOlder "3.6"; - propagatedBuildInputs = [ future ]; - - src = fetchPypi { - inherit pname version; - sha256 = "a5d6e8305c6b210849b47a6174ddf9c452b2888340b8177874b862ba6c207645"; + src = fetchFromGitHub { + owner = "erocarrera"; + repo = pname; + rev = "v${version}"; + sha256 = "0qdy88dvy29ixsyfqdcvf3w6rz09vpimk0568i09v1ayhs52p62k"; }; - # Test data encrypted. + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + future + ]; + + # Test data encrypted doCheck = false; - # Verify import still works. pythonImportsCheck = [ "pefile" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyahocorasick/default.nix b/pkgs/development/python-modules/pyahocorasick/default.nix index 9ef89c6e920d..87d1d0c9fc01 100644 --- a/pkgs/development/python-modules/pyahocorasick/default.nix +++ b/pkgs/development/python-modules/pyahocorasick/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyahocorasick"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "WojciechMula"; repo = pname; rev = version; - sha256 = "0plm9x2gziayjsl7flsgn1z8qx88c9vqm4fs1wq7dv7fr188liik"; + sha256 = "13x3718if28l50474xrz1b9709kvnvdg3nzm6y8bh7mc9a4zyss5"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyeight/default.nix b/pkgs/development/python-modules/pyeight/default.nix index b3a2de5ed404..a714bbfaba95 100644 --- a/pkgs/development/python-modules/pyeight/default.nix +++ b/pkgs/development/python-modules/pyeight/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyeight"; - version = "0.1.5"; + version = "0.1.7"; disabled = !isPy3k; src = fetchFromGitHub { owner = "mezz64"; repo = "pyEight"; rev = version; - sha256 = "1wzmjqs8zx611b71ip7a0phyas96vxpq8xpnhrirfi9l09kdjgsw"; + sha256 = "sha256-kTxd6nRsPvCjrXApjKcoghOISIMho5x9/kK7OvHjKQM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfreedompro/default.nix b/pkgs/development/python-modules/pyfreedompro/default.nix new file mode 100644 index 000000000000..f5fd102ed7fc --- /dev/null +++ b/pkgs/development/python-modules/pyfreedompro/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, aiohttp +}: + +buildPythonPackage rec { + pname = "pyfreedompro"; + version = "1.1.0"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "92812070a0c74761fa0c8cac98ddbe0bca781c8de80e2b08dbd04492e831c172"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "aiohttp" ]; + + meta = with lib; { + description = "Python library for Freedompro API"; + homepage = "https://github.com/stefano055415/pyfreedompro"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyfritzhome/default.nix b/pkgs/development/python-modules/pyfritzhome/default.nix index 7c0982d490ba..0bfda48269e1 100644 --- a/pkgs/development/python-modules/pyfritzhome/default.nix +++ b/pkgs/development/python-modules/pyfritzhome/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyfritzhome"; - version = "0.6.1"; + version = "0.6.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "hthiery"; repo = "python-fritzhome"; rev = version; - sha256 = "sha256-CEoXb7D/8Iksw4aJYNqANkmfhd0yxIIuabaTdWI3RNc="; + sha256 = "1hwxq9w5qmiky8gpp623nabmydr3yv6hvgzk24fdbmkglfp6ja1v"; }; propagatedBuildInputs = [ requests ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; checkPhase = '' - nosetests --with-coverage + nosetests ''; pythonImportsCheck = [ "pyfritzhome" ]; diff --git a/pkgs/development/python-modules/pypoint/default.nix b/pkgs/development/python-modules/pypoint/default.nix new file mode 100644 index 000000000000..be487199b38b --- /dev/null +++ b/pkgs/development/python-modules/pypoint/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, authlib +, httpx +}: + +buildPythonPackage rec { + pname = "pypoint"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "fredrike"; + repo = "pypoint"; + rev = "v${version}"; + sha256 = "13p68d2qxfj31lfjv94wzpigjfgjw03yjpl2h16zgxbka2k8zf3x"; + }; + + propagatedBuildInputs = [ + authlib + httpx + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "pypoint" ]; + + meta = with lib; { + description = "API for Minut Point"; + homepage = "https://github.com/fredrike/pypoint"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pysyncobj/default.nix b/pkgs/development/python-modules/pysyncobj/default.nix index bca2d47320eb..3afdacd18034 100644 --- a/pkgs/development/python-modules/pysyncobj/default.nix +++ b/pkgs/development/python-modules/pysyncobj/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "pysyncobj"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "bakwc"; repo = "PySyncObj"; rev = version; - sha256 = "0i7gjapaggkfvys4rgd4krpmh6mxwpzv30ngiwb6ddgp8jx0nzxk"; + sha256 = "sha256-T7ecy5/1eF0pYaOv74SBEp6V6Z23E2b9lo5Q/gig3Cw="; }; # Tests require network features diff --git a/pkgs/development/python-modules/pytest-cases/default.nix b/pkgs/development/python-modules/pytest-cases/default.nix index 018ca0c46de9..9bee3808c5a7 100644 --- a/pkgs/development/python-modules/pytest-cases/default.nix +++ b/pkgs/development/python-modules/pytest-cases/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pytest-cases"; - version = "3.6.1"; + version = "3.6.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "2009845554d3169dca99a7397d9904e5dbb58726c7417e8c308dda86f8966311"; + sha256 = "1hipm73s97dx37la57aif1x7myidirfslr1k6apvwyc2929y2lsk"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 4d223c548388..6ddc4543d3d0 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "13.6"; + version = "13.7"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "37cfe8faba16fb68a8b5ab41a10e787c385f6296200c84256cc54d7c16334643"; + sha256 = "sha256-JN91RZ4zW5a6/6aZFnn4RL1CaXivWmnKQZoKxDpAYCw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index c6bf0e4aef6a..e036197a1eca 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.18.0"; + version = "0.19.0"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = version; - sha256 = "sha256-612BBDgVcdpOsEl2Hc+oCDFmSPGjHvfmVr7i7zdfB/o="; + sha256 = "sha256-9xKt6OspdM7zWbVzjtvDPYuGyIW3K6ioASt53LOgdvk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index 7d1dcdeb1c7b..3a3e9bced050 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -1,34 +1,19 @@ -{ buildPythonPackage, lib, fetchPypi, fetchpatch, numpy +{ buildPythonPackage, lib, fetchPypi, numpy , pydantic, pint, networkx, pytestrunner, pytestcov, pytest } : buildPythonPackage rec { pname = "qcelemental"; - version = "0.20.0"; + version = "0.21.0"; checkInputs = [ pytestrunner pytestcov pytest ]; propagatedBuildInputs = [ numpy pydantic pint networkx ]; src = fetchPypi { inherit pname version; - sha256 = "141vw36fmacj897q26kq2bl9l0d23lyqjfry6q46aa9087dcs7ni"; + sha256 = "1b3c78fxbpnddrm1fnbvv4x2840jcfjg2l5cb5w4p38vzksiv238"; }; - # FIXME: Fixed upstream but not released yet. Nevertheless critical for correct behaviour. - # See https://github.com/MolSSI/QCElemental/pull/265 - patches = [ - (fetchpatch { - name = "SearchPath1.patch"; - url = "https://github.com/MolSSI/QCElemental/commit/2211a4e59690bcb14265a60f199a5efe74fe44db.diff"; - sha256 = "1ibjvmdrc103jdj79xrr11y5yji5hc966rm4ihfhfzgbvfkbjg2l"; - }) - (fetchpatch { - name = "SearchPath2.patch"; - url = "https://github.com/MolSSI/QCElemental/commit/5a32ce33e8142047b0a00d0036621fe2750e872a.diff"; - sha256 = "0gmg70vdps7k6alqclwdlxkli9d8s1fphbdvyl8wy8xrh46jw6rk"; - }) - ]; - doCheck = true; meta = with lib; { diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 236970a5d343..85d5d5d0b7d8 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -2,23 +2,24 @@ , cython, setuptools , numpy, affine, attrs, cligj, click-plugins, snuggs, gdal , pytest, pytestcov, packaging, hypothesis, boto3, mock +, certifi, shapely }: buildPythonPackage rec { pname = "rasterio"; - version = "1.1.5"; + version = "1.2.6"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "168b6hmx026jsvhnq6s5k0qfhzda02mmx1alax6wqk16mk63mqcz"; + sha256 = "sha256-rf2qdUhbS4Z2+mvlN1RzZvlgTgjqiBoQzry4z5QLSUc="; }; - checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock; + checkInputs = [ boto3 pytest pytestcov packaging hypothesis shapely ] ++ lib.optional (!isPy3k) mock; nativeBuildInputs = [ cython gdal ]; - propagatedBuildInputs = [ gdal numpy attrs affine cligj click-plugins snuggs setuptools ]; + propagatedBuildInputs = [ certifi gdal numpy attrs affine cligj click-plugins snuggs setuptools ]; meta = with lib; { description = "Python package to read and write geospatial raster data"; diff --git a/pkgs/development/python-modules/simber/default.nix b/pkgs/development/python-modules/simber/default.nix index d1471286bb84..331f84252cee 100644 --- a/pkgs/development/python-modules/simber/default.nix +++ b/pkgs/development/python-modules/simber/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "simber"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "deepjyoti30"; repo = pname; rev = version; - sha256 = "0ksc2m61j5ijj0sq6kkc0hhkmfy9f51h9z3cl2sf8g6wbr9vc47h"; + sha256 = "04dp9b4s7zb166vlacsaypc6iw1p75azqas1wf0flp570qqf3rkx"; }; propagatedBuildInputs = [ colorama ]; diff --git a/pkgs/development/python-modules/skidl/default.nix b/pkgs/development/python-modules/skidl/default.nix index 3d2007732e8c..3b4f42c1feee 100644 --- a/pkgs/development/python-modules/skidl/default.nix +++ b/pkgs/development/python-modules/skidl/default.nix @@ -1,36 +1,28 @@ { lib , buildPythonPackage , fetchFromGitHub -, requests , future , kinparse -, enum34 , pyspice , graphviz -, pillow -, cffi }: buildPythonPackage rec { pname = "skidl"; - version = "unstable-2020-09-15"; + version = "1.0.0"; src = fetchFromGitHub { owner = "xesscorp"; repo = "skidl"; - rev = "551bdb92a50c0894b0802c0a89b4cb62a5b4038f"; - sha256 = "1g65cyxpkqshgsggav2q3f76rbj5pzh7sacyhmhzvfz4zfarkcxk"; + rev = version; + sha256 = "1m0hllvmr5nkl4zy8yyzfgw9zmbrrzd5pw87ahd2mq68fjpcaqq5"; }; propagatedBuildInputs = [ - requests future kinparse - enum34 pyspice graphviz - pillow - cffi ]; # Checks require availability of the kicad symbol libraries. @@ -38,8 +30,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "skidl" ]; meta = with lib; { - description = "SKiDL is a module that extends Python with the ability to design electronic circuits"; - homepage = "https://xesscorp.github.io/skidl/docs/_site/"; + description = "Module that extends Python with the ability to design electronic circuits"; + homepage = "https://xess.com/skidl/docs/_site/"; license = licenses.mit; maintainers = with maintainers; [ matthuszagh ]; }; diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index 1ae05cab9738..cb63f8d11ba4 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "splinter"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "cobrateam"; repo = "splinter"; rev = version; - sha256 = "0480bqprv8581cvnc80ls91rz9780wvdnfw99zsw44hvy2yg15a6"; + sha256 = "sha256-y87Cnci4gJHrttThGPeOS/h6VK8x95cQA9nZs1fBfAw="; }; propagatedBuildInputs = [ @@ -32,6 +32,7 @@ buildPythonPackage rec { "samples" "tests/test_djangoclient.py" "tests/test_flaskclient.py" + "tests/test_popups.py" "tests/test_webdriver.py" "tests/test_webdriver_chrome.py" "tests/test_webdriver_firefox.py" diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index eac1f9b49355..6c576f0b85e9 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.19"; + version = "1.4.20"; src = fetchPypi { inherit pname version; - sha256 = "1qjwxqmsw34iw07nl1vzghj5m5inr2bs414lg9yf9drkrwys39c9"; + sha256 = "1l5miq1nzvg51yqw3pnaq17dgibhgx2m0il2ha79gwpyd8k3mviq"; }; propagatedBuildInputs = [ @@ -36,8 +36,6 @@ buildPythonPackage rec { sed -e 's:--max-worker-restart=5::g' -i setup.cfg ''; - dontUseSetuptoolsCheck = true; - # disable mem-usage tests on mac, has trouble serializing pickle files disabledTests = lib.optionals stdenv.isDarwin [ "MemUsageWBackendTest" diff --git a/pkgs/development/python-modules/tern/0001-Replace-debut-with-debian-inspector.patch b/pkgs/development/python-modules/tern/0001-Replace-debut-with-debian-inspector.patch deleted file mode 100644 index c9cb8b4a5281..000000000000 --- a/pkgs/development/python-modules/tern/0001-Replace-debut-with-debian-inspector.patch +++ /dev/null @@ -1,40 +0,0 @@ -From d944d8fa6cb6d1667f3e4c4e0cff4c4b2a7c0a30 Mon Sep 17 00:00:00 2001 -From: Cole Helbling <cole.e.helbling@outlook.com> -Date: Fri, 7 May 2021 11:00:46 -0700 -Subject: [PATCH] Replace `debut` with `debian-inspector` - ---- - requirements.in | 2 +- - tern/analyze/common.py | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/requirements.in b/requirements.in -index edd90ab..5135841 100644 ---- a/requirements.in -+++ b/requirements.in -@@ -12,6 +12,6 @@ requests - stevedore - pbr - dockerfile-parse --debut -+debian-inspector - regex - GitPython -diff --git a/tern/analyze/common.py b/tern/analyze/common.py -index 6962404..0f5e77d 100644 ---- a/tern/analyze/common.py -+++ b/tern/analyze/common.py -@@ -19,8 +19,8 @@ from tern.utils import cache - from tern.utils import constants - from tern.utils import general - from tern.utils import rootfs --from debut import debcon --from debut import copyright as debut_copyright -+from debian_inspector import debcon -+from debian_inspector import copyright as debut_copyright - - # global logger - logger = logging.getLogger(constants.logger_name) --- -2.31.1 - diff --git a/pkgs/development/python-modules/tern/default.nix b/pkgs/development/python-modules/tern/default.nix index e00e06561f02..0468ee6f84b1 100644 --- a/pkgs/development/python-modules/tern/default.nix +++ b/pkgs/development/python-modules/tern/default.nix @@ -13,6 +13,7 @@ , prettytable , idna }: + buildPythonPackage rec { pname = "tern"; version = "2.6.1"; @@ -22,14 +23,6 @@ buildPythonPackage rec { sha256 = "749c18ef493ebe3ac28624b2b26c6e38f77de2afd6a6579d2c92393d8fbdbd46"; }; - patches = [ - # debut was renamed to debian-inspector - # https://github.com/tern-tools/tern/pull/962 - # NOTE: Has to be in-tree because the upstream patch doesn't apply cleanly - # to the PyPi source. - ./0001-Replace-debut-with-debian-inspector.patch - ]; - preBuild = '' cp requirements.{in,txt} ''; diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix index b45218219c53..166e42ced821 100644 --- a/pkgs/development/python-modules/twitterapi/default.nix +++ b/pkgs/development/python-modules/twitterapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "twitterapi"; - version = "2.7.3"; + version = "2.7.4"; src = fetchFromGitHub { owner = "geduldig"; repo = "TwitterAPI"; rev = "v${version}"; - sha256 = "sha256-82TOVrC7wX7E9lKsx3iGxaEEjHSzf5uZwePBvAw3hDk="; + sha256 = "sha256-HDPRpM1LDTtUbldzfCrsdh/GpbzNCVVUVGwohyMe/YE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index c4fb1f25304d..6e04e60bfb5c 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -345,6 +345,7 @@ let stsm = [ pkgs.gsl_1 ]; stringi = [ pkgs.icu.dev ]; survSNP = [ pkgs.gsl_1 ]; + svglite = [ pkgs.libpng.dev ]; sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype.dev ]; systemfonts = [ pkgs.fontconfig.dev pkgs.freetype.dev ]; TAQMNGR = [ pkgs.zlib.dev ]; diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 66f2db280685..ebbfa619fed3 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - sha256 = "1z104cd3wg718x1d89znppx4h6f0c6icgmpcllyrd0d19lb71a2b"; + sha256 = "sha256-j5VLxtu8Xg1fwDYWYJXGFUkfpgauG/5NauSniSZ7G2w="; }; nativeBuildInputs = [ @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ]; - cargoSha256 = "1hpi9aifn3g19yqkb58lphyw8cbsqllhg5dzbqx15hcfvrb7ip4k"; + cargoSha256 = "sha256-1lFGczzcN4QPsIpEVQiSmNS7L+9rlSfxi+gopt2E7Ec="; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index e3828eb7f14c..ba6f0bf652e3 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.21.1"; + version = "1.21.2"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-Wes52lTcv3Jb6gJeUS6fmf4Nee3qEcc3SibaTFvQ8sQ="; + sha256 = "sha256-9AYFC10AYbt/qHj5hfuLRxUwibizKk4n9rgtd5RBEQg="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 6c9cffe41b20..245aeeb4351b 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, buildGoModule }: -let version = "1.2.4"; +let version = "1.3.0"; in buildGoModule rec { inherit version; pname = "drone-cli"; revision = "v${version}"; - vendorSha256 = "0v94rwxkbj85l3brbm792xf1rfs3vgnwpgjczwqip1gm159dpnd7"; + vendorSha256 = "sha256-I+UBa6gqkPRXNV72iyJcCBLYShZxMtHFHSK77mhDv+U="; doCheck = false; @@ -18,7 +18,7 @@ in buildGoModule rec { owner = "drone"; repo = "drone-cli"; rev = revision; - sha256 = "14sm5k2ifvr4g9369zqgb92vrr4rc0bxf5m52l3g8bd2s8fq8nx8"; + sha256 = "sha256-j6drDMxvAVfQ1aCFooc9g9HhMRMlFZXGZPiuJZKBbY4="; }; meta = with lib; { diff --git a/pkgs/development/tools/fission/default.nix b/pkgs/development/tools/fission/default.nix index 3045842d91f0..56d5161b49e9 100644 --- a/pkgs/development/tools/fission/default.nix +++ b/pkgs/development/tools/fission/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fission"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "fission"; repo = "fission"; rev = version; - sha256 = "sha256-WCynU5+d789d584JH99jmTZSEbyco2ysuBXIC2pW1r4="; + sha256 = "sha256-ayVEU2Dlqun8KLP+KeI0uU4p9N4aaYLZ/IHqfA2PGrI="; }; vendorSha256 = "sha256-V3/IFCbW3wXfNiFzucLeyFDc6SA2nE+NwO0sNEBmIYg="; diff --git a/pkgs/development/tools/flawfinder/default.nix b/pkgs/development/tools/flawfinder/default.nix index 554ca92b8c0e..36209c5d5aa4 100644 --- a/pkgs/development/tools/flawfinder/default.nix +++ b/pkgs/development/tools/flawfinder/default.nix @@ -1,30 +1,22 @@ { lib -, stdenv , fetchurl , installShellFiles , python3 }: -stdenv.mkDerivation rec { +python3.pkgs.buildPythonApplication rec { pname = "flawfinder"; - version = "2.0.15"; + version = "2.0.18"; src = fetchurl { url = "https://dwheeler.com/flawfinder/flawfinder-${version}.tar.gz"; - sha256 = "01j4szy8gwvikrfzfayfayjnc1za0jxsnxp5fsa6d06kn69wyr8a"; + sha256 = "1hk2y13fd2a5gf42a1hk45hw6pbls715wi9k1yh3c3wyhvbyylba"; }; - nativeBuildInputs = [ installShellFiles ]; + # Project is using a combination of bash/Python for the tests + doCheck = false; - buildInputs = [ python3 ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - cp ${pname} $out/bin - installManPage flawfinder.1 - runHook postInstall - ''; + pythonImportsCheck = [ "flawfinder" ]; meta = with lib; { description = "Tool to examines C/C++ source code for security flaws"; diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index 1220ec90d90f..b0d2cb719533 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.71.1"; + version = "0.72.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-+s2Wa+5Qznqpv84VEZCMmzy0bI1mN/BknPObYqJlaYs="; + sha256 = "sha256-QMbkxfGJOMNTILmGYhbUdtq4zfe0Cc/IBftFdM+rT9c="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/kustomize/3.nix b/pkgs/development/tools/kustomize/3.nix new file mode 100644 index 000000000000..aa99256faa84 --- /dev/null +++ b/pkgs/development/tools/kustomize/3.nix @@ -0,0 +1,40 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kustomize_3"; + version = "3.10.0"; + # rev is the commit of the tag, mainly for kustomize version command output + rev = "602ad8aa98e2e17f6c9119e027a09757e63c8bec"; + + ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in [ + "-s -w" + "-X ${t}.version=${version}" + "-X ${t}.gitCommit=${rev}" + ]; + + src = fetchFromGitHub { + owner = "kubernetes-sigs"; + repo = "kustomize"; + rev = "kustomize/v${version}"; + sha256 = "sha256-ESIykbAKXdv8zM9be0zEJ71rBAzZby0aTg25NlCsIOM="; + }; + + doCheck = true; + + # avoid finding test and development commands + sourceRoot = "source/kustomize"; + + vendorSha256 = "sha256-xLeetcmzvpILLLMhMx7oahWLxguFjG3qbYpeeWpFUlw="; + + meta = with lib; { + description = "Customization of kubernetes YAML configurations"; + longDescription = '' + kustomize lets you customize raw, template-free YAML files for + multiple purposes, leaving the original YAML untouched and usable + as is. + ''; + homepage = "https://github.com/kubernetes-sigs/kustomize"; + license = licenses.asl20; + maintainers = with maintainers; [ carlosdagos vdemeester zaninime Chili-Man saschagrunert ]; + }; +} diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 2acc7e5bdf32..3945389e8cd1 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.8.5"; + version = "2.9.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "0a9n8ilsi3kyx5xqvk5s7iikk6y3pkpm5mvsn5za5ivlzf1i40br"; + sha256 = "07m476kgagpd6kzm3jq30yfxqspr2hychah0xfqs14z82zxpq8dv"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 6ab1463917c8..60704fdd780b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -28,9 +28,9 @@ let # 1) change all these hashes # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) run the ./result script that is output by that (it updates ./grammars) - version = "0.19.5"; - sha256 = "1qmb0sva28zv6r3c3j7xs9pc8bpwwhkb9vxxndw2zbdn9wkvmbmn"; - cargoSha256 = "0hnjik3pymb1s7frhfpfzvd6w2k3lgpsmh6milpriwxmqsmkwdzz"; + version = "0.20.0"; + sha256 = "0hrcisvw44fjxix09lfbrz7majaj6njbnr6c92a6a5748p2jvyng"; + cargoSha256 = "029db3yy6nj18vxfvj0ra568a9k4x7znfj08spvzl5sxfbx6442r"; src = fetchFromGitHub { owner = "tree-sitter"; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index 5ebc9c9a0f3c..8b8315e4abdc 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c-sharp", - "rev": "aa429589525bb849189a0c5ddb52267ce578f988", - "date": "2021-06-07T18:47:38+02:00", - "path": "/nix/store/mclvpa5kfbl9g5ij3xjdhnqc6bqzqcj6-tree-sitter-c-sharp", - "sha256": "07alycp4bclr0ycn44dj2481xag0s10nwgyrdxar3j91hphd966s", + "rev": "3953034ee61e8639100b063092d4280e047ca9e9", + "date": "2021-06-21T12:18:46+02:00", + "path": "/nix/store/8f2bnr790zwibhyd3jqjm38zfc1md5is-tree-sitter-c-sharp", + "sha256": "0k6pb27f463y88bf6ym0zl4d36182y5cr3013j71h3vlg264z96c", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index b8ca41abcf29..1e00f279d68f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "237f4eb4417c28f643a29d795ed227246afb66f9", - "date": "2021-06-05T13:41:42+02:00", - "path": "/nix/store/wwi86c3ix0zq8czwljxxypw5w2mxnz5h-tree-sitter-haskell", - "sha256": "0gx6mr6yg053i5mif8i8qwkk9h57laf9riw5r24av1y7cal7sszd", + "rev": "a0c1adb59e390f7d839a146c57fdb33d36ed97e6", + "date": "2021-06-18T23:36:08+02:00", + "path": "/nix/store/7rl3najf8rn8ndh31vcxjz5px3r1scky-tree-sitter-haskell", + "sha256": "0a97w0qnj0fwy0yyg7hb9i1fyiwbyiz5mwx77aaw6md4jcsf4di8", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index 65066c66d539..24fd79d5116c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "45b9ce2a2588c0e6d616b0ee2a710b1fcb99c5b5", - "date": "2021-06-09T14:12:41-07:00", - "path": "/nix/store/j6r7z3m4wk6baz70qg2xn2mq3jlnyq6f-tree-sitter-javascript", - "sha256": "0rzpyxbh1j9l12jxyryc06f8jhbd5ci18lfb7bw2msc685b2ckcx", + "rev": "6de6d604c243b68f90dce14130d536c694d90dcc", + "date": "2021-06-29T15:54:12-07:00", + "path": "/nix/store/mmz8s440zplg88c0mb0w3dlg94dzgxmf-tree-sitter-javascript", + "sha256": "1bz8xhs7q4lp49q1id6dvz93l7vf0gxgngsbjk3x1nvw8rg171j6", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index 49b57f4d8a39..6b64a962a523 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "b065fc4ded84c30aff14c07ec6e7cf449e222b04", - "date": "2021-06-01T20:33:20+02:00", - "path": "/nix/store/czdqn2nz8pgrd64w74yskx6vl233phxn-tree-sitter-php", - "sha256": "1qr2byy344haqybd0zz2hazncay7zndkp4p3317ck50xrs05z086", + "rev": "5e89808d490d893799ebcf229130afe4cf2b0324", + "date": "2021-06-22T09:23:44+02:00", + "path": "/nix/store/5c1pn1p183czqb43a0va7whd4sz81jf1-tree-sitter-php", + "sha256": "1mp5kv305a4rrgh7kklifqfg3680krfsd0h76sxn4i0wxyqfgczi", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json index a96363af7139..c8142974fd43 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ruby", - "rev": "391269d74d20154bbd0ac9be20b35eced6920290", - "date": "2021-05-04T14:02:32-07:00", - "path": "/nix/store/hamsaml0yzi13qd61abypjwbv33rd824-tree-sitter-ruby", - "sha256": "0biyhydfzybz3g6hhdd0rk6yav7xsk61j8lnmpsi60vaxabdsaiv", + "rev": "fe6a2d634da0e16b11b5aa255cc3df568a4572fd", + "date": "2021-03-03T16:54:30-08:00", + "path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby", + "sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json index b7c214cc720a..75329fc63a00 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-scala", - "rev": "fb23ed9a99da012d86b7a5059b9d8928607cce29", - "date": "2021-04-01T10:11:15-07:00", - "path": "/nix/store/n1wvxkz4h38770lxvwakway34ac2a8h7-tree-sitter-scala", - "sha256": "05g95340g4labkdvfka5cbg7pr6vzigc40y54js1b5wml0w3d8f7", + "rev": "bfa2a81388019d47f6a0a6a6e9c96910dec830b4", + "date": "2021-06-23T15:37:27-07:00", + "path": "/nix/store/nc5cndwzc5pzq3x64wa51bff0rl36hc8-tree-sitter-scala", + "sha256": "0x0lq78gjfsqi225mfvrpkl2jc6fbb378jgj04syxkm941lxc4bk", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json index b224fa54dafe..41c4fcfe734d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json @@ -1,9 +1,9 @@ { "url": "https://github.com/Himujjal/tree-sitter-svelte", - "rev": "10c113001acf9852817150acb3031a5e68d2b4cf", - "date": "2021-05-02T10:05:14+05:30", - "path": "/nix/store/mpfr56mfiizhwr4hq7h422glmdc4hg48-tree-sitter-svelte", - "sha256": "1n7addsnin6czm5hrbhaaqqgf0c3nz3mpcdysm2z4icgn7fjq281", + "rev": "c696a13a587b0595baf7998f1fb9e95c42750263", + "date": "2021-03-20T16:45:11+05:30", + "path": "/nix/store/8krdxqwpi95ljrb5jgalwgygz3aljqr8-tree-sitter-svelte", + "sha256": "0ckmss5gmvffm6danlsvgh6gwvrlznxsqf6i6ipkn7k5lxg1awg3", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/pgtop/default.nix b/pkgs/development/tools/pgtop/default.nix new file mode 100644 index 000000000000..03b3ef89265b --- /dev/null +++ b/pkgs/development/tools/pgtop/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, perlPackages, fetchFromGitHub, shortenPerlShebang }: + +perlPackages.buildPerlPackage rec { + pname = "pgtop"; + version = "0.11"; + + src = fetchFromGitHub { + owner = "cosimo"; + repo = "pgtop"; + rev = "v${version}"; + sha256 = "1awyl6ddfihm7dfr5y2z15r1si5cyipnlyyj3m1l19pk98s4x66l"; + }; + + outputs = [ "out" ]; + + buildInputs = with perlPackages; [ DBI DBDPg TermReadKey JSON LWPUserAgent ]; + + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/pgtop + ''; + + meta = with lib; { + description = "a PostgreSQL clone of `mytop', which in turn is a `top' clone for MySQL"; + homepage = "https://github.com/cosimo/pgtop"; + changelog = "https://github.com/cosimo/pgtop/releases/tag/v${version}"; + maintainers = [ maintainers.hagl ]; + license = [ licenses.gpl2Only ]; + }; +} diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 2af1d5e2a074..ed704b0639a0 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-ZHEujkl+GUk5WjgDWdbJwOIKuOqJnIpGnvD1SsrHuhI="; + sha256 = "sha256-ARNsNt5xpXn4ifnnRdmkhJAJq98ri3+oAF+Uov+byI0="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 901435bb631f..8d8b1a004d5e 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,10 +1,10 @@ { stdenv, lib, fetchurl, writeText, php, makeWrapper }: let - version = "2.4.0"; + version = "2.5.0"; completion = fetchurl { url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; - sha256 = "15d330x6d3fizrm6ckzmdknqg6wjlx5fr87bmkbd5s6a1ihs0g24"; + sha256 = "sha256-RDygYQzK6NLWrOug7EqnkpuH7Wz1T2Zq/tGNZjoYo5U="; }; ini = writeText "php.ini" '' @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar"; - sha256 = "0h5mjxrw4z3648v4wb4pvapz2a1mlmbszgggg4b7bvrrxn3cr78k"; + sha256 = "sha256-vghT6fRD84SFZgcIcdNE6K2B6x4V0V3PkyS0p14nJ4k="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 3ba900f3f691..8fcf4696d0e1 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2021.3.0"; + version = "2021.4.0"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-RtEkWi0J3nYzT+IhdyBlGeUE2SCmhlnfw0L6sOvE4WI="; + sha256 = "sha256-lMQWoShlEACTrcGgQtfPGVQ4X8pCG/6SkXtz+rWAOyg="; }; nativeBuildInputs = diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 7fad6a020a88..776f84309da5 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.22.1"; - sha256 = "12drpkffn79xx84pffg9y2cn9fiwycgaa2rjj3ix6visfzvhsrfx"; + version = "12.22.2"; + sha256 = "1p281hdw3y32pnbfr7cdc9igv2yrzqg16pn4yj3g01pi3mbhbn3z"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 27b2a4f33191..6271401a0f43 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -7,7 +7,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.17.1"; - sha256 = "0zr4b9gja8f9611rnmc9yacmh90bd76xv9ayikcyqdfzdpax5wfx"; + version = "14.17.2"; + sha256 = "0gjq61l1lm15bv47w0phil44nbh0fsq3mmqf40xxlm92gswb4psg"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v15.nix b/pkgs/development/web/nodejs/v15.nix deleted file mode 100644 index e6903098b302..000000000000 --- a/pkgs/development/web/nodejs/v15.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ callPackage, icu68, python3, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix { - icu = icu68; - python = python3; - }; -in - buildNodejs { - inherit enableNpm; - version = "15.14.0"; - sha256 = "0vm6jdazqjd1plqsgngzvjrafv2d3mdahk6il4ray02gx97dq8l1"; - } diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 8514baec8b16..305baadecac7 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "16.4.0"; - sha256 = "07f8g3hs0v7nsdvzlsr1p4pzgb04qn54pnhmbdsgmmb41cp227pr"; + version = "16.4.1"; + sha256 = "1a1aygksmbafxvrs8g2jv0y1jj3cwyclk0qbqxkn5qfq5r1i943n"; } diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 2a4df9bf7cf7..3e96351acbbb 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs }: +{ stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs, libsForQt5, newScope, texlive, perlPackages, jdk8, jre8 }: # To whomever it may concern: # @@ -35,7 +35,7 @@ with lib; let - callPackage = pkgs.newScope self; + callPackage = newScope self; # The latest Dwarf Fortress version. Maintainers: when a new version comes # out, ensure that (unfuck|dfhack|twbt) are all up to date before changing @@ -45,51 +45,54 @@ let # Converts a version to a package name. versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}"; - dwarf-therapist-original = pkgs.qt5.callPackage ./dwarf-therapist { - texlive = pkgs.texlive.combine { - inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem; + dwarf-therapist-original = libsForQt5.callPackage ./dwarf-therapist { + texlive = texlive.combine { + inherit (texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem; }; }; # A map of names to each Dwarf Fortress package we know about. - df-games = lib.listToAttrs (map (dfVersion: { - name = versionToName dfVersion; - value = - let - # I can't believe this syntax works. Spikes of Nix code indeed... - dwarf-fortress = callPackage ./game.nix { - inherit dfVersion; - inherit dwarf-fortress-unfuck; - }; + df-games = lib.listToAttrs (map + (dfVersion: { + name = versionToName dfVersion; + value = + let + # I can't believe this syntax works. Spikes of Nix code indeed... + dwarf-fortress = callPackage ./game.nix { + inherit dfVersion; + inherit dwarf-fortress-unfuck; + }; - # unfuck is linux-only right now, we will only use it there. - dwarf-fortress-unfuck = if stdenv.isLinux then callPackage ./unfuck.nix { inherit dfVersion; } - else null; + # unfuck is linux-only right now, we will only use it there. + dwarf-fortress-unfuck = + if stdenv.isLinux then callPackage ./unfuck.nix { inherit dfVersion; } + else null; - twbt = callPackage ./twbt { inherit dfVersion; }; + twbt = callPackage ./twbt { inherit dfVersion; }; - dfhack = callPackage ./dfhack { - inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT; - inherit dfVersion twbt; - stdenv = gccStdenv; - }; + dfhack = callPackage ./dfhack { + inherit (perlPackages) XMLLibXML XMLLibXSLT; + inherit dfVersion twbt; + stdenv = gccStdenv; + }; - dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix { - inherit dwarf-fortress; - dwarf-therapist = dwarf-therapist-original; - }; - in - callPackage ./wrapper { - inherit (self) themes; + dwarf-therapist = libsForQt5.callPackage ./dwarf-therapist/wrapper.nix { + inherit dwarf-fortress; + dwarf-therapist = dwarf-therapist-original; + }; + in + callPackage ./wrapper { + inherit (self) themes; - dwarf-fortress = dwarf-fortress; - twbt = twbt; - dfhack = dfhack; - dwarf-therapist = dwarf-therapist; + dwarf-fortress = dwarf-fortress; + twbt = twbt; + dfhack = dfhack; + dwarf-therapist = dwarf-therapist; - jdk = pkgs.jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - }) (lib.attrNames self.df-hashes)); + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; + }) + (lib.attrNames self.df-hashes)); self = rec { df-hashes = builtins.fromJSON (builtins.readFile ./game.json); @@ -107,7 +110,7 @@ let soundSense = callPackage ./soundsense.nix { }; legends-browser = callPackage ./legends-browser { - jre = pkgs.jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; themes = recurseIntoAttrs (callPackage ./themes { @@ -119,4 +122,5 @@ let cla-theme = themes.cla; }; -in self // df-games +in +self // df-games diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 2e27d9493bd1..4bfb69355a7e 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -1,7 +1,20 @@ -{ stdenv, buildEnv, lib, fetchFromGitHub, cmake, writeScriptBin -, perl, XMLLibXML, XMLLibXSLT, zlib, ruby -, enableStoneSense ? false, allegro5, libGLU, libGL -, enableTWBT ? true, twbt +{ stdenv +, buildEnv +, lib +, fetchFromGitHub +, cmake +, writeScriptBin +, perl +, XMLLibXML +, XMLLibXSLT +, zlib +, ruby +, enableStoneSense ? false +, allegro5 +, libGLU +, libGL +, enableTWBT ? true +, twbt , SDL , dfVersion }: @@ -60,9 +73,10 @@ let }; }; - release = if hasAttr dfVersion dfhack-releases - then getAttr dfVersion dfhack-releases - else throw "[DFHack] Unsupported Dwarf Fortress version: ${dfVersion}"; + release = + if hasAttr dfVersion dfhack-releases + then getAttr dfVersion dfhack-releases + else throw "[DFHack] Unsupported Dwarf Fortress version: ${dfVersion}"; version = release.dfHackRelease; @@ -125,7 +139,7 @@ let nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ]; # We don't use system libraries because dfhack needs old C++ ABI. buildInputs = [ zlib SDL ] - ++ lib.optionals enableStoneSense [ allegro5 libGLU libGL ]; + ++ lib.optionals enableStoneSense [ allegro5 libGLU libGL ]; preConfigure = '' # Trick build system into believing we have .git @@ -138,7 +152,7 @@ let ''; cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" "-DDOWNLOAD_RUBY=OFF" ] - ++ lib.optionals enableStoneSense [ "-DBUILD_STONESENSE=ON" "-DSTONESENSE_INTERNAL_SO=OFF" ]; + ++ lib.optionals enableStoneSense [ "-DBUILD_STONESENSE=ON" "-DSTONESENSE_INTERNAL_SO=OFF" ]; # dfhack expects an unversioned libruby.so to be present in the hack # subdirectory for ruby plugins to function. diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 243db1e1c398..ec765e71158e 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -1,5 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, qtbase -, qtdeclarative, cmake, texlive, ninja }: +{ lib +, stdenv +, fetchFromGitHub +, qtbase +, qtdeclarative +, cmake +, texlive +, ninja +}: stdenv.mkDerivation rec { pname = "dwarf-therapist"; @@ -15,10 +22,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ texlive cmake ninja ]; buildInputs = [ qtbase qtdeclarative ]; - installPhase = if stdenv.isDarwin then '' - mkdir -p $out/Applications - cp -r DwarfTherapist.app $out/Applications - '' else null; + installPhase = + if stdenv.isDarwin then '' + mkdir -p $out/Applications + cp -r DwarfTherapist.app $out/Applications + '' else null; dontWrapQtApps = true; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in b/pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in index 77936c430e2b..5ae0a35b5e20 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in @@ -5,22 +5,21 @@ install_dir="@install@" therapist_dir="@therapist@" -cat <<EOF >&2 +@cat@ <<EOF >&2 Using $DT_DIR as Dwarf Therapist overlay directory. EOF update_path() { local path="$1" - mkdir -p "$DT_DIR/$(dirname "$path")" + @mkdir@ -p "$DT_DIR/$(@dirname@ "$path")" if [ ! -e "$DT_DIR/$path" ] || [ -L "$DT_DIR/$path" ]; then - rm -f "$DT_DIR/$path" - ln -s "$install_dir/share/dwarftherapist/$path" "$DT_DIR/$path" + @rm@ -f "$DT_DIR/$path" + @ln@ -s "$install_dir/share/dwarftherapist/$path" "$DT_DIR/$path" fi } cd "$install_dir/share/dwarftherapist" update_path memory_layouts -QT_QPA_PLATFORM_PLUGIN_PATH="@qt_plugin_path@" \ - exec "$therapist_dir/bin/dwarftherapist" "$@" +exec "$therapist_dir/bin/dwarftherapist" "$@" diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 7db79012ec65..93f51df1819d 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -1,8 +1,9 @@ -{ pkgs, stdenv, dwarf-therapist, dwarf-fortress, makeWrapper }: +{ stdenv, dwarf-therapist, dwarf-fortress, substituteAll, coreutils, wrapQtAppsHook }: let - platformSlug = if stdenv.targetPlatform.is32bit then - "linux32" else "linux64"; + platformSlug = + if stdenv.targetPlatform.is32bit then + "linux32" else "linux64"; inifile = "linux/v0.${dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}_${platformSlug}.ini"; in @@ -10,24 +11,32 @@ in stdenv.mkDerivation { name = "dwarf-therapist-${dwarf-therapist.version}"; - wrapper = ./dwarf-therapist.in; + wrapper = substituteAll { + src = ./dwarf-therapist.in; + stdenv_shell = "${stdenv.shell}"; + rm = "${coreutils}/bin/rm"; + ln = "${coreutils}/bin/ln"; + cat = "${coreutils}/bin/cat"; + mkdir = "${coreutils}/bin/mkdir"; + dirname = "${coreutils}/bin/dirname"; + therapist = "${dwarf-therapist}"; + }; paths = [ dwarf-therapist ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ wrapQtAppsHook ]; passthru = { inherit dwarf-fortress dwarf-therapist; }; buildCommand = '' mkdir -p $out/bin + + install -Dm755 $wrapper $out/bin/dwarftherapist ln -s $out/bin/dwarftherapist $out/bin/DwarfTherapist - substitute $wrapper $out/bin/dwarftherapist \ - --subst-var-by stdenv_shell ${stdenv.shell} \ - --subst-var-by install $out \ - --subst-var-by therapist ${dwarf-therapist} \ - --subst-var-by qt_plugin_path "${pkgs.qt5.qtbase}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins/platforms" - chmod 755 $out/bin/dwarftherapist + substituteInPlace $out/bin/dwarftherapist \ + --subst-var-by install $out + wrapQtApp $out/bin/dwarftherapist # Fix up memory layouts rm -rf $out/share/dwarftherapist/memory_layouts/linux diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 9200d01aa985..d73b111919e1 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -1,10 +1,16 @@ -{ stdenv, lib, fetchurl -, SDL, dwarf-fortress-unfuck +{ stdenv +, lib +, fetchurl +, SDL +, dwarf-fortress-unfuck -# Our own "unfuck" libs for macOS -, ncurses, fmodex, gcc + # Our own "unfuck" libs for macOS +, ncurses +, fmodex +, gcc -, dfVersion, df-hashes +, dfVersion +, df-hashes }: with lib; @@ -30,15 +36,18 @@ let baseVersion = elemAt dfVersionTriple 1; patchVersion = elemAt dfVersionTriple 2; - game = if hasAttr dfVersion df-hashes - then getAttr dfVersion df-hashes - else throw "Unknown Dwarf Fortress version: ${dfVersion}"; - dfPlatform = if hasAttr stdenv.hostPlatform.system platforms - then getAttr stdenv.hostPlatform.system platforms - else throw "Unsupported system: ${stdenv.hostPlatform.system}"; - sha256 = if hasAttr dfPlatform game - then getAttr dfPlatform game - else throw "Unsupported dfPlatform: ${dfPlatform}"; + game = + if hasAttr dfVersion df-hashes + then getAttr dfVersion df-hashes + else throw "Unknown Dwarf Fortress version: ${dfVersion}"; + dfPlatform = + if hasAttr stdenv.hostPlatform.system platforms + then getAttr stdenv.hostPlatform.system platforms + else throw "Unsupported system: ${stdenv.hostPlatform.system}"; + sha256 = + if hasAttr dfPlatform game + then getAttr dfPlatform game + else throw "Unsupported dfPlatform: ${dfPlatform}"; in diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix index 41620dd66f1c..b34dbd3c74b8 100644 --- a/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -1,5 +1,10 @@ -{ stdenvNoCC, lib, buildEnv -, df-games, themes, latestVersion, versionToName +{ stdenvNoCC +, lib +, buildEnv +, df-games +, themes +, latestVersion +, versionToName , dfVersion ? latestVersion # This package should, at any given time, provide an opinionated "optimal" # DF experience. It's the equivalent of the Lazy Newbie Pack, that is, and @@ -9,9 +14,10 @@ , enableSoundSense ? true , enableStoneSense ? true , enableDwarfTherapist ? true -, enableLegendsBrowser ? true, legends-browser +, enableLegendsBrowser ? true +, legends-browser , theme ? themes.phoebus -# General config options: + # General config options: , enableIntro ? true , enableTruetype ? true , enableFPS ? false @@ -23,9 +29,10 @@ with lib; let dfGame = versionToName dfVersion; - dwarf-fortress = if hasAttr dfGame df-games - then getAttr dfGame df-games - else throw "Unknown Dwarf Fortress version: ${dfVersion}"; + dwarf-fortress = + if hasAttr dfGame df-games + then getAttr dfGame df-games + else throw "Unknown Dwarf Fortress version: ${dfVersion}"; dwarf-therapist = dwarf-fortress.dwarf-therapist; in buildEnv { @@ -33,10 +40,11 @@ buildEnv { paths = [ (dwarf-fortress.override { inherit enableDFHack enableTWBT enableSoundSense enableStoneSense theme - enableIntro enableTruetype enableFPS enableTextMode enableSound; - })] - ++ lib.optional enableDwarfTherapist dwarf-therapist - ++ lib.optional enableLegendsBrowser legends-browser; + enableIntro enableTruetype enableFPS enableTextMode enableSound; + }) + ] + ++ lib.optional enableDwarfTherapist dwarf-therapist + ++ lib.optional enableLegendsBrowser legends-browser; meta = with lib; { description = "An opinionated wrapper for Dwarf Fortress"; diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix index a59c87306903..5202c13b5b8a 100644 --- a/pkgs/games/dwarf-fortress/soundsense.nix +++ b/pkgs/games/dwarf-fortress/soundsense.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchzip, dos2unix +{ stdenv +, fetchzip +, dos2unix , soundPack ? stdenv.mkDerivation { name = "soundsense-soundpack"; src = fetchzip { @@ -8,7 +10,8 @@ installPhase = '' cp -r . $out ''; -}}: + } +}: stdenv.mkDerivation rec { version = "2016-1_196"; diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix index 6241df7590d9..c6987a1d16bd 100644 --- a/pkgs/games/dwarf-fortress/themes/default.nix +++ b/pkgs/games/dwarf-fortress/themes/default.nix @@ -1,19 +1,21 @@ -{lib, fetchFromGitHub, ...}: +{ lib, fetchFromGitHub, ... }: with builtins; -listToAttrs (map (v: { - inherit (v) name; - value = fetchFromGitHub { - name = "${v.name}-${v.version}"; - owner = "DFgraphics"; - repo = v.name; - rev = v.version; - sha256 = v.sha256; - meta = with lib; { - platforms = platforms.all; - maintainers = [ maintainers.matthewbauer maintainers.shazow ]; - license = licenses.free; +listToAttrs (map + (v: { + inherit (v) name; + value = fetchFromGitHub { + name = "${v.name}-${v.version}"; + owner = "DFgraphics"; + repo = v.name; + rev = v.version; + sha256 = v.sha256; + meta = with lib; { + platforms = platforms.all; + maintainers = [ maintainers.matthewbauer maintainers.shazow ]; + license = licenses.free; + }; }; - }; -}) (fromJSON (readFile ./themes.json))) + }) + (fromJSON (readFile ./themes.json))) diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix index bee2c28e5308..e6c82e32f0db 100644 --- a/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/pkgs/games/dwarf-fortress/twbt/default.nix @@ -1,4 +1,7 @@ -{ stdenvNoCC, lib, fetchurl, unzip +{ stdenvNoCC +, lib +, fetchurl +, unzip , dfVersion }: @@ -49,9 +52,10 @@ let }; }; - release = if hasAttr dfVersion twbt-releases - then getAttr dfVersion twbt-releases - else throw "[TWBT] Unsupported Dwarf Fortress version: ${dfVersion}"; + release = + if hasAttr dfVersion twbt-releases + then getAttr dfVersion twbt-releases + else throw "[TWBT] Unsupported Dwarf Fortress version: ${dfVersion}"; in stdenvNoCC.mkDerivation rec { diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 0fb08aa7e87f..7e96b284044d 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -1,7 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, cmake -, libGL, libSM, SDL, SDL_image, SDL_ttf, glew, openalSoft -, ncurses, glib, gtk2, libsndfile, zlib -, dfVersion, pkg-config +{ stdenv +, lib +, fetchFromGitHub +, cmake +, libGL +, libSM +, SDL +, SDL_image +, SDL_ttf +, glew +, openalSoft +, ncurses +, glib +, gtk2 +, libsndfile +, zlib +, dfVersion +, pkg-config }: with lib; @@ -46,9 +60,10 @@ let }; }; - release = if hasAttr dfVersion unfuck-releases - then getAttr dfVersion unfuck-releases - else throw "[unfuck] Unknown Dwarf Fortress version: ${dfVersion}"; + release = + if hasAttr dfVersion unfuck-releases + then getAttr dfVersion unfuck-releases + else throw "[unfuck] Unknown Dwarf Fortress version: ${dfVersion}"; in stdenv.mkDerivation { @@ -68,8 +83,17 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - libSM SDL SDL_image SDL_ttf glew openalSoft - ncurses gtk2 libsndfile zlib libGL + libSM + SDL + SDL_image + SDL_ttf + glew + openalSoft + ncurses + gtk2 + libsndfile + zlib + libGL ]; # Don't strip unused symbols; dfhack hooks into some of them. diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 73288ab659f3..ce989b98ffbd 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -1,13 +1,22 @@ -{ stdenv, lib, buildEnv, substituteAll, runCommand +{ stdenv +, lib +, buildEnv +, substituteAll +, runCommand +, coreutils , dwarf-fortress , dwarf-therapist -, enableDFHack ? false, dfhack -, enableSoundSense ? false, soundSense, jdk +, enableDFHack ? false +, dfhack +, enableSoundSense ? false +, soundSense +, jdk , enableStoneSense ? false -, enableTWBT ? false, twbt -, themes ? {} +, enableTWBT ? false +, twbt +, themes ? { } , theme ? null -# General config options: + # General config options: , enableIntro ? true , enableTruetype ? true , enableFPS ? false @@ -31,11 +40,11 @@ let # These are in inverse order for first packages to override the next ones. themePkg = lib.optional (theme != null) ptheme; pkgs = lib.optional enableDFHack dfhack_ - ++ lib.optional enableSoundSense soundSense - ++ lib.optional enableTWBT twbt.art - ++ [ dwarf-fortress ]; + ++ lib.optional enableSoundSense soundSense + ++ lib.optional enableTWBT twbt.art + ++ [ dwarf-fortress ]; - fixup = lib.singleton (runCommand "fixup" {} ('' + fixup = lib.singleton (runCommand "fixup" { } ('' mkdir -p $out/data/init '' + (if (theme != null) then '' cp ${lib.head themePkg}/data/init/init.txt $out/data/init/init.txt @@ -61,7 +70,7 @@ let substituteInPlace $out/data/init/init.txt \ --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]' '' + - lib.optionalString enableTextMode '' + lib.optionalString enableTextMode '' substituteInPlace $out/data/init/init.txt \ --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TEXT]' '' + '' @@ -89,8 +98,15 @@ stdenv.mkDerivation { name = "dwarf-fortress-init"; src = ./dwarf-fortress-init.in; inherit env; - exe = if stdenv.isLinux then "libs/Dwarf_Fortress" - else "dwarfort.exe"; + exe = + if stdenv.isLinux then "libs/Dwarf_Fortress" + else "dwarfort.exe"; + stdenv_shell = "${stdenv.shell}"; + cp = "${coreutils}/bin/cp"; + rm = "${coreutils}/bin/rm"; + ln = "${coreutils}/bin/ln"; + cat = "${coreutils}/bin/cat"; + mkdir = "${coreutils}/bin/mkdir"; }; runDF = ./dwarf-fortress.in; diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in index b041067d89e4..27639e57f212 100644 --- a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in +++ b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in @@ -1,3 +1,4 @@ +#!@stdenv_shell@ -e shopt -s extglob [ -z "$DF_DIR" ] && export DF_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/df_linux" @@ -7,25 +8,25 @@ exe="$env_dir/@exe@" update_path() { local path="$1" - mkdir -p "$DF_DIR/$(dirname "$path")" + @mkdir@ -p "$DF_DIR/$(dirname "$path")" # If user has replaced these data directories, let them stay. if [ ! -e "$DF_DIR/$path" ] || [ -L "$DF_DIR/$path" ]; then - rm -f "$DF_DIR/$path" - ln -s "$env_dir/$path" "$DF_DIR/$path" + @rm@ -f "$DF_DIR/$path" + @ln@ -s "$env_dir/$path" "$DF_DIR/$path" fi } forcecopy_path() { local path="$1" - mkdir -p "$DF_DIR/$(dirname "$path")" - rm -rf "$DF_DIR/$path" - cp -rL --no-preserve=all "$env_dir/$path" "$DF_DIR/$path" + @mkdir@ -p "$DF_DIR/$(dirname "$path")" + @rm@ -rf "$DF_DIR/$path" + @cp@ -rL --no-preserve=all "$env_dir/$path" "$DF_DIR/$path" } -mkdir -p "$DF_DIR" +@mkdir@ -p "$DF_DIR" -cat <<EOF >&2 +@cat@ <<EOF >&2 Using $DF_DIR as Dwarf Fortress overlay directory. If you do any changes in it, don't forget to clean it when updating the game version! We try to detect changes based on data directories being symbolic links -- keep this in mind. diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index 88d8598e133c..d114ed848000 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "0.8.0"; + version = "0.8.1"; pname = "extremetuxracer"; src = fetchurl { url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz"; - sha256 = "05ysaxvsgps9fxc421kdifsxmc1sn6n79cjaa0k0i3fs9qqrja2b"; + sha256 = "sha256-ktqWPtMqub/xJjRu37lUnocdfDzsdT9KxQmODVPDg0E="; }; buildInputs = [ diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 58e91a44842c..1560a45b0618 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "freeciv"; - version = "2.6.4"; + version = "2.6.5"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-MRaY10HliP8TA8/9s5caNtB5hks5SJcBJItFXOUryCI="; + sha256 = "sha256-7KVtBGihABpcbUm5ac2fuBVaDvbucEJSREPulGUdnUE="; }; postPatch = '' diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 19cd1941ddc0..b15e111970e9 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -58,8 +58,8 @@ let inherit version; src = fetchurl { - url = "https://dl.xonotic.org/xonotic-${version}.zip"; - sha256 = "sha256-oi9yMPSGxYJbVc/a3XM5nJsPrpjJ4IHdisduygg1mtU="; + url = "https://dl.xonotic.org/xonotic-${version}-source.zip"; + sha256 = "0axxw04fyz6jlfqd0kp7hdrqa0li31sx1pbipf2j5qp9wvqicsay"; }; nativeBuildInputs = [ unzip ]; @@ -120,7 +120,7 @@ let in rec { xonotic-data = fetchzip { name = "xonotic-data"; - url = "https://dl.xonotic.org/xonotic-data-${version}.zip"; + url = "https://dl.xonotic.org/xonotic-${version}.zip"; sha256 = "1ygkh0v68y4sd1w5vpk8dgb65h5jm599hwszdfgjp3ax4d3ml81x"; extraPostFetch = '' cd $out diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 15a129246e18..a94964d888d5 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "8.0.1"; + version = "8.0.3"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; - rev = "d34499a2aafa024623a4210fe7f663cef13fe9a6"; - sha256 = "VKoGr3CTDFg3Q0X+MTlwa4BbfLB+28FeTyTJRCq37RA="; + rev = "v${version}"; + sha256 = "F6kLPWZb7FttyAP7pNEn+aRcAjvZlMNXrmuHMYa0Xig="; }; nativeBuildInputs = [ diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 49a45d6d24d4..ea9aaae53edc 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -413,12 +413,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-06-30"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "01507625b76291bb41a3c92ca8a056d655b674cb"; - sha256 = "16n1vdgrn9rv7pzwzgisdhin81d5fhlyicp0m0md4g6sd6jfydqh"; + rev = "d66a7ec580c5e006bf44c5ffc0c17e39897b0c22"; + sha256 = "0an89qwx70gj3dzlmx9j61vmsqfzsh9p4jhqysrg1n6hx56ak7yj"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -810,12 +810,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-06-21"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "aa817559be68d9e90316bc7e5d3205fe2ffcffbe"; - sha256 = "06c9ab58rj0qx2nyl63qpx5r8lwlx320j7913nafpk268pmqdz4i"; + rev = "7df02d1bf18324d81cbc32b98c05f5aa936afc17"; + sha256 = "1vf2386xagiyh23kflcnckw5niy4xygns4pi3apq7kza05ca6861"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1364,12 +1364,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-06-17"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "f4a26c075f603c3d82baf56b04c9168a7e084c8b"; - sha256 = "02rsawnqixwq8cj8ryqg0nmmmzq5s1adfll9mmwa6bqh3nwxsb2s"; + rev = "1e540f25a4bb84fcc50b5f10c969fbda02d21027"; + sha256 = "17qpqiv63jpap10wgfkb6zmj2xqcl7jwjglg74y9pajkpm1l050h"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -2039,12 +2039,12 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop-nvim"; - version = "2021-06-27"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "00b0f865efdcb329629315c63e9dac5aa6a6e736"; - sha256 = "1c3bzhrsdbkwj9hj832bb9snr7b78yf8mbx9gm4fc2lbbnrxqvvp"; + rev = "0e9d4b4585f8a37d6cccbe9dd5993900b96a595b"; + sha256 = "0gpah47azk1miybwm2aa6m3vm08683z85rgrjfywx76fnih9rs66"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2316,12 +2316,12 @@ final: prev: julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-06-29"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "26beb1213019d56767e7f14ba1f2cbc33cb315b8"; - sha256 = "05bqimb70r646q9v7nshwapqs8n9hvbx55cxx6khd6gwvpckh22w"; + rev = "6ff9e9938badea96f64154f2991e165e8d340cf2"; + sha256 = "11k1gjsh8fibdpg5lrcq3rz90gwjb7725krhimnvhrkwhcyl1bwb"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2676,24 +2676,24 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-06-27"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "1e79310e57404e86e00ceca2c4657bb9a9072673"; - sha256 = "0v6kgjjy9ygr2vygh4zizfbnms33w3bn1b4zdljx79c358firgcx"; + rev = "b94accc40260be439b6bfa120402ebd10bd60577"; + sha256 = "19lz2l9dzq5a339rhp8xdzj1m0dxxnwm9w4kg4lizgxi1ck53dpq"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; lush-nvim = buildVimPluginFrom2Nix { pname = "lush-nvim"; - version = "2021-06-28"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "850a2aa8366bbe8b07088a19e6b6f2e8e76f2c9f"; - sha256 = "048fjsxrshlgcscs9c1y29fgpcb9l9cnhpghkj9ailpzjv4j5hxf"; + rev = "3232af465ed86b9a188389e52ce3c47cd811c3f3"; + sha256 = "1qcvi8kklggzl4k88n6zhxb08hh2srhm9vvnfrknlz751pgd8z3x"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3084,12 +3084,12 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2021-06-28"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "b03c121c66d859fa165aaab05ba9c1c1b2098007"; - sha256 = "0b72c14sqjq8bb0xz1spp5lq2bs1fsbp651qiwvvcdlma5yf5vxk"; + rev = "3fdfd45119be64945e635bf2406fdb0430cb85df"; + sha256 = "1sd45xvvw4wgmzixlmaq6j0kvv25l561678q24l23swh77x617r4"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -3144,12 +3144,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2021-06-27"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "vhyrro"; repo = "neorg"; - rev = "639a2deb5e3783aeb8f7cddaade8e84575f3bc1e"; - sha256 = "0q890252cpcjy5a9xy6m5qlziqbqmfgy43l305aslv05yxbckk11"; + rev = "7fe4530c9a71f81444ad9fee9d89c5e2f5bfbf8d"; + sha256 = "1zyi32x8wfz3lqb2nqggrjlp8d0j4qpnkck4pfg15fgmkycrivf7"; }; meta.homepage = "https://github.com/vhyrro/neorg/"; }; @@ -3348,12 +3348,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord-nvim"; - version = "2021-06-17"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "cbede2d4abef3f6054919863404ce46f3ed572a9"; - sha256 = "0w7fv6yl78inr81h57kgh5xfhha626sc2w8mmzgbwp7s7yhqxymk"; + rev = "98063a91de4179685c29acb1c765a99bf08ef0f2"; + sha256 = "18q05vfb4h94nlxylkir9chb3n62x2ibb3qlcij4rhn35fsnrfd9"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3468,12 +3468,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-06-29"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "9a1ab398bfdb4bda1134b7a0e7a379017d3bdefa"; - sha256 = "04khvbxx5qsfzhg5ari55ka8ff9gpd2kh7s3vc27z1jz43vizrsa"; + rev = "a46dfe7d7fc8f7af5bb84006db45ba11fb7b786c"; + sha256 = "161zrqvw5kpcphn747cpa4388x4c2flps5qwxkl5yxkn320937im"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3600,12 +3600,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-06-29"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "234a8cdad1104dd562796e6ca2c6c41e22e5f77a"; - sha256 = "0w10mx66p9sil1aa6jhkfb7k2p4m2vwjbyr8f1dr2apn07cr72w8"; + rev = "161ec66bda585fd7ba402cf7434bac87c927734f"; + sha256 = "1d4qwxrkx9cbbrxddg2n9f7sszmp23jnx83g52yydsxhlxq8dj8l"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3684,24 +3684,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-06-29"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "a80ea23b4c765efe3b6eaa9440d19d298e4c709b"; - sha256 = "11m62asv3qrv5kh4gb8xvhjmxwbzxf26902cxn8gncclc79cr42i"; + rev = "a01a33f9a8aea3eb19eb76601131c01e23d8e034"; + sha256 = "1jsf6prmf1555kd87gfjdiydkvl15qk0lk6x04dwbrx6wxfvd77a"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-06-29"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "917ae3da7c0d827c819405cc747aafc8bb041dbd"; - sha256 = "00mh980ffh3k0cp4dm1qvx5x803kw8xajgvv86hw0yspmjb98d5d"; + rev = "5fa8d5741dca82a15426db659f461244975678e6"; + sha256 = "1xqq1m27w3vh1dd9g3k4kwva92hr8zf1xnlvqhy2jz1xazx4k2m1"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4008,12 +4008,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-06-19"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "268002fdba2f8f5a4e86574e3b9924ad6d42da20"; - sha256 = "07zskz9b5s4cainjqj431b2skzdrhnm8agydmjxmw13qjmwj0q7z"; + rev = "18da6621459032aa5608b760622f0bc8fdc0535c"; + sha256 = "1z1n3jpxmz3672f8bd6s898mlqjf17pv11qqy15l2npfd9crh5sv"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -4057,12 +4057,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence-nvim"; - version = "2021-06-14"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "65a16b25f98891e2832daa437cdd682e546a494e"; - sha256 = "0fwxxrwad3y69bczs7rxa0brff4vp139w2ylv8rfh0v2dgx2gmay"; + rev = "774994a5b930b9e6635e6a9b83b7f476bdd7dd23"; + sha256 = "0q6d5k2rf6ci3mgmdga304ihklb10falp4g29djnfxxsi2iapvjv"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -4249,12 +4249,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers-nvim"; - version = "2021-06-21"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "6817136df80ae9ddb980a97f7e4cf31cc4f9fa4a"; - sha256 = "13di6mjn6wb931ak98g1xl99j97c2kphhqrbwh673nl7syqwhnrf"; + rev = "fd21f094a460bb319a8f6eac18653a1a2122d41c"; + sha256 = "0y5qga2x767blzbrlbfxidz73fpby81xpsw133wmfy3hnkg8xdam"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -4574,12 +4574,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-06-08"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "5c1fc0452387cae323692e3345238a780a942056"; - sha256 = "0j2bba7img06m6b7lzgw1q5r8g38cs70pynwisqdb34l5jbj0fqx"; + rev = "e8935bde797ce92318c60a21ee671caf04387a33"; + sha256 = "1sw8d7ipadpa4hazs2fija3rzlf6ch7h8lkm4k3hg9m9gpviygla"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -4803,12 +4803,12 @@ final: prev: syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2021-05-19"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "176f364f1b4acf894cdc248944f2d5506a37cc80"; - sha256 = "01ylf4vjlisgls2f2gwlagg7x1yyhcr64kzdlzhcs3r8s3wdsf25"; + rev = "c89741ef310fd0a380ffb80b80e10f197afd6224"; + sha256 = "0n691w9mcq0ks7wvj9mpmwhqnkcd11lhzf4fz6pkki8g5i7zhqrh"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -4984,12 +4984,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-06-27"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "e5bd4963da81b5d044749ee4507061801aeb0f78"; - sha256 = "1dskr91qiark1z08yfjkbrnf1zvy2mci4avkdn574b7pz8v72lzb"; + rev = "5a53ec5c2fdab10ca8775d3979b1a85e63d57953"; + sha256 = "1mr98irwsc5pmj63ssxd3cdwb3x31lalbkk1pyp79bswdfjmx0nl"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5837,12 +5837,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-06-26"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "492eca7ff8e162ec8a8e4535860de399d7e1cd57"; - sha256 = "1xxgf3mk26pj3w2lzdr4aw8xvya02ar57v01v1yajlw0rzx23crw"; + rev = "4402c9292c4495916b075e27dac88ad391c47ceb"; + sha256 = "0hwap5z5727iq42zpl769m1w84qr41xgbg7rfjbk94qb3kkikb4m"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -9165,12 +9165,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-06-01"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "552403842b992efde3816a89b20055f7d66d9a0d"; - sha256 = "1pkkysv2mnbzm2bi33l1xccdb6sh06dgyg83dg0dgd0gmp94l7ya"; + rev = "a1d1841ecadc19eeab9efdd9fa17054cedcba6e6"; + sha256 = "0zzqxxv2jqi71p76z0fsnc25kmclazb3x6rg248npsn8pnfwwi1s"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -9502,12 +9502,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-06-28"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "299363d651c5a8c26a4440f434df613cdf66a4c4"; - sha256 = "18c9b35cjjrw2bf62j6ss5i7i21rz32nrm102bljybf2cfs700lf"; + rev = "c9b3b50427d97403e8a36b3fe2d636d0a97db0d8"; + sha256 = "1vpl02n2xy7b95mhagbsq7fiz55i0x3wpqpbmpmp16mva6r6agvr"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; diff --git a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix index 7d2615824a68..a23502714827 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "alsa-lib"; - version = "1.2.5"; + version = "1.2.5.1"; src = fetchurl { url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; - sha256 = "067ga0l6zr782kw8jdsqvbb20pcgnl0vkpnnz2n36fq8ii58k4lh"; + sha256 = "sha256-YoQh2VDOyvI03j+JnVIMCmkjMTyWStdR/6wIHfMxQ44="; }; patches = [ diff --git a/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix index d87f3eebb845..0666f3f47939 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "alsa-ucm-conf-${version}"; - version = "1.2.5"; + version = "1.2.5.1"; src = fetchurl { url = "mirror://alsa/lib/${name}.tar.bz2"; - sha256 = "sha256-CTrj2Fpeb9LNHMJ/7aQA1xkTgvuLXl4jSXKGyHwVB6U="; + sha256 = "sha256-WEGkRBZty/R523UTA9vDVW9oUIWsfgDwyed1VnYZXZc="; }; dontBuild = true; diff --git a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix index 37bda86b0a6a..782e6ffce8cb 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-utils"; - version = "1.2.5"; + version = "1.2.5.1"; src = fetchurl { url = "mirror://alsa/utils/${pname}-${version}.tar.bz2"; - sha256 = "15wrl7jsprpcqdk01a3hdh2lak5jhp5jgflkr80h1crqb3q0m5q9"; + sha256 = "sha256-nBaa43pJKV+bl7kqzncoA9r2tlEKGVdOC3j4flYhGNA="; }; nativeBuildInputs = [ gettext makeWrapper ]; diff --git a/pkgs/os-specific/linux/bpftools/default.nix b/pkgs/os-specific/linux/bpftools/default.nix index 3e20efa9f012..f2ca8d874714 100644 --- a/pkgs/os-specific/linux/bpftools/default.nix +++ b/pkgs/os-specific/linux/bpftools/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ libopcodes libbfd libelf zlib readline ]; preConfigure = '' - patchShebangs scripts/bpf_helpers_doc.py + patchShebangs scripts/bpf_doc.py cd tools/bpf substituteInPlace ./bpftool/Makefile \ diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 95998c694fb9..1a9b7e34f5a2 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "firejail"; - version = "0.9.64.4"; + version = "0.9.66"; src = fetchFromGitHub { owner = "netblue30"; repo = "firejail"; rev = version; - sha256 = "sha256-q/XL8cznHlUXdubUEptEAVma1jRUqFb5XcLAV0RVCzs="; + sha256 = "sha256-oKstTiGt0r4wePaZ9u1o78GZ1XWJ27aS0BdLxmfYk9Q="; }; buildInputs = [ which ]; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 638983d6c17e..ea3c4d36958f 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.12.0"; + version = "5.13.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-nSaNuYo27ioOP/O5Ky7/9m/BE4pR5Am972qzz+FfMm8="; + sha256 = "sha256-cqLlN3TKyeZfe2F97rsgWfh+iWDW6XE+TXiM6pZvGzY="; }; preConfigure = '' diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index ae27839c8cd3..cc335aec4c8f 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation { postPatch = '' patchShebangs scripts/bpf_helpers_doc.py + patchShebangs scripts/bpf_doc.py ''; doCheck = false; # requires "sparse" diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix index 79271448b75b..17f8b3a28c4e 100644 --- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, kernel, linuxHeaders}: +{ lib, stdenv, fetchFromGitHub, kernel, linuxHeaders }: stdenv.mkDerivation rec { pname = "tuxedo-keyboard-${kernel.version}"; - version = "3.0.5"; + version = "3.0.7"; src = fetchFromGitHub { owner = "tuxedocomputers"; repo = "tuxedo-keyboard"; rev = "v${version}"; - sha256 = "123ady2bi2dwbajy3pgv10l3g2pyhi5k31c1ii0zcrvl2qqhndck"; + sha256 = "sha256-JloLwfJfDdVowx1hOehjxPbnaKBCAMn7SZe09SE03HU="; }; buildInputs = [ linuxHeaders ]; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 73c3f82e8b05..7d715cc3c092 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -205,12 +205,12 @@ in { zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.13"; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.14"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.1.0-rc7"; + version = "2.1.0-rc8"; - sha256 = "11dvz8r5l7cbhbx2j02y6335i2vibh29dqrqk4kmw4lf87g1isni"; + sha256 = "0c53ca6xd59c30h3b2hmvyy63yqyk745x1kdfypnfqj3lnsj1pac"; isUnstable = true; }; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b51cc9f0ba6d..dbe9c938c678 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -646,7 +646,7 @@ "plugwise" = ps: with ps; [ plugwise ]; "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad "pocketcasts" = ps: with ps; [ ]; # missing inputs: pycketcasts - "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint + "point" = ps: with ps; [ aiohttp-cors pypoint ]; "poolsense" = ps: with ps; [ poolsense ]; "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall "profiler" = ps: with ps; [ guppy3 objgraph pyprof2calltree ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 4b23b4a2bc42..c9a4a15a87c0 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -606,6 +606,7 @@ in with py.pkgs; buildPythonApplication rec { "plant" "plex" "plugwise" + "point" "poolsense" "profiler" "prometheus" @@ -614,6 +615,7 @@ in with py.pkgs; buildPythonApplication rec { "pushbullet" "pvpc_hourly_pricing" "python_script" + "qld_bushfire" "rachio" "radarr" "rainmachine" diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix index 036e44ca621e..ea9628417d7d 100644 --- a/pkgs/servers/http/pomerium/default.nix +++ b/pkgs/servers/http/pomerium/default.nix @@ -11,15 +11,15 @@ let in buildGoModule rec { pname = "pomerium"; - version = "0.14.4"; + version = "0.14.7"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - hash = "sha256:097csr8f43cn0iq030ajvvpwnwcfmjxyyk6pcisdy937axlrzska"; + hash = "sha256:1jb96jk5qmary4fi1z9zwmppdyskj0qb6qii8s8mwazjjxqj1z2s"; }; - vendorSha256 = "sha256:0n45xvwjiqyh41dsm4z1rnkgkycf5wfmacm804hqnd5rz7xk2shf"; + vendorSha256 = "sha256:1daabi9qc9nx8bafn26iw6rv4vx2xpd0nnk06265aqaksx26db0s"; subPackages = [ "cmd/pomerium" "cmd/pomerium-cli" diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index e445184b9561..2e825dc96152 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "389-ds-base"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "389ds"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-H0G8py4sB+2CSZKyCIb2TCIXOpnPx7udWUEK4Tg5TD8="; + sha256 = "sha256-MYLRrH3PrNdPVuRffiG39zzJK6eHJcvIDWn1q0IHrZ8="; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 1e87bb436e3e..7940b560b5a7 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.37.0"; + version = "1.37.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BWGbfDBB1jX0PJSR8WCZE3FE1pDs0fRg8/fML3FsJHA="; + sha256 = "sha256-KxDHJrKm/QUZtOzI6MEpIUb4hTtxtIPLFuD1as3j4EA="; }; patches = [ diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 99acc52b9de2..14d0c63d90bf 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "8.0.3"; + version = "8.0.4"; excludedPackages = [ "release_publisher" ]; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-GGtmsz3c7Q6mEGCJ6cdz2CjOW0ovZZW8j6LMfFgrMZ4="; + sha256 = "sha256-I4TUPni2WDdpsV19nltsaF1PugB5SOtQ9Jb0YzWUwFg="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-2x0FhKinrXAFenJcUDh4Q3RJNBrqixKBNZT7BZNNOj8="; + sha256 = "sha256-GUVnw2kKxVfztvfsNMwRLxPTqRYzbxXzoH2GkmZB2JE="; }; vendorSha256 = "sha256-x7sSVIim/TOhMTbnRK/fpgxiSRSO8KwGILTE2i1gU3U="; diff --git a/pkgs/servers/pufferpanel/default.nix b/pkgs/servers/pufferpanel/default.nix new file mode 100644 index 000000000000..67529b7d5bb8 --- /dev/null +++ b/pkgs/servers/pufferpanel/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, pkgs +, stdenv +, fetchzip +, openjdk16 +, nodejs +, pathDeps ? [ ] +}: + +buildGoModule rec { + pname = "pufferpanel"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "pufferpanel"; + repo = pname; + rev = "v${version}"; + sha256 = "1ifig8ckjlg47wj0lfk4q941dan7llb1i5l76akcpjq726b2j8lh"; + }; + + # PufferPanel is split into two parts: the backend daemon and the + # frontend. + # Getting the frontend to build in the Nix environment fails even + # with all the proper node_modules populated. To work around this, + # we just download the built frontend and package that. + frontend = fetchzip { + url = "https://github.com/PufferPanel/PufferPanel/releases/download/v${version}/pufferpanel_${version}_linux_arm64.zip"; + sha256 = "0phbf4asr0dns7if84crx05kfgr44yaxrbsbihdywbhh2mb16052"; + stripRoot = false; + } + "/www"; + + nativeBuildInputs = [ makeWrapper ]; + + vendorSha256 = "061l1sy0z3kd7rc2blqh333gy66nbadfxy9hyxgq07dszds4byys"; + + postFixup = '' + mkdir -p $out/share/pufferpanel + cp -r ${src}/assets/email $out/share/pufferpanel/templates + cp -r ${frontend} $out/share/pufferpanel/www + + # Wrap the binary with the path to the external files. + mv $out/bin/cmd $out/bin/pufferpanel + wrapProgram "$out/bin/pufferpanel" \ + --set PUFFER_PANEL_EMAIL_TEMPLATES $out/share/pufferpanel/templates/emails.json \ + --set GIN_MODE release \ + --set PUFFER_PANEL_WEB_FILES $out/share/pufferpanel/www \ + --prefix PATH : ${lib.makeBinPath pathDeps} + ''; + + meta = with lib; { + description = "A free, open source game management panel"; + homepage = "https://www.pufferpanel.com/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ ronthecookie ]; + }; +} diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 5973a1a190c6..8ef89031c182 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "11.0.3"; + version = "11.0.4"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "sha256-oYlc6PSBLovNsEWDc6eGpDI85T6bTHgBvxA/PZP3aQU="; + sha256 = "sha256-a/IMroZ1zAgIv7Cx4kkj5byIMoC0o+seHhqVLaUUSqc="; }; buildInputs = with lib; diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 5e7c4d5368a4..5a3301040d33 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -1,8 +1,11 @@ { stdenv, makeWrapper, runCommandNoCC, lib, nixosTests, writeShellScript -, fetchFromGitHub, bundlerEnv, ruby, replace, gzip, gnutar, git, cacert -, util-linux, gawk, imagemagick, optipng, pngquant, libjpeg, jpegoptim -, gifsicle, libpsl, redis, postgresql, which, brotli, procps, rsync -, nodePackages, v8 +, fetchFromGitHub, bundlerEnv, callPackage + +, ruby, replace, gzip, gnutar, git, cacert, util-linux, gawk +, imagemagick, optipng, pngquant, libjpeg, jpegoptim, gifsicle, libpsl +, redis, postgresql, which, brotli, procps, rsync, nodePackages, v8 + +, plugins ? [] }: let @@ -46,6 +49,35 @@ let UNICORN_LISTENER = "/run/discourse/sockets/unicorn.sock"; }; + mkDiscoursePlugin = + { name ? null + , pname ? null + , version ? null + , meta ? null + , bundlerEnvArgs ? {} + , src + , ... + }@args: + let + rubyEnv = bundlerEnv (bundlerEnvArgs // { + inherit name pname version ruby; + }); + in + stdenv.mkDerivation (builtins.removeAttrs args [ "bundlerEnvArgs" ] // { + inherit name pname version src meta; + pluginName = if name != null then name else "${pname}-${version}"; + phases = [ "unpackPhase" "installPhase" ]; + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r * $out/ + '' + lib.optionalString (bundlerEnvArgs != {}) '' + ln -sf ${rubyEnv}/lib/ruby/gems $out/gems + '' + '' + runHook postInstall + ''; + }); + rake = runCommandNoCC "discourse-rake" { nativeBuildInputs = [ makeWrapper ]; } '' @@ -121,6 +153,12 @@ let nodePackages.uglify-js ]; + patches = [ + # Use the Ruby API version in the plugin gem path, to match the + # one constructed by bundlerEnv + ./plugin_gem_api_version.patch + ]; + # We have to set up an environment that is close enough to # production ready or the assets:precompile task refuses to # run. This means that Redis and PostgreSQL has to be running and @@ -148,6 +186,8 @@ let mkdir $NIX_BUILD_TOP/tmp_home export HOME=$NIX_BUILD_TOP/tmp_home + ${lib.concatMapStringsSep "\n" (p: "ln -sf ${p} plugins/${p.pluginName or ""}") plugins} + export RAILS_ENV=production bundle exec rake db:migrate >/dev/null @@ -195,6 +235,14 @@ let # Log Unicorn messages to the journal and make request timeout # configurable ./unicorn_logging_and_timeout.patch + + # Use the Ruby API version in the plugin gem path, to match the + # one constructed by bundlerEnv + ./plugin_gem_api_version.patch + + # Use mv instead of rename, since rename doesn't work across + # device boundaries + ./use_mv_instead_of_rename.patch ]; postPatch = '' @@ -203,8 +251,6 @@ let # warnings and means we don't have to link back to lib from the # state directory. find config -type f -execdir sed -Ei "s,(\.\./)+(lib|app)/,$out/share/discourse/\2/," {} \; - - ${replace}/bin/replace-literal -f -r -e 'File.rename(temp_destination, destination)' "FileUtils.mv(temp_destination, destination)" . ''; buildPhase = '' @@ -212,7 +258,6 @@ let mv config config.dist mv public public.dist - mv plugins plugins.dist runHook postBuild ''; @@ -230,6 +275,7 @@ let ln -sf /run/discourse/public $out/share/discourse/public ln -sf /run/discourse/plugins $out/share/discourse/plugins ln -sf ${assets} $out/share/discourse/public.dist/assets + ${lib.concatMapStringsSep "\n" (p: "ln -sf ${p} $out/share/discourse/plugins/${p.pluginName or ""}") plugins} runHook postInstall ''; @@ -243,7 +289,9 @@ let }; passthru = { - inherit rubyEnv runtimeEnv runtimeDeps rake; + inherit rubyEnv runtimeEnv runtimeDeps rake mkDiscoursePlugin; + enabledPlugins = plugins; + plugins = callPackage ./plugins/all-plugins.nix { inherit mkDiscoursePlugin; }; ruby = rubyEnv.wrappedRuby; tests = nixosTests.discourse; }; diff --git a/pkgs/servers/web-apps/discourse/plugin_gem_api_version.patch b/pkgs/servers/web-apps/discourse/plugin_gem_api_version.patch new file mode 100644 index 000000000000..ca7aa850ec51 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugin_gem_api_version.patch @@ -0,0 +1,13 @@ +diff --git a/lib/plugin_gem.rb b/lib/plugin_gem.rb +index 855d1aca2c..8115623547 100644 +--- a/lib/plugin_gem.rb ++++ b/lib/plugin_gem.rb +@@ -4,7 +4,7 @@ module PluginGem + def self.load(path, name, version, opts = nil) + opts ||= {} + +- gems_path = File.dirname(path) + "/gems/#{RUBY_VERSION}" ++ gems_path = File.dirname(path) + "/gems/#{Gem.ruby_api_version}" + + spec_path = gems_path + "/specifications" + diff --git a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix new file mode 100644 index 000000000000..e6640cbbe975 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix @@ -0,0 +1,12 @@ +{ mkDiscoursePlugin, newScope, fetchFromGitHub, ... }@args: +let + callPackage = newScope args; +in +{ + discourse-spoiler-alert = callPackage ./discourse-spoiler-alert {}; + discourse-solved = callPackage ./discourse-solved {}; + discourse-canned-replies = callPackage ./discourse-canned-replies {}; + discourse-math = callPackage ./discourse-math {}; + discourse-github = callPackage ./discourse-github {}; + discourse-yearly-review = callPackage ./discourse-yearly-review {}; +} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix new file mode 100644 index 000000000000..05c153cd70b1 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix @@ -0,0 +1,11 @@ +{ mkDiscoursePlugin, fetchFromGitHub }: + +mkDiscoursePlugin { + name = "discourse-canned-replies"; + src = fetchFromGitHub { + owner = "discourse"; + repo = "discourse-canned-replies"; + rev = "7ee748f18a276aca42185e2079c1d4cadeecdaf8"; + sha256 = "0j10kxfr6v2rdd58smg2i7iac46z74qnnjk8b91jd1svazhis1ph"; + }; +} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile new file mode 100644 index 000000000000..f0205f4ff1df --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' +gem 'sawyer', '0.8.2' +gem 'octokit', '4.21.0' diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock new file mode 100644 index 000000000000..f28833a35c0f --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock @@ -0,0 +1,37 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + faraday (1.4.2) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) + multipart-post (>= 1.2, < 3) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.1.0) + multipart-post (2.1.1) + octokit (4.21.0) + faraday (>= 0.9) + sawyer (~> 0.8.0, >= 0.5.3) + public_suffix (4.0.6) + ruby2_keywords (0.0.4) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) + +PLATFORMS + ruby + +DEPENDENCIES + octokit (= 4.21.0) + sawyer (= 0.8.2) + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix new file mode 100644 index 000000000000..e5d8cff0a9fd --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix @@ -0,0 +1,12 @@ +{ mkDiscoursePlugin, fetchFromGitHub }: + +mkDiscoursePlugin { + name = "discourse-github"; + bundlerEnvArgs.gemdir = ./.; + src = fetchFromGitHub { + owner = "discourse"; + repo = "discourse-github"; + rev = "151e353a5a1971157c70c2e2b0f56387f212a81f"; + sha256 = "00kra6zd2k1f2vwcdvxnxnammzh72f5qxcqbb94m0z6maj598wdy"; + }; +} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix new file mode 100644 index 000000000000..bad1f9629578 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix @@ -0,0 +1,126 @@ +{ + addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + type = "gem"; + }; + version = "2.7.0"; + }; + faraday = { + dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-net_http" "faraday-net_http_persistent" "multipart-post" "ruby2_keywords"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07mhk70gv453pg38md346470hknyhipdqppnplq706ll3k3lzb7v"; + type = "gem"; + }; + version = "1.4.2"; + }; + faraday-em_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-em_synchrony = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-excon = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; + type = "gem"; + }; + version = "1.1.0"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-net_http_persistent = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l2c835wl7gv34xp49fhd1bl4czkpw2g3ahqsak2251iqv5589ka"; + type = "gem"; + }; + version = "1.1.0"; + }; + multipart-post = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + type = "gem"; + }; + version = "2.1.1"; + }; + octokit = { + dependencies = ["faraday" "sawyer"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ak64rb48d8z98nw6q70r6i0i3ivv61iqla40ss5l79491qfnn27"; + type = "gem"; + }; + version = "4.21.0"; + }; + public_suffix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + type = "gem"; + }; + version = "4.0.6"; + }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + type = "gem"; + }; + version = "0.0.4"; + }; + sawyer = { + dependencies = ["addressable" "faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz"; + type = "gem"; + }; + version = "0.8.2"; + }; +} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix new file mode 100644 index 000000000000..8cf2a4abc0d1 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix @@ -0,0 +1,11 @@ +{ mkDiscoursePlugin, fetchFromGitHub }: + +mkDiscoursePlugin { + name = "discourse-math"; + src = fetchFromGitHub { + owner = "discourse"; + repo = "discourse-math"; + rev = "143ddea4558ea9a1b3fd71635bc11e055763c8e7"; + sha256 = "18pq5ybl3g34i39cpixc3nszvq8gx5yji58zlbbl6428mm011cbx"; + }; +} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix new file mode 100644 index 000000000000..c382a83d0893 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix @@ -0,0 +1,11 @@ +{ mkDiscoursePlugin, fetchFromGitHub }: + +mkDiscoursePlugin { + name = "discourse-solved"; + src = fetchFromGitHub { + owner = "discourse"; + repo = "discourse-solved"; + rev = "179611766d53974308e6f7def21836997c3c55fc"; + sha256 = "sha256:1s77h42d3bv2lqw33akxh8ss482vxnz4d7qz6xicwqfwv34qjf03"; + }; +} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix new file mode 100644 index 000000000000..8eba43e47e40 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix @@ -0,0 +1,11 @@ +{ mkDiscoursePlugin, fetchFromGitHub }: + +mkDiscoursePlugin { + name = "discourse-spoiler-alert"; + src = fetchFromGitHub { + owner = "discourse"; + repo = "discourse-spoiler-alert"; + rev = "e200cfa571d252cab63f3d30d619b370986e4cee"; + sha256 = "0ya69ix5g77wz4c9x9gmng6l25ghb5xxlx3icr6jam16q14dzc33"; + }; +} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix new file mode 100644 index 000000000000..8e76123ae593 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix @@ -0,0 +1,11 @@ +{ mkDiscoursePlugin, fetchFromGitHub }: + +mkDiscoursePlugin { + name = "discourse-yearly-review"; + src = fetchFromGitHub { + owner = "discourse"; + repo = "discourse-yearly-review"; + rev = "d1471bdb68945f55342e72e2c525b4f628419a50"; + sha256 = "sha256:0xpl0l1vpih8xzb6y7k1lm72nj4ya99378viyhqfvpwzsn5pha2a"; + }; +} diff --git a/pkgs/servers/web-apps/discourse/use_mv_instead_of_rename.patch b/pkgs/servers/web-apps/discourse/use_mv_instead_of_rename.patch new file mode 100644 index 000000000000..30493b543e38 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/use_mv_instead_of_rename.patch @@ -0,0 +1,22 @@ +diff --git a/lib/discourse.rb b/lib/discourse.rb +index ea2a3cbafd..66454d9157 100644 +--- a/lib/discourse.rb ++++ b/lib/discourse.rb +@@ -62,7 +62,7 @@ module Discourse + fd.fsync() + end + +- File.rename(temp_destination, destination) ++ FileUtils.mv(temp_destination, destination) + + nil + end +@@ -76,7 +76,7 @@ module Discourse + FileUtils.mkdir_p(File.join(Rails.root, 'tmp')) + temp_destination = File.join(Rails.root, 'tmp', SecureRandom.hex) + execute_command('ln', '-s', source, temp_destination) +- File.rename(temp_destination, destination) ++ FileUtils.mv(temp_destination, destination) + + nil + end diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 286125902fab..46d7ebfd85a2 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ "-Dxwayland_eglstream=true" - "-Ddefault_font-path=${defaultFontPath}" + "-Ddefault_font_path=${defaultFontPath}" "-Dxkb_bin_dir=${xkbcomp}/bin" "-Dxkb_dir=${xkeyboard_config}/etc/X11/xkb" "-Dxkb_output_dir=${placeholder "out"}/share/X11/xkb/compiled" diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 69b55a6f3c29..bf0b7472c571 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -6,8 +6,6 @@ , withSqlite ? false, sqlite , withPam ? false, pam , withZlib ? true, zlib -, withRiak ? false -, withElixir ? false, elixir , withIconv ? true , withTools ? false , withRedis ? false @@ -24,12 +22,12 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils util-linux procps ]; in stdenv.mkDerivation rec { - version = "20.12"; + version = "21.04"; pname = "ejabberd"; src = fetchurl { url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/${pname}-${version}.tgz"; - sha256 = "sha256-nZxdYXRyv4UejPLHNT/p6CrvW22Koo7rZSi96KRjqFQ="; + sha256 = "09s8mj0dkvp9mxazsqxqqmnl5n2xyi8avx0rzgvqrbl3byanzfzr"; }; nativeBuildInputs = [ fakegit makeWrapper ]; @@ -38,11 +36,7 @@ in stdenv.mkDerivation rec { ++ lib.optional withSqlite sqlite ++ lib.optional withPam pam ++ lib.optional withZlib zlib - ++ lib.optional withElixir elixir - ; - - # Apparently needed for Elixir - LANG = "en_US.UTF-8"; + ; deps = stdenv.mkDerivation { pname = "ejabberd-deps"; @@ -52,7 +46,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ]; - nativeBuildInputs = [ git erlang openssl expat libyaml sqlite pam zlib elixir ]; + nativeBuildInputs = [ git erlang openssl expat libyaml sqlite pam zlib ]; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; @@ -76,7 +70,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-0/hBgA+9rsDOBcvbROSpc5Xnw4JkYpuLCl2V+lJnieY="; + outputHash = "1mvixgb46ss35abjwz3lw38c69bii1xyj557a92bvrxc1gc6gx31"; }; configureFlags = @@ -85,8 +79,6 @@ in stdenv.mkDerivation rec { (lib.enableFeature withSqlite "sqlite") (lib.enableFeature withPam "pam") (lib.enableFeature withZlib "zlib") - (lib.enableFeature withRiak "riak") - (lib.enableFeature withElixir "elixir") (lib.enableFeature withIconv "iconv") (lib.enableFeature withTools "tools") (lib.enableFeature withRedis "redis") @@ -97,7 +89,7 @@ in stdenv.mkDerivation rec { preBuild = '' cp -r $deps deps chmod -R +w deps - patchShebangs deps + patchShebangs . ''; postInstall = '' @@ -108,6 +100,7 @@ in stdenv.mkDerivation rec { -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \ $out/sbin/ejabberdctl wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libpng libjpeg libwebp ]}" + rm $out/bin/{mix,iex,elixir} ''; meta = with lib; { @@ -116,6 +109,5 @@ in stdenv.mkDerivation rec { homepage = "https://www.ejabberd.im"; platforms = platforms.linux; maintainers = with maintainers; [ sander abbradar ]; - broken = withElixir; }; } diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 654476bd5ae0..1f6c7b70dc71 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, readline }: +{ stdenv, lib, fetchurl, withReadline ? true, readline }: stdenv.mkDerivation rec { pname = "oil"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { mkdir -p $out/bin ''; - buildInputs = [ readline ]; - configureFlags = [ "--with-readline" ]; + buildInputs = lib.optional withReadline readline; + configureFlags = lib.optional withReadline "--with-readline"; # Stripping breaks the bundles by removing the zip file from the end. dontStrip = true; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index d5e8897af9b8..e0c0f061ecb9 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,18 +21,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "1p8iv2axb5i8xnzm58dmmahxfwplj4r115mz63cl5q0iyy12npbh"; + sha256 = "0viiwimnk26jfi4ypkvclqqxw8anlmch10zscjw69d8x1pyqczcd"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "0zcf9zabdg2r7d9vafxn4wf0j09im5lhycylf91g734zzh6vc267"; + sha256 = "11113l8pyhq6vbsh79m5anh6ljss94zhnp33ghds9rn1gxa83hnb"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "345.0.0"; + version = "347.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/tools/backup/discordchatexporter-cli/default.nix new file mode 100644 index 000000000000..76b7d1da59b4 --- /dev/null +++ b/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -0,0 +1,87 @@ +{ lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper, autoPatchelfHook +, dotnet-sdk_5, dotnetPackages, dotnetCorePackages, cacert +}: + +let + projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; +in +stdenv.mkDerivation rec { + pname = "discordchatexporter-cli"; + version = "2.28"; + + src = fetchFromGitHub { + owner = "tyrrrz"; + repo = "discordchatexporter"; + rev = version; + sha256 = "1bcq8mwjr8635g8mkgbxnszk20hnwf0zk672glrxjqga6f6fnykg"; + }; + + nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc.lib ]; + + nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix { + fetchNuGet = { name, version, sha256 }: fetchurl { + name = "nuget-${name}-${version}.nupkg"; + url = "https://www.nuget.org/api/v2/package/${name}/${version}"; + inherit sha256; + }; + }); + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + export DOTNET_NOLOGO=1 + + nuget sources Add -Name nixos -Source "$PWD/nixos" + nuget init "$nugetDeps" "$PWD/nixos" + + # FIXME: https://github.com/NuGet/Home/issues/4413 + mkdir -p $HOME/.nuget/NuGet + cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet + + dotnet restore --source "$PWD/nixos" ${projectFile} + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + dotnet build ${projectFile} \ + --no-restore \ + --configuration Release \ + -p:Version=${version} + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + dotnet publish ${projectFile} \ + --no-build \ + --configuration Release \ + --no-self-contained \ + --output $out/lib/${pname} + shopt -s extglob + + makeWrapper $out/lib/${pname}/DiscordChatExporter.Cli $out/bin/discordchatexporter-cli \ + --set DOTNET_ROOT "${dotnetCorePackages.sdk_3_1}" + + runHook postInstall + ''; + + # Strip breaks the executable. + dontStrip = true; + + meta = with lib; { + description = "A tool to export Discord chat logs to a file"; + homepage = "https://github.com/Tyrrrz/DiscordChatExporter"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.ivar ]; + platforms = [ "x86_64-linux" ]; + }; + passthru.updateScript = ./updater.sh; +} diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix new file mode 100644 index 000000000000..a7703f2ba2c1 --- /dev/null +++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -0,0 +1,67 @@ +{ fetchNuGet }: [ + (fetchNuGet { + name = "CliFx"; + version = "2.0.4"; + sha256 = "1wwpjli4y2545yi6k17mvjqy994wl3wm6nngszk87rbdwhkbncaj"; + }) + (fetchNuGet { + name = "Gress"; + version = "1.2.0"; + sha256 = "0aidc9whi0718gh896j7xkyndki9x7rifd8n1n681afb2zbxw4bn"; + }) + (fetchNuGet { + name = "JsonExtensions"; + version = "1.1.0"; + sha256 = "1fqxb2jdbvjgg135wmy890qf63r056dq16jy7wgzkgp21m3j0lgy"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.App.Ref"; + version = "3.1.10"; + sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.App.Host.linux-x64"; + version = "3.1.14"; + sha256 = "11rqnascx9asfyxgxzwgxgr9gxxndm552k4dn4p1s57ciz7vkg9h"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.App.Ref"; + version = "3.1.0"; + sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; + }) + (fetchNuGet { + name = "MiniRazor.CodeGen"; + version = "2.1.2"; + sha256 = "0mg4zy4zq0ccrc9wchy796ln1znkmn3k1aax0kd2gha4fwa1d1fb"; + }) + (fetchNuGet { + name = "MiniRazor.Runtime"; + version = "2.1.2"; + sha256 = "1a6cm7j1f5n1bfzhg8w60xwa7cps2i82418k57dm2hgqla6p3rsp"; + }) + (fetchNuGet { + name = "Polly"; + version = "7.2.2"; + sha256 = "0s15n5zwj44i6sw3v40ca8l6j0ijydxcakvad49j52rp49iwrmkn"; + }) + (fetchNuGet { + name = "Spectre.Console"; + version = "0.40.0"; + sha256 = "17bb31nsvfk7m337zwqcz4v6cvayhfx51ri4yrv5i8nbp7f4rpb1"; + }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.0"; + sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; + }) + (fetchNuGet { + name = "Tyrrrz.Extensions"; + version = "1.6.5"; + sha256 = "1yzsii1pbp6b066wxwwws310p7h809apl81bhb8ad55hqlzy1rg3"; + }) + (fetchNuGet { + name = "Wcwidth"; + version = "0.2.0"; + sha256 = "0p7zaisix9ql4v5nyl9gfc93xcyj74j01rwvgm7jw29js3wlj10s"; + }) +] diff --git a/pkgs/tools/backup/discordchatexporter-cli/updater.sh b/pkgs/tools/backup/discordchatexporter-cli/updater.sh new file mode 100755 index 000000000000..ff5c44a19bcd --- /dev/null +++ b/pkgs/tools/backup/discordchatexporter-cli/updater.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_5 +set -eo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +deps_file="$(realpath "./deps.nix")" + +new_version="$(curl -s "https://api.github.com/repos/tyrrrz/DiscordChatExporter/releases?per_page=1" | jq -r '.[0].name')" +old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" +if [[ "$new_version" == "$old_version" ]]; then + echo "Up to date" + exit 0 +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 + +echo "{ fetchNuGet }: [" >"$deps_file" +while read pkg_spec; do + { read pkg_name; read pkg_version; } < <( + # Build version part should be ignored: `3.0.0-beta2.20059.3+77df2220` -> `3.0.0-beta2.20059.3` + sed -nE 's/.*<id>([^<]*).*/\1/p; s/.*<version>([^<+]*).*/\1/p' "$pkg_spec") + pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)" + cat >>"$deps_file" <<EOF + (fetchNuGet { + name = "$pkg_name"; + version = "$pkg_version"; + sha256 = "$pkg_sha256"; + }) +EOF +done < <(find ./nuget_tmp.packages -name '*.nuspec' | sort) +echo "]" >>"$deps_file" + +popd +rm -r "$src" diff --git a/pkgs/tools/backup/rotate-backups/default.nix b/pkgs/tools/backup/rotate-backups/default.nix index c0a06e1b9ae5..405fc6c3955d 100644 --- a/pkgs/tools/backup/rotate-backups/default.nix +++ b/pkgs/tools/backup/rotate-backups/default.nix @@ -1,17 +1,33 @@ -{ lib, buildPythonPackage, fetchFromGitHub, update-dotdee, simpleeval, dateutil }: +{ lib +, python3 +, fetchFromGitHub +}: -buildPythonPackage rec { +python3.pkgs.buildPythonApplication rec { pname = "rotate-backups"; - version = "6.0"; + version = "8.1"; src = fetchFromGitHub { owner = "xolox"; repo = "python-rotate-backups"; rev = version; - sha256 = "0i59qfv1cfm0ss63ab2nrkn5wr4rxpqqmvfd7pf9c3pl9dbfq20c"; + sha256 = "0r4dyd7hj403rksgp3vh1azp9n4af75r3wq3x39wxcqizpms3vkx"; }; - propagatedBuildInputs = [ update-dotdee simpleeval dateutil ]; + propagatedBuildInputs = with python3.pkgs; [ + python-dateutil + simpleeval + update-dotdee + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + disabledTests = [ + # https://github.com/xolox/python-rotate-backups/issues/33 + "test_removal_command" + ]; meta = with lib; { description = "Simple command line interface for backup rotation"; @@ -20,4 +36,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ eyjhb ]; }; } - diff --git a/pkgs/tools/cd-dvd/isomd5sum/default.nix b/pkgs/tools/cd-dvd/isomd5sum/default.nix index 2ca14cc4d603..9cb033e15d13 100644 --- a/pkgs/tools/cd-dvd/isomd5sum/default.nix +++ b/pkgs/tools/cd-dvd/isomd5sum/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { sha256 = "1wjnh2hlp1hjjm4a8wzdhdrm73jq41lmpmy3ls0rh715p3j7z4q9"; }; - buildInputs = [ python3 popt ] ; + strictDeps = true; + nativeBuildInputs = [ python3 ]; + buildInputs = [ popt ] ; postPatch = '' substituteInPlace Makefile --replace "#/usr/" "#" diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index a25bf744a91a..72de0295c714 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -38,7 +38,7 @@ # Linux Only Dependencies , linuxHeaders, util-linux, libuuid, udev, keyutils, rdma-core, rabbitmq-c -, libaio ? null, libxfs ? null, zfs ? null +, libaio ? null, libxfs ? null, zfs ? null, liburing ? null , ... }: @@ -130,6 +130,8 @@ let ps.Mako ceph-common ps.cherrypy + ps.cmd2 + ps.colorama ps.dateutil ps.jsonpatch ps.pecan @@ -176,7 +178,7 @@ in rec { snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka cryptsetup sqlite lua icu bzip2 ] ++ lib.optionals stdenv.isLinux [ - linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs + linuxHeaders util-linux libuuid udev keyutils liburing optLibaio optLibxfs optZfs # ceph 14 rdma-core rabbitmq-c ] ++ lib.optionals hasRadosgw [ @@ -207,11 +209,12 @@ in rec { "-DMGR_PYTHON_VERSION=${ceph-python-env.python.pythonVersion}" "-DWITH_SYSTEMD=OFF" "-DWITH_TESTS=OFF" + "-DWITH_CEPHFS_SHELL=ON" # TODO breaks with sandbox, tries to download stuff with npm "-DWITH_MGR_DASHBOARD_FRONTEND=OFF" # WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now ''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}'' - ]; + ] ++ lib.optional stdenv.isLinux "-DWITH_SYSTEM_LIBURING=ON"; postFixup = '' wrapPythonPrograms diff --git a/pkgs/tools/graphics/adriconf/default.nix b/pkgs/tools/graphics/adriconf/default.nix new file mode 100644 index 000000000000..74ff4f1ed666 --- /dev/null +++ b/pkgs/tools/graphics/adriconf/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, fetchFromGitLab +, cmake +, pkg-config +, libdrm +, libGL +, atkmm +, pcre +, gtkmm3 +, boost +, libxmlxx3 +, mesa +, pciutils +}: + +stdenv.mkDerivation rec { + pname = "adriconf"; + version = "2.4.1"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mesa"; + repo = pname; + rev = "v${version}"; + sha256 = "hZy+FpKKBKuho/fALu2O+44zzK6s/M8CTbhrO00ANgo="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libdrm libGL atkmm pcre gtkmm3 boost libxmlxx3 mesa pciutils ]; + + cmakeFlags = [ "-DENABLE_UNIT_TESTS=off" ]; + + meta = with lib; { + homepage = "https://gitlab.freedesktop.org/mesa/adriconf/"; + description = "A GUI tool used to configure open source graphics drivers"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ musfay ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/ploticus/builder.sh b/pkgs/tools/graphics/ploticus/builder.sh deleted file mode 100644 index 2fb16b259bdc..000000000000 --- a/pkgs/tools/graphics/ploticus/builder.sh +++ /dev/null @@ -1,33 +0,0 @@ -source $stdenv/setup - -preBuild() { - cd src -} - -preInstall() { - mkdir -p $out/bin -} - -postInstall() { - # Install the "prefabs". - mkdir -p $out/share/ploticus/prefabs && \ - cd .. && \ - cp -rv prefabs/* $out/share/ploticus/prefabs - - # Create a wrapper that knows where to find them. Debian's package - # does something similar by patching directly the C file that looks - # for `$PLOTICUS_PREFABS'. - cat > $out/bin/ploticus <<EOF -#! $SHELL -e -PLOTICUS_PREFABS="$out/share/ploticus/prefabs" -export PLOTICUS_PREFABS -exec "$out/bin/pl" \$@ -EOF - chmod +x $out/bin/ploticus - - # Install the man pages. - cp -rv man $out - ln -s "$out/man/man1/pl.1" "$out/man/man1/ploticus.1" -} - -genericBuild diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix index 23d6919f78e0..50b7aad48a04 100644 --- a/pkgs/tools/graphics/ploticus/default.nix +++ b/pkgs/tools/graphics/ploticus/default.nix @@ -1,34 +1,74 @@ -{lib, stdenv, fetchurl, zlib, libX11, libpng}: +{ lib +, stdenv +, fetchurl +, zlib +, libX11 +, libpng +, gd +, freetype +}: -stdenv.mkDerivation { - name = "ploticus-2.42"; +stdenv.mkDerivation rec { + pname = "ploticus"; + version = "2.42"; - builder = ./builder.sh; src = fetchurl { - url = "mirror://sourceforge/ploticus/ploticus/2.41/pl241src.tar.gz"; - sha256 = "1065r0nizjixi9sxxfxrnwg10r458i6fgsd23nrxa200rypvdk7c"; + url = "mirror://sourceforge/ploticus/ploticus/${version}/ploticus${lib.replaceStrings [ "." ] [ "" ] version}_src.tar.gz"; + sha256 = "PynkufQFIDqT7+yQDlgW2eG0OBghiB4kHAjKt91m4LA="; }; - buildInputs = [ zlib libX11 libpng ]; + patches = [ + # Replace hardcoded FHS path with $out. + ./ploticus-install.patch + + # Set the location of the PREFABS directory. + ./set-prefabs-dir.patch + + # Use gd from Nixpkgs instead of the vendored one. + # This is required for non-ASCII fonts to work: + # http://ploticus.sourceforge.net/doc/fonts.html + ./use-gd-package.patch + ]; + + buildInputs = [ + zlib + libX11 + libpng + gd + freetype + ]; hardeningDisable = [ "format" ]; - patches = [ ./ploticus-install.patch ]; + preBuild = '' + cd src + ''; + + preInstall = '' + mkdir -p "$out/bin" + ''; + + postInstall = '' + cd .. + + # Install the “prefabs”. + mkdir -p "$out/share/ploticus/prefabs" + cp -rv prefabs/* "$out/share/ploticus/prefabs" - # Make the symlink relative instead of absolute. - # Otherwise it breaks when auto-moved to $out/share. - preFixup = '' - ln -sf pl.1 "$out"/man/man1/ploticus.1 + # Add aliases for backwards compatibility. + ln -s "pl" "$out/bin/ploticus" ''; meta = with lib; { description = "A non-interactive software package for producing plots and charts"; - longDescription = ''Ploticus is a free, GPL'd, non-interactive + longDescription = '' + Ploticus is a free, GPL'd, non-interactive software package for producing plots, charts, and graphics from data. Ploticus is good for automated or just-in-time graph generation, handles date and time data nicely, and has basic statistical capabilities. It allows significant user control - over colors, styles, options and details.''; + over colors, styles, options and details. + ''; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; homepage = "http://ploticus.sourceforge.net/"; diff --git a/pkgs/tools/graphics/ploticus/set-prefabs-dir.patch b/pkgs/tools/graphics/ploticus/set-prefabs-dir.patch new file mode 100644 index 000000000000..82871654fdea --- /dev/null +++ b/pkgs/tools/graphics/ploticus/set-prefabs-dir.patch @@ -0,0 +1,11 @@ +--- a/src/pl.h ++++ b/src/pl.h +@@ -8,7 +8,7 @@ + #include <stdlib.h> + #include "plg.h" + +-#define PREFABS_DIR "" /* INSTALLERS can set this to a valid pathname, so that users don't need to set PLOTICUS_PREFABS env var */ ++#define PREFABS_DIR "@out@/share/ploticus/prefabs" /* INSTALLERS can set this to a valid pathname, so that users don't need to set PLOTICUS_PREFABS env var */ + + #define PLVERSION "2.42-May2013" /* see also the Copyright page, and page headers and footers */ + diff --git a/pkgs/tools/graphics/ploticus/use-gd-package.patch b/pkgs/tools/graphics/ploticus/use-gd-package.patch new file mode 100644 index 000000000000..9a72489ddaad --- /dev/null +++ b/pkgs/tools/graphics/ploticus/use-gd-package.patch @@ -0,0 +1,34 @@ +--- a/src/Makefile ++++ b/src/Makefile +@@ -91,10 +91,10 @@ + + + ########### Option 1: use bundled GD16 (PNG only). Requires libpng and zlib. +-exetarget: plpng +-GD16LIBS = -lpng -lz +-GD16H = -I/usr/local/include +-ZFLAG = -DWZ ++# exetarget: plpng ++# GD16LIBS = -lpng -lz ++# GD16H = -I/usr/local/include ++# ZFLAG = -DWZ + ### These should remain commented unless your libs are not in usual places, then alter to suit... + ### GD16LIBS = /home/scg/lib/libpng.a /home/scg/lib/libz.a + ### GD16H = -I/home/scg/lib +@@ -111,11 +111,11 @@ + + ########### Option 4: use your own GD resource with FreeType2 (ttf) fonts enabled. + ########### Requires GD 1.84+, libpng, zlib, libjpeg and libfreetype +-# exetarget: plgd18 +-# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype +-# GD18H = +-# GDFREETYPE = -DGDFREETYPE +-# ZFLAG = -DWZ ++exetarget: plgd18 ++GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype ++GD18H = ++GDFREETYPE = -DGDFREETYPE ++ZFLAG = -DWZ + + ########### Option 5: don't use GD at all. + # exetarget: plnogd diff --git a/pkgs/tools/misc/beats/default.nix b/pkgs/tools/misc/beats/default.nix index 1e6f155f3506..3e471c76fdfe 100644 --- a/pkgs/tools/misc/beats/default.nix +++ b/pkgs/tools/misc/beats/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "beats"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "j0hax"; repo = "beats"; rev = "v${version}"; - sha256 = "0qs5cmbncqhs11m4whqmrh2gvv3p3b37qz57xh78x2ma8jbhskqz"; + sha256 = "1rdvsqrjpily74y8vwch711401585xckb4p41cfwrmj6vf44jhif"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 4d69f237a08c..81e2061b4cc1 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.0.15"; + version = "2.0.16"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-PUcsDyszFT4DzTwvbcCO8FQErvmotmY7gREZ2sgpcw8="; + sha256 = "sha256-0m5ya3S/aqQr0n6MdfWfTo0Q7xTS5qY+iDhexwDGdWo="; }; - vendorSha256 = "sha256-7SfqBxCfOYwePK/6SsWS5StuVr0png6WjQXIDuQW0EE="; + vendorSha256 = "sha256-k2dw8WfOxK+VpnJonm/GXm49rUdIXSA81RO0g+8ocBs="; doCheck = false; diff --git a/pkgs/tools/misc/complete-alias/default.nix b/pkgs/tools/misc/complete-alias/default.nix new file mode 100644 index 000000000000..721e99427bb6 --- /dev/null +++ b/pkgs/tools/misc/complete-alias/default.nix @@ -0,0 +1,43 @@ +{ lib +, fetchFromGitHub +, stdenvNoCC +}: + +stdenvNoCC.mkDerivation rec { + pname = "complete-alias"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "cykerway"; + repo = pname; + rev = version; + sha256 = "1s0prdnmb2qnzc8d7ddldzqa53yc10qq0lbgx2l9dzmz8pdwylyc"; + }; + + buildPhase = '' + runHook preBuild + + # required for the patchShebangs setup hook + chmod +x complete_alias + + patchShebangs complete_alias + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r complete_alias "$out"/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "Automagical shell alias completion"; + homepage = "https://github.com/cykerway/complete-alias"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ tuxinaut ]; + }; +} diff --git a/pkgs/tools/misc/cpufetch/default.nix b/pkgs/tools/misc/cpufetch/default.nix index 37a6dfdc9dd5..4473738ac76c 100644 --- a/pkgs/tools/misc/cpufetch/default.nix +++ b/pkgs/tools/misc/cpufetch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cpufetch"; - version = "0.94"; + version = "0.98"; src = fetchFromGitHub { owner = "Dr-Noob"; repo = "cpufetch"; rev = "v${version}"; - sha256 = "1gncgkhqd8bnz254qa30yyl10qm28dwx6aif0dwrj38z5ql40ck9"; + sha256 = "060hmkwmb5ybcrj9jfx9681zk92489kq71nl6nacn8nfqrcn3qdb"; }; nativeBuildInputs = [ installShellFiles ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir $out install -Dm755 cpufetch $out/bin/cpufetch install -Dm644 LICENSE $out/share/licenses/cpufetch/LICENSE - installManPage cpufetch.8 + installManPage cpufetch.1 runHook postInstall ''; diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 20288bf3f5e7..d097beca9114 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.13.1"; + version = "2.14.1"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-6xSRsLM1DD1xMjOGzHMDVLibrJlu9lN9OoSV7B/WMT0="; + sha256 = "sha256-46azJ7q0Ix/8wdg01hYQ2V2E4tBD/NDdHpexnFBD5so="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-udz1EtPchEHxkvvVFnkwSOpFz4XEBGOXRz8qWREyzvc="; + cargoSha256 = "sha256-hCf6Ih2bJrMX2ntWbIrX3Dk8wI5tio+OcN4WNWuU7j4="; doCheck = false; diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 07a2d02b0b2a..e4e4868e4d9f 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = "http://www.flashrom.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; license = licenses.gpl2; - maintainers = with maintainers; [ funfunctor fpletz ]; + maintainers = with maintainers; [ funfunctor fpletz felixsinger ]; platforms = platforms.all; broken = stdenv.isDarwin; # requires DirectHW }; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 6f0c90517da4..051e61e7af81 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, ncurses, gettext, openssl, withGeolocation ? true, libmaxminddb }: stdenv.mkDerivation rec { - version = "1.5"; + version = "1.5.1"; pname = "goaccess"; src = fetchurl { url = "https://tar.goaccess.io/goaccess-${version}.tar.gz"; - sha256 = "sha256-liJtXfiXAyg+NBCcF+G07v4kBKWefHaitu76EPOqwWE="; + sha256 = "sha256-iEF+eOYrcN45gLdiKRHk/NcZw2YPADyIeWjnGWw5lw8="; }; configureFlags = [ diff --git a/pkgs/tools/misc/qmk/default.nix b/pkgs/tools/misc/qmk/default.nix index 40e5d4d23aea..3fa088d8e2b4 100644 --- a/pkgs/tools/misc/qmk/default.nix +++ b/pkgs/tools/misc/qmk/default.nix @@ -3,38 +3,59 @@ , fetchpatch }: -python3.pkgs.buildPythonApplication rec { +let + inherit (python3.pkgs) buildPythonApplication fetchPypi; +in +buildPythonApplication rec { pname = "qmk"; - version = "0.0.45"; + version = "0.0.52"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; - sha256 = "43f297f36b21d68c34c5efa0ce1449dddb2e28753f80939cadf761ee7a2a0901"; + sha256 = "sha256-mNF+bRhaL6JhNbROmjYDHkKKokRIALd5FZbRt9Kg5XQ="; }; - patches = [ - # https://github.com/qmk/qmk_cli/pull/48 - (fetchpatch { - name = "remove-unused-install-requires.patch"; - url = "https://github.com/qmk/qmk_cli/commit/75b6ada1feccfa5a9bc2bb07a4cc749ef40d02dd.patch"; - sha256 = "0lwi1dz35p07vha5gwq2jxm5q49vm99ix4jyhd6g6ypqbq1qiwc8"; - }) - ]; - nativeBuildInputs = with python3.pkgs; [ + flake8 + nose2 + pep8-naming setuptools-scm + yapf ]; propagatedBuildInputs = with python3.pkgs; [ + appdirs + argcomplete + colorama + dotty-dict + hid + hjson + jsonschema milc + pygments + pyusb ]; # no tests implemented doCheck = false; meta = with lib; { - description = "A program to help users work with QMK Firmware"; homepage = "https://github.com/qmk/qmk_cli"; + description = "A program to help users work with QMK Firmware"; + longDescription = '' + qmk_cli is a companion tool to QMK firmware. With it, you can: + + - Interact with your qmk_firmware tree from any location + - Use qmk clone to pull down anyone's qmk_firmware fork + - Setup and work with your build environment: + - qmk setup + - qmk doctor + - qmk compile + - qmk console + - qmk flash + - qmk lint + - ... and many more! + ''; license = licenses.mit; maintainers = with maintainers; [ bhipple ]; }; diff --git a/pkgs/tools/misc/yajsv/default.nix b/pkgs/tools/misc/yajsv/default.nix new file mode 100644 index 000000000000..6e5f20bfbd2b --- /dev/null +++ b/pkgs/tools/misc/yajsv/default.nix @@ -0,0 +1,28 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +let version = "1.4.0"; +in buildGoModule { + pname = "yajsv"; + version = version; + + src = fetchFromGitHub { + owner = "neilpa"; + repo = "yajsv"; + rev = "v${version}"; + sha256 = "0smaij3905fqgcjmnfs58r6silhp3hyv7ccshk7n13fmllmsm7v7"; + }; + + vendorSha256 = "0rmc31i5jra2qcqhw1azflmhawxasrq0d6qwd6qp250sj1jr6ahq"; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/yajsv -v > /dev/null + ''; + + meta = { + description = "Yet Another JSON Schema Validator"; + homepage = "https://github.com/neilpa/yajsv"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rycee ]; + }; +} diff --git a/pkgs/tools/networking/arping/default.nix b/pkgs/tools/networking/arping/default.nix index 4a5cae9bd3c4..54ea08ceaef5 100644 --- a/pkgs/tools/networking/arping/default.nix +++ b/pkgs/tools/networking/arping/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, libnet, libpcap }: stdenv.mkDerivation rec { - version = "2.21"; + version = "2.22"; pname = "arping"; buildInputs = [ libnet libpcap ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "ThomasHabets"; repo = pname; rev = "${pname}-${version}"; - sha256 = "1i7rjn863bnq51ahbvypm1bkzhyshlm5b32yzdd9iaqyz7sa7pa7"; + sha256 = "sha256-yFSLhhyz6i7xyJR8Ax8FnHFGNe/HE40YirkkeefBqC4="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 093863f21c15..c28e94a8218c 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.38.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dltCZ6g5Ta/M2N95TRkdLRr3T0YeKdkY88zE306AtDg="; + sha256 = "sha256-H0K38SX/mKsVjdQEa6vzx5TNRhqqomYk28+5Wl5H0sA="; }; vendorSha256 = null; diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index fe8f743c71cc..beb04041861e 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.9.15"; + version = "0.9.17"; src = fetchFromGitHub { owner = "kbknapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Cd0QWFeAAHSkeCVQvb+Fsg5nBoutV1k1kQpMkWpci2E="; + sha256 = "sha256-Ian/vXGoPHecguQUp2IUgdLW6Ll8OdCA2W0WmoYPDrI="; }; - cargoSha256 = "sha256-VngJMDVKIV8+ODHia2U2gKKPKskyKiuKhSnO6NJsJHI="; + cargoSha256 = "sha256-eDu1dAs543AryUEsCY9COHrvuamQocCk0nBXDIdFmYs="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/package-management/fpm/Gemfile.lock b/pkgs/tools/package-management/fpm/Gemfile.lock index c8bb7d364132..b3e8b9d221a5 100644 --- a/pkgs/tools/package-management/fpm/Gemfile.lock +++ b/pkgs/tools/package-management/fpm/Gemfile.lock @@ -1,40 +1,36 @@ GEM remote: https://rubygems.org/ specs: - arr-pm (0.0.10) + arr-pm (0.0.11) cabin (> 0) - backports (3.14.0) + backports (3.21.0) cabin (0.9.0) - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) clamp (1.0.1) - dotenv (2.7.2) - ffi (1.10.0) - fpm (1.11.0) - arr-pm (~> 0.0.10) + dotenv (2.7.6) + fpm (1.13.0) + arr-pm (~> 0.0.11) backports (>= 2.6.2) cabin (>= 0.6.0) - childprocess (= 0.9.0) clamp (~> 1.0.0) - ffi - json (>= 1.7.7, < 2.0) + git (>= 1.3.0, < 2.0) + json (>= 1.7.7, < 3.0) pleaserun (~> 0.0.29) - ruby-xz (~> 0.2.3) + rexml stud + git (1.8.1) + rchardet (~> 1.8) insist (1.0.0) - io-like (0.3.0) - json (1.8.6) + json (2.5.1) mustache (0.99.8) - pleaserun (0.0.30) + pleaserun (0.0.32) cabin (> 0) clamp dotenv insist mustache (= 0.99.8) stud - ruby-xz (0.2.3) - ffi (~> 1.9) - io-like (~> 0.3) + rchardet (1.8.0) + rexml (3.2.5) stud (0.0.23) PLATFORMS diff --git a/pkgs/tools/package-management/fpm/gemset.nix b/pkgs/tools/package-management/fpm/gemset.nix index 654a640c6ec2..dca13598e8cc 100644 --- a/pkgs/tools/package-management/fpm/gemset.nix +++ b/pkgs/tools/package-management/fpm/gemset.nix @@ -5,20 +5,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07yx1g1nh4zdy38i2id1xyp42fvj4vl6i196jn7szvjfm0jx98hg"; + sha256 = "17qssricshzs2ml1jvn4bs2h85gxvrqm074pl5nl8vr74620iazi"; type = "gem"; }; - version = "0.0.10"; + version = "0.0.11"; }; backports = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17j5pf0b69bkn043wi4xd530ky53jbbnljr4bsjzlm4k8bzlknfn"; + sha256 = "0xqvwj3mm28g1z4npya51zjcvxaniyyzn3fwgcdwmm8xrdbl8fgr"; type = "gem"; }; - version = "3.14.0"; + version = "3.21.0"; }; cabin = { groups = ["default"]; @@ -30,17 +30,6 @@ }; version = "0.9.0"; }; - childprocess = { - dependencies = ["ffi"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p"; - type = "gem"; - }; - version = "0.9.0"; - }; clamp = { groups = ["default"]; platforms = []; @@ -56,31 +45,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13cis6bf06hmz744xrsl163p6gb78xcm8g8q4pcabsy5ywyv6kag"; + sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94"; type = "gem"; }; - version = "2.7.2"; + version = "2.7.6"; }; - ffi = { + fpm = { + dependencies = ["arr-pm" "backports" "cabin" "clamp" "git" "json" "pleaserun" "rexml" "stud"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + sha256 = "03ss7yh628f0m6by23q3sniq660gm07mkz6wqjpvr118gc0h53sa"; type = "gem"; }; - version = "1.10.0"; + version = "1.13.0"; }; - fpm = { - dependencies = ["arr-pm" "backports" "cabin" "childprocess" "clamp" "ffi" "json" "pleaserun" "ruby-xz" "stud"]; + git = { + dependencies = ["rchardet"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0khzsiqzswxpql6w2ws9dawb27zgv4nmgrjszydmm0xpv6h21jrm"; + sha256 = "0vdcv93s33d9914a9nxrn2y2qv15xk7jx94007cmalp159l08cnl"; type = "gem"; }; - version = "1.11.0"; + version = "1.8.1"; }; insist = { groups = ["default"]; @@ -92,57 +82,56 @@ }; version = "1.0.0"; }; - io-like = { + json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04nn0s2wmgxij3k760h3r8m1dgih5dmd9h4v1nn085yi824i5z6k"; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; type = "gem"; }; - version = "0.3.0"; + version = "2.5.1"; }; - json = { + mustache = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; + sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2"; type = "gem"; }; - version = "1.8.6"; + version = "0.99.8"; }; - mustache = { + pleaserun = { + dependencies = ["cabin" "clamp" "dotenv" "insist" "mustache" "stud"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2"; + sha256 = "1aykf0l8327bqkkf5xd9jcglsib973zpy37cfnlf4j0vp0cdpn2d"; type = "gem"; }; - version = "0.99.8"; + version = "0.0.32"; }; - pleaserun = { - dependencies = ["cabin" "clamp" "dotenv" "insist" "mustache" "stud"]; + rchardet = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hgnrl67zkqaxmfkwbyscawj4wqjm7h8khpbj58s6iw54wp3408p"; + sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9"; type = "gem"; }; - version = "0.0.30"; + version = "1.8.0"; }; - ruby-xz = { - dependencies = ["ffi" "io-like"]; + rexml = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11bgpvvk0098ghvlxr4i713jmi2izychalgikwvdwmpb452r3ndw"; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; type = "gem"; }; - version = "0.2.3"; + version = "3.2.5"; }; stud = { groups = ["default"]; diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/tools/security/dnsx/default.nix index 33f40ce59d48..75c85deb1cce 100644 --- a/pkgs/tools/security/dnsx/default.nix +++ b/pkgs/tools/security/dnsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dnsx"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "dnsx"; rev = "v${version}"; - sha256 = "sha256-dfjchsmGqyWLxO2sP+TlBEeKz9Fd4bHWG2r4FJPGNMs="; + sha256 = "sha256-w+FQp5pvySM36UHFxBH5WRZvnGi43NZeI2tLr6HAF3Q="; }; - vendorSha256 = "sha256-KJyWb+coWSdvZGwDw/JSLtPeynndnaevwyYIzyEH4Kc="; + vendorSha256 = "sha256-gsoeAau3klOFTu+ZEYEMdIuXw/5IVsfFJ2maxPaZKjA="; meta = with lib; { description = "Fast and multi-purpose DNS toolkit"; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index ded48ffb273a..bcc27c81f556 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-06-29"; + version = "2021-07-02"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-RF7+fo6I7rz7PTSHRDikeRpM0f4Bugn+Tt5Z7mjIKIM="; + sha256 = "sha256-p6D0FM52SF4fnWXa/zpewr+lNWC4hZWc0yAQYnioUdQ="; }; installPhase = '' diff --git a/pkgs/tools/security/flare-floss/default.nix b/pkgs/tools/security/flare-floss/default.nix index 954dd07d6ab8..fbf065dc3b15 100644 --- a/pkgs/tools/security/flare-floss/default.nix +++ b/pkgs/tools/security/flare-floss/default.nix @@ -1,8 +1,9 @@ { lib -, python2 +, python3 , fetchFromGitHub }: -python2.pkgs.buildPythonPackage rec { + +python3.pkgs.buildPythonPackage rec { pname = "flare-floss"; version = "1.7.0"; @@ -13,18 +14,17 @@ python2.pkgs.buildPythonPackage rec { sha256 = "GMOA1+qM2A/Qw33kOTIINEvjsfqjWQWBXHNemh3IK8w="; }; - propagatedBuildInputs = with python2.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ pyyaml simplejson tabulate vivisect plugnplay viv-utils - enum34 ]; - checkInputs = [ - python2.pkgs.pytestCheckHook + checkInputs = with python3.pkgs; [ + pytestCheckHook ]; disabledTests = [ diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index dea65ca7164c..358acf376b48 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.12.6"; + version = "1.12.7"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "17y9indpgqqx261bqvckfqq1q2zciahssaalaa5c5hb6bnw5ls52"; + sha256 = "08mzm03vhc8pqyl17y8dkrcpgy3ckmb84x84b6ap3cja3y8gmj5x"; }; - vendorSha256 = "106rn0bkvzf2fw21f6wpiya88ysj8sfc2zkkm47iqr23d2202i4b"; + vendorSha256 = "0ym6f1h51bj3qlzxs936fz3p47l63nad4xckl16m13iy0k7z5flg"; subPackages = [ "." ]; diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 613d93747ed1..7df1090b2b0c 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grype"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nHSnDrvz0EwDnmYch/bDJOZkf1b1Vrf1960d637ZmBs="; + sha256 = "sha256-fYeZFNtftG46/QHdV5UhCNCdP7ErOgwWfEB4V14ei5k="; }; - vendorSha256 = "sha256-+1XJTr/WJIz/gvvl9KNp68OVEkjHk+KunAd4trd2T/Y="; + vendorSha256 = "sha256-mW3e4WFa9pKSpyTZYmPA2j8nZz+94G2PqdqI0BDo3wc="; propagatedBuildInputs = [ docker ]; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index f1268717a917..ec240a7c7156 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "keybase"; - version = "5.6.1"; + version = "5.7.1"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/kbnm" "go/keybase" ]; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "12b0jdwhnvxb51x3pq0g0f23grv9yjbxmpsz36n8ab3j0fvmfg0g"; + sha256 = "sha256-72rVk8pYIQFESQqBu4bmFBPpAOB0oG2Iu36TbAdecBw="; }; patches = [ diff --git a/pkgs/tools/security/libtpms/default.nix b/pkgs/tools/security/libtpms/default.nix index 71ae5c969a0e..baca0ed8b771 100644 --- a/pkgs/tools/security/libtpms/default.nix +++ b/pkgs/tools/security/libtpms/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libtpms"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; rev = "v${version}"; - sha256 = "sha256-D6lYOVlgtBY6C07YqbG6TPnDKrUoEj82Ra6GK/HB7X8="; + sha256 = "sha256-9e7O9SE7e8D6ULXhICabNCrL+QTH55jQm0AI7DVteE0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 9f0af308cfb9..79f85f2b3750 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.49" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.51" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index ce054a6a480d..8248f6e8181b 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 2e07122e80d8ae23e6aa53ae0fcb9dfca6639c59 - ref: refs/tags/6.0.49 + revision: d9aeac3fea255c475f553be4c55f3ae7cefc8542 + ref: refs/tags/6.0.51 specs: - metasploit-framework (6.0.49) + metasploit-framework (6.0.51) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -55,6 +55,7 @@ GIT rb-readline recog redcarpet + reline (= 0.2.5) rex-arch rex-bin_tools rex-core @@ -125,13 +126,13 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.469.0) - aws-sdk-core (3.114.3) + aws-partitions (1.473.0) + aws-sdk-core (3.115.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.244.0) + aws-sdk-ec2 (1.246.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.55.0) @@ -155,7 +156,7 @@ GEM cookiejar (0.3.3) crass (1.0.6) daemons (1.4.0) - dnsruby (1.61.5) + dnsruby (1.61.7) simpleidn (~> 0.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) @@ -172,7 +173,7 @@ GEM eventmachine (1.2.7) faker (2.18.0) i18n (>= 1.6, < 2) - faraday (1.4.2) + faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -198,8 +199,8 @@ GEM i18n (1.8.10) concurrent-ruby (~> 1.0) io-console (0.5.9) - irb (1.3.5) - reline (>= 0.1.5) + irb (1.3.6) + reline (>= 0.2.5) jmespath (1.4.0) jsobfu (0.4.2) rkelly-remix @@ -344,7 +345,7 @@ GEM rex-socket rex-text rex-struct2 (0.1.3) - rex-text (0.2.34) + rex-text (0.2.35) rex-zip (0.1.4) rex-text rexml (3.2.5) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index b8ad99b91788..c48c5e1690ef 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.50"; + version = "6.0.51"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-ZtIpkUt3jIhe4st8JlxE0rvLe6P+QBGdjyTL13Avwj0="; + sha256 = "sha256-ICVF4GVOyCq7dUAvzUUzhG+NuEiHSFvVWbQ8tAqUFFg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 7f43161b5beb..b52bff8aa8bb 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -114,30 +114,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xh65jmz3s12kfi7ij0j89d638nzdvq4z6dq9amzgmiw09ycvdbr"; + sha256 = "1dw05k0l63lm631lwg5b1bx1nhkirds4rbc1v98bliwfjk5wf71a"; type = "gem"; }; - version = "1.469.0"; + version = "1.473.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10wk5y4flc04cc42cmcfgr9sj67mz4582d45xmll56mpz4cw5cfc"; + sha256 = "06cs5wj4njb2ivhv06v5d7rgy1i2g67a93c0kxly8h7fkkxh315q"; type = "gem"; }; - version = "3.114.3"; + version = "3.115.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnpxgcmacmqs98swlv3qkg7svpwydb1kqsngqciyg3jddzxrzp6"; + sha256 = "0n3m2a8jnk64ai4wb1wh1a77i8c561ncjklvp650w8723avbj5bq"; type = "gem"; }; - version = "1.244.0"; + version = "1.246.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -274,10 +274,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q7k7wn8flcdr0kzgknq40cjddd0zn3g3n4gwwwdz0kq30pinzxx"; + sha256 = "1pbhj4xmj4262in6c1nwl5ssw0qypg8ysjrrkwn2akkzbxzy9rfq"; type = "gem"; }; - version = "1.61.5"; + version = "1.61.7"; }; domain_name = { groups = ["default"]; @@ -354,10 +354,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07mhk70gv453pg38md346470hknyhipdqppnplq706ll3k3lzb7v"; + sha256 = "0zmdsl6n05khwwq8gjssmfca0ifz6q82wwghf1qyzbxxjdna5mly"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.3"; }; faraday-em_http = { groups = ["default"]; @@ -494,10 +494,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06i0izb1jm4ijydwk9w2jqyvz72aznaa1b386769yfi8284cnwj6"; + sha256 = "0s4yjh5p1n05cm3pglh3g4ssrgy67x2bn3bsl0sydbm8mlf3xivr"; type = "gem"; }; - version = "1.3.5"; + version = "1.3.6"; }; jmespath = { groups = ["default"]; @@ -574,12 +574,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "2e07122e80d8ae23e6aa53ae0fcb9dfca6639c59"; - sha256 = "0zxyr1r88qslw6ypjqxx188vhmikl94fmkcdg3phm8r71qa375da"; + rev = "d9aeac3fea255c475f553be4c55f3ae7cefc8542"; + sha256 = "0n0ljh5b8g5lb7amnj4792w8svw46d2wsbs0fnxjmj2fcph4a990"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.49"; + version = "6.0.51"; }; metasploit-model = { groups = ["default"]; @@ -1156,10 +1156,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01g6jr73c3hbqhmzlc80jlqz2cwn9bq1j3cc19fpkq3hdg89drjp"; + sha256 = "0idgw5z813h5dp82n07g5ldpyfnk7mhvnzl87d9fpy6invixnnbq"; type = "gem"; }; - version = "0.2.34"; + version = "0.2.35"; }; rex-zip = { groups = ["default"]; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 2e1e1ae2a67b..b3c98ac013e4 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.5.7"; + version = "0.4.6.6"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "0x7hhl0svfc4yh9xvq7kkzgmwjcw1ak9i0794wjg4biy2fmclzs4"; + sha256 = "04ifi18cj4cw5lhfzgfrrc42j7qqdmbvxq24xlhj0dsmljdih8rl"; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 45bd76b90917..89900ff313b4 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests }: +{ lib, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests +, makeWrapper +, gawk +, glibc +}: buildGoPackage rec { pname = "vault"; @@ -15,13 +19,16 @@ buildGoPackage rec { subPackages = [ "." ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; buildFlagsArray = [ "-tags=vault" "-ldflags=-s -w -X ${goPackagePath}/sdk/version.GitCommit=${src.rev}" ]; postInstall = '' echo "complete -C $out/bin/vault vault" > vault.bash installShellCompletion vault.bash + + wrapProgram $out/bin/vault \ + --prefix PATH ${lib.makeBinPath [ gawk glibc ]} ''; passthru.tests.vault = nixosTests.vault; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 11175c3c889f..6ae4845346aa 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc }: let version = "1.7.3"; @@ -30,7 +30,7 @@ in stdenv.mkDerivation { src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; sourceRoot = "."; @@ -41,6 +41,9 @@ in stdenv.mkDerivation { mv vault $out/bin echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault + wrapProgram $out/bin/vault \ + --prefix PATH ${lib.makeBinPath [ gawk glibc ]} + runHook postInstall ''; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 673d29d61aa1..25d0366ef715 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -42,6 +42,11 @@ in stdenv.mkDerivation rec { # required to prevent plugins from relying on /etc # and /var ./no-files-in-etc-and-var.patch + # The current IPC location is unsafe as it writes + # a fixed path in /tmp, which is world-writable. + # Therefore we put it into `/run/netdata`, which is owned + # by netdata only. + ./ipc-socket-in-run.patch ]; NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; diff --git a/pkgs/tools/system/netdata/ipc-socket-in-run.patch b/pkgs/tools/system/netdata/ipc-socket-in-run.patch new file mode 100644 index 000000000000..a117955af095 --- /dev/null +++ b/pkgs/tools/system/netdata/ipc-socket-in-run.patch @@ -0,0 +1,13 @@ +diff --git a/daemon/commands.h b/daemon/commands.h +index bd4aabfe1cbe4..ce7eb3c730228 100644 +--- a/daemon/commands.h ++++ b/daemon/commands.h +@@ -6,7 +6,7 @@ + #ifdef _WIN32 + # define PIPENAME "\\\\?\\pipe\\netdata-cli" + #else +-# define PIPENAME "/tmp/netdata-ipc" ++# define PIPENAME "/run/netdata/ipc" + #endif + + #define MAX_COMMAND_LENGTH 4096 diff --git a/pkgs/tools/text/chroma/default.nix b/pkgs/tools/text/chroma/default.nix index 6511d2dcdbb3..1b9cbcd3727a 100644 --- a/pkgs/tools/text/chroma/default.nix +++ b/pkgs/tools/text/chroma/default.nix @@ -1,30 +1,33 @@ -{ lib, buildGoModule, fetchFromGitHub, git }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "chroma"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "alecthomas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+4UaQrJh3PBf68rlW1lOEyEVw3vWxfc+Casa5+H8F9A="; + sha256 = "19d7yr6q8kwrm91yyglmw9n7wa861sgi6dbwn8sl6dp55czfwvaq"; + # populate values otherwise taken care of by goreleaser, + # unfortunately these require us to use git. By doing + # this in postFetch we can delete .git afterwards and + # maintain better reproducibility of the src. leaveDotGit = true; - }; + postFetch = '' + cd "$out" - nativeBuildInputs = [ git ]; + commit="$(git rev-parse HEAD)" + date=$(git show -s --format=%aI "$commit") - # populate values otherwise taken care of by goreleaser - # https://github.com/alecthomas/chroma/issues/435 - postPatch = '' - commit="$(git rev-parse HEAD)" - date=$(git show -s --format=%aI "$commit") + substituteInPlace "$out/cmd/chroma/main.go" \ + --replace 'version = "?"' 'version = "${version}"' \ + --replace 'commit = "?"' "commit = \"$commit\"" \ + --replace 'date = "?"' "date = \"$date\"" - substituteInPlace cmd/chroma/main.go \ - --replace 'version = "?"' 'version = "${version}"' \ - --replace 'commit = "?"' "commit = \"$commit\"" \ - --replace 'date = "?"' "date = \"$date\"" - ''; + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; + }; vendorSha256 = "0y8mp08zccn9qxrsj9j7vambz8dwzsxbbgrlppzam53rg8rpxhrg"; diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index 69ded2307de4..fd572fabae3e 100644 --- a/pkgs/tools/video/svt-av1/default.nix +++ b/pkgs/tools/video/svt-av1/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, nasm }: +{ lib, stdenv, fetchFromGitLab, cmake, nasm }: stdenv.mkDerivation rec { pname = "svt-av1"; - version = "0.8.6"; + version = "0.8.7"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "AOMediaCodec"; repo = "SVT-AV1"; rev = "v${version}"; - sha256 = "1wzamg89azi1f93wxvdy7silsgklckc754ca066k33drvyacicyw"; + sha256 = "1xlxb6kn6hqz9dxz0nd905m4i2mwjwq1330rbabwzmg4b66cdslg"; }; nativeBuildInputs = [ cmake nasm ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { activities. ''; inherit (src.meta) homepage; - changelog = "https://github.com/AOMediaCodec/SVT-AV1/blob/v${version}/CHANGELOG.md"; + changelog = "https://gitlab.com/AOMediaCodec/SVT-AV1/-/blob/v${version}/CHANGELOG.md"; license = with licenses; [ bsd2 { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e616c611939..7bdc59ce4b12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -799,6 +799,8 @@ in acme-client = callPackage ../tools/networking/acme-client { stdenv = gccStdenv; }; + adriconf = callPackage ../tools/graphics/adriconf { }; + amass = callPackage ../tools/networking/amass { }; afew = callPackage ../applications/networking/mailreaders/afew { }; @@ -5614,6 +5616,8 @@ in pgloader = callPackage ../development/tools/pgloader { }; + pgtop = callPackage ../development/tools/pgtop { }; + pigz = callPackage ../tools/compression/pigz { }; pixz = callPackage ../tools/compression/pixz { }; @@ -10164,6 +10168,8 @@ in yafaray-core = callPackage ../tools/graphics/yafaray-core { }; + yajsv = callPackage ../tools/misc/yajsv { }; + yapf = with python3Packages; toPythonApplication yapf; yarn = callPackage ../development/tools/yarn { }; @@ -13721,6 +13727,8 @@ in kustomize = callPackage ../development/tools/kustomize { }; + kustomize_3 = callPackage ../development/tools/kustomize/3.nix { }; + kustomize-sops = callPackage ../development/tools/kustomize/kustomize-sops.nix { }; ktlint = callPackage ../development/tools/ktlint { }; @@ -14850,6 +14858,8 @@ in directfb = callPackage ../development/libraries/directfb { }; + discordchatexporter-cli = callPackage ../tools/backup/discordchatexporter-cli { }; + discord-rpc = callPackage ../development/libraries/discord-rpc { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -16498,6 +16508,8 @@ in liblcf = callPackage ../development/libraries/liblcf { }; + libliftoff = callPackage ../development/libraries/libliftoff { }; + liblqr1 = callPackage ../development/libraries/liblqr-1 { }; liblockfile = callPackage ../development/libraries/liblockfile { }; @@ -17830,6 +17842,8 @@ in pstreams = callPackage ../development/libraries/pstreams {}; + pufferpanel = callPackage ../servers/pufferpanel { }; + pugixml = callPackage ../development/libraries/pugixml { }; pylode = callPackage ../misc/pylode {}; @@ -18067,7 +18081,7 @@ in rocksdb_lite = rocksdb.override { enableLite = true; }; - rotate-backups = with python3Packages; toPythonApplication rotate-backups; + rotate-backups = callPackage ../tools/backup/rotate-backups { }; rote = callPackage ../development/libraries/rote { }; @@ -18100,7 +18114,7 @@ in }; SDL = callPackage ../development/libraries/SDL ({ - inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa; + inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa GLUT; } // lib.optionalAttrs stdenv.hostPlatform.isAndroid { # libGLU doesn’t work with Android’s SDL libGLU = null; @@ -20896,8 +20910,6 @@ in dpdk-kmods = callPackage ../os-specific/linux/dpdk-kmods { }; - dpdk = throw "The dpdk driver has been renamed to dpdk-kmods."; - exfat-nofuse = callPackage ../os-specific/linux/exfat { }; evdi = callPackage ../os-specific/linux/evdi { }; @@ -21071,7 +21083,7 @@ in # Update this when adding the newest kernel major version! # And update linux_latest_for_hardened below if the patches are already available - linuxPackages_latest = linuxPackages_5_12; + linuxPackages_latest = linuxPackages_5_13; linux_latest = linuxPackages_latest.kernel; # Realtime kernel packages. @@ -23266,6 +23278,8 @@ in communi = libsForQt5.callPackage ../applications/networking/irc/communi { }; + complete-alias = callPackage ../tools/misc/complete-alias { }; + confclerk = callPackage ../applications/misc/confclerk { }; copyq = libsForQt514.callPackage ../applications/misc/copyq { }; @@ -24849,6 +24863,8 @@ in irssi_fish = callPackage ../applications/networking/irc/irssi/fish { }; + kirc = callPackage ../applications/networking/irc/kirc { }; + ir.lv2 = callPackage ../applications/audio/ir.lv2 { }; istioctl = callPackage ../applications/networking/cluster/istioctl { }; @@ -27432,10 +27448,7 @@ in wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); neovim-unwrapped = callPackage ../applications/editors/neovim { - lua = - # neovim doesn't work with luajit on aarch64: https://github.com/neovim/neovim/issues/7879 - if stdenv.isAarch64 then lua5_1 else - luajit; + lua = luajit; }; neovimUtils = callPackage ../applications/editors/neovim/utils.nix { }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index f0e54a9ce1d1..6fc0500ed53e 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -49,6 +49,7 @@ let interval = callPackage ../development/coq-modules/interval {}; InfSeqExt = callPackage ../development/coq-modules/InfSeqExt {}; iris = callPackage ../development/coq-modules/iris {}; + itauto = callPackage ../development/coq-modules/itauto { }; ITree = callPackage ../development/coq-modules/ITree { }; ltac2 = callPackage ../development/coq-modules/ltac2 {}; math-classes = callPackage ../development/coq-modules/math-classes { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ca96e411b572..6e25108d04fe 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -22,6 +22,8 @@ let alcotest-lwt = callPackage ../development/ocaml-modules/alcotest/lwt.nix {}; + alcotest-mirage = callPackage ../development/ocaml-modules/alcotest/mirage.nix {}; + angstrom = callPackage ../development/ocaml-modules/angstrom { }; angstrom-async = callPackage ../development/ocaml-modules/angstrom-async { }; @@ -1151,6 +1153,8 @@ let rope = callPackage ../development/ocaml-modules/rope { }; + routes = callPackage ../development/ocaml-modules/routes { }; + rpclib = callPackage ../development/ocaml-modules/rpclib { }; rpclib-lwt = callPackage ../development/ocaml-modules/rpclib/lwt.nix { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e518ee68f7b8..3ceaf784af3b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -59,6 +59,73 @@ lib.makeScope pkgs.newScope (self: with self; { pname = "php-${pname}"; }); + # Function to build an extension which is shipped as part of the php + # source, based on the php version. + # + # Name passed is the name of the extension and is automatically used + # to add the configureFlag "--enable-${name}", which can be overriden. + # + # Build inputs is used for extra deps that may be needed. And zendExtension + # will mark the extension as a zend extension or not. + mkExtension = + { name + , configureFlags ? [ "--enable-${name}" ] + , internalDeps ? [ ] + , postPhpize ? "" + , buildInputs ? [ ] + , zendExtension ? false + , doCheck ? true + , ... + }@args: stdenv.mkDerivation ((builtins.removeAttrs args [ "name" ]) // { + pname = "php-${name}"; + extensionName = name; + + inherit (php.unwrapped) version src; + sourceRoot = "php-${php.version}/ext/${name}"; + + enableParallelBuilding = true; + nativeBuildInputs = [ php.unwrapped autoconf pkg-config re2c ]; + inherit configureFlags internalDeps buildInputs + zendExtension doCheck; + + prePatch = "pushd ../.."; + postPatch = "popd"; + + preConfigure = '' + nullglobRestore=$(shopt -p nullglob) + shopt -u nullglob # To make ?-globbing work + + # Some extensions have a config0.m4 or config9.m4 + if [ -f config?.m4 ]; then + mv config?.m4 config.m4 + fi + + $nullglobRestore + phpize + ${postPhpize} + ${lib.concatMapStringsSep "\n" + (dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}") + internalDeps} + ''; + checkPhase = "runHook preCheck; NO_INTERACTON=yes make test; runHook postCheck"; + outputs = [ "out" "dev" ]; + installPhase = '' + mkdir -p $out/lib/php/extensions + cp modules/${name}.so $out/lib/php/extensions/${name}.so + mkdir -p $dev/include + ${rsync}/bin/rsync -r --filter="+ */" \ + --filter="+ *.h" \ + --filter="- *" \ + --prune-empty-dirs \ + . $dev/include/ + ''; + + meta = { + description = "PHP upstream extension: ${name}"; + inherit (php.meta) maintainers homepage license; + }; + }); + php = phpPackage; # This is a set of interactive tools based on PHP. @@ -171,72 +238,6 @@ lib.makeScope pkgs.newScope (self: with self; { yaml = callPackage ../development/php-packages/yaml { }; } // ( let - # Function to build a single php extension based on the php version. - # - # Name passed is the name of the extension and is automatically used - # to add the configureFlag "--enable-${name}", which can be overriden. - # - # Build inputs is used for extra deps that may be needed. And zendExtension - # will mark the extension as a zend extension or not. - mkExtension = - { name - , configureFlags ? [ "--enable-${name}" ] - , internalDeps ? [ ] - , postPhpize ? "" - , buildInputs ? [ ] - , zendExtension ? false - , doCheck ? true - , ... - }@args: stdenv.mkDerivation ((builtins.removeAttrs args [ "name" ]) // { - pname = "php-${name}"; - extensionName = name; - - inherit (php.unwrapped) version src; - sourceRoot = "php-${php.version}/ext/${name}"; - - enableParallelBuilding = true; - nativeBuildInputs = [ php.unwrapped autoconf pkg-config re2c ]; - inherit configureFlags internalDeps buildInputs - zendExtension doCheck; - - prePatch = "pushd ../.."; - postPatch = "popd"; - - preConfigure = '' - nullglobRestore=$(shopt -p nullglob) - shopt -u nullglob # To make ?-globbing work - - # Some extensions have a config0.m4 or config9.m4 - if [ -f config?.m4 ]; then - mv config?.m4 config.m4 - fi - - $nullglobRestore - phpize - ${postPhpize} - ${lib.concatMapStringsSep "\n" - (dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}") - internalDeps} - ''; - checkPhase = "runHook preCheck; NO_INTERACTON=yes make test; runHook postCheck"; - outputs = [ "out" "dev" ]; - installPhase = '' - mkdir -p $out/lib/php/extensions - cp modules/${name}.so $out/lib/php/extensions/${name}.so - mkdir -p $dev/include - ${rsync}/bin/rsync -r --filter="+ */" \ - --filter="+ *.h" \ - --filter="- *" \ - --prune-empty-dirs \ - . $dev/include/ - ''; - - meta = { - description = "PHP upstream extension: ${name}"; - inherit (php.meta) maintainers homepage license; - }; - }); - # This list contains build instructions for different modules that one may # want to build. # @@ -256,20 +257,6 @@ lib.makeScope pkgs.newScope (self: with self; { { name = "dom"; buildInputs = [ libxml2 ]; - patches = [ - # https://github.com/php/php-src/pull/7030 - (fetchpatch { - url = "https://github.com/php/php-src/commit/4cc261aa6afca2190b1b74de39c3caa462ec6f0b.patch"; - sha256 = "11qsdiwj1zmpfc2pgh6nr0sn7qa1nyjg4jwf69cgwnd57qfjcy4k"; - excludes = [ "ext/dom/tests/bug43364.phpt" "ext/dom/tests/bug80268.phpt" ]; - }) - ]; - # For some reason `patch` fails to remove these files correctly. - # Since `postPatch` is already used in `mkExtension`, we have to make it here. - preCheck = '' - rm tests/bug43364.phpt - rm tests/bug80268.phpt - ''; configureFlags = [ "--enable-dom" ] # Required to build on darwin. ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b796d9ac4427..7ea357116233 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -50,6 +50,7 @@ mapAliases ({ pytest-pep8 = pytestpep8; # added 2021-01-04 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 + rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 setuptools_scm = setuptools-scm; # added 2021-06-03 smart_open = smart-open; # added 2021-03-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 99c6294ecadb..5eac97ab1891 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -325,6 +325,8 @@ in { aiomultiprocess = callPackage ../development/python-modules/aiomultiprocess { }; + aiomusiccast = callPackage ../development/python-modules/aiomusiccast { }; + aiomysql = callPackage ../development/python-modules/aiomysql { }; aionotify = callPackage ../development/python-modules/aionotify { }; @@ -5233,6 +5235,8 @@ in { phonenumbers = callPackage ../development/python-modules/phonenumbers { }; + netmap = callPackage ../development/python-modules/netmap { }; + openapi-core = callPackage ../development/python-modules/openapi-core { }; pdunehd = callPackage ../development/python-modules/pdunehd { }; @@ -5323,6 +5327,8 @@ in { pyflick = callPackage ../development/python-modules/pyflick { }; + pyfreedompro = callPackage ../development/python-modules/pyfreedompro { }; + pygti = callPackage ../development/python-modules/pygti { }; pyheos = callPackage ../development/python-modules/pyheos { }; @@ -5343,6 +5349,8 @@ in { pynx584 = callPackage ../development/python-modules/pynx584 { }; + pypoint = callPackage ../development/python-modules/pypoint { }; + pyrfxtrx = callPackage ../development/python-modules/pyrfxtrx { }; pyrogram = callPackage ../development/python-modules/pyrogram { }; @@ -7616,8 +7624,6 @@ in { ropper = callPackage ../development/python-modules/ropper { }; - rotate-backups = callPackage ../tools/backup/rotate-backups { }; - routes = callPackage ../development/python-modules/routes { }; rpdb = callPackage ../development/python-modules/rpdb { }; |